diff --git a/card/extra.js b/card/extra.js index a3b0c8d1f..01517b359 100644 --- a/card/extra.js +++ b/card/extra.js @@ -381,6 +381,14 @@ game.import('card',function(){ trigger.num++; }, temp:true, + onremove:function(player){ + if(player.node.jiu){ + player.node.jiu.delete(); + player.node.jiu2.delete(); + delete player.node.jiu; + delete player.node.jiu2; + } + }, group:'jiu2' }, jiu2:{ @@ -396,12 +404,6 @@ game.import('card',function(){ content:function(){ game.broadcastAll(function(player){ player.removeSkill('jiu'); - if(player.node.jiu){ - player.node.jiu.delete(); - player.node.jiu2.delete(); - delete player.node.jiu; - delete player.node.jiu2; - } },player); }, }, diff --git a/card/standard.js b/card/standard.js index 6a8d52898..3722510f8 100644 --- a/card/standard.js +++ b/card/standard.js @@ -1375,12 +1375,6 @@ game.import('card',function(){ if(player.hasSkill('jiu')){ game.broadcastAll(function(player){ player.removeSkill('jiu'); - if(player.node.jiu){ - player.node.jiu.delete(); - player.node.jiu2.delete(); - delete player.node.jiu; - delete player.node.jiu2; - } },player); event.jiu=true; } diff --git a/character/yijiang.js b/character/yijiang.js index 23b083243..32316e30e 100644 --- a/character/yijiang.js +++ b/character/yijiang.js @@ -2187,12 +2187,6 @@ game.import('character',function(){ if(player.hasSkill('jiu')){ game.broadcastAll(function(player){ player.removeSkill('jiu'); - if(player.node.jiu){ - player.node.jiu.delete(); - player.node.jiu2.delete(); - delete player.node.jiu; - delete player.node.jiu2; - } },player); event.jiu=true; } diff --git a/game/game.js b/game/game.js index 848d6cc74..a2415fff5 100644 --- a/game/game.js +++ b/game/game.js @@ -12931,12 +12931,6 @@ if(!_status.video){ game.addVideo('update',this,[this.countCards('h'),this.hp,this.maxHp,this.hujia]); } - if(this.node.jiu&&!this.hasSkill('jiu')){ - this.node.jiu.delete(); - this.node.jiu2.delete(); - delete this.node.jiu; - delete this.node.jiu2; - } this.updateMarks(); return this; }, diff --git a/mode/boss.js b/mode/boss.js index f5b3c63e7..3b953beb3 100644 --- a/mode/boss.js +++ b/mode/boss.js @@ -1064,6 +1064,7 @@ game.import('mode',function(){ game.addBossFellow(7,'boss_yanling'); 'step 3' for(var i=0;i=-1) return [0,0,0,1]; + return 'zeroplayertarget'; + } + return -0.5; } } } @@ -1538,7 +1581,56 @@ game.import('mode',function(){ save:true, } }, - boss_chiyi:{}, + boss_chiyi:{ + trigger:{player:'phaseBegin'}, + forced:true, + filter:function(event,player){ + return [3,5,7].contains(game.roundNumber); + }, + content:function(){ + 'step 0' + if(game.roundNumber==3){ + var enemies=game.filterPlayer(function(current){ + return current.isEnemyOf(player); + }); + player.line(enemies,'green'); + for(var i=0;i