1.9.5

card/hearth.js

@@ -358,15 +358,16 @@ card.hearth={
 			filterTarget:function(card,player,target){
 				return target==player;
 			},
-			usable:3,
+			modTarget:true,
-			forceUsable:true,
+			// usable:3,
+			// forceUsable:true,
 			content:function(){
 				'step 0'
-				player.storage.chuansongmen=cards[0];
 				var gained=get.cards()[0];
 				target.gain(gained,'gain2');
-				if(lib.filter.filterCard(gained,player,event.parent.parent)){
+				if(event.getParent(3).name=='phaseUse'&&_status.currentPhase==target&&
-					var next=player.chooseToUse();
+				lib.filter.filterCard(gained,target,event.getParent(2))){
+					var next=target.chooseToUse();
 					next.filterCard=function(card){
 						return card==gained;
 					};
@@ -385,8 +386,14 @@ card.hearth={
 					event.finish();
 				}
 				'step 1'
-				if(result.bool){
+				if(result.bool&&!target.hasSkill('chuansongmen3')){
-					player.gain(cards,'gain2');
+					if(target.hasSkill('chuansongmen2')){
+						target.addTempSkill('chuansongmen3','phaseAfter');
+					}
+					else{
+						target.addTempSkill('chuansongmen2','phaseAfter');
+					}
+					target.gain(cards,'gain2');
 				}
 				else{
 					ui.discardPile.appendChild(cards[0]);
@@ -650,6 +657,8 @@ card.hearth={
 		}
 	},
 	skill:{
+		chuansongmen2:{},
+		chuansongmen3:{},
 		shihuawuqi:{
 			mod:{
 				attackFrom:function(from,to,distance){
@@ -679,7 +688,7 @@ card.hearth={
 		tanshezhiren:'弹射之刃',
 		tanshezhiren_info:'限场存活角色不小于3时使用，弃置一名随机角色（不含你）的手牌，重复此过程直到有一名角色失去最后一张手牌（最多重复10次）',
 		chuansongmen:'传送门',
-		chuansongmen_info:'摸一张牌，若你能立即使用之，则将此牌回手（每回合最多使用3次）',
+		chuansongmen_info:'摸一张牌并展示，若发生在出牌阶段，你可以立即使用摸到的牌，若如此做，你将传送门收回手牌（每阶段最多收回2张传送门）',
 		dunpaigedang:'盾牌格挡',
 		dunpaigedang_info:'获得一点护甲值，摸一张牌',
 		siwangchanrao:'死亡缠绕',

character/gujian.js

@@ -11,6 +11,9 @@ character.gujian={
 		gjqt_wenrenyu:['female','shu',4,['chizhen','dangping']],
 		gjqt_xiayize:['male','qun',3,['xuanning','liuguang','yangming']],
 		gjqt_aruan:['female','wu',3,['zhaolu','jiehuo','yuling']],
+
+		// gjqt_xunfang:['female','shu',3,['zhaolu','jiehuo','yuling']],
+		// gjqt_ouyangshaogong:['male','shu',3,['zhaolu','jiehuo','yuling']],
 	},
 	skill:{
 		chizhen:{
@@ -1335,7 +1338,7 @@ character.gujian={
 		gjqt_aruan:'阿阮',
 
 		chizhen:'驰阵',
-		chizhen_info:'出牌阶段开始时，你可以摸X张牌并弃置X张牌，若你弃置了杀，可以视为使用一张决斗（X为你已损失的体力值+1）',
+		chizhen_info:'出牌阶段开始时，你可以摸X张牌并弃置X张牌，若你弃置了杀，可以视为使用一张决斗（X为你已损失的体力值且至少为1）',
 		xidie:'戏蝶',
 		xidie2:'戏蝶',
 		xidie_info:'回合开始阶段，若你的手牌数大于体力值，可以弃置至多X张牌，并于回合结束阶段摸等量的牌，X为你的体力值与手牌数之差且不超过3',
@@ -1365,7 +1368,7 @@ character.gujian={
 		xuelu:'血戮',
 		xuelu_info:'回合结束阶段，你可以弃置一张红色牌并对一名其他角色造成X点火焰伤害，X为你已损失体力值的一半，向上取整且不超过2',
 		fanshi:'反噬',
-		fanshi_info:'锁定技，若你于回合内造成过伤害，你于弃牌阶段结束时流失一点体力并摸一张牌',
+		fanshi_info:'锁定技，弃牌阶段结束时，若你本回合内造成过伤害，你流失一点体力并摸一张牌',
 		shahun:'煞魂',
 		shahun2:'煞魂',
 		shahun_info:'限定技，濒死阶段，你可以重置武将牌，弃置所有牌并摸三张牌，然后将体力回复至1；若如此做，你失去技能【反噬】，获得技能【绝境】，并于三回合后立即死亡',

character/ow.js

@@ -7,7 +7,7 @@ character.ow={
         ow_falaozhiying:['female','shu',3,['feidan','huoyu','feiying']],
         ow_zhixuzhiguang:['female','qun',3,['guangshu']],
         ow_luxiao:['male','wu',3,['yuedong','kuoyin','huhuan']],
-        ow_shibing:['male','shu',4,['tuji','mujing']],
+        ow_shibing:['male','shu',4,['tuji','mujing','lichang']],
         ow_yuanshi:['male','qun',3,['feiren','lianpo','zhanlong']],
         ow_chanyata:['male','qun',3,['xie','luan','sheng']],
         ow_dva:['female','shu',2,['jijia','tuijin','zihui','chongzhuang']],
@@ -1508,6 +1508,104 @@ character.ow={
             },
         },
         mujing:{
+			enable:['chooseToRespond','chooseToUse'],
+			filterCard:function(card){
+				return get.color(card)=='black';
+			},
+			position:'he',
+			viewAs:{name:'sha'},
+			viewAsFilter:function(player){
+				if(!player.num('he',{color:'black'})) return false;
+			},
+			prompt:'将一张黑色牌当杀使用或打出',
+			check:function(card){return 4-ai.get.value(card)},
+			ai:{
+				skillTagFilter:function(player){
+					if(!player.num('he',{color:'black'})) return false;
+				},
+				respondSha:true,
+			},
+            group:'mujing2'
+		},
+        mujing2:{
+            trigger:{player:'shaMiss'},
+            forced:true,
+            popup:false,
+            filter:function(event){
+                return !event.parent._mujinged;
+            },
+            content:function(){
+                trigger.parent._mujinged=true;
+                player.getStat().card.sha--;
+            }
+        },
+        lichang:{
+			trigger:{player:'phaseEnd'},
+			direct:true,
+            filter:function(event,player){
+                return player.num('he',{color:'red'})>0;
+            },
+			content:function(){
+				"step 0"
+				var next=player.chooseToDiscard(get.prompt('lichang'),'he',{color:'red'});
+				next.logSkill='lichang';
+				next.ai=function(card){
+					return 6-ai.get.value(card);
+				};
+				"step 1"
+				if(result.bool){
+					player.addSkill('lichang2');
+				}
+			},
+		},
+        lichang2:{
+            trigger:{player:'phaseBegin'},
+            direct:true,
+            mark:true,
+            intro:{
+                content:'下个回合开始时令一名距离1以内的角色回复一点体力或摸两张牌'
+            },
+            content:function(){
+                'step 0'
+                player.chooseTarget('力场：令一名角色回复一点体力或摸两张牌',function(card,player,target){
+                    return get.distance(player,target)<=1;
+                }).ai=function(target){
+                    var att=ai.get.attitude(player,target);
+                    if(att>0){
+                        if(target.hp==1&&target.maxHp>1) return att*2;
+                    }
+                    return att;
+                };
+                player.removeSkill('lichang2');
+                'step 1'
+                if(result.bool){
+                    player.logSkill('lichang',result.targets);
+                    event.target=result.targets[0];
+                    if(event.target.isHealthy()){
+                        event.target.draw(2);
+                        event.finish();
+                    }
+                    else{
+                        event.target.chooseControl('draw_card','recover_hp',function(event,player){
+        					if(player.hp>=3&&player.num('h')<=player.hp) return 'draw_card';
+        					if(player.hp==2&&player.num('h')<=1) return 'draw_card';
+        					return 'recover_hp';
+        				});
+                    }
+                }
+                else{
+                    event.finish();
+                }
+                'step 2'
+                if(result.control=='draw_card'){
+                    event.target.draw(2);
+                }
+                else{
+                    event.target.recover();
+                }
+            }
+        },
+        mujing_old:{
             trigger:{player:'useCardToBegin'},
 			filter:function(event,player){
 				return event.target&&event.target!=player&&get.distance(event.target,player,'attack')>1;
@@ -2623,6 +2721,9 @@ character.ow={
         }
     },
     translate:{
+        lichang:'力场',
+        lichang2:'力场',
+        lichang_info:'回合结束阶段，你可以弃置一张红色牌，若如此做，你可以在下个回合开始时令一名距离1以内的角色回复一点体力或摸两张牌',
         mengji:'猛击',
         mengji_info:'锁定技，若你已发动重盾，当你没有护甲时，你的杀造成的伤害+1',
         zhongdun:'重盾',
@@ -2699,9 +2800,11 @@ character.ow={
         shouge:'收割',
         shouge_info:'每当你杀死一名角色，你可以获得一张治疗波',
         tuji:'突击',
-        tuji_info:'锁定技，在你的回合内，你每使用一次牌后，你计算与其他角色的距离便减少1，直到回合结束',
+        tuji_info:'锁定技，在你的回合内，每当你使用一张牌，你计算与其他角色的距离便减少1',
         mujing:'目镜',
-        mujing_info:'每当你对攻击范围不含你的角色使用一张牌，你可以弃置目标一张牌；若你的手牌数不多于目标，你摸一张牌',
+        mujing2:'目镜',
+        mujing_info:'你可以将一张黑色牌当作杀使用或打出；当你的杀被闪避后，此杀不计入出杀次数',
+        mujing_old_info:'每当你对攻击范围不含你的角色使用一张牌，你可以弃置目标一张牌；若你的手牌数不多于目标，你摸一张牌',
         feiren:'飞刃',
         feiren2:'飞刃',
         feiren_info:'你的杀无视距离和防具；你的黑桃杀造成的伤害+1，梅花杀可以额外指定一个目标',

character/rank.js

@@ -27,7 +27,6 @@ window.characterRank={
         'swd_xuanyuanjianxian',
         'swd_yuwentuo',
         'pal_xuanxiao',
-        'xk_fujianhan',
         'swd_jipeng',
         'lusu',
         'yuanshu',
@@ -121,7 +120,6 @@ window.characterRank={
         'hs_lafamu',
         'ow_chanyata',
         'ow_tianshi',
-        'ow_shibing',
         'ow_liekong',
         'ow_ana',
         'ow_heibaihe',
@@ -139,6 +137,7 @@ window.characterRank={
     ],
     am:[
         'swd_duanmeng',
+        'ow_shibing',
         'sunziliufang',
         'hs_blingtron',
         'hs_kcthun',
@@ -193,7 +192,6 @@ window.characterRank={
         'swd_rongshuang',
         'zhanghe',
         'zhangzhang',
-        'xk_guyuexuan',
         'pal_zhaoliner',
         'caozhi',
         'caochong',
@@ -319,7 +317,6 @@ window.characterRank={
         'swd_hupo',
         'caopi',
         'jiaxu',
-        'xk_jinji',
         'maliang',
         'zhangchunhua',
         'xushu',

character/shenhua.js

@@ -502,17 +502,12 @@ character.shenhua={
 					event.finish();
 				}
 				"step 2"
-				game.delay();
-				"step 3"
 				for(var i=0;i<event.targets.length;i++){
-					player.gain(event.targets[i].get('h').randomGet());
+					player.gain(event.targets[i].get('h').randomGet(),event.targets[i]);
 					event.targets[i].$give(1,player);
 				}
 				trigger.finish();
 				trigger.untrigger();
-				game.delay();
-				"step 4"
-				if(result.bool) game.delay();
 			},
 			ai:{
 				expose:0.2

character/xianjian.js

@@ -32,7 +32,7 @@ character.xianjian={
 		// pal_longyou:['male','wei',4,[]],
 		// pal_xiaoman:['male','wei',4,[]],
 
-		pal_xiahoujinxuan:['male','shu',3,['xuanmo','lingyan','danqing']],
+		pal_xiahoujinxuan:['male','shu',3,['xuanmo','danqing']],
 		// pal_muchanglan:['male','wei',4,[]],
 		// pal_xia:['male','wei',4,[]],
 		// pal_jiangcheng:['male','wei',4,[]],
@@ -129,9 +129,9 @@ character.xianjian={
 					}
 				}
 			},
-			// filter:function(event,player){
+			filter:function(event,player){
-			// 	return player.storage.danqing.length==4;
+				return player.storage.danqing.length==4;
-			// },
+			},
 			content:function(){
 				'step 0'
 				player.storage.danqing.length=0;
@@ -157,7 +157,10 @@ character.xianjian={
 								current.equip(card);
 								current.$draw(card);
 								break;
-							case 'stealth':current.addTempSkill('hslingjian_yinshen',{player:'phaseBegin'});break;
+							case 'stealth':
+								current.addTempSkill('hslingjian_yinshen',{player:'phaseBegin'});
+								game.log(current,'获得了','【潜行】');
+								break;
 						}
 					}
 					if(effs.contains('draw')){

game/asset.js

@@ -1,5 +1,5 @@
 window.noname_asset_list=[
-    '1.9.4',
+    '1.9.5',
     'image/background/huangtian_bg.jpg',
     'image/background/shengshi_bg.jpg',
     'image/background/xueji_bg.jpg',
@@ -261,9 +261,11 @@ window.noname_asset_list=[
     'image/character/gjqt_fanglansheng.jpg',
     'image/character/gjqt_fengqingxue.jpg',
     'image/character/gjqt_hongyu.jpg',
+    'image/character/gjqt_ouyangshaogong.jpg',
     'image/character/gjqt_wenrenyu.jpg',
     'image/character/gjqt_xiangling.jpg',
     'image/character/gjqt_xiayize.jpg',
+    'image/character/gjqt_xunfang.jpg',
     'image/character/gjqt_yinqianshang.jpg',
     'image/character/gjqt_yuewuyi.jpg',
     'image/character/gongsunyuan.jpg',