From 2667a9e58b0af8d2296c94462d524709babc1a9b Mon Sep 17 00:00:00 2001
From: libccy <widget@widgetdeMacBook-Pro.local>
Date: Mon, 27 Mar 2017 17:45:20 +0800
Subject: [PATCH] eq

---
 character/ow.js      |  2 +-
 character/swd.js     |  6 +++---
 character/yijiang.js | 12 ++++++------
 character/yxs.js     |  2 +-
 mode/boss.js         |  2 +-
 mode/guozhan.js      |  2 +-
 6 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/character/ow.js b/character/ow.js
index cf8f526a5..8c39c427f 100644
--- a/character/ow.js
+++ b/character/ow.js
@@ -2164,7 +2164,7 @@ character.ow={
 			direct:true,
 			content:function(){
 				"step 0"
-				var dis=trigger.target.countCards('h','shan')||trigger.target.num('e','bagua')||trigger.target.countCards('h')>2;
+				var dis=trigger.target.countCards('h','shan')||trigger.target.getEquip('bagua')||trigger.target.countCards('h')>2;
 				var next=player.chooseToDiscard(get.prompt('xiandan'));
 				next.ai=function(card){
 					if(dis) return 7-ai.get.value(card);
diff --git a/character/swd.js b/character/swd.js
index 9584a4e22..a948ddf5d 100644
--- a/character/swd.js
+++ b/character/swd.js
@@ -2735,7 +2735,7 @@ character.swd={
 					if(ui.discardPile.childNodes[i].name=='xuanyuanjian') return true;
 				}
 				return game.hasPlayer(function(current){
-					return current!=player&&current.num('e','xuanyuanjian');
+					return current!=player&&current.getEquip('xuanyuanjian');
 				});
 			},
 			content:function(){
@@ -2750,7 +2750,7 @@ character.swd={
 				}
 				else{
 					var target=game.findPlayer(function(current){
-						return current!=player&&current.num('e','xuanyuanjian');
+						return current!=player&&current.getEquip('xuanyuanjian');
 					});
 					if(target){
 						var card=target.getEquip('xuanyuanjian');
@@ -8589,7 +8589,7 @@ character.swd={
 			direct:true,
 			content:function(){
 				"step 0"
-				var dis=trigger.target.countCards('h','shan')||trigger.target.num('e','bagua')||trigger.target.countCards('h')>2;
+				var dis=trigger.target.countCards('h','shan')||trigger.target.getEquip('bagua')||trigger.target.countCards('h')>2;
 				var next=player.chooseToDiscard(get.prompt('shoulie',trigger.target));
 				next.ai=function(card){
 					if(dis) return 7-ai.get.value(card);
diff --git a/character/yijiang.js b/character/yijiang.js
index 3fadbae94..91da980de 100644
--- a/character/yijiang.js
+++ b/character/yijiang.js
@@ -1980,7 +1980,7 @@ character.yijiang={
 					var trigger=_status.event.getTrigger();
 					if(att>0&&eff>=0) return 1;
 					if(att>=0&&eff>0) return 1;
-					if(att>0&&(trigger.player.hp>=3||trigger.player.num('e','bagua')||trigger.player.countCards('h','shan'))){
+					if(att>0&&(trigger.player.hp>=3||trigger.player.getEquip('bagua')||trigger.player.countCards('h','shan'))){
 						if(name=='lebu'&&nh>trigger.player.hp) return 1;
 						if(name=='bingliang'&&nh<trigger.player.hp) return 1;
 					}
@@ -2079,7 +2079,7 @@ character.yijiang={
 			},
 			check:function(event,player){
 				if(ai.get.attitude(player,event.player)>=0) return false;
-				if(event.player.num('e','zhuge')) return false;
+				if(event.player.getEquip('zhuge')) return false;
 				if(event.player.hasSkill('paoxiao')) return false;
 				var players=game.filterPlayer();
 				for(var i=0;i<players.length;i++){
@@ -2278,7 +2278,7 @@ character.yijiang={
 						!trigger.player.hasSkill('tanlin3')&&
 						!trigger.player.hasSkill('zhaxiang2')&&
 						!trigger.player.hasSkill('fengnu')&&
-						!trigger.player.num('e','zhuge')){
+						!trigger.player.getEquip('zhuge')){
 						var nh=trigger.player.countCards('h');
 						if(player==trigger.player){
 							go=(player.countCards('h','sha')>0);
@@ -5898,7 +5898,7 @@ character.yijiang={
 					player:function(player){
 						if(_status.event.parent.name=='phaseUse'){
 							if(player.countCards('h','jiu')>0) return 0;
-							if(player.num('e','zhuge')&&player.countCards('h','sha')>1) return 0;
+							if(player.getEquip('zhuge')&&player.countCards('h','sha')>1) return 0;
 							if(!player.countCards('h','sha')) return 0;
 							var targets=[];
 							var target;
@@ -5928,14 +5928,14 @@ character.yijiang={
 							var e2=target.getEquip(2);
 							if(e2){
 								if(e2.name=='tengjia'){
-									if(!player.countCards('h',{name:'sha',nature:'fire'})&&!player.num('e','zhuque')) return 0;
+									if(!player.countCards('h',{name:'sha',nature:'fire'})&&!player.getEquip('zhuque')) return 0;
 								}
 								if(e2.name=='renwang'){
 									if(!player.countCards('h',{name:'sha',color:'red'})) return 0;
 								}
 								if(e2.name=='baiyin') return 0;
 							}
-							if(player.num('e','guanshi')&&player.countCards('he')>2) return 1;
+							if(player.getEquip('guanshi')&&player.countCards('he')>2) return 1;
 							return target.countCards('h')>3?0:1;
 						}
 						if(player==_status.event.dying||player.isTurnedOver()) return 3;
diff --git a/character/yxs.js b/character/yxs.js
index 91f2b0895..70baba4df 100644
--- a/character/yxs.js
+++ b/character/yxs.js
@@ -971,7 +971,7 @@ character.yxs={
 			},
 			check:function(event,player){
 				if(ai.get.attitude(player,event.target)>=0) return false;
-				if(event.target.num('e','bagua')) return false;
+				if(event.target.getEquip('bagua')) return false;
 				if(event.target.hasSkillTag('respondShan')&&event.target.countCards('h')>=3) return false;
 				return true;
 			},
diff --git a/mode/boss.js b/mode/boss.js
index 2131ba66e..95483b6c1 100644
--- a/mode/boss.js
+++ b/mode/boss.js
@@ -2443,7 +2443,7 @@ mode.boss={
 			filter:function(event,player){
 				var players=game.filterPlayer();
 				for(var i=0;i<players.length;i++){
-					if(players[i]!=player&&players[i].num('e','qinggang')){
+					if(players[i]!=player&&players[i].getEquip('qinggang')){
 						return true;
 					}
 				}
diff --git a/mode/guozhan.js b/mode/guozhan.js
index e90c313fd..c5e8fef48 100644
--- a/mode/guozhan.js
+++ b/mode/guozhan.js
@@ -538,7 +538,7 @@ mode.guozhan={
 							}
 						}
 						if(game.hasPlayer(function(current){
-							return current!=player&&current.num('e','feilongduofeng');
+							return current!=player&&current.getEquip('feilongduofeng');
 						})){
 							return true;
 						}