From 1f90f4e4700a804ae445a479403cbcf333d48e4c Mon Sep 17 00:00:00 2001 From: Tim Mocny Date: Thu, 16 Jan 2020 21:49:58 +0000 Subject: [PATCH] THB 1/15 tweaks and such --- .../java/forge/game/card/CounterType.java | 2 +- .../upcoming/calix_destinys_hand.txt | 2 +- .../upcoming/heliods_punishment.txt | 2 +- .../upcoming/protean_thaumaturge.txt | 4 +- .../res/editions/Theros Beyond Death.txt | 77 ------------------- 5 files changed, 5 insertions(+), 82 deletions(-) diff --git a/forge-game/src/main/java/forge/game/card/CounterType.java b/forge-game/src/main/java/forge/game/card/CounterType.java index 2d20a3c9abd..5d9fd5970d6 100644 --- a/forge-game/src/main/java/forge/game/card/CounterType.java +++ b/forge-game/src/main/java/forge/game/card/CounterType.java @@ -269,7 +269,7 @@ public enum CounterType { STUDY("STUDY", 226, 192, 165), - TASK("TASK", 109, 95, 243), + TASK("TASK", 191, 63, 49), THEFT("THEFT", 255, 176, 125), diff --git a/forge-gui/res/cardsfolder/upcoming/calix_destinys_hand.txt b/forge-gui/res/cardsfolder/upcoming/calix_destinys_hand.txt index 1955175d823..0bcbd73afa6 100755 --- a/forge-gui/res/cardsfolder/upcoming/calix_destinys_hand.txt +++ b/forge-gui/res/cardsfolder/upcoming/calix_destinys_hand.txt @@ -9,6 +9,6 @@ SVar:Cleanup:DB$ Cleanup | ClearRemembered$ True SVar:ComeBack:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | ValidCard$ Card.IsImprinted | Execute$ TrigReturn | TriggerZones$ Command | TriggerController$ TriggeredCardController | Static$ True | TriggerDescription$ Target is exiled until target enchantment you control leaves the battlefield. SVar:TrigReturn:DB$ ChangeZone | Origin$ Exile | Destination$ Battlefield | Defined$ Remembered | SubAbility$ ExileSelf SVar:ExileSelf:DB$ ChangeZone | Origin$ Command | Destination$ Exile | Defined$ Self -SVar:OblivionRing:TRUE A:AB$ ChangeZoneAll | Cost$ SubCounter<7/LOYALTY> | Planeswalker$ True | Ultimate$ True | ChangeType$ Enchantment.YouOwn | Origin$ Graveyard | Destination$ Battlefield | SpellDescription$ Return all enchantment cards from your graveyard to the battlefield. +DeckNeeds:Type$Enchantment Oracle:[+1]: Look at the top four cards of your library. You may reveal an enchantment card from among them and put that card into your hand. Put the rest on the bottom of your library in a random order.\n[−3]: Exile target creature or enchantment you don't control until target enchantment you control leaves the battlefield.\n[−7]: Return all enchantment cards from your graveyard to the battlefield. diff --git a/forge-gui/res/cardsfolder/upcoming/heliods_punishment.txt b/forge-gui/res/cardsfolder/upcoming/heliods_punishment.txt index d67269e05e5..081b985e559 100644 --- a/forge-gui/res/cardsfolder/upcoming/heliods_punishment.txt +++ b/forge-gui/res/cardsfolder/upcoming/heliods_punishment.txt @@ -5,6 +5,6 @@ K:Enchant creature K:etbCounter:TASK:4 A:SP$ Attach | Cost$ 1 W | ValidTgts$ Creature | AILogic$ Curse S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddHiddenKeyword$ CARDNAME can't attack or block. | RemoveAllAbilities$ True | AddAbility$ ABRemoveCounter | AddSVar$ DBHeliodsPunishment | Description$ Enchanted creature can't attack or block. It loses all abilities and has "{T}: Remove a task counter from CARDNAME. Then if it has no task counters on it, destroy CARDNAME." -SVar:ABRemoveCounter:AB$ RemoveCounter | Cost$ T | CounterType$ TASK | CounterNum$ 1 | AILogic$ Always | Defined$ OriginalHost | SpellDescription$ Remove a task counter from ORIGINALHOST. Then if it has no task counters on it, destroy ORIGINALHOST. | SubAbility$ DBHeliodsPunishment +SVar:ABRemoveCounter:AB$ RemoveCounter | Cost$ T | CounterType$ TASK | CounterNum$ 1 | AILogic$ Always | Defined$ OriginalHost | StackDescription$ SpellDescription | SpellDescription$ Remove a task counter from ORIGINALHOST. Then if it has no task counters on it, destroy ORIGINALHOST. | SubAbility$ DBHeliodsPunishment SVar:DBHeliodsPunishment:DB$ Destroy | Defined$ OriginalHost | ConditionDefined$ OriginalHost | ConditionPresent$ Card.counters_EQ0_TASK Oracle:Enchant creature\nHeliod's Punishment enters the battlefield with four task counters on it.\nEnchanted creature can't attack or block. It loses all abilities and has "{T}: Remove a task counter from Heliod's Punishment. Then if it has no task counters on it, destroy Heliod's Punishment." diff --git a/forge-gui/res/cardsfolder/upcoming/protean_thaumaturge.txt b/forge-gui/res/cardsfolder/upcoming/protean_thaumaturge.txt index b39f880520c..1cb8fb890f8 100644 --- a/forge-gui/res/cardsfolder/upcoming/protean_thaumaturge.txt +++ b/forge-gui/res/cardsfolder/upcoming/protean_thaumaturge.txt @@ -2,6 +2,6 @@ Name:Protean Thaumaturge ManaCost:1 U Types:Creature Human Wizard PT:1/1 -T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Enchantment.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigProteanCopy | TriggerDescription$ Constellation — Whenever an enchantment enters the battlefield under your control, you may have Protean Thaumaturge become a copy of another target creature, except it has this ability. -SVar:TrigProteanCopy:DB$ Clone | ValidTgts$ Creature | TgtPrompt$ Select target creature to copy | Optional$ True | GainThisAbility$ True | AddSVars$ TrigProteanCopy | AILogic$ CloneBestCreature +T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Enchantment.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigProteanCopy | TriggerDescription$ Constellation — Whenever an enchantment enters the battlefield under your control, you may have CARDNAME become a copy of another target creature, except it has this ability. +SVar:TrigProteanCopy:DB$ Clone | ValidTgts$ Creature.Other | TgtPrompt$ Select target creature to copy | Optional$ True | GainThisAbility$ True | AddSVars$ TrigProteanCopy | AILogic$ CloneBestCreature Oracle:Constellation — Whenever an enchantment enters the battlefield under your control, you may have Protean Thaumaturge become a copy of another target creature, except it has this ability. diff --git a/forge-gui/res/editions/Theros Beyond Death.txt b/forge-gui/res/editions/Theros Beyond Death.txt index ba0ac3fc86e..892ae22467a 100644 --- a/forge-gui/res/editions/Theros Beyond Death.txt +++ b/forge-gui/res/editions/Theros Beyond Death.txt @@ -263,20 +263,6 @@ Prerelease=6 Boosters, 1 RareMythic+ 252 L Swamp 253 L Mountain 254 L Forest -255 M Elspeth, Sun's Nemesis -256 M Ashiok, Nightmare Muse -257 M Calix, Destiny's Hand -258 U Daxos, Blessed by the Sun -259 M Heliod, Sun-Crowned -260 U Callaphe, Beloved of the Sea -261 M Thassa, Deep-Dwelling -262 M Erebos, Bleak-Hearted -263 U Tymaret, Chosen from Death -264 U Anax, Hardened in the Forge -265 M Purphoros, Bronze-Blooded -266 M Nylea, Keen-Eyed -267 U Renata, Called to the Hunt -268 M Klothys, God of Destiny 269 M Athreos, Shroud-Veiled 270 M Elspeth, Undaunted Hero 271 U Eidolon of Inspiration @@ -296,69 +282,6 @@ Prerelease=6 Boosters, 1 RareMythic+ 285 L Mountain 286 L Forest 287 L Forest -288 R Grasping Giant -289 R Victory's Envoy -290 R Sphinx Mindbreaker -291 R Serpent of Yawning Depths -292 R Demon of Loathing -293 R Underworld Sentinel -294 R Deathbellow War Cry -295 R Terror of Mount Velus -296 R Ironscale Hydra -297 R Treeshaker Chimera -298 R Archon of Sun's Grace -299 R Eidolon of Obstruction -300 R Heliod's Intervention -301 R Idyllic Tutor -302 R Shatter the Sky -304 R Ashiok's Erasure -305 R Nadir Kraken -306 R Protean Thaumaturge -307 R Thassa's Intervention -308 R Thassa's Oracle -309 R Thryx, the Sudden Storm -310 R Wavebreak Hippocamp -311 R Aphemia, the Cacophony -312 R Eat to Extinction -313 R Erebos's Intervention -314 R Gravebreaker Lamia -315 R Nightmare Shepherd -316 R Treacherous Blessing -317 R Woe Strider -318 M Ox of Agonas -319 R Phoenix of Ash -320 R Purphoros's Intervention -321 R Storm Herald -322 R Storm's Wrath -323 R Tectonic Giant -324 R Underworld Breach -325 R Arasta of the Endless Web -326 R Dryad of the Ilysian Grove -327 R Mantle of the Wolf -328 R Nessian Boar -329 R Nylea's Intervention -330 M Nyxbloom Ancient -331 R Setessan Champion -332 R Allure of the Unknown -333 R Atris, Oracle of Half-Truths -334 R Bronzehide Lion -335 R Dalakos, Crafter of Wonders -336 R Dream Trawler -337 R Enigmatic Incarnation -338 R Gallia of the Endless Dance -339 R Haktos the Unscarred -340 M Kroxa, Titan of Death's Hunger -341 R Kunoros, Hound of Athreos -342 M Polukranos, Unchained -343 M Uro, Titan of Nature's Wrath -344 R Nyx Lotus -345 R Shadowspear -346 R Labyrinth of Skophos -347 R Temple of Abandon -348 R Temple of Deceit -349 R Temple of Enlightenment -350 R Temple of Malice -351 R Temple of Plenty [tokens] b_2_2_zombie