From 0c94e6de80081b9b30300b7984a62c1f62fe7c89 Mon Sep 17 00:00:00 2001 From: Northmoc Date: Tue, 5 Dec 2023 08:20:46 -0500 Subject: [PATCH] merfolk_tunnel_guide.txt initial --- .../main/java/forge/game/trigger/TriggerHandler.java | 8 +++++++- forge-gui/res/cardsfolder/c/champions_of_tyr.txt | 4 ++-- forge-gui/res/cardsfolder/m/miners_guidewing.txt | 2 +- .../res/cardsfolder/upcoming/merfolk_tunnel_guide.txt | 10 ++++++++++ 4 files changed, 20 insertions(+), 4 deletions(-) create mode 100644 forge-gui/res/cardsfolder/upcoming/merfolk_tunnel_guide.txt diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerHandler.java b/forge-game/src/main/java/forge/game/trigger/TriggerHandler.java index e79ad304013..e6a353ecd36 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerHandler.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerHandler.java @@ -563,7 +563,13 @@ public class TriggerHandler { regtrig.triggerRun(); - if (regtrig.hasParam("OneOff") && host.isImmutable()) { + boolean removeBoon = host.isBoon(); + if (regtrig.hasParam("BoonAmount")) { + int x = AbilityUtils.calculateAmount(host, regtrig.getParam("BoonAmount"), wrapperAbility); + int y = host.getAbilityActivatedThisGame(regtrig.getOverridingAbility()); + if (y < x) removeBoon = false; + } + if (regtrig.hasParam("OneOff") && host.isImmutable() || removeBoon) { host.getController().getZone(ZoneType.Command).remove(host); } } diff --git a/forge-gui/res/cardsfolder/c/champions_of_tyr.txt b/forge-gui/res/cardsfolder/c/champions_of_tyr.txt index 035487278b6..ce16547113c 100644 --- a/forge-gui/res/cardsfolder/c/champions_of_tyr.txt +++ b/forge-gui/res/cardsfolder/c/champions_of_tyr.txt @@ -3,9 +3,9 @@ ManaCost:2 W W Types:Creature Angel Knight PT:4/3 K:Flying -K:Double team +K:Double Team T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ DBBoon | TriggerDescription$ When CARDNAME enters the battlefield, you get a boon with "When you cast your next creature spell, that creature enters the battlefield with your choice of a +1/+1 counter, a flying counter, or a lifelink counter on it." -SVar:DBBoon:DB$ Effect | Boon$ True | Duration$ Permanent | Triggers$ SpellCast | SpellDescription$ You get a boon with "When you cast your next creature spell, that creature enters the battlefield with an additional +1/+1 counter, reach counter, and trample counter on it." +SVar:DBBoon:DB$ Effect | Boon$ True | Duration$ Permanent | Triggers$ SpellCast SVar:SpellCast:Mode$ SpellCast | ValidCard$ Creature | ValidActivatingPlayer$ You | OneOff$ True | ActivationLimit$ 1 | TriggerZones$ Command | Execute$ ReplEffAddCounter | TriggerDescription$ When you cast your next creature spell, that creature enters the battlefield with an additional +1/+1 counter, flying counter, and lifelink counter on it. SVar:ReplEffAddCounter:DB$ Effect | ReplacementEffects$ ETBAddCounter | RememberObjects$ TriggeredCard SVar:ETBAddCounter:Event$ Moved | Origin$ Stack | Destination$ Battlefield | ValidCard$ Card.IsRemembered | ReplaceWith$ ETBAddExtraCounter diff --git a/forge-gui/res/cardsfolder/m/miners_guidewing.txt b/forge-gui/res/cardsfolder/m/miners_guidewing.txt index 7bb8a098387..f4ab34f13ad 100644 --- a/forge-gui/res/cardsfolder/m/miners_guidewing.txt +++ b/forge-gui/res/cardsfolder/m/miners_guidewing.txt @@ -7,4 +7,4 @@ K:Vigilance T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigExplore | TriggerDescription$ When CARDNAME dies, target creature you control explores. (Reveal the top card of your library. Put that card into your hand if it's a land. Otherwise, put a +1/+1 counter on that creature, then put the card back or put it into your graveyard.) SVar:TrigExplore:DB$ Explore | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control DeckHas:Ability$Counters -Oracle:Flying, vigilance\nWhen Miner's Guidewing dies, target creature you control explores. (Reveal the top card of your library. Put that card into your hand if it's a land. Otherwise, put a +1/+1 counter on that creature, then put the card back or put it into your graveyard.) \ No newline at end of file +Oracle:Flying, vigilance\nWhen Miner's Guidewing dies, target creature you control explores. (Reveal the top card of your library. Put that card into your hand if it's a land. Otherwise, put a +1/+1 counter on that creature, then put the card back or put it into your graveyard.) diff --git a/forge-gui/res/cardsfolder/upcoming/merfolk_tunnel_guide.txt b/forge-gui/res/cardsfolder/upcoming/merfolk_tunnel_guide.txt new file mode 100644 index 00000000000..9163f87c1c0 --- /dev/null +++ b/forge-gui/res/cardsfolder/upcoming/merfolk_tunnel_guide.txt @@ -0,0 +1,10 @@ +Name:Merfolk Tunnel-Guide +ManaCost:G U +Types:Creature Merfolk Wizard +PT:2/2 +T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigBoon | TriggerDescription$ When CARDNAME enters the battlefield, you get a three-time boon with "Whenever one or more Merfolk enter the battlefield under your control, target Merfolk creature you control explores." +SVar:TrigBoon:DB$ Effect | Boon$ True | Duration$ Permanent | Triggers$ MerfolkETB | SpellDescription$ You get a boon with "Whenever one or more Merfolk enter the battlefield under your control, target Merfolk creature you control explores." +SVar:MerfolkETB:Mode$ ChangesZoneAll | ValidCards$ Merfolk.YouCtrl | Destination$ Battlefield | TriggerZones$ Command | BoonAmount$ 3 | Execute$ TrigExplore | TriggerDescription$ Whenever one or more Merfolk enter the battlefield under your control, target Merfolk creature you control explores. +SVar:TrigExplore:DB$ Explore | ValidTgts$ Creature.Merfolk+YouCtrl | TgtPrompt$ Select target Merfolk creature you control +AI:DeckNeeds:Type$Merfolk +Oracle:When Merfolk Tunnel-Guide enters the battlefield, you get a three-time boon with "Whenever one or more Merfolk enter the battlefield under your control, target Merfolk creature you control explores."