From 8ec101e40cfaf2e484c2372a1b4db8a6553994df Mon Sep 17 00:00:00 2001 From: libccy Date: Fri, 4 Dec 2015 18:18:00 +0800 Subject: [PATCH] jixi --- character/mountain.js | 3 +++ game/game.js | 16 +++++++++++++++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/character/mountain.js b/character/mountain.js index 6e5142d8c..c6dcd1566 100755 --- a/character/mountain.js +++ b/character/mountain.js @@ -559,6 +559,7 @@ character.mountain={ }; } else{ + player.addTempSkill('jixi_nouse','phaseAfter'); event.finish(); } "step 2" @@ -577,11 +578,13 @@ character.mountain={ order:10, result:{ player:function(player){ + if(player.skills.contains('jixi_nouse')) return 0; return player.storage.tuntian.length-1; } } } }, + jixi_nouse:{}, jiang:{ audio:2, trigger:{player:['shaBefore','juedouBefore'],target:['shaBefore','juedouBefore']}, diff --git a/game/game.js b/game/game.js index 746680ac4..197288826 100755 --- a/game/game.js +++ b/game/game.js @@ -2677,6 +2677,7 @@ } player.phaseDiscard() game.delayx(); + delete player._noSkill; }, phaseJudge:function(){ "step 0" @@ -3735,6 +3736,12 @@ player.stat[player.stat.length-1].skill[skill]++; } } + if(player.stat[player.stat.length-1].allSkills==undefined){ + player.stat[player.stat.length-1].allSkills=1; + } + else{ + player.stat[player.stat.length-1].allSkills++; + } "step 1" if(!event.skill){ console.log('error: no skill',get.translation(event.player),event.player.get('s')); @@ -3794,6 +3801,10 @@ event.redo(); } "step 2" + if(player.getStat().allSkills>200){ + player._noSkill=true; + console.log(player.name,event.skill); + } if(document.getElementsByClassName('thrown').length){ if(event.skill&&get.info(event.skill).delay!==0) game.delayx(); } @@ -18890,7 +18901,10 @@ return (j>0); } lib.temp={}; - cards=get.selectableCards().concat(get.skills()); + cards=get.selectableCards(); + if(!_status.event.player._noSkill){ + cards=cards.concat(get.skills()); + } cards2=cards.slice(0); cards.sort(function(a,b){ return (check(b,cards2)-check(a,cards2));