From 5165c1623341e624dad8209152af6046024a0c9d Mon Sep 17 00:00:00 2001 From: Hanmac Date: Sat, 19 Jan 2019 07:57:08 +0100 Subject: [PATCH] Fix for upcoming cards --- .../game/staticability/StaticAbilityContinuous.java | 10 ++++++---- forge-gui/res/cardsfolder/l/liege_of_the_tangle.txt | 5 ++--- forge-gui/res/cardsfolder/t/transguild_courier.txt | 5 ++--- .../res/cardsfolder/upcoming/electrodominance.txt | 2 +- .../res/cardsfolder/upcoming/ethereal_absolution.txt | 4 +++- .../res/cardsfolder/upcoming/goblin_gathering.txt | 3 ++- .../cardsfolder/upcoming/knight_of_the_last_breath.txt | 3 ++- forge-gui/res/cardsfolder/upcoming/sharktocrab.txt | 2 +- .../cardsfolder/upcoming/sphinx_of_the_guildpact.txt | 2 +- forge-gui/res/cardsfolder/upcoming/watchful_giant.txt | 3 ++- 10 files changed, 22 insertions(+), 17 deletions(-) diff --git a/forge-game/src/main/java/forge/game/staticability/StaticAbilityContinuous.java b/forge-game/src/main/java/forge/game/staticability/StaticAbilityContinuous.java index 63e71ca52a1..feb5fd659c2 100644 --- a/forge-game/src/main/java/forge/game/staticability/StaticAbilityContinuous.java +++ b/forge-game/src/main/java/forge/game/staticability/StaticAbilityContinuous.java @@ -336,9 +336,10 @@ public final class StaticAbilityContinuous { final String colors = params.get("AddColor"); if (colors.equals("ChosenColor")) { addColors = CardUtil.getShortColorsString(hostCard.getChosenColors()); + } else if (colors.equals("All")) { + addColors = "W U B R G"; } else { - addColors = CardUtil.getShortColorsString(new ArrayList(Arrays.asList(colors.split( - " & ")))); + addColors = CardUtil.getShortColorsString(Arrays.asList(colors.split(" & "))); } } @@ -346,9 +347,10 @@ public final class StaticAbilityContinuous { final String colors = params.get("SetColor"); if (colors.equals("ChosenColor")) { addColors = CardUtil.getShortColorsString(hostCard.getChosenColors()); + } else if (colors.equals("All")) { + addColors = "W U B R G"; } else { - addColors = CardUtil.getShortColorsString(new ArrayList(Arrays.asList( - colors.split(" & ")))); + addColors = CardUtil.getShortColorsString(Arrays.asList(colors.split(" & "))); } se.setOverwriteColors(true); } diff --git a/forge-gui/res/cardsfolder/l/liege_of_the_tangle.txt b/forge-gui/res/cardsfolder/l/liege_of_the_tangle.txt index 3ed7075e00b..c9fbe4af558 100644 --- a/forge-gui/res/cardsfolder/l/liege_of_the_tangle.txt +++ b/forge-gui/res/cardsfolder/l/liege_of_the_tangle.txt @@ -3,12 +3,11 @@ ManaCost:6 G G Types:Creature Elemental PT:8/8 K:Trample -S:Mode$ Continuous | Affected$ Card.counters_GE1_AWAKENING | AddType$ Creature & Elemental | SetColor$ Green | SetPower$ 8 | SetToughness$ 8 T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigPutCounter | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, you may choose any number of target lands you control and put an awakening counter on each of them. Each of those lands is an 8/8 green Elemental creature for as long as it has an awakening counter on it. They're still lands. SVar:TrigPutCounter:DB$ PutCounter | ValidTgts$ Land.YouCtrl | OptionalDecider$ You | TargetMin$ 0 | TargetMax$ X | TgtPrompt$ Select lands you control | CounterType$ AWAKENING | CounterNum$ 1 | SubAbility$ DBEffect | References$ X SVar:X:Count$Valid Land.YouCtrl -SVar:DBEffect:DB$ Effect | Name$ Awakening Effect | StaticAbilities$ KWAnimateAll | Unique$ True | Duration$ Permanent -SVar:KWAnimateAll:Mode$ Continuous | EffectZone$ Command | Affected$ Card.counters_GE1_AWAKENING | SetPower$ 8 | SetToughness$ 8 | AddType$ Creature & Elemental | SetColor$ Green | Description$ Each of those lands is an 8/8 green Elemental creature for as long as it has an awakening counter on it. They're still lands. +SVar:DBEffect:DB$ Effect | Name$ Awakening Effect | StaticAbilities$ KWAnimateAll | Duration$ Permanent | RememberObjects$ Targeted +SVar:KWAnimateAll:Mode$ Continuous | EffectZone$ Command | Affected$ Card.IsRemembered+counters_GE1_AWAKENING | SetPower$ 8 | SetToughness$ 8 | AddType$ Creature & Elemental | SetColor$ Green | Description$ Each of those lands is an 8/8 green Elemental creature for as long as it has an awakening counter on it. They're still lands. SVar:MustBeBlocked:True SVar:Picture:http://www.wizards.com/global/images/magic/general/liege_of_the_tangle.jpg Oracle:Trample\nWhenever Liege of the Tangle deals combat damage to a player, you may choose any number of target lands you control and put an awakening counter on each of them. Each of those lands is an 8/8 green Elemental creature for as long as it has an awakening counter on it. They're still lands. diff --git a/forge-gui/res/cardsfolder/t/transguild_courier.txt b/forge-gui/res/cardsfolder/t/transguild_courier.txt index ca031b01d62..43ff467cc3a 100644 --- a/forge-gui/res/cardsfolder/t/transguild_courier.txt +++ b/forge-gui/res/cardsfolder/t/transguild_courier.txt @@ -1,8 +1,7 @@ Name:Transguild Courier ManaCost:4 Types:Artifact Creature Golem -Text:CARDNAME is all colors (even if this card isn't on the battlefield). +S:Mode$ Continuous | EffectZone$ All | Affected$ Card.Self | CharacteristicDefining$ True | SetColor$ All | Description$ CARDNAME is all colors. PT:3/3 -Colors:white,blue,black,red,green SVar:Picture:http://www.wizards.com/global/images/magic/general/transguild_courier.jpg -Oracle: +Oracle:Transguild Courier is all colors diff --git a/forge-gui/res/cardsfolder/upcoming/electrodominance.txt b/forge-gui/res/cardsfolder/upcoming/electrodominance.txt index 40b9dcfd14e..9d272b3eea8 100644 --- a/forge-gui/res/cardsfolder/upcoming/electrodominance.txt +++ b/forge-gui/res/cardsfolder/upcoming/electrodominance.txt @@ -2,6 +2,6 @@ Name:Electrodominance ManaCost:X R R Types:Instant A:SP$ DealDamage | Cost$ X R R | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select any target | NumDmg$ X | References$ X | SubAbility$ DBPlay | SpellDescription$ CARDNAME deals X damage to any target. You may cast a card with converted mana cost X or less from your hand without paying its mana cost. -SVar:DBPlay:DB$ Play | Valid$ Targeted.cmcLEX+YouCtrl | ValidZone$ Hand | WithoutManaCost$ True | Amount$ 1 | Controller$ You | Optional$ True | References$ X +SVar:DBPlay:DB$ Play | Valid$ Card.nonLand+YouOwn+cmcLEX | ValidZone$ Hand | WithoutManaCost$ True | Amount$ 1 | Controller$ You | Optional$ True | References$ X SVar:X:Count$xPaid Oracle:Electrodominance deals X damage to any target. You may cast a card with converted mana cost X or less from your hand without paying its mana cost. diff --git a/forge-gui/res/cardsfolder/upcoming/ethereal_absolution.txt b/forge-gui/res/cardsfolder/upcoming/ethereal_absolution.txt index 11450772185..288224e09e9 100644 --- a/forge-gui/res/cardsfolder/upcoming/ethereal_absolution.txt +++ b/forge-gui/res/cardsfolder/upcoming/ethereal_absolution.txt @@ -6,5 +6,7 @@ S:Mode$ Continuous | Affected$ Creature.OppCtrl | AddPower$ -1 | AddToughness$ - SVar:PlayMain1:TRUE SVar:RemRandomDeck:True A:AB$ ChangeZone | Cost$ 4 W B | Origin$ Graveyard | Destination$ Exile | ValidTgts$ Card.OppOwn | SubAbility$ DBToken | SpellDescription$ Exile target card from an opponent's graveyard. If it was a creature card, you create a 1/1 white and black Spirit creature token with flying. -SVar:DBToken:DB$ Token | ConditionDefined$ Targeted | ConditionPresent$ Creature | ConditionCompare$ EQ1 | TokenAmount$ 1 | TokenName$ Spirit | TokenTypes$ Creature,Spirit | TokenOwner$ You | TokenColors$ White,Black | TokenPower$ 1 | TokenToughness$ 1 | TokenKeywords$ Flying | SubAbility$ DBCleanup +SVar:DBToken:DB$ Token | ConditionDefined$ Targeted | ConditionPresent$ Creature | ConditionCompare$ EQ1 | TokenAmount$ 1 | TokenScript$ wb_1_1_spirit_flying | TokenOwner$ You | SubAbility$ DBCleanup +SVar:DBCleanup:DB$Cleanup | ClearRemembered$ True +DeckHas:Ability$Token Oracle:Creatures you control get +1/+1.\nCreatures your opponents control get -1/-1.\n{2}{W}{B}: Exile target card from an opponent's graveyard. If it was a creature card, you create a 1/1 white and black Spirit creature token with flying. diff --git a/forge-gui/res/cardsfolder/upcoming/goblin_gathering.txt b/forge-gui/res/cardsfolder/upcoming/goblin_gathering.txt index 0e43db0e315..af886dfda2a 100644 --- a/forge-gui/res/cardsfolder/upcoming/goblin_gathering.txt +++ b/forge-gui/res/cardsfolder/upcoming/goblin_gathering.txt @@ -1,7 +1,8 @@ Name:Goblin Gathering ManaCost:2 R Types:Sorcery -A:SP$ Token | Cost$ 2 R | TokenAmount$ X | TokenName$ Goblin | TokenTypes$ Creature,Goblin | TokenOwner$ You | TokenColors$ Red | TokenPower$ 1 | TokenToughness$ 1 | References$ X | SpellDescription$ Create a number of 1/1 red Goblin creature tokens equal to two plus the number of cards named CARDNAME in your graveyard. +A:SP$ Token | Cost$ 2 R | TokenAmount$ X | TokenScript$ r_1_1_goblin | TokenOwner$ You | References$ X | SpellDescription$ Create a number of 1/1 red Goblin creature tokens equal to two plus the number of cards named CARDNAME in your graveyard. SVar:X:Count$ValidGraveyard Card.YouOwn+namedGoblin Gathering/Plus.2 DeckHints:Name$Goblin Gathering +DeckHas:Ability$Token Oracle:Create a number of 1/1 red Goblin creature tokens equal to two plus the number of cards named Goblin Gathering in your graveyard. diff --git a/forge-gui/res/cardsfolder/upcoming/knight_of_the_last_breath.txt b/forge-gui/res/cardsfolder/upcoming/knight_of_the_last_breath.txt index d826e2ebb6c..cb4c548f5ad 100644 --- a/forge-gui/res/cardsfolder/upcoming/knight_of_the_last_breath.txt +++ b/forge-gui/res/cardsfolder/upcoming/knight_of_the_last_breath.txt @@ -2,7 +2,8 @@ Name:Knight of the Last Breath ManaCost:5 W B Types:Creature Giant Knight PT:4/4 -A:AB$ Token | Cost$ 3 Sac<1/Creature.nonToken+Other/another creature> | TokenAmount$ 1 | TokenName$ Spirit | TokenTypes$ Creature,Spirit | TokenOwner$ You | TokenColors$ White,Black | TokenPower$ 1 | TokenToughness$ 1 | TokenKeywords$ Flying | SpellDescription$ Create a 1/1 white and black Spirit creature token with flying. +A:AB$ Token | Cost$ 3 Sac<1/Creature.nonToken+Other/another creature> | TokenAmount$ 1 | TokenScript$ wb_1_1_spirit_flying | TokenOwner$ You | SpellDescription$ Create a 1/1 white and black Spirit creature token with flying. SVar:RemRandomDeck:True K:Afterlife:3 +DeckHas:Ability$Token Oracle:{3}, Sacrifice another nontoken creature: Create a 1/1 white and black Spirit creature token with flying.\nAfterlife 3 (When this creature dies, create three 1/1 white and black Spirit creature tokens with flying.) diff --git a/forge-gui/res/cardsfolder/upcoming/sharktocrab.txt b/forge-gui/res/cardsfolder/upcoming/sharktocrab.txt index ca3af405231..6c878bed090 100644 --- a/forge-gui/res/cardsfolder/upcoming/sharktocrab.txt +++ b/forge-gui/res/cardsfolder/upcoming/sharktocrab.txt @@ -2,7 +2,7 @@ Name:Sharktocrab ManaCost:2 G U Types:Creature Fish Octopus Crab PT:4/4 -K:Adapt:1 +K:Adapt:2 G U:1 DeckHas:Ability$Counters T:Mode$ CounterAddedOnce | ValidCard$ Card.Self | TriggerZones$ Battlefield | CounterType$ P1P1 | Execute$ TrigTap | TriggerDescription$ Whenever one or more +1/+1 counter are put on CARDNAME, tap target creature an opponent controls. That creature doesn't untap during its controller's next untap step. SVar:TrigTap:DB$ Tap | ValidTgts$ Creature.OppCtrl | TgtPrompt$ Choose target creature an opponent controls. | SubAbility$ DBPump diff --git a/forge-gui/res/cardsfolder/upcoming/sphinx_of_the_guildpact.txt b/forge-gui/res/cardsfolder/upcoming/sphinx_of_the_guildpact.txt index 942bcf5ab61..b782846b8d5 100644 --- a/forge-gui/res/cardsfolder/upcoming/sphinx_of_the_guildpact.txt +++ b/forge-gui/res/cardsfolder/upcoming/sphinx_of_the_guildpact.txt @@ -2,7 +2,7 @@ Name:Sphinx of the Guildpact ManaCost:7 Types:Artifact Creature Sphinx PT:5/5 -K:CARDNAME is all colors. +S:Mode$ Continuous | EffectZone$ All | Affected$ Card.Self | CharacteristicDefining$ True | SetColor$ All | Description$ CARDNAME is all colors. K:Flying K:Hexproof:Card.MonoColor:monocolored Oracle:Sphinx of the Guildpact is all colors.\nFlying\nHexproof from monocolored (This creature can't be the target of monocolored spells or abilities your opponents control.) diff --git a/forge-gui/res/cardsfolder/upcoming/watchful_giant.txt b/forge-gui/res/cardsfolder/upcoming/watchful_giant.txt index d8d5bbdb6a8..d214f346e1e 100644 --- a/forge-gui/res/cardsfolder/upcoming/watchful_giant.txt +++ b/forge-gui/res/cardsfolder/upcoming/watchful_giant.txt @@ -3,6 +3,7 @@ ManaCost:5 W Types:Creature Giant Soldier PT:3/6 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters the battlefield, create a 1/1 white Human creature token. -SVar:TrigToken:DB$Token | TokenAmount$ 1 | TokenName$ Human | TokenTypes$ Creature,Human | TokenOwner$ You | TokenColors$ White | TokenPower$ 1 | TokenToughness$ 1 | SpellDescription$ Create a 1/1 white Human creature token. +SVar:TrigToken:DB$Token | TokenAmount$ 1 | TokenScript$ w_1_1_human | TokenOwner$ You | SpellDescription$ Create a 1/1 white Human creature token. DeckHints:Type$Human +DeckHas:Ability$Token Oracle:When Watchful Giant enters the battlefield, create a 1/1 white Human creature token.