From fcc199fdb4499cec4f4a99a47824d37d3083f5eb Mon Sep 17 00:00:00 2001 From: Northmoc <103371817+Northmoc@users.noreply.github.com> Date: Sat, 23 Mar 2024 09:45:46 -0400 Subject: [PATCH] YMKM: sleuth_instructor + support (#4863) --- .../src/main/java/forge/game/trigger/Trigger.java | 8 ++++++++ .../res/cardsfolder/upcoming/sleuth_instructor.txt | 11 +++++++++++ 2 files changed, 19 insertions(+) create mode 100644 forge-gui/res/cardsfolder/upcoming/sleuth_instructor.txt diff --git a/forge-game/src/main/java/forge/game/trigger/Trigger.java b/forge-game/src/main/java/forge/game/trigger/Trigger.java index 37a48d34cff..5de5ebad9bb 100644 --- a/forge-game/src/main/java/forge/game/trigger/Trigger.java +++ b/forge-game/src/main/java/forge/game/trigger/Trigger.java @@ -373,6 +373,10 @@ public abstract class Trigger extends TriggerReplacementBase { getActivationsThisTurn() >= Integer.parseInt(getParam("ActivationLimit"))) { return false; } + if (hasParam("GameActivationLimit") && + getActivationsThisGame() >= Integer.parseInt(getParam("GameActivationLimit"))) { + return false; + } return true; } @@ -574,6 +578,10 @@ public abstract class Trigger extends TriggerReplacementBase { return hostCard.getAbilityActivatedThisTurn(this.getOverridingAbility()); } + public int getActivationsThisGame() { + return hostCard.getAbilityActivatedThisGame(this.getOverridingAbility()); + } + public void triggerRun() { if (this.getOverridingAbility() != null) { hostCard.addAbilityActivated(this.getOverridingAbility()); diff --git a/forge-gui/res/cardsfolder/upcoming/sleuth_instructor.txt b/forge-gui/res/cardsfolder/upcoming/sleuth_instructor.txt new file mode 100644 index 00000000000..a1a0c9aaf48 --- /dev/null +++ b/forge-gui/res/cardsfolder/upcoming/sleuth_instructor.txt @@ -0,0 +1,11 @@ +Name:Sleuth Instructor +ManaCost:1 W +Types:Creature Elephant Detective +PT:3/2 +K:Disguise:1 W +T:Mode$ TurnFaceUp | ValidCard$ Card.Self,Creature.Other+YouCtrl | Execute$ TrigSeek | TriggerZones$ Battlefield | GameActivationLimit$ 1 | TriggerDescription$ Whenever CARDNAME or another creature you control is turned face up, seek a non-Elephant creature card with mana value 3 or less and cloak it. This ability triggers only once. +SVar:TrigSeek:DB$ Seek | Type$ Creature.nonElephant+cmcLE3 | RememberFound$ True | SubAbility$ DBCloak +SVar:DBCloak:DB$ Cloak | Defined$ Remembered | SubAbility$ DBCleanup +SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True +DeckHints:Keyword$Morph|Megamorph|Disguise +Oracle:Disguise {1}{W}\nWhenever Sleuth Instructor or another permanent you control is turned face up, seek a non-Elephant creature card with mana value 3 or less and cloak it. This ability triggers only once.