AttachAi: make KeepTapped logic generic (#7361)

forge-ai/src/main/java/forge/ai/ability/AttachAi.java

@@ -19,6 +19,8 @@ import forge.game.phase.PhaseHandler;
 import forge.game.phase.PhaseType;
 import forge.game.player.Player;
 import forge.game.player.PlayerActionConfirmMode;
+import forge.game.replacement.ReplacementLayer;
+import forge.game.replacement.ReplacementType;
 import forge.game.spellability.SpellAbility;
 import forge.game.spellability.TargetRestrictions;
 import forge.game.staticability.StaticAbility;
@@ -371,9 +373,39 @@ public class AttachAi extends SpellAbilityAi {
      */
     private static Card attachAIKeepTappedPreference(final SpellAbility sa, final List<Card> list, final boolean mandatory, final Card attachSource) {
         // AI For Cards like Paralyzing Grasp and Glimmerdust Nap
+
+        // check for ETB Trigger
+        boolean tapETB = isAuraSpell(sa) && attachSource.getTriggers().anyMatch(t -> {
+            if (t.getMode() != TriggerType.ChangesZone) {
+                return false;
+            }
+
+            if (!ZoneType.Battlefield.toString().equals(t.getParam("Destination"))) {
+                return false;
+            }
+
+            if (t.hasParam("ValidCard") && !t.getParam("ValidCard").contains("Self")) {
+                return false;
+            }
+
+            SpellAbility tSa = t.ensureAbility();
+            if (tSa == null) {
+                return false;
+            }
+
+            if (!ApiType.Tap.equals(tSa.getApi())) {
+                return false;
+            }
+            if (!"Enchanted".equals(tSa.getParam("Defined"))) {
+                return false;
+            }
+
+            return true;
+        });
+
         final List<Card> prefList = CardLists.filter(list, c -> {
             // Don't do Untapped Vigilance cards
-            if (c.isCreature() && c.hasKeyword(Keyword.VIGILANCE) && c.isUntapped()) {
+            if (!tapETB && c.isCreature() && c.hasKeyword(Keyword.VIGILANCE) && c.isUntapped()) {
                 return false;
             }
 
@@ -388,20 +420,9 @@ public class AttachAi extends SpellAbilityAi {
                     return false;
                 }
             }
-
+            // already affected
-            if (!c.isEnchanted()) {
+            if (!c.canUntap(c.getController(), true)) {
-                return true;
+                return false;
-            }
-
-            final Iterable<Card> auras = c.getEnchantedBy();
-            for (Card aura : auras) {
-                SpellAbility auraSA = aura.getSpells().get(0);
-                if (auraSA.getApi() == ApiType.Attach) {
-                    if ("KeepTapped".equals(auraSA.getParam("AILogic"))) {
-                        // Don't attach multiple KeepTapped Auras to one card
-                        return false;
-                    }
-                }
             }
 
             return true;
@@ -925,6 +946,10 @@ public class AttachAi extends SpellAbilityAi {
         return true;
     }
 
+    private static boolean isAuraSpell(final SpellAbility sa) {
+        return sa.isSpell() && sa.getHostCard().isAura();
+    }
+
     /**
      * Attach preference.
      *
@@ -1387,8 +1412,6 @@ public class AttachAi extends SpellAbilityAi {
             c = attachAICuriosityPreference(sa, prefList, mandatory, attachSource);
         } else if ("ChangeType".equals(logic)) {
             c = attachAIChangeTypePreference(sa, prefList, mandatory, attachSource);
-        } else if ("KeepTapped".equals(logic)) {
-            c = attachAIKeepTappedPreference(sa, prefList, mandatory, attachSource);
         } else if ("Animate".equals(logic)) {
             c = attachAIAnimatePreference(sa, prefList, mandatory, attachSource);
         } else if ("Reanimate".equals(logic)) {
@@ -1399,6 +1422,12 @@ public class AttachAi extends SpellAbilityAi {
             c = attachAIHighestEvaluationPreference(prefList);
         }
 
+        if (isAuraSpell(sa)) {
+            if (attachSource.getReplacementEffects().anyMatch(re -> re.getMode().equals(ReplacementType.Untap) && re.getLayer().equals(ReplacementLayer.CantHappen))) {
+                c = attachAIKeepTappedPreference(sa, prefList, mandatory, attachSource);
+            }
+        }
+
         // Consider exceptional cases which break the normal evaluation rules
         if (!isUsefulAttachAction(ai, c, sa)) {
             return null;

forge-gui/res/cardsfolder/b/bind_the_monster.txt

@@ -2,7 +2,7 @@ Name:Bind the Monster
 ManaCost:U
 Types:Enchantment Aura
 K:Enchant creature
-A:SP$ Attach | ValidTgts$ Creature | TgtPrompt$ Select target creature | AILogic$ KeepTapped
+A:SP$ Attach | ValidTgts$ Creature | TgtPrompt$ Select target creature
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigTap | TriggerDescription$ When CARDNAME enters, tap enchanted creature. It deals damage to you equal to its power.
 SVar:TrigTap:DB$ Tap | Defined$ Enchanted | SubAbility$ DBDealDamage
 SVar:DBDealDamage:DB$ DealDamage | Defined$ You | NumDmg$ X | DamageSource$ Enchanted

forge-gui/res/cardsfolder/b/bitter_chill.txt

@@ -2,7 +2,7 @@ Name:Bitter Chill
 ManaCost:1 U
 Types:Enchantment Aura
 K:Enchant creature
-A:SP$ Attach | ValidTgts$ Creature | AILogic$ KeepTapped
+A:SP$ Attach | ValidTgts$ Creature
 R:Event$ Untap | ActiveZones$ Battlefield | ValidCard$ Creature.EnchantedBy | ValidStepTurnToController$ You | Layer$ CantHappen | Description$ Enchanted creature doesn't untap during its controller's untap step.
 T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ TrigTap | TriggerDescription$ When CARDNAME enters, tap enchanted creature.
 SVar:TrigTap:DB$ Tap | Defined$ Enchanted

forge-gui/res/cardsfolder/b/bonds_of_quicksilver.txt

@@ -3,6 +3,6 @@ ManaCost:3 U
 Types:Enchantment Aura
 K:Flash
 K:Enchant creature
-A:SP$ Attach | ValidTgts$ Creature | AILogic$ KeepTapped
+A:SP$ Attach | ValidTgts$ Creature
 R:Event$ Untap | ActiveZones$ Battlefield | ValidCard$ Creature.EnchantedBy | ValidStepTurnToController$ You | Layer$ CantHappen | Description$ Enchanted creature doesn't untap during its controller's untap step.
 Oracle:Flash (You may cast this spell any time you could cast an instant.)\nEnchant creature\nEnchanted creature doesn't untap during its controller's untap step.

forge-gui/res/cardsfolder/b/bubble_snare.txt

@@ -2,7 +2,7 @@ Name:Bubble Snare
 ManaCost:U
 Types:Enchantment Aura
 K:Kicker:2 U
-A:SP$ Attach | ValidTgts$ Creature | AILogic$ KeepTapped
+A:SP$ Attach | ValidTgts$ Creature
 T:Mode$ ChangesZone | ValidCard$ Card.Self+kicked | Origin$ Any | Destination$ Battlefield | Execute$ TrigTap | TriggerDescription$ When CARDNAME enters, if it was kicked, tap enchanted creature.
 SVar:TrigTap:DB$ Tap | Defined$ Enchanted
 R:Event$ Untap | ActiveZones$ Battlefield | ValidCard$ Creature.AttachedBy | ValidStepTurnToController$ You | Layer$ CantHappen | Description$ Enchanted creature doesn't untap during its controller's untap step.

forge-gui/res/cardsfolder/b/burden_of_guilt.txt

@@ -2,7 +2,7 @@ Name:Burden of Guilt
 ManaCost:W
 Types:Enchantment Aura
 K:Enchant creature
-A:SP$ Attach | ValidTgts$ Creature | AILogic$ KeepTapped
+A:SP$ Attach | ValidTgts$ Creature
 A:AB$ Tap | Cost$ 1 | Defined$ Enchanted | SpellDescription$ Tap enchanted creature.
 AI:RemoveDeck:All
 SVar:NonStackingAttachEffect:True

forge-gui/res/cardsfolder/c/capture_sphere.txt

@@ -3,7 +3,7 @@ ManaCost:3 U
 Types:Enchantment Aura
 K:Flash
 K:Enchant creature
-A:SP$ Attach | ValidTgts$ Creature | AILogic$ KeepTapped
+A:SP$ Attach | ValidTgts$ Creature
 R:Event$ Untap | ActiveZones$ Battlefield | ValidCard$ Creature.EnchantedBy | ValidStepTurnToController$ You | Layer$ CantHappen | Description$ Enchanted creature doesn't untap during its controller's untap step.
 T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ TrigTap | TriggerDescription$ When CARDNAME enters, tap enchanted creature.
 SVar:TrigTap:DB$ Tap | Defined$ Enchanted

forge-gui/res/cardsfolder/c/castaways_despair.txt

@@ -2,7 +2,7 @@ Name:Castaway's Despair
 ManaCost:3 U
 Types:Enchantment Aura
 K:Enchant creature
-A:SP$ Attach | ValidTgts$ Creature | AILogic$ KeepTapped
+A:SP$ Attach | ValidTgts$ Creature
 R:Event$ Untap | ActiveZones$ Battlefield | ValidCard$ Creature.EnchantedBy | ValidStepTurnToController$ You | Layer$ CantHappen | Description$ Enchanted creature doesn't untap during its controller's untap step.
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigTap | TriggerDescription$ When CARDNAME enters, tap enchanted creature.
 SVar:TrigTap:DB$ Tap | Defined$ Enchanted

forge-gui/res/cardsfolder/c/charmed_sleep.txt

@@ -2,7 +2,7 @@ Name:Charmed Sleep
 ManaCost:1 U U
 Types:Enchantment Aura
 K:Enchant creature
-A:SP$ Attach | ValidTgts$ Creature | AILogic$ KeepTapped
+A:SP$ Attach | ValidTgts$ Creature
 T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ TrigTap | TriggerDescription$ When CARDNAME enters, tap enchanted creature.
 SVar:TrigTap:DB$ Tap | Defined$ Enchanted
 R:Event$ Untap | ActiveZones$ Battlefield | ValidCard$ Creature.AttachedBy | ValidStepTurnToController$ You | Layer$ CantHappen | Description$ Enchanted creature doesn't untap during its controller's untap step.

forge-gui/res/cardsfolder/c/claustrophobia.txt

@@ -2,7 +2,7 @@ Name:Claustrophobia
 ManaCost:1 U U
 Types:Enchantment Aura
 K:Enchant creature
-A:SP$ Attach | ValidTgts$ Creature | AILogic$ KeepTapped
+A:SP$ Attach | ValidTgts$ Creature
 T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ TrigTap | TriggerDescription$ When CARDNAME enters, tap enchanted creature.
 SVar:TrigTap:DB$ Tap | Defined$ Enchanted
 R:Event$ Untap | ActiveZones$ Battlefield | ValidCard$ Creature.AttachedBy | ValidStepTurnToController$ You | Layer$ CantHappen | Description$ Enchanted creature doesn't untap during its controller's untap step.

forge-gui/res/cardsfolder/c/coma_veil.txt

@@ -2,6 +2,6 @@ Name:Coma Veil
 ManaCost:4 U
 Types:Enchantment Aura
 K:Enchant artifact or creature
-A:SP$ Attach | ValidTgts$ Artifact,Creature | TgtPrompt$ Select target artifact or creature | AILogic$ KeepTapped
+A:SP$ Attach | ValidTgts$ Artifact,Creature | TgtPrompt$ Select target artifact or creature
 R:Event$ Untap | ActiveZones$ Battlefield | ValidCard$ Card.EnchantedBy | ValidStepTurnToController$ You | Layer$ CantHappen | Description$ Enchanted permanent doesn't untap during its controller's untap step.
 Oracle:Enchant artifact or creature\nEnchanted permanent doesn't untap during its controller's untap step.

forge-gui/res/cardsfolder/c/containment_membrane.txt

@@ -3,6 +3,6 @@ ManaCost:2 U
 Types:Enchantment Aura
 K:Surge:U
 K:Enchant creature
-A:SP$ Attach | ValidTgts$ Creature | AILogic$ KeepTapped
+A:SP$ Attach | ValidTgts$ Creature
 R:Event$ Untap | ActiveZones$ Battlefield | ValidCard$ Creature.EnchantedBy | ValidStepTurnToController$ You | Layer$ CantHappen | Description$ Enchanted creature doesn't untap during its controller's untap step.
 Oracle:Surge {U} (You may cast this spell for its surge cost if you or a teammate has cast another spell this turn.)\nEnchant creature\nEnchanted creature doesn't untap during its controller's untap step.

forge-gui/res/cardsfolder/c/controlled_instincts.txt

@@ -2,7 +2,7 @@ Name:Controlled Instincts
 ManaCost:U
 Types:Enchantment Aura
 K:Enchant red or green creature
-A:SP$ Attach | ValidTgts$ Creature.Green,Creature.Red | TgtPrompt$ Select target red or green creature | AILogic$ KeepTapped
+A:SP$ Attach | ValidTgts$ Creature.Green,Creature.Red | TgtPrompt$ Select target red or green creature
 R:Event$ Untap | ActiveZones$ Battlefield | ValidCard$ Creature.EnchantedBy | ValidStepTurnToController$ You | Layer$ CantHappen | Description$ Enchanted creature doesn't untap during its controller's untap step.
 AI:RemoveDeck:Random
 Oracle:Enchant red or green creature\nEnchanted creature doesn't untap during its controller's untap step.

forge-gui/res/cardsfolder/c/curse_of_chains.txt

@@ -2,7 +2,7 @@ Name:Curse of Chains
 ManaCost:1 WU
 Types:Enchantment Aura
 K:Enchant creature
-A:SP$ Attach | ValidTgts$ Creature | AILogic$ KeepTapped
+A:SP$ Attach | ValidTgts$ Creature
 T:Mode$ Phase | Phase$ Upkeep | TriggerZones$ Battlefield | Execute$ TrigTap | TriggerDescription$ At the beginning of each upkeep, tap enchanted creature.
 SVar:TrigTap:DB$ Tap | Defined$ Enchanted
 SVar:NonStackingAttachEffect:True

forge-gui/res/cardsfolder/d/dehydration.txt

@@ -2,6 +2,6 @@ Name:Dehydration
 ManaCost:3 U
 Types:Enchantment Aura
 K:Enchant creature
-A:SP$ Attach | ValidTgts$ Creature | AILogic$ KeepTapped
+A:SP$ Attach | ValidTgts$ Creature
 R:Event$ Untap | ActiveZones$ Battlefield | ValidCard$ Creature.EnchantedBy | ValidStepTurnToController$ You | Layer$ CantHappen | Description$ Enchanted creature doesn't untap during its controller's untap step.
 Oracle:Enchant creature (Target a creature as you cast this. This card enters attached to that creature.)\nEnchanted creature doesn't untap during its controller's untap step.

forge-gui/res/cardsfolder/d/dramatic_accusation.txt

@@ -2,7 +2,7 @@ Name:Dramatic Accusation
 ManaCost:2 U
 Types:Enchantment Aura
 K:Enchant creature
-A:SP$ Attach | ValidTgts$ Creature | AILogic$ KeepTapped
+A:SP$ Attach | ValidTgts$ Creature
 R:Event$ Untap | ActiveZones$ Battlefield | ValidCard$ Creature.EnchantedBy | ValidStepTurnToController$ You | Layer$ CantHappen | Description$ Enchanted creature doesn't untap during its controller's untap step.
 T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ TrigTap | TriggerDescription$ When CARDNAME enters, tap enchanted creature.
 SVar:TrigTap:DB$ Tap | Defined$ Enchanted

forge-gui/res/cardsfolder/e/encase_in_ice.txt

@@ -3,7 +3,7 @@ ManaCost:1 U
 Types:Enchantment Aura
 K:Flash
 K:Enchant red or green creature
-A:SP$ Attach | Cost$ 1 U | ValidTgts$ Creature.Red,Creature.Green | TgtPrompt$ Select target red or green creature | AILogic$ KeepTapped
+A:SP$ Attach | Cost$ 1 U | ValidTgts$ Creature.Red,Creature.Green | TgtPrompt$ Select target red or green creature
 T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ TrigTap | TriggerDescription$ When CARDNAME enters, tap enchanted creature.
 SVar:TrigTap:DB$ Tap | Defined$ Enchanted
 R:Event$ Untap | ActiveZones$ Battlefield | ValidCard$ Creature.AttachedBy | ValidStepTurnToController$ You | Layer$ CantHappen | Description$ Enchanted creature doesn't untap during its controller's untap step.

forge-gui/res/cardsfolder/e/entangling_vines.txt

@@ -2,6 +2,6 @@ Name:Entangling Vines
 ManaCost:3 G
 Types:Enchantment Aura
 K:Enchant tapped creature
-A:SP$ Attach | ValidTgts$ Creature.tapped | AILogic$ KeepTapped
+A:SP$ Attach | ValidTgts$ Creature.tapped
 R:Event$ Untap | ActiveZones$ Battlefield | ValidCard$ Creature.EnchantedBy | ValidStepTurnToController$ You | Layer$ CantHappen | Description$ Enchanted creature doesn't untap during its controller's untap step.
 Oracle:Enchant tapped creature\nEnchanted creature doesn't untap during its controller's untap step.

forge-gui/res/cardsfolder/e/eternity_snare.txt

@@ -2,7 +2,7 @@ Name:Eternity Snare
 ManaCost:5 U
 Types:Enchantment Aura
 K:Enchant creature
-A:SP$ Attach | ValidTgts$ Creature | AILogic$ KeepTapped
+A:SP$ Attach | ValidTgts$ Creature
 R:Event$ Untap | ActiveZones$ Battlefield | ValidCard$ Creature.EnchantedBy | ValidStepTurnToController$ You | Layer$ CantHappen | Description$ Enchanted creature doesn't untap during its controller's untap step.
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerDescription$ When CARDNAME enters, draw a card.
 SVar:TrigDraw:DB$ Draw | Defined$ You | NumCards$ 1

forge-gui/res/cardsfolder/f/fall_from_favor.txt

@@ -2,7 +2,7 @@ Name:Fall from Favor
 ManaCost:2 U
 Types:Enchantment Aura
 K:Enchant creature
-A:SP$ Attach | ValidTgts$ Creature | AILogic$ KeepTapped | AITgts$ Card.cmcGE2
+A:SP$ Attach | ValidTgts$ Creature | AITgts$ Card.cmcGE2
 T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ TrigTap | TriggerDescription$ When CARDNAME enters, tap enchanted creature and you become the monarch.
 SVar:TrigTap:DB$ Tap | Defined$ Enchanted | SubAbility$ DBMonarch
 SVar:DBMonarch:DB$ BecomeMonarch | Defined$ You

forge-gui/res/cardsfolder/f/flood_the_engine.txt

@@ -2,7 +2,7 @@ Name:Flood the Engine
 ManaCost:2 U
 Types:Enchantment Aura
 K:Enchant creature or Vehicle
-A:SP$ Attach | ValidTgts$ Creature,Vehicle | AILogic$ KeepTapped
+A:SP$ Attach | ValidTgts$ Creature,Vehicle
 T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ TrigTap | TriggerDescription$ When this Aura enters, tap enchanted permanent.
 SVar:TrigTap:DB$ Tap | Defined$ Enchanted
 S:Mode$ Continuous | Affected$ Permanent.AttachedBy | RemoveAllAbilities$ True | Description$ Enchanted permanent loses all abilities and doesn't untap during its controller's untap step.

forge-gui/res/cardsfolder/f/frozen_solid.txt

@@ -2,7 +2,7 @@ Name:Frozen Solid
 ManaCost:1 U U
 Types:Enchantment Aura
 K:Enchant creature
-A:SP$ Attach | ValidTgts$ Creature | AILogic$ KeepTapped
+A:SP$ Attach | ValidTgts$ Creature
 R:Event$ Untap | ActiveZones$ Battlefield | ValidCard$ Creature.EnchantedBy | ValidStepTurnToController$ You | Layer$ CantHappen | AddSVar$ FrozenSolidDestroy | Description$ Enchanted creature doesn't untap during its controller's untap step.
 SVar:FrozenSolidDestroy:SVar:DestroyWhenDamaged:True
 T:Mode$ DamageDoneOnce | ValidTarget$ Creature.EnchantedBy | Execute$ TrigDestroy | TriggerZones$ Battlefield | TriggerDescription$ When enchanted creature is dealt damage, destroy it.

forge-gui/res/cardsfolder/g/glimmerdust_nap.txt

@@ -2,6 +2,6 @@ Name:Glimmerdust Nap
 ManaCost:2 U
 Types:Enchantment Aura
 K:Enchant tapped creature
-A:SP$ Attach | ValidTgts$ Creature.tapped | AILogic$ KeepTapped
+A:SP$ Attach | ValidTgts$ Creature.tapped
 R:Event$ Untap | ActiveZones$ Battlefield | ValidCard$ Creature.EnchantedBy | ValidStepTurnToController$ You | Layer$ CantHappen | Description$ Enchanted creature doesn't untap during its controller's untap step.
 Oracle:Enchant tapped creature\nEnchanted creature doesn't untap during its controller's untap step.

forge-gui/res/cardsfolder/i/ice_over.txt

@@ -2,6 +2,6 @@ Name:Ice Over
 ManaCost:1 U
 Types:Enchantment Aura
 K:Enchant artifact or creature
-A:SP$ Attach | ValidTgts$ Artifact,Creature | TgtPrompt$ Select target artifact or creature | AILogic$ KeepTapped
+A:SP$ Attach | ValidTgts$ Artifact,Creature | TgtPrompt$ Select target artifact or creature
 R:Event$ Untap | ActiveZones$ Battlefield | ValidCard$ Card.EnchantedBy | ValidStepTurnToController$ You | Layer$ CantHappen | Description$ Enchanted permanent doesn't untap during its controller's untap step.
 Oracle:Enchant artifact or creature\nEnchanted permanent doesn't untap during its controller's untap step.

forge-gui/res/cardsfolder/i/immobilizing_ink.txt

@@ -2,7 +2,7 @@ Name:Immobilizing Ink
 ManaCost:1 U
 Types:Enchantment Aura
 K:Enchant creature
-A:SP$ Attach | ValidTgts$ Creature | AILogic$ KeepTapped
+A:SP$ Attach | ValidTgts$ Creature
 R:Event$ Untap | ActiveZones$ Battlefield | ValidCard$ Creature.EnchantedBy | ValidStepTurnToController$ You | Layer$ CantHappen | Description$ Enchanted creature doesn't untap during its controller's untap step.
 S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddAbility$ Untap | Description$ Enchanted creature has "{1}, Discard a card: Untap this creature."
 SVar:Untap:AB$ Untap | Cost$ 1 Discard<1/Card> | Defined$ Self | SpellDescription$ Untap CARDNAME.

forge-gui/res/cardsfolder/i/inertia_bubble.txt

@@ -2,6 +2,6 @@ Name:Inertia Bubble
 ManaCost:1 U
 Types:Enchantment Aura
 K:Enchant artifact
-A:SP$ Attach | ValidTgts$ Artifact | AILogic$ KeepTapped
+A:SP$ Attach | ValidTgts$ Artifact
 R:Event$ Untap | ActiveZones$ Battlefield | ValidCard$ Card.EnchantedBy | ValidStepTurnToController$ You | Layer$ CantHappen | Description$ Enchanted artifact doesn't untap during its controller's untap step.
 Oracle:Enchant artifact\nEnchanted artifact doesn't untap during its controller's untap step.

forge-gui/res/cardsfolder/l/leaden_fists.txt

@@ -3,7 +3,7 @@ ManaCost:2 U
 Types:Enchantment Aura
 K:Flash
 K:Enchant creature
-A:SP$ Attach | ValidTgts$ Creature | AILogic$ KeepTapped
+A:SP$ Attach | ValidTgts$ Creature
 S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddPower$ 3 | AddToughness$ 3 | Description$ Enchanted creature gets +3/+3 and doesn't untap during its controller's untap step.
 R:Event$ Untap | ValidCard$ Creature.EnchantedBy | ValidStepTurnToController$ You | Layer$ CantHappen | Secondary$ True | Description$ Enchanted creature doesn't untap during its controller's untap step.
 AI:RemoveDeck:All

forge-gui/res/cardsfolder/l/locked_in_the_cemetery.txt

@@ -2,7 +2,7 @@ Name:Locked in the Cemetery
 ManaCost:1 U
 Types:Enchantment Aura
 K:Enchant creature
-A:SP$ Attach | ValidTgts$ Creature | AILogic$ KeepTapped
+A:SP$ Attach | ValidTgts$ Creature
 T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ TrigTap | IsPresent$ Card.YouCtrl | PresentCompare$ GE5 | PresentZone$ Graveyard | TriggerDescription$ When CARDNAME enters, if there are five or more cards in your graveyard, tap enchanted creature.
 SVar:TrigTap:DB$ Tap | Defined$ Enchanted
 R:Event$ Untap | ActiveZones$ Battlefield | ValidCard$ Creature.AttachedBy | ValidStepTurnToController$ You | Layer$ CantHappen | Description$ Enchanted creature doesn't untap during its controller's untap step.

forge-gui/res/cardsfolder/m/malfunction.txt

@@ -2,7 +2,7 @@ Name:Malfunction
 ManaCost:3 U
 Types:Enchantment Aura
 K:Enchant artifact or creature
-A:SP$ Attach | ValidTgts$ Artifact,Creature | TgtPrompt$ Select target artifact or creature | AILogic$ KeepTapped
+A:SP$ Attach | ValidTgts$ Artifact,Creature | TgtPrompt$ Select target artifact or creature
 T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ TrigTap | TriggerDescription$ When CARDNAME enters, tap enchanted permanent.
 SVar:TrigTap:DB$ Tap | Defined$ Enchanted
 R:Event$ Untap | ActiveZones$ Battlefield | ValidCard$ Permanent.AttachedBy | ValidStepTurnToController$ You | Layer$ CantHappen | Description$ Enchanted permanent doesn't untap during its controller's untap step.

forge-gui/res/cardsfolder/m/melancholy.txt

@@ -4,7 +4,7 @@ Types:Enchantment Aura
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigUpkeep | TriggerDescription$ At the beginning of your upkeep, sacrifice CARDNAME unless you pay {B}.
 SVar:TrigUpkeep:DB$ Sacrifice | UnlessPayer$ You | UnlessCost$ B
 K:Enchant creature
-A:SP$ Attach | ValidTgts$ Creature | AILogic$ KeepTapped
+A:SP$ Attach | ValidTgts$ Creature
 R:Event$ Untap | ActiveZones$ Battlefield | ValidCard$ Creature.EnchantedBy | ValidStepTurnToController$ You | Layer$ CantHappen | Description$ Enchanted creature doesn't untap during its controller's untap step.
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigTap | TriggerDescription$ When CARDNAME enters, tap enchanted creature.
 SVar:TrigTap:DB$ Tap | Defined$ Enchanted

forge-gui/res/cardsfolder/m/merseine.txt

@@ -2,7 +2,7 @@ Name:Merseine
 ManaCost:2 U U
 Types:Enchantment Aura
 K:Enchant creature
-A:SP$ Attach | ValidTgts$ Creature | AILogic$ KeepTapped | AITgts$ Card.cmcGE2
+A:SP$ Attach | ValidTgts$ Creature | AITgts$ Card.cmcGE2
 K:etbCounter:NET:3
 R:Event$ Untap | ActiveZones$ Battlefield | ValidCard$ Creature.EnchantedBy | ValidStepTurnToController$ You | Layer$ CantHappen | IsPresent$ Card.Self+counters_GE1_NET | Description$ Enchanted creature doesn't untap during its controller's untap step if this Aura has a net counter on it.
 A:AB$ RemoveCounter | Activator$ Player.EnchantedController | Cost$ Mana<0\EnchantedCost> | CostDesc$ Pay enchanted creature's mana cost: | CounterType$ NET | CounterNum$ 1 | SpellDescription$ Remove a net counter from this Aura. Only the controller of the enchanted creature may activate this ability.

forge-gui/res/cardsfolder/m/mesmerizing_dose.txt

@@ -2,7 +2,7 @@ Name:Mesmerizing Dose
 ManaCost:1 U U
 Types:Enchantment Aura
 K:Enchant creature
-A:SP$ Attach | ValidTgts$ Creature | AILogic$ KeepTapped
+A:SP$ Attach | ValidTgts$ Creature
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigTap | TriggerDescription$ When CARDNAME enters, tap enchanted creature, then proliferate.
 SVar:TrigTap:DB$ Tap | Defined$ Enchanted | SubAbility$ DBProliferate
 SVar:DBProliferate:DB$ Proliferate

forge-gui/res/cardsfolder/m/motion_sickness.txt

@@ -2,7 +2,7 @@ Name:Motion Sickness
 ManaCost:3 U
 Types:Enchantment Aura
 K:Enchant creature
-A:SP$ Attach | ValidTgts$ Creature | AILogic$ KeepTapped
+A:SP$ Attach | ValidTgts$ Creature
 T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ TrigTap | TriggerDescription$ When CARDNAME enters the battlefield, tap enchanted creature.
 SVar:TrigTap:DB$ Tap | Defined$ Enchanted
 R:Event$ Untap | ActiveZones$ Battlefield | ValidCard$ Creature.AttachedBy | ValidStepTurnToController$ You | Layer$ CantHappen | Description$ Enchanted creature doesn't untap during its controller's untap step.

forge-gui/res/cardsfolder/m/mystic_restraints.txt

@@ -3,7 +3,7 @@ ManaCost:2 U U
 Types:Enchantment Aura
 K:Flash
 K:Enchant creature
-A:SP$ Attach | ValidTgts$ Creature | AILogic$ KeepTapped
+A:SP$ Attach | ValidTgts$ Creature
 R:Event$ Untap | ActiveZones$ Battlefield | ValidCard$ Creature.EnchantedBy | ValidStepTurnToController$ You | Layer$ CantHappen | Description$ Enchanted creature doesn't untap during its controller's untap step.
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigTap | TriggerDescription$ When CARDNAME enters, tap enchanted creature.
 SVar:TrigTap:DB$ Tap | Defined$ Enchanted

forge-gui/res/cardsfolder/n/numbing_dose.txt

@@ -2,7 +2,7 @@ Name:Numbing Dose
 ManaCost:3 U U
 Types:Enchantment Aura
 K:Enchant artifact or creature
-A:SP$ Attach | ValidTgts$ Artifact,Creature | TgtPrompt$ Select target artifact or creature | AILogic$ KeepTapped
+A:SP$ Attach | ValidTgts$ Artifact,Creature | TgtPrompt$ Select target artifact or creature
 R:Event$ Untap | ActiveZones$ Battlefield | ValidCard$ Card.EnchantedBy | ValidStepTurnToController$ You | Layer$ CantHappen | Description$ Enchanted permanent doesn't untap during its controller's untap step.
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player.EnchantedController | TriggerZones$ Battlefield | Execute$ TrigLoseLife | TriggerDescription$ At the beginning of the upkeep of enchanted permanent's controller, that player loses 1 life.
 SVar:TrigLoseLife:DB$ LoseLife | Defined$ TriggeredPlayer | LifeAmount$ 1

forge-gui/res/cardsfolder/p/paralyzing_grasp.txt

@@ -2,6 +2,6 @@ Name:Paralyzing Grasp
 ManaCost:2 U
 Types:Enchantment Aura
 K:Enchant creature
-A:SP$ Attach | ValidTgts$ Creature | AILogic$ KeepTapped
+A:SP$ Attach | ValidTgts$ Creature
 R:Event$ Untap | ActiveZones$ Battlefield | ValidCard$ Creature.EnchantedBy | ValidStepTurnToController$ You | Layer$ CantHappen | Description$ Enchanted creature doesn't untap during its controller's untap step.
 Oracle:Enchant creature\nEnchanted creature doesn't untap during its controller's untap step.

forge-gui/res/cardsfolder/p/plumes_of_peace.txt

@@ -2,7 +2,7 @@ Name:Plumes of Peace
 ManaCost:1 W U
 Types:Enchantment Aura
 K:Enchant creature
-A:SP$ Attach | ValidTgts$ Creature | AILogic$ KeepTapped
+A:SP$ Attach | ValidTgts$ Creature
 R:Event$ Untap | ActiveZones$ Battlefield | ValidCard$ Creature.EnchantedBy | ValidStepTurnToController$ You | Layer$ CantHappen | Description$ Enchanted creature doesn't untap during its controller's untap step.
 A:AB$ Tap | Cost$ W U Reveal<1/CARDNAME> | TgtPrompt$ Choose target creature | ValidTgts$ Creature | Forecast$ True | SpellDescription$ Tap target creature. (Activate only during your upkeep and only once each turn.)
 Oracle:Enchant creature\nEnchanted creature doesn't untap during its controller's untap step.\nForecast — {W}{U}, Reveal Plumes of Peace from your hand: Tap target creature. (Activate only during your upkeep and only once each turn.)

forge-gui/res/cardsfolder/p/psychic_overload.txt

@@ -2,7 +2,7 @@ Name:Psychic Overload
 ManaCost:3 U
 Types:Enchantment Aura
 K:Enchant permanent
-A:SP$ Attach | ValidTgts$ Permanent | AILogic$ KeepTapped
+A:SP$ Attach | ValidTgts$ Permanent
 T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ TrigTap | TriggerDescription$ When this Aura enters, tap enchanted permanent.
 SVar:TrigTap:DB$ Tap | Defined$ Enchanted
 R:Event$ Untap | ActiveZones$ Battlefield | ValidCard$ Card.EnchantedBy | ValidStepTurnToController$ You | Layer$ CantHappen | Description$ Enchanted permanent doesn't untap during its controller's untap step.

forge-gui/res/cardsfolder/r/ray_of_frost.txt

@@ -3,7 +3,7 @@ ManaCost:1 U
 Types:Enchantment Aura
 K:Flash
 K:Enchant creature
-A:SP$ Attach | ValidTgts$ Creature | AILogic$ KeepTapped
+A:SP$ Attach | ValidTgts$ Creature
 T:Mode$ ChangesZone | ValidCard$ Card.Self | Destination$ Battlefield | IsPresent$ Creature.EnchantedBy+Red | Execute$ TrigTap | TriggerDescription$ When CARDNAME enters, if enchanted creature is red, tap it.
 SVar:TrigTap:DB$ Tap | Defined$ Enchanted
 S:Mode$ Continuous | Affected$ Creature.EnchantedBy+Red | RemoveAllAbilities$ True | Description$ As long as enchanted creature is red, it loses all abilities.

forge-gui/res/cardsfolder/r/ringing_strike_mastery.txt

@@ -2,7 +2,7 @@ Name:Ringing Strike Mastery
 ManaCost:U
 Types:Enchantment Aura
 K:Enchant creature
-A:SP$ Attach | ValidTgts$ Creature | AILogic$ KeepTapped
+A:SP$ Attach | ValidTgts$ Creature
 T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ TrigTap | TriggerDescription$ When this Aura enters, tap enchanted creature.
 SVar:TrigTap:DB$ Tap | Defined$ Enchanted
 R:Event$ Untap | ActiveZones$ Battlefield | ValidCard$ Creature.AttachedBy | ValidStepTurnToController$ You | Layer$ CantHappen | Description$ Enchanted creature doesn't untap during its controller's untap step.

forge-gui/res/cardsfolder/r/roots.txt

@@ -2,7 +2,7 @@ Name:Roots
 ManaCost:3 G
 Types:Enchantment Aura
 K:Enchant creature without flying
-A:SP$ Attach | ValidTgts$ Creature.withoutFlying | AILogic$ KeepTapped
+A:SP$ Attach | ValidTgts$ Creature.withoutFlying
 R:Event$ Untap | ActiveZones$ Battlefield | ValidCard$ Creature.EnchantedBy | ValidStepTurnToController$ You | Layer$ CantHappen | Description$ Enchanted creature doesn't untap during its controller's untap step.
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigTap | TriggerDescription$ When CARDNAME enters, tap enchanted creature.
 SVar:TrigTap:DB$ Tap | Defined$ Enchanted

forge-gui/res/cardsfolder/s/shackles.txt

@@ -2,7 +2,7 @@ Name:Shackles
 ManaCost:2 W
 Types:Enchantment Aura
 K:Enchant creature
-A:SP$ Attach | ValidTgts$ Creature | AILogic$ KeepTapped
+A:SP$ Attach | ValidTgts$ Creature
 R:Event$ Untap | ActiveZones$ Battlefield | ValidCard$ Creature.EnchantedBy | ValidStepTurnToController$ You | Layer$ CantHappen | Description$ Enchanted creature doesn't untap during its controller's untap step.
 A:AB$ ChangeZone | Cost$ W | Origin$ Battlefield | Destination$ Hand | SpellDescription$ Return CARDNAME to its owner's hand.
 Oracle:Enchant creature\nEnchanted creature doesn't untap during its controller's untap step.\n{W}: Return Shackles to its owner's hand.

forge-gui/res/cardsfolder/s/singing_bell_strike.txt

@@ -2,7 +2,7 @@ Name:Singing Bell Strike
 ManaCost:1 U
 Types:Enchantment Aura
 K:Enchant creature
-A:SP$ Attach | ValidTgts$ Creature | AILogic$ KeepTapped
+A:SP$ Attach | ValidTgts$ Creature
 T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ TrigTap | TriggerDescription$ When CARDNAME enters, tap enchanted creature.
 SVar:TrigTap:DB$ Tap | Defined$ Enchanted
 R:Event$ Untap | ActiveZones$ Battlefield | ValidCard$ Creature.AttachedBy | ValidStepTurnToController$ You | Layer$ CantHappen | Description$ Enchanted creature doesn't untap during its controller's untap step.

forge-gui/res/cardsfolder/s/sinking_feeling.txt

@@ -2,7 +2,7 @@ Name:Sinking Feeling
 ManaCost:2 U
 Types:Enchantment Aura
 K:Enchant creature
-A:SP$ Attach | ValidTgts$ Creature | AILogic$ KeepTapped
+A:SP$ Attach | ValidTgts$ Creature
 R:Event$ Untap | ActiveZones$ Battlefield | ValidCard$ Creature.EnchantedBy | ValidStepTurnToController$ You | Layer$ CantHappen | Description$ Enchanted creature doesn't untap during its controller's untap step.
 S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddAbility$ Untap | Description$ Enchanted creature has "{1}, Put a -1/-1 counter on this creature: Untap this creature."
 SVar:Untap:AB$ Untap | Cost$ 1 AddCounter<1/M1M1> | SpellDescription$ Untap CARDNAME.

forge-gui/res/cardsfolder/s/sleep_paralysis.txt

@@ -2,7 +2,7 @@ Name:Sleep Paralysis
 ManaCost:3 U
 Types:Enchantment Aura
 K:Enchant creature
-A:SP$ Attach | ValidTgts$ Creature | AILogic$ KeepTapped
+A:SP$ Attach | ValidTgts$ Creature
 T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ TrigTap | TriggerDescription$ When CARDNAME enters, tap enchanted creature.
 SVar:TrigTap:DB$ Tap | Defined$ Enchanted
 R:Event$ Untap | ActiveZones$ Battlefield | ValidCard$ Creature.AttachedBy | ValidStepTurnToController$ You | Layer$ CantHappen | Description$ Enchanted creature doesn't untap during its controller's untap step.

forge-gui/res/cardsfolder/s/sleep_with_the_fishes.txt

@@ -2,7 +2,7 @@ Name:Sleep with the Fishes
 ManaCost:2 U U
 Types:Enchantment Aura
 K:Enchant creature
-A:SP$ Attach | ValidTgts$ Creature | AILogic$ KeepTapped
+A:SP$ Attach | ValidTgts$ Creature
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigTap | TriggerDescription$ When CARDNAME enters, tap enchanted creature and you create a 1/1 blue Fish creature token with "This creature can't be blocked."
 SVar:TrigTap:DB$ Tap | Defined$ Enchanted | SubAbility$ DBToken
 SVar:DBToken:DB$ Token | TokenScript$ u_1_1_fish_unblockable

forge-gui/res/cardsfolder/s/sleeping_potion.txt

@@ -4,7 +4,7 @@ Types:Enchantment Aura
 K:Enchant creature
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigTap | TriggerDescription$ When CARDNAME enters, tap enchanted creature.
 SVar:TrigTap:DB$ Tap | Defined$ Enchanted
-A:SP$ Attach | ValidTgts$ Creature | AILogic$ KeepTapped
+A:SP$ Attach | ValidTgts$ Creature
 R:Event$ Untap | ActiveZones$ Battlefield | ValidCard$ Creature.EnchantedBy | ValidStepTurnToController$ You | Layer$ CantHappen | Description$ Enchanted creature doesn't untap during its controller's untap step.
 T:Mode$ BecomesTarget | ValidTarget$ Card.AttachedBy | TriggerZones$ Battlefield | Execute$ TrigSac | TriggerDescription$ When enchanted creature becomes the target of a spell or ability, sacrifice CARDNAME.
 SVar:TrigSac:DB$ Sacrifice

forge-gui/res/cardsfolder/s/so_shiny.txt

@@ -2,7 +2,7 @@ Name:So Shiny
 ManaCost:2 U
 Types:Enchantment Aura
 K:Enchant creature
-A:SP$ Attach | ValidTgts$ Creature | AILogic$ KeepTapped
+A:SP$ Attach | ValidTgts$ Creature
 T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | IsPresent$ Card.YouCtrl+token | PresentCompare$ GE1 | Execute$ TrigTap | TriggerDescription$ When CARDNAME enters, if you control a token, tap enchanted creature, then scry 2.
 SVar:TrigTap:DB$ Tap | Defined$ Enchanted | SubAbility$ DBScry
 SVar:DBScry:DB$ Scry | ScryNum$ 2

forge-gui/res/cardsfolder/s/starlight_snare.txt

@@ -2,7 +2,7 @@ Name:Starlight Snare
 ManaCost:2 U
 Types:Enchantment Aura
 K:Enchant creature
-A:SP$ Attach | ValidTgts$ Creature | AILogic$ KeepTapped
+A:SP$ Attach | ValidTgts$ Creature
 T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ TrigTap | TriggerDescription$ When CARDNAME enters, tap enchanted creature.
 SVar:TrigTap:DB$ Tap | Defined$ Enchanted
 R:Event$ Untap | ActiveZones$ Battlefield | ValidCard$ Creature.EnchantedBy | ValidStepTurnToController$ You | Layer$ CantHappen | Description$ Enchanted creature doesn't untap during its controller's untap step.

forge-gui/res/cardsfolder/s/stasis_cell.txt

@@ -2,8 +2,8 @@ Name:Stasis Cell
 ManaCost:4 U
 Types:Enchantment Aura
 K:Enchant creature
-A:SP$ Attach | ValidTgts$ Creature | AILogic$ KeepTapped
+A:SP$ Attach | ValidTgts$ Creature
 R:Event$ Untap | ActiveZones$ Battlefield | ValidCard$ Creature.EnchantedBy | ValidStepTurnToController$ You | Layer$ CantHappen | Description$ Enchanted creature doesn't untap during its controller's untap step.
-A:AB$ Attach | Cost$ 3 U | ValidTgts$ Creature | TgtPrompt$ Select target creature | AILogic$ KeepTapped | SpellDescription$ Attach CARDNAME to target creature.
+A:AB$ Attach | Cost$ 3 U | ValidTgts$ Creature | TgtPrompt$ Select target creature | SpellDescription$ Attach CARDNAME to target creature.
 AI:RemoveDeck:All
 Oracle:Enchant creature\nEnchanted creature doesn't untap during its controller's untap step.\n{3}{U}: Attach Stasis Cell to target creature.

forge-gui/res/cardsfolder/s/stay_hidden_stay_silent.txt

@@ -1,7 +1,7 @@
 Name:Stay Hidden, Stay Silent
 ManaCost:1 U
 Types:Enchantment Aura
-A:SP$ Attach | ValidTgts$ Creature | AILogic$ KeepTapped
+A:SP$ Attach | ValidTgts$ Creature
 T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ TrigTap | TriggerDescription$ When CARDNAME enters, tap enchanted creature.
 SVar:TrigTap:DB$ Tap | Defined$ Enchanted
 R:Event$ Untap | ActiveZones$ Battlefield | ValidCard$ Creature.EnchantedBy | ValidStepTurnToController$ You | Layer$ CantHappen | Description$ Enchanted creature doesn't untap during its controller's untap step.

forge-gui/res/cardsfolder/s/stop_cold.txt

@@ -3,7 +3,7 @@ ManaCost:3 U
 Types:Enchantment Aura
 K:Flash
 K:Enchant artifact or creature
-A:SP$ Attach | ValidTgts$ Artifact,Creature | TgtPrompt$ Select target artifact or creature | AILogic$ KeepTapped
+A:SP$ Attach | ValidTgts$ Artifact,Creature | TgtPrompt$ Select target artifact or creature
 T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ TrigTap | TriggerDescription$ When this Aura enters, tap enchanted permanent.
 SVar:TrigTap:DB$ Tap | Defined$ Enchanted
 S:Mode$ Continuous | Affected$ Permanent.AttachedBy | RemoveAllAbilities$ True | Description$ Enchanted permanent loses all abilities and doesn't untap during its controller's untap step.

forge-gui/res/cardsfolder/t/tamiyos_compleation.txt

@@ -3,7 +3,7 @@ ManaCost:3 U
 Types:Enchantment Aura
 K:Flash
 K:Enchant artifact, creature, or planeswalker
-A:SP$ Attach | ValidTgts$ Artifact,Creature,Planeswalker | TgtPrompt$ Select target artifact, creature, or planeswalker | AILogic$ KeepTapped
+A:SP$ Attach | ValidTgts$ Artifact,Creature,Planeswalker | TgtPrompt$ Select target artifact, creature, or planeswalker
 T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ TrigTap | TriggerDescription$ When CARDNAME enters, tap enchanted permanent. If it's an Equipment, unattach it.
 SVar:TrigTap:DB$ Tap | Defined$ Enchanted | SubAbility$ DBUnattach
 SVar:DBUnattach:DB$ Unattach | Defined$ Enchanted | ConditionDefined$ Enchanted | ConditionPresent$ Equipment

forge-gui/res/cardsfolder/t/tangle_kelp.txt

@@ -2,7 +2,7 @@ Name:Tangle Kelp
 ManaCost:U
 Types:Enchantment Aura
 K:Enchant creature
-A:SP$ Attach | ValidTgts$ Creature | AILogic$ KeepTapped
+A:SP$ Attach | ValidTgts$ Creature
 T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ TrigTap | TriggerDescription$ When CARDNAME enters, tap enchanted creature.
 SVar:TrigTap:DB$ Tap | Defined$ Enchanted
 R:Event$ Untap | ActiveZones$ Battlefield | ValidCard$ Creature.AttachedBy+attackedLastTurn | ValidStepTurnToController$ You | Layer$ CantHappen | Description$ Enchanted creature doesn't untap during its controller's untap step if it attacked during its controller's last turn.

forge-gui/res/cardsfolder/t/thirst.txt

@@ -4,7 +4,7 @@ Types:Enchantment Aura
 K:Enchant creature
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigUpkeep | TriggerDescription$ At the beginning of your upkeep, sacrifice CARDNAME unless you pay {U}.
 SVar:TrigUpkeep:DB$ Sacrifice | UnlessPayer$ You | UnlessCost$ U
-A:SP$ Attach | ValidTgts$ Creature | AILogic$ KeepTapped
+A:SP$ Attach | ValidTgts$ Creature
 R:Event$ Untap | ActiveZones$ Battlefield | ValidCard$ Creature.EnchantedBy | ValidStepTurnToController$ You | Layer$ CantHappen | Description$ Enchanted creature doesn't untap during its controller's untap step.
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigTap | TriggerDescription$ When CARDNAME enters, tap enchanted creature.
 SVar:TrigTap:DB$ Tap | Defined$ Enchanted

forge-gui/res/cardsfolder/u/unquenchable_thirst.txt

@@ -2,7 +2,7 @@ Name:Unquenchable Thirst
 ManaCost:1 U
 Types:Enchantment Aura
 K:Enchant creature
-A:SP$ Attach | ValidTgts$ Creature | AILogic$ KeepTapped
+A:SP$ Attach | ValidTgts$ Creature
 T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ TrigTap | Desert$ True | TriggerDescription$ When CARDNAME enters, if you control a Desert or there is a Desert card in your graveyard, tap enchanted creature.
 SVar:TrigTap:DB$ Tap | Defined$ Enchanted
 R:Event$ Untap | ActiveZones$ Battlefield | ValidCard$ Creature.AttachedBy | ValidStepTurnToController$ You | Layer$ CantHappen | Description$ Enchanted creature doesn't untap during its controller's untap step.

forge-gui/res/cardsfolder/w/waterknot.txt

@@ -2,7 +2,7 @@ Name:Waterknot
 ManaCost:1 U U
 Types:Enchantment Aura
 K:Enchant creature
-A:SP$ Attach | ValidTgts$ Creature | AILogic$ KeepTapped
+A:SP$ Attach | ValidTgts$ Creature
 T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ TrigTap | TriggerDescription$ When CARDNAME enters, tap enchanted creature.
 SVar:TrigTap:DB$ Tap | Defined$ Enchanted
 R:Event$ Untap | ActiveZones$ Battlefield | ValidCard$ Creature.AttachedBy | ValidStepTurnToController$ You | Layer$ CantHappen | Description$ Enchanted creature doesn't untap during its controller's untap step.

forge-gui/res/cardsfolder/w/weakstones_subjugation.txt

@@ -2,7 +2,7 @@ Name:Weakstone's Subjugation
 ManaCost:U
 Types:Enchantment Aura
 K:Enchant artifact or creature
-A:SP$ Attach | ValidTgts$ Artifact,Creature | TgtPrompt$ Select target artifact or creature | AILogic$ KeepTapped
+A:SP$ Attach | ValidTgts$ Artifact,Creature | TgtPrompt$ Select target artifact or creature
 T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ TrigTap | TriggerDescription$ When CARDNAME enters, you may pay {3}. If you do, tap enchanted permanent.
 SVar:TrigTap:AB$ Tap | Cost$ 3 | Defined$ Enchanted
 R:Event$ Untap | ActiveZones$ Battlefield | ValidCard$ Permanent.AttachedBy | ValidStepTurnToController$ You | Layer$ CantHappen | Description$ Enchanted permanent doesn't untap during its controller's untap step.

forge-gui/res/cardsfolder/w/winters_rest.txt

@@ -2,7 +2,7 @@ Name:Winter's Rest
 ManaCost:1 U
 Types:Snow Enchantment Aura
 K:Enchant creature
-A:SP$ Attach | ValidTgts$ Creature | AILogic$ KeepTapped
+A:SP$ Attach | ValidTgts$ Creature
 T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ TrigTap | TriggerDescription$ When this Aura enters, tap enchanted creature.
 SVar:TrigTap:DB$ Tap | Defined$ Enchanted
 R:Event$ Untap | ActiveZones$ Battlefield | ValidCard$ Creature.EnchantedBy | ValidStepTurnToController$ You | Layer$ CantHappen | IsPresent$ Permanent.Snow+Other+YouCtrl | Description$ As long as you control another snow permanent, enchanted creature doesn't untap during its controller's untap step.