From b0d606b27df0a4f6f3d90ec9819c575b4fae06ac Mon Sep 17 00:00:00 2001 From: libccy Date: Sat, 25 Mar 2017 23:36:28 +0800 Subject: [PATCH] jq --- character/diy.js | 2 +- character/extra.js | 6 +++--- character/gujian.js | 4 ++-- character/hearth.js | 14 +++++++------- character/refresh.js | 8 ++++---- character/shenhua.js | 10 +++++----- character/sp.js | 2 +- character/standard.js | 8 ++++---- character/swd.js | 14 +++++++------- character/yijiang.js | 13 ++++++++----- character/yxs.js | 8 ++++---- mode/guozhan.js | 2 +- 12 files changed, 47 insertions(+), 44 deletions(-) diff --git a/character/diy.js b/character/diy.js index 500ba3182..a1070affc 100644 --- a/character/diy.js +++ b/character/diy.js @@ -960,7 +960,7 @@ character.diy={ result:{ target:function(card,player,target,current){ if(target.hp<=1&&get.tag(card,'damage')){ - if(player.hasSkill('jueqing')) return [1,-5]; + if(player.hasSkillTag('jueqing')) return [1,-5]; return [1,0,0,-2]; } } diff --git a/character/extra.js b/character/extra.js index 21d311fb5..786c54ba1 100644 --- a/character/extra.js +++ b/character/extra.js @@ -246,7 +246,7 @@ character.extra={ maixie_hp:true, effect:{ target:function(card,player,target){ - if(player.hasSkill('jueqing')) return [1,-2]; + if(player.hasSkillTag('jueqing')) return [1,-2]; if(get.tag(card,'damage')){ if(target.hp==target.maxHp){ if(!target.hasSkill('jilue')){ @@ -499,7 +499,7 @@ character.extra={ effect:{ target:function(card,player,target,current){ if(target.hp<=1&&get.tag(card,'damage')){ - if(player.hasSkill('jueqing')) return [1,-5]; + if(player.hasSkillTag('jueqing')) return [1,-5]; if(!target.hasFriend()) return; if(player.hp>2&&ai.get.attitude(player,target)<=0) return [0,2]; return [1,0,0,-player.hp]; @@ -571,7 +571,7 @@ character.extra={ effect:{ target:function(card,player,target){ if(get.tag(card,'damage')){ - if(player.hasSkill('jueqing')) return [1,-2]; + if(player.hasSkillTag('jueqing')) return [1,-2]; if(target.hp==1) return 0.8; if(target.isTurnedOver()) return [0,3]; var num=game.countPlayer(function(current){ diff --git a/character/gujian.js b/character/gujian.js index 3a48ef0f0..b7f14559c 100644 --- a/character/gujian.js +++ b/character/gujian.js @@ -730,7 +730,7 @@ character.gujian={ effect:{ target:function(card,player,target){ if(get.tag(card,'damage')){ - if(player.hasSkill('jueqing')) return [1,-1.5]; + if(player.hasSkillTag('jueqing')) return [1,-1.5]; return [1,0,0,-0.5]; } } @@ -877,7 +877,7 @@ character.gujian={ effect:{ target:function(card,player,target){ if(get.tag(card,'damage')&&target.num('h')==0){ - if(player.hasSkill('jueqing')) return; + if(player.hasSkillTag('jueqing')) return; return 0.1; } } diff --git a/character/hearth.js b/character/hearth.js index 7ed94de2f..ad8dd0cfd 100644 --- a/character/hearth.js +++ b/character/hearth.js @@ -740,7 +740,7 @@ character.hearth={ effect:{ target:function(card,player,target){ if(get.tag(card,'damage')){ - if(player.hasSkill('jueqing')) return; + if(player.hasSkillTag('jueqing')) return; return 0.5; } } @@ -849,7 +849,7 @@ character.hearth={ effect:{ target:function(card,player,target){ if(get.tag(card,'damage')){ - if(player.hasSkill('jueqing')) return [1,-2]; + if(player.hasSkillTag('jueqing')) return [1,-2]; if(!target.hasFriend()) return; if(target.hp>=4) return [1,get.tag(card,'damage')*2]; if(target.hp==3) return [1,get.tag(card,'damage')*1.5]; @@ -1177,7 +1177,7 @@ character.hearth={ maixie_hp:true, effect:{ target:function(card,player,target){ - if(player.hasSkill('jueqing')) return [1,-2]; + if(player.hasSkillTag('jueqing')) return [1,-2]; if(!target.hasFriend()) return false; if(get.tag(card,'damage')&&player.num('h')>1) return [1,0,0,-1]; } @@ -2851,7 +2851,7 @@ character.hearth={ effect:{ target:function(card,player,target){ if(get.tag(card,'damage')){ - if(player.hasSkill('jueqing')) return [1,-2]; + if(player.hasSkillTag('jueqing')) return [1,-2]; if(!target.hasFriend()) return; var nh=target.num('h'); if(nh>5) return [1,-1]; @@ -3975,7 +3975,7 @@ character.hearth={ effect:{ target:function(card,player){ if(get.tag(card,'damage')){ - if(player.hasSkill('jueqing')) return [1,-1]; + if(player.hasSkillTag('jueqing')) return [1,-1]; return 0.8; } } @@ -4892,7 +4892,7 @@ character.hearth={ ai:{ effect:function(card,player){ if(get.tag(card,'damage')){ - if(player.hasSkill('jueqing')) return [1,1]; + if(player.hasSkillTag('jueqing')) return [1,1]; return 1.2; } }, @@ -5047,7 +5047,7 @@ character.hearth={ }, effect:function(card,player){ if(get.tag(card,'damage')){ - if(player.hasSkill('jueqing')) return; + if(player.hasSkillTag('jueqing')) return; return 1.2; } }, diff --git a/character/refresh.js b/character/refresh.js index df402ba04..9996e0660 100644 --- a/character/refresh.js +++ b/character/refresh.js @@ -377,7 +377,7 @@ character.refresh={ effect:{ target:function(card,player,target){ if(player.num('he')>1&&get.tag(card,'damage')){ - if(player.hasSkill('jueqing')) return [1,-1.5]; + if(player.hasSkillTag('jueqing')) return [1,-1.5]; if(ai.get.attitude(target,player)<0) return [1,1]; } } @@ -880,7 +880,7 @@ character.refresh={ maixie_hp:true, effect:{ target:function(card,player,target){ - if(player.hasSkill('jueqing')) return [1,-1]; + if(player.hasSkillTag('jueqing')) return [1,-1]; if(get.tag(card,'damage')&&player!=target) return [1,0.6]; } } @@ -960,7 +960,7 @@ character.refresh={ result:{ effect:function(card,player,target){ if(get.tag(card,'damage')){ - if(player.hasSkill('jueqing')) return [1,-2]; + if(player.hasSkillTag('jueqing')) return [1,-2]; if(player.hp>=4) return [1,get.tag(card,'damage')*2]; if(target.hp==3) return [1,get.tag(card,'damage')*1.5]; if(target.hp==2) return [1,get.tag(card,'damage')*0.5]; @@ -1162,7 +1162,7 @@ character.refresh={ }, effect:function(card,player){ if(get.tag(card,'damage')){ - if(player.hasSkill('jueqing')) return [1,1]; + if(player.hasSkillTag('jueqing')) return [1,1]; return 1.2; } if(get.tag(card,'loseHp')){ diff --git a/character/shenhua.js b/character/shenhua.js index 393e5bc7d..2746a3ded 100644 --- a/character/shenhua.js +++ b/character/shenhua.js @@ -1948,7 +1948,7 @@ character.shenhua={ effect:{ target:function(card,player,target){ if(get.tag(card,'damage')){ - if(player.hasSkill('jueqing')) return [1,-2]; + if(player.hasSkillTag('jueqing')) return [1,-2]; if(target.hp<=1) return; if(!target.hasFriend()) return; var hastarget=false; @@ -2862,7 +2862,7 @@ character.shenhua={ return 0; }, player:function(player,target){ - if(target.hasSkill('jueqing')) return -10; + if(target.hasSkillTag('jueqing')) return -10; var mn=1; var hs=player.get('h'); for(var i=0;i1){ - if(player.hasSkill('jueqing')) return [1,-2]; + if(player.hasSkillTag('jueqing')) return [1,-2]; var max=0; var players=game.filterPlayer(); for(var i=0;i1) return 0.7; } }, @@ -3638,7 +3638,7 @@ character.shenhua={ ai:{ effect:{ target:function(card,player,target){ - if(player.hasSkill('jueqing')) return; + if(player.hasSkillTag('jueqing')) return; if(get.tag(card,'damage')&&target.num('he')>1) return 0.7; } }, diff --git a/character/sp.js b/character/sp.js index 46bcacb83..d1a1c4ff2 100644 --- a/character/sp.js +++ b/character/sp.js @@ -1669,7 +1669,7 @@ character.sp={ effect:{ target:function(card,player,target,current){ if(get.tag(card,'damage')){ - if(player.hasSkill('jueqing')) return [1,-2]; + if(player.hasSkillTag('jueqing')) return [1,-2]; if(ai.get.attitude(player,target)>0) return [0,0]; var eff=ai.get.damageEffect(target.storage.shichou_target,player,target); if(eff>0){ diff --git a/character/standard.js b/character/standard.js index 7fc96b06f..fa8346af1 100644 --- a/character/standard.js +++ b/character/standard.js @@ -143,7 +143,7 @@ character.standard={ maixie_hp:true, effect:{ target:function(card,player){ - if(player.hasSkill('jueqing')) return [1,-1]; + if(player.hasSkillTag('jueqing')) return [1,-1]; if(get.tag(card,'damage')) return [1,0.5]; } } @@ -163,7 +163,7 @@ character.standard={ effect:{ target:function(card,player,target){ if(player.num('he')>1&&get.tag(card,'damage')){ - if(player.hasSkill('jueqing')) return [1,-1.5]; + if(player.hasSkillTag('jueqing')) return [1,-1.5]; if(ai.get.attitude(target,player)<0) return [1,1]; } } @@ -260,7 +260,7 @@ character.standard={ ai:{ result:{ target:function(card,player,target){ - if(player.hasSkill('jueqing')) return [1,-1]; + if(player.hasSkillTag('jueqing')) return [1,-1]; if(get.tag(card,'damage')&&ai.get.damageEffect(target,player,player)>0) return [1,0,0,-1.5]; } } @@ -403,7 +403,7 @@ character.standard={ effect:{ target:function(card,player,target){ if(get.tag(card,'damage')){ - if(player.hasSkill('jueqing')) return [1,-2]; + if(player.hasSkillTag('jueqing')) return [1,-2]; if(!target.hasFriend()) return; if(target.hp>=4) return [1,get.tag(card,'damage')*2]; if(target.hp==3) return [1,get.tag(card,'damage')*1.5]; diff --git a/character/swd.js b/character/swd.js index 69992e1bd..e43b74871 100644 --- a/character/swd.js +++ b/character/swd.js @@ -1998,7 +1998,7 @@ character.swd={ effect:{ target:function(card,player){ if(get.tag(card,'damage')){ - if(player.hasSkill('jueqing')) return [1,-2]; + if(player.hasSkillTag('jueqing')) return [1,-2]; return 0.7; } } @@ -2709,7 +2709,7 @@ character.swd={ maixie_hp:true, effect:function(card,player,target){ if(get.tag(card,'damage')){ - if(player.hasSkill('jueqing')) return [1,-0.5]; + if(player.hasSkillTag('jueqing')) return [1,-0.5]; if(!target.hasFriend()){ if(lib.config.mode=='guozhan'){ if(!player.hasFriend()) return; @@ -2940,7 +2940,7 @@ character.swd={ effect:{ target:function(card,player,target){ if(get.tag(card,'damage')){ - if(player.hasSkill('jueqing')) return [1,-1.5]; + if(player.hasSkillTag('jueqing')) return [1,-1.5]; if(player.hp>=4) return [1,1.5]; if(target.hp==3) return [1,1]; if(target.hp==2) return [1,0.5]; @@ -5118,7 +5118,7 @@ character.swd={ effect:{ target:function(card,player,target){ if(get.tag(card,'damage')){ - if(player.hasSkill('jueqing')) return [1,-2]; + if(player.hasSkillTag('jueqing')) return [1,-2]; if(target.storage.yishan.length==0) return 1.5; if(target.storage.yishan[0]=='tao'||target.storage.yishan[1]=='tao'){ return [0,2]; @@ -5402,7 +5402,7 @@ character.swd={ effect:{ target:function(card,player,target){ if(get.tag(card,'damage')){ - if(player.hasSkill('jueqing')) return; + if(player.hasSkillTag('jueqing')) return; if(target.storage.daixing>1) return 0.1; if(target.storage.daixing==1) return 0.5; } @@ -6025,7 +6025,7 @@ character.swd={ effect:{ target:function(card,player,target){ if(get.tag(card,'damage')){ - if(player.hasSkill('jueqing')) return [1,-1]; + if(player.hasSkillTag('jueqing')) return [1,-1]; var num=player.num('h')-target.num('h'); if(num>0){ return [1,0,0,-num/2]; @@ -6267,7 +6267,7 @@ character.swd={ effect:{ target:function(card,player,target){ if(get.tag(card,'damage')&&_status.currentPhase!=target){ - if(player.hasSkill('jueqing')) return [1,-1.5]; + if(player.hasSkillTag('jueqing')) return [1,-1.5]; return [1,0.5]; } } diff --git a/character/yijiang.js b/character/yijiang.js index 7b7930fcb..fc71c8ad2 100644 --- a/character/yijiang.js +++ b/character/yijiang.js @@ -4804,7 +4804,7 @@ character.yijiang={ effect:{ target:function(card,player,target){ if(get.tag(card,'damage')){ - if(player.hasSkill('jueqing')) return [1,-2]; + if(player.hasSkillTag('jueqing')) return [1,-2]; if(!target.hasFriend()) return; if(target.hp>=4) return [0.5,get.tag(card,'damage')*2]; if(!target.hasSkill('paiyi')&&target.hp>1) return [0.5,get.tag(card,'damage')*1.5]; @@ -5783,6 +5783,9 @@ character.yijiang={ if(player.hasSkill('reluoyi2')) ex++; } trigger.player.loseHp(trigger.num+ex); + }, + ai:{ + jueqing:true } }, shangshi:{ @@ -5943,7 +5946,7 @@ character.yijiang={ if(card.name=='guiyoujie') return [0,0.5]; if(target.isTurnedOver()){ if(get.tag(card,'damage')){ - if(player.hasSkill('jueqing')) return [1,-2]; + if(player.hasSkillTag('jueqing')) return [1,-2]; if(target.hp==1) return; return [1,target.num('h')/2]; } @@ -6430,7 +6433,7 @@ character.yijiang={ ai:{ effect:{ target:function(card,player,target){ - if(player.hasSkill('jueqing')) return [1,-1.5]; + if(player.hasSkillTag('jueqing')) return [1,-1.5]; if(!target.hasFriend()) return; if(get.tag(card,'damage')) return [1,0,0,-0.7]; } @@ -6457,7 +6460,7 @@ character.yijiang={ ai:{ effect:{ target:function(card,player,target){ - if(player.hasSkill('jueqing')) return [1,-2]; + if(player.hasSkillTag('jueqing')) return [1,-2]; if(!target.hasFriend()) return; if(get.tag(card,'damage')) return [1,0,0,-1]; } @@ -6800,7 +6803,7 @@ character.yijiang={ effect:{ target:function(card,player,target){ if(get.tag(card,'damage')){ - if(player.hasSkill('jueqing')) return [1,-2]; + if(player.hasSkillTag('jueqing')) return [1,-2]; if(!target.hasFriend()) return; if(target.hp>=4) return [1,2]; if(target.hp==3) return [1,1.5]; diff --git a/character/yxs.js b/character/yxs.js index 8d4a38f58..1d765c62b 100644 --- a/character/yxs.js +++ b/character/yxs.js @@ -533,7 +533,7 @@ character.yxs={ effect:{ target:function(card,player,target){ if(get.tag(card,'damage')){ - if(player.hasSkill('jueqing')) return [1,-2]; + if(player.hasSkillTag('jueqing')) return [1,-2]; if(!target.hasFriend()) return; var players=game.filterPlayer(); for(var i=0;i=4) return [1,get.tag(card,'damage')*2]; if(target.hp==3) return [1,get.tag(card,'damage')*1.5]; @@ -2012,7 +2012,7 @@ character.yxs={ effect:{ target:function(card,player,target){ if(get.tag(card,'damage')){ - if(player.hasSkill('jueqing')) return [1,-2]; + if(player.hasSkillTag('jueqing')) return [1,-2]; if(!target.hasFriend()) return; if(target.hp>=4) return [1,2]; if(target.hp==3) return [1,1.5]; @@ -2178,7 +2178,7 @@ character.yxs={ result:{ target:function(card,player,target){ if(player.num('he')>1&&get.tag(card,'damage')){ - if(player.hasSkill('jueqing')) return [1,-1]; + if(player.hasSkillTag('jueqing')) return [1,-1]; if(ai.get.attitude(target,player)<0) return [1,0,0,-1.5]; } } diff --git a/mode/guozhan.js b/mode/guozhan.js index 029501a9d..c8abb7a60 100644 --- a/mode/guozhan.js +++ b/mode/guozhan.js @@ -1199,7 +1199,7 @@ mode.guozhan={ ai:{ effect:{ target:function(card,player,target){ - if(player.hasSkill('jueqing')) return; + if(player.hasSkillTag('jueqing')) return; if(!player.isUnseen(2)) return; var num=get.tag(card,'damage'); if(num){