From 6af1604ea4989d3e2575ed44c47428c368f4ed13 Mon Sep 17 00:00:00 2001 From: libccy Date: Fri, 19 May 2017 17:35:11 +0800 Subject: [PATCH] s2 --- character/gwent.js | 12 ------------ character/hearth.js | 36 ------------------------------------ character/xianjian.js | 2 +- 3 files changed, 1 insertion(+), 49 deletions(-) diff --git a/character/gwent.js b/character/gwent.js index a8e56875c..0f9c6a132 100644 --- a/character/gwent.js +++ b/character/gwent.js @@ -493,8 +493,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){ subSkill:{ count:{ trigger:{player:'phaseUseBegin'}, - forced:true, - popup:false, silent:true, content:function(){ player.storage.hunmo1=0; @@ -922,8 +920,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){ subSkill:{ count1:{ trigger:{global:'phaseBegin'}, - forced:true, - popup:false, silent:true, content:function(){ player.storage.gwchuanxin=[]; @@ -931,8 +927,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){ }, count2:{ trigger:{player:'useCard'}, - forced:true, - popup:false, silent:true, // filter:function(event){ // return event.card&&event.card.name=='sha'; @@ -1133,8 +1127,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){ default:return false; } }, - forced:true, - popup:false, silent:true, content:function(){ 'step 0' @@ -1328,8 +1320,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){ subSkill:{ count:{ trigger:{player:'useCard'}, - forced:true, - popup:false, silent:true, filter:function(event,player){ return _status.currentPhase==player; @@ -1347,8 +1337,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){ }, count2:{ trigger:{player:'phaseAfter'}, - forced:true, - popup:false, silent:true, content:function(){ delete player.storage.huihun; diff --git a/character/hearth.js b/character/hearth.js index d2820ba8f..c85a6ed6d 100644 --- a/character/hearth.js +++ b/character/hearth.js @@ -449,8 +449,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){ }, zhaochao2:{ trigger:{player:'shaMiss'}, - forced:true, - popup:false, silent:true, filter:function(event){ return event.getParent(2).name=='zhaochao'; @@ -1088,8 +1086,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){ subSkill:{ add:{ trigger:{player:'useCard'}, - forced:true, - popup:false, silent:true, filter:function(event,player){ return _status.currentPhase==player&&get.type(event.card,'trick')=='trick'; @@ -1890,8 +1886,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){ }, yushou_lose:{ trigger:{player:'phaseBegin'}, - forced:true, - popup:false, silent:true, content:function(){ var list=['yushou_misha','yushou_huofu','yushou_leiouke']; @@ -1959,8 +1953,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){ subSkill:{ count:{ trigger:{player:'useCard'}, - forced:true, - popup:false, silent:true, filter:function(event,player){ return event.card.name.indexOf('hsqingyu_')==0; @@ -2430,8 +2422,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){ }, peiyu2:{ trigger:{player:'damageAfter'}, - forced:true, - popup:false, silent:true, content:function(){ player.removeAdditionalSkill('peiyu'); @@ -2894,8 +2884,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){ subSkill:{ count1:{ trigger:{player:'useCard'}, - forced:true, - popup:false, silent:true, filter:function(event,player){ return _status.currentPhase==player&&get.type(event.card)=='trick'; @@ -2906,8 +2894,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){ }, count2:{ trigger:{player:'phaseBegin'}, - forced:true, - popup:false, silent:true, content:function(){ player.storage.kuangluan=0; @@ -3004,8 +2990,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){ }, kuangluan3:{ trigger:{player:'phaseBegin'}, - forced:true, - popup:false, silent:true, content:function(){ player.storage.kuangluan=[]; @@ -3117,9 +3101,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ }, mobao2:{ trigger:{player:'damageEnd'}, - forced:true, silent:true, - popup:false, filter:function(event,player){ return event.source&&event.source!=player; }, @@ -3132,9 +3114,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ }, mobao3:{ trigger:{player:'phaseEnd'}, - forced:true, silent:true, - popup:false, content:function(){ delete player.storage.mobao; } @@ -3670,8 +3650,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){ }, hsbaowu_huangjinyuanhou2:{ trigger:{player:'phaseBegin'}, - forced:true, - popup:false, silent:true, content:function(){ player.removeSkill('hsbaowu_huangjinyuanhou'); @@ -3746,9 +3724,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ }, fbeifa3:{ trigger:{global:'phaseBegin'}, - forced:true, silent:true, - popup:false, content:function(){ player.storage.fbeifa=0; } @@ -3782,8 +3758,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){ filter:function(event,player){ return event.source==_status.currentPhase&&event.source!=player; }, - popup:false, - forced:true, silent:true, content:function(){ player.storage.yufa=trigger.source; @@ -3791,8 +3765,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){ }, yufa3:{ trigger:{global:'phaseBegin'}, - popup:false, - forced:true, silent:true, content:function(){ player.storage.yufa=null; @@ -4272,8 +4244,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){ subSkill:{ begin:{ trigger:{global:'phaseUseBegin'}, - forced:true, - popup:false, silent:true, content:function(){ trigger.player.storage.shixu_begin=get.time(); @@ -4281,8 +4251,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){ }, end:{ trigger:{global:'phaseUseEnd'}, - forced:true, - popup:false, silent:true, filter:function(event,player){ return typeof event.player.storage.shixu_begin=='number'; @@ -4363,9 +4331,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ subSkill:{ clear:{ trigger:{player:'phaseBefore'}, - forced:true, silent:true, - popup:false, content:function(){ player.storage.qianghua=0; } @@ -5088,9 +5054,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ }, shengdun_old:{ trigger:{player:'phaseBegin'}, - forced:true, silent:true, - popup:false, priority:10, init2:function(player){ player.markSkill('shengdun'); diff --git a/character/xianjian.js b/character/xianjian.js index 161e8d3fc..c50d5ea06 100644 --- a/character/xianjian.js +++ b/character/xianjian.js @@ -109,7 +109,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ return !(player.storage.lingdi||[]).contains(get.suit(card)); }, check:function(){ - return 7-get.value(card); + return 8-get.value(card); }, content:function(){ game.asyncDraw([player,target]);