From 6123cf7fdeb2af7cd2561999aef2fe4de45fdf2c Mon Sep 17 00:00:00 2001 From: Northmoc Date: Sun, 5 Sep 2021 22:21:33 -0400 Subject: [PATCH 1/5] sludge_monster.txt --- forge-gui/res/cardsfolder/upcoming/sludge_monster.txt | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 forge-gui/res/cardsfolder/upcoming/sludge_monster.txt diff --git a/forge-gui/res/cardsfolder/upcoming/sludge_monster.txt b/forge-gui/res/cardsfolder/upcoming/sludge_monster.txt new file mode 100644 index 00000000000..dcfdd1022a6 --- /dev/null +++ b/forge-gui/res/cardsfolder/upcoming/sludge_monster.txt @@ -0,0 +1,11 @@ +Name:Sludge Monster +ManaCost:3 U U +Types:Creature Horror +PT:5/5 +T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPutCounter | TriggerDescription$ Whenever CARDNAME enters the battlefield or attacks, put a slime counter on up to one other target creature. +T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigPutCounter | TriggerZones$ Battlefield | Secondary$ True | TriggerDescription$ Whenever CARDNAME enters the battlefield or attacks, put a slime counter on up to one other target creature. +SVar:TrigPutCounter:DB$ PutCounter | ValidTgts$ Creature.Other | TgtPrompt$ Select up to one other target creature | TargetMin$ 0 | TargetMax$ 1 | CounterType$ SLIME | CounterNum$ 1 +S:Mode$ Continuous | Affected$ Creature.nonHorror+counters_GE1_SLIME | RemoveAllAbilities$ True | SetPower$ 2 | SetToughness$ 2 | Description$ Non-Horror creatures with slime counters on them lose all abilities and have base power and toughness 2/2. +DeckHas:Ability$Counters +SVar:HasAttackEffect:TRUE +Oracle:Whenever Sludge Monster enters the battlefield or attacks, put a slime counter on up to one other target creature.\nNon-Horror creatures with slime counters on them lose all abilities and have base power and toughness 2/2. From c3a083749f135eea8b35bbc0718874f542b79f71 Mon Sep 17 00:00:00 2001 From: Northmoc Date: Sun, 5 Sep 2021 22:58:39 -0400 Subject: [PATCH 2/5] light_up_the_night.txt --- .../res/cardsfolder/upcoming/light_up_the_night.txt | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 forge-gui/res/cardsfolder/upcoming/light_up_the_night.txt diff --git a/forge-gui/res/cardsfolder/upcoming/light_up_the_night.txt b/forge-gui/res/cardsfolder/upcoming/light_up_the_night.txt new file mode 100644 index 00000000000..7268f2c41c3 --- /dev/null +++ b/forge-gui/res/cardsfolder/upcoming/light_up_the_night.txt @@ -0,0 +1,10 @@ +Name:Light Up the Night +ManaCost:X R +Types:Sorcery +A:SP$ DealDamage | Cost$ X R | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select any target | NumDmg$ Z | SpellDescription$ CARDNAME deals X damage to any target. It deals X plus 1 damage instead if that target is a creature or planeswalker. +SVar:X:Count$xPaid +SVar:Y:Targeted$Valid Creature,Planeswalker +SVar:Z:SVar$X/Plus.Y +K:Flashback:XCantBe0 3 R RemoveAnyCounter::If you cast this spell this way, X can't be 0.:{3}{R}, Remove X loyalty counters from among planeswalkers you control +DeckHints:Type$Planeswalker +Oracle:Light Up the Night deals X damage to any target. It deals X plus 1 damage instead if that target is a creature or planeswalker.\nFlashback—{3}{R}, Remove X loyalty counters from among planeswalkers you control. If you cast this spell this way, X can't be 0. (You may cast this card from your graveyard for its flashback cost. Then exile it.) From 85fdda07b70b8945e4872b301352b7da18104059 Mon Sep 17 00:00:00 2001 From: Northmoc Date: Sun, 5 Sep 2021 22:59:46 -0400 Subject: [PATCH 3/5] little more Flashback keyword tweaking - allows exact Oracle wording for complicated costs --- .../java/forge/game/card/CardFactoryUtil.java | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java b/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java index 65af2511ad6..6ee77425263 100644 --- a/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java +++ b/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java @@ -2170,19 +2170,28 @@ public class CardFactoryUtil { sb.append("Event$ Moved | ValidCard$ Card.Self | Origin$ Stack | ExcludeDestination$ Exile "); sb.append("| ValidStackSa$ Spell.Flashback | Description$ Flashback"); - if (keyword.contains(":")) { // K:Flashback:Cost:ExtraParam(Key$Value):ExtraDescription + if (keyword.contains(":")) { // K:Flashback:Cost:ExtraParam(Key$Value):ExtraDescription:Cost(for formatting) final String[] k = keyword.split(":"); final Cost cost = new Cost(k[1], false); sb.append(cost.isOnlyManaCost() ? " " : "—"); - sb.append(cost.toSimpleString()); + String prettyCost = k.length > 4 ? k[4] : ""; + if (!prettyCost.isEmpty()) { + sb.append(prettyCost); + } else { + sb.append(cost.toSimpleString()); + } if (!cost.isOnlyManaCost()) { sb.append("."); } String extraDesc = k.length > 3 ? k[3] : ""; if (!extraDesc.isEmpty()) { - sb.append(". ").append(extraDesc); + if (!cost.isOnlyManaCost()) { + sb.append(" ").append(extraDesc); + } else { + sb.append(". ").append(extraDesc); + } } } From 552d08207473c9d4d63c64ad8794ec7783736f32 Mon Sep 17 00:00:00 2001 From: Northmoc Date: Sun, 5 Sep 2021 23:00:38 -0400 Subject: [PATCH 4/5] primeval_titan.txt typos --- forge-gui/res/cardsfolder/p/primeval_titan.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/forge-gui/res/cardsfolder/p/primeval_titan.txt b/forge-gui/res/cardsfolder/p/primeval_titan.txt index 81ec521fcf2..9dec655c7ea 100644 --- a/forge-gui/res/cardsfolder/p/primeval_titan.txt +++ b/forge-gui/res/cardsfolder/p/primeval_titan.txt @@ -3,9 +3,8 @@ ManaCost:4 G G Types:Creature Giant PT:6/6 K:Trample -T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.Self | Execute$ TrigChange | OptionalDecider$ You | TriggerDescription$ When CARDNAME enters the battlefield or attacks, you may search your library for up to two land cards, put them onto the battlefield tapped, then shuffle. +T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChange | OptionalDecider$ You | TriggerDescription$ Whenever CARDNAME enters the battlefield or attacks, you may search your library for up to two land cards, put them onto the battlefield tapped, then shuffle. T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigChange | TriggerZones$ Battlefield | OptionalDecider$ You | Secondary$ True | TriggerDescription$ Whenever CARDNAME enters the battlefield or attacks, you may search your library for up to two land cards, put them onto the battlefield tapped, then shuffle. SVar:TrigChange:DB$ChangeZone | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land | ChangeNum$ 2 | ShuffleNonMandatory$ True SVar:HasAttackEffect:TRUE -SVar:Picture:http://www.wizards.com/global/images/magic/general/primeval_titan.jpg Oracle:Trample\nWhenever Primeval Titan enters the battlefield or attacks, you may search your library for up to two land cards, put them onto the battlefield tapped, then shuffle. From fd38b52007173d9e380dcff3af08a16e763df0b9 Mon Sep 17 00:00:00 2001 From: Northmoc Date: Sun, 5 Sep 2021 23:15:24 -0400 Subject: [PATCH 5/5] rite_of_harmony.txt (Suthro) --- forge-gui/res/cardsfolder/upcoming/rite_of_harmony.txt | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 forge-gui/res/cardsfolder/upcoming/rite_of_harmony.txt diff --git a/forge-gui/res/cardsfolder/upcoming/rite_of_harmony.txt b/forge-gui/res/cardsfolder/upcoming/rite_of_harmony.txt new file mode 100644 index 00000000000..94daba88415 --- /dev/null +++ b/forge-gui/res/cardsfolder/upcoming/rite_of_harmony.txt @@ -0,0 +1,9 @@ +Name:Rite of Harmony +ManaCost:G W +Types:Instant +K:Flashback:2 G W +A:SP$ Effect | Triggers$ CreatureEnchantmentETB | SpellDescription$ Whenever a creature or enchantment enters the battlefield under your control this turn, draw a card. +SVar:CreatureEnchantmentETB:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.YouCtrl,Enchantment.YouCtrl | TriggerZones$ Command | Execute$ TrigDraw | TriggerDescription$ Whenever a creature or enchantment enters the battlefield under your control this turn, draw a card. +SVar:TrigDraw:DB$ Draw | Defined$ You | NumCards$ 1 +DeckHints:Type$Enchantment +Oracle:Whenever a creature or enchantment enters the battlefield under your control this turn, draw a card.\nFlashback {2}{G}{W} (You may cast this card from your graveyard for its flashback cost. Then exile it.)