diff --git a/card/extra.js b/card/extra.js index d540cde1f..7f9f7b4c4 100644 --- a/card/extra.js +++ b/card/extra.js @@ -155,7 +155,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){ target.damage('fire'); } else{ - target.addTempSkill('huogong2','phaseBegin'); + target.addTempSkill('huogong2'); } event.dialog.close(); game.addVideo('cardDialog',null,event.videoId); diff --git a/card/gujian.js b/card/gujian.js index a8e2a1d5b..23c988076 100644 --- a/card/gujian.js +++ b/card/gujian.js @@ -183,7 +183,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){ target.storage.xiajiao=card; target.storage.xiajiao_markcount=3; target.addSkill('xiajiao'); - target.addTempSkill('xiajiao3','phaseAfter'); + target.addTempSkill('xiajiao3'); }, ai:{ order:2, @@ -589,7 +589,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){ "step 4" if(cards&&cards.length){ player.gain(cards,'gain2'); - target.addTempSkill('bingpotong','phaseAfter'); + target.addTempSkill('bingpotong'); } }, ai:{ @@ -964,7 +964,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){ else{ player.updateMarks(); } - player.addTempSkill('xiajiao3','phaseAfter'); + player.addTempSkill('xiajiao3'); }, group:'xiajiao_draw', subSkill:{ @@ -973,7 +973,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){ forced:true, content:function(){ trigger.num++; - player.addTempSkill('xiajiao2','phaseAfter'); + player.addTempSkill('xiajiao2'); } } } @@ -1397,7 +1397,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){ } if(card.storage.yuheng>=3){ card.init([card.suit,card.number,'yuheng_plus',card.nature]); - player.addTempSkill('yuheng_plus_temp','phaseAfter'); + player.addTempSkill('yuheng_plus_temp'); } } }, diff --git a/card/guozhan.js b/card/guozhan.js index 101a85595..20e14b03e 100644 --- a/card/guozhan.js +++ b/card/guozhan.js @@ -305,7 +305,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){ return target!=player; }, content:function(){ - target.addTempSkill('diaohulishan','phaseAfter'); + target.addTempSkill('diaohulishan'); }, ai:{ order:10, diff --git a/card/gwent.js b/card/gwent.js index c63e7fdf9..776bc2742 100644 --- a/card/gwent.js +++ b/card/gwent.js @@ -783,7 +783,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){ var dialog=ui.create.dialog('卜天术',[list,'vcard']); var bing=target.countCards('h')<=1; player.chooseButton(dialog,true,function(button){ - if(ai.get.effect(target,{name:button.link[2]},player,player)>0){ + if(get.effect(target,{name:button.link[2]},player,player)>0){ if(button.link[2]=='bingliang'){ if(bing) return 2; return 0.7; @@ -819,7 +819,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){ var eff=0; for(var i in lib.card){ if(lib.card[i].type=='delay'){ - var current=ai.get.effect(target,{name:i},player,player); + var current=get.effect(target,{name:i},player,player); if(current>eff){ eff=current; } @@ -1100,7 +1100,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){ useful:[4,1], result:{ target:function(player,target){ - var threaten=ai.get.threaten(target,player,true); + var threaten=get.threaten(target,player,true); if(target.hujia){ threaten*=(target.hujia+1); } diff --git a/card/hearth.js b/card/hearth.js index 292d91257..b1b60fcca 100644 --- a/card/hearth.js +++ b/card/hearth.js @@ -50,7 +50,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){ modTarget:true, content:function(){ if(_status.currentPhase==target){ - target.addTempSkill('jihuocard2','phaseAfter'); + target.addTempSkill('jihuocard2'); } target.draw(); }, @@ -221,7 +221,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){ target.damage('thunder'); } else{ - target.addTempSkill('huogong2','phaseBegin'); + target.addTempSkill('huogong2'); } game.addVideo('cardDialog',null,event.videoId); event.dialog.close(); @@ -287,7 +287,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){ }, selectTarget:-1, content:function(){ - player.addTempSkill('shihuawuqi','phaseAfter'); + player.addTempSkill('shihuawuqi'); if(!player.countCards('h','sha')){ var card=get.cardPile('sha'); if(card){ @@ -397,10 +397,10 @@ game.import('card',function(lib,game,ui,get,ai,_status){ 'step 1' if(result.bool&&!target.hasSkill('chuansongmen3')){ if(target.hasSkill('chuansongmen2')){ - target.addTempSkill('chuansongmen3','phaseAfter'); + target.addTempSkill('chuansongmen3'); } else{ - target.addTempSkill('chuansongmen2','phaseAfter'); + target.addTempSkill('chuansongmen2'); } target.gain(cards,'gain2'); } diff --git a/card/sp.js b/card/sp.js index 0be0349eb..ca29b5536 100644 --- a/card/sp.js +++ b/card/sp.js @@ -416,7 +416,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){ }, effect:function(){ if(result.bool==false){ - player.addTempSkill('caomu_skill','phaseAfter'); + player.addTempSkill('caomu_skill'); } }, ai:{ diff --git a/card/standard.js b/card/standard.js index 2e57e6280..a250a05a1 100644 --- a/card/standard.js +++ b/card/standard.js @@ -1016,7 +1016,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){ } } if(target.getEquip('baiyin')&&target.isDamaged()&& - ai.get.recoverEffect(target,player,player)>0){ + get.recoverEffect(target,player,player)>0){ if(target.hp==1&&!target.hujia) return 1.6; if(target.hp==2) return 0.01; return 0; diff --git a/card/swd.js b/card/swd.js index c95b39ed9..009111495 100644 --- a/card/swd.js +++ b/card/swd.js @@ -48,7 +48,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){ else{ player.$gain2(event.card1); target.$gain2(event.card2); - target.addTempSkill('dujian2','phaseBegin'); + target.addTempSkill('dujian2'); } ui.arena.classList.remove('thrownhighlight'); game.addVideo('thrownhighlight2'); @@ -1790,7 +1790,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){ }, content:function(){ player.storage.zhufangshenshi=target; - player.addTempSkill('zhufangshenshi','phaseAfter'); + player.addTempSkill('zhufangshenshi'); }, ai:{ value:4, @@ -2255,7 +2255,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){ },trigger.player,-1).set('cardname',trigger.card.name).targetRequired=true; 'step 1' if(result.bool){ - player.addTempSkill('shenmiguo2','phaseAfter'); + player.addTempSkill('shenmiguo2'); } delete player.storage.shenmiguo; } @@ -2900,7 +2900,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){ if(!hu.storage.shouna){ hu.storage.shouna=[]; } - player.addTempSkill('shouna2','phaseAfter'); + player.addTempSkill('shouna2'); player.$gain2(cards); for(var i=0;i=2){ - player.addTempSkill('shewu_dist','phaseAfter'); + player.addTempSkill('shewu_dist'); } if(cards.length==3){ player.recover(); @@ -998,7 +1040,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ game.asyncDrawAuto(result.targets,function(current){ return current==player?1:2; }); - player.addTempSkill('huandie_discard','phaseAfter'); + player.addTempSkill('huandie_discard'); } }, ai:{ @@ -1436,6 +1478,8 @@ game.import('character',function(lib,game,ui,get,ai,_status){ gw_zhangyujushou:'章鱼巨兽', gw_zhuoertan:'卓尔坦', + lingji:'灵计', + lingji_info:'出牌阶段限一次,你可以摸两张牌并弃置两张牌,若弃置的牌花色相同,你获得一张随机铜卡;若弃置的牌点数相同,你获得一张随机银卡', gwjinyan:'金焰', gwjinyan_info:'锁定技,准备阶段,若游戏轮数为3的倍数,你获得一张随机金卡;你的体力值不能小于X,X为游戏轮数除3的余数', gwshenyu:'神愈', diff --git a/character/hearth.js b/character/hearth.js index e66bfba10..ed74b31be 100644 --- a/character/hearth.js +++ b/character/hearth.js @@ -867,7 +867,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ var list=get.inpile('trick','trick'); player.gain(game.createCard(list.randomGet()),'draw'); if(player.storage.counttrigger&&player.storage.counttrigger.lieyang>=3){ - player.addTempSkill('lieyang2','phaseAfter'); + player.addTempSkill('lieyang2'); } }, ai:{ @@ -3415,7 +3415,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ forced:true, content:function(){ player.gain(game.createCard(trigger.card),'gain2'); - trigger.player.addTempSkill('yiwen2','phaseAfter'); + trigger.player.addTempSkill('yiwen2'); }, ai:{ threaten:0.7 @@ -5272,7 +5272,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ }, content:function(){ trigger.player.recover(); - player.addTempSkill('shengyan2','phaseAfter'); + player.addTempSkill('shengyan2'); }, ai:{ expose:0.2 @@ -5383,7 +5383,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ 'step 0' if(!event.isMine()) game.delay(0.5); 'step 1' - player.addTempSkill('fengxing2','phaseAfter'); + player.addTempSkill('fengxing2'); player.chooseToDiscard('he',get.prompt('fengxing')).set('ai',function(card){ return 7-get.value(card); }).logSkill='fengxing'; @@ -5757,7 +5757,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ ui.discardPile.appendChild(player.storage.bingjia); delete player.storage.bingjia; player.changeHujia(); - player.addTempSkill('mianyi','phaseAfter'); + player.addTempSkill('mianyi'); }, intro:{ mark:function(dialog,content,player){ @@ -6163,7 +6163,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ target.discard(cs.randomGet()); } target.damage('thunder'); - player.addTempSkill('tzhenji2','phaseAfter'); + player.addTempSkill('tzhenji2'); } }, ai:{ diff --git a/character/jiange.js b/character/jiange.js index fbfad043a..ffd9959e9 100644 --- a/character/jiange.js +++ b/character/jiange.js @@ -144,7 +144,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ forced:true, popup:false, content:function(){ - player.addTempSkill('huodi3','phaseAfter'); + player.addTempSkill('huodi3'); } }, huodi3:{}, diff --git a/character/old.js b/character/old.js index 65b434aac..8d38e7f6e 100644 --- a/character/old.js +++ b/character/old.js @@ -54,7 +54,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ trigger.result={bool:true,card:{name:'sha'}} } player.logSkill('zhenshan',result.targets); - player.addTempSkill('zhenshan2','phaseAfter'); + player.addTempSkill('zhenshan2'); player.swapHandcards(result.targets[0]); } }, @@ -123,7 +123,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ },true).ai=function(target){ return get.attitude(player,target); } - player.addTempSkill('zhenshan2','phaseAfter'); + player.addTempSkill('zhenshan2'); 'step 1' if(result.bool){ player.logSkill('zhenshan',result.targets); diff --git a/character/ow.js b/character/ow.js index efa4ff998..bd0cd1509 100644 --- a/character/ow.js +++ b/character/ow.js @@ -311,7 +311,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ var target=result.targets[0]; player.logSkill('feitiao',target); player.storage.feitiao2=target; - player.addTempSkill('feitiao2','phaseAfter'); + player.addTempSkill('feitiao2'); target.randomDiscard(); } @@ -358,7 +358,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ if(player.marks.zhencha){ player.marks.zhencha.firstChild.innerHTML='侦'; } - player.addTempSkill('zhencha2','phaseAfter'); + player.addTempSkill('zhencha2'); }, subSkill:{ sha:{ @@ -394,7 +394,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ if(player.marks.zhencha){ player.marks.zhencha.firstChild.innerHTML='哨'; } - player.addTempSkill('zhencha2','phaseAfter'); + player.addTempSkill('zhencha2'); }, subSkill:{ sha:{ @@ -553,7 +553,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ }); 'step 1' if(result.bool){ - target.addTempSkill('liangou2','phaseAfter'); + target.addTempSkill('liangou2'); target.storage.liangou2=player; } }, @@ -919,6 +919,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ return get.attitude(player,event.target)<=0; }, filter:function(event,player){ + if(player.hasSkill('bfengshi4')) return false; var num=0.2; if(get.is.altered('bfengshi')) num=0.15; return Math.random()0){ player.draw(num); } - player.addTempSkill('canshi2','phaseAfter'); + player.addTempSkill('canshi2'); } }, canshi2:{ @@ -5593,7 +5593,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ player.logSkill('jilei',trigger.source); player.popup(get.translation(result.control)+'牌'); trigger.source.storage.jilei2=result.control; - trigger.source.addTempSkill('jilei2','phaseAfter'); + trigger.source.addTempSkill('jilei2'); } }, ai:{ @@ -6154,7 +6154,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ player.draw(); player.markSkill('wangzun'); player.storage.wangzun=trigger.player; - trigger.player.addTempSkill('wangzun3','phaseAfter'); + trigger.player.addTempSkill('wangzun3'); }, ai:{ expose:0.2 @@ -6499,7 +6499,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ if(trigger.delay==false) game.delay(); "step 1" player.draw(); - player.addTempSkill('shenxian2','phaseAfter'); + player.addTempSkill('shenxian2'); }, ai:{ threaten:1.5 @@ -7448,7 +7448,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ player.storage.huxiao3=[]; } player.storage.huxiao3.addArray(player.storage.huxiao); - player.addTempSkill('huxiao3','phaseAfter'); + player.addTempSkill('huxiao3'); } }, clear:{ diff --git a/character/swd.js b/character/swd.js index 8ef2f6eef..36237a381 100644 --- a/character/swd.js +++ b/character/swd.js @@ -653,7 +653,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ trigger.num++; trigger.id=trigger.id||get.id(); player.storage.kbolan2=trigger.id; - player.addTempSkill('kbolan2','phaseAfter'); + player.addTempSkill('kbolan2'); } }, kbolan2:{ @@ -1920,7 +1920,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ "step 1" if(player.countCards('h')>=8){ player.damage(3,'fire'); - player.addTempSkill('heihuo2','phaseAfter'); + player.addTempSkill('heihuo2'); } }, ai:{ @@ -2205,7 +2205,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ next.logSkill='lianda'; "step 1" if(result.bool){ - player.addTempSkill('lianda2','phaseAfter'); + player.addTempSkill('lianda2'); player.useCard({name:'sha'},trigger.target); } } @@ -2927,7 +2927,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ player.lose(result.cards,ui.special); player.storage.hutian=target; player.logSkill('hutian',result.targets); - player.addTempSkill('hutian4','phaseAfter'); + player.addTempSkill('hutian4'); target.addSkill('hutian2'); target.storage.hutian2=result.cards; game.addVideo('storage',target,['hutian2',get.cardsInfo(result.cards),'cards']); @@ -3915,7 +3915,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ if(result.bool){ player.discard(result.cards); player.logSkill('dangping',result.targets); - player.addTempSkill('dangping2','phaseAfter'); + player.addTempSkill('dangping2'); } "step 2" if(result.bool){ @@ -3945,11 +3945,11 @@ game.import('character',function(lib,game,ui,get,ai,_status){ "step 1" if(result.bool){ - target.addTempSkill('duishi3','phaseAfter'); + target.addTempSkill('duishi3'); } else{ player.gainPlayerCard(target,'he',true); - player.addTempSkill('duishi2','phaseAfter'); + player.addTempSkill('duishi2'); } }, ai:{ @@ -4859,7 +4859,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ trigger.player.hp=1; if(trigger.player.maxHp<1) trigger.player.maxHp=1; trigger.player.update(); - player.addTempSkill('susheng2','phaseAfter'); + player.addTempSkill('susheng2'); } }, @@ -7514,7 +7514,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ }, content:function(){ "step 0" - player.addTempSkill('xiaomoyu2','phaseAfter'); + player.addTempSkill('xiaomoyu2'); if(player.hp0){ + if(get.effect(target,{name:button.link[2]},player,player)>0){ if(button.link[2]=='bingliang'){ if(bing) return 2; return 0.7; @@ -7731,7 +7731,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ var eff=0; for(var i in lib.card){ if(lib.card[i].type=='delay'){ - var current=ai.get.effect(target,{name:i},player,player); + var current=get.effect(target,{name:i},player,player); if(current>eff){ eff=current; } @@ -8333,7 +8333,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ player.judge(function(){ return 0; }); - player.addTempSkill('yueren2','phaseAfter'); + player.addTempSkill('yueren2'); "step 1" if(get.color(result.card)=='black'){ if(trigger.target.countCards('he')){ diff --git a/character/xiake.js b/character/xiake.js index 836e59edf..743a3685d 100644 --- a/character/xiake.js +++ b/character/xiake.js @@ -77,7 +77,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ }, content:function(){ player.draw(); - player.addTempSkill('gzhenji3','phaseAfter'); + player.addTempSkill('gzhenji3'); } }, gzhenji3:{ diff --git a/character/xianjian.js b/character/xianjian.js index b864225f8..e2eb0d836 100644 --- a/character/xianjian.js +++ b/character/xianjian.js @@ -744,7 +744,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ player.markSkill('yanshi'); player.updateMarks(); } - player.addTempSkill('yanshi2','phaseAfter'); + player.addTempSkill('yanshi2'); } } } @@ -1332,7 +1332,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ } 'step 1' if(result.bool){ - player.addTempSkill('qixia2','phaseAfter'); + player.addTempSkill('qixia2'); trigger.player.draw(2); if(trigger.player.hp==1&&!trigger.player.hujia){ trigger.player.changeHujia(); @@ -1560,7 +1560,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ onuse:function(result){ if(result.targets){ for(var i=0;i0){ + get.recoverEffect(target,player,player)>0){ if(target.hp==1&&!target.hujia) return 1.6*att; if(target.hp==2) return 0.01*att; return 0; diff --git a/mode/stone.js b/mode/stone.js index 636b81929..368d55b86 100644 --- a/mode/stone.js +++ b/mode/stone.js @@ -2400,7 +2400,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){ else{ target.recover(num); } - // player.addTempSkill('priest_kuaisuzhiliao','phaseAfter'); + // player.addTempSkill('priest_kuaisuzhiliao'); }, ai:{ order:7, @@ -3441,7 +3441,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){ selectTarget:-1, content:function(){ player.drawDeck(2); - player.addTempSkill('shaman_xianzuzhishi','phaseAfter'); + player.addTempSkill('shaman_xianzuzhishi'); }, ai:{ order:10, @@ -3982,7 +3982,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){ content:function(){ var list=['spell_lierenyinji','spell_guanmenfanggou','spell_duochongsheji','spell_kuaisusheji','spell_zhaohuanchongwu']; player.gain(game.createCard(list.randomGet()),'draw'); - player.addTempSkill('hunter_zidanshangtang','phaseAfter'); + player.addTempSkill('hunter_zidanshangtang'); }, ai:{ order:7.5, @@ -8873,7 +8873,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){ forced:true, unique:true, content:function(){ - player.getLeader().addTempSkill('stone_yaosaishouwei2','phaseAfter'); + player.getLeader().addTempSkill('stone_yaosaishouwei2'); } }, stone_yaosaishouwei2:{