This commit is contained in:
libccy 2017-03-28 12:06:07 +08:00
parent 34c52f2bd0
commit 4f91401602
6 changed files with 13 additions and 13 deletions

View File

@ -51,7 +51,7 @@ character.refresh={
if(player.hp==player.maxHp||player.storage.rerende<0||player.countCards('h')<=1){ if(player.hp==player.maxHp||player.storage.rerende<0||player.countCards('h')<=1){
var players=game.filterPlayer(); var players=game.filterPlayer();
for(var i=0;i<players.length;i++){ for(var i=0;i<players.length;i++){
if(players[i].getSkills().contains('haoshi')&& if(players[i].hasSkill('haoshi')&&
!players[i].isTurnedOver()&& !players[i].isTurnedOver()&&
!players[i].hasJudge('lebu')&& !players[i].hasJudge('lebu')&&
ai.get.attitude(player,players[i])>=3&& ai.get.attitude(player,players[i])>=3&&
@ -174,7 +174,7 @@ character.refresh={
var nh=target.countCards('h'); var nh=target.countCards('h');
var np=player.countCards('h'); var np=player.countCards('h');
if(player.hp==player.maxHp||player.storage.rerende<0||player.countCards('h')<=1){ 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); return Math.max(1,5-nh);
} }

View File

@ -2579,7 +2579,7 @@ character.shenhua={
mod:{ mod:{
cardSavable:function(card,player){ cardSavable:function(card,player){
if(!_status.currentPhase) return; 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; if(card.name=='tao'&&_status.event.dying!=player) return false;
} }
} }

View File

@ -4786,7 +4786,7 @@ character.sp={
}, },
content:function(){ content:function(){
player.storage.mozhi.add(trigger.card); player.storage.mozhi.add(trigger.card);
if(player.getSkills().contains('mozhi')) player.markSkill('mozhi'); if(player.hasSkill('mozhi')) player.markSkill('mozhi');
} }
}, },
chenqing2:{}, chenqing2:{},
@ -5760,7 +5760,7 @@ character.sp={
game.log(player,'的判定牌改为',player.storage.zhoufu2); game.log(player,'的判定牌改为',player.storage.zhoufu2);
game.delay(2); game.delay(2);
"step 1" "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.logSkill('yingbin');
player.storage.zhoufu3.draw(2); player.storage.zhoufu3.draw(2);
} }
@ -8034,7 +8034,7 @@ character.sp={
mod:{ mod:{
targetEnabled:function(card,player,target){ targetEnabled:function(card,player,target){
if(card.name!='sha') return; 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 num=game.checkMod(card,player,1,'cardUsable',player.getSkills())-20;
var players=game.filterPlayer(); var players=game.filterPlayer();
for(var i=0;i<players.length;i++){ for(var i=0;i<players.length;i++){

View File

@ -504,7 +504,7 @@ character.standard={
} }
var players=game.filterPlayer(); var players=game.filterPlayer();
for(var i=0;i<players.length;i++){ for(var i=0;i<players.length;i++){
if(players[i].getSkills().contains('haoshi')&& if(players[i].hasSkill('haoshi')&&
!players[i].isTurnedOver()&& !players[i].isTurnedOver()&&
!players[i].hasJudge('lebu')&& !players[i].hasJudge('lebu')&&
ai.get.attitude(player,players[i])>=3&& ai.get.attitude(player,players[i])>=3&&
@ -548,7 +548,7 @@ character.standard={
var nh=target.countCards('h'); var nh=target.countCards('h');
var np=player.countCards('h'); var np=player.countCards('h');
if(player.hp==player.maxHp||player.storage.rende<0||player.countCards('h')<=1){ 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); return Math.max(1,5-nh);
} }

View File

@ -38306,13 +38306,13 @@
} }
var mode=get.mode(); var mode=get.mode();
if(mode=='identity'){ 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; if(game.zhu.isZhu) return game.zhu;
} }
else if(mode=='versus'&&_status.mode=='four'){ else if(mode=='versus'&&_status.mode=='four'){
for(var i=0;i<game.players.length;i++){ for(var i=0;i<game.players.length;i++){
if(game.players[i].isZhu){ if(game.players[i].isZhu){
if(skill&&!(game.players[i].getSkills().contains(skill))) continue; if(skill&&!(game.players[i].hasSkill(skill))) continue;
if(!player) return game.players[i]; if(!player) return game.players[i];
if(player.side==game.players[i].side){ if(player.side==game.players[i].side){
return game.players[i]; return game.players[i];
@ -38323,7 +38323,7 @@
else if(mode=='guozhan'){ else if(mode=='guozhan'){
for(var i=0;i<game.players.length;i++){ for(var i=0;i<game.players.length;i++){
if(get.is.jun(game.players[i])&&!game.players[i].isUnseen()){ if(get.is.jun(game.players[i])&&!game.players[i].isUnseen()){
if(skill&&!game.players[i].getSkills().contains(skill)) continue; if(skill&&!game.players[i].hasSkill(skill)) continue;
if(!player) return game.players[i]; if(!player) return game.players[i];
if(player.identity==game.players[i].identity){ if(player.identity==game.players[i].identity){
return game.players[i]; return game.players[i];

View File

@ -1431,7 +1431,7 @@ mode.guozhan={
} }
var players=game.filterPlayer(); var players=game.filterPlayer();
for(var i=0;i<players.length;i++){ for(var i=0;i<players.length;i++){
if(players[i].getSkills().contains('haoshi')&& if(players[i].hasSkill('haoshi')&&
!players[i].isTurnedOver()&& !players[i].isTurnedOver()&&
!players[i].hasJudge('lebu')&& !players[i].hasJudge('lebu')&&
ai.get.attitude(player,players[i])>=3&& ai.get.attitude(player,players[i])>=3&&
@ -1474,7 +1474,7 @@ mode.guozhan={
var nh=target.countCards('h'); var nh=target.countCards('h');
var np=player.countCards('h'); var np=player.countCards('h');
if(player.hp==player.maxHp||player.storage.gzrende<0||player.countCards('h')+player.storage.gzrende<=2){ 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); return Math.max(1,5-nh);
} }