From 7846128ba5ade6f7d7a104e7586f3b08487d5d75 Mon Sep 17 00:00:00 2001 From: Wendell Wilkerson Date: Mon, 12 Jul 2021 09:28:13 -0500 Subject: [PATCH 1/2] fixes from Alumi comments --- forge-gui/res/cardsfolder/upcoming/divine_smite.txt | 2 +- forge-gui/res/cardsfolder/upcoming/hunters_mark.txt | 2 +- forge-gui/res/cardsfolder/upcoming/improvised_weaponry.txt | 2 +- .../res/cardsfolder/upcoming/instrument_of_the_bards.txt | 2 +- forge-gui/res/cardsfolder/upcoming/manticore.txt | 2 +- forge-gui/res/cardsfolder/upcoming/skullport_merchant.txt | 2 +- forge-gui/res/cardsfolder/upcoming/thieves_tools.txt | 2 +- forge-gui/res/cardsfolder/upcoming/wild_shape.txt | 6 +++--- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/forge-gui/res/cardsfolder/upcoming/divine_smite.txt b/forge-gui/res/cardsfolder/upcoming/divine_smite.txt index e504e4e15b8..b703358cc0e 100644 --- a/forge-gui/res/cardsfolder/upcoming/divine_smite.txt +++ b/forge-gui/res/cardsfolder/upcoming/divine_smite.txt @@ -1,6 +1,6 @@ Name:Divine Smite ManaCost:1 W Types:Instant -A:SP$ Phases | Cost$ 1 W | ValidTgts$ Creature,Planeswalker | IsCurse$ True | ConditionDefined$ Targeted | ConditionPresent$ Card.Black | ConditionCompare$ EQ0 | SubAbility$ DBExile | StackDescription$ SpellDescription | SpellDescription$ Target creature or planeswalker an opponent controls phases out. If that permanent is black, exile it instead. (If it phases out, treat it and anything attached to it as though they don't exist until its controller's next turn.) +A:SP$ Phases | Cost$ 1 W | ValidTgts$ Creature.OppCtrl,Planeswalker.OppCtrl | IsCurse$ True | ConditionDefined$ Targeted | ConditionPresent$ Card.Black | ConditionCompare$ EQ0 | SubAbility$ DBExile | StackDescription$ SpellDescription | SpellDescription$ Target creature or planeswalker an opponent controls phases out. If that permanent is black, exile it instead. (If it phases out, treat it and anything attached to it as though they don't exist until its controller's next turn.) SVar:DBExile:DB$ ChangeZone | Defined$ Targeted | Origin$ Battlefield | Destination$ Exile | ConditionDefined$ Targeted | ConditionPresent$ Card.Black | ConditionCompare$ EQ1 | StackDescription$ None Oracle:Target creature or planeswalker an opponent controls phases out. If that permanent is black, exile it instead. (If it phases out, treat it and anything attached to it as though they don't exist until its controller's next turn.) \ No newline at end of file diff --git a/forge-gui/res/cardsfolder/upcoming/hunters_mark.txt b/forge-gui/res/cardsfolder/upcoming/hunters_mark.txt index 1ccb20cae90..f8ee4c3ed10 100644 --- a/forge-gui/res/cardsfolder/upcoming/hunters_mark.txt +++ b/forge-gui/res/cardsfolder/upcoming/hunters_mark.txt @@ -6,6 +6,6 @@ S:Mode$ ReduceCost | ValidCard$ Card.Self | Type$ Spell | Amount$ CostReduction SVar:CostReduction:Count$Compare CheckTgt GE1.3.0 SVar:CheckTgt:TargetedObjects$Valid Card.Blue+YouDontCtrl A:SP$ Pump | Cost$ 3 G | ValidTgts$ Creature.YouCtrl | AILogic$ PowerDmg | NumAtt$ +1 | NumDef$ +1 | TgtPrompt$ Select target creature you control | SubAbility$ SoulsDamage | StackDescription$ {c:ThisTargetedCard} gets +1/+1 until end of turn. | SpellDescription$ Target creature you control gets +1/+1 until end of turn. It deals damage equal to its power to target creature you don't control. -SVar:SoulsDamage:DB$ DealDamage | ValidTgts$ Creature.YouDontCtrl | AILogic$ PowerDmg | TgtPrompt$ Select target creature you don't control | NumDmg$ X | DamageSource$ ParentTarget | StackDescription$ Then {c:ParentTarget} deals damage equal to its power to {c:ThisTargetedCard}. +SVar:SoulsDamage:DB$ DealDamage | ValidTgts$ Creature.YouDontCtrl,Planeswalker.YouDontCtrl | AILogic$ PowerDmg | TgtPrompt$ Select target creature or planeswalker you don't control | NumDmg$ X | DamageSource$ ParentTarget | StackDescription$ Then {c:ParentTarget} deals damage equal to its power to {c:ThisTargetedCard}. SVar:X:ParentTargeted$CardPower Oracle:This spell costs {3} less to cast if it targets a blue permanent you don't control.\nThis spell can't be countered.\nTarget creature you control gets +1/+1 until end of turn. Then it deals damage equal to its power to target creature or planeswalker you don't control. diff --git a/forge-gui/res/cardsfolder/upcoming/improvised_weaponry.txt b/forge-gui/res/cardsfolder/upcoming/improvised_weaponry.txt index 0886b1810a9..f3bb4f741d8 100644 --- a/forge-gui/res/cardsfolder/upcoming/improvised_weaponry.txt +++ b/forge-gui/res/cardsfolder/upcoming/improvised_weaponry.txt @@ -1,7 +1,7 @@ Name:Improvised Weaponry ManaCost:2 R Types:Sorcery -A:SP$ DealDamage | Cost$ 1 R R | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select any targeto | NumDmg$ 2 | SubAbility$ DBToken | SpellDescription$ CARDNAME deals 2 damage to any target. +A:SP$ DealDamage | Cost$ 2 R | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select any targeto | NumDmg$ 2 | SubAbility$ DBToken | SpellDescription$ CARDNAME deals 2 damage to any target. SVar:DBToken:DB$ Token | TokenAmount$ 1 | TokenScript$ c_a_treasure_sac | TokenOwner$ You | SpellDescription$ Create a Treasure token. DeckHas:Ability$Token Oracle:Improvised Weaponry deals 2 damage to any target. Create a Treasure token. (It's an artifact with "{T}, Sacrifice this artifact: Add one mana of any color.") \ No newline at end of file diff --git a/forge-gui/res/cardsfolder/upcoming/instrument_of_the_bards.txt b/forge-gui/res/cardsfolder/upcoming/instrument_of_the_bards.txt index 66b549a2b37..c58be434150 100644 --- a/forge-gui/res/cardsfolder/upcoming/instrument_of_the_bards.txt +++ b/forge-gui/res/cardsfolder/upcoming/instrument_of_the_bards.txt @@ -3,7 +3,7 @@ ManaCost:G Types:Legendary Artifact T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigPutCounter | TriggerDescription$ At the beginning of your upkeep, you may put a charge counter on CARDNAME. SVar:TrigPutCounter:DB$PutCounter | Defined$ Self | CounterType$ HARMONY | CounterNum$ 1 -A:AB$ ChangeZone | Cost$ 3 G T | Origin$ Library | Destination$ Hand | ChangeType$ Creature.cmcLEX | ChangeNum$ 1 | RememberChanged$ True | SubAbility$ DBToken | StackDescription$ SpellDescription | SpellDescription$ Search your library for a creature card with mana value equal to the number of harmony counters on CARDNAME, reveal it, and put it into your hand. If that card is legendary, create a Treasure token. Then shuffle. +A:AB$ ChangeZone | Cost$ 3 G T | Origin$ Library | Destination$ Hand | ChangeType$ Creature.cmcEQX | ChangeNum$ 1 | RememberChanged$ True | SubAbility$ DBToken | StackDescription$ SpellDescription | SpellDescription$ Search your library for a creature card with mana value equal to the number of harmony counters on CARDNAME, reveal it, and put it into your hand. If that card is legendary, create a Treasure token. Then shuffle. SVar:DBToken:DB$ Token | TokenAmount$ 1 | TokenScript$ c_a_treasure_sac | TokenOwner$ You | ConditionDefined$ Remembered | ConditionPresent$ Card.Legendary | ConditionCompare$ GE1 | SubAbility$ DBCleanup SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True SVar:X:Count$CardCounters.HARMONY diff --git a/forge-gui/res/cardsfolder/upcoming/manticore.txt b/forge-gui/res/cardsfolder/upcoming/manticore.txt index accac1fd457..4c21085dcb4 100644 --- a/forge-gui/res/cardsfolder/upcoming/manticore.txt +++ b/forge-gui/res/cardsfolder/upcoming/manticore.txt @@ -5,5 +5,5 @@ PT:2/1 K:Flash K:Flying T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ TailSpikes | TriggerDescription$ Tail Spikes — When CARDNAME enters the battlefield, destroy target creature an opponent controls that was dealt damage this turn. -SVar:TailSpikes:DB$ Destroy | ValidTgts$ Creature.wasDealtDamageThisTurn | TgtPrompt$ Select target creature that was dealt damage this turn +SVar:TailSpikes:DB$ Destroy | ValidTgts$ Creature.wasDealtDamageThisTurn+OppCtrl | TgtPrompt$ Select target creature an opponent controls that was dealt damage this turn Oracle:Tail Spikes — When Manticore enters the battlefield, destroy target creature an opponent controls that was dealt damage this turn. diff --git a/forge-gui/res/cardsfolder/upcoming/skullport_merchant.txt b/forge-gui/res/cardsfolder/upcoming/skullport_merchant.txt index cb0555c260d..46e695f1a43 100644 --- a/forge-gui/res/cardsfolder/upcoming/skullport_merchant.txt +++ b/forge-gui/res/cardsfolder/upcoming/skullport_merchant.txt @@ -4,6 +4,6 @@ Types:Creature Dwarf Citizen PT:1/4 T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ DBToken | TriggerDescription$ When CARDNAME enters the battlefield, create a Treasure token. SVar:DBToken:DB$ Token | TokenAmount$ 1 | TokenScript$ c_a_treasure_sac | TokenOwner$ You -A:AB$ Draw | Cost$ Sac<1/Creature.Other;Artifact.Treasure/another creature or treasure> | NumCards$ 1 | SpellDescription$ Draw a card. +A:AB$ Draw | 1 B Cost$ Sac<1/Creature.Other;Artifact.Treasure/another creature or treasure> | NumCards$ 1 | SpellDescription$ Draw a card. DeckHas:Ability$Token Oracle:When Skullport Merchant enters the battlefield, create a Treasure token. (It's an artifact with \"{T}, Sacrifice this artifact: Add one mana of any color.\")\n{1}{B}, Sacrifice another creature or a Treasure: Draw a card. \ No newline at end of file diff --git a/forge-gui/res/cardsfolder/upcoming/thieves_tools.txt b/forge-gui/res/cardsfolder/upcoming/thieves_tools.txt index 7b51a68340c..74e18b45bd3 100644 --- a/forge-gui/res/cardsfolder/upcoming/thieves_tools.txt +++ b/forge-gui/res/cardsfolder/upcoming/thieves_tools.txt @@ -4,6 +4,6 @@ Types:Artifact Equipment K:Equip:3 T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ DBToken | TriggerDescription$ When CARDNAME enters the battlefield, create a Treasure token. SVar:DBToken:DB$ Token | TokenAmount$ 1 | TokenScript$ c_a_treasure_sac | TokenOwner$ You -S:Mode$ Continuous | Affected$ Creature.EquippedBy+powerLE3 | AddHiddenKeyword$ Unblockable | Description$ nEquipped creature can't be blocked as long as its power is 3 or less. +S:Mode$ Continuous | Affected$ Creature.EquippedBy+powerLE3 | AddHiddenKeyword$ Unblockable | Description$ Equipped creature can't be blocked as long as its power is 3 or less. DeckHas:Ability$Token Oracle:When Thieves' Tools enters the battlefield, create a Treasure token. (It's an artifact with \"{T}, Sacrifice this artifact: Add one mana of any color.\")\nEquipped creature can't be blocked as long as its power is 3 or less.\nEquip {2} ({2}: Attach to target creature you control. Equip only as a sorcery.) \ No newline at end of file diff --git a/forge-gui/res/cardsfolder/upcoming/wild_shape.txt b/forge-gui/res/cardsfolder/upcoming/wild_shape.txt index c537ddbe30b..71b7919a0b8 100644 --- a/forge-gui/res/cardsfolder/upcoming/wild_shape.txt +++ b/forge-gui/res/cardsfolder/upcoming/wild_shape.txt @@ -2,7 +2,7 @@ Name:Wild Shape ManaCost: G Types:Instant A:SP$ Charm | Cost$ G | Choices$ ChangeIntoTurtle,ChangeIntoSpider,ChangeIntoElephant | SpellDescription$ Choose one. Until end of turn, target creature you control has that base power and toughness, becomes that creature type, and gains that ability. -SVar:ChangeIntoTurtle:DB$ Animate | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | Power$ 1 | Toughness$ 3 | Types$ Creature,Turtle | Keywords$ Hexproof | SpellDescription$ 1/3 Turtle with hexproof. -SVar:ChangeIntoSpider:DB$ Animate | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | Power$ 1 | Toughness$ 5 | Types$ Creature,Spider | Keywords$ Reach | SpellDescription$ 1/5 Spider with reach. -SVar:ChangeIntoElephant:DB$ Animate | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | Power$ 3 | Toughness$ 3 | Types$ Creature,Elephant | Keywords$ Trample | SpellDescription$ 3/3 Elephant with trample. +SVar:ChangeIntoTurtle:DB$ Animate | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | Power$ 1 | Toughness$ 3 | RemoveCreatureTypes$ True| Types$ Creature,Turtle | Keywords$ Hexproof | SpellDescription$ 1/3 Turtle with hexproof. +SVar:ChangeIntoSpider:DB$ Animate | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | Power$ 1 | Toughness$ 5 | RemoveCreatureTypes$ True | Types$ Creature,Spider | Keywords$ Reach | SpellDescription$ 1/5 Spider with reach. +SVar:ChangeIntoElephant:DB$ Animate | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | Power$ 3 | Toughness$ 3 | RemoveCreatureTypes$ True | Types$ Creature,Elephant | Keywords$ Trample | SpellDescription$ 3/3 Elephant with trample. Oracle:Choose one. Until end of turn, target creature you control has that base power and toughness, becomes that creature type, and gains that ability.\n• 1/3 Turtle with hexproof.\n• 1/5 Spider with reach.\n• 3/3 Elephant with trample. \ No newline at end of file From a3d5094175968b9cb675748f523278dc90b544d1 Mon Sep 17 00:00:00 2001 From: ArsenalNut <1523-ArsenalNut@users.noreply.git.cardforge.org> Date: Mon, 12 Jul 2021 15:52:29 +0000 Subject: [PATCH 2/2] Update skullport_merchant.txt --- forge-gui/res/cardsfolder/upcoming/skullport_merchant.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/forge-gui/res/cardsfolder/upcoming/skullport_merchant.txt b/forge-gui/res/cardsfolder/upcoming/skullport_merchant.txt index 46e695f1a43..13e5286deee 100644 --- a/forge-gui/res/cardsfolder/upcoming/skullport_merchant.txt +++ b/forge-gui/res/cardsfolder/upcoming/skullport_merchant.txt @@ -4,6 +4,6 @@ Types:Creature Dwarf Citizen PT:1/4 T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ DBToken | TriggerDescription$ When CARDNAME enters the battlefield, create a Treasure token. SVar:DBToken:DB$ Token | TokenAmount$ 1 | TokenScript$ c_a_treasure_sac | TokenOwner$ You -A:AB$ Draw | 1 B Cost$ Sac<1/Creature.Other;Artifact.Treasure/another creature or treasure> | NumCards$ 1 | SpellDescription$ Draw a card. +A:AB$ Draw | Cost$ 1 B Sac<1/Creature.Other;Artifact.Treasure/another creature or treasure> | NumCards$ 1 | SpellDescription$ Draw a card. DeckHas:Ability$Token -Oracle:When Skullport Merchant enters the battlefield, create a Treasure token. (It's an artifact with \"{T}, Sacrifice this artifact: Add one mana of any color.\")\n{1}{B}, Sacrifice another creature or a Treasure: Draw a card. \ No newline at end of file +Oracle:When Skullport Merchant enters the battlefield, create a Treasure token. (It's an artifact with \"{T}, Sacrifice this artifact: Add one mana of any color.\")\n{1}{B}, Sacrifice another creature or a Treasure: Draw a card.