From 1eabf322e608cc7a4b76aee5f49ae557e55e1879 Mon Sep 17 00:00:00 2001
From: libccy <operawidget@163.com>
Date: Mon, 22 May 2017 21:34:35 +0800
Subject: [PATCH] notrigger

---
 card/swd.js           |  4 ++++
 card/yunchou.js       |  1 +
 character/hearth.js   | 10 ++++++++--
 character/refresh.js  |  3 +++
 character/shenhua.js  |  1 +
 character/sp.js       |  4 ++++
 character/swd.js      |  4 ++++
 character/xiake.js    |  1 +
 character/xianjian.js |  4 ++++
 character/yijiang.js  |  1 +
 character/yxs.js      |  3 +++
 mode/boss.js          |  1 +
 12 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/card/swd.js b/card/swd.js
index b2ff33f76..1084b8b88 100644
--- a/card/swd.js
+++ b/card/swd.js
@@ -3039,6 +3039,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 				forced:true,
 				priority:55,
 				filter:function(event){
+					if(event._notrigger.contains(event.player)) return false;
 					return event.player.countCards('he')>0;
 				},
 				content:function(){
@@ -3376,6 +3377,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 				trigger:{source:'damageEnd'},
 				forced:true,
 				filter:function(event){
+					if(event._notrigger.contains(event.player)) return false;
 					return event.card&&event.card.name=='sha'&&event.player.countCards('he');
 				},
 				content:function(){
@@ -3537,6 +3539,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 					return get.attitude(player,event.player)<=0;
 				},
 				filter:function(event){
+					if(event._notrigger.contains(event.player)) return false;
 					return event.card&&event.card.name=='sha'&&event.player&&event.player.isAlive();
 				},
 				logTarget:'player',
@@ -4170,6 +4173,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 				trigger:{source:'damageEnd'},
 				direct:true,
 				filter:function(event,player){
+					if(event._notrigger.contains(event.player)) return false;
 					return event.nature&&event.player&&event.player.isAlive();
 				},
 				content:function(){
diff --git a/card/yunchou.js b/card/yunchou.js
index 4c5fb83fd..c3ea9c81e 100644
--- a/card/yunchou.js
+++ b/card/yunchou.js
@@ -1021,6 +1021,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 					if(event.player==player) return false;
 					if(!event.player.countCards('he')) return false;
 					if(!lib.filter.targetEnabled({name:'chenhuodajie'},player,event.player)) return false;
+					if(event._notrigger.contains(event.player)) return false;
 					return player.hasCard('chenhuodajie');
 				},
 				content:function(){
diff --git a/character/hearth.js b/character/hearth.js
index 178592925..4f2e27332 100644
--- a/character/hearth.js
+++ b/character/hearth.js
@@ -197,6 +197,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
                 trigger:{source:'damageEnd',player:'damageEnd'},
                 forced:true,
                 filter:function(event,player){
+                    if(event._notrigger.contains(event.player)) return false;
                     return (event.source!=player&&event.source.isIn())||(event.player!=player&&event.player.isIn());
                 },
                 content:function(){
@@ -494,7 +495,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
                 forced:true,
                 content:function(){
                     player.draw();
-                    if(trigger.player&&trigger.player.isIn()){
+                    if(trigger.player&&trigger.player.isIn()&&!trigger._notrigger.contains(trigger.player)){
                         trigger.player.randomDiscard();
                     }
                 },
@@ -3202,6 +3203,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
     		xueren:{
     			trigger:{source:'damageEnd'},
     			filter:function(event){
+                    if(event._notrigger.contains(event.player)) return false;
     				return event.card&&event.card.name=='sha'&&event.player.isAlive();
     			},
     			check:function(event,player){
@@ -4164,6 +4166,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
     			trigger:{source:'damageEnd',player:'damageEnd'},
     			forced:true,
     			filter:function(event,player){
+                    if(event._notrigger.contains(event.player)) return false;
     				if(player==event.source){
     					return event.player!=player&&event.player.countCards('e');
     				}
@@ -4755,6 +4758,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
     			forced:true,
     			alter:true,
     			filter:function(event,player){
+                    if(event._notrigger.contains(event.player)) return false;
     				if(get.is.altered('xshixin')&&event.player.hp<player.hp) return false;
     				return event.player.isAlive()&&event.player!=player;
     			},
@@ -4944,6 +4948,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
     			forced:true,
     			alter:true,
     			filter:function(event,player){
+                    if(event._notrigger.contains(event.player)) return false;
     				return event.card&&get.color(event.card)=='black'&&
     				!event.player.isTurnedOver()&&event.player.isAlive();
     			},
@@ -5166,6 +5171,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
     		bingshuang:{
     			trigger:{source:'damageEnd'},
     			filter:function(event,player){
+                    if(event._notrigger.contains(event.player)) return false;
     				return event.card&&get.type(event.card)=='trick'&&
     				event.player.isAlive()&&!event.player.isTurnedOver();
     			},
@@ -7724,7 +7730,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
     		hsqingyu:'青玉',
 
     		lianzhan:'连斩',
-    		lianzhan_info:'每当你造成一次伤害，若此伤害是你本回合第一次造成伤害，你摸两张牌；否则你增加一点体力上限并 回复一点体力',
+    		lianzhan_info:'每当你造成一次伤害，若此伤害是你本回合第一次造成伤害，你摸两张牌；否则你增加一点体力上限并回复一点体力',
     		shifa:'魔瘾',
     		shifa_info:'锁定技，每当你使用一张非转化的普通锦囊牌，你摸一张牌；出牌阶段开始时，你令你与一名随机敌人各获得一张随机普通锦囊牌',
     		yuanzheng:'远征',
diff --git a/character/refresh.js b/character/refresh.js
index ab73bfd60..7f894fa4c 100644
--- a/character/refresh.js
+++ b/character/refresh.js
@@ -210,6 +210,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 				trigger:{source:'damageEnd'},
 				forced:true,
 				filter:function(event,player){
+                    if(event._notrigger.contains(event.player)) return false;
 					return event.card&&event.card.name=='sha'&&event.player.isAlive()&&event.player.countCards('he')>0;
 				},
 				check:function(){
@@ -1131,6 +1132,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 				trigger:{source:'damageEnd'},
 				direct:true,
 				filter:function(event){
+                    if(event._notrigger.contains(event.player)) return false;
 					return event.card&&event.card.name=='sha'&&event.cards&&
 					get.color(event.cards)=='black'&&event.player.countCards('e');
 				},
@@ -1456,6 +1458,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 				audio:2,
 				trigger:{player:'damageEnd',source:'damageEnd'},
 				filter:function(event){
+                    if(event._notrigger.contains(event.player)) return false;
 					return event.num&&event.source&&event.player&&
 					event.player.isAlive()&&event.source.isAlive()&&event.source!=event.player;
 				},
diff --git a/character/shenhua.js b/character/shenhua.js
index ee52eacbb..18d5d0c2f 100644
--- a/character/shenhua.js
+++ b/character/shenhua.js
@@ -1869,6 +1869,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
     			audio:2,
     			trigger:{source:'damageEnd'},
     			filter:function(event,player){
+                    if(event._notrigger.contains(event.player)) return false;
     				return (event.card&&event.card.name=='sha'&&
     					event.player.classList.contains('dead')==false&&
     					event.player.countCards('h')&&player.countCards('h'))&&event.player!=player;
diff --git a/character/sp.js b/character/sp.js
index ce132a970..adaff2046 100644
--- a/character/sp.js
+++ b/character/sp.js
@@ -2897,6 +2897,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
     		zhidao:{
     			trigger:{source:'damageEnd'},
     			filter:function(event,player){
+                    if(event._notrigger.contains(event.player)) return false;
     				return _status.currentPhase==player&&event.player.isAlive()&&
     				event.player.countCards('hej')>0&&event.player!=player&&!player.hasSkill('zhidao2');
     			},
@@ -5129,6 +5130,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
     		bushi:{
     			trigger:{player:'damageEnd',source:'damageEnd'},
     			filter:function(event,player){
+                    if(event._notrigger.contains(event.player)) return false;
     				return player.storage.yishe&&player.storage.yishe.length&&event.player.isAlive();
     			},
     			direct:true,
@@ -7379,6 +7381,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
     			trigger:{source:'damageEnd'},
     			silent:true,
     			filter:function(event,player){
+                    if(event._notrigger.contains(event.player)) return false;
     				return event.nature=='fire';
     			},
     			content:function(){
@@ -8420,6 +8423,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
     			direct:true,
     			audio:2,
     			filter:function(event){
+                    if(event._notrigger.contains(event.player)) return false;
     				return event.card&&event.card.name=='sha'&&event.player.countCards('e');
     			},
     			content:function(){
diff --git a/character/swd.js b/character/swd.js
index 6526b1126..e78050fcd 100644
--- a/character/swd.js
+++ b/character/swd.js
@@ -3106,6 +3106,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
     			trigger:{source:'damageEnd'},
     			direct:true,
     			filter:function(event,player){
+                    if(event._notrigger.contains(event.player)) return false;
     				return event.player.countCards('e');
     			},
     			content:function(){
@@ -5561,6 +5562,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
     			trigger:{source:'damageEnd'},
     			direct:true,
     			filter:function(event){
+                    if(event._notrigger.contains(event.player)) return false;
     				return event.card&&event.card.name=='sha'&&event.player.countCards('he');
     			},
     			content:function(){
@@ -5607,6 +5609,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
     			trigger:{source:'damageEnd'},
     			forced:true,
     			filter:function(event,player){
+                    if(event._notrigger.contains(event.player)) return false;
     				return event.player.countCards('hej');
     			},
     			content:function(){
@@ -6109,6 +6112,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
     		polang:{
     			trigger:{source:'damageEnd'},
     			filter:function(event,player){
+                    if(event._notrigger.contains(event.player)) return false;
     				return event.player.countCards('e');
     			},
     			direct:true,
diff --git a/character/xiake.js b/character/xiake.js
index 498f80859..ece8ea283 100644
--- a/character/xiake.js
+++ b/character/xiake.js
@@ -73,6 +73,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 	            trigger:{source:'damageEnd'},
 	            frequent:true,
 	            filter:function(event,player){
+                    if(event._notrigger.contains(event.player)) return false;
 	                return _status.currentPhase==player&&event.card&&event.card.name=='sha';
 	            },
 	            content:function(){
diff --git a/character/xianjian.js b/character/xianjian.js
index 905a4fdbc..c539c5f3a 100644
--- a/character/xianjian.js
+++ b/character/xianjian.js
@@ -484,6 +484,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 					return get.attitude(player,event.player)<0;
 				},
 				filter:function(event,player){
+                    if(event._notrigger.contains(event.player)) return false;
 					return event.player!=player&&event.player.isIn()&&!event.player.hasSkill('anwugu2');
 				},
 				logTarget:'player',
@@ -2144,6 +2145,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 						trigger:{source:'damageEnd'},
 						forced:true,
 						filter:function(event){
+		                    if(event._notrigger.contains(event.player)) return false;
 							if(get.is.altered('tianjian')) return false;
 							return event.parent.skill=='tianjian'&&event.player.countCards('he');
 						},
@@ -2749,6 +2751,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 				trigger:{source:'damageEnd'},
 				forced:true,
 				filter:function(event){
+                    if(event._notrigger.contains(event.player)) return false;
 					return event.player.isAlive()&&event.card&&event.card.name=='sha';
 				},
 				content:function(){
@@ -3750,6 +3753,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 				trigger:{source:'damageEnd'},
 				alter:true,
 				filter:function(event,player){
+                    if(event._notrigger.contains(event.player)) return false;
 					return player.storage.xuanning>0&&event.player.countCards('he')>0;
 				},
 				direct:true,
diff --git a/character/yijiang.js b/character/yijiang.js
index e25024f25..689dfc275 100644
--- a/character/yijiang.js
+++ b/character/yijiang.js
@@ -6738,6 +6738,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
     				return get.attitude(player,event.player)>0;
     			},
     			filter:function(event){
+                    if(event._notrigger.contains(event.player)) return false;
     				return event.card&&event.card.name=='sha'&&event.player.isAlive();
     			},
     			logTarget:'player',
diff --git a/character/yxs.js b/character/yxs.js
index 95e4bbc30..cdfe2a46f 100644
--- a/character/yxs.js
+++ b/character/yxs.js
@@ -106,6 +106,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 				forced:true,
 				logTarget:'player',
 				filter:function(event,player){
+                    if(event._notrigger.contains(event.player)) return false;
 					return event.player.isIn()&&!event.player.hasSkill('lyuxue2');
 				},
 				content:function(){
@@ -860,6 +861,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 				trigger:{source:'damageEnd'},
 				frequent:true,
 				filter:function(event){
+                    if(event._notrigger.contains(event.player)) return false;
 					return event.player.isAlive()&&event.parent.name=='yanyi'&&event.player.hp<event.player.maxHp;
 				},
 				content:function(){
@@ -1343,6 +1345,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 				trigger:{source:'damageEnd'},
 				direct:true,
 				filter:function(event,player){
+                    if(event._notrigger.contains(event.player)) return false;
 					if(event.player.isDead()) return false;
 					var nh=event.player.countCards('h');
 					if(nh==0) return false;
diff --git a/mode/boss.js b/mode/boss.js
index a101519b5..b583deb4b 100644
--- a/mode/boss.js
+++ b/mode/boss.js
@@ -1766,6 +1766,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
 				forced:true,
 				unique:true,
 				filter:function(event,player){
+                    if(event._notrigger.contains(event.player)) return false;
 					return event.player.isIn()&&event.player.isEnemyOf(player)&&!event.player.hasSkill('boss_zhongdu');
 				},
 				logTarget:'player',