From 945a369920846734468390cf1680d778029f97bc Mon Sep 17 00:00:00 2001
From: Spmario233 <Spmario233@163.com>
Date: Thu, 5 Dec 2019 23:22:10 +0800
Subject: [PATCH] v1.9.95.9

---
 game/game.js   | 27 +++++++++++++++++----------
 game/update.js | 47 +++++++++++++++++++++++++----------------------
 2 files changed, 42 insertions(+), 32 deletions(-)

diff --git a/game/game.js b/game/game.js
index cb0e4312c..ad3066f0b 100644
--- a/game/game.js
+++ b/game/game.js
@@ -6451,6 +6451,13 @@
 						return this.childNodes[row].childNodes[col];
 					}
 				};
+				Array.prototype.filterInD=function(){
+					var list=[];
+					for(var i=0;i<this.length;i++){
+						if(get.position(this[i])=='d') list.push(this[i]);
+					}
+					return list;
+				};
 				Array.prototype.find=function(item){
 					return this.indexOf(item);
 				};
@@ -11045,6 +11052,7 @@
 				},
 				chooseToUse:function(){
 					"step 0"
+					if(event.responded) return;
 					if(game.modeSwapPlayer&&!_status.auto&&player.isUnderControl()&&!lib.filter.wuxieSwap(event)){
 						game.modeSwapPlayer(player);
 					}
@@ -20160,7 +20168,7 @@
 						if(mode!='identity'){
 							if(player&&this.side!=player.side) return false;
 						}
-						if(this.isZhu) return true;
+						if(this.isZhu==true) return true;
 						for(var i in this.storage){
 							if(i.indexOf('zhuSkill_')==0&&this.storage[i].contains(skill)) return true;
 						}
@@ -22514,15 +22522,8 @@
 							if(info.filterCard!=undefined){
 								this.filterCard=function(card,player,event){
 									if(!info.ignoreMod&&player){
-										if(!event) event=_status.event;
-										if(event.name=='chooseToUse'){
-											var mod=game.checkMod(card,player,'unchanged','cardEnabled',player);
-											if(mod!='unchanged') return mod;
-										}
-										if(event.name=='chooseToRespond'){
-											var mod=game.checkMod(card,player,'unchanged','cardRespondable',player);
-											if(mod!='unchanged') return mod;
-										}
+										var mod=game.checkMod(card,player,'unchanged','cardEnabled2',player);
+										if(mod!='unchanged') return mod;
 									}
 									return get.filter(info.filterCard)(card,player,event);
 								};
@@ -23300,6 +23301,8 @@
 			cardEnabled:function(card,player,event){
 				card=get.autoViewAs(card,null,player);
 				if(player==undefined) player=_status.event.player;
+				var mod2=game.checkMod(card,player,'unchanged','cardEnabled2',player);
+				if(mod2!='unchanged') return mod2;
 				if(event==='forceEnable'){
 					var mod=game.checkMod(card,player,'unchanged','cardEnabled',player);
 					if(mod!='unchanged') return mod;
@@ -23324,6 +23327,8 @@
 					}
 				}
 				if(player==undefined) player=_status.event.player;
+				var mod2=game.checkMod(card,player,'unchanged','cardEnabled2',player);
+				if(mod2!='unchanged') return mod2;
 				var mod=game.checkMod(card,player,'unchanged','cardRespondable',player);
 				if(mod!='unchanged') return mod;
 				return true;
@@ -24038,6 +24043,8 @@
 						player.chooseToUse({
 							filterCard:function(card,player,event){
 								event=event||_status.event;
+								var mod2=game.checkMod(card,player,'unchanged','cardEnabled2',player);
+								if(mod2!='unchanged') return mod2;
 								var mod=game.checkMod(card,player,'unchanged','cardSavable',player);
 								if(mod!='unchanged') return mod;
 								var savable=get.info(card).savable;
diff --git a/game/update.js b/game/update.js
index b8027282b..93cfedd26 100644
--- a/game/update.js
+++ b/game/update.js
@@ -1,40 +1,43 @@
 window.noname_update={
-	version:'1.9.95.8.2',
-	update:'1.9.95.8.1',
+	version:'1.9.95.9',
+	update:'1.9.95.8',
 	changeLog:[
-		'紧急修复BUG',
-		//'欢乐卡牌写轮眼写法调整、漩涡面具、DIY王允、段珪的部分技能小调整',
+		'响应杀的方式改为【使用】闪',
+		'修复BUG',
 	],
 	files:[
-		//'card/extra.js',
-		'card/huanlekapai.js',
-		//'card/sp.js',
-		//'card/standard.js',
+		'card/extra.js',
+		//'card/huanlekapai.js',
+		'card/sp.js',
+		'card/standard.js',
 		//'card/swd.js',
-		//'card/guozhan.js',
+		'card/guozhan.js',
 		//'card/gwent.js',
 		'character/diy.js',
-		//'character/extra.js',
+		'character/extra.js',
+		'character/hearth.js',
 		//'character/gujian.js',
 		//'character/gwent.js',
 		//'character/mobile.js',
 		//'character/mtg.js',
-		//'character/old.js',
-		//'character/refresh.js',
-		//'character/shenhua.js',
+		'character/old.js',
+		'character/refresh.js',
+		'character/shenhua.js',
 		'character/sp.js',
 		//'character/tw.js',
-		//'character/standard.js',
-		//'character/swd.js',
-		//'character/xinghuoliaoyuan.js',
-		//'character/yijiang.js',
-		//'mode/identity.js',
+		'character/standard.js',
+		'character/swd.js',
+		'character/xianjian.js',
+		'character/xinghuoliaoyuan.js',
+		'character/yijiang.js',
+		'character/yxs.js',
+		'mode/identity.js',
 		//'mode/doudizhu.js',
-		//'mode/guozhan.js',
-		//'mode/single.js',
+		'mode/guozhan.js',
+		'mode/single.js',
 		//'mode/versus.js',
-		//'mode/boss.js',
-		//'game/game.js',
+		'mode/boss.js',
+		'game/game.js',
 		//'game/config.js',
 		//'game/package.js',
 		//'game/asset.js',