diff --git a/character/refresh.js b/character/refresh.js index b6d6c4a04..e013fc7ca 100644 --- a/character/refresh.js +++ b/character/refresh.js @@ -51,7 +51,7 @@ character.refresh={ if(player.hp==player.maxHp||player.storage.rerende<0||player.countCards('h')<=1){ var players=game.filterPlayer(); for(var i=0;i=3&& @@ -174,7 +174,7 @@ character.refresh={ var nh=target.countCards('h'); var np=player.countCards('h'); if(player.hp==player.maxHp||player.storage.rerende<0||player.countCards('h')<=1){ - if(nh>=np-1&&np<=player.hp&&!target.getSkills().contains('haoshi')) return 0; + if(nh>=np-1&&np<=player.hp&&!target.hasSkill('haoshi')) return 0; } return Math.max(1,5-nh); } diff --git a/character/shenhua.js b/character/shenhua.js index 0cc1de13c..67bd03416 100644 --- a/character/shenhua.js +++ b/character/shenhua.js @@ -2579,7 +2579,7 @@ character.shenhua={ mod:{ cardSavable:function(card,player){ if(!_status.currentPhase) return; - if(_status.currentPhase.getSkills().contains('wansha')&&_status.currentPhase!=player){ + if(_status.currentPhase.hasSkill('wansha')&&_status.currentPhase!=player){ if(card.name=='tao'&&_status.event.dying!=player) return false; } } diff --git a/character/sp.js b/character/sp.js index 6394c8924..26eb7aa3b 100644 --- a/character/sp.js +++ b/character/sp.js @@ -4786,7 +4786,7 @@ character.sp={ }, content:function(){ player.storage.mozhi.add(trigger.card); - if(player.getSkills().contains('mozhi')) player.markSkill('mozhi'); + if(player.hasSkill('mozhi')) player.markSkill('mozhi'); } }, chenqing2:{}, @@ -5760,7 +5760,7 @@ character.sp={ game.log(player,'的判定牌改为',player.storage.zhoufu2); game.delay(2); "step 1" - if(player.storage.zhoufu3.isAlive()&&player.storage.zhoufu3.getSkills().contains('yingbin')){ + if(player.storage.zhoufu3.isAlive()&&player.storage.zhoufu3.hasSkill('yingbin')){ player.storage.zhoufu3.logSkill('yingbin'); player.storage.zhoufu3.draw(2); } @@ -8034,7 +8034,7 @@ character.sp={ mod:{ targetEnabled:function(card,player,target){ if(card.name!='sha') return; - if(player==_status.currentPhase&&player.getSkills().contains('chixin')){ + if(player==_status.currentPhase&&player.hasSkill('chixin')){ var num=game.checkMod(card,player,1,'cardUsable',player.getSkills())-20; var players=game.filterPlayer(); for(var i=0;i=3&& @@ -548,7 +548,7 @@ character.standard={ var nh=target.countCards('h'); var np=player.countCards('h'); if(player.hp==player.maxHp||player.storage.rende<0||player.countCards('h')<=1){ - if(nh>=np-1&&np<=player.hp&&!target.getSkills().contains('haoshi')) return 0; + if(nh>=np-1&&np<=player.hp&&!target.hasSkill('haoshi')) return 0; } return Math.max(1,5-nh); } diff --git a/game/game.js b/game/game.js index 6388fd80e..2da14cdc2 100644 --- a/game/game.js +++ b/game/game.js @@ -38306,13 +38306,13 @@ } var mode=get.mode(); if(mode=='identity'){ - if(skill&&!game.zhu.getSkills().contains(skill)) return null; + if(skill&&!game.zhu.hasSkill(skill)) return null; if(game.zhu.isZhu) return game.zhu; } else if(mode=='versus'&&_status.mode=='four'){ for(var i=0;i=3&& @@ -1474,7 +1474,7 @@ mode.guozhan={ var nh=target.countCards('h'); var np=player.countCards('h'); if(player.hp==player.maxHp||player.storage.gzrende<0||player.countCards('h')+player.storage.gzrende<=2){ - if(nh>=np-1&&np<=player.hp&&!target.getSkills().contains('haoshi')) return 0; + if(nh>=np-1&&np<=player.hp&&!target.hasSkill('haoshi')) return 0; } return Math.max(1,5-nh); }