From 929b5fbcfef3d6f3f1ad901ea9388ab0cf3a68f8 Mon Sep 17 00:00:00 2001 From: Chris H Date: Mon, 21 Jan 2019 20:39:25 -0500 Subject: [PATCH] Fix some more broken cards --- forge-gui/res/cardsfolder/upcoming/deface.txt | 9 +++------ forge-gui/res/cardsfolder/upcoming/final_payment.txt | 2 +- forge-gui/res/cardsfolder/upcoming/incubation_druid.txt | 8 ++++---- .../cardsfolder/upcoming/priest_of_forgotten_gods.txt | 2 +- 4 files changed, 9 insertions(+), 12 deletions(-) diff --git a/forge-gui/res/cardsfolder/upcoming/deface.txt b/forge-gui/res/cardsfolder/upcoming/deface.txt index b957bfeb2fd..9002c21a88c 100644 --- a/forge-gui/res/cardsfolder/upcoming/deface.txt +++ b/forge-gui/res/cardsfolder/upcoming/deface.txt @@ -1,10 +1,7 @@ Name:Deface ManaCost:R Types:Sorcery -A:SP$ ChooseCard | Cost$ R | Defined$ You | Choices$ Player | ChoiceZone$ Exile | Amount$ 1 | RememberChosen$ True | SVar$ Choose one -2/-4 if you choose one -1/+4 Choose one -1/+4. Choose one -1/+4 Choose one -1/+4. | ChoiceZone$ Exile | RememberChosen$ True | SubAbility$ DBChoose -SVar:DBChoose:DB$ ChooseCard | Defined$ You | Choices$ Player.IsRemembered | ChoiceZone$ Exile | Amount$ 1 | RememberChosen$ True | Choices$ Card.IsRemembered | ChoiceZone$ Choose one to one -1/+1 | RememberChosen$ True -A:SP$ ChooseCard | Cost$ R | Defined$ You | Choices$ Player | ChoiceZone$ Exile | Amount$ 1 | RememberChosen$ True | SVar$ Choose one -2/-4 if you choose one -1/+4 Choose one -1/+4. Choose one -1/+4 Choose one -1/+4. | ChoiceZone$ Exile | RememberChosen$ True | SubAbility$ DBChoose -SVar:DBChoose:DB$ ChooseCard | Defined$ You | Choices$ Player.IsRemembered | ChoiceZone$ Exile | Amount$ 1 | RememberChosen$ True | Choices$ Card.IsRemembered | ChoiceZone$ Choose one to one -1/+1 | RememberChosen$ True -A:SP$ ChooseCard | Cost$ R | Defined$ You | Choices$ Player | ChoiceZone$ Exile | Amount$ 1 | RememberChosen$ True | SVar$ Choose one -2/-4 if you choose one -1/+4 Choose one -1/+4. Choose one -1/+4 Choose one -1/+4. | ChoiceZone$ Exile | RememberChosen$ True | SubAbility$ DBChoose -SVar:DBChoose:DB$ ChooseCard | Defined$ You | Choices$ Player.IsRemembered | ChoiceZone$ Exile | Amount$ 1 | RememberChosen$ True | Choices$ Card.IsRemembered | ChoiceZone$ Choose one to one -1/+1 | RememberChosen$ True +A:SP$ Charm | Cost$ R | Choices$ DBDestroy,DBDestroy2 +SVar:DBDestroy:DB$ Destroy | ValidTgts$ Artifact | TgtPrompt$ Select target Artifact | SpellDescription$ Destroy target artifact. +SVar:DBDestroy2:DB$ Destroy | ValidTgts$ Creature.withDefender | TgtPrompt$ Select target creature with defender | SpellDescription$ Destroy target creature with defender. Oracle:Choose one —\n• Destroy target artifact.\n• Destroy target creature with defender. diff --git a/forge-gui/res/cardsfolder/upcoming/final_payment.txt b/forge-gui/res/cardsfolder/upcoming/final_payment.txt index 738c4f59fad..b99e79bf6ff 100644 --- a/forge-gui/res/cardsfolder/upcoming/final_payment.txt +++ b/forge-gui/res/cardsfolder/upcoming/final_payment.txt @@ -1,6 +1,6 @@ Name:Final Payment ManaCost:W B Types:Instant -K:AlternateAdditionalCost:PayLife<5>:Generic/B or sacrifice a creature or enchantment. +K:AlternateAdditionalCost:PayLife<5>:Sac<1/Creature,Enchantment> A:SP$ Destroy | Cost$ W B | ValidTgts$ Creature | TgtPrompt$ Select target creature | SpellDescription$ Destroy target creature. Oracle:As an additional cost to cast this spell, pay 5 life or sacrifice a creature or enchantment.\nDestroy target creature. diff --git a/forge-gui/res/cardsfolder/upcoming/incubation_druid.txt b/forge-gui/res/cardsfolder/upcoming/incubation_druid.txt index 37bc252bc28..cd9d27f8bec 100644 --- a/forge-gui/res/cardsfolder/upcoming/incubation_druid.txt +++ b/forge-gui/res/cardsfolder/upcoming/incubation_druid.txt @@ -2,9 +2,9 @@ Name:Incubation Druid ManaCost:1 G Types:Creature Elf Druid PT:0/2 -A:AB$ ManaReflected | Cost$ T | ColorOrType$ Type | Valid$ Land.YouCtrl | ReflectProperty$ Produce | SubAbility$ DBManaU | SpellDescription$ Add one mana of any type that a land you control could produce. If CARDNAME has a +1/+1 counter on it, add three mana of that type instead. -SVar:DBManaU:DB$ Mana | Produced$ Combo Card.Self | ConditionDefined$ Remembered | ConditionPresent$ Card.Self | SubAbility$ DBManaB -SVar:DBManaB:DB$ Mana | Produced$ G | Amount$ X | Permanent$ True | References$ X | ConditionDefined$ Remembered | ConditionPresent$ Card | ConditionCompare$ GE1 | SubAbility$ DBCleanup -A:AB$ PutCounter | Cost$ 3 G G | Defined$ Self | CounterType$ P1P1 | CounterNum$3 | SpellDescription$ As CARDNAME, support 3. (If this creature has no +1/+1 counters on it, put three +1/+1 counters on it.) +K:Adapt:3:3 G G +A:AB$ ManaReflected | Cost$ T | ColorOrType$ Type | Valid$ Land.YouCtrl | Amount$ IncubationAmount | ReflectProperty$ Produce | SpellDescription$ Add one mana of any type that a land you control could produce. If CARDNAME has a +1/+1 counter on it, add three mana of that type instead. +SVar:Y:Count$Valid Card.Self+counters_GE1_P1P1 +SVar:IncubationAmount:Count$Compare Y GE1.3.1 DeckHas:Ability$Counters Oracle:{T}: Add one mana of any type that a land you control could produce. If Incubation Druid has a +1/+1 counter on it, add three mana of that type instead.\n{3}{G}{G}: Adapt 3. (If this creature has no +1/+1 counters on it, put three +1/+1 counters on it.) diff --git a/forge-gui/res/cardsfolder/upcoming/priest_of_forgotten_gods.txt b/forge-gui/res/cardsfolder/upcoming/priest_of_forgotten_gods.txt index 15e7b0f1241..b25f535472d 100644 --- a/forge-gui/res/cardsfolder/upcoming/priest_of_forgotten_gods.txt +++ b/forge-gui/res/cardsfolder/upcoming/priest_of_forgotten_gods.txt @@ -2,7 +2,7 @@ Name:Priest of Forgotten Gods ManaCost:1 B Types:Creature Human Cleric PT:1/2 -A:AB$ LoseLife | Cost$ T Sac<2/Creature.Other/other creatures> | ValidTgts$ Player | TgtPrompt$ Select target player | TargetMin$ 0 | TargetMax$ MaxTgt | References$ MaxTgt | LifeAmount$ 2 | SubAbility$ DBSac | SpellDescription$ Any number of target players each lose 2 life and sacrifice a creature. You add {B}{B} and draw a card. +A:AB$ LoseLife | Cost$ T Sac<2/Creature.Other/other creatures> | ValidTgts$ Player | TgtPrompt$ Select target player | TargetMin$ 0 | TargetMax$ MaxTgts | References$ MaxTgts | LifeAmount$ 2 | SubAbility$ DBSac | SpellDescription$ Any number of target players each lose 2 life and sacrifice a creature. You add {B}{B} and draw a card. SVar:MaxTgts:PlayerCountPlayers$Amount SVar:DBSac:DB$ Sacrifice | SacValid$ Creature | Defined$ Targeted | Amount$ 1 | SubAbility$ DBMana SVar:DBMana:DB$ Mana | Produced$ B | Amount$ 2 | SubAbility$ DBDraw