diff --git a/character/jsrg/skill.js b/character/jsrg/skill.js index 36a85cd8e..8f40b0e3b 100644 --- a/character/jsrg/skill.js +++ b/character/jsrg/skill.js @@ -6654,7 +6654,12 @@ const skills = { group: "jsrgguanhuo_viewas", content: function () { "step 0"; - var count = player.getHistory("useSkill", evt => evt.skill == "jsrgguanhuo_viewas").length; + var count = player.getHistory("useSkill", evt => { + return ( + evt.skill == "jsrgguanhuo_viewas" && + evt.getParent("phaseUse") === trigger.getParent("phaseUse") + ); + }).length; if (count == 1) { player.addTempSkill("jsrgguanhuo_ex", "phaseUseAfter"); player.addMark("jsrgguanhuo_ex", 1, false); @@ -6666,8 +6671,18 @@ const skills = { ai: { effect: { player: function (card, player) { - if (_status.event.getParent().skill == "jsrgguanhuo_viewas" && player.getHistory("useSkill", evt => evt.skill == "jsrgguanhuo_viewas").length == 1) return "zeroplayertarget"; - if (_status.event.type == "phase" && _status.event.skill == "jsrgguanhuo_viewas" && player.getHistory("useSkill", evt => evt.skill == "jsrgguanhuo_viewas").length > 1 && player.countCards("h") <= 3) return [0, 0]; + if (_status.event.getParent().skill == "jsrgguanhuo_viewas" && player.getHistory("useSkill", evt => { + return ( + evt.skill == "jsrgguanhuo_viewas" && + evt.getParent("phaseUse") === _status.event.getParent("phaseUse") + ); + }).length == 1) return "zeroplayertarget"; + if (_status.event.type == "phase" && _status.event.skill == "jsrgguanhuo_viewas" && player.getHistory("useSkill", evt => { + return ( + evt.skill == "jsrgguanhuo_viewas" && + evt.getParent("phaseUse") === _status.event.getParent("phaseUse") + ); + }).length > 1 && player.countCards("h") <= 3) return [0, 0]; }, }, },