- Converted keyword "Permanents don't untap during their controllers' untap steps" to a static ablility

- Added Dream Tides, Magnetic Mountain, Mudslide, Thelon's Curse
2025-11-17 03:08:02 +00:00 · 2014-03-10 00:32:54 +00:00
parent 891b1fa2fd
commit a4be2a944d
22 changed files with 77 additions and 47 deletions
--- a/.gitattributes
+++ b/.gitattributes
@@ -3739,6 +3739,7 @@ forge-gui/res/cardsfolder/d/dream_salvage.txt -text
 forge-gui/res/cardsfolder/d/dream_stalker.txt svneol=native#text/plain
 forge-gui/res/cardsfolder/d/dream_thief.txt -text
 forge-gui/res/cardsfolder/d/dream_thrush.txt -text
+forge-gui/res/cardsfolder/d/dream_tides.txt -text
 forge-gui/res/cardsfolder/d/dream_twist.txt -text
 forge-gui/res/cardsfolder/d/dreamborn_muse.txt svneol=native#text/plain
 forge-gui/res/cardsfolder/d/dreamcatcher.txt svneol=native#text/plain
@@ -7484,6 +7485,7 @@ forge-gui/res/cardsfolder/m/magmatic_force.txt svneol=native#text/plain
 forge-gui/res/cardsfolder/m/magmaw.txt svneol=native#text/plain
 forge-gui/res/cardsfolder/m/magnetic_flux.txt svneol=native#text/plain
 forge-gui/res/cardsfolder/m/magnetic_mine.txt svneol=native#text/plain
+forge-gui/res/cardsfolder/m/magnetic_mountain.txt -text
 forge-gui/res/cardsfolder/m/magnetic_theft.txt -text
 forge-gui/res/cardsfolder/m/magnify.txt svneol=native#text/plain
 forge-gui/res/cardsfolder/m/magnigoth_treefolk.txt svneol=native#text/plain
@@ -8189,6 +8191,7 @@ forge-gui/res/cardsfolder/m/mudbutton_clanger.txt svneol=native#text/plain
 forge-gui/res/cardsfolder/m/mudbutton_torchrunner.txt svneol=native#text/plain
 forge-gui/res/cardsfolder/m/muddle_the_mixture.txt svneol=native#text/plain
 forge-gui/res/cardsfolder/m/mudhole.txt -text
+forge-gui/res/cardsfolder/m/mudslide.txt -text
 forge-gui/res/cardsfolder/m/mugging.txt -text
 forge-gui/res/cardsfolder/m/mul_daya_channelers.txt svneol=native#text/plain
 forge-gui/res/cardsfolder/m/mulch.txt svneol=native#text/plain
@@ -12532,6 +12535,7 @@ forge-gui/res/cardsfolder/t/thelonite_druid.txt -text
 forge-gui/res/cardsfolder/t/thelonite_hermit.txt svneol=native#text/plain
 forge-gui/res/cardsfolder/t/thelonite_monk.txt svneol=native#text/plain
 forge-gui/res/cardsfolder/t/thelons_chant.txt -text
+forge-gui/res/cardsfolder/t/thelons_curse.txt -text
 forge-gui/res/cardsfolder/t/thermal_blast.txt svneol=native#text/plain
 forge-gui/res/cardsfolder/t/thermal_flux.txt -text
 forge-gui/res/cardsfolder/t/thermal_glider.txt svneol=native#text/plain
--- a/forge-game/src/main/java/forge/game/card/Card.java
+++ b/forge-game/src/main/java/forge/game/card/Card.java
@@ -1946,8 +1946,7 @@ public class Card extends GameEntity implements Comparable<Card> {

        for (int i = 0; i < keywords.size(); i++) {
            String keyword = keywords.get(i);
-            if (keyword.startsWith("Permanents don't untap during their controllers' untap steps")
-                    || keyword.startsWith("PreventAllDamageBy")
+            if (keyword.startsWith("PreventAllDamageBy")
                    || keyword.startsWith("CantEquip")
                    || keyword.startsWith("SpellCantTarget")) {
                continue;
--- a/forge-game/src/main/java/forge/game/phase/Untap.java
+++ b/forge-game/src/main/java/forge/game/phase/Untap.java
@@ -85,21 +85,6 @@ public class Untap extends Phase {
                || c.hasKeyword("This card doesn't untap during your next two untap steps.")) {
            return false;
        }
-
-        for (final Card ca : c.getGame().getCardsIn(ZoneType.Battlefield)) {
-            if (ca.hasStartOfKeyword("Permanents don't untap during their controllers' untap steps")) {
-                final int keywordPosition = ca
-                        .getKeywordPosition("Permanents don't untap during their controllers' untap steps");
-                final String parse = ca.getKeyword().get(keywordPosition).toString();
-                final String[] k = parse.split(":");
-                final String[] restrictions = k[1].split(",");
-                final Card card = ca;
-                if (c.isValid(restrictions, card.getController(), card)) {
-                    return false;
-                }
-            }
-        } // end of Permanents don't untap during their controllers' untap steps
-
        return true;
    }

--- a/forge-gui/res/cardsfolder/a/arena_of_the_ancients.txt
+++ b/forge-gui/res/cardsfolder/a/arena_of_the_ancients.txt
@@ -1,8 +1,7 @@
 Name:Arena of the Ancients
 ManaCost:3
 Types:Artifact
-Text:Legendary creatures don't untap during their controllers' untap steps.
-K:Permanents don't untap during their controllers' untap steps:Creature.Legendary
+S:Mode$ Continuous | Affected$ Creature.Legendary | AddHiddenKeyword$ CARDNAME doesn't untap during your untap step. | Description$ Legendary creatures don't untap during their controllers' untap steps.
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigTapAll | TriggerDescription$ When CARDNAME enters the battlefield, tap all legendary creatures.
 SVar:TrigTapAll:AB$TapAll | Cost$ 0 | ValidCards$ Creature.Legendary
 SVar:NonStackingEffect:True
--- a/forge-gui/res/cardsfolder/b/back_to_basics.txt
+++ b/forge-gui/res/cardsfolder/b/back_to_basics.txt
@@ -1,8 +1,7 @@
 Name:Back to Basics
 ManaCost:2 U
 Types:Enchantment
-Text:Nonbasic lands don't untap during their controllers' untap steps.
-K:Permanents don't untap during their controllers' untap steps:Land.nonBasic
+S:Mode$ Continuous | Affected$ Land.nonBasic | AddHiddenKeyword$ CARDNAME doesn't untap during your untap step. | Description$ Nonbasic lands don't untap during their controllers' untap steps.
 SVar:NonStackingEffect:True
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/back_to_basics.jpg
--- a/forge-gui/res/cardsfolder/b/blizzard.txt
+++ b/forge-gui/res/cardsfolder/b/blizzard.txt
@@ -1,10 +1,9 @@
 Name:Blizzard
 ManaCost:G G
 Types:Enchantment
-Text:Creatures with flying don't untap during their controllers' untap steps.
 K:Cumulative upkeep:2
+S:Mode$ Continuous | Affected$ Creature.withFlying | AddHiddenKeyword$ CARDNAME doesn't untap during your untap step. | Description$ Creatures with flying don't untap during their controllers' untap steps.
 S:Mode$ CantBeCast | ValidCard$ Card.Self | EffectZone$ All | CheckSVar$ X | SVarCompare$ EQ0 | Description$ Cast CARDNAME only if you control a snow land.
-K:Permanents don't untap during their controllers' untap steps:Creature.withFlying
 SVar:X:Count$Valid Snow.Land+YouCtrl
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/blizzard.jpg
--- a/forge-gui/res/cardsfolder/c/choke.txt
+++ b/forge-gui/res/cardsfolder/c/choke.txt
@@ -1,8 +1,7 @@
 Name:Choke
 ManaCost:2 G
 Types:Enchantment
-Text:Islands don't untap during their controllers' untap steps.
-K:Permanents don't untap during their controllers' untap steps:Island
+S:Mode$ Continuous | Affected$ Island | AddHiddenKeyword$ CARDNAME doesn't untap during your untap step. | Description$ Islands don't untap during their controllers' untap steps.
 SVar:NonStackingEffect:True
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/choke.jpg
--- a/forge-gui/res/cardsfolder/c/crackdown.txt
+++ b/forge-gui/res/cardsfolder/c/crackdown.txt
@@ -1,8 +1,7 @@
 Name:Crackdown
 ManaCost:2 W
 Types:Enchantment
-Text:Nonwhite creatures with power 3 or greater don't untap during their controllers' untap steps.
-K:Permanents don't untap during their controllers' untap steps:Creature.powerGE3+nonWhite
+S:Mode$ Continuous | Affected$ Creature.powerGE3+nonWhite | AddHiddenKeyword$ CARDNAME doesn't untap during your untap step. | Description$ Nonwhite creatures with power 3 or greater don't untap during their controllers' untap steps.
 SVar:NonStackingEffect:True
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/crackdown.jpg
--- a/forge-gui/res/cardsfolder/c/curse_of_marit_lage.txt
+++ b/forge-gui/res/cardsfolder/c/curse_of_marit_lage.txt
@@ -1,8 +1,7 @@
 Name:Curse of Marit Lage
 ManaCost:3 R R
 Types:Enchantment
-Text:Islands don't untap during their controllers' untap steps.
-K:Permanents don't untap during their controllers' untap steps:Island
+S:Mode$ Continuous | Affected$ Island | AddHiddenKeyword$ CARDNAME doesn't untap during your untap step. | Description$ Islands don't untap during their controllers' untap steps.
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigTapAll | TriggerDescription$ When CARDNAME enters the battlefield, tap all Islands.
 SVar:TrigTapAll:AB$ TapAll | Cost$ 0 | ValidCards$ Island
 SVar:NonStackingEffect:True
--- a/forge-gui/res/cardsfolder/d/dream_tides.txt
+++ b/forge-gui/res/cardsfolder/d/dream_tides.txt
@@ -0,0 +1,13 @@
+Name:Dream Tides
+ManaCost:2 U U
+Types:Enchantment
+S:Mode$ Continuous | Affected$ Creature | AddHiddenKeyword$ CARDNAME doesn't untap during your untap step. | Description$ Creatures don't untap during their controllers' untap steps.
+T:Mode$ Phase | Phase$ Upkeep | TriggerZones$ Battlefield | Execute$ TrigChoose | TriggerDescription$ At the beginning of each player's upkeep, that player may choose any number of tapped nongreen creatures he or she controls and pay {2} for each creature chosen this way. If the player does, untap those creatures.
+SVar:TrigChoose:DB$ ChooseCard | Defined$ TriggeredPlayer | Amount$ X | References$ X | Choices$ Creature.tapped+nonGreen | TargetControls$ True | ChoiceTitle$ Choose any number of tapped nongreen creatures you control | ChoiceZone$ Battlefield | SubAbility$ DBUntap
+SVar:DBUntap:DB$ RepeatEach | DefinedCards$ ChosenCard | RepeatSubAbility$ UntapEach
+SVar:UntapEach:DB$ Untap | Defined$ Remembered | UnlessCost$ 2 | UnlessPayer$ RememberedController | UnlessSwitched$ True
+SVar:X:Count$Valid Creature.tapped+nonGreen+ActivePlayerCtrl
+SVar:RemRandomDeck:True
+SVar:NonStackingEffect:True
+SVar:Picture:http://www.wizards.com/global/images/magic/general/dream_tides.jpg
+Oracle:Creatures don't untap during their controllers' untap steps.\nAt the beginning of each player's upkeep, that player may choose any number of tapped nongreen creatures he or she controls and pay {2} for each creature chosen this way. If the player does, untap those creatures.
--- a/forge-gui/res/cardsfolder/e/embargo.txt
+++ b/forge-gui/res/cardsfolder/e/embargo.txt
@@ -1,10 +1,10 @@
 Name:Embargo
 ManaCost:3 U
 Types:Enchantment
-Text:Nonland permanents don't untap during their controllers' untap steps.
-K:Permanents don't untap during their controllers' untap steps:Permanent.nonLand
+S:Mode$ Continuous | Affected$ Permanent.nonLand | AddHiddenKeyword$ CARDNAME doesn't untap during your untap step. | Description$ Nonland permanents don't untap during their controllers' untap steps.
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigLoseLife | TriggerDescription$ At the beginning of your upkeep, you lose 2 life.
 SVar:TrigLoseLife:AB$LoseLife | Cost$ 0 | Defined$ You | LifeAmount$ 2
 SVar:RemRandomDeck:True
+SVar:NonStackingEffect:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/embargo.jpg
 Oracle:Nonland permanents don't untap during their controllers' untap steps.\nAt the beginning of your upkeep, you lose 2 life.
--- a/forge-gui/res/cardsfolder/e/energy_storm.txt
+++ b/forge-gui/res/cardsfolder/e/energy_storm.txt
@@ -2,8 +2,9 @@ Name:Energy Storm
 ManaCost:1 W
 Types:Enchantment
 K:Cumulative upkeep:1
-K:Permanents don't untap during their controllers' untap steps:Creature.withFlying
-S:Mode$ PreventDamage | Source$ Instant,Sorcery | Description$ Prevent all damage that would be dealt by instant and sorcery spells. Creatures with flying don't untap during their controller's untap step.
+S:Mode$ Continuous | Affected$ Creature.withFlying | AddHiddenKeyword$ CARDNAME doesn't untap during your untap step. | Description$ Creatures with flying don't untap during their controllers' untap steps.
+S:Mode$ PreventDamage | Source$ Instant,Sorcery | Description$ Prevent all damage that would be dealt by instant and sorcery spells.
 SVar:RemRandomDeck:True
+SVar:NonStackingEffect:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/energy_storm.jpg
 Oracle:Cumulative upkeep {1} (At the beginning of your upkeep, put an age counter on this permanent, then sacrifice it unless you pay its upkeep cost for each age counter on it.)\nPrevent all damage that would be dealt by instant and sorcery spells.\nCreatures with flying don't untap during their controllers' untap steps.
--- a/forge-gui/res/cardsfolder/f/freyalises_radiance.txt
+++ b/forge-gui/res/cardsfolder/f/freyalises_radiance.txt
@@ -1,9 +1,9 @@
 Name:Freyalise's Radiance
 ManaCost:1 G
 Types:Enchantment
-Text:Snow permanents don't untap during their controllers' untap steps.
-K:Permanents don't untap during their controllers' untap steps:Snow
+S:Mode$ Continuous | Affected$ Permanent.Snow | AddHiddenKeyword$ CARDNAME doesn't untap during your untap step. | Description$ Snow permanents don't untap during their controllers' untap steps.
 K:Cumulative upkeep:2
 SVar:RemRandomDeck:True
+SVar:NonStackingEffect:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/freyalises_radiance.jpg
 Oracle:Cumulative upkeep {2} (At the beginning of your upkeep, put an age counter on this permanent, then sacrifice it unless you pay its upkeep cost for each age counter on it.)\nSnow permanents don't untap during their controllers' untap steps.
--- a/forge-gui/res/cardsfolder/j/juntu_stakes.txt
+++ b/forge-gui/res/cardsfolder/j/juntu_stakes.txt
@@ -1,8 +1,7 @@
 Name:Juntu Stakes
 ManaCost:2
 Types:Artifact
-Text:Creatures with power 1 or less don't untap during their controllers' untap steps.
-K:Permanents don't untap during their controllers' untap steps:Creature.powerLE1
+S:Mode$ Continuous | Affected$ Creature.powerLE1 | AddHiddenKeyword$ CARDNAME doesn't untap during your untap step. | Description$ Creatures with power 1 or less don't untap during their controllers' untap steps.
 SVar:NonStackingEffect:True
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/juntu_stakes.jpg
--- a/forge-gui/res/cardsfolder/m/magnetic_mountain.txt
+++ b/forge-gui/res/cardsfolder/m/magnetic_mountain.txt
@@ -0,0 +1,13 @@
+Name:Magnetic Mountain
+ManaCost:1 R R
+Types:Enchantment
+S:Mode$ Continuous | Affected$ Creature.Blue | AddHiddenKeyword$ CARDNAME doesn't untap during your untap step. | Description$ Blue creatures don't untap during their controllers' untap steps.
+T:Mode$ Phase | Phase$ Upkeep | TriggerZones$ Battlefield | Execute$ TrigChoose | TriggerDescription$ At the beginning of each player's upkeep, that player may choose any number of tapped blue creatures he or she controls and pay {4} for each creature chosen this way. If the player does, untap those creatures.
+SVar:TrigChoose:DB$ ChooseCard | Defined$ TriggeredPlayer | Amount$ X | References$ X | Choices$ Creature.tapped+Blue | TargetControls$ True | ChoiceTitle$ Choose any number of tapped blue creatures you control | ChoiceZone$ Battlefield | SubAbility$ DBUntap
+SVar:DBUntap:DB$ RepeatEach | DefinedCards$ ChosenCard | RepeatSubAbility$ UntapEach
+SVar:UntapEach:DB$ Untap | Defined$ Remembered | UnlessCost$ 4 | UnlessPayer$ RememberedController | UnlessSwitched$ True
+SVar:X:Count$Valid Creature.tapped+Blue+ActivePlayerCtrl
+SVar:RemRandomDeck:True
+SVar:NonStackingEffect:True
+SVar:Picture:http://www.wizards.com/global/images/magic/general/magnetic_mountain.jpg
+Oracle:Blue creatures don't untap during their controllers' untap steps.\nAt the beginning of each player's upkeep, that player may choose any number of tapped blue creatures he or she controls and pay {4} for each creature chosen this way. If the player does, untap those creatures.
--- a/forge-gui/res/cardsfolder/m/marble_titan.txt
+++ b/forge-gui/res/cardsfolder/m/marble_titan.txt
@@ -1,9 +1,8 @@
 Name:Marble Titan
 ManaCost:3 W
 Types:Creature Giant
-Text:Creatures with power 3 or greater don't untap during their controllers' untap steps.
+S:Mode$ Continuous | Affected$ Creature.powerGE3 | AddHiddenKeyword$ CARDNAME doesn't untap during your untap step. | Description$ Creatures with power 3 or greater don't untap during their controllers' untap steps.
 PT:3/3
-K:Permanents don't untap during their controllers' untap steps:Creature.powerGE3
 SVar:RemRandomDeck:True
 SVar:Picture:http://resources.wizards.com/magic/cards/9ed/en-us/card84533.jpg
 Oracle:Creatures with power 3 or greater don't untap during their controllers' untap steps.
--- a/forge-gui/res/cardsfolder/m/meekstone.txt
+++ b/forge-gui/res/cardsfolder/m/meekstone.txt
@@ -1,8 +1,7 @@
 Name:Meekstone
 ManaCost:1
 Types:Artifact
-Text:Creatures with power 3 or greater don't untap during their controllers' untap steps.
-K:Permanents don't untap during their controllers' untap steps:Creature.powerGE3
+S:Mode$ Continuous | Affected$ Creature.powerGE3 | AddHiddenKeyword$ CARDNAME doesn't untap during your untap step. | Description$ Creatures with power 3 or greater don't untap during their controllers' untap steps.
 SVar:NonStackingEffect:True
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/meekstone.jpg
--- a/forge-gui/res/cardsfolder/m/mist_of_stagnation.txt
+++ b/forge-gui/res/cardsfolder/m/mist_of_stagnation.txt
@@ -1,13 +1,13 @@
 Name:Mist of Stagnation
 ManaCost:3 U U
 Types:Enchantment
-Text:Permanents don't untap during their controllers' untap steps.
-K:Permanents don't untap during their controllers' untap steps:Permanent
+S:Mode$ Continuous | Affected$ Permanent | AddHiddenKeyword$ CARDNAME doesn't untap during your untap step. | Description$ Permanents don't untap during their controllers' untap steps.
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | Execute$ TrigChoose | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of each player's upkeep, that player chooses a permanent for each card in his or her graveyard, then untaps those permanents.
 SVar:TrigChoose:AB$ ChooseCard | Cost$ 0 | Defined$ TriggeredPlayer | Amount$ X | References$ X | Choices$ Permanent.ActivePlayerCtrl | ChoiceTitle$ Choose a permanent to untap | RememberChosen$ True | AILogic$ Untap | SubAbility$ DBUntap
 SVar:DBUntap:DB$ UntapAll | ValidCards$ Permanent.IsRemembered | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:X:Count$ValidGraveyard Card.ActivePlayerCtrl
 SVar:RemRandomDeck:True
+SVar:NonStackingEffect:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/mist_of_stagnation.jpg
 Oracle:Permanents don't untap during their controllers' untap steps.\nAt the beginning of each player's upkeep, that player chooses a permanent for each card in his or her graveyard, then untaps those permanents.
--- a/forge-gui/res/cardsfolder/m/mudslide.txt
+++ b/forge-gui/res/cardsfolder/m/mudslide.txt
@@ -0,0 +1,13 @@
+Name:Mudslide
+ManaCost:2 R
+Types:Enchantment
+S:Mode$ Continuous | Affected$ Creature.withoutFlying | AddHiddenKeyword$ CARDNAME doesn't untap during your untap step. | Description$ Creatures without flying don't untap during their controllers' untap steps.
+T:Mode$ Phase | Phase$ Upkeep | TriggerZones$ Battlefield | Execute$ TrigChoose | TriggerDescription$ At the beginning of each player's upkeep, that player may choose any number of tapped creatures without flying he or she controls and pay {2} for each creature chosen this way. If the player does, untap those creatures.
+SVar:TrigChoose:DB$ ChooseCard | Defined$ TriggeredPlayer | Amount$ X | References$ X | Choices$ Creature.tapped+withoutFlying | TargetControls$ True | ChoiceTitle$ Choose any number of tapped nongreen creatures you control | ChoiceZone$ Battlefield | SubAbility$ DBUntap
+SVar:DBUntap:DB$ RepeatEach | DefinedCards$ ChosenCard | RepeatSubAbility$ UntapEach
+SVar:UntapEach:DB$ Untap | Defined$ Remembered | UnlessCost$ 2 | UnlessPayer$ RememberedController | UnlessSwitched$ True
+SVar:X:Count$Valid Creature.tapped+withoutFlying+ActivePlayerCtrl
+SVar:RemRandomDeck:True
+SVar:NonStackingEffect:True
+SVar:Picture:http://www.wizards.com/global/images/magic/general/mudslide.jpg
+Oracle:Creatures without flying don't untap during their controllers' untap steps.\nAt the beginning of each player's upkeep, that player may choose any number of tapped creatures without flying he or she controls and pay {2} for each creature chosen this way. If the player does, untap those creatures.
--- a/forge-gui/res/cardsfolder/r/root_cage.txt
+++ b/forge-gui/res/cardsfolder/r/root_cage.txt
@@ -1,8 +1,7 @@
 Name:Root Cage
 ManaCost:1 G
 Types:Enchantment
-Text:Mercenaries don't untap during their controllers' untap steps.
-K:Permanents don't untap during their controllers' untap steps:Mercenary
+S:Mode$ Continuous | Affected$ Mercenary | AddHiddenKeyword$ CARDNAME doesn't untap during your untap step. | Description$ Mercenaries don't untap during their controllers' untap steps.
 SVar:NonStackingEffect:True
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/root_cage.jpg
--- a/forge-gui/res/cardsfolder/t/thelons_curse.txt
+++ b/forge-gui/res/cardsfolder/t/thelons_curse.txt
@@ -0,0 +1,13 @@
+Name:Thelon's Curse
+ManaCost:G G
+Types:Enchantment
+S:Mode$ Continuous | Affected$ Creature.Blue | AddHiddenKeyword$ CARDNAME doesn't untap during your untap step. | Description$ Blue creatures don't untap during their controllers' untap steps.
+T:Mode$ Phase | Phase$ Upkeep | TriggerZones$ Battlefield | Execute$ TrigChoose | TriggerDescription$ At the beginning of each player's upkeep, that player may choose any number of tapped blue creatures he or she controls and pay {U} for each creature chosen this way. If the player does, untap those creatures.
+SVar:TrigChoose:DB$ ChooseCard | Defined$ TriggeredPlayer | Amount$ X | References$ X | Choices$ Creature.tapped+Blue | TargetControls$ True | ChoiceTitle$ Choose any number of tapped nongreen creatures you control | ChoiceZone$ Battlefield | SubAbility$ DBUntap
+SVar:DBUntap:DB$ RepeatEach | DefinedCards$ ChosenCard | RepeatSubAbility$ UntapEach
+SVar:UntapEach:DB$ Untap | Defined$ Remembered | UnlessCost$ U | UnlessPayer$ RememberedController | UnlessSwitched$ True
+SVar:X:Count$Valid Creature.tapped+Blue+ActivePlayerCtrl
+SVar:RemRandomDeck:True
+SVar:NonStackingEffect:True
+SVar:Picture:http://www.wizards.com/global/images/magic/general/thelons_curse.jpg
+Oracle:Blue creatures don't untap during their controllers' untap steps.\nAt the beginning of each player's upkeep, that player may choose any number of tapped blue creatures he or she controls and pay {U} for each creature chosen this way. If the player does, untap those creatures.
--- a/forge-gui/res/cardsfolder/w/wrath_of_marit_lage.txt
+++ b/forge-gui/res/cardsfolder/w/wrath_of_marit_lage.txt
@@ -1,8 +1,7 @@
 Name:Wrath of Marit Lage
 ManaCost:3 U U
 Types:Enchantment
-Text:Red creatures don't untap during their controllers' untap steps.
-K:Permanents don't untap during their controllers' untap steps:Creature.Red
+S:Mode$ Continuous | Affected$ Creature.Red | AddHiddenKeyword$ CARDNAME doesn't untap during your untap step. | Description$ Red creatures don't untap during their controllers' untap steps.
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigTapAll | TriggerDescription$ When CARDNAME enters the battlefield, tap all red creatures.
 SVar:TrigTapAll:AB$TapAll | Cost$ 0 | ValidCards$ Creature.Red
 SVar:NonStackingEffect:True