diff --git a/card/swd.js b/card/swd.js index 2da18812b..adb700741 100644 --- a/card/swd.js +++ b/card/swd.js @@ -1258,7 +1258,10 @@ game.import('card',function(){ ai:{ order:2, result:{ - target:-1, + target:function(player,target){ + if(target.hasSkillTag('noturn')) return 0; + return -1; + }, }, useful:[2,0.5], value:[2,0.5], @@ -1715,7 +1718,10 @@ game.import('card',function(){ value:6, }, result:{ - target:-3 + target:function(player,target){ + if(target.hasSkillTag('noturn')) return 0; + return -3; + } }, } }, @@ -3564,6 +3570,7 @@ game.import('card',function(){ hslingjian_jinjilengdong_equip1:{ trigger:{source:'damageEnd'}, check:function(event,player){ + if(event.player.hasSkillTag('noturn')) return 0; if(event.player.isTurnedOver()){ return get.attitude(player,event.player)>0; } @@ -3581,6 +3588,7 @@ game.import('card',function(){ hslingjian_jinjilengdong_equip2:{ trigger:{player:'damageEnd'}, check:function(event,player){ + if(event.player.hasSkillTag('noturn')) return 0; if(event.player.isTurnedOver()){ return get.attitude(player,event.source)>0; } @@ -3621,6 +3629,7 @@ game.import('card',function(){ player.chooseTarget(get.prompt('hslingjian_jinjilengdong_duanzao'),function(card,player,target){ return player!=target&&!target.isTurnedOver(); }).ai=function(target){ + if(target.hasSkillTag('noturn')) return 0; return Math.max(0,-get.attitude(player,target)-2); }; "step 1" diff --git a/character/extra.js b/character/extra.js index 1fb2b2979..ee80b188c 100644 --- a/character/extra.js +++ b/character/extra.js @@ -372,6 +372,7 @@ game.import('character',function(){ player.chooseTarget('是否弃置一枚“忍”,并发动【放逐】?',function(card,player,target){ return player!=target }).ai=function(target){ + if(target.hasSkillTag('noturn')) return 0; if(target.isTurnedOver()){ return get.attitude(player,target)-1; } diff --git a/character/hearth.js b/character/hearth.js index 590f95f57..c86dd67b7 100644 --- a/character/hearth.js +++ b/character/hearth.js @@ -4118,6 +4118,7 @@ game.import('character',function(){ event.player.isAlive()&&!event.player.isTurnedOver(); }, check:function(event,player){ + if(event.player.hasSkillTag('noturn')) return; if(event.player.isTurnedOver()){ return get.attitude(player,event.player)>0; } diff --git a/character/ow.js b/character/ow.js index 8b7cb7ebf..790afa52d 100644 --- a/character/ow.js +++ b/character/ow.js @@ -1319,6 +1319,7 @@ game.import('character',function(){ }, result:{ target:function(player,target){ + if(target.hasSkillTag('noturn')) return 0; if(player.hasUnknown()) return 0; return -1; } diff --git a/character/shenhua.js b/character/shenhua.js index 0d99a8378..7894acc67 100644 --- a/character/shenhua.js +++ b/character/shenhua.js @@ -1932,6 +1932,7 @@ game.import('character',function(){ player.chooseTarget(get.prompt('fangzhu'),function(card,player,target){ return player!=target }).ai=function(target){ + if(target.hasSkillTag('noturn')) return 0; var player=_status.event.player; if(get.attitude(_status.event.player,target)==0) return 0; if(get.attitude(_status.event.player,target)>0){ diff --git a/character/sp.js b/character/sp.js index 00f50625e..463bcc409 100644 --- a/character/sp.js +++ b/character/sp.js @@ -329,6 +329,7 @@ game.import('character',function(){ order:8, result:{ target:function(player,target){ + if(target.hasSkillTag('noturn')) return 0; if(target.isTurnedOver()) return 2; return -0.5; } diff --git a/character/swd.js b/character/swd.js index 674fb9307..bd1a2eac1 100644 --- a/character/swd.js +++ b/character/swd.js @@ -1706,6 +1706,7 @@ game.import('character',function(){ order:1, result:{ target:function(player,target){ + if(target.hasSkillTag('noturn')) return 0; if(game.phaseNumber0){ diff --git a/character/yijiang.js b/character/yijiang.js index b4f3013da..23b083243 100644 --- a/character/yijiang.js +++ b/character/yijiang.js @@ -4051,6 +4051,7 @@ game.import('character',function(){ threaten:1.8, result:{ target:function(player,target){ + if(target.hasSkillTag('noturn')) return 0; if(target.isTurnedOver()) return 2; return -1/(target.countCards('h')+1); } diff --git a/mode/boss.js b/mode/boss.js index 2da815393..2a79427a2 100644 --- a/mode/boss.js +++ b/mode/boss.js @@ -1243,6 +1243,19 @@ game.import('mode',function(){ } } } + }, + trigger:{player:'turnOverBefore'}, + priority:20, + forced:true, + filter:function(event,player){ + return !player.isTurnedOver(); + }, + content:function(){ + trigger.untrigger(); + trigger.finish(); + }, + ai:{ + noturn:true } }, honghuangzhili:{ @@ -1269,7 +1282,21 @@ game.import('mode',function(){ } }, boss_shenen:{}, - boss_fentian:{}, + boss_fentian:{ + trigger:{source:'damageBegin'}, + forced:true, + content:function(){ + trigger.nature='fire'; + }, + mod:{ + cardUsable:function(card){ + if(get.color(card)=='red') return Infinity; + }, + targetInRange:function(card){ + if(get.color(card)=='red') return true; + } + } + }, boss_xingxia:{}, boss_huihuo:{}, boss_chiyi:{},