From aa284c639b58531a6c2f0fbf26b879eb52223001 Mon Sep 17 00:00:00 2001
From: Spmario233 <Spmario233@163.com>
Date: Tue, 13 Aug 2019 12:37:11 +0800
Subject: [PATCH] v1.9.91.5(Part 1)

---
 card/extra.js    | 5 +++--
 card/guozhan.js  | 5 ++++-
 card/standard.js | 9 +++++----
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/card/extra.js b/card/extra.js
index 7aa5fc3dc..1f64fc0a1 100644
--- a/card/extra.js
+++ b/card/extra.js
@@ -35,8 +35,8 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 						if(cards&&cards.length){
 							card=cards[0];
 						}
-						if(!player.storage.jiu) player.storage.jiu=0;
-						player.storage.jiu++;
+						if(!target.storage.jiu) target.storage.jiu=0;
+						target.storage.jiu++;
 						game.broadcastAll(function(target,card,gain2){
 							target.addSkill('jiu');
 							if(!target.node.jiu&&lib.config.jiu_effect){
@@ -79,6 +79,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 					result:{
 						target:function(player,target){
 							if(target&&target.isDying()) return 2;
+							if(target&&!target.isPhaseUsing()) return 0;
 							if(lib.config.mode=='stone'&&!player.isMin()){
 								if(player.getActCount()+1>=player.actcount) return 0;
 							}
diff --git a/card/guozhan.js b/card/guozhan.js
index 5fe738472..bd7d53afc 100644
--- a/card/guozhan.js
+++ b/card/guozhan.js
@@ -790,7 +790,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 				}
 			},
 			dinglanyemingzhu_skill:{
-				inherit:'gzzhiheng',
+				inherit:'zhiheng',
 				filter:function(event,player){
 					return !player.hasSkill('gzzhiheng');
 				},
@@ -798,6 +798,9 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 					var player=_status.event.player;
 					return [1,player.maxHp];
 				},
+				filterCard:function(card,player){
+					return card!=player.getEquip(5);
+				},
 				prompt:'出牌阶段限一次，你可以弃置至多X张牌（X为你的体力上限），然后摸等量的牌'
 			},
 			g_dinglanyemingzhu_ai:{
diff --git a/card/standard.js b/card/standard.js
index 0ed28f4cd..3a1e048ac 100644
--- a/card/standard.js
+++ b/card/standard.js
@@ -1140,7 +1140,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 					return game.hasPlayer(function(current){
 						if(current.getEquip(1)){
 							return game.hasPlayer(function(current2){
-								return lib.filter.filterTarget({name:'sha'},current,current2);
+								return lib.filter.targetInRange({name:'sha'},current,current2);
 							})
 						}
 					});
@@ -1150,7 +1150,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 						return (player!=target&&target.getCards('e',{subtype:'equip1'}).length);
 					}
 					else{
-						return lib.filter.filterTarget({name:'sha'},ui.selected.targets[0],target);
+						return lib.filter.targetInRange({name:'sha'},ui.selected.targets[0],target);
 					}
 				},
 				content:function(){
@@ -1638,8 +1638,9 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 						if(get.mode()!='guozhan') return;
 						if(!ui.selected.targets.length) return;
 						if(target.identity=='ye'||target.identity=='unknown') return;
-						for(var i=0;i<ui.selected.targets.length;i++){
-							if(target!=ui.selected.targets[i]&&target.identity==ui.selected.targets[i].identity){
+						var targets=ui.selected.targets.slice(0);
+						for(var i=0;i<targets.length;i++){
+							if(target!=targets[i]&&target.identity==targets[i].identity){
 								return false;
 							}
 						}