1

card/guozhan.js

@@ -655,6 +655,7 @@ card.guozhan={
 			},
 			content:function(){
 				'step 0'
+				_status.chiling=false;
 				var targets=game.filterPlayer(function(target){
 					return target.isUnseen();
 				});
@@ -666,7 +667,7 @@ card.guozhan={
 					event.current=target;
 					if(target.num('he',{type:'equip'})){
 						target.chooseControl('选项一','选项二','选项三',function(){
-							return Math.random()<0.5?'选项一':'选项二';
+							return Math.random()<0.5?'选项一':'选项三';
 						}).set('prompt','敕令<br><br><div class="text">选项一：明置一张武将牌，然后摸一张牌</div><br><div class="text">选项二：失去1点体力</div><br><div class="text">选项三：弃置一张装备牌</div>');
 					}
 					else{
@@ -769,7 +770,7 @@ card.guozhan={
 				player.$give(cards,targets[0]);
 			},
 			discard:false,
-			delay:0.5,
+			// delay:0.5,
 			content:function(){
 				"step 0"
 				target.gain(cards);

character/hearth.js

@@ -56,7 +56,7 @@ character.hearth={
 		hs_huzhixiannv:['female','wu',3,['jingmeng','qingliu']],
 		hs_tgolem:['male','wu',4,['xinwuyan','guozai']],
 		hs_totemic:['male','wu',3,['s_tuteng']],
-		hs_xsylvanas:['female','wei',3,['busi','xshixin','xmojian']],
+		hs_xsylvanas:['female','qun',3,['busi','xshixin','xmojian']],
 		hs_siwangzhiyi:['male','qun',12,['mieshi']],
 		hs_bilanyoulong:['male','wei',4,['lingzhou']],
 		hs_jinglinglong:['male','wu',3,['mianyi']],
@@ -2045,7 +2045,7 @@ character.hearth={
 			trigger:{player:'turnOverAfter'},
 			direct:true,
 			filter:function(event,player){
-				return player.isTurnedOver();
+				return !player.isTurnedOver();
 			},
 			content:function(){
 				"step 0"
@@ -4776,7 +4776,7 @@ character.hearth={
 		xshixin:'蚀心',
 		xshixin_info:'锁定技，每当你对一名其他角色造成一次伤害，受伤害角色与你各流失一点体力',
 		xmojian:'魔箭',
-		xmojian_info:'每当你的武将牌翻至背面时，你可以指定一名角色视为对其使用了一张杀',
+		xmojian_info:'每当你的武将牌翻至正面时，你可以指定一名角色视为对其使用了一张杀',
 		enze:'恩泽',
 		enze_info:'出牌阶段限一次，你可以指定一名角色令其手牌数与你相等（至多摸三张牌）',
 		chongsheng:'重生',

character/ow.js

@@ -3,7 +3,7 @@ character.ow={
     character:{
         ow_liekong:['female','shu',3,['shanxian','shanhui']],
         // ow_heibaihe:['female','shu',3,[]],
-        ow_sishen:['male','shu',3,['xiandan','yihun','hongxi']],
+        ow_sishen:['male','shu',3,['xiandan','yihun','shouge']],
         ow_tianshi:['female','qun',3,['shouhu','ziyu','feiying']],
         ow_falaozhiying:['female','shu',3,['feidan','huoyu','feiying']],
         ow_zhixuzhiguang:['female','qun',3,['guangshu']],
@@ -15,6 +15,47 @@ character.ow={
         ow_chanyata:['male','qun',3,['xie','luan','sheng']],
     },
     skill:{
+        xiandan:{
+			trigger:{player:'shaBegin'},
+			direct:true,
+			content:function(){
+				"step 0"
+				var dis=trigger.target.num('h','shan')||trigger.target.num('e','bagua')||trigger.target.num('h')>2;
+				var next=player.chooseToDiscard('是否发动【霰弹】？');
+				next.ai=function(card){
+					if(dis) return 7-ai.get.value(card);
+					return 0;
+				}
+				next.logSkill='xiandan';
+				"step 1"
+				if(result.bool){
+                    if(get.color(result.cards[0])=='red'){
+                        trigger.directHit=true;
+                    }
+					else{
+                        player.addTempSkill('xiandan2','shaAfter');
+                    }
+				}
+			}
+		},
+        xiandan2:{
+			trigger:{source:'damageBegin'},
+			filter:function(event){
+				return event.card&&event.card.name=='sha'&&event.notLink();
+			},
+			forced:true,
+            popup:false,
+			content:function(){
+				trigger.num++;
+			}
+		},
+        shouge:{
+            trigger:{source:'dieAfter'},
+            frequent:true,
+            content:function(){
+                player.gain(game.createCard('zhiliaobo'),'gain2');
+            }
+        },
         tuji:{
             mod:{
                 globalFrom:function(from,to,distance){
@@ -417,7 +458,7 @@ character.ow={
                 }
             }
         },
-        xiandan:{
+        xiandan_old:{
             mod:{
                 selectTarget:function(card,player,range){
                     if(card.name=='sha'&&range[1]!=-1){
@@ -456,7 +497,7 @@ character.ow={
             trigger:{player:'phaseEnd'},
             direct:true,
             filter:function(event,player){
-                return player.num('he',{suit:'spade'})>0;
+                return player.num('he',{suit:'spade'})>0&&!player.hasSkill('yihun2');
             },
             content:function(){
                 'step 0'
@@ -492,13 +533,15 @@ character.ow={
             },
         },
         yihun2:{
-            trigger:{global:'phaseBegin'},
+            trigger:{global:['phaseBegin','dieAfter']},
             forced:true,
             filter:function(event,player){
                 return event.player==player.storage.yihun2;
             },
             content:function(){
-                player.useCard({name:'sha'},player.storage.yihun2);
+                if(player.storage.yihun2.isAlive()){
+                    player.useCard({name:'sha'},player.storage.yihun2);
+                }
                 player.removeSkill('yihun2');
                 delete player.storage.yihun2;
             },
@@ -1067,6 +1110,8 @@ character.ow={
         }
     },
     translate:{
+        shouge:'收割',
+        shouge_info:'每当你杀死一名角色，你可以获得一张治疗波',
         tuji:'突击',
         tuji_info:'锁定技，在你的回合内，你每使用一次牌后，你计算与其他角色的距离便减少1，直到回合结束',
         mujing:'目镜',
@@ -1085,7 +1130,7 @@ character.ow={
         sheng:'圣',
         sheng_info:'限定技，出牌阶段，你可以将你的武将牌翻面，然后令任意名角色回复一点体力，若如此做，你不能成为其他角色的卡牌目标直到下一回合开始',
         xiandan:'霰弹',
-        xiandan_info:'你的杀可以指定距离1以内的角色为额外目标',
+        xiandan_info:'每当你使用一张杀，你可以弃置一张红色牌令此杀不可闪避，或弃置一张黑色牌令此杀伤害+1',
         yihun:'移魂',
         yihun_info:'回合结束阶段，你可以弃置一张黑桃牌并指定一名其他角色，你在该角色下一回合开始时视为对其使用一张杀；在此之前，你不能使用卡牌，也不能成为卡牌的目标',
         feidan:'飞弹',

character/sp.js

@@ -5141,7 +5141,7 @@ character.sp={
 			selectCard:[1,Infinity],
 			complexSelect:true,
 			filterTarget:function(card,player,target){
-				return get.distance(player,target,'attack')<=1&&ui.selected.cards.length==target.hp;
+				return target!=player&&get.distance(player,target,'attack')<=1&&ui.selected.cards.length==target.hp;
 			},
 			check:function(card){
 				switch(ui.selected.cards.length){

character/yijiang.js

@@ -233,9 +233,9 @@ character.yijiang={
 				var target=result.targets[0];
 				event.target=target;
 				player.line(target,'green');
-				var type=get.type(trigger.card);
+				var type=get.type(trigger.card,'trick');
 				target.chooseCard('滔乱<br><br><div class="text center">交给'+get.translation(player)+'一张'+get.translation(type)+'牌，或令其失去一点体力',function(card,player,target){
-					return get.type(card)==_status.event.cardType;
+					return get.type(card,'trick')==_status.event.cardType;
 				}).set('cardType',type).set('ai',function(card){
 					if(_status.event.att){
 						return 11-ai.get.value(card);
@@ -4492,6 +4492,7 @@ character.yijiang={
 			content:function(){
 				"step 0"
 				player.chooseTarget('是否发动【谮毁】？',function(card,player,target){
+					if(player==target) return false;
 					var trigger=_status.event.getTrigger();
 					return player.canUse(trigger.card,target)&&trigger.targets.contains(target)==false;
 				}).set('ai',function(target){

game/update.js

@@ -6,9 +6,13 @@ window.noname_update={
     files:{
         global:[
             'character/hearth.js',
+            'character/ow.js',
+            'character/yijiang.js',
+            'character/sp.js',
             'card/swd.js',
+            'card/guozhan.js',
             'game/game.js',
         ],
-        '1.8.15.4':[]
+        '1.8.16.1':[]
     }
 }