From 21e742a229aec447ddcb79dc288c2b229a5d7173 Mon Sep 17 00:00:00 2001 From: Northmoc Date: Fri, 24 Dec 2021 10:10:39 -0500 Subject: [PATCH 1/3] town_razer_tyrant.txt --- .../res/cardsfolder/upcoming/town_razer_tyrant.txt | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 forge-gui/res/cardsfolder/upcoming/town_razer_tyrant.txt diff --git a/forge-gui/res/cardsfolder/upcoming/town_razer_tyrant.txt b/forge-gui/res/cardsfolder/upcoming/town_razer_tyrant.txt new file mode 100644 index 00000000000..3ff951ed8fa --- /dev/null +++ b/forge-gui/res/cardsfolder/upcoming/town_razer_tyrant.txt @@ -0,0 +1,10 @@ +Name:Town-razer Tyrant +ManaCost:2 R R +Types:Creature Dragon +PT:4/4 +K:Flying +T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigAnimate | TriggerDescription$ When CARDNAME enters the battlefield, target land you don't control loses all abilities except mana abilities and gains "At the beginning of your upkeep, this permanent deals 2 damage to you unless you sacrifice it." +SVar:TrigAnimate:DB$ Animate | ValidTgts$ Land.YouDontCtrl | TgtPrompt$ Select target land you don't control | RemoveNonManaAbilities$ True | Triggers$ UpkeepShock | Duration$ Permanent +SVar:UpkeepShock:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigDamage | TriggerDescription$ At the beginning of your upkeep, this permanent deals 2 damage to you unless you sacrifice it. +SVar:TrigDamage:DB$ DealDamage | Defined$ You | NumDmg$ 2 | UnlessCost$ Sac<1/CARDNAME> | RememberDamaged$ True | UnlessPayer$ TriggeredPlayer +Oracle:Flying\nWhen Town-razer Tyrant enters the battlefield, target land you don't control loses all abilities except mana abilities and gains "At the beginning of your upkeep, this permanent deals 2 damage to you unless you sacrifice it." From 926f20f76ee53e24d02c8b948752362755144405 Mon Sep 17 00:00:00 2001 From: Northmoc Date: Fri, 24 Dec 2021 12:17:02 -0500 Subject: [PATCH 2/3] AnimateEffectBase update booleans --- .../ability/effects/AnimateEffectBase.java | 49 ++++--------------- 1 file changed, 10 insertions(+), 39 deletions(-) diff --git a/forge-game/src/main/java/forge/game/ability/effects/AnimateEffectBase.java b/forge-game/src/main/java/forge/game/ability/effects/AnimateEffectBase.java index 0616ed3e244..24e62094dfe 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/AnimateEffectBase.java +++ b/forge-game/src/main/java/forge/game/ability/effects/AnimateEffectBase.java @@ -50,46 +50,17 @@ public abstract class AnimateEffectBase extends SpellAbilityEffect { final Card source = sa.getHostCard(); final Game game = source.getGame(); - boolean addAllCreatureTypes = false; - boolean removeSuperTypes = false; - boolean removeCardTypes = false; - boolean removeSubTypes = false; - boolean removeLandTypes = false; - boolean removeCreatureTypes = false; - boolean removeArtifactTypes = false; - boolean removeEnchantmentTypes = false; - + boolean addAllCreatureTypes = sa.hasParam("AddAllCreatureTypes"); + boolean removeSuperTypes = sa.hasParam("RemoveSuperTypes"); + boolean removeCardTypes = sa.hasParam("RemoveCardTypes"); + boolean removeSubTypes = sa.hasParam("RemoveSubTypes"); + boolean removeLandTypes = sa.hasParam("RemoveLandTypes"); + boolean removeCreatureTypes = sa.hasParam("RemoveCreatureTypes"); + boolean removeArtifactTypes = sa.hasParam("RemoveArtifactTypes"); + boolean removeEnchantmentTypes = sa.hasParam("RemoveEnchantmentTypes"); + boolean removeNonManaAbilities = sa.hasParam("RemoveNonManaAbilities"); boolean removeAll = sa.hasParam("RemoveAllAbilities"); - if (sa.hasParam("AddAllCreatureTypes")) { - addAllCreatureTypes = true; - } - - if (sa.hasParam("RemoveSuperTypes")) { - removeSuperTypes = true; - } - - if (sa.hasParam("RemoveCardTypes")) { - removeCardTypes = true; - } - - if (sa.hasParam("RemoveSubTypes")) { - removeSubTypes = true; - } - - if (sa.hasParam("RemoveLandTypes")) { - removeLandTypes = true; - } - if (sa.hasParam("RemoveCreatureTypes")) { - removeCreatureTypes = true; - } - if (sa.hasParam("RemoveArtifactTypes")) { - removeArtifactTypes = true; - } - if (sa.hasParam("RemoveEnchantmentTypes")) { - removeEnchantmentTypes = true; - } - if (sa.hasParam("RememberAnimated")) { source.addRemembered(c); } @@ -195,7 +166,7 @@ public abstract class AnimateEffectBase extends SpellAbilityEffect { || !addedAbilities.isEmpty() || !removedAbilities.isEmpty() || !addedTriggers.isEmpty() || !addedReplacements.isEmpty() || !addedStaticAbilities.isEmpty()) { c.addChangedCardTraits(addedAbilities, removedAbilities, addedTriggers, addedReplacements, - addedStaticAbilities, removeAll, false, timestamp, 0); + addedStaticAbilities, removeAll, removeNonManaAbilities, timestamp, 0); } if (!"Permanent".equals(sa.getParam("Duration"))) { From 2af4b814649e3ef04a6b55efd4cf10cded44510c Mon Sep 17 00:00:00 2001 From: Northmoc Date: Mon, 27 Dec 2021 13:04:45 -0500 Subject: [PATCH 3/3] remove unneeded param --- forge-gui/res/cardsfolder/upcoming/town_razer_tyrant.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/forge-gui/res/cardsfolder/upcoming/town_razer_tyrant.txt b/forge-gui/res/cardsfolder/upcoming/town_razer_tyrant.txt index 3ff951ed8fa..a7cc3786464 100644 --- a/forge-gui/res/cardsfolder/upcoming/town_razer_tyrant.txt +++ b/forge-gui/res/cardsfolder/upcoming/town_razer_tyrant.txt @@ -6,5 +6,5 @@ K:Flying T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigAnimate | TriggerDescription$ When CARDNAME enters the battlefield, target land you don't control loses all abilities except mana abilities and gains "At the beginning of your upkeep, this permanent deals 2 damage to you unless you sacrifice it." SVar:TrigAnimate:DB$ Animate | ValidTgts$ Land.YouDontCtrl | TgtPrompt$ Select target land you don't control | RemoveNonManaAbilities$ True | Triggers$ UpkeepShock | Duration$ Permanent SVar:UpkeepShock:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigDamage | TriggerDescription$ At the beginning of your upkeep, this permanent deals 2 damage to you unless you sacrifice it. -SVar:TrigDamage:DB$ DealDamage | Defined$ You | NumDmg$ 2 | UnlessCost$ Sac<1/CARDNAME> | RememberDamaged$ True | UnlessPayer$ TriggeredPlayer +SVar:TrigDamage:DB$ DealDamage | Defined$ You | NumDmg$ 2 | UnlessCost$ Sac<1/CARDNAME> | UnlessPayer$ TriggeredPlayer Oracle:Flying\nWhen Town-razer Tyrant enters the battlefield, target land you don't control loses all abilities except mana abilities and gains "At the beginning of your upkeep, this permanent deals 2 damage to you unless you sacrifice it."