From d0f0c0b4319d495ce262edc0c2c4bc5f14f4e729 Mon Sep 17 00:00:00 2001
From: libccy <operawidget@163.com>
Date: Thu, 20 Jul 2017 09:56:12 +0800
Subject: [PATCH] v1.9.32

---
 character/sp.js | 28 ++++++++++++++++++++++++++++
 game/game.js    | 18 ++++++++++++------
 2 files changed, 40 insertions(+), 6 deletions(-)

diff --git a/character/sp.js b/character/sp.js
index b18b9bf3e..bffde43c9 100644
--- a/character/sp.js
+++ b/character/sp.js
@@ -564,6 +564,24 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 					}
                 }
             },
+            fuqi:{
+                mod:{
+                    wuxieRespondable:function(card,player,target,current){
+                        if(player!=current&&get.distance(player,current)<=1){
+                            return false;
+                        }
+                    }
+                },
+                ai:{
+                    norespond:true,
+                    skillTagFilter:function(player,tag,arg){
+                        if(tag=='norespond'&&Array.isArray(arg)){
+                            if(get.distance(player,arg[1])<=1) return true;
+                        }
+                        return false;
+                    }
+                }
+            },
             wylianji:{
                 enable:'phaseUse',
                 usable:1,
@@ -3956,6 +3974,16 @@ game.import('character',function(lib,game,ui,get,ai,_status){
                     }
     			}
     		},
+			jiaozi:{
+				trigger:{player:'damageBegin',source:'damageBegin'},
+				forced:true,
+				filter:function(event,player){
+					return player.isMaxHandcard(true);
+				},
+                content:function(){
+                    trigger.num++;
+                }
+			},
     		jiqiao:{
     			trigger:{player:'phaseUseBegin'},
     			direct:true,
diff --git a/game/game.js b/game/game.js
index f8091fb8b..1d7fda82a 100644
--- a/game/game.js
+++ b/game/game.js
@@ -16910,7 +16910,7 @@
                 },
 				isMaxHp:function(equal){
 					for(var i=0;i<game.players.length;i++){
-						if(game.players[i].isOut()) continue;
+						if(game.players[i].isOut()||game.players[i]==this) continue;
 						if(equal){
 							if(game.players[i].hp>=this.hp) return false;
 						}
@@ -16922,7 +16922,7 @@
 				},
 				isMinHp:function(equal){
 					for(var i=0;i<game.players.length;i++){
-						if(game.players[i].isOut()) continue;
+						if(game.players[i].isOut()||game.players[i]==this) continue;
 						if(equal){
 							if(game.players[i].hp<=this.hp) return false;
 						}
@@ -16935,7 +16935,7 @@
 				isMaxCard:function(equal){
 					var nh=this.countCards('he');
 					for(var i=0;i<game.players.length;i++){
-						if(game.players[i].isOut()) continue;
+						if(game.players[i].isOut()||game.players[i]==this) continue;
 						if(equal){
 							if(game.players[i].countCards('he')>=nh) return false;
 						}
@@ -16948,7 +16948,7 @@
 				isMinCard:function(equal){
 					var nh=this.countCards('he');
 					for(var i=0;i<game.players.length;i++){
-						if(game.players[i].isOut()) continue;
+						if(game.players[i].isOut()||game.players[i]==this) continue;
 						if(equal){
 							if(game.players[i].countCards('he')<=nh) return false;
 						}
@@ -16961,7 +16961,7 @@
 				isMaxHandcard:function(equal){
 					var nh=this.countCards('h');
 					for(var i=0;i<game.players.length;i++){
-						if(game.players[i].isOut()) continue;
+						if(game.players[i].isOut()||game.players[i]==this) continue;
 						if(equal){
 							if(game.players[i].countCards('h')>=nh) return false;
 						}
@@ -16974,7 +16974,7 @@
 				isMinHandcard:function(equal){
 					var nh=this.countCards('h');
 					for(var i=0;i<game.players.length;i++){
-						if(game.players[i].isOut()) continue;
+						if(game.players[i].isOut()||game.players[i]==this) continue;
 						if(equal){
 							if(game.players[i].countCards('h')<=nh) return false;
 						}
@@ -19706,6 +19706,12 @@
 			},
 			cardRespondable:function(card,player){
 				if(_status.event.name!='chooseToRespond') return true;
+				var source=_status.event.getParent().player;
+				if(source!=player){
+					if(source.hasSkillTag('norespond',false,[card,player],true)){
+						return false;
+					}
+				}
 				if(player==undefined) player=_status.event.player;
 				var mod=game.checkMod(card,player,'unchanged','cardRespondable',player);
 				if(mod!='unchanged') return mod;