diff --git a/character/jiange.js b/character/jiange.js index ffd9959e9..9d6a94474 100644 --- a/character/jiange.js +++ b/character/jiange.js @@ -141,8 +141,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){ return _status.currentPhase==player&&event.targets&&(event.targets.length>1||event.targets[0]!=player); }, silent:true, - forced:true, - popup:false, content:function(){ player.addTempSkill('huodi3'); } diff --git a/character/ow.js b/character/ow.js index 5ab16d364..f2db05f79 100644 --- a/character/ow.js +++ b/character/ow.js @@ -142,8 +142,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){ subSkill:{ die:{ trigger:{player:'dieBegin'}, - forced:true, - popup:false, silent:true, content:function(){ player.removeSkill('woliu2'); @@ -501,8 +499,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){ subSkill:{ count:{ trigger:{player:'phaseBegin'}, - forced:true, - popup:false, silent:true, content:function(){ player.storage.pingzhang=0; @@ -952,8 +948,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){ }, bfengshi3:{ trigger:{player:'useCard'}, - forced:true, - popup:false, silent:true, filter:function(event,player){ if(player.hasSkill('bfengshi4')) return false; @@ -3049,8 +3043,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){ }, kuoyin2:{ trigger:{player:'phaseBegin'}, - forced:true, - popup:false, silent:true, content:function(){ player.storage.yuedong_recover=false; diff --git a/character/refresh.js b/character/refresh.js index 83d061b6d..12e9349e3 100644 --- a/character/refresh.js +++ b/character/refresh.js @@ -199,8 +199,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){ }, rerende1:{ trigger:{player:'phaseUseBegin'}, - forced:true, - popup:false, silent:true, content:function(){ player.storage.rerende=0; @@ -761,8 +759,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){ retishen2:{ trigger:{player:'phaseEnd'}, priority:-10, - forced:true, - popup:false, silent:true, content:function(){ player.storage.retishen2=player.hp; diff --git a/character/shenhua.js b/character/shenhua.js index dadd75463..5d11fec94 100644 --- a/character/shenhua.js +++ b/character/shenhua.js @@ -361,8 +361,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){ subSkill:{ reset:{ trigger:{player:'phaseAfter'}, - forced:true, - popup:false, silent:true, filter:function(event,player){ return player.storage.reluanji?true:false; @@ -373,8 +371,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){ }, count:{ trigger:{player:'useCard'}, - forced:true, - popup:false, silent:true, filter:function(event){ return event.skill=='reluanji'; @@ -390,8 +386,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){ }, respond:{ trigger:{global:'respond'}, - forced:true, - popup:false, silent:true, filter:function(event){ return event.getParent(2).skill=='reluanji'&&event.player.isDamaged(); @@ -3706,8 +3700,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){ }, xintianxiang3:{ trigger:{player:['phaseBegin','dieBegin']}, - forced:true, - popup:false, silent:true, content:function(){ if(player.storage.xintianxiang3){ diff --git a/character/sp.js b/character/sp.js index 5fd779f9c..6d6af5e50 100644 --- a/character/sp.js +++ b/character/sp.js @@ -333,8 +333,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){ }, cancel:{ trigger:{player:'phaseUseEnd'}, - forced:true, - popup:false, silent:true, content:function(){ delete player.forceCountChoose; @@ -1491,8 +1489,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){ subSkill:{ count1:{ trigger:{player:'phaseBegin'}, - forced:true, - popup:false, silent:true, content:function(){ player.storage.yjixi++; @@ -1500,8 +1496,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){ }, count2:{ trigger:{player:'loseHpAfter'}, - forced:true, - popup:false, silent:true, content:function(){ player.storage.yjixi=0; @@ -1673,8 +1667,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){ }, xiehui4:{ trigger:{player:'loseEnd'}, - forced:true, - popup:false, silent:true, content:function(){ if(player.storage.xiehui2){ @@ -1743,8 +1735,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){ }, shanjia2:{ trigger:{player:'useCard'}, - forced:true, - popup:false, silent:true, filter:function(event,player){ return get.type(event.card)=='equip'&&player.storage.shanjia<7; @@ -2948,8 +2938,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){ }, }, trigger:{source:'damageEnd'}, - forced:true, - popup:false, silent:true, mark:true, intro:{ @@ -3085,8 +3073,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){ }, qizhi2:{ trigger:{player:'phaseBegin'}, - forced:true, - popup:false, silent:true, content:function(){ player.storage.qizhi=0; @@ -3967,8 +3953,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){ subSkill:{ color:{ trigger:{player:'phaseBegin'}, - forced:true, - popup:false, silent:true, content:function(){ player.storage.xingwu_color=['black','red']; @@ -3976,8 +3960,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){ }, color2:{ trigger:{player:'useCard'}, - forced:true, - popup:false, silent:true, filter:function(event,player){ return Array.isArray(player.storage.xingwu_color)&&_status.currentPhase==player; @@ -4835,8 +4817,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){ fenyin3:{ trigger:{player:'useCard'}, priority:-1, - forced:true, - popup:false, silent:true, filter:function(event,player){ if(!event.cards||event.cards.length!=1) return false; @@ -4849,9 +4829,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ }, fenyin2:{ trigger:{player:'phaseBefore'}, - forced:true, silent:true, - popup:false, priority:10, content:function(){ player.storage.fenyin=null; @@ -5035,9 +5013,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ }, mozhi2:{ trigger:{player:'phaseAfter'}, - forced:true, silent:true, - popup:false, content:function(){ player.storage.mozhi.length=0; player.unmarkSkill('mozhi'); @@ -5045,9 +5021,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ }, mozhi3:{ trigger:{player:'useCard'}, - forced:true, silent:true, - popup:false, filter:function(event,player){ if(_status.currentPhase!=player) return false; if(event.parent.parent.name!='phaseUse') return false; @@ -6166,8 +6140,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){ }, wangzun2:{ trigger:{player:'phaseBegin'}, - forced:true, - popup:false, silent:true, content:function(){ player.unmarkSkill('wangzun'); @@ -6534,8 +6506,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){ }, qiangwu2:{ trigger:{player:'phaseUseBegin'}, - forced:true, - popup:false, silent:true, content:function(){ delete player.storage.qiangwu; @@ -6602,10 +6572,8 @@ game.import('character',function(lib,game,ui,get,ai,_status){ }, qiluan:{ trigger:{source:'dieAfter'}, - forced:true, priority:-10, silent:true, - popup:false, filter:function(event){ return _status.currentPhase!=event.player; }, @@ -7409,8 +7377,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){ }, huxiao:{ trigger:{source:'damageEnd'}, - forced:true, - popup:false, silent:true, filter:function(event,player){ return event.nature=='fire'; @@ -7454,8 +7420,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){ clear:{ trigger:{source:'damageAfter'}, priority:-7, - forced:true, - popup:false, silent:true, content:function(){ delete player.storage.huxiao; @@ -7789,8 +7753,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){ duwu3:{ trigger:{global:'dying'}, priority:15, - forced:true, - popup:false, silent:true, filter:function(event,player){ return event.reason&&event.reason.getParent().name=='duwu';