From 4f4764ea289f5d27991e1d4f4024c9f8c623639d Mon Sep 17 00:00:00 2001 From: paul_snoops Date: Tue, 19 Apr 2022 15:13:47 +0100 Subject: [PATCH] fixes --- forge-gui/res/cardsfolder/upcoming/capenna_express.txt | 3 ++- forge-gui/res/cardsfolder/upcoming/case_the_joint.txt | 6 ------ .../res/cardsfolder/upcoming/darling_of_the_masses.txt | 3 ++- forge-gui/res/cardsfolder/upcoming/deal_gone_bad.txt | 2 +- forge-gui/res/cardsfolder/upcoming/exhibition_magician.txt | 3 +-- forge-gui/res/cardsfolder/upcoming/expendable_lackey.txt | 2 +- forge-gui/res/cardsfolder/upcoming/halo_scarab.txt | 2 +- .../res/cardsfolder/upcoming/majestic_metamorphosis.txt | 2 +- forge-gui/res/cardsfolder/upcoming/ominous_parcel.txt | 4 ++-- forge-gui/res/cardsfolder/upcoming/sky_crier.txt | 3 +-- forge-gui/res/cardsfolder/upcoming/take_to_the_streets.txt | 4 ++-- 11 files changed, 14 insertions(+), 20 deletions(-) delete mode 100644 forge-gui/res/cardsfolder/upcoming/case_the_joint.txt diff --git a/forge-gui/res/cardsfolder/upcoming/capenna_express.txt b/forge-gui/res/cardsfolder/upcoming/capenna_express.txt index ae6104f9ba6..5e965426d73 100644 --- a/forge-gui/res/cardsfolder/upcoming/capenna_express.txt +++ b/forge-gui/res/cardsfolder/upcoming/capenna_express.txt @@ -4,5 +4,6 @@ Types:Artifact Vehicle PT:6/6 A:AB$ Animate | Cost$ Sac<1/Treasure> | Defined$ Self | Types$ Artifact,Creature | SpellDescription$ CARDNAME becomes an artifact creature until end of turn. K:Crew:3 -DeckHas:Ability$Sacrifice & Type$Treasure +DeckHas:Ability$Sacrifice +DeckHints:Type$Treasure Oracle:Sacrifice a Treasure: Capenna Express becomes an artifact creature until end of turn.\nCrew 3 (Tap any number of creatures you control with total power 3 or more: This Vehicle becomes an artifact creature until end of turn.) diff --git a/forge-gui/res/cardsfolder/upcoming/case_the_joint.txt b/forge-gui/res/cardsfolder/upcoming/case_the_joint.txt deleted file mode 100644 index 540eb1e4b5a..00000000000 --- a/forge-gui/res/cardsfolder/upcoming/case_the_joint.txt +++ /dev/null @@ -1,6 +0,0 @@ -Name:Case the Joint -ManaCost:3 U -Types:Instant -A:SP$ Draw | NumCards$ 2 | StackDescription$ {p:You} draws two cards, | SubAbility$ DBDig | SpellDescription$ Draw two cards, then look at the top card of each player's library. -SVar:DBDig:DB$ Dig | Defined$ Player | DigNum$ 1 | DestinationZone$ Library | LibraryPosition$ 0 | StackDescription$ then looks at the top card of each player's library. -Oracle:Draw two cards, then look at the top card of each player's library. diff --git a/forge-gui/res/cardsfolder/upcoming/darling_of_the_masses.txt b/forge-gui/res/cardsfolder/upcoming/darling_of_the_masses.txt index 80fd0c315ab..8a349bb7096 100644 --- a/forge-gui/res/cardsfolder/upcoming/darling_of_the_masses.txt +++ b/forge-gui/res/cardsfolder/upcoming/darling_of_the_masses.txt @@ -7,5 +7,6 @@ T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ Tr SVar:TrigToken:DB$ Token | TokenScript$ gw_1_1_citizen SVar:PlayMain1:TRUE SVar:HasAttackEffect:True -DeckHas:Ability$Token & Type$Citizen +DeckHas:Ability$Token +DeckHints:Type$Citizen Oracle:Other Citizens you control get +1/+0.\nWhenever Darling of the Masses attacks, create a 1/1 green and white Citizen creature token. diff --git a/forge-gui/res/cardsfolder/upcoming/deal_gone_bad.txt b/forge-gui/res/cardsfolder/upcoming/deal_gone_bad.txt index 2a216a99c7c..2bb93f364cf 100644 --- a/forge-gui/res/cardsfolder/upcoming/deal_gone_bad.txt +++ b/forge-gui/res/cardsfolder/upcoming/deal_gone_bad.txt @@ -1,7 +1,7 @@ Name:Deal Gone Bad ManaCost:3 B Types:Instant -A:SP$ Pump | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ -3 | NumDef$ -3 | SubAbility$ DBMill | SpellDescription$ Target creature gets -3/-3 until end of turn. +A:SP$ Pump | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ -3 | NumDef$ -3 | SubAbility$ DBMill | IsCurse$ True | SpellDescription$ Target creature gets -3/-3 until end of turn. SVar:DBMill:DB$ Mill | NumCards$ 3 | ValidTgts$ Player | TgtPrompt$ Choose a player | SpellDescription$ Target player mills three cards. (They put the top three cards of their library into their graveyard.) DeckHas:Ability$Mill Oracle:Target creature gets -3/-3 until end of turn. Target player mills three cards. (They put the top three cards of their library into their graveyard.) diff --git a/forge-gui/res/cardsfolder/upcoming/exhibition_magician.txt b/forge-gui/res/cardsfolder/upcoming/exhibition_magician.txt index b982beeee0b..59e52e06397 100644 --- a/forge-gui/res/cardsfolder/upcoming/exhibition_magician.txt +++ b/forge-gui/res/cardsfolder/upcoming/exhibition_magician.txt @@ -6,6 +6,5 @@ T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.S SVar:TrigCharm:DB$ Charm | Choices$ DBToken,DBToken2 SVar:DBToken:DB$ Token | TokenScript$ gw_1_1_citizen | SpellDescription$ Create a 1/1 green and white Citizen creature token. SVar:DBToken2:DB$ Token | TokenScript$ c_a_treasure_sac | SpellDescription$ Create a Treasure token. (It's an artifact with "{T}, Sacrifice this artifact: Add one mana of any color.") -DeckHas:Ability$Sacrifice|Token & Type$Treasure|Artifact -DeckHints:Type$Citizen +DeckHas:Ability$Sacrifice|Token & Type$Treasure|Artifact|Citizen Oracle:When Exhibition Magician enters the battlefield, choose one —\n• Create a 1/1 green and white Citizen creature token.\n• Create a Treasure token. (It's an artifact with "{T}, Sacrifice this artifact: Add one mana of any color.") diff --git a/forge-gui/res/cardsfolder/upcoming/expendable_lackey.txt b/forge-gui/res/cardsfolder/upcoming/expendable_lackey.txt index 669d3c540b3..f7ec16b7491 100644 --- a/forge-gui/res/cardsfolder/upcoming/expendable_lackey.txt +++ b/forge-gui/res/cardsfolder/upcoming/expendable_lackey.txt @@ -3,5 +3,5 @@ ManaCost:U Types:Creature Human Citizen PT:1/1 A:AB$ Token | Cost$ 1 U ExileFromGrave<1/CARDNAME> | ActivationZone$ Graveyard | SorcerySpeed$ True | TokenScript$ u_1_1_fish_unblockable | SpellDescription$ Create a 1/1 blue Fish creature token with "This creature can't be blocked." Activate only as a sorcery. -DeckHas:Ability$Token +DeckHas:Ability$Token & Type$Fish Oracle:{1}{U}, Exile Expendable Lackey from your graveyard: Create a 1/1 blue Fish creature token with "This creature can't be blocked." Activate only as a sorcery. diff --git a/forge-gui/res/cardsfolder/upcoming/halo_scarab.txt b/forge-gui/res/cardsfolder/upcoming/halo_scarab.txt index e1d566530a6..b92339d260c 100644 --- a/forge-gui/res/cardsfolder/upcoming/halo_scarab.txt +++ b/forge-gui/res/cardsfolder/upcoming/halo_scarab.txt @@ -2,6 +2,6 @@ Name:Halo Scarab ManaCost:2 Types:Artifact Creature Insect PT:2/1 -A:AB$ Token | Cost$ 2 ExileFromGrave<1/CARDNAME> | ActivationZone$ Graveyard | TokenAmount$ 1 | TokenScript$ c_a_treasure_sac | TokenOwner$ You | SpellDescription$ Create a Treasure token. (It's an artifact with "{T}, Sacrifice this artifact: Add one mana of any color.") +A:AB$ Token | Cost$ 2 ExileFromGrave<1/CARDNAME> | ActivationZone$ Graveyard | TokenScript$ c_a_treasure_sac | SpellDescription$ Create a Treasure token. (It's an artifact with "{T}, Sacrifice this artifact: Add one mana of any color.") DeckHas:Ability$Sacrifice|Token & Type$Treasure|Artifact Oracle:{2}, Exile Halo Scarab from your graveyard: Create a Treasure token. (It's an artifact with "{T}, Sacrifice this artifact: Add one mana of any color.") diff --git a/forge-gui/res/cardsfolder/upcoming/majestic_metamorphosis.txt b/forge-gui/res/cardsfolder/upcoming/majestic_metamorphosis.txt index 74a86edc1e2..79239623420 100644 --- a/forge-gui/res/cardsfolder/upcoming/majestic_metamorphosis.txt +++ b/forge-gui/res/cardsfolder/upcoming/majestic_metamorphosis.txt @@ -1,7 +1,7 @@ Name:Majestic Metamorphosis ManaCost:2 U Types:Instant -A:SP$ Animate | ValidTgts$ Artifact,Creature | TgtPrompt$ Select target artifact or creature | Power$ 4 | Toughness$ 4 | Types$ Angel,Artifact,Creature | AddKeyword$ Flying | SubAbility$ DBDraw | SpellDescription$ Until end of turn, target artifact or creature becomes a 4/4 Angel artifact creature and gains flying. Draw a card. | StackDescription$ Until end of turn, {c:Targeted} becomes a 4/4 Angel artifact creature and gains flying. +A:SP$ Animate | ValidTgts$ Artifact,Creature | TgtPrompt$ Select target artifact or creature | Power$ 4 | Toughness$ 4 | Types$ Angel,Artifact,Creature | AddKeyword$ Flying | SubAbility$ DBDraw | SpellDescription$ Until end of turn, target artifact or creature becomes a 4/4 Angel artifact creature and gains flying. Draw a card. SVar:DBDraw:DB$ Draw | NumCards$ 1 DeckHas:Type$Angel DeckNeeds:Type$Artifact|Creature diff --git a/forge-gui/res/cardsfolder/upcoming/ominous_parcel.txt b/forge-gui/res/cardsfolder/upcoming/ominous_parcel.txt index 586aea77342..feea1c008e8 100644 --- a/forge-gui/res/cardsfolder/upcoming/ominous_parcel.txt +++ b/forge-gui/res/cardsfolder/upcoming/ominous_parcel.txt @@ -1,6 +1,6 @@ Name:Ominous Parcel ManaCost:1 Types:Artifact -A:AB$ ChangeZone | Cost$ 2 T Sac<1/CARDNAME> | Origin$ Library | Destination$ Hand | ChangeType$ Land.Basic | ChangeNum$ 1 | StackDescription$ SpellDescription | SpellDescription$ Search your library for a basic land card, reveal it, put it into your hand, then shuffle. -A:AB$ DealDamage | Cost$ 5 T Sac<1/CARDNAME> | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumDmg$ 4 | SpellDescription$ It deals 4 damage to target creature. +A:AB$ ChangeZone | Cost$ 2 T Sac<1/CARDNAME> | Origin$ Library | Destination$ Hand | ChangeType$ Land.Basic | ChangeNum$ 1 | ChangeTypeDesc$ basic land | SpellDescription$ Search your library for a basic land card, reveal it, put it into your hand, then shuffle. +A:AB$ DealDamage | Cost$ 5 T Sac<1/CARDNAME> | ValidTgts$ Creature | NumDmg$ 4 | SpellDescription$ It deals 4 damage to target creature. Oracle:{2}, {T}, Sacrifice Ominous Parcel: Search your library for a basic land card, reveal it, put it into your hand, then shuffle.\n{5}, {T}, Sacrifice Ominous Parcel: It deals 4 damage to target creature. diff --git a/forge-gui/res/cardsfolder/upcoming/sky_crier.txt b/forge-gui/res/cardsfolder/upcoming/sky_crier.txt index dd555556c2e..e85ee153ced 100644 --- a/forge-gui/res/cardsfolder/upcoming/sky_crier.txt +++ b/forge-gui/res/cardsfolder/upcoming/sky_crier.txt @@ -4,7 +4,6 @@ Types:Creature Bird Citizen PT:1/1 K:Flying K:Lifelink -A:AB$ Draw | Cost$ 3 W | NumCards$ 1 | SubAbility$ DBDraw | SpellDescription$ You and target opponent each draw a card. -SVar:DBDraw:DB$ Draw | NumCards$ 1 | ValidTgts$ Opponent | TgtPrompt$ Select target opponent +A:AB$ Draw | Cost$ 3 W | Defined$ TargetedAndYou | ValidTgts$ Opponent | TgtPrompt$ Select target opponent | SpellDescription$ You and target opponent each draw a card. DeckHas:Ability$LifeGain Oracle:Flying, lifelink\n{3}{W}: You and target opponent each draw a card. diff --git a/forge-gui/res/cardsfolder/upcoming/take_to_the_streets.txt b/forge-gui/res/cardsfolder/upcoming/take_to_the_streets.txt index 893dc17053c..62d568d90d7 100644 --- a/forge-gui/res/cardsfolder/upcoming/take_to_the_streets.txt +++ b/forge-gui/res/cardsfolder/upcoming/take_to_the_streets.txt @@ -1,7 +1,7 @@ Name:Take to the Streets ManaCost:4 G Types:Sorcery -A:SP$ PumpAll | Cost$ 4 G | ValidCards$ Creature.YouCtrl | NumAtt$ 2 | NumDef$ 2 | SubAbility$ DBPumpCitizens | SpellDescription$ Creatures you control get +2/+2 until end of turn. Citizens you control get an additional +1/+1 and gain vigilance until end of turn. +A:SP$ PumpAll | ValidCards$ Creature.YouCtrl | NumAtt$ 2 | NumDef$ 2 | SubAbility$ DBPumpCitizens | SpellDescription$ Creatures you control get +2/+2 until end of turn. Citizens you control get an additional +1/+1 and gain vigilance until end of turn. SVar:DBPumpCitizens:DB$ PumpAll | ValidCards$ Creature.Citizen+YouCtrl | NumAtt$ 1 | NumDef$ 1 | KW$ Vigilance -DeckNeeds:Type$Citizen +DeckHints:Type$Citizen Oracle:Creatures you control get +2/+2 until end of turn. Citizens you control get an additional +1/+1 and gain vigilance until end of turn.