From abacbb7019b57d4ac28f8539e88a97dfafe8238b Mon Sep 17 00:00:00 2001 From: Simisays <67333662+Simisays@users.noreply.github.com> Date: Wed, 29 May 2024 22:19:21 +0200 Subject: [PATCH] cleanup --- forge-gui/res/cardsfolder/upcoming/ondu_knotmaster.txt | 2 +- forge-gui/res/cardsfolder/upcoming/pyretic_rebirth.txt | 4 ++-- forge-gui/res/cardsfolder/upcoming/reckless_pyrosurfer.txt | 2 +- forge-gui/res/cardsfolder/upcoming/skoa_embermage.txt | 2 +- forge-gui/res/cardsfolder/upcoming/solstice_zealot.txt | 2 +- .../upcoming/sundering_eruption_volcanic_fissure.txt | 2 +- forge-gui/res/cardsfolder/upcoming/the_hunger_tide_rises.txt | 2 +- forge-gui/res/cardsfolder/upcoming/voltstorm_angel.txt | 2 +- .../upcoming/waterlogged_teachings_inundated_archive.txt | 2 -- 9 files changed, 9 insertions(+), 11 deletions(-) diff --git a/forge-gui/res/cardsfolder/upcoming/ondu_knotmaster.txt b/forge-gui/res/cardsfolder/upcoming/ondu_knotmaster.txt index fd724b7bf44..b4289a7604e 100644 --- a/forge-gui/res/cardsfolder/upcoming/ondu_knotmaster.txt +++ b/forge-gui/res/cardsfolder/upcoming/ondu_knotmaster.txt @@ -13,5 +13,5 @@ ALTERNATE Name:Throw a Line ManaCost:W B Types:Sorcery Adventure -A:SP$ PutCounter | ValidTgts$ Creature | TgtPrompt$ Select target creature to distribute counters to | CounterType$ P1P1 | CounterNum$ 2 | TargetMin$ 1 | TargetMax$ 2 | DividedAsYouChoose$ 2 | SpellDescription$ Distribute two +1/+1 counters among one or two target creatures. +A:SP$ PutCounter | ValidTgts$ Creature | TgtPrompt$ Select one or two creatures to distribute counters to | CounterType$ P1P1 | CounterNum$ 2 | TargetMin$ 1 | TargetMax$ 2 | DividedAsYouChoose$ 2 | SpellDescription$ Distribute two +1/+1 counters among one or two target creatures. Oracle:Distribute two +1/+1 counters among one or two target creatures. (Then exile this card. You may cast the creature later from exile.) \ No newline at end of file diff --git a/forge-gui/res/cardsfolder/upcoming/pyretic_rebirth.txt b/forge-gui/res/cardsfolder/upcoming/pyretic_rebirth.txt index e80eff90ed9..3e7048f3c58 100644 --- a/forge-gui/res/cardsfolder/upcoming/pyretic_rebirth.txt +++ b/forge-gui/res/cardsfolder/upcoming/pyretic_rebirth.txt @@ -1,8 +1,8 @@ Name:Pyretic Rebirth ManaCost:2 B R Types:Instant -A:SP$ ChangeZone | ValidTgts$ Creature.YouCtrl,Artifact.YouCtrl | TgtPrompt$ Select target artifact or creature card | Origin$ Graveyard | Destination$ Hand | SubAbility$ DBDamage | RememberTargets$ True | SpellDescription$ Return target artifact or creature card from your graveyard to your hand. CARDNAME deals damage equal to that card's mana value to up to one target creature or planeswalker. -SVar:DBDamage:DB$ DealDamage | ValidTgts$ Creature,Planeswalker | TargetMin$ 0 | TargetMax$ 1 | TgtPrompt$ Select target creature or planeswalker. | NumDmg$ X | SubAbility$ DBCleanup +A:SP$ ChangeZone | ValidTgts$ Creature.YouCtrl,Artifact.YouCtrl | TgtPrompt$ Select target artifact or creature card in your graveyard | Origin$ Graveyard | Destination$ Hand | SubAbility$ DBDamage | RememberTargets$ True | SpellDescription$ Return target artifact or creature card from your graveyard to your hand. CARDNAME deals damage equal to that card's mana value to up to one target creature or planeswalker. +SVar:DBDamage:DB$ DealDamage | ValidTgts$ Creature,Planeswalker | TargetMin$ 0 | TargetMax$ 1 | TgtPrompt$ Select up to one target creature or planeswalker | NumDmg$ X | SubAbility$ DBCleanup SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True SVar:X:Remembered$CardManaCost Oracle:Return target artifact or creature card from your graveyard to your hand. Pyretic Rebirth deals damage equal to that card's mana value to up to one target creature or planeswalker. \ No newline at end of file diff --git a/forge-gui/res/cardsfolder/upcoming/reckless_pyrosurfer.txt b/forge-gui/res/cardsfolder/upcoming/reckless_pyrosurfer.txt index 3d2b9cebf66..75d1773de71 100644 --- a/forge-gui/res/cardsfolder/upcoming/reckless_pyrosurfer.txt +++ b/forge-gui/res/cardsfolder/upcoming/reckless_pyrosurfer.txt @@ -4,5 +4,5 @@ Types:Creature Human Scout PT:2/2 K:Haste T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Land.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigBattleCry | TriggerDescription$ Landfall — Whenever a land enters the battlefield under your control, CARDNAME gains battle cry until end of turn. (Whenever this creature attacks, each other attacking creature gets +1/+ until end of turn. Each instance of battle cry triggers separately.) -SVar:TrigFlying:DB$ Pump | Defined$ Self | KW$ Battle cry +SVar:TrigBattleCry:DB$ Pump | Defined$ Self | KW$ Battle cry Oracle:Haste\nLandfall — Whenever a land enters the battlefield under your control, Reckless Pyrosurfer gains battle cry until end of turn. (Whenever this creature attacks, each other attacking creature gets +1/+ until end of turn. Each instance of battle cry triggers separately.) \ No newline at end of file diff --git a/forge-gui/res/cardsfolder/upcoming/skoa_embermage.txt b/forge-gui/res/cardsfolder/upcoming/skoa_embermage.txt index aec09bd987d..f836b632b88 100644 --- a/forge-gui/res/cardsfolder/upcoming/skoa_embermage.txt +++ b/forge-gui/res/cardsfolder/upcoming/skoa_embermage.txt @@ -4,6 +4,6 @@ Types:Legendary Creature Goblin Wizard PT:4/4 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDealDamage | TriggerDescription$ When CARDNAME enters the battlefield, it deals 4 damage to any target. SVar:TrigDealDamage:DB$ DealDamage | ValidTgts$ Any | NumDmg$ 4 -A:AB$ DealDamage | Cost$ Discard<1/Card.namedSkoa; Embermage> Sac<2/Mountain> | CostDesc$ Grandeur — Discard another card named Skoa, Embermage, Sacrifice two Mountains: | ValidTgts$ Any | NumDmg$ 4 | SpellDescription$ NICKNAME deals 4 damage to any target. +A:AB$ DealDamage | Cost$ Discard<1/Card.namedSkoa, Embermage> Sac<2/Mountain> | CostDesc$ Grandeur — Discard another card named Skoa, Embermage, Sacrifice two Mountains: | ValidTgts$ Any | NumDmg$ 4 | SpellDescription$ NICKNAME deals 4 damage to any target. SVar:PlayMain1:TRUE Oracle:When Skoa, Embermage enters the battlefield, it deals 4 damage to any target.\Grandeur — Discard another card named Skoa, Embermage, Sacrifice two Mountains: Skoa deals 4 damage to any target. diff --git a/forge-gui/res/cardsfolder/upcoming/solstice_zealot.txt b/forge-gui/res/cardsfolder/upcoming/solstice_zealot.txt index f2ca54708ea..f54c2f6ad98 100644 --- a/forge-gui/res/cardsfolder/upcoming/solstice_zealot.txt +++ b/forge-gui/res/cardsfolder/upcoming/solstice_zealot.txt @@ -4,5 +4,5 @@ Types:Creature Rhino Cleric PT:2/3 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigEnergy | TriggerDescription$ When CARDNAME enters the battlefield, you get {E}{E} (two energy counters). SVar:TrigEnergy:DB$ PutCounter | Defined$ You | CounterType$ ENERGY | CounterNum$ 2 -A:AB$ Tap | Cost$ T PayEnergy<1> | ValidTgts$ Creature | TgtPrompt$ Select target creature | SpellDescription$ Tap target creature. +A:AB$ Tap | Cost$ T PayEnergy<1> | ValidTgts$ Creature | SpellDescription$ Tap target creature. Oracle:When Solstice Zealot enters the battlefield, you get {E}{E} (two energy counters).\n{T}, Pay {E}: Tap target creature. \ No newline at end of file diff --git a/forge-gui/res/cardsfolder/upcoming/sundering_eruption_volcanic_fissure.txt b/forge-gui/res/cardsfolder/upcoming/sundering_eruption_volcanic_fissure.txt index df30282169d..02b80fc824d 100644 --- a/forge-gui/res/cardsfolder/upcoming/sundering_eruption_volcanic_fissure.txt +++ b/forge-gui/res/cardsfolder/upcoming/sundering_eruption_volcanic_fissure.txt @@ -2,7 +2,7 @@ Name:Sundering Eruption ManaCost:2 R Types:Sorcery A:SP$ Destroy | ValidTgts$ Land | TgtPrompt$ Select target land | SubAbility$ DBChange | SpellDescription$ Destroy target land. Its controller may search their library for a basic land card, put it onto the battlefield tapped, then shuffle. Creatures without flying can't block this turn. -SVar:DBChange:DB$ ChangeZone | Optional$ True | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | Tapped$ True | ChangeNum$ 1 | DefinedPlayer$ TargetedController | ShuffleNonMandatory$ True | SubAbility$ SubAbility$ CantBlockEffect +SVar:DBChange:DB$ ChangeZone | Optional$ True | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | Tapped$ True | ChangeNum$ 1 | DefinedPlayer$ TargetedController | ShuffleNonMandatory$ True | SubAbility$ CantBlockEffect SVar:CantBlockEffect:DB$ Effect | StaticAbilities$ KWPump | AILogic$ Evasion | SpellDescription$ Creatures without flying can't block this turn. SVar:KWPump:Mode$ Continuous | EffectZone$ Command | AffectedZone$ Battlefield | Affected$ Creature.withoutFlying | AddHiddenKeyword$ CARDNAME can't block. | Description$ Creatures without flying can't block this turn. SVar:PlayMain1:TRUE diff --git a/forge-gui/res/cardsfolder/upcoming/the_hunger_tide_rises.txt b/forge-gui/res/cardsfolder/upcoming/the_hunger_tide_rises.txt index 2331656c325..85214d2cb25 100644 --- a/forge-gui/res/cardsfolder/upcoming/the_hunger_tide_rises.txt +++ b/forge-gui/res/cardsfolder/upcoming/the_hunger_tide_rises.txt @@ -4,7 +4,7 @@ Types:Enchantment Saga K:Chapter:4:DBToken,DBToken,DBToken,DBSacrifice SVar:DBToken:DB$ Token | TokenAmount$ 1 | TokenScript$ bg_1_1_insect | TokenOwner$ You | SpellDescription$ Create a 1/1 black and green Insect creature token. SVar:DBSacrifice:DB$ Sacrifice | Defined$ You | Amount$ SacX | SacValid$ Creature | RememberSacrificed$ True | Optional$ True | SubAbility$ DBSearch | SpellDescription$ Sacrifice any number of creatures. Search your library and/or graveyard for a creature card with mana value less than or equal to the number of creatures sacrificed this way and put it onto the battlefield. If you search your library this way, shuffle. -SVar:TrigSearch:DB$ ChangeZone | Origin$ Library | OriginAlternative$ Graveyard | Destination$ Battlefield | ChangeType$ Creature.YouOwn+cmcLESearchX | SubAbility$ DBCleanup +SVar:DBSearch:DB$ ChangeZone | Origin$ Library | OriginAlternative$ Graveyard | Destination$ Battlefield | ChangeType$ Creature.YouOwn+cmcLESearchX | SubAbility$ DBCleanup SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True SVar:SacX:Count$Valid Creature.YouCtrl SVar:SearchX:Remembered$Amount diff --git a/forge-gui/res/cardsfolder/upcoming/voltstorm_angel.txt b/forge-gui/res/cardsfolder/upcoming/voltstorm_angel.txt index 1474e1832ff..590cb208594 100644 --- a/forge-gui/res/cardsfolder/upcoming/voltstorm_angel.txt +++ b/forge-gui/res/cardsfolder/upcoming/voltstorm_angel.txt @@ -9,5 +9,5 @@ T:Mode$ Phase | Phase$ BeginCombat | ValidPlayer$ You | TriggerZones$ Battlefiel SVar:TrigImmediateTrig:AB$ ImmediateTrigger | Cost$ PayEnergy<2> | Execute$ TrigCharm | TriggerDescription$ When you do, ABILITY SVar:TrigCharm:DB$ Charm | Choices$ DBSelf,DBOthers | CharmNum$ 1 SVar:DBSelf:DB$ Pump | Defined$ Self | KW$ Vigilance & Lifelink | SpellDescription$ CARDNAME gains vigilance and lifelink until end of turn. -SVar:DBOthers:DB$ Pump | Defined$ Creature.StrictlyOther+YouCtrl | NumAtt$ +1 | NumDef$ +1 | SpellDescription$ Other creatures you control get +1/+1 until end of turn. +SVar:DBOthers:DB$ Pump | Defined$ Valid Creature.StrictlyOther+YouCtrl | NumAtt$ +1 | NumDef$ +1 | SpellDescription$ Other creatures you control get +1/+1 until end of turn. Oracle:Flying\nWhen Voltstorm Angel enters the battlefield, you get {E}{E}{E} (three energy counters).\nAt the beginning of combat on your turn, you may pay {E}{E}. When you do, choose one—\n• Voltstorm Angel gains vigilance and lifelink until end of turn.\n• Other creatures you control get +1/+1 until end of turn. diff --git a/forge-gui/res/cardsfolder/upcoming/waterlogged_teachings_inundated_archive.txt b/forge-gui/res/cardsfolder/upcoming/waterlogged_teachings_inundated_archive.txt index 8de6b24901e..35357076b52 100644 --- a/forge-gui/res/cardsfolder/upcoming/waterlogged_teachings_inundated_archive.txt +++ b/forge-gui/res/cardsfolder/upcoming/waterlogged_teachings_inundated_archive.txt @@ -2,8 +2,6 @@ Name:Waterlogged Teachings ManaCost:3 UB Types:Instant A:SP$ ChangeZone | ChangeType$ Instant,Card.hasKeywordFlash | ChangeNum$ 1 | Origin$ Library | Destination$ Hand | Shuffle$ True | SpellDescription$ Search your library for an instant card or a card with flash, reveal it, put it into your hand, then shuffle. -#TODO (copied from Mystical Teachings): The AI will currently search for the most expensive valid card in the library. This can be used to the AI's advantage with -#careful deck design (which is why this card only works in properly designed AI decks). Consider improving tutoring logic with priorities. AI:RemoveDeck:Random AlternateMode:Modal Oracle:Search your library for an instant card or a card with flash, reveal it, put it into your hand, then shuffle.