From 6950f58bfc4d28fed0e8399a3b4d98ac6bcaf0ee Mon Sep 17 00:00:00 2001 From: Simisays <67333662+Simisays@users.noreply.github.com> Date: Fri, 30 Jun 2023 12:27:24 +0200 Subject: [PATCH 1/2] update --- .../java/forge/game/card/CounterEnumType.java | 2 ++ .../res/cardsfolder/upcoming/mirkwood_elk.txt | 15 +++++++++++++++ .../upcoming/of_herbs_and_stewed_rabbit.txt | 12 ++++++++++++ forge-gui/res/cardsfolder/upcoming/prize_pig.txt | 14 ++++++++++++++ .../cardsfolder/upcoming/raise_the_palisade.txt | 6 ++++++ .../upcoming/rampaging_war_mammoth.txt | 11 +++++++++++ 6 files changed, 60 insertions(+) create mode 100644 forge-gui/res/cardsfolder/upcoming/mirkwood_elk.txt create mode 100644 forge-gui/res/cardsfolder/upcoming/of_herbs_and_stewed_rabbit.txt create mode 100644 forge-gui/res/cardsfolder/upcoming/prize_pig.txt create mode 100644 forge-gui/res/cardsfolder/upcoming/raise_the_palisade.txt create mode 100644 forge-gui/res/cardsfolder/upcoming/rampaging_war_mammoth.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 9afa9a33e02..1dd23c0a5c2 100644 --- a/forge-game/src/main/java/forge/game/card/CounterEnumType.java +++ b/forge-game/src/main/java/forge/game/card/CounterEnumType.java @@ -310,6 +310,8 @@ public enum CounterEnumType { REPRIEVE("REPR", 240, 120, 50), REJECTION("REJECT", 212, 235, 242), + + RIBBON("RIBBON", 233, 245, 232), RITUAL("RITUAL", 155, 17, 30), diff --git a/forge-gui/res/cardsfolder/upcoming/mirkwood_elk.txt b/forge-gui/res/cardsfolder/upcoming/mirkwood_elk.txt new file mode 100644 index 00000000000..63be65c661a --- /dev/null +++ b/forge-gui/res/cardsfolder/upcoming/mirkwood_elk.txt @@ -0,0 +1,15 @@ +Name:Mirkwood Elk +ManaCost:5 G +Types:Creature Elk +PT:6/6 +K:Trample +T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChange | TriggerDescription$ Whenever CARDNAME enters the battlefield or attacks, return target Elf card from your graveyard to your hand. You gain life equal to that card's power. +T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigChange | TriggerZones$ Battlefield | Secondary$ True | TriggerDescription$ Whenever CARDNAME enters the battlefield or attacks, return target Elf card from your graveyard to your hand. You gain life equal to that card's power. +SVar:TrigChange:DB$ ChangeZone | Origin$ Graveyard | Destination$ Hand | ValidTgts$ Elf.YouOwn | RememberChanged$ True | SubAbility$ DBGainLife +SVar:DBGainLife:DB$ GainLife | Defined$ You | LifeAmount$ X | SubAbility$ DBCleanup +SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True +SVar:X:Remembered$CardPower +SVar:HasAttackEffect:TRUE +DeckHas:Ability$LifeGain +DeckHints:Type$Elf|Graveyard +Oracle:Trample\nWhenever Mirkwood Elk enters the battlefield or attacks, return target Elf card from your graveyard to your hand. You gain life equal to that card's power. \ No newline at end of file diff --git a/forge-gui/res/cardsfolder/upcoming/of_herbs_and_stewed_rabbit.txt b/forge-gui/res/cardsfolder/upcoming/of_herbs_and_stewed_rabbit.txt new file mode 100644 index 00000000000..2d6096f4717 --- /dev/null +++ b/forge-gui/res/cardsfolder/upcoming/of_herbs_and_stewed_rabbit.txt @@ -0,0 +1,12 @@ +Name:Of Herbs and Stewed Rabbit +ManaCost:2 W +Types:Enchantment Saga +K:Saga:3:DBPutCounter,DBDraw,DBHalfing +SVar:DBPutCounter:DB$ PutCounter | ValidTgts$ Creature | TargetMin$ 0 | TargetMax$ 1 | TgtPrompt$ Select up to one target creature | CounterType$ P1P1 | SubAbility$ DBFood | SpellDescription$ Put a +1/+1 counter on up to one target creature. Create a Food token. +SVar:DBFood:DB$ Token | TokenAmount$ 1 | ValidTgts$ Opponent | TokenAmount$ 1 | TokenScript$ c_a_food_sac +SVar:DBDraw:DB$ Draw | SubAbility$ DBFood | SpellDescription$ Draw a card. Create a Food token. +SVar:DBHalfing:DB$ Token | TokenAmount$ X | TokenScript$ w_1_1_halfling | SpellDescription$ Create a 1/1 white Halfling creature token for each Food you control. +SVar:X:Count$Valid Food.YouCtrl +DeckHas:Ability$Token|Sacrifice|Counters & Type$Artifact|Food|Halfling +DeckHints:Type$Food +Oracle:(As this Saga enters and after your draw step, add a lore counter. Sacrifice after III.)\nI — Put a +1/+1 counter on up to one target creature. Create a Food token.\nII — Draw a card. Create a Food token.\nIII — Create a 1/1 white Halfling creature token for each Food you control. \ No newline at end of file diff --git a/forge-gui/res/cardsfolder/upcoming/prize_pig.txt b/forge-gui/res/cardsfolder/upcoming/prize_pig.txt new file mode 100644 index 00000000000..f8e17de08f0 --- /dev/null +++ b/forge-gui/res/cardsfolder/upcoming/prize_pig.txt @@ -0,0 +1,14 @@ +Name:Prize Pig +ManaCost:1 G +Types:Creature Boar +PT:0/3 +T:Mode$ LifeGained | TriggerZones$ Battlefield | ValidPlayer$ You | Execute$ TrigPutCounter | TriggerDescription$ Whenever you gain life, put that many ribbon counters on CARDNAME. Then if there are three or more ribbon counters on CARDNAME, remove those counters and untap it. +SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ RIBBON | CounterNum$ 1 | SubAbility$ DBRemoveCounters +SVar:DBRemoveCounters:DB$ RemoveCounter | CounterType$ RIBBON | CounterNum$ All | RememberRemoved$ True | ConditionDefined$ Self | ConditionPresent$ Card.counters_GE3_RIBBON | SubAbility$ DBUntap +SVar:DBUntap:DB$ Untap | ConditionCheckSVar$ X | SubAbility$ DBCleanup +SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True +SVar:X:Count$RememberedSize +A:AB$ Mana | Cost$ T | Produced$ Any | SpellDescription$ Add one mana of any color. +DeckHints:Ability$LifeGain +DeckHas:Ability$Counters +Oracle:Whenever you gain life, put that many ribbon counters on Prize Pig. Then if there are three or more ribbon counters on Prize Pig, remove those counters and untap it.\n{T}: Add one mana of any color. diff --git a/forge-gui/res/cardsfolder/upcoming/raise_the_palisade.txt b/forge-gui/res/cardsfolder/upcoming/raise_the_palisade.txt new file mode 100644 index 00000000000..0cbd89b5dec --- /dev/null +++ b/forge-gui/res/cardsfolder/upcoming/raise_the_palisade.txt @@ -0,0 +1,6 @@ +Name:Raise the Palisade +ManaCost:4 U +Types:Sorcery +A:SP$ ChooseType | Defined$ You | Type$ Creature | SubAbility$ DBReturnAll | AILogic$ MostProminentComputerControls | SpellDescription$ Choose a creature type. Return all creatures that aren't of the chosen type to their owners' hands. +SVar:DBReturnAll:DB$ ChangeZoneAll | ChangeType$ Creature.IsNotChosenType | Origin$ Battlefield | Destination$ Hand +Oracle:Choose a creature type. Return all creatures that aren't of the chosen type to their owners' hands. \ No newline at end of file diff --git a/forge-gui/res/cardsfolder/upcoming/rampaging_war_mammoth.txt b/forge-gui/res/cardsfolder/upcoming/rampaging_war_mammoth.txt new file mode 100644 index 00000000000..7628bfe3a75 --- /dev/null +++ b/forge-gui/res/cardsfolder/upcoming/rampaging_war_mammoth.txt @@ -0,0 +1,11 @@ +Name:Rampaging War Mammoth +ManaCost:5 R R +Types:Creature Elephant +PT:9/7 +K:Trample +K:Cycling:X 2 R +T:Mode$ Cycled | ValidCard$ Card.Self | Execute$ TrigDestroy | TriggerDescription$ When you cycle Rampaging War Mammoth, destroy up to X target artifacts. +SVar:TrigDestroy:DB$ Destroy | ValidTgts$ Artifact | TgtPrompt$ Select up to X target artifacts | TargetMin$ 0 | TargetMax$ X +SVar:X:Count$xPaid +DeckHas:Ability$Discard +Oracle:Trample\nCycling {X}{2}{R} ({X}{2}{R}, Discard this card: Draw a card.)\nWhen you cycle Rampaging War Mammoth, destroy up to X target artifacts. \ No newline at end of file From 83f94b642c237d7ff978b70370ee342329e0bc10 Mon Sep 17 00:00:00 2001 From: Simisays <67333662+Simisays@users.noreply.github.com> Date: Fri, 30 Jun 2023 12:39:49 +0200 Subject: [PATCH 2/2] update --- .../res/cardsfolder/upcoming/of_herbs_and_stewed_rabbit.txt | 2 +- forge-gui/res/cardsfolder/upcoming/prize_pig.txt | 3 ++- forge-gui/res/cardsfolder/upcoming/rampaging_war_mammoth.txt | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/forge-gui/res/cardsfolder/upcoming/of_herbs_and_stewed_rabbit.txt b/forge-gui/res/cardsfolder/upcoming/of_herbs_and_stewed_rabbit.txt index 2d6096f4717..93f0a3fcd71 100644 --- a/forge-gui/res/cardsfolder/upcoming/of_herbs_and_stewed_rabbit.txt +++ b/forge-gui/res/cardsfolder/upcoming/of_herbs_and_stewed_rabbit.txt @@ -3,7 +3,7 @@ ManaCost:2 W Types:Enchantment Saga K:Saga:3:DBPutCounter,DBDraw,DBHalfing SVar:DBPutCounter:DB$ PutCounter | ValidTgts$ Creature | TargetMin$ 0 | TargetMax$ 1 | TgtPrompt$ Select up to one target creature | CounterType$ P1P1 | SubAbility$ DBFood | SpellDescription$ Put a +1/+1 counter on up to one target creature. Create a Food token. -SVar:DBFood:DB$ Token | TokenAmount$ 1 | ValidTgts$ Opponent | TokenAmount$ 1 | TokenScript$ c_a_food_sac +SVar:DBFood:DB$ Token | TokenAmount$ 1 | TokenScript$ c_a_food_sac SVar:DBDraw:DB$ Draw | SubAbility$ DBFood | SpellDescription$ Draw a card. Create a Food token. SVar:DBHalfing:DB$ Token | TokenAmount$ X | TokenScript$ w_1_1_halfling | SpellDescription$ Create a 1/1 white Halfling creature token for each Food you control. SVar:X:Count$Valid Food.YouCtrl diff --git a/forge-gui/res/cardsfolder/upcoming/prize_pig.txt b/forge-gui/res/cardsfolder/upcoming/prize_pig.txt index f8e17de08f0..83258c7c318 100644 --- a/forge-gui/res/cardsfolder/upcoming/prize_pig.txt +++ b/forge-gui/res/cardsfolder/upcoming/prize_pig.txt @@ -3,11 +3,12 @@ ManaCost:1 G Types:Creature Boar PT:0/3 T:Mode$ LifeGained | TriggerZones$ Battlefield | ValidPlayer$ You | Execute$ TrigPutCounter | TriggerDescription$ Whenever you gain life, put that many ribbon counters on CARDNAME. Then if there are three or more ribbon counters on CARDNAME, remove those counters and untap it. -SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ RIBBON | CounterNum$ 1 | SubAbility$ DBRemoveCounters +SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ RIBBON | CounterNum$ Y | SubAbility$ DBRemoveCounters SVar:DBRemoveCounters:DB$ RemoveCounter | CounterType$ RIBBON | CounterNum$ All | RememberRemoved$ True | ConditionDefined$ Self | ConditionPresent$ Card.counters_GE3_RIBBON | SubAbility$ DBUntap SVar:DBUntap:DB$ Untap | ConditionCheckSVar$ X | SubAbility$ DBCleanup SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True SVar:X:Count$RememberedSize +SVar:Y:TriggerCount$LifeAmount A:AB$ Mana | Cost$ T | Produced$ Any | SpellDescription$ Add one mana of any color. DeckHints:Ability$LifeGain DeckHas:Ability$Counters diff --git a/forge-gui/res/cardsfolder/upcoming/rampaging_war_mammoth.txt b/forge-gui/res/cardsfolder/upcoming/rampaging_war_mammoth.txt index 7628bfe3a75..0755ee465d3 100644 --- a/forge-gui/res/cardsfolder/upcoming/rampaging_war_mammoth.txt +++ b/forge-gui/res/cardsfolder/upcoming/rampaging_war_mammoth.txt @@ -4,7 +4,7 @@ Types:Creature Elephant PT:9/7 K:Trample K:Cycling:X 2 R -T:Mode$ Cycled | ValidCard$ Card.Self | Execute$ TrigDestroy | TriggerDescription$ When you cycle Rampaging War Mammoth, destroy up to X target artifacts. +T:Mode$ Cycled | ValidCard$ Card.Self | Execute$ TrigDestroy | TriggerDescription$ When you cycle CARDNAME, destroy up to X target artifacts. SVar:TrigDestroy:DB$ Destroy | ValidTgts$ Artifact | TgtPrompt$ Select up to X target artifacts | TargetMin$ 0 | TargetMax$ X SVar:X:Count$xPaid DeckHas:Ability$Discard