From 8bd6b6393ed7898e9ef51a4bf029d7b044204669 Mon Sep 17 00:00:00 2001 From: swordshine Date: Thu, 23 May 2019 14:06:33 +0800 Subject: [PATCH] Update some scripts --- .../res/cardsfolder/upcoming/astral_drift.txt | 13 +++--- .../upcoming/planebound_accomplice.txt | 4 +- .../cardsfolder/upcoming/tempered_sliver.txt | 6 +-- forge-gui/res/editions/Modern Horizons.txt | 42 ++++++++++++++++++- forge-gui/res/formats/Sanctioned/Modern.txt | 2 +- 5 files changed, 54 insertions(+), 13 deletions(-) diff --git a/forge-gui/res/cardsfolder/upcoming/astral_drift.txt b/forge-gui/res/cardsfolder/upcoming/astral_drift.txt index d7c41de34ed..5fd6a2b7d89 100644 --- a/forge-gui/res/cardsfolder/upcoming/astral_drift.txt +++ b/forge-gui/res/cardsfolder/upcoming/astral_drift.txt @@ -2,9 +2,10 @@ Name:Astral Drift ManaCost:2 W Types:Enchantment K:Cycling:2 W -T:Mode$ Cycled | ValidCard$ Card.Self | Execute$ TrigExile | OptionalDecider$ You | TriggerZones$ Graveyard | TriggerDescription$ Whenever you cycle CARDNAME, you may exile target creature. If you do, return that card to the battlefield under its owner's control at the beginning of the next end step. -T:Mode$ Cycled | ValidCard$ Card.Other | Execute$ TrigExile | OptionalDecider$ You | TriggerZones$ Battlefield | TriggerDescription$ Whenever you cycle another card while CARDNAME is on the battlefield, you may exile target creature. If you do, return that card to the battlefield under its owner's control at the beginning of the next end step. -SVar:TrigExile:DB$ ChangeZone | Origin$ Battlefield | Destination$ Exile | ValidTgts$ Creature | RememberTargets$ True | TgtPrompt$ Select target creature | SubAbility$ DelTrig | SpellDescription$ Exile target creature. Return that card to the battlefield under its owner's control at end of turn. -SVar:DelTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ End of Turn | Execute$ TrigReturn | TriggerDescription$ Return exiled card to the battlefield. -SVar:TrigReturn:DB$ ChangeZone | Defined$ Remembered | Origin$ Exile | Destination$ Battlefield -Oracle:Whenever you cycle Astral Drift or cycle another card while Astral Drift is on the battlefield, you may exile target creature. If you do, return that card to the battlefield under its owner's control at the beginning of the next end step.\nCycling {2}{W} ({2}{W}, Discard this card: Draw a card.) \ No newline at end of file +T:Mode$ Cycled | ValidCard$ Card.Self | Execute$ TrigExile | OptionalDecider$ You | TriggerDescription$ Whenever you cycle CARDNAME or cycle another card while CARDNAME is on the battlefield, you may exile target creature. If you do, return that card to the battlefield under its owner's control at the beginning of the next end step. +T:Mode$ Cycled | ValidCard$ Card.Other+YouOwn | Execute$ TrigExile | OptionalDecider$ You | TriggerZones$ Battlefield | Secondary$ True | TriggerDescription$ Whenever you cycle CARDNAME or cycle another card while CARDNAME is on the battlefield, you may exile target creature. If you do, return that card to the battlefield under its owner's control at the beginning of the next end step. +SVar:TrigExile:DB$ ChangeZone | Origin$ Battlefield | Destination$ Exile | ValidTgts$ Creature | RememberChanged$ True | TgtPrompt$ Select target creature | SubAbility$ DelTrig | SpellDescription$ Exile target creature. Return that card to the battlefield under its owner's control at end of turn. +SVar:DelTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ End of Turn | Execute$ TrigReturn | RememberObjects$ Remembered | TriggerDescription$ Return exiled card to the battlefield. | SubAbility$ DBCleanup +SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True +SVar:TrigReturn:DB$ ChangeZone | Defined$ DelayTriggerRemembered | Origin$ Exile | Destination$ Battlefield +Oracle:Whenever you cycle Astral Drift or cycle another card while Astral Drift is on the battlefield, you may exile target creature. If you do, return that card to the battlefield under its owner's control at the beginning of the next end step.\nCycling {2}{W} ({2}{W}, Discard this card: Draw a card.) diff --git a/forge-gui/res/cardsfolder/upcoming/planebound_accomplice.txt b/forge-gui/res/cardsfolder/upcoming/planebound_accomplice.txt index a6bfd05d5be..c5901a170f5 100644 --- a/forge-gui/res/cardsfolder/upcoming/planebound_accomplice.txt +++ b/forge-gui/res/cardsfolder/upcoming/planebound_accomplice.txt @@ -2,8 +2,8 @@ Name:Planebound Accomplice ManaCost:2 R Types:Creature Human Wizard PT:1/3 -A:AB$ ChangeZone | Cost$ R | Origin$ Hand | Destination$ Battlefield | ChangeType$ Planeswalker.YouOwn | Optional$ True | SubAbility$ DBPump | AILogic$ BeforeCombat | SpellDescription$ You may put a planeswalker card from your hand onto the battlefield. Sacrifice it at the beginning of the next end step. -SVar:DBPump:DB$ Pump | Defined$ Self | AtEOT$ Sacrifice | SubAbility$ DBCleanup +A:AB$ ChangeZone | Cost$ R | Origin$ Hand | Destination$ Battlefield | ChangeType$ Planeswalker.YouOwn | RememberChanged$ True | Optional$ True | SubAbility$ DBPump | AILogic$ BeforeCombat | SpellDescription$ You may put a planeswalker card from your hand onto the battlefield. Sacrifice it at the beginning of the next end step. +SVar:DBPump:DB$ Pump | Defined$ Remembered | AtEOT$ Sacrifice | SubAbility$ DBCleanup SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True AI:RemoveDeck:Random Oracle:{R}: You may put a planeswalker card from your hand onto the battlefield. Sacrifice it at the beginning of the next end step. diff --git a/forge-gui/res/cardsfolder/upcoming/tempered_sliver.txt b/forge-gui/res/cardsfolder/upcoming/tempered_sliver.txt index 4afae6c6eee..e4c1aace376 100644 --- a/forge-gui/res/cardsfolder/upcoming/tempered_sliver.txt +++ b/forge-gui/res/cardsfolder/upcoming/tempered_sliver.txt @@ -2,9 +2,9 @@ Name:Tempered Sliver ManaCost:2 G Types:Creature Sliver PT:2/2 -S:Mode$ Continuous | Affected$ Creature.Sliver+YouCtrl | AddTrigger$ DamageDone | Description$ Sliver creatures you control have "Whenever this creature deals combat damage to a player, put a +1/+1 counter on it." -SVar:DamageDone:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigPutCounter | TriggerZones$ Battlefield | TriggerDescription$ Whenever this creature deals combat damage to a player, put a +1/+1 counter on it. -SVar:TrigPutCounter:DB$PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1 +S:Mode$ Continuous | Affected$ Creature.Sliver+YouCtrl | AddTrigger$ DamageDone | AddSVar$ TemperedSliverPutCounter | Description$ Sliver creatures you control have "Whenever this creature deals combat damage to a player, put a +1/+1 counter on it." +SVar:DamageDone:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | Execute$ TemperedSliverPutCounter | TriggerZones$ Battlefield | TriggerDescription$ Whenever this creature deals combat damage to a player, put a +1/+1 counter on it. +SVar:TemperedSliverPutCounter:DB$PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1 SVar:PlayMain1:TRUE SVar:BuffedBy:Sliver Oracle:Sliver creatures you control have "Whenever this creature deals combat damage to a player, put a +1/+1 counter on it." \ No newline at end of file diff --git a/forge-gui/res/editions/Modern Horizons.txt b/forge-gui/res/editions/Modern Horizons.txt index b43897e0380..3ab292dca27 100644 --- a/forge-gui/res/editions/Modern Horizons.txt +++ b/forge-gui/res/editions/Modern Horizons.txt @@ -8,30 +8,70 @@ Type=Other [cards] 1 M Morophon, the Boundless +3 R Astral Drift +5 U Dismantling Blow +10 R Force of Virtue +13 R Giver of Runes 14 C Impostor of the Sixth Pride 19 C Martyr's Soul +21 M Ranger-Captain of Eos 26 M Serra the Benevolent 36 C Wall of One Thousand Cuts 38 U Wing Shards +43 C Chillerpillar 44 C Choking Tethers +48 U Exclude 50 U Fact or Fiction 52 R Force of Negation +55 C Man-o'-War +63 C Pondering Mage 64 C Prohibit +67 C Scour All Possibilities 71 C Stream of Thought +75 M Urza, Lord High Artificer 80 R Cabal Therapist +84 U Crypt Rats +87 C Diabolic Edict +88 U Dregscape Sliver +92 R Force of Despair 95 C Headless Specter -114 C Venomous Changling +112 U Undead Augur +114 C Venomous Changeling +118 R Blazing Chant 122 U Firebolt +123 C Fists of Flame +128 R Goblin Engineer 129 U Goblin Matron 131 C Goblin War Party 134 C Lava Dart +140 R Planebound Accomplice 145 M Seasoned Pyromancer 161 R Deep Forest Hermit 162 C Elvish Fury 164 R Force of Vigor +174 C Nimble Mongoose +175 U Regrowth 178 C Savage Swipe +179 U Scale Up +180 C Spore Frog +183 U Tempered Sliver +194 U Abominable Treefolk +196 R Collected Conjuring +198 U Etchings of the Chosen +200 M The First Sliver +201 U Good-Fortune Unicorn 203 R Ice-Fang Coatl +207 U Lavabelly Sliver +208 R Lightning Skelemental +209 U Munitions Expert +215 U Thundering Djinn +227 R Scrapyard Recombiner +238 R Fiery Islet +243 R Nurturing Peatland 244 R Prismatic Vista +246 R Silent Clearing +247 R Sunbaked Canyon +249 R Waterlogged Grove 250 L Snow-Covered Plains 251 L Snow-Covered Island 252 L Snow-Covered Swamp diff --git a/forge-gui/res/formats/Sanctioned/Modern.txt b/forge-gui/res/formats/Sanctioned/Modern.txt index 4f23105e5e9..b6803d0783a 100644 --- a/forge-gui/res/formats/Sanctioned/Modern.txt +++ b/forge-gui/res/formats/Sanctioned/Modern.txt @@ -3,5 +3,5 @@ Name:Modern Order:102 Subtype:Modern Type:Sanctioned -Sets:8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, GPT, DIS, CSP, TSP, TSB, PLC, FUT, 10E, LRW, EVE, SHM, MOR, ALA, CFX, ARB, M10, ZEN, WWK, ROE, M11, SOM, MBS, NPH, M12, ISD, DKA, AVR, M13, RTR, GTC, DGM, M14, THS, BNG, JOU, M15, KTK, FRF, DTK, MM2, ORI, BFZ, OGW, SOI, EMN, KLD, AER, AKH, W17, HOU, XLN, RIX, DOM, M19, G18, GRN, RNA, WAR +Sets:8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, GPT, DIS, CSP, TSP, TSB, PLC, FUT, 10E, LRW, EVE, SHM, MOR, ALA, CFX, ARB, M10, ZEN, WWK, ROE, M11, SOM, MBS, NPH, M12, ISD, DKA, AVR, M13, RTR, GTC, DGM, M14, THS, BNG, JOU, M15, KTK, FRF, DTK, MM2, ORI, BFZ, OGW, SOI, EMN, KLD, AER, AKH, W17, HOU, XLN, RIX, DOM, M19, G18, GRN, RNA, WAR, MH1 Banned:Ancient Den; Birthing Pod; Blazing Shoal; Chrome Mox; Cloudpost; Dark Depths; Deathrite Shaman; Dig Through Time; Dread Return; Eye of Ugin; Gitaxian Probe; Glimpse of Nature; Golgari Grave-Troll; Great Furnace; Green Sun's Zenith; Hypergenesis; Krark-Clan Ironworks; Mental Misstep; Ponder; Preordain; Punishing Fire; Rite of Flame; Seat of the Synod; Second Sunrise; Seething Song; Sensei's Divining Top; Skullclamp; Splinter Twin; Stoneforge Mystic; Summer Bloom; Treasure Cruise; Tree of Tales; Umezawa's Jitte; Vault of Whispers