From a3883b0ba59af7299fb1a0544e68ac44d79c11e0 Mon Sep 17 00:00:00 2001 From: Suthro <81990938+MikeS-NZ@users.noreply.github.com> Date: Mon, 13 Mar 2023 19:21:31 -0500 Subject: [PATCH 1/3] LTR: Gandalf the Grey + The One Ring LTR: Add card scripts for spoiled LTR cards Gandalf the Grey and The One Ring. - Gandalf the Grey - The One Ring --- .../main/java/forge/game/card/CounterEnumType.java | 10 ++++++---- .../res/cardsfolder/upcoming/gandalf_the_grey.txt | 13 +++++++++++++ forge-gui/res/cardsfolder/upcoming/the_one_ring.txt | 12 ++++++++++++ 3 files changed, 31 insertions(+), 4 deletions(-) create mode 100644 forge-gui/res/cardsfolder/upcoming/gandalf_the_grey.txt create mode 100644 forge-gui/res/cardsfolder/upcoming/the_one_ring.txt diff --git a/forge-game/src/main/java/forge/game/card/CounterEnumType.java b/forge-game/src/main/java/forge/game/card/CounterEnumType.java index 68ee6771b08..9f6e8ee3059 100644 --- a/forge-game/src/main/java/forge/game/card/CounterEnumType.java +++ b/forge-game/src/main/java/forge/game/card/CounterEnumType.java @@ -61,6 +61,8 @@ public enum CounterEnumType { BRICK("BRICK", 226, 192, 164), + BURDEN("BURDEN", 135, 62, 35), + CAGE("CAGE", 155, 155, 155), CARRION("CRRON", 255, 163, 222), @@ -184,7 +186,7 @@ public enum CounterEnumType { INFECTION("INFCT", 0, 230, 66), INGENUITY("INGTY", 67, 186, 205), - + INTEL("INTEL", 80, 250, 180), INTERVENTION("INTRV", 205, 203, 105), @@ -242,7 +244,7 @@ public enum CounterEnumType { MUSIC("MUSIC", 255, 138, 255), MUSTER("MUSTR", 235, 196, 0), - + NECRODERMIS("NECRO", 80, 209, 250), NET("NET", 0, 221, 251), @@ -296,7 +298,7 @@ public enum CounterEnumType { P2P2("+2/+2", "+2/+2", 96, 226, 23), QUEST("QUEST", 251, 189, 0), - + REPRIEVE("REPR", 240, 120, 50), RITUAL("RITUAL", 155, 17, 30), @@ -336,7 +338,7 @@ public enum CounterEnumType { STASH("STASH", 248, 191, 0), STORAGE("STORG", 255, 177, 121), - + STORY("STORY", 180, 72, 195), STRIFE("STRFE", 255, 89, 223), diff --git a/forge-gui/res/cardsfolder/upcoming/gandalf_the_grey.txt b/forge-gui/res/cardsfolder/upcoming/gandalf_the_grey.txt new file mode 100644 index 00000000000..6ba5fafa299 --- /dev/null +++ b/forge-gui/res/cardsfolder/upcoming/gandalf_the_grey.txt @@ -0,0 +1,13 @@ +Name:Gandalf the Grey +ManaCost:3 U R +Types:Legendary Creature Avatar Wizard +PT:3/4 +T:Mode$ SpellCast | ValidCard$ Instant,Sorcery | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigCharm | TriggerDescription$ Whenever you cast an instant or sorcery spell, ABILITY +SVar:TrigCharm:DB$ Charm | Choices$ DBTapUntap,DBDamage,DBCopy,DBChangeZone | ChoiceRestriction$ ThisGame | CharmNum$ 1 +SVar:DBTapUntap:DB$ TapOrUntap | ValidTgts$ Permanent | TgtPrompt$ Select target permanent to tap or untap | SpellDescription$ You may tap or untap target permanent. +SVar:DBDamage:DB$ DealDamage | Defined$ Opponent | NumDmg$ 3 | SpellDescription$ CARDNAME deals 3 damage to each opponent. +SVar:DBCopy:DB$ CopySpellAbility | ValidTgts$ Instant.YouCtrl,Sorcery.YouCtrl | TgtPrompt$ Select target instant or sorcery spell you control | MayChooseTarget$ True | SpellDescription$ Copy target instant or sorcery spell you control. You may choose new targets for the copy. +SVar:DBChangeZone:DB$ ChangeZone | Origin$ Battlefield | Destination$ Library | LibraryPosition$ 0 | SpellDescription$ Put NICKNAME on top of its owner's library. +DeckNeeds:Type$Instant|Sorcery +DeckHas:Type$Wizard +Oracle:Whenever you cast an instant or sorcery spell, choose one that hasn't been chosen —\n• You can tap or untap target permanent.\n• Gandalf the Grey deals 3 damage to each opponent.\n• Copy target instant or sorcery spell you control. You may choose new targets for the copy.\n• Put Gandalf on top of its owner's library. diff --git a/forge-gui/res/cardsfolder/upcoming/the_one_ring.txt b/forge-gui/res/cardsfolder/upcoming/the_one_ring.txt new file mode 100644 index 00000000000..2019a21e820 --- /dev/null +++ b/forge-gui/res/cardsfolder/upcoming/the_one_ring.txt @@ -0,0 +1,12 @@ +Name:The One Ring +ManaCost:4 +Types:Legendary Artifact +K:Indestructible +T:Mode$ ChangesZone | ValidCard$ Card.wasCastByYou+Self | Destination$ Battlefield | Execute$ TrigPump | TriggerDescription$ When CARDNAME enters the battlefield, if you cast it, you gain protection from everything until your next turn. +SVar:TrigPump:DB$ Pump | Defined$ You | Duration$ UntilYourNextTurn | KW$ Protection from everything +T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | Execute$ TrigLoseLife | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of your upkeep, you lose 1 life for each burden counter on CARDNAME. +SVar:TrigLoseLife:DB$ LoseLife | LifeAmount$ X +A:AB$ PutCounter | Cost$ T | Defined$ Self | CounterType$ BURDEN | CounterNum$ 1 | SubAbility$ DBDraw | SpellDescription$ Put a burden counter on CARDNAME, then draw a card for each burden counter on CARDNAME. +SVar:DBDraw:DB$ Draw | Defined$ You | NumCards$ X +SVar:X:Count$CardCounters.BURDEN +Oracle:Indestructible\nWhen The One Ring enters the battlefield, if you cast it, you gain protection from everything until your next turn.\nAt the beginning of your upkeep, you lose 1 life for each burden counter on The One Ring.\n{T}: Put a burden coutner on The One Ring, then draw a card for each burden counter on The One Ring. From b1ebbdc8fb3b8a648d88b08b5e185a18f8bf2133 Mon Sep 17 00:00:00 2001 From: Mike S <81990938+MikeS-NZ@users.noreply.github.com> Date: Tue, 14 Mar 2023 11:12:38 -0500 Subject: [PATCH 2/3] Create gandalf_the_grey.txt --- forge-gui/res/cardsfolder/upcoming/gandalf_the_grey.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/forge-gui/res/cardsfolder/upcoming/gandalf_the_grey.txt b/forge-gui/res/cardsfolder/upcoming/gandalf_the_grey.txt index 6ba5fafa299..e9de4f06328 100644 --- a/forge-gui/res/cardsfolder/upcoming/gandalf_the_grey.txt +++ b/forge-gui/res/cardsfolder/upcoming/gandalf_the_grey.txt @@ -9,5 +9,4 @@ SVar:DBDamage:DB$ DealDamage | Defined$ Opponent | NumDmg$ 3 | SpellDescription$ SVar:DBCopy:DB$ CopySpellAbility | ValidTgts$ Instant.YouCtrl,Sorcery.YouCtrl | TgtPrompt$ Select target instant or sorcery spell you control | MayChooseTarget$ True | SpellDescription$ Copy target instant or sorcery spell you control. You may choose new targets for the copy. SVar:DBChangeZone:DB$ ChangeZone | Origin$ Battlefield | Destination$ Library | LibraryPosition$ 0 | SpellDescription$ Put NICKNAME on top of its owner's library. DeckNeeds:Type$Instant|Sorcery -DeckHas:Type$Wizard Oracle:Whenever you cast an instant or sorcery spell, choose one that hasn't been chosen —\n• You can tap or untap target permanent.\n• Gandalf the Grey deals 3 damage to each opponent.\n• Copy target instant or sorcery spell you control. You may choose new targets for the copy.\n• Put Gandalf on top of its owner's library. From 6d945ff283805a816785803ff73341bdb7bfa85f Mon Sep 17 00:00:00 2001 From: Mike S <81990938+MikeS-NZ@users.noreply.github.com> Date: Tue, 14 Mar 2023 12:13:19 -0500 Subject: [PATCH 3/3] Update gandalf_the_grey.txt --- forge-gui/res/cardsfolder/upcoming/gandalf_the_grey.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/forge-gui/res/cardsfolder/upcoming/gandalf_the_grey.txt b/forge-gui/res/cardsfolder/upcoming/gandalf_the_grey.txt index e9de4f06328..b0d5d3497ba 100644 --- a/forge-gui/res/cardsfolder/upcoming/gandalf_the_grey.txt +++ b/forge-gui/res/cardsfolder/upcoming/gandalf_the_grey.txt @@ -9,4 +9,4 @@ SVar:DBDamage:DB$ DealDamage | Defined$ Opponent | NumDmg$ 3 | SpellDescription$ SVar:DBCopy:DB$ CopySpellAbility | ValidTgts$ Instant.YouCtrl,Sorcery.YouCtrl | TgtPrompt$ Select target instant or sorcery spell you control | MayChooseTarget$ True | SpellDescription$ Copy target instant or sorcery spell you control. You may choose new targets for the copy. SVar:DBChangeZone:DB$ ChangeZone | Origin$ Battlefield | Destination$ Library | LibraryPosition$ 0 | SpellDescription$ Put NICKNAME on top of its owner's library. DeckNeeds:Type$Instant|Sorcery -Oracle:Whenever you cast an instant or sorcery spell, choose one that hasn't been chosen —\n• You can tap or untap target permanent.\n• Gandalf the Grey deals 3 damage to each opponent.\n• Copy target instant or sorcery spell you control. You may choose new targets for the copy.\n• Put Gandalf on top of its owner's library. +Oracle:Whenever you cast an instant or sorcery spell, choose one that hasn't been chosen —\n• You may tap or untap target permanent.\n• Gandalf the Grey deals 3 damage to each opponent.\n• Copy target instant or sorcery spell you control. You may choose new targets for the copy.\n• Put Gandalf on top of its owner's library.