From e02fe3c7f0c8efb4be746bb9ed520a000acc9a8b Mon Sep 17 00:00:00 2001 From: Simisays <67333662+Simisays@users.noreply.github.com> Date: Thu, 10 Nov 2022 18:28:10 +0100 Subject: [PATCH] cleanup --- forge-gui/res/cardsfolder/upcoming/mine_worker.txt | 2 +- forge-gui/res/cardsfolder/upcoming/no_one_left_behind.txt | 4 ++-- forge-gui/res/cardsfolder/upcoming/perimeter_patrol.txt | 2 +- forge-gui/res/cardsfolder/upcoming/phalanx_vanguard.txt | 6 +++--- forge-gui/res/cardsfolder/upcoming/prison_sentence.txt | 2 +- forge-gui/res/cardsfolder/upcoming/pyrrhic_blast.txt | 1 - forge-gui/res/cardsfolder/upcoming/titanias_command.txt | 8 ++++---- forge-gui/res/cardsfolder/upcoming/tower_worker.txt | 4 ++-- 8 files changed, 14 insertions(+), 15 deletions(-) diff --git a/forge-gui/res/cardsfolder/upcoming/mine_worker.txt b/forge-gui/res/cardsfolder/upcoming/mine_worker.txt index a9fb5684e17..eb7d03eb16a 100644 --- a/forge-gui/res/cardsfolder/upcoming/mine_worker.txt +++ b/forge-gui/res/cardsfolder/upcoming/mine_worker.txt @@ -9,5 +9,5 @@ SVar:UrzaCheck:SVar$X/Plus.Y SVar:X:Count$Valid Creature.YouCtrl+namedTower Worker/LimitMax.1 SVar:Y:Count$Valid Creature.YouCtrl+namedPower Plant Worker/LimitMax.1 DeckHas:Ability$LifeGain -DeckNeeds:Name$Mine Worker|Tower Worker +DeckNeeds:Name$Power Plant Worker|Tower Worker Oracle:{T}: You gain 1 life. If you control creatures named Power Plant Worker and Tower Worker, you gain 3 life instead. \ No newline at end of file diff --git a/forge-gui/res/cardsfolder/upcoming/no_one_left_behind.txt b/forge-gui/res/cardsfolder/upcoming/no_one_left_behind.txt index bde1b2bf55f..28d13170046 100644 --- a/forge-gui/res/cardsfolder/upcoming/no_one_left_behind.txt +++ b/forge-gui/res/cardsfolder/upcoming/no_one_left_behind.txt @@ -1,9 +1,9 @@ Name:No One Left Behind ManaCost:4 B Types:Sorcery -S:Mode$ ReduceCost | ValidCard$ Card.Self | Type$ Spell | Amount$ CostReduction | Relative$ True | EffectZone$ All | Description$ This spell costs {3} less to cast if it targets a blue permanent you don't control. +S:Mode$ ReduceCost | ValidCard$ Card.Self | Type$ Spell | Amount$ CostReduction | Relative$ True | EffectZone$ All | Description$ This spell costs {3} less to cast if it targets a creature card with mana value 3 or less. SVar:CostReduction:Count$Compare CheckTgt GE1.3.0 -SVar:CheckTgt:TargetedObjects$Valid Creature.cmcLE3+YouOwn +SVar:CheckTgt:TargetedObjects$Valid Creature.cmcLE3+YouCtrl A:SP$ ChangeZone | Origin$ Graveyard | Destination$ Battlefield | TgtPrompt$ Choose target creature card in your graveyard | ValidTgts$ Creature.YouOwn | ChangeNum$ 1 | SpellDescription$ Return target creature card from your graveyard to the battlefield. DeckHas:Ability$Graveyard DeckHints:Ability$Graveyard|Mill|Dredge diff --git a/forge-gui/res/cardsfolder/upcoming/perimeter_patrol.txt b/forge-gui/res/cardsfolder/upcoming/perimeter_patrol.txt index 2f01a6a2018..81f08a2806e 100644 --- a/forge-gui/res/cardsfolder/upcoming/perimeter_patrol.txt +++ b/forge-gui/res/cardsfolder/upcoming/perimeter_patrol.txt @@ -1,8 +1,8 @@ Name:Perimeter Patrol ManaCost:2 G Types:Creature Human Soldier +PT:3/3 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Artifact.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever an artifact enters the battlefield under your control, CARDNAME gets +1/+0 until end of turn. SVar:TrigPump:DB$ Pump | Defined$ Self | NumAtt$ +1 -PT:3/3 DeckHints:Type$Artifact Oracle:Whenever an artifact enters the battlefield under your control, Perimeter Patrol gets +1/+0 until end of turn. diff --git a/forge-gui/res/cardsfolder/upcoming/phalanx_vanguard.txt b/forge-gui/res/cardsfolder/upcoming/phalanx_vanguard.txt index 981f86a863e..80c4ec64e62 100644 --- a/forge-gui/res/cardsfolder/upcoming/phalanx_vanguard.txt +++ b/forge-gui/res/cardsfolder/upcoming/phalanx_vanguard.txt @@ -1,9 +1,9 @@ Name:Phalanx Vanguard -ManaCost:2 G +ManaCost:1 W Types:Creature Human Soldier +PT:2/2 K:Vigilance T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Artifact.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever an artifact enters the battlefield under your control, CARDNAME gets +1/+0 until end of turn. SVar:TrigPump:DB$ Pump | Defined$ Self | NumAtt$ +1 -PT:3/3 DeckHints:Type$Artifact -Oracle:Whenever an artifact enters the battlefield under your control, Phalanx Vanguard gets +1/+0 until end of turn. +Oracle:Vigilance\nWhenever an artifact enters the battlefield under your control, Phalanx Vanguard gets +1/+0 until end of turn. \ No newline at end of file diff --git a/forge-gui/res/cardsfolder/upcoming/prison_sentence.txt b/forge-gui/res/cardsfolder/upcoming/prison_sentence.txt index 3def588238e..218471d8c01 100644 --- a/forge-gui/res/cardsfolder/upcoming/prison_sentence.txt +++ b/forge-gui/res/cardsfolder/upcoming/prison_sentence.txt @@ -5,5 +5,5 @@ K:Enchant creature A:SP$ Attach | ValidTgts$ Creature | TgtPrompt$ Select target creature | AILogic$ Curse T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigScry | TriggerDescription$ When CARDNAME enters the battlefield, scry 2. SVar:TrigScry:DB$ Scry | ScryNum$ 2 -S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddHiddenKeyword$ CARDNAME can't block. & CARDNAME's activated abilities can't be activated. | Description$ Enchanted creature can't block and its activated abilities can't be activated. +S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddHiddenKeyword$ CARDNAME can't attack or block. & CARDNAME's activated abilities can't be activated. | Description$ Enchanted creature can't attack or block and its activated abilities can't be activated. Oracle:Enchant creature\nWhen Prison Sentence enters the battlefield, scry 2.\nEnchanted creature can't attack or block, and its activated abilities can't be activated. diff --git a/forge-gui/res/cardsfolder/upcoming/pyrrhic_blast.txt b/forge-gui/res/cardsfolder/upcoming/pyrrhic_blast.txt index 9a91bb68aa3..d5db1424656 100644 --- a/forge-gui/res/cardsfolder/upcoming/pyrrhic_blast.txt +++ b/forge-gui/res/cardsfolder/upcoming/pyrrhic_blast.txt @@ -4,6 +4,5 @@ Types:Instant A:SP$ DealDamage | Cost$ 3 R Sac<1/Creature> | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select any target | NumDmg$ X | SubAbility$ DBDraw | SpellDescription$ CARDNAME deals damage equal to the sacrificed creature's power to any target. Draw a card. SVar:DBDraw:DB$ Draw SVar:X:Sacrificed$CardPower -AI:RemoveDeck:Random DeckHas:Ability$Sacrifice Oracle:As an additional cost to cast this spell, sacrifice a creature.\nPyrrhic Blast deals damage equal to the sacrificed creature's power to any target. Draw a card. \ No newline at end of file diff --git a/forge-gui/res/cardsfolder/upcoming/titanias_command.txt b/forge-gui/res/cardsfolder/upcoming/titanias_command.txt index cd30ad9c101..f51666010df 100644 --- a/forge-gui/res/cardsfolder/upcoming/titanias_command.txt +++ b/forge-gui/res/cardsfolder/upcoming/titanias_command.txt @@ -2,12 +2,12 @@ Name:Titania's Command ManaCost:4 G G Types:Sorcery A:SP$ Charm | Choices$ DBExileAll,DBSearch,DBToken,DBCounter | CharmNum$ 2 -SVar:DBExileAll:DB$ ChangeZoneAll | Origin$ Graveyard | Destination$ Exile | ValidTgts$ Player | TgtPrompt$ Select target player | ChangeType$ Card | RememberedChanged$ True | SubAbility$ DBGainLife | SpellDescription$ Exile target player's graveyard. You gain 1 life for each card exiled this way. +SVar:DBExileAll:DB$ ChangeZoneAll | Origin$ Graveyard | Destination$ Exile | TgtPrompt$ Select target player | ChangeType$ Card | RememberedChanged$ True | SubAbility$ DBGainLife | SpellDescription$ Exile target player's graveyard. You gain 1 life for each card exiled this way. SVar:DBGainLife:DB$ GainLife | Defined$ You | LifeAmount$ X | SubAbility$ DBCleanup SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True -SVar:DBSearch:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield| ChangeType$ Land | ChangeNum$ 2 | Tapped$ True | SpellDescription$ Search your library for up to two land cards, put them onto the battlefield tapped, then shuffle. +SVar:DBSearch:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land | ChangeNum$ 2 | Tapped$ True | SpellDescription$ Search your library for up to two land cards, put them onto the battlefield tapped, then shuffle. SVar:DBToken:DB$ Token | TokenScript$ g_2_2_bear | TokenAmount$ 2 | SpellDescription$ Create two 2/2 green Bear creature tokens. SVar:DBCounter:DB$ PutCounterAll | ValidCards$ Creature.YouCtrl | CounterType$ P1P1 | CounterNum$ 2 | SpellDescription$ Put two +1/+1 counters on each creature you control. SVar:X:Remembered$Amount -DeckHas:Ability$Token|Counter|LifeGain Type$Bear -Oracle:Choose two —\n• Exile target player’s graveyard. You gain 1 life for each card exiled this way.\n• Search your library for up to two land cards, put them onto the battlefield tapped, then shuffle.\n• Create two 2/2 green Bear creature tokens.\n• Put two +1/+1 counters on each creature you control. +DeckHas:Ability$Token|Counter|LifeGain & Type$Bear +Oracle:Choose two —\n• Exile target player's graveyard. You gain 1 life for each card exiled this way.\n• Search your library for up to two land cards, put them onto the battlefield tapped, then shuffle.\n• Create two 2/2 green Bear creature tokens.\n• Put two +1/+1 counters on each creature you control. diff --git a/forge-gui/res/cardsfolder/upcoming/tower_worker.txt b/forge-gui/res/cardsfolder/upcoming/tower_worker.txt index 4e7c9ec5955..9e119c8d613 100644 --- a/forge-gui/res/cardsfolder/upcoming/tower_worker.txt +++ b/forge-gui/res/cardsfolder/upcoming/tower_worker.txt @@ -3,10 +3,10 @@ ManaCost:3 Types:Artifact Creature Assembly-Worker PT:1/3 K:Reach -DeckNeeds:Name$Mine Worker|Tower Worker -A:AB$ Mana | Cost$ T | Produced$ C | Amount$ UrzaAmount | SpellDescription$ Add {C}. If you control an Urza's Mine and an Urza's Tower, add {C}{C} instead. +A:AB$ Mana | Cost$ T | Produced$ C | Amount$ UrzaAmount | SpellDescription$ Add {C}. If you control creatures named Mine Worker and Power Plant Worker, add {C}{C}{C} instead. SVar:UrzaAmount:SVar$UrzaCheck/Plus.1 SVar:UrzaCheck:SVar$X/Plus.Y/LimitMin.2 SVar:X:Count$Valid Creature.YouCtrl+namedMine Worker/LimitMax.1 SVar:Y:Count$Valid Creature.YouCtrl+namedPower Plant Worker/LimitMax.1 +DeckNeeds:Name$Mine Worker|Power Plant Worker Oracle:Reach\n{T}: Add {C}. If you control creatures named Mine Worker and Power Plant Worker, add {C}{C}{C} instead. \ No newline at end of file