From d085419a9232f31cbc6443f963a9c1822266870f Mon Sep 17 00:00:00 2001 From: Northmoc Date: Fri, 22 Jul 2022 16:48:51 -0400 Subject: [PATCH 1/8] descent_into_avernus.txt and CounterEnumType.DESCENT --- .../src/main/java/forge/game/card/CounterEnumType.java | 2 ++ .../res/cardsfolder/upcoming/descent_into_avernus.txt | 10 ++++++++++ 2 files changed, 12 insertions(+) create mode 100644 forge-gui/res/cardsfolder/upcoming/descent_into_avernus.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 9958436edad..01280aa110b 100644 --- a/forge-game/src/main/java/forge/game/card/CounterEnumType.java +++ b/forge-game/src/main/java/forge/game/card/CounterEnumType.java @@ -95,6 +95,8 @@ public enum CounterEnumType { DEPLETION("DPLT", 185, 201, 208), + DESCENT("DESCT", 175, 35, 40), + DESPAIR("DESPR", 238, 186, 187), DEVOTION("DEVOT", 255, 111, 255), diff --git a/forge-gui/res/cardsfolder/upcoming/descent_into_avernus.txt b/forge-gui/res/cardsfolder/upcoming/descent_into_avernus.txt new file mode 100644 index 00000000000..472a592531e --- /dev/null +++ b/forge-gui/res/cardsfolder/upcoming/descent_into_avernus.txt @@ -0,0 +1,10 @@ +Name:Descent into Avernus +ManaCost:2 R +Types:Enchantment +T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ At the beginning of your upkeep, put two descent counters on CARDNAME. Then each player creates X Treasure tokens and CARDNAME deals X damage to each player, where X is the number of descent counters on CARDNAME. +SVar:TrigPutCounter:DB$ PutCounter | CounterType$ DESCENT | CounterNum$ 2 | SubAbility$ DBTreasure +SVar:DBTreasure:DB$ Token | TokenOwner$ Player | TokenAmount$ X | TokenScript$ c_a_treasure_sac | SubAbility$ DBDealDamage +SVar:DBDealDamage:DB$ DealDamage | Defined$ Player | NumDmg$ X +SVar:X:Count$CardCounters.DESCENT +DeckHas:Ability$Token|Sacrifice & Type$Treasure|Artifact +Oracle:At the beginning of your upkeep, put two descent counters on Descent into Avernus. Then each player creates X Treasure tokens and Descent into Avernus deals X damage to each player, where X is the number of descent counters on Descent into Avernus. From e6d8373e44f7e340719292474d50a4144b2b9789 Mon Sep 17 00:00:00 2001 From: Northmoc Date: Fri, 22 Jul 2022 16:53:11 -0400 Subject: [PATCH 2/8] dire_mimic.txt --- forge-gui/res/cardsfolder/upcoming/dire_mimic.txt | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 forge-gui/res/cardsfolder/upcoming/dire_mimic.txt diff --git a/forge-gui/res/cardsfolder/upcoming/dire_mimic.txt b/forge-gui/res/cardsfolder/upcoming/dire_mimic.txt new file mode 100644 index 00000000000..7e72ea942db --- /dev/null +++ b/forge-gui/res/cardsfolder/upcoming/dire_mimic.txt @@ -0,0 +1,8 @@ +Name:Dire Mimic +ManaCost:2 +Types:Artifact Treasure +K:Flash +A:AB$ Mana | Cost$ T Sac<1/CARDNAME> | Produced$ Any | SpellDescription$ Add one mana of any color. +A:AB$ Animate | Cost$ 3 | Types$ Shapeshifter,Artifact,Creature | Power$ 5 | Toughness$ 5 | StackDescription$ SpellDescription | SpellDescription$ CARDNAME becomes a Shapeshifter artifact creature with base power and toughness 5/5 until end of turn. +DeckHas:Ability$Sacrifice & Type$Shapeshifter +Oracle:Flash\n{T}, Sacrifice Dire Mimic: Add one mana of any color.\n{3}: Dire Mimic becomes a Shapeshifter artifact creature with base power and toughness 5/5 until end of turn. From 0b824698dd3fa116992618587f7812aa86d959eb Mon Sep 17 00:00:00 2001 From: Northmoc Date: Fri, 22 Jul 2022 16:54:01 -0400 Subject: [PATCH 3/8] dragonborn_looter.txt --- forge-gui/res/cardsfolder/upcoming/dragonborn_looter.txt | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 forge-gui/res/cardsfolder/upcoming/dragonborn_looter.txt diff --git a/forge-gui/res/cardsfolder/upcoming/dragonborn_looter.txt b/forge-gui/res/cardsfolder/upcoming/dragonborn_looter.txt new file mode 100644 index 00000000000..37304b06ff5 --- /dev/null +++ b/forge-gui/res/cardsfolder/upcoming/dragonborn_looter.txt @@ -0,0 +1,8 @@ +Name:Dragonborn Looter +ManaCost:1 U +Types:Creature Dragon Rogue +PT:1/2 +A:AB$ Draw | Cost$ 1 T | SubAbility$ DBDiscard | SpellDescription$ Draw a card, then discard a card. +SVar:DBDiscard:DB$ Discard | Mode$ TgtChoose +DeckHas:Ability$Discard +Oracle:{1}, {T}: Draw a card, then discard a card. From 1aeeae74acd9274840ee179a753b0d052e04a332 Mon Sep 17 00:00:00 2001 From: Northmoc Date: Fri, 22 Jul 2022 16:54:13 -0400 Subject: [PATCH 4/8] grixis_battlemage.txt add AI --- forge-gui/res/cardsfolder/g/grixis_battlemage.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/forge-gui/res/cardsfolder/g/grixis_battlemage.txt b/forge-gui/res/cardsfolder/g/grixis_battlemage.txt index 9d4c75a14f8..3954bf976f2 100644 --- a/forge-gui/res/cardsfolder/g/grixis_battlemage.txt +++ b/forge-gui/res/cardsfolder/g/grixis_battlemage.txt @@ -5,4 +5,5 @@ PT:2/2 A:AB$ Draw | Cost$ U T | NumCards$ 1 | SpellDescription$ Draw a card, then discard a card. | SubAbility$ DBDiscard SVar:DBDiscard:DB$ Discard | Defined$ You | NumCards$ 1 | Mode$ TgtChoose A:AB$ Pump | Cost$ R T | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ HIDDEN CARDNAME can't block. | IsCurse$ True | SpellDescription$ Target creature can't block this turn. +DeckHas:Ability$Discard Oracle:{U}, {T}: Draw a card, then discard a card.\n{R}, {T}: Target creature can't block this turn. From 6cf263b6a3d9a175ff47b646c1bc6004cf3ced8c Mon Sep 17 00:00:00 2001 From: Northmoc Date: Fri, 22 Jul 2022 16:54:26 -0400 Subject: [PATCH 5/8] thallid.txt tidy up --- forge-gui/res/cardsfolder/t/thallid.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/forge-gui/res/cardsfolder/t/thallid.txt b/forge-gui/res/cardsfolder/t/thallid.txt index 8eb9dd10619..33ced7f8e6b 100644 --- a/forge-gui/res/cardsfolder/t/thallid.txt +++ b/forge-gui/res/cardsfolder/t/thallid.txt @@ -3,8 +3,8 @@ ManaCost:G Types:Creature Fungus PT:1/1 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ At the beginning of your upkeep, put a spore counter on CARDNAME. -SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ SPORE | CounterNum$ 1 | SpellDescription$ Put a spore counter on CARDNAME. -A:AB$ Token | Cost$ SubCounter<3/SPORE> | TokenAmount$ 1 | TokenScript$ g_1_1_saproling | TokenOwner$ You | SpellDescription$ Create a 1/1 green Saproling creature token. +SVar:TrigPutCounter:DB$ PutCounter | CounterType$ SPORE +A:AB$ Token | Cost$ SubCounter<3/SPORE> | TokenScript$ g_1_1_saproling | SpellDescription$ Create a 1/1 green Saproling creature token. DeckHints:Type$Fungus -DeckHas:Ability$Counters|Token +DeckHas:Ability$Counters|Token & Type$Saproling Oracle:At the beginning of your upkeep, put a spore counter on Thallid.\nRemove three spore counters from Thallid: Create a 1/1 green Saproling creature token. From bc37db49fa365f055b4420741783ebfffb6344fd Mon Sep 17 00:00:00 2001 From: Northmoc Date: Fri, 22 Jul 2022 16:58:56 -0400 Subject: [PATCH 6/8] cut_a_deal.txt --- forge-gui/res/cardsfolder/upcoming/cut_a_deal.txt | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 forge-gui/res/cardsfolder/upcoming/cut_a_deal.txt diff --git a/forge-gui/res/cardsfolder/upcoming/cut_a_deal.txt b/forge-gui/res/cardsfolder/upcoming/cut_a_deal.txt new file mode 100644 index 00000000000..7f6d4bfa731 --- /dev/null +++ b/forge-gui/res/cardsfolder/upcoming/cut_a_deal.txt @@ -0,0 +1,9 @@ +Name:Cut a Deal +ManaCost:2 W +Types:Sorcery +A:SP$ Draw | Defined$ Opponent | RememberDrawn$ True | SubAbility$ DBDraw | SpellDescription$ Each opponent draws a card, then you draw a card for each opponent who drew a card this way. +SVar:DBDraw:DB$ Draw | NumCards$ X | SubAbility$ DBCleanup | StackDescription$ {p:You} draws a card for each opponent who drew a card this way. +SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True +SVar:X:Remembered$Amount +AI:RemoveDeck:Random +Oracle:Each opponent draws a card, then you draw a card for each opponent who drew a card this way. From 7abe34b06fc262ba2d587bc71f6007c2c76f6a1a Mon Sep 17 00:00:00 2001 From: Northmoc Date: Fri, 22 Jul 2022 17:05:12 -0400 Subject: [PATCH 7/8] death_kiss.txt --- forge-gui/res/cardsfolder/upcoming/death_kiss.txt | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 forge-gui/res/cardsfolder/upcoming/death_kiss.txt diff --git a/forge-gui/res/cardsfolder/upcoming/death_kiss.txt b/forge-gui/res/cardsfolder/upcoming/death_kiss.txt new file mode 100644 index 00000000000..e9608ccd5b4 --- /dev/null +++ b/forge-gui/res/cardsfolder/upcoming/death_kiss.txt @@ -0,0 +1,14 @@ +Name:Death Kiss +ManaCost:5 R +Types:Creature Beholder +PT:5/5 +T:Mode$ Attacks | ValidCard$ Creature.OppCtrl | Attacked$ Opponent | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever a creature an opponent controls attacks one of your opponents, double its power until end of turn. +SVar:TrigPump:DB$ Pump | Defined$ TriggeredAttacker | NumAtt$ +Y | Double$ True +SVar:Y:TriggeredAttacker$CardPower +K:Monstrosity:X:X X R +SVar:X:Count$xPaid +T:Mode$ BecomeMonstrous | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigGoad | TriggerDescription$ When CARDNAME becomes monstrous, goad up to X target creatures your opponents control. +SVar:TrigGoad:DB$ Goad | TargetMin$ 0 | TargetMax$ MonstrosityX | ValidTgts$ Creature.OppCtrl | TgtPrompt$ Select up to X target creatures your opponents control +SVar:MonstrosityX:TriggerCount$MonstrosityAmount +AI:RemoveDeck:Random +Oracle:Whenever a creature an opponent controls attacks one of your opponents, double its power until end of turn.\n{X}{X}{R}: Monstrosity X. (If this creature isn't monstrous, put X +1/+1 counters on it and it becomes monstrous.)\nWhen Death Kiss becomes monstrous, goad up to X target creatures your opponents control. From 1f3c2aa15711c960e4a8faf09f3276cee88e978c Mon Sep 17 00:00:00 2001 From: Northmoc Date: Sat, 23 Jul 2022 01:35:53 -0400 Subject: [PATCH 8/8] death_kiss.txt improve AI --- forge-gui/res/cardsfolder/upcoming/death_kiss.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/forge-gui/res/cardsfolder/upcoming/death_kiss.txt b/forge-gui/res/cardsfolder/upcoming/death_kiss.txt index e9608ccd5b4..5ead68d0ebb 100644 --- a/forge-gui/res/cardsfolder/upcoming/death_kiss.txt +++ b/forge-gui/res/cardsfolder/upcoming/death_kiss.txt @@ -11,4 +11,5 @@ T:Mode$ BecomeMonstrous | ValidCard$ Card.Self | TriggerZones$ Battlefield | Exe SVar:TrigGoad:DB$ Goad | TargetMin$ 0 | TargetMax$ MonstrosityX | ValidTgts$ Creature.OppCtrl | TgtPrompt$ Select up to X target creatures your opponents control SVar:MonstrosityX:TriggerCount$MonstrosityAmount AI:RemoveDeck:Random +DeckHas:Ability$Counters Oracle:Whenever a creature an opponent controls attacks one of your opponents, double its power until end of turn.\n{X}{X}{R}: Monstrosity X. (If this creature isn't monstrous, put X +1/+1 counters on it and it becomes monstrous.)\nWhen Death Kiss becomes monstrous, goad up to X target creatures your opponents control.