Merge branch 'attachCombine-meaningful-names' into 'attachCombine'

Attempting to refactor names to not be ambiguous/confusing.

See merge request core-developers/forge!1133

forge-ai/src/main/java/forge/ai/ComputerUtil.java

@@ -975,7 +975,7 @@ public class ComputerUtil {
                     playNow = false;
                     break;
                 }
-                if (!playNow && c.isCreature() && ComputerUtilCombat.canAttackNextTurn(c) && c.canBeAttachedBy(card)) {
+                if (!playNow && c.isCreature() && ComputerUtilCombat.canAttackNextTurn(c) && c.canBeAttached(card)) {
                     playNow = true;
                 }
             }

forge-ai/src/main/java/forge/ai/GameState.java

@@ -289,12 +289,12 @@ public abstract class GameState {
                 newText.append("|Meld");
             }
             if (c.isAttachedToEntity()) {
-                newText.append("|Attaching:").append(c.getAttachingEntity().getId());
+                newText.append("|AttachedTo:").append(c.getEntityAttachedTo().getId());
             }
-            if (c.getAttachingPlayer() != null) {
+            if (c.getPlayerAttachedTo() != null) {
                 // TODO: improve this for game states with more than two players
                 newText.append("|EnchantingPlayer:");
-                Player p = c.getAttachingPlayer();
+                Player p = c.getPlayerAttachedTo();
                 newText.append(p.getController().isAI() ? "AI" : "HUMAN");
             }
 
@@ -1029,7 +1029,7 @@ public abstract class GameState {
                         // (will be overridden later, so the actual value shouldn't matter)
 
                         //FIXME it shouldn't be able to attach itself
-                        c.setAttachingEntity(c);
+                        c.setEntityAttachedTo(c);
                     }
 
                     if (cardsWithoutETBTrigs.contains(c)) {
@@ -1126,7 +1126,7 @@ public abstract class GameState {
                 } else if (info.startsWith("Id:")) {
                     int id = Integer.parseInt(info.substring(3));
                     idToCard.put(id, c);
-                } else if (info.startsWith("Attaching:")) {
+                } else if (info.startsWith("Attaching:") /*deprecated*/ || info.startsWith("AttachedTo:")) {
                     int id = Integer.parseInt(info.substring(info.indexOf(':') + 1));
                     cardToAttachId.put(c, id);
                 } else if (info.startsWith("EnchantingPlayer:")) {

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

@@ -1282,7 +1282,7 @@ public class AttachAi extends SpellAbilityAi {
         }
 
         // Don't fortify if already fortifying
-        if (attachSource.getAttachingCard() != null && attachSource.getAttachingCard().getController() == aiPlayer) {
+        if (attachSource.getAttachedTo() != null && attachSource.getAttachedTo().getController() == aiPlayer) {
             return null;
         }
 
@@ -1292,7 +1292,7 @@ public class AttachAi extends SpellAbilityAi {
         } else {
             list = CardLists.getValidCards(aiPlayer.getGame().getCardsIn(tgt.getZone()), tgt.getValidTgts(), sa.getActivatingPlayer(), attachSource, sa);
 
-            list = CardLists.filter(list, CardPredicates.canBeAttachedBy(attachSource));
+            list = CardLists.filter(list, CardPredicates.canBeAttached(attachSource));
 
             // TODO If Attaching without casting, don't need to actually target.
             // I believe this is the only case where mandatory will be true, so just

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

@@ -39,7 +39,7 @@ public class ZoneExchangeAi extends SpellAbilityAi {
         }
         if (type.equals("Aura")) {
             Card c = object1.getEnchantingCard();
-            if (!c.canBeAttachedBy(object2)) {
+            if (!c.canBeAttached(object2)) {
                 return false;
             }
         }

forge-ai/src/main/java/forge/ai/simulation/GameCopier.java

@@ -212,8 +212,8 @@ public class GameCopier {
             otherCard.setSickness(card.hasSickness());
             otherCard.setState(card.getCurrentStateName(), false);
             if (card.isAttachedToEntity()) {
-                GameEntity ge = gameObjectMap.map(card.getAttachingEntity());
+                GameEntity ge = gameObjectMap.map(card.getEntityAttachedTo());
-                otherCard.setAttachingEntity(ge);
+                otherCard.setEntityAttachedTo(ge);
                 ge.addAttachedCard(otherCard);
             }
             if (card.getCloneOrigin() != null) {

forge-game/src/main/java/forge/game/GameAction.java

@@ -508,7 +508,7 @@ public class GameAction {
 
         // unenchant creature if moving aura
         if (copied.isAttachedToEntity()) {
-            copied.unattachFromEntity(copied.getAttachingEntity());
+            copied.unattachFromEntity(copied.getEntityAttachedTo());
         }
     }
 
@@ -975,7 +975,7 @@ public class GameAction {
                 checkAgain |= stateBasedAction704_attach(c); // Attachment
 
                 if (c.isCreature() && c.isAttachedToEntity()) { // Rule 704.5q - Creature attached to an object or player, becomes unattached
-                    c.unattachFromEntity(c.getAttachingEntity());
+                    c.unattachFromEntity(c.getEntityAttachedTo());
                     checkAgain = true;
                 }
 
@@ -1093,14 +1093,14 @@ public class GameAction {
         boolean checkAgain = false;
 
         if (c.isAttachedToEntity()) {
-            final GameEntity ge = c.getAttachingEntity();
+            final GameEntity ge = c.getEntityAttachedTo();
-            if (!ge.canBeAttachedBy(c)) {
+            if (!ge.canBeAttached(c)) {
                 c.unattachFromEntity(ge);
                 checkAgain = true;
             }
         }
 
-        if (c.isAttachedByCards()) {
+        if (c.hasCardAttachments()) {
             for (final Card attach : Lists.newArrayList(c.getAttachedCards())) {
                 if (!attach.isInPlay()) {
                     attach.unattachFromEntity(c);

forge-game/src/main/java/forge/game/GameEntity.java

@@ -307,7 +307,7 @@ public abstract class GameEntity extends GameObject implements IIdentifiable {
         getView().updateAttachedCards(this);
     }
 
-    public final boolean isAttachedByCards() {
+    public final boolean hasCardAttachments() {
         return FCollection.hasElements(attachedCards);
     }
 
@@ -320,15 +320,15 @@ public abstract class GameEntity extends GameObject implements IIdentifiable {
         return CardLists.count(attachedCards, CardPredicates.Presets.AURA) > 0;
     }
 
-    public final boolean isAttachedByCard(Card c) {
+    public final boolean hasCardAttachment(Card c) {
         return FCollection.hasElement(attachedCards, c);
     }
     public final boolean isEnchantedBy(Card c) {
         // Rule 303.4k  Even if c is no Aura it still counts
-        return isAttachedByCard(c);
+        return hasCardAttachment(c);
     }
 
-    public final boolean isAttachedByCard(final String cardName) {
+    public final boolean hasCardAttachment(final String cardName) {
         if (attachedCards == null) {
             return false;
         }
@@ -336,7 +336,7 @@ public abstract class GameEntity extends GameObject implements IIdentifiable {
     }
     public final boolean isEnchantedBy(final String cardName) {
         // Rule 303.4k  Even if c is no Aura it still counts
-        return isAttachedByCard(cardName);
+        return hasCardAttachment(cardName);
     }
 
     /**
@@ -376,11 +376,11 @@ public abstract class GameEntity extends GameObject implements IIdentifiable {
         }
     }
 
-    public boolean canBeAttachedBy(final Card attach) {
+    public boolean canBeAttached(final Card attach) {
-        return canBeAttachedBy(attach, false);
+        return canBeAttached(attach, false);
     }
 
-    public boolean canBeAttachedBy(final Card attach, boolean checkSBA) {
+    public boolean canBeAttached(final Card attach, boolean checkSBA) {
         // master mode
         if (!attach.isAttachment() || attach.isCreature() || equals(attach)) {
             return false;

forge-game/src/main/java/forge/game/GameEntityView.java

@@ -45,12 +45,12 @@ public abstract class GameEntityView extends TrackableObject {
     public Iterable<CardView> getAttachedCards() {
         return get(TrackableProperty.AttachedCards);
     }
-    public boolean isAttachedByCards() {
+    public boolean hasCardAttachments() {
         return getAttachedCards() != null;
     }
 
     protected void updateAttachedCards(GameEntity e) {
-        if (e.isAttachedByCards()) {
+        if (e.hasCardAttachments()) {
             set(TrackableProperty.AttachedCards, CardView.getCollection(e.getAttachedCards()));
         }
         else {

forge-game/src/main/java/forge/game/ability/AbilityUtils.java

@@ -545,7 +545,7 @@ public class AbilityUtils {
             // Add whole Enchanted list to handlePaid
             final CardCollection list = new CardCollection();
             if (card.isEnchanting()) {
-                Object o = card.getAttachingEntity();
+                Object o = card.getEntityAttachedTo();
                 if (o instanceof Card) {
                     list.add(game.getCardState((Card) o));
                 }
@@ -1114,7 +1114,7 @@ public class AbilityUtils {
             }
         }
         else if (defined.equals("EnchantedPlayer")) {
-            final Object o = sa.getHostCard().getAttachingEntity();
+            final Object o = sa.getHostCard().getEntityAttachedTo();
             if (o instanceof Player) {
                 if (!players.contains(o)) {
                     players.add((Player) o);

forge-game/src/main/java/forge/game/ability/effects/AttachEffect.java

@@ -101,7 +101,7 @@ public class AttachEffect extends SpellAbilityEffect {
                 // Although honestly, I'm not sure if the three of those could
                 // handle being scripted
                 // 303.4h: If the card can't be enchanted, the aura doesn't move
-                if (c.canBeAttachedBy(card)) {
+                if (c.canBeAttached(card)) {
                     handleAura(card, c);
                 }
             } else  {
@@ -132,7 +132,7 @@ public class AttachEffect extends SpellAbilityEffect {
 
             @Override
             public void run() {
-                final GameEntity entity = card.getAttachingEntity();
+                final GameEntity entity = card.getEntityAttachedTo();
                 if (entity == null) {
                     return;
                 }

forge-game/src/main/java/forge/game/ability/effects/TokenEffect.java

@@ -497,7 +497,7 @@ public class TokenEffect extends SpellAbilityEffect {
             // TODO update when doing Attach Update
             boolean canAttach = lki.isAttachment();
 
-            if (canAttach && ge.canBeAttachedBy(lki)) {
+            if (canAttach && ge.canBeAttached(lki)) {
                 canAttach = false;
             }
 

forge-game/src/main/java/forge/game/ability/effects/UnattachAllEffect.java

@@ -16,8 +16,8 @@ import java.util.List;
 
 public class UnattachAllEffect extends SpellAbilityEffect {
     private static void handleUnattachment(final GameEntity o, final Card cardToUnattach) {
-        if (cardToUnattach.isAttachment() && o.isAttachedByCard(cardToUnattach)) {
+        if (cardToUnattach.isAttachment() && o.hasCardAttachment(cardToUnattach)) {
-            cardToUnattach.unattachFromEntity(cardToUnattach.getAttachingEntity());
+            cardToUnattach.unattachFromEntity(cardToUnattach.getEntityAttachedTo());
         }
     }
 

forge-game/src/main/java/forge/game/ability/effects/UnattachEffect.java

@@ -33,7 +33,7 @@ public class UnattachEffect extends SpellAbilityEffect {
                 //AbilityFactoryAttach.handleUnattachAura(cardToUnattach, c, gainControl);
             } else if (cardToUnattach.isAttachment()) {
                 if (cardToUnattach.isAttachedToEntity()) {
-                    cardToUnattach.unattachFromEntity(cardToUnattach.getAttachingEntity());
+                    cardToUnattach.unattachFromEntity(cardToUnattach.getEntityAttachedTo());
                 }
             }
         }

forge-game/src/main/java/forge/game/ability/effects/ZoneExchangeEffect.java

@@ -77,7 +77,7 @@ public class ZoneExchangeEffect extends SpellAbilityEffect {
         Card c = null;
         if (type != null && type.equals("Aura") && object1.getEnchantingCard() != null) {
             c = object1.getEnchantingCard();
-            if (!c.canBeAttachedBy(object2)) {
+            if (!c.canBeAttached(object2)) {
                 return;
             }
         }

forge-game/src/main/java/forge/game/card/Card.java

@@ -103,7 +103,7 @@ public class Card extends GameEntity implements Comparable<Card> {
     // if this card is attached or linked to something, what card is it currently attached to
     private Card encoding, cloneOrigin, haunting, effectSource, pairedWith, meldedWith;
 
-    private GameEntity attachingEntity = null;
+    private GameEntity entityAttachedTo = null;
 
     private GameEntity mustAttackEntity = null;
     private GameEntity mustAttackEntityThisTurn = null;
@@ -2598,10 +2598,10 @@ public class Card extends GameEntity implements Comparable<Card> {
         return CardLists.count(attachedCards, CardPredicates.Presets.EQUIPMENT) > 0;
     }
     public final boolean isEquippedBy(Card c) {
-        return this.isAttachedByCard(c);
+        return this.hasCardAttachment(c);
     }
     public final boolean isEquippedBy(final String cardName) {
-        return this.isAttachedByCard(cardName);
+        return this.hasCardAttachment(cardName);
     }
 
     public final CardCollectionView getFortifiedBy() {
@@ -2621,11 +2621,11 @@ public class Card extends GameEntity implements Comparable<Card> {
     }
     public final boolean isFortifiedBy(Card c) {
         // 301.5e + 301.6
-        return isAttachedByCard(c);
+        return hasCardAttachment(c);
     }
 
     public final Card getEquipping() {
-        return this.getAttachingCard();
+        return this.getAttachedTo();
     }
     public final boolean isEquipping() {
         return this.isAttachedToEntity();
@@ -2663,36 +2663,36 @@ public class Card extends GameEntity implements Comparable<Card> {
         }
     }
 
-    public final GameEntity getAttachingEntity() {
+    public final GameEntity getEntityAttachedTo() {
-        return attachingEntity;
+        return entityAttachedTo;
     }
-    public final void setAttachingEntity(final GameEntity e) {
+    public final void setEntityAttachedTo(final GameEntity e) {
-        if (attachingEntity == e) { return; }
+        if (entityAttachedTo == e) { return; }
-        attachingEntity = e;
+        entityAttachedTo = e;
-        view.updateAttaching(this);
+        view.updateAttachedTo(this);
     }
-    public final void removeAttaching(final GameEntity e) {
+    public final void removeAttachedTo(final GameEntity e) {
-        if (attachingEntity == e) {
+        if (entityAttachedTo == e) {
-            setAttachingEntity(null);
+            setEntityAttachedTo(null);
         }
     }
     public final boolean isAttachedToEntity() {
-        return attachingEntity != null;
+        return entityAttachedTo != null;
     }
 
-    public final Card getAttachingCard() {
+    public final Card getAttachedTo() {
-        if (attachingEntity instanceof Card) {
+        if (entityAttachedTo instanceof Card) {
-            return (Card) attachingEntity;
+            return (Card) entityAttachedTo;
         }
         return null;
     }
 
     public final Card getEnchantingCard() {
-        return getAttachingCard();
+        return getAttachedTo();
     }
-    public final Player getAttachingPlayer() {
+    public final Player getPlayerAttachedTo() {
-        if (attachingEntity instanceof Player) {
+        if (entityAttachedTo instanceof Player) {
-            return (Player) attachingEntity;
+            return (Player) entityAttachedTo;
         }
         return null;
     }
@@ -2704,13 +2704,13 @@ public class Card extends GameEntity implements Comparable<Card> {
     }
 
     public final void attachToEntity(final GameEntity entity) {
-        if (!entity.canBeAttachedBy(this)) {
+        if (!entity.canBeAttached(this)) {
             return;
         }
 
         GameEntity oldTarget = null;
         if (isAttachedToEntity()) {
-            oldTarget = getAttachingEntity();
+            oldTarget = getEntityAttachedTo();
             // If attempting to reattach to the same object, don't do anything.
             if (oldTarget.equals(entity)) {
                 return;
@@ -2719,7 +2719,7 @@ public class Card extends GameEntity implements Comparable<Card> {
         }
 
         // They use double links... it's doubtful
-        setAttachingEntity(entity);
+        setEntityAttachedTo(entity);
         setTimestamp(getGame().getNextTimestamp());
         entity.addAttachedCard(this);
 
@@ -2735,11 +2735,11 @@ public class Card extends GameEntity implements Comparable<Card> {
     }
 
     public final void unattachFromEntity(final GameEntity entity) {
-        if (attachingEntity == null || !attachingEntity.equals(entity)) {
+        if (entityAttachedTo == null || !entityAttachedTo.equals(entity)) {
             return;
         }
 
-        setAttachingEntity(null);
+        setEntityAttachedTo(null);
         entity.removeAttachedCard(this);
 
         // Handle Bestowed Aura part
@@ -3833,7 +3833,7 @@ public class Card extends GameEntity implements Comparable<Card> {
             setDirectlyPhasedOut(direct);
         }
 
-        if (isAttachedByCards()) {
+        if (hasCardAttachments()) {
             for (final Card eq : getAttachedCards()) {
                 if (eq.isPhasedOut() == phasingIn) {
                     eq.phase(false);
@@ -5196,16 +5196,16 @@ public class Card extends GameEntity implements Comparable<Card> {
     }
 
     /* (non-Javadoc)
-     * @see forge.game.GameEntity#canBeAttachedBy(forge.game.card.Card, boolean)
+     * @see forge.game.GameEntity#canBeAttached(forge.game.card.Card, boolean)
      */
     @Override
-    public boolean canBeAttachedBy(Card attach, boolean checkSBA) {
+    public boolean canBeAttached(Card attach, boolean checkSBA) {
         // phase check there
         if (isPhasedOut() && !attach.isPhasedOut()) {
             return false;
         }
 
-        return super.canBeAttachedBy(attach, checkSBA);
+        return super.canBeAttached(attach, checkSBA);
     }
 
     public FCollectionView<ReplacementEffect> getReplacementEffects() {

forge-game/src/main/java/forge/game/card/CardFactory.java

@@ -93,7 +93,7 @@ public class CardFactory {
 
         // this's necessary for forge.game.GameAction.unattachCardLeavingBattlefield(Card)
         out.setAttachedCards(in.getAttachedCards());
-        out.setAttachingEntity(in.getAttachingEntity());
+        out.setEntityAttachedTo(in.getEntityAttachedTo());
 
         out.setClones(in.getClones());
         out.setCastSA(in.getCastSA());

forge-game/src/main/java/forge/game/card/CardFactoryUtil.java

@@ -1526,7 +1526,7 @@ public class CardFactoryUtil {
 
         //  Count$InTargetedHand (targeted player's cards in hand)
         if (sq[0].contains("InEnchantedHand")) {
-            GameEntity o = c.getAttachingEntity();
+            GameEntity o = c.getEntityAttachedTo();
             Player controller = null;
             if (o instanceof Card) {
                 controller = ((Card) o).getController();
@@ -1539,7 +1539,7 @@ public class CardFactoryUtil {
             }
         }
         if (sq[0].contains("InEnchantedYard")) {
-            GameEntity o = c.getAttachingEntity();
+            GameEntity o = c.getEntityAttachedTo();
             Player controller = null;
             if (o instanceof Card) {
                 controller = ((Card) o).getController();

forge-game/src/main/java/forge/game/card/CardPredicates.java

@@ -216,11 +216,11 @@ public final class CardPredicates {
         };
     };
 
-    public static final Predicate<Card> canBeAttachedBy(final Card aura) {
+    public static final Predicate<Card> canBeAttached(final Card aura) {
         return new Predicate<Card>() {
             @Override
             public boolean apply(final Card c) {
-                return c.canBeAttachedBy(aura);
+                return c.canBeAttached(aura);
             }
         };
     };

forge-game/src/main/java/forge/game/card/CardProperty.java

@@ -175,7 +175,7 @@ public class CardProperty {
             }
         } else if (property.startsWith("EnchantedPlayer")) {
             Player p = property.endsWith("Ctrl") ? controller : card.getOwner();
-            final Object o = source.getAttachingEntity();
+            final Object o = source.getEntityAttachedTo();
             if (o instanceof Player) {
                 if (!p.equals(o)) {
                     return false;
@@ -185,7 +185,7 @@ public class CardProperty {
             }
         } else if (property.startsWith("EnchantedController")) {
             Player p = property.endsWith("Ctrl") ? controller : card.getOwner();
-            final Object o = source.getAttachingEntity();
+            final Object o = source.getEntityAttachedTo();
             if (o instanceof Card) {
                 if (!p.equals(((Card) o).getController())) {
                     return false;
@@ -401,11 +401,11 @@ public class CardProperty {
                 return false;
             }
         } else if (property.startsWith("AttachedBy")) {
-            if (!card.isAttachedByCard(source)) {
+            if (!card.hasCardAttachment(source)) {
                 return false;
             }
         } else if (property.equals("Attached")) {
-            if (!source.isAttachedByCard(card)) {
+            if (!source.hasCardAttachment(card)) {
                 return false;
             }
         } else if (property.startsWith("AttachedTo")) {
@@ -416,7 +416,7 @@ public class CardProperty {
                         final SpellAbility sa = t.getTriggeredSA();
                         final CardCollectionView cards = AbilityUtils.getDefinedCards(source, "Targeted", sa);
                         for (final Card c : cards) {
-                            if (card.getEquipping() != c && !c.equals(card.getAttachingEntity())) {
+                            if (card.getEquipping() != c && !c.equals(card.getEntityAttachedTo())) {
                                 return false;
                             }
                         }
@@ -425,7 +425,7 @@ public class CardProperty {
                     for (final SpellAbility sa : source.getCurrentState().getNonManaAbilities()) {
                         final CardCollectionView cards = AbilityUtils.getDefinedCards(source, "Targeted", sa);
                         for (final Card c : cards) {
-                            if (card.getEquipping() == c || c.equals(card.getAttachingEntity())) { // handle multiple targets
+                            if (card.getEquipping() == c || c.equals(card.getEntityAttachedTo())) { // handle multiple targets
                                 return true;
                             }
                         }
@@ -433,22 +433,22 @@ public class CardProperty {
                     return false;
                 }
             } else {
-                if ((card.getAttachingEntity() == null || !card.getAttachingEntity().isValid(restriction, sourceController, source, spellAbility))) {
+                if ((card.getEntityAttachedTo() == null || !card.getEntityAttachedTo().isValid(restriction, sourceController, source, spellAbility))) {
                     return false;
                 }
             }
         } else if (property.equals("NameNotEnchantingEnchantedPlayer")) {
-            Player enchantedPlayer = source.getAttachingPlayer();
+            Player enchantedPlayer = source.getPlayerAttachedTo();
             if (enchantedPlayer == null || enchantedPlayer.isEnchantedBy(card.getName())) {
                 return false;
             }
         } else if (property.equals("NotAttachedTo")) {
-            if (source.isAttachedByCard(card)) {
+            if (source.hasCardAttachment(card)) {
                 return false;
             }
         } else if (property.startsWith("EnchantedBy")) {
             if (property.equals("EnchantedBy")) {
-                if (!card.isEnchantedBy(source) && !card.equals(source.getAttachingEntity())) {
+                if (!card.isEnchantedBy(source) && !card.equals(source.getEntityAttachedTo())) {
                     return false;
                 }
             } else {
@@ -456,7 +456,7 @@ public class CardProperty {
                 switch (restriction) {
                     case "Imprinted":
                         for (final Card c : source.getImprintedCards()) {
-                            if (!card.isEnchantedBy(c) && !card.equals(c.getAttachingEntity())) {
+                            if (!card.isEnchantedBy(c) && !card.equals(c.getEntityAttachedTo())) {
                                 return false;
                             }
                         }
@@ -466,7 +466,7 @@ public class CardProperty {
                             final SpellAbility saTargeting = sa.getSATargetingCard();
                             if (saTargeting != null) {
                                 for (final Card c : saTargeting.getTargets().getTargetCards()) {
-                                    if (!card.isEnchantedBy(c) && !card.equals(c.getAttachingEntity())) {
+                                    if (!card.isEnchantedBy(c) && !card.equals(c.getEntityAttachedTo())) {
                                         return false;
                                     }
                                 }
@@ -500,18 +500,18 @@ public class CardProperty {
                 }
             }
         } else if (property.startsWith("Enchanted")) {
-            if (!source.equals(card.getAttachingEntity())) {
+            if (!source.equals(card.getEntityAttachedTo())) {
                 return false;
             }
         } else if (property.startsWith("CanEnchant")) {
             final String restriction = property.substring(10);
             if (restriction.equals("Remembered")) {
                 for (final Object rem : source.getRemembered()) {
-                    if (!(rem instanceof Card) || !((Card) rem).canBeAttachedBy(card))
+                    if (!(rem instanceof Card) || !((Card) rem).canBeAttached(card))
                         return false;
                 }
             } else if (restriction.equals("Source")) {
-                if (!source.canBeAttachedBy(card)) return false;
+                if (!source.canBeAttached(card)) return false;
             }
         } else if (property.startsWith("CanBeEnchantedBy")) {
             if (property.substring(16).equals("Targeted")) {
@@ -519,7 +519,7 @@ public class CardProperty {
                     final SpellAbility saTargeting = sa.getSATargetingCard();
                     if (saTargeting != null) {
                         for (final Card c : saTargeting.getTargets().getTargetCards()) {
-                            if (!card.canBeAttachedBy(c)) {
+                            if (!card.canBeAttached(c)) {
                                 return false;
                             }
                         }
@@ -529,13 +529,13 @@ public class CardProperty {
                 for (final Object rem : source.getRemembered()) {
                     if (rem instanceof Card) {
                         final Card c = (Card) rem;
-                        if (!card.canBeAttachedBy(c)) {
+                        if (!card.canBeAttached(c)) {
                             return false;
                         }
                     }
                 }
             } else {
-                if (!card.canBeAttachedBy(source)) {
+                if (!card.canBeAttached(source)) {
                     return false;
                 }
             }
@@ -545,7 +545,7 @@ public class CardProperty {
                     final SpellAbility saTargeting = sa.getSATargetingCard();
                     if (saTargeting != null) {
                         for (final Card c : saTargeting.getTargets().getTargetCards()) {
-                            if (!card.isAttachedByCard(c)) {
+                            if (!card.hasCardAttachment(c)) {
                                 return false;
                             }
                         }
@@ -553,29 +553,29 @@ public class CardProperty {
                 }
             } else if (property.substring(10).equals("Enchanted")) {
                 if (source.getEnchantingCard() == null ||
-                        !card.isAttachedByCard(source.getEnchantingCard())) {
+                        !card.hasCardAttachment(source.getEnchantingCard())) {
                     return false;
                 }
             } else {
-                if (!card.isAttachedByCard(source)) {
+                if (!card.hasCardAttachment(source)) {
                     return false;
                 }
             }
         } else if (property.startsWith("FortifiedBy")) {
-            if (!card.isAttachedByCard(source)) {
+            if (!card.hasCardAttachment(source)) {
                 return false;
             }
         } else if (property.startsWith("CanBeAttachedBy")) {
-            if (!card.canBeAttachedBy(source)) {
+            if (!card.canBeAttached(source)) {
                 return false;
             }
         } else if (property.startsWith("Equipped")) {
-            if (!source.isAttachedByCard(card)) {
+            if (!source.hasCardAttachment(card)) {
                 return false;
             }
         } else if (property.startsWith("Fortified")) {
             // FIXME TODO what property has this?
-            if (!source.isAttachedByCard(card)) {
+            if (!source.hasCardAttachment(card)) {
                 return false;
             }
         } else if (property.startsWith("HauntedBy")) {

forge-game/src/main/java/forge/game/card/CardUtil.java

@@ -266,7 +266,7 @@ public final class CardUtil {
         newCopy.getDamageHistory().setCreatureGotBlockedThisTurn(in.getDamageHistory().getCreatureGotBlockedThisTurn());
 
         newCopy.setAttachedCards(in.getAttachedCards());
-        newCopy.setAttachingEntity(in.getAttachingEntity());
+        newCopy.setEntityAttachedTo(in.getEntityAttachedTo());
 
         newCopy.setClones(in.getClones());
         newCopy.setHaunting(in.getHaunting());

forge-game/src/main/java/forge/game/card/CardView.java

@@ -442,22 +442,22 @@ public class CardView extends GameEntityView {
         return get(TrackableProperty.EncodedCards);
     }
 
-    public GameEntityView getAttachingEntity() {
+    public GameEntityView getEntityAttachedTo() {
-        return get(TrackableProperty.AttachingEntity);
+        return get(TrackableProperty.EntityAttachedTo);
     }
-    void updateAttaching(Card c) {
+    void updateAttachedTo(Card c) {
-        set(TrackableProperty.AttachingEntity, GameEntityView.get(c.getAttachingEntity()));
+        set(TrackableProperty.EntityAttachedTo, GameEntityView.get(c.getEntityAttachedTo()));
     }
 
-    public CardView getAttachingCard() {
+    public CardView getAttachedTo() {
-        GameEntityView enchanting = getAttachingEntity();
+        GameEntityView enchanting = getEntityAttachedTo();
         if (enchanting instanceof CardView) {
             return (CardView) enchanting;
         }
         return null;
     }
-    public PlayerView getAttachingPlayer() {
+    public PlayerView getEnchantedPlayer() {
-        GameEntityView enchanting = getAttachingEntity();
+        GameEntityView enchanting = getEntityAttachedTo();
         if (enchanting instanceof PlayerView) {
             return (PlayerView) enchanting;
         }

forge-game/src/main/java/forge/game/cost/CostUnattach.java

@@ -116,7 +116,7 @@ public class CostUnattach extends CostPartWithList {
      */
     @Override
     protected Card doPayment(SpellAbility ability, Card targetCard) {
-        targetCard.unattachFromEntity(targetCard.getAttachingEntity());
+        targetCard.unattachFromEntity(targetCard.getEntityAttachedTo());
         return targetCard;
     }
 

forge-game/src/main/java/forge/game/phase/Untap.java

@@ -271,7 +271,7 @@ public class Untap extends Phase {
                 // 702.23g If an object would simultaneously phase out directly
                 // and indirectly, it just phases out indirectly.
                 if (c.isAura() || c.isFortification()) {
-                    final Card ent = c.getAttachingCard();
+                    final Card ent = c.getAttachedTo();
                     if (ent != null && list.contains(ent)) {
                         continue;
                     }

forge-game/src/main/java/forge/game/player/Player.java

@@ -684,7 +684,7 @@ public class Player extends GameEntity implements Comparable<Player> {
                     restDamage *= 2;
                 }
             } else if (c.getName().equals("Curse of Bloodletting")) {
-                if (c.getAttachingEntity().equals(this)) {
+                if (c.getEntityAttachedTo().equals(this)) {
                     restDamage *= 2;
                 }
             } else if (c.getName().equals("Gisela, Blade of Goldnight")) {
@@ -2098,7 +2098,7 @@ public class Player extends GameEntity implements Comparable<Player> {
                 return false;
             }
         } else if (incR[0].equals("EnchantedController")) {
-            final GameEntity enchanted = source.getAttachingEntity();
+            final GameEntity enchanted = source.getEntityAttachedTo();
             if ((enchanted == null) || !(enchanted instanceof Card)) {
                 return false;
             }

forge-game/src/main/java/forge/trackable/TrackableProperty.java

@@ -43,7 +43,7 @@ public enum TrackableProperty {
     NamedCard(TrackableTypes.StringType),
     PlayerMayLook(TrackableTypes.PlayerViewCollectionType, FreezeMode.IgnoresFreeze),
     PlayerMayLookTemp(TrackableTypes.PlayerViewCollectionType, FreezeMode.IgnoresFreeze),
-    AttachingEntity(TrackableTypes.GameEntityViewType),
+    EntityAttachedTo(TrackableTypes.GameEntityViewType),
     EncodedCards(TrackableTypes.CardViewCollectionType),
     GainControlTargets(TrackableTypes.CardViewCollectionType),
     CloneOrigin(TrackableTypes.CardViewType),

forge-gui-desktop/src/main/java/forge/screens/match/TargetingOverlay.java

@@ -404,18 +404,18 @@ public class TargetingOverlay {
             return; //don't add arcs for cards if card already visualized
         }
 
-        final CardView attaching = c.getAttachingCard();
+        final CardView attachedTo = c.getAttachedTo();
-        final Iterable<CardView> attachedBy = c.getAttachedCards();
+        final Iterable<CardView> attachedCards = c.getAttachedCards();
         final CardView paired = c.getPairedWith();
 
-        if (null != attaching) {
+        if (null != attachedTo) {
-            if (attaching.getController() != null && !attaching.getController().equals(c.getController())) {
+            if (attachedTo.getController() != null && !attachedTo.getController().equals(c.getController())) {
-                addArc(endpoints.get(attaching.getId()), endpoints.get(c.getId()), ArcConnection.Friends);
+                addArc(endpoints.get(attachedTo.getId()), endpoints.get(c.getId()), ArcConnection.Friends);
-                cardsVisualized.add(attaching);
+                cardsVisualized.add(attachedTo);
             }
         }
-        if (null != attachedBy) {
+        if (null != attachedCards) {
-            for (final CardView enc : attachedBy) {
+            for (final CardView enc : attachedCards) {
                 if (enc.getController() != null && !enc.getController().equals(c.getController())) {
                     addArc(endpoints.get(c.getId()), endpoints.get(enc.getId()), ArcConnection.Friends);
                     cardsVisualized.add(enc);

forge-gui-desktop/src/main/java/forge/view/arcane/PlayArea.java

@@ -106,7 +106,7 @@ public class PlayArea extends CardPanelContainer implements CardPanelMouseListen
                 final CardStack stack = allLands.get(i);
                 final CardPanel firstPanel = stack.get(0);
                 if (firstPanel.getCard().getCurrentState().getName().equals(state.getName())) {
-                    if (!firstPanel.getAttachedPanels().isEmpty() || firstPanel.getCard().isAttachedByCards()) {
+                    if (!firstPanel.getAttachedPanels().isEmpty() || firstPanel.getCard().hasCardAttachments()) {
                         // Put this land to the left of lands with the same name
                         // and attachments.
                         insertIndex = i;
@@ -114,7 +114,7 @@ public class PlayArea extends CardPanelContainer implements CardPanelMouseListen
                     }
                     if (!panel.getAttachedPanels().isEmpty()
                             || !panel.getCard().hasSameCounters(firstPanel.getCard())
-                            || firstPanel.getCard().isAttachedByCards() || (stack.size() == this.landStackMax)) {
+                            || firstPanel.getCard().hasCardAttachments() || (stack.size() == this.landStackMax)) {
                         // If this land has attachments or the stack is full,
                         // put it to the right.
                         insertIndex = i + 1;
@@ -683,7 +683,7 @@ public class PlayArea extends CardPanelContainer implements CardPanelMouseListen
         }
         toPanel.getAttachedPanels().clear();
 
-        if (card.isAttachedByCards()) {
+        if (card.hasCardAttachments()) {
             final Iterable<CardView> enchants = card.getAttachedCards();
             for (final CardView e : enchants) {
                 final CardPanel cardE = getCardPanel(e.getId());
@@ -698,8 +698,8 @@ public class PlayArea extends CardPanelContainer implements CardPanelMouseListen
         }
 
         CardPanel attachedToPanel;
-        if (card.getAttachingCard() != null) {
+        if (card.getAttachedTo() != null) {
-            attachedToPanel = getCardPanel(card.getAttachingCard().getId());
+            attachedToPanel = getCardPanel(card.getAttachedTo().getId());
         }
         else {
             attachedToPanel = null;

forge-gui-desktop/src/test/java/forge/ai/simulation/GameSimulatorTest.java

@@ -1378,7 +1378,7 @@ public class GameSimulatorTest extends SimulationTestCase {
         lifelink.attachToEntity(bear);
 
         assertTrue(bear.isEnchanted());
-        assertTrue(bear.isAttachedByCard(lifelink));
+        assertTrue(bear.hasCardAttachment(lifelink));
 
         // this adds Artifact Type
         addCardToZone("Mycosynth Lattice", p, ZoneType.Battlefield);
@@ -1416,7 +1416,7 @@ public class GameSimulatorTest extends SimulationTestCase {
         curse.attachToEntity(p);
         game.getAction().checkStateEffects(true);
         assertTrue(p.isEnchanted());
-        assertTrue(p.isAttachedByCard(curse));
+        assertTrue(p.hasCardAttachment(curse));
 
         // this adds Artifact Type
         addCardToZone("Mycosynth Lattice", p, ZoneType.Battlefield);
@@ -1453,7 +1453,7 @@ public class GameSimulatorTest extends SimulationTestCase {
         assertFalse(fortification.isEquipment());
 
         assertTrue(mountain.isFortified());
-        assertTrue(mountain.isAttachedByCard(fortification));
+        assertTrue(mountain.hasCardAttachment(fortification));
         assertTrue(mountain.hasKeyword(Keyword.INDESTRUCTIBLE));
 
         // adding Brawl will cause the Fortification into Equipment and it to
@@ -1464,7 +1464,7 @@ public class GameSimulatorTest extends SimulationTestCase {
         assertFalse(fortification.isFortification());
         assertTrue(fortification.isEquipment());
 
-        assertFalse(mountain.isAttachedByCard(fortification));
+        assertFalse(mountain.hasCardAttachment(fortification));
         assertFalse(mountain.hasKeyword(Keyword.INDESTRUCTIBLE));
     }
 
@@ -1486,7 +1486,7 @@ public class GameSimulatorTest extends SimulationTestCase {
         assertTrue(dryad.isFortified());
         assertFalse(dryad.isEquipped());
 
-        assertTrue(dryad.isAttachedByCard(fortification));
+        assertTrue(dryad.hasCardAttachment(fortification));
         assertTrue(dryad.hasKeyword(Keyword.INDESTRUCTIBLE));
 
         // adding Brawl will cause the Fortification into Equipment
@@ -1498,7 +1498,7 @@ public class GameSimulatorTest extends SimulationTestCase {
         assertFalse(dryad.isFortified());
         assertTrue(dryad.isEquipped());
 
-        assertTrue(dryad.isAttachedByCard(fortification));
+        assertTrue(dryad.hasCardAttachment(fortification));
         assertTrue(dryad.hasKeyword(Keyword.INDESTRUCTIBLE));
     }
 

forge-gui-desktop/src/test/java/forge/gamesimulationtests/util/GameWrapper.java

@@ -104,7 +104,7 @@ public class GameWrapper {
         		if( card.getTarget() != null ) {
         		    Card target = CardSpecificationHandler.INSTANCE.find( game, card.getTarget() );
         		    if (actualCard.isAttachment()) {
-        		        if (target.canBeAttachedBy(actualCard)) {
+        		        if (target.canBeAttached(actualCard)) {
         		            actualCard.attachToEntity(target);
         		        } else {
                                     throw new IllegalStateException( actualCard + " can't attach to " + target );

forge-gui-mobile/src/forge/screens/match/views/VCardDisplayArea.java

@@ -279,8 +279,8 @@ public abstract class VCardDisplayArea extends VDisplayArea implements ActivateH
 
             attachedPanels.clear();
 
-            if (card.isAttached()) {
+            if (card.hasCardAttachments()) {
-                final Iterable<CardView> enchants = card.getAttachedBy();
+                final Iterable<CardView> enchants = card.getAttachedCards();
                 for (final CardView e : enchants) {
                     final CardAreaPanel cardE = CardAreaPanel.get(e);
                     if (cardE != null) {
@@ -289,8 +289,8 @@ public abstract class VCardDisplayArea extends VDisplayArea implements ActivateH
                 }
             }
        
-            if (card.getAttachingCard() != null) {
+            if (card.getAttachedTo() != null) {
-                setAttachedToPanel(CardAreaPanel.get(card.getAttachingCard()));
+                setAttachedToPanel(CardAreaPanel.get(card.getAttachedTo()));
             }
             else {
                 setAttachedToPanel(null);

forge-gui-mobile/src/forge/screens/match/views/VField.java

@@ -99,7 +99,7 @@ public class VField extends FContainer {
     };
 
     private boolean tryStackCard(CardView card, List<CardView> cardsOfType) {
-        if (card.isAttachedByCards()) {
+        if (card.hasCardAttachments()) {
             return false; //can stack with enchanted or equipped card
         }
         if (card.getCurrentState().isCreature() && !card.isToken()) {
@@ -107,7 +107,7 @@ public class VField extends FContainer {
         }
         final String cardName = card.getCurrentState().getName();
         for (CardView c : cardsOfType) {
-            if (!c.isAttachedByCards() &&
+            if (!c.hasCardAttachments() &&
                     cardName.equals(c.getCurrentState().getName()) &&
                     card.hasSameCounters(c) &&
                     card.isToken() == c.isToken()) { //don't stack tokens on top of non-tokens

forge-gui/res/puzzle/INQ02.pzl

@@ -14,7 +14,7 @@ activephase=CLEANUP
 humanhand=Copy Enchantment;Peel from Reality;Shinen of Fear's Chill;Dimir Aqueduct
 humanlibrary=Dream Leash
 humangraveyard=
-humanbattlefield=Blood Funnel;Cyclopean Snare;Dimir Doppelganger|Id:14;Followed Footsteps|Attaching:14;Halcyon Glaze;Heartstone;Mindleech Mass;Spawnbroker;Dimir Aqueduct;Dimir Aqueduct;Dimir Aqueduct;Dimir Aqueduct;Island;Island;Island;Island
+humanbattlefield=Blood Funnel;Cyclopean Snare;Dimir Doppelganger|Id:14;Followed Footsteps|AttachedTo:14;Halcyon Glaze;Heartstone;Mindleech Mass;Spawnbroker;Dimir Aqueduct;Dimir Aqueduct;Dimir Aqueduct;Dimir Aqueduct;Island;Island;Island;Island
 humanexile=
 humancommand=
 aihand=

forge-gui/res/puzzle/PC_020816.pzl

@@ -13,8 +13,8 @@ AILife=11
 humanhand=
 humangraveyard=Soul Snare; Zektar Shrine Expedition; Call to Arms; Pursuit of Knowledge; Seal of Fire;
 humanlibrary=Fell the Mighty
-humanbattlefield=Mountain|Set:C15; Mountain|Set:C15; Mountain|Set:C15; Mountain|Set:C15; Plains|Set:C15; Plains|Set:C15; Plains|Set:C15; Plains|Set:C15; Plains|Set:C15; Boros Garrison; Temple of Triumph; Perilous Myr; Circle of Flame; Battle Strain; Burning Earth; Blockbuster|Id:420; Starfield of Nyx; Cage of Hands|Attaching:422;
+humanbattlefield=Mountain|Set:C15; Mountain|Set:C15; Mountain|Set:C15; Mountain|Set:C15; Plains|Set:C15; Plains|Set:C15; Plains|Set:C15; Plains|Set:C15; Plains|Set:C15; Boros Garrison; Temple of Triumph; Perilous Myr; Circle of Flame; Battle Strain; Burning Earth; Blockbuster|Id:420; Starfield of Nyx; Cage of Hands|AttachedTo:422;
-aibattlefield=Island|Set:C15; Island|Tapped|Set:C15; Island|Tapped|Set:C15; Island|Tapped|Set:C15; Swamp|Tapped|Set:C15; Swamp|Tapped|Set:C15; Swamp|Tapped|Set:C15; Piranha Marsh; Underground Sea; Dismal Backwater; Radiant Fountain; Vampire Nighthawk|Id:422; Fallowsage; Whirlwind Adept; Air Servant; Argentum Armor; Greel's Caress|Attaching:420;
+aibattlefield=Island|Set:C15; Island|Tapped|Set:C15; Island|Tapped|Set:C15; Island|Tapped|Set:C15; Swamp|Tapped|Set:C15; Swamp|Tapped|Set:C15; Swamp|Tapped|Set:C15; Piranha Marsh; Underground Sea; Dismal Backwater; Radiant Fountain; Vampire Nighthawk|Id:422; Fallowsage; Whirlwind Adept; Air Servant; Argentum Armor; Greel's Caress|AttachedTo:420;
 aigraveyard=
 ailibrary=
 aiexile=

forge-gui/res/puzzle/PC_033115.pzl

@@ -11,5 +11,5 @@ ActivePhase=Main1
 HumanLife=4
 AILife=4
 humanhand=Glaring Aegis|Set:DTK; Jeskai Barricade|Set:FRF; Epic Confrontation|Set:DTK; Dromoka's Gift|Set:DTK
-humanbattlefield=Forest|Set:DTK; Forest|Set:DTK; Forest|Set:DTK; Forest|Set:DTK; Plains|Set:DTK; Plains|Set:DTK; Plains|Set:DTK; Plains|Set:DTK; Plains|Set:DTK; Lightwalker|Set:DTK; Dragon-Scarred Bear|Set:DTK; Abzan Skycaptain|Set:FRF|Tapped|Id:420; Battlefront Krushok|Set:FRF; Ambush Krotiq|Set:FRF; Dromoka Monument|Set:DTK; Stormrider Rig|Attaching:420|Set:DTK
+humanbattlefield=Forest|Set:DTK; Forest|Set:DTK; Forest|Set:DTK; Forest|Set:DTK; Plains|Set:DTK; Plains|Set:DTK; Plains|Set:DTK; Plains|Set:DTK; Plains|Set:DTK; Lightwalker|Set:DTK; Dragon-Scarred Bear|Set:DTK; Abzan Skycaptain|Set:FRF|Tapped|Id:420; Battlefront Krushok|Set:FRF; Ambush Krotiq|Set:FRF; Dromoka Monument|Set:DTK; Stormrider Rig|AttachedTo:420|Set:DTK
 aibattlefield=Plains|Set:DTK|Tapped; Plains|Set:DTK|Tapped; Plains|Set:DTK|Tapped; Island|Set:DTK|Tapped; Island|Set:DTK|Tapped; Island|Set:DTK|Tapped; Island|Set:DTK|Tapped; Dromoka Dunecaster|Set:DTK; Territorial Roc|Set:DTK; Orator of Ojutai|Set:DTK; Updraft Elemental|Set:DTK; Ancient Carp|Set:DTK; Strongarm Monk|Set:DTK; Ojutai, Soul of Winter|Set:FRF; Cunning Breezedancer|Tapped|Set:DTK

forge-gui/res/puzzle/PC_040715.pzl

@@ -14,4 +14,4 @@ humanhand=Mountain|Set:DTK; Collateral Damage|Set:FRF; Twin Bolt|Set:DTK; Gravep
 humangraveyard=Gurmag Angler|Set:FRF; Atarka Efreet|Set:DTK
 humanlibrary=Mountain|Set:DTK
 humanbattlefield=Swamp|Set:DTK; Swamp|Set:DTK; Swamp|Set:DTK; Swamp|Set:DTK; Mountain|Set:DTK; Mountain|Set:DTK; Mountain|Set:DTK; Shambling Goblin|Set:DTK; Kolaghan Stormsinger|Counters:P1P1=1|Set:DTK; Qarsi High Priest|Set:FRF; Qal Sisma Behemoth|Id:420|Set:DTK; Deadly Wanderings|Set:DTK
-aibattlefield=Pacifism|Set:DTK|Attaching:420|Set:DTK; Forest|Set:DTK|Tapped; Forest|Set:DTK|Tapped; Forest|Set:DTK|Tapped; Forest|Set:DTK|Tapped; Plains|Set:DTK|Tapped; Plains|Set:DTK|Tapped; Blossoming Sands|Tapped|Set:FRF; Glade Watcher|Set:DTK; Champion of Arashin|Set:DTK; Segmented Krotiq|Counters:P1P1=1|Set:DTK; Segmented Krotiq|Counters:P1P1=1|Tapped|Set:DTK
+aibattlefield=Pacifism|Set:DTK|AttachedTo:420|Set:DTK; Forest|Set:DTK|Tapped; Forest|Set:DTK|Tapped; Forest|Set:DTK|Tapped; Forest|Set:DTK|Tapped; Plains|Set:DTK|Tapped; Plains|Set:DTK|Tapped; Blossoming Sands|Tapped|Set:FRF; Glade Watcher|Set:DTK; Champion of Arashin|Set:DTK; Segmented Krotiq|Counters:P1P1=1|Set:DTK; Segmented Krotiq|Counters:P1P1=1|Tapped|Set:DTK

forge-gui/res/puzzle/PC_042815.pzl

@@ -15,7 +15,7 @@ humanhand=Sidisi's Faithful|Set:DTK; Sudden Reclamation|Set:FRF; Trap Essence|Se
 humangraveyard=Servant of the Scale|Set:DTK; Naturalize|Set:DTK; Savage Punch|Set:KTK; Sultai Skullkeeper|Set:FRF; Bathe in Dragonfire|Set:FRF; Write into Being|Set:FRF
 humanlibrary=Windstorm|Set:KTK
 humanbattlefield=Island|Set:DTK; Island|Set:DTK; Island|Set:DTK; Mountain|Set:DTK; Mountain|Set:DTK; Forest|Set:DTK; Forest|Set:DTK; Rugged Highlands|Set:FRF; Whisperer of the Wilds|Set:FRF; Heir of the Wilds|Set:KTK; Roar of Challenge|Set:KTK|FaceDown; Den Protector|Set:DTK|FaceDown; Herdchaser Dragon|Set:DTK; Briber's Purse|Set:KTK
-aibattlefield=t:Dragon,P:4,T:4,Cost:no cost,Color:R,Types:Creature-Dragon,Keywords:Flying,Image:r_4_4_dragon_dtk|Id:420; t:Dragon,P:4,T:4,Cost:no cost,Color:R,Types:Creature-Dragon,Keywords:Flying,Image:r_4_4_dragon_dtk|Id:421; t:Dragon,P:4,T:4,Cost:no cost,Color:R,Types:Creature-Dragon,Keywords:Flying,Image:r_4_4_dragon_dtk|Id:422; t:Dragon,P:4,T:4,Cost:no cost,Color:R,Types:Creature-Dragon,Keywords:Flying,Image:r_4_4_dragon_dtk|Id:423; Sultai Runemark|Attaching:424|Set:FRF; Herdchaser Dragon|Set:DTK|Counters:P1P1=1|Id:424; Plains|Set:DTK|Tapped; Island|Set:DTK|Tapped; Swamp|Set:DTK|Tapped; Mountain|Set:DTK|Tapped; Mountain|Set:DTK|Tapped; Forest|Set:DTK|Tapped; Forest|Set:DTK|Tapped; Scoured Barrens|Set:KTK|Tapped; Swiftwater Cliffs|Set:FRF|Tapped; Thornwood Falls|Set:FRF|Tapped
+aibattlefield=t:Dragon,P:4,T:4,Cost:no cost,Color:R,Types:Creature-Dragon,Keywords:Flying,Image:r_4_4_dragon_dtk|Id:420; t:Dragon,P:4,T:4,Cost:no cost,Color:R,Types:Creature-Dragon,Keywords:Flying,Image:r_4_4_dragon_dtk|Id:421; t:Dragon,P:4,T:4,Cost:no cost,Color:R,Types:Creature-Dragon,Keywords:Flying,Image:r_4_4_dragon_dtk|Id:422; t:Dragon,P:4,T:4,Cost:no cost,Color:R,Types:Creature-Dragon,Keywords:Flying,Image:r_4_4_dragon_dtk|Id:423; Sultai Runemark|AttachedTo:424|Set:FRF; Herdchaser Dragon|Set:DTK|Counters:P1P1=1|Id:424; Plains|Set:DTK|Tapped; Island|Set:DTK|Tapped; Swamp|Set:DTK|Tapped; Mountain|Set:DTK|Tapped; Mountain|Set:DTK|Tapped; Forest|Set:DTK|Tapped; Forest|Set:DTK|Tapped; Scoured Barrens|Set:KTK|Tapped; Swiftwater Cliffs|Set:FRF|Tapped; Thornwood Falls|Set:FRF|Tapped
 aihand=
 aigraveyard=
 ailibrary=

forge-gui/res/puzzle/PC_051215.pzl

@@ -14,6 +14,6 @@ humanhand=Provoke|Set:TPR; Needle Storm|Set:TPR; Tranquility|Set:TPR; Legerdemai
 humanbattlefield=Forest|Set:TPR; Forest|Set:TPR; Forest|Set:TPR; Forest|Set:TPR; Forest|Set:TPR; Forest|Set:TPR; Island|Set:TPR; Island|Set:TPR; Island|Set:TPR; Island|Set:TPR; Island|Set:TPR; Wind Dancer|Set:TPR; Rootwater Hunter|Set:TPR; Telethopter|Set:TPR; Thalakos Drifters|Set:TPR
 humangraveyard=
 humanlibrary=Island|Set:TPR; Forest|Set:TPR
-aibattlefield=Plains|Tapped|Set:TPR; Plains|Tapped|Set:TPR; Plains|Tapped|Set:TPR; Plains|Tapped|Set:TPR; Island|Tapped|Set:TPR; Island|Tapped|Set:TPR; Island|Tapped|Set:TPR; Island|Tapped|Set:TPR; Armored Pegasus|Set:TPR; Soltari Priest|Set:TPR; Horned Turtle|Set:TPR; Thalakos Scout|Set:TPR; Wayward Soul|Id:420|Tapped|Set:TPR; Sea Monster|Tapped|Set:TPR; Conviction|Attaching:420|Set:TPR; 
+aibattlefield=Plains|Tapped|Set:TPR; Plains|Tapped|Set:TPR; Plains|Tapped|Set:TPR; Plains|Tapped|Set:TPR; Island|Tapped|Set:TPR; Island|Tapped|Set:TPR; Island|Tapped|Set:TPR; Island|Tapped|Set:TPR; Armored Pegasus|Set:TPR; Soltari Priest|Set:TPR; Horned Turtle|Set:TPR; Thalakos Scout|Set:TPR; Wayward Soul|Id:420|Tapped|Set:TPR; Sea Monster|Tapped|Set:TPR; Conviction|AttachedTo:420|Set:TPR;
 aigraveyard=
 ailibrary=Shadow Rift|Set:TPR; Repentance|Set:TPR

forge-gui/res/puzzle/PC_051915.pzl

@@ -14,6 +14,6 @@ humanhand=Flayer Husk; Darksteel Axe; Nameless Inversion
 humanbattlefield=Plains|Set:CHK; Plains|Set:CHK; Plains|Set:CHK; Plains|Set:CHK; Swamp|Set:CHK; Swamp|Set:CHK; Swamp|Set:CHK; Kor Duelist; Scavenger Drake; Moonlit Strider; Copper Carapace
 humangraveyard=Thief of Hope
 humanlibrary=
-aibattlefield=Mountain|Set:ZEN|Tapped; Mountain|Set:ZEN|Tapped; Mountain|Set:ZEN|Tapped; Mountain|Set:ZEN|Tapped; Forest|Set:ZEN|Tapped; Forest|Set:ZEN|Tapped; Forest|Set:ZEN|Tapped; Forest|Set:ZEN|Tapped; Bloodshot Trainee; Kozilek's Predator|Id:420; Kitesail|Attaching:420; Gorehorn Minotaurs|Counters:P1P1=2; Kavu Primarch|Counters:P1P1=4|Tapped
+aibattlefield=Mountain|Set:ZEN|Tapped; Mountain|Set:ZEN|Tapped; Mountain|Set:ZEN|Tapped; Mountain|Set:ZEN|Tapped; Forest|Set:ZEN|Tapped; Forest|Set:ZEN|Tapped; Forest|Set:ZEN|Tapped; Forest|Set:ZEN|Tapped; Bloodshot Trainee; Kozilek's Predator|Id:420; Kitesail|AttachedTo:420; Gorehorn Minotaurs|Counters:P1P1=2; Kavu Primarch|Counters:P1P1=4|Tapped
 aigraveyard=
 ailibrary=

forge-gui/res/puzzle/PC_052615.pzl

@@ -11,7 +11,7 @@ ActivePhase=Main2
 HumanLife=1
 AILife=5
 humanhand=Burst of Energy; Last Breath; Victimize; Spinning Darkness
-humanbattlefield=Plains|Set:ZEN; Plains|Set:ZEN; Plains|Set:ZEN; Plains|Set:ZEN|Tapped; Swamp|Set:ZEN; Swamp|Set:ZEN|Tapped; Sengir Bats|Id:421|Damage:2; Necromancer's Magemark|Attaching:421; Mosquito Guard|Id:422|Damage:2; Krovikan Fetish|Attaching:422; Kithkin Spellduster|Damage:2; Archdemon of Greed|Tapped|Transformed|Damage:2; Soul Net; Aeolipile
+humanbattlefield=Plains|Set:ZEN; Plains|Set:ZEN; Plains|Set:ZEN; Plains|Set:ZEN|Tapped; Swamp|Set:ZEN; Swamp|Set:ZEN|Tapped; Sengir Bats|Id:421|Damage:2; Necromancer's Magemark|AttachedTo:421; Mosquito Guard|Id:422|Damage:2; Krovikan Fetish|AttachedTo:422; Kithkin Spellduster|Damage:2; Archdemon of Greed|Tapped|Transformed|Damage:2; Soul Net; Aeolipile
 humangraveyard=Venerable Monk; Flickering Spirit
 humanlibrary=Soul Net
 aihand=Evincar's Justice

forge-gui/res/puzzle/PC_060215.pzl

@@ -14,6 +14,6 @@ humanhand=Blades of Velis Vel|Set:MM2; Smash to Smithereens|Set:MM2; Thrive|Set:
 humanbattlefield=Island|Set:M15; Island|Set:M15; Mountain|Set:M15; Mountain|Set:M15; Mountain|Set:M15; Forest|Set:M15; Forest|Set:M15; Forest|Set:M15; Forest|Set:M15; Noble Hierarch|Set:MM2; Thrummingbird|Set:MM2; Smokebraider|Set:MM2; Soulbright Flamekin|Set:MM2; Vigean Graftmage|Set:MM2|Counters:P1P1=2; Bloodshot Trainee|Set:MM2
 humangraveyard=
 humanlibrary=
-aibattlefield=Mountain|Set:M15|Tapped; Mountain|Set:M15|Tapped; Mountain|Set:M15|Tapped; Plains|Set:M15|Tapped; Plains|Set:M15|Tapped; Plains|Set:M15|Tapped; Plains|Set:M15|Tapped; Boros Garrison|Set:MM2|Tapped; Goblin Fireslinger|Set:MM2; Skyhunter Skirmisher|Set|MM2|Tapped|Id:420; Goblin War Paint|Set:MM2|Attaching:420; Taj-Nar Swordsmith|Set:MM2|Id:421; Sickleslicer|Set:MM2|Attaching:421; Conclave Phalanx|Set:MM2; Iona, Shield of Emeria|Set:MM2|ChosenColor:red
+aibattlefield=Mountain|Set:M15|Tapped; Mountain|Set:M15|Tapped; Mountain|Set:M15|Tapped; Plains|Set:M15|Tapped; Plains|Set:M15|Tapped; Plains|Set:M15|Tapped; Plains|Set:M15|Tapped; Boros Garrison|Set:MM2|Tapped; Goblin Fireslinger|Set:MM2; Skyhunter Skirmisher|Set|MM2|Tapped|Id:420; Goblin War Paint|Set:MM2|AttachedTo:420; Taj-Nar Swordsmith|Set:MM2|Id:421; Sickleslicer|Set:MM2|AttachedTo:421; Conclave Phalanx|Set:MM2; Iona, Shield of Emeria|Set:MM2|ChosenColor:red
 aigraveyard=
 ailibrary=

forge-gui/res/puzzle/PC_060915.pzl

@@ -11,7 +11,7 @@ ActivePhase=Main1
 HumanLife=9
 AILife=6
 humanhand=Mountain|Set:M15; Bone Splinters|Set:MM2; Brute Force|Set:MM2; Stormblood Berserker|Set:MM2; Goblin War Paint|Set:MM2; Chimeric Mass|Set:MM2
-humanbattlefield=Swamp|Set:M15; Swamp|Set:M15; Mountain|Set:M15; Mountain|Set:M15|Tapped; Rakdos Carnarium; Mortarpod|Attaching:420|Set:MM2; t:Germ,P:0,T:0,Cost:no cost,Color:B,Types:Creature-Germ,Keywords:,Image:b_0_0_germ|Id:420; Sickle Ripper|Set:MM2; Necroskitter|Set:MM2
+humanbattlefield=Swamp|Set:M15; Swamp|Set:M15; Mountain|Set:M15; Mountain|Set:M15|Tapped; Rakdos Carnarium; Mortarpod|AttachedTo:420|Set:MM2; t:Germ,P:0,T:0,Cost:no cost,Color:B,Types:Creature-Germ,Keywords:,Image:b_0_0_germ|Id:420; Sickle Ripper|Set:MM2; Necroskitter|Set:MM2
 
 humangraveyard=
 humanlibrary=

forge-gui/res/puzzle/PC_062315.pzl

@@ -11,7 +11,7 @@ ActivePhase=Main1
 HumanLife=2
 AILife=6
 humanhand=Dismal Backwater|Set:FRF; Evolving Wilds|Set:DTK; Despise|Set:KTK; Grave Strength|Set:FRF; Rite of Undoing|Set:FRF; Set Adrift|Set:KTK
-humanbattlefield=Island|Set:DTK; Island|Set:DTK; Island|Set:DTK; Island|Set:DTK; Swamp|Set:DTK; Swamp|Set:DTK; Swamp|Set:DTK; Swamp|Set:DTK; Qarsi Sadist|Set:DTK; Heart-Piercer Bow|Set:KTK; Illusory Gains|Set:DTK|Attaching:420 
+humanbattlefield=Island|Set:DTK; Island|Set:DTK; Island|Set:DTK; Island|Set:DTK; Swamp|Set:DTK; Swamp|Set:DTK; Swamp|Set:DTK; Swamp|Set:DTK; Qarsi Sadist|Set:DTK; Heart-Piercer Bow|Set:KTK; Illusory Gains|Set:DTK|AttachedTo:420
 humangraveyard=Douse in Gloom|Set:FRF; Treasure Cruise|Set:KTK
 humanlibrary=
 aihand=Sprinting Warbrute|Set:DTK

forge-gui/res/puzzle/PC_063015.pzl

@@ -14,7 +14,7 @@ humanhand=Emerald Charm; Hornet Sting; Mercy Killing; Pouncing Wurm; Argothian W
 humanbattlefield=Forest|Set:ZEN; Forest|Set:ZEN; Forest|Set:ZEN; Forest|Set:ZEN; Forest|Set:ZEN; Mistveil Plains; Sunpetal Grove; Pelakka Wurm|Id:420; Novablast Wurm; Symbiotic Wurm; Cream of the Crop; Urza's Incubator|ChosenType:Wurm; Jar of Eyeballs; Heartbeat of Spring
 humangraveyard=Ravaging Riftwurm
 humanlibrary=Forest|Set:ZEN;Forest|Set:ZEN;Forest|Set:ZEN;Forest|Set:ZEN;Forest|Set:ZEN;Forest|Set:ZEN;Forest|Set:ZEN;Forest|Set:ZEN;Forest|Set:ZEN;Forest|Set:ZEN;Forest|Set:ZEN;Forest|Set:ZEN;Forest|Set:ZEN;Forest|Set:ZEN;Forest|Set:ZEN;Forest|Set:ZEN;Forest|Set:ZEN;Forest|Set:ZEN;Forest|Set:ZEN;Forest|Set:ZEN;Forest|Set:ZEN;Forest|Set:ZEN;Forest|Set:ZEN;Forest|Set:ZEN;Forest|Set:ZEN;Forest|Set:ZEN;Forest|Set:ZEN;Forest|Set:ZEN;Forest|Set:ZEN;Forest|Set:ZEN;Forest|Set:ZEN;Forest|Set:ZEN;Forest|Set:ZEN;Forest|Set:ZEN;Forest|Set:ZEN;Forest|Set:ZEN;Forest|Set:ZEN;Forest|Set:ZEN;Forest|Set:ZEN;Forest|Set:ZEN
-aibattlefield=Plains|Set:ZEN|Tapped; Plains|Set:ZEN|Tapped; Plains|Set:ZEN|Tapped; Plains|Set:ZEN|Tapped; Swamp|Set:ZEN; Swamp|Set:ZEN|Tapped; Swamp|Set:ZEN|Tapped; Swamp|Set:ZEN|Tapped; Pillory of the Sleepless|Attaching:420; t:Soldier,P:1,T:1,Cost:no cost,Color:W,Types:Creature-Soldier,Keywords:,Image:w_1_1_soldier_m13; t:Soldier,P:1,T:1,Cost:no cost,Color:W,Types:Creature-Soldier,Keywords:,Image:w_1_1_soldier_m13; Pentarch Ward|ChosenColor:white|Attaching:422; Peacekeeper|Id:422; Seizan, Perverter of Truth; Mobilization; Baneful Omen
+aibattlefield=Plains|Set:ZEN|Tapped; Plains|Set:ZEN|Tapped; Plains|Set:ZEN|Tapped; Plains|Set:ZEN|Tapped; Swamp|Set:ZEN; Swamp|Set:ZEN|Tapped; Swamp|Set:ZEN|Tapped; Swamp|Set:ZEN|Tapped; Pillory of the Sleepless|AttachedTo:420; t:Soldier,P:1,T:1,Cost:no cost,Color:W,Types:Creature-Soldier,Keywords:,Image:w_1_1_soldier_m13; t:Soldier,P:1,T:1,Cost:no cost,Color:W,Types:Creature-Soldier,Keywords:,Image:w_1_1_soldier_m13; Pentarch Ward|ChosenColor:white|AttachedTo:422; Peacekeeper|Id:422; Seizan, Perverter of Truth; Mobilization; Baneful Omen
 aihand=
 aigraveyard=
 ailibrary=Debt to the Deathless

forge-gui/res/puzzle/PC_070715.pzl

@@ -14,7 +14,7 @@ humanhand=Kitesail|Set:MM2; Wings of Velis Vel|Set:MM2; Nameless Inversion|Set:M
 humanbattlefield=Island|Set:M15; Island|Set:M15; Swamp|Set:M15; Swamp|Set:M15; Swamp|Set:M15; Darksteel Citadel|Set:MM2; Plagued Rusalka|Set:MM2; Alloy Myr|Set:MM2; Cathodion|Set:MM2; Thief of Hope|Set:MM2; Rusted Relic|Set:MM2|Id:420
 humangraveyard=
 humanlibrary=
-aibattlefield=Forest|Set:M15; Forest|Set:M15|Tapped; Forest|Set:M15|Tapped; Forest|Set:M15|Tapped; Forest|Set:M15|Tapped; Plains|Set:M15|Tapped; Plains|Set:M15|Tapped; Plains|Set:M15|Tapped; Plains|Set:M15|Tapped; Arrest|Set:MM2|Attaching:420; t:Eldrazi Spawn,P:0,T:1,Cost:no cost,Types:Creature-Eldrazi-Spawn,Keywords:,Image:c_0_1_eldrazi_spawn3; Aquastrand Spider|Set:MM2|Counters:P1P1=1; Algae Gharial|Set:MM2; Precursor Golem|Set:MM2|Counters:P1P1=1; Flayer Husk|Set:MM2|Attaching:422; t:Golem,P:3,T:3,Cost:no cost,Types:Artifact-Creature-Golem,Keywords:,Image:c_3_3_golem|Id:422; Copper Carapace|Set:MM2|Attaching:424; Battlegrace Angel|Set:MM2|Id:424|Tapped
+aibattlefield=Forest|Set:M15; Forest|Set:M15|Tapped; Forest|Set:M15|Tapped; Forest|Set:M15|Tapped; Forest|Set:M15|Tapped; Plains|Set:M15|Tapped; Plains|Set:M15|Tapped; Plains|Set:M15|Tapped; Plains|Set:M15|Tapped; Arrest|Set:MM2|AttachedTo:420; t:Eldrazi Spawn,P:0,T:1,Cost:no cost,Types:Creature-Eldrazi-Spawn,Keywords:,Image:c_0_1_eldrazi_spawn3; Aquastrand Spider|Set:MM2|Counters:P1P1=1; Algae Gharial|Set:MM2; Precursor Golem|Set:MM2|Counters:P1P1=1; Flayer Husk|Set:MM2|AttachedTo:422; t:Golem,P:3,T:3,Cost:no cost,Types:Artifact-Creature-Golem,Keywords:,Image:c_3_3_golem|Id:422; Copper Carapace|Set:MM2|AttachedTo:424; Battlegrace Angel|Set:MM2|Id:424|Tapped
 aihand=
 aigraveyard=
 ailibrary=

forge-gui/res/puzzle/PC_071415.pzl

@@ -13,7 +13,7 @@ AILife=13
 humanhand=Might of the Masses|Set:ORI; Reclaim|Set:ORI; Subterranean Scout|Set:ORI
 humangraveyard=Timberpack Wolf|Set:ORI; Titanic Growth|Set:ORI; Act of Treason|Set:ORI; Chandra's Fury|Set:ORI
 humanlibrary=
-humanbattlefield=Mountain|Set:ORI; Mountain|Set:ORI; Mountain|Set:ORI; Forest|Set:ORI; Forest|Set:ORI; Forest|Set:ORI; Bellows Lizard|Set:ORI; Valeron Wardens|Set:ORI; Akroan Sergeant|Set:ORI; Call of the Full Moon|Set:ORI|Attaching:420; Llanowar Empath|Set:ORI|Id:420
+humanbattlefield=Mountain|Set:ORI; Mountain|Set:ORI; Mountain|Set:ORI; Forest|Set:ORI; Forest|Set:ORI; Forest|Set:ORI; Bellows Lizard|Set:ORI; Valeron Wardens|Set:ORI; Akroan Sergeant|Set:ORI; Call of the Full Moon|Set:ORI|AttachedTo:420; Llanowar Empath|Set:ORI|Id:420
 aibattlefield=Plains|Set:ORI; Plains|Set:ORI; Plains|Set:ORI|Tapped; Island|Set:ORI; Island|Set:ORI; Island|Set:ORI|Tapped; Island|Set:ORI|Tapped; Anointer of Champions|Set:ORI|Tapped; Maritime Guard|Set:ORI; Ampryn Tactician|Set:ORI; Ringwarden Owl|Set:ORI|Tapped; Heavy Infantry|Set:ORI
 aihand=
 aigraveyard=

forge-gui/res/puzzle/PC_072115.pzl

@@ -13,8 +13,8 @@ AILife=9
 humanhand=Touch of Moonglove|Set:ORI; Celestial Flare|Set:ORI
 humangraveyard=Fetid Imp|Set:ORI; Fleshbag Marauder|Set:ORI; Eyeblight Assassin|Set:ORI; Blood-Cursed Knight|Set:ORI
 humanlibrary=Plains|Set:ORI; 
-humanbattlefield=Plains|Set:ORI; Plains|Set:ORI; Plains|Set:ORI|Tapped; Plains|Set:ORI|Tapped; Swamp|Set:ORI; Swamp|Set:ORI|Tapped; Swamp|Set:ORI|Tapped; Swamp|Set:ORI|Tapped; Anointer of Champions|Set:ORI; Topan Freeblade|Set:ORI|Counters:P1P1=1|Renowned; Guardian Automaton|Set:ORI; Undead Servant|Set:ORI; Murder Investigation|Set:ORI|Attaching:421; Catacomb Slug|Set:ORI|Id:421; Revenant|Set:ORI; Valor in Akros|Set:ORI
+humanbattlefield=Plains|Set:ORI; Plains|Set:ORI; Plains|Set:ORI|Tapped; Plains|Set:ORI|Tapped; Swamp|Set:ORI; Swamp|Set:ORI|Tapped; Swamp|Set:ORI|Tapped; Swamp|Set:ORI|Tapped; Anointer of Champions|Set:ORI; Topan Freeblade|Set:ORI|Counters:P1P1=1|Renowned; Guardian Automaton|Set:ORI; Undead Servant|Set:ORI; Murder Investigation|Set:ORI|AttachedTo:421; Catacomb Slug|Set:ORI|Id:421; Revenant|Set:ORI; Valor in Akros|Set:ORI
-aibattlefield=Forest|Set:ORI; Forest|Set:ORI|Tapped; Forest|Set:ORI|Tapped; Forest|Set:ORI|Tapped; Plains|Set:ORI; Plains|Set:ORI|Tapped; Plains|Set:ORI|Tapped; Plains|Set:ORI|Tapped; Consul's Lieutenant|Set:ORI|Attacking|Tapped; Knightly Valor|Set:ORI|Attaching:420; Charging Griffin|Set:ORI|Id:420|Attacking; t:Knight,P:2,T:2,Cost:no cost,Color:W,Types:Creature-Knight,Keywords:Vigilance,Image:w_2_2_knight_rtr|Attacking; Rhox Maulers|Set:ORI|Counters:P1P1=2|Renowned|Attacking|Tapped; Skysnare Spider|Set:ORI|Attacking
+aibattlefield=Forest|Set:ORI; Forest|Set:ORI|Tapped; Forest|Set:ORI|Tapped; Forest|Set:ORI|Tapped; Plains|Set:ORI; Plains|Set:ORI|Tapped; Plains|Set:ORI|Tapped; Plains|Set:ORI|Tapped; Consul's Lieutenant|Set:ORI|Attacking|Tapped; Knightly Valor|Set:ORI|AttachedTo:420; Charging Griffin|Set:ORI|Id:420|Attacking; t:Knight,P:2,T:2,Cost:no cost,Color:W,Types:Creature-Knight,Keywords:Vigilance,Image:w_2_2_knight_rtr|Attacking; Rhox Maulers|Set:ORI|Counters:P1P1=2|Renowned|Attacking|Tapped; Skysnare Spider|Set:ORI|Attacking
 aiprecast=Joraga Invocation
 aihand=
 aigraveyard=Joraga Invocation|Set:ORI

forge-gui/res/puzzle/PC_072815.pzl

@@ -13,7 +13,7 @@ AILife=12
 humanhand=Island|Set:ORI; Rogue's Passage|Set:ORI; Bonded Construct|Set:ORI; Disperse|Set:ORI; Calculated Dismissal|Set:ORI; Tormented Thoughts|Set:ORI; Rabid Bloodsucker|Set:ORI; Necromantic Summons|Set:ORI
 humangraveyard=
 humanlibrary=
-humanbattlefield=Mage-Ring Network|Counters:STORAGE=4; Island|Set:ORI; Island|Set:ORI; Island|Set:ORI; Island|Set:ORI; Swamp|Set:ORI; Swamp|Set:ORI; Swamp|Set:ORI; Claustrophobia|Set:ORI|Attaching:420; Nantuko Husk|Set:ORI|Tapped|Id:420; Whirler Rogue|Set:ORI; Willbreaker|Set:ORI; Deep-Sea Terror|Set:ORI; Alchemist's Vial|Set:ORI; t:Thopter,P:1,T:1,Cost:no cost,Types:Artifact-Creature-Thopter,Keywords:Flying,Image:c_1_1_thopter_ori
+humanbattlefield=Mage-Ring Network|Counters:STORAGE=4; Island|Set:ORI; Island|Set:ORI; Island|Set:ORI; Island|Set:ORI; Swamp|Set:ORI; Swamp|Set:ORI; Swamp|Set:ORI; Claustrophobia|Set:ORI|AttachedTo:420; Nantuko Husk|Set:ORI|Tapped|Id:420; Whirler Rogue|Set:ORI; Willbreaker|Set:ORI; Deep-Sea Terror|Set:ORI; Alchemist's Vial|Set:ORI; t:Thopter,P:1,T:1,Cost:no cost,Types:Artifact-Creature-Thopter,Keywords:Flying,Image:c_1_1_thopter_ori
 aibattlefield=Island|Set:ORI|Tapped; Island|Set:ORI|Tapped; Island|Set:ORI|Tapped; Island|Set:ORI|Tapped; Mountain|Set:ORI|Tapped; Mountain|Set:ORI|Tapped; Mountain|Set:ORI|Tapped; Mountain|Set:ORI|Tapped; Mountain|Set:ORI|Tapped; Subterranean Scout|Set:ORI; Watercourser|Set:ORI; Thopter Engineer|Set:ORI; Guardian Automaton|Set:ORI; Reclusive Artificer|Set:ORI; Gold-Forged Sentinel|Set:ORI|Tapped
 aihand=Island; Island; Island; Island; Island; Island; Island
 aigraveyard=

forge-gui/res/puzzle/PC_081115.pzl

@@ -14,7 +14,7 @@ humanhand=Noxious Revival; Pit Fight; Briarhorn
 humangraveyard=
 humanlibrary=Wayfarer's Bauble 
 humanbattlefield=Mountain|Set:ORI; Mountain|Set:ORI; Mountain|Set:ORI; Mountain|Set:ORI; Forest|Set:ORI; Forest|Set:ORI|Tapped; Raging Ravine; Yavimaya Hollow; Sunflare Shaman; Generator Servant; Grinning Ignus; Flame-Kin War Scout; Flame Elemental; Cytoplast Root-Kin|Counters:P1P1=4; Hollowhenge Scavenger
-aibattlefield=Plains|Set:ORI; Plains|Set:ORI; Plains|Set:ORI; Plains|Set:ORI; Island|Set:ORI; Island|Set:ORI; Island|Set:ORI; Wall of Glare; Wall of Denial; Moat; Indentured Djinn|Tapped; Holy Mantle|Attaching:420; Angel of Finality|Tapped|Id:420
+aibattlefield=Plains|Set:ORI; Plains|Set:ORI; Plains|Set:ORI; Plains|Set:ORI; Island|Set:ORI; Island|Set:ORI; Island|Set:ORI; Wall of Glare; Wall of Denial; Moat; Indentured Djinn|Tapped; Holy Mantle|AttachedTo:420; Angel of Finality|Tapped|Id:420
 aihand=
 aigraveyard=
 ailibrary=

forge-gui/res/puzzle/PC_081815.pzl

@@ -13,8 +13,8 @@ AILife=5
 humanhand=Stratus Walk|Set:ORI; Fiery Conclusion|Set:ORI; Helm of the Gods|Set:ORI
 humangraveyard=
 humanlibrary=Act of Treason|Set:ORI; Infectious Bloodlust|Set:ORI
-humanbattlefield=Island|Set:ORI; Island|Set:ORI; Island|Set:ORI; Island|Set:ORI; Mountain|Set:ORI; Mountain|Set:ORI; Mountain|Set:ORI; Mountain|Set:ORI; Infectious Bloodlust|Set:ORI|Attaching:420; Aspiring Aeronaut|Set:ORI|Id:420; Reclusive Artificer|Set:ORI; Ghirapur Aether Grid|Set:ORI; Jayemdae Tome|Set:ORI
+humanbattlefield=Island|Set:ORI; Island|Set:ORI; Island|Set:ORI; Island|Set:ORI; Mountain|Set:ORI; Mountain|Set:ORI; Mountain|Set:ORI; Mountain|Set:ORI; Infectious Bloodlust|Set:ORI|AttachedTo:420; Aspiring Aeronaut|Set:ORI|Id:420; Reclusive Artificer|Set:ORI; Ghirapur Aether Grid|Set:ORI; Jayemdae Tome|Set:ORI
-aibattlefield=Swamp|Set:ORI|Tapped; Swamp|Set:ORI|Tapped; Swamp|Set:ORI|Tapped; Swamp|Set:ORI|Tapped; Swamp|Set:ORI|Tapped; Forest|Set:ORI|Tapped; Forest|Set:ORI|Tapped; Forest|Set:ORI|Tapped; Forest|Set:ORI|Tapped; Forest|Set:ORI|Tapped; Forest|Set:ORI|Tapped; Forest|Set:ORI|Tapped; Mantle of Webs|Set:ORI|Attaching:421; Thornbow Archer|Set:ORI|Id:421; Dwynen's Elite|Set:ORI; Scrapskin Drake|Set:ORI|Counters:P1P1=2; Deadbridge Shaman|Set:ORI; Hitchclaw Recluse|Set:ORI
+aibattlefield=Swamp|Set:ORI|Tapped; Swamp|Set:ORI|Tapped; Swamp|Set:ORI|Tapped; Swamp|Set:ORI|Tapped; Swamp|Set:ORI|Tapped; Forest|Set:ORI|Tapped; Forest|Set:ORI|Tapped; Forest|Set:ORI|Tapped; Forest|Set:ORI|Tapped; Forest|Set:ORI|Tapped; Forest|Set:ORI|Tapped; Forest|Set:ORI|Tapped; Mantle of Webs|Set:ORI|AttachedTo:421; Thornbow Archer|Set:ORI|Id:421; Dwynen's Elite|Set:ORI; Scrapskin Drake|Set:ORI|Counters:P1P1=2; Deadbridge Shaman|Set:ORI; Hitchclaw Recluse|Set:ORI
 aihand=
 aigraveyard=
 ailibrary=

forge-gui/res/puzzle/PC_082515.pzl

@@ -13,7 +13,7 @@ AILife=8
 humanhand=Fling; To Arms!; Warleader's Helix
 humangraveyard=
 humanlibrary=
-humanbattlefield=Mountain|Set:ORI; Mountain|Set:ORI; Mountain|Set:ORI; Mountain|Set:ORI; Plains|Set:ORI; Plains|Set:ORI; Plains|Set:ORI; Plains|Set:ORI; Plains|Set:ORI; Haunted Angel|Tapped; Serra Advocate; Avenging Angel|Tapped;  Basandra, Battle Seraph|Tapped; Pledge of Loyalty|Attaching:420; Twilight Shepherd|Id:420; Akroma, Angel of Fury|Tapped; Mass Hysteria
+humanbattlefield=Mountain|Set:ORI; Mountain|Set:ORI; Mountain|Set:ORI; Mountain|Set:ORI; Plains|Set:ORI; Plains|Set:ORI; Plains|Set:ORI; Plains|Set:ORI; Plains|Set:ORI; Haunted Angel|Tapped; Serra Advocate; Avenging Angel|Tapped;  Basandra, Battle Seraph|Tapped; Pledge of Loyalty|AttachedTo:420; Twilight Shepherd|Id:420; Akroma, Angel of Fury|Tapped; Mass Hysteria
 aibattlefield=Plains|Set:ORI; Plains|Set:ORI|Tapped; Plains|Set:ORI|Tapped; Plains|Set:ORI|Tapped; Island|Set:ORI; Island|Set:ORI|Tapped; Island|Set:ORI|Tapped; Island|Set:ORI|Tapped; Sejiri Refuge; Doorkeeper|Tapped; Guard Gomazoa; Guard Gomazoa; Hover Barrier; Wall of Denial; Sunweb; Meekstone; Temple Bell|Tapped; Leyline of Sanctity
 aihand=
 aigraveyard=

forge-gui/res/puzzle/PC_090115.pzl

@@ -13,8 +13,8 @@ AILife=8
 humanhand=Enshrouding Mist|Set:ORI; Touch of Moonglove|Set:ORI; Grasp of the Hieromancer|Set:ORI; Auramancer|Set:ORI
 humangraveyard=
 humanlibrary=Evolving Wilds|Set:ORI; Evolving Wilds|Set:ORI; Evolving Wilds|Set:ORI; Evolving Wilds|Set:ORI; Evolving Wilds|Set:ORI; Evolving Wilds|Set:ORI
-humanbattlefield=Plains|Set:ORI; Plains|Set:ORI; Plains|Set:ORI; Plains|Set:ORI; Plains|Set:ORI; Plains|Set:ORI; Swamp|Set:ORI; Swamp|Set:ORI; Swamp|Set:ORI; Swamp|Set:ORI; Swamp|Set:ORI; Bonded Construct|Set:ORI; Fleshbag Marauder|Set:ORI; Knight of the Pilgrim's Road|Set:ORI; Undead Servant|Set:ORI; Grasp of the Hieromancer|Set:ORI|Attaching:420; Blightcaster|Set:ORI|Tapped|Id:420; Kothophed, Soul Hoarder|Set:ORI; Demonic Pact|Set:ORI; Weight of the Underworld|Set:ORI|Attaching:422
+humanbattlefield=Plains|Set:ORI; Plains|Set:ORI; Plains|Set:ORI; Plains|Set:ORI; Plains|Set:ORI; Plains|Set:ORI; Swamp|Set:ORI; Swamp|Set:ORI; Swamp|Set:ORI; Swamp|Set:ORI; Swamp|Set:ORI; Bonded Construct|Set:ORI; Fleshbag Marauder|Set:ORI; Knight of the Pilgrim's Road|Set:ORI; Undead Servant|Set:ORI; Grasp of the Hieromancer|Set:ORI|AttachedTo:420; Blightcaster|Set:ORI|Tapped|Id:420; Kothophed, Soul Hoarder|Set:ORI; Demonic Pact|Set:ORI; Weight of the Underworld|Set:ORI|AttachedTo:422
-aibattlefield=Forest|Set:ORI; Forest|Set:ORI; Forest|Set:ORI|Tapped; Forest|Set:ORI|Tapped; Forest|Set:ORI|Tapped; Island|Set:ORI; Island|Set:ORI; Island|Set:ORI|Tapped; Island|Set:ORI|Tapped; Island|Set:ORI|Tapped; Island|Set:ORI|Tapped; Tower Geist|Set:ORI; Willbreaker|Set:ORI; Woodland Bellower|Id:422; Skysnare Spider|Set:ORI; Claustrophobia|Set:ORI|Attaching:420
+aibattlefield=Forest|Set:ORI; Forest|Set:ORI; Forest|Set:ORI|Tapped; Forest|Set:ORI|Tapped; Forest|Set:ORI|Tapped; Island|Set:ORI; Island|Set:ORI; Island|Set:ORI|Tapped; Island|Set:ORI|Tapped; Island|Set:ORI|Tapped; Island|Set:ORI|Tapped; Tower Geist|Set:ORI; Willbreaker|Set:ORI; Woodland Bellower|Id:422; Skysnare Spider|Set:ORI; Claustrophobia|Set:ORI|AttachedTo:420
 aihand=Nivix Barrier|Set:ORI
 aigraveyard=
 ailibrary=Evolving Wilds|Set:ORI; Evolving Wilds|Set:ORI; Evolving Wilds|Set:ORI; Evolving Wilds|Set:ORI; Evolving Wilds|Set:ORI; Evolving Wilds|Set:ORI

forge-gui/res/puzzle/PC_090815.pzl

@@ -13,7 +13,7 @@ AILife=6
 humanhand=Blazing Torch|Set:ZEN; Wind Zendikon|Set:WWK
 humangraveyard=
 humanlibrary=
-humanbattlefield=Island|Set:ZEN; Island|Set:ZEN; Mountain|Set:ZEN; Mountain|Set:ZEN; Quicksand|Set:WWK; Goblin War Paint|Set:ZEN|Attaching:420; Cunning Sparkmage|Set:WWK|Id:420; Tideforce Elemental|Set:WWK; Shatterskull Giant|Set:ZEN; Surrakar Banisher|Set:WWK
+humanbattlefield=Island|Set:ZEN; Island|Set:ZEN; Mountain|Set:ZEN; Mountain|Set:ZEN; Quicksand|Set:WWK; Goblin War Paint|Set:ZEN|AttachedTo:420; Cunning Sparkmage|Set:WWK|Id:420; Tideforce Elemental|Set:WWK; Shatterskull Giant|Set:ZEN; Surrakar Banisher|Set:WWK
 aibattlefield=Swamp|Set:ZEN|Tapped; Swamp|Set:ZEN|Tapped; Swamp|Set:ZEN|Tapped; Swamp|Set:ZEN|Tapped; Swamp|Set:ZEN|Tapped; Swamp|Set:ZEN|Tapped; Giant Scorpion|Set:ZEN; Vampire Nighthawk|Set:ZEN; Vampire Nighthawk|Set:ZEN; Jagwasp Swarm|Set:WWK|Tapped; Crypt Ripper|Set:ZEN|Tapped
 aihand=
 aigraveyard=

forge-gui/res/puzzle/PC_092215.pzl

@@ -13,8 +13,8 @@ AILife=5
 humanhand=
 humangraveyard=
 humanlibrary=
-humanbattlefield=Swamp|Set:ZEN; Swamp|Set:ZEN; Swamp|Set:ZEN; Swamp|Set:ZEN; Mountain|Set:ZEN; Mountain|Set:ZEN; Mountain|Set:ZEN; Mountain|Set:ZEN; Coffin Queen; Silverskin Armor|Attaching:420; Krark-Clan Stoker|Id:420; Dross Scorpion; Firemaw Kavu; Liquimetal Coating
+humanbattlefield=Swamp|Set:ZEN; Swamp|Set:ZEN; Swamp|Set:ZEN; Swamp|Set:ZEN; Mountain|Set:ZEN; Mountain|Set:ZEN; Mountain|Set:ZEN; Mountain|Set:ZEN; Coffin Queen; Silverskin Armor|AttachedTo:420; Krark-Clan Stoker|Id:420; Dross Scorpion; Firemaw Kavu; Liquimetal Coating
-aibattlefield=Forest|Set:ZEN|Tapped; Forest|Set:ZEN|Tapped; Forest|Set:ZEN|Tapped; Forest|Set:ZEN|Tapped; Plains|Set:ZEN|Tapped; Plains|Set:ZEN|Tapped; Plains|Set:ZEN|Tapped; Llanowar Elves|Tapped; Beacon Hawk|Tapped; Canopy Cover|Attaching:422; Scavenging Ooze|Id:422|Counters:P1P1=5|Tapped; Blessed Orator; t:Rhino,P:4,T:4,Cost:no cost,Color:G,Types:Creature-Rhino,Keywords:Trample,Image:g_4_4_rhino_rtr; t:Rhino,P:4,T:4,Cost:no cost,Color:G,Types:Creature-Rhino,Keywords:Trample,Image:g_4_4_rhino_rtr
+aibattlefield=Forest|Set:ZEN|Tapped; Forest|Set:ZEN|Tapped; Forest|Set:ZEN|Tapped; Forest|Set:ZEN|Tapped; Plains|Set:ZEN|Tapped; Plains|Set:ZEN|Tapped; Plains|Set:ZEN|Tapped; Llanowar Elves|Tapped; Beacon Hawk|Tapped; Canopy Cover|AttachedTo:422; Scavenging Ooze|Id:422|Counters:P1P1=5|Tapped; Blessed Orator; t:Rhino,P:4,T:4,Cost:no cost,Color:G,Types:Creature-Rhino,Keywords:Trample,Image:g_4_4_rhino_rtr; t:Rhino,P:4,T:4,Cost:no cost,Color:G,Types:Creature-Rhino,Keywords:Trample,Image:g_4_4_rhino_rtr
 aihand=
 aigraveyard=
 ailibrary=

forge-gui/res/puzzle/PC_101315.pzl

@@ -14,7 +14,7 @@ humanhand=Lithomancer's Focus|Set:BFZ; Tandem Tactics|Set:BFZ; Unnatural Aggress
 humangraveyard=
 humanlibrary=
 humanbattlefield=Forest|Set:BFZ; Forest|Set:BFZ; Forest|Set:BFZ; Forest|Set:BFZ; Forest|Set:BFZ; Plains|Set:BFZ; Plains|Set:BFZ; Plains|Set:BFZ; Plains|Set:BFZ; Plains|Set:BFZ; Shrine of the Forsaken Gods|Set:BFZ; Blisterpod|Set:BFZ; Fortified Rampart|Set:BFZ; Stone Haven Medic|Set:BFZ; Snapping Gnarlid|Set:BFZ; Felidar Cub|Set:BFZ; Tajuru Warcaller|Set:BFZ; Hedron Archive|Set:BFZ
-aibattlefield=Swamp|Set:BFZ|Tapped; Swamp|Set:BFZ|Tapped; Swamp|Set:BFZ|Tapped; Swamp|Set:BFZ|Tapped; Swamp|Set:BFZ|Tapped; Swamp|Set:BFZ|Tapped; Mountain|Set:BFZ|Tapped; Mountain|Set:BFZ|Tapped; Mountain|Set:BFZ|Tapped; Mountain|Set:BFZ|Tapped; Mountain|Set:BFZ|Tapped; Mountain|Set:BFZ|Tapped; Mortuary Mire|Set:BFZ|Tapped; Hedron Blade|Set:BFZ|Attaching:420; Silent Skimmer|Set:BFZ|Tapped|Id:420; Skitterskin|Set:BFZ; Goblin War Paint|Set:BFZ|Attaching:422; Shatterskull Recruit|Set:BFZ|Id:422|Tapped; Endless One|Set:BFZ|Counters:P1P1=13; Mountain|Set:BFZ|Id:424; Retreat to Hagra|Set:BFZ
+aibattlefield=Swamp|Set:BFZ|Tapped; Swamp|Set:BFZ|Tapped; Swamp|Set:BFZ|Tapped; Swamp|Set:BFZ|Tapped; Swamp|Set:BFZ|Tapped; Swamp|Set:BFZ|Tapped; Mountain|Set:BFZ|Tapped; Mountain|Set:BFZ|Tapped; Mountain|Set:BFZ|Tapped; Mountain|Set:BFZ|Tapped; Mountain|Set:BFZ|Tapped; Mountain|Set:BFZ|Tapped; Mortuary Mire|Set:BFZ|Tapped; Hedron Blade|Set:BFZ|AttachedTo:420; Silent Skimmer|Set:BFZ|Tapped|Id:420; Skitterskin|Set:BFZ; Goblin War Paint|Set:BFZ|AttachedTo:422; Shatterskull Recruit|Set:BFZ|Id:422|Tapped; Endless One|Set:BFZ|Counters:P1P1=13; Mountain|Set:BFZ|Id:424; Retreat to Hagra|Set:BFZ
 # Precast Ondu Rising with Awaken for the AI, targeting mountain - requires KW Awaken implementation
 # with the target for Awaken set in its first subability.
 aiprecast=Ondu Rising:KW#AwakenOnly->424

forge-gui/res/puzzle/PC_102015.pzl

@@ -14,7 +14,7 @@ humanhand=Gods Willing; Mogg War Marshal; Temporal Isolation; War Flare
 humangraveyard=
 humanlibrary=
 humanbattlefield=Mountain|Set:MIR; Mountain|Set:MIR; Mountain|Set:MIR; Mountain|Set:MIR; Plains|Set:MIR; Plains|Set:MIR; Plains|Set:MIR; Plains|Set:MIR; Plains|Set:MIR; Mogg Fanatic; Sparksmith; Hissing Iguanar; Daring Skyjek
-aibattlefield=Island|Set:MIR|Tapped; Island|Set:MIR|Tapped; Island|Set:MIR|Tapped; Island|Set:MIR|Tapped; Swamp|Set:MIR|Tapped; Swamp|Set:MIR|Tapped; Swamp|Set:MIR|Tapped; Swamp|Set:MIR|Tapped; Swamp|Set:MIR|Tapped; Halimar Wavewatch|Counters:LEVEL=2; Vulshok Morningstar|Attaching:420; Dauthi Horror|Id:420|Tapped; Dauthi Slayer; Flayer Husk|Attaching:422; Yotian Soldier|Id:422; Lotus Path Djinn; Gray Merchant of Asphodel
+aibattlefield=Island|Set:MIR|Tapped; Island|Set:MIR|Tapped; Island|Set:MIR|Tapped; Island|Set:MIR|Tapped; Swamp|Set:MIR|Tapped; Swamp|Set:MIR|Tapped; Swamp|Set:MIR|Tapped; Swamp|Set:MIR|Tapped; Swamp|Set:MIR|Tapped; Halimar Wavewatch|Counters:LEVEL=2; Vulshok Morningstar|AttachedTo:420; Dauthi Horror|Id:420|Tapped; Dauthi Slayer; Flayer Husk|AttachedTo:422; Yotian Soldier|Id:422; Lotus Path Djinn; Gray Merchant of Asphodel
 aihand=
 aigraveyard=
 ailibrary=

forge-gui/res/puzzle/PC_111715.pzl

@@ -14,7 +14,7 @@ humanhand=Mutant's Prey; Remember the Fallen; Feral Contest
 humangraveyard=Conch Horn; Veteran Armorer; Zealous Inquisitor; Rustspore Ram
 humanlibrary=
 humanbattlefield=Mountain|Set:MRD; Forest|Set:MRD; Forest|Set:MRD; Forest|Set:MRD; Forest|Set:MRD; Plains|Set:MRD; Plains|Set:MRD; Plains|Set:MRD; Plains|Set:MRD; Gruul Turf; Frostling; Arcbound Hybrid|Counters:P1P1=2; Raven's Run Dragoon; Fangren Firstborn; Rakeclaw Gargantuan|Id:420; Ashnod's Transmogrant
-aibattlefield=Island|Set:MRD; Island|Set:MRD; Island|Set:MRD; Island|Set:MRD; Island|Set:MRD; Island|Set:MRD; Island|Set:MRD|Tapped; Swamp|Set:MRD|Tapped; Swamp|Set:MRD|Tapped; Swamp|Set:MRD|Tapped; Swamp|Set:MRD|Tapped; Pin to the Earth|Attaching:420; Grafted Wargear|Attaching:422; Brood of Cockroaches|Id:422; Dream Fighter; Escaped Null; Midnight Covenant|Attaching:424; Ghost Ship|Id:424|Tapped; Scion of Glaciers
+aibattlefield=Island|Set:MRD; Island|Set:MRD; Island|Set:MRD; Island|Set:MRD; Island|Set:MRD; Island|Set:MRD; Island|Set:MRD|Tapped; Swamp|Set:MRD|Tapped; Swamp|Set:MRD|Tapped; Swamp|Set:MRD|Tapped; Swamp|Set:MRD|Tapped; Pin to the Earth|AttachedTo:420; Grafted Wargear|AttachedTo:422; Brood of Cockroaches|Id:422; Dream Fighter; Escaped Null; Midnight Covenant|AttachedTo:424; Ghost Ship|Id:424|Tapped; Scion of Glaciers
 aihand=
 aigraveyard=
 ailibrary=

forge-gui/res/puzzle/PC_112415.pzl

@@ -14,7 +14,7 @@ humanhand=Sky Hussar
 humangraveyard=Sea Gate Oracle; Weathered Wayfarer; Azorius Guildmage; Wall of Omens
 humanlibrary=Plains|Set:C15; Plains|Set:C15; Plains|Set:C15; Plains|Set:C15; Plains|Set:C15; 
 humanbattlefield=Plains|Set:C15; Plains|Set:C15; Plains|Set:C15; Plains|Set:C15; Island|Set:C15; Island|Set:C15; Island|Set:C15; Island|Set:C15; Grixis Illusionist; True Believer; Kitsune Palliator; Courtly Provocateur; Headless Skaab; Djinn of Infinite Deceits; Hot Soup
-aibattlefield=Swamp|Set:C15|Tapped; Swamp|Set:C15|Tapped; Swamp|Set:C15|Tapped; Swamp|Set:C15|Tapped; Swamp|Set:C15|Tapped; Gaea's Cradle|Tapped; Quirion Ranger; Wight of Precinct Six; Plague Spitter; Tiger Claws|Attaching:420; Corpse Augur|Id:420; Thrashing Wumpus; Primeval Force|Tapped; Jungle Weaver
+aibattlefield=Swamp|Set:C15|Tapped; Swamp|Set:C15|Tapped; Swamp|Set:C15|Tapped; Swamp|Set:C15|Tapped; Swamp|Set:C15|Tapped; Gaea's Cradle|Tapped; Quirion Ranger; Wight of Precinct Six; Plague Spitter; Tiger Claws|AttachedTo:420; Corpse Augur|Id:420; Thrashing Wumpus; Primeval Force|Tapped; Jungle Weaver
 aihand=
 aigraveyard=Fleshbag Marauder; Acidic Slime
 ailibrary=Swamp|Set:C15; Swamp|Set:C15; Swamp|Set:C15; Swamp|Set:C15; Swamp|Set:C15; Swamp|Set:C15; Swamp|Set:C15; Swamp|Set:C15; Swamp|Set:C15; Swamp|Set:C15; Swamp|Set:C15; Swamp|Set:C15; 

forge-gui/res/puzzle/PC_120815.pzl

@@ -14,7 +14,7 @@ humanhand=Nameless Inversion; Gigantoplasm
 humangraveyard=Riptide Shapeshifter; Dimir Doppelganger; Chimeric Staff
 humanlibrary=
 humanbattlefield=Island|Set:USG; Island|Set:USG; Island|Set:USG; Island|Set:USG; Island|Set:USG; Island|Set:USG; Swamp|Set:USG; Swamp|Set:USG; Swamp|Set:USG; Temple of Deceit; Reflecting Pool; Mothdust Changeling; Lazav, Dimir Mastermind|ExecuteScript:LazavCopy->420; Cairn Wanderer; Sol Ring; Urza's Incubator|ChosenType:Shapeshifter
-aibattlefield=Plains|Set:USG|Tapped; Island|Set:USG|Tapped; Island|Set:USG|Tapped; Swamp|Set:USG|Tapped; Arcane Sanctum; Arcane Sanctum|Tapped; Urza's Tower|Set:8ED|Tapped; Urza's Power Plant|Set:8ED|Tapped; Urza's Power Plant|Set:8ED|Tapped; Urza's Mine|Set:8ED|Tapped; Sydri, Galvanic Genius; Sanctum Gargoyle; Shield of the Righteous|Attaching:420; Sanctum Gargoyle|Id:420; Solemn Simulacrum|Tapped; Salvage Titan|Tapped; Goblin Boom Keg; Sword of Kaldra; Spine of Ish Sah
+aibattlefield=Plains|Set:USG|Tapped; Island|Set:USG|Tapped; Island|Set:USG|Tapped; Swamp|Set:USG|Tapped; Arcane Sanctum; Arcane Sanctum|Tapped; Urza's Tower|Set:8ED|Tapped; Urza's Power Plant|Set:8ED|Tapped; Urza's Power Plant|Set:8ED|Tapped; Urza's Mine|Set:8ED|Tapped; Sydri, Galvanic Genius; Sanctum Gargoyle; Shield of the Righteous|AttachedTo:420; Sanctum Gargoyle|Id:420; Solemn Simulacrum|Tapped; Salvage Titan|Tapped; Goblin Boom Keg; Sword of Kaldra; Spine of Ish Sah
 aihand=
 aigraveyard=
 ailibrary=

forge-gui/res/puzzle/PC_121515.pzl

@@ -14,8 +14,8 @@ AILife=6
 humanhand=Vertigo; Sacred Boon; Blaze|Set:5ED
 humangraveyard=
 humanlibrary=Hematatite Talisman
-humanbattlefield=Mountain|Set:IA; Mountain|Set:IA|Tapped; Mountain|Set:IA|Tapped; Plains|Set:IA; Plains|Set:IA; Plains|Set:IA|Tapped; Snow-Covered Mountain|Set:IA; Snow-Covered Forest|Set:IA; Phyrexian War Beast; Bestial Fury|Attaching:420; Phyrexian War Beast|Tapped|Id:420; Orcish Bloodpainter; Armor of Faith|Attaching:422; Blinking Spirit|Id:422; Darien, King of Kjeldor; Hematite Talisman
+humanbattlefield=Mountain|Set:IA; Mountain|Set:IA|Tapped; Mountain|Set:IA|Tapped; Plains|Set:IA; Plains|Set:IA; Plains|Set:IA|Tapped; Snow-Covered Mountain|Set:IA; Snow-Covered Forest|Set:IA; Phyrexian War Beast; Bestial Fury|AttachedTo:420; Phyrexian War Beast|Tapped|Id:420; Orcish Bloodpainter; Armor of Faith|AttachedTo:422; Blinking Spirit|Id:422; Darien, King of Kjeldor; Hematite Talisman
-aibattlefield=Swamp|Set:IA; Swamp|Set:IA|Tapped; Swamp|Set:IA|Tapped; Forest|Set:IA; Forest|Set:IA; Forest|Set:IA|Tapped; Forest|Set:IA|Tapped; Snow-Covered Island|Set:IA; Fyndhorn Elves; Lim-Dul's Cohort; Phobian Phantasm|Attacking|Tapped; Surging Might|Attaching:424; Zombie Musher|Tapped|Attacking|Id:424; Deadly Insect|Tapped|Attacking; Surging Might|Attaching:426; Gorilla Berserkers|Tapped|Attacking|Id:426
+aibattlefield=Swamp|Set:IA; Swamp|Set:IA|Tapped; Swamp|Set:IA|Tapped; Forest|Set:IA; Forest|Set:IA; Forest|Set:IA|Tapped; Forest|Set:IA|Tapped; Snow-Covered Island|Set:IA; Fyndhorn Elves; Lim-Dul's Cohort; Phobian Phantasm|Attacking|Tapped; Surging Might|AttachedTo:424; Zombie Musher|Tapped|Attacking|Id:424; Deadly Insect|Tapped|Attacking; Surging Might|AttachedTo:426; Gorilla Berserkers|Tapped|Attacking|Id:426
 aihand=
 aigraveyard=
 ailibrary=

forge-gui/res/puzzle/PC_122915.pzl

@@ -15,7 +15,7 @@ humangraveyard=
 humanlibrary=
 humanprecast=
 humanbattlefield=Plains|Set:ZEN; Plains|Set:ZEN; Plains|Set:ZEN; Island|Set:ZEN; Island|Set:ZEN; Island|Set:ZEN; Aven Riftwatcher|Counters:TIME=1; Brago, King Eternal; Heavy Infantry|Id:422; Runed Halo|NamedCard:Lightning Bolt|NoETBTrigs; Angelic Shield; Clone|ExecuteScript:DBCopy->420|NoETBTrigs
-aibattlefield=Swamp|Tapped|Set:ZEN; Swamp|Tapped|Set:ZEN; Swamp|Tapped|Set:ZEN; Mountain|Set:ZEN; Mountain|Tapped|Set:ZEN; Mountain|Tapped|Set:ZEN; Volcanic Dragon|Id:420; Typhoid Rats; Skulking Fugitive; Vulshok Refugee; Mindslicer|Id:424; Accorder's Shield|Attaching:424; Torment|Attaching:422; 
+aibattlefield=Swamp|Tapped|Set:ZEN; Swamp|Tapped|Set:ZEN; Swamp|Tapped|Set:ZEN; Mountain|Set:ZEN; Mountain|Tapped|Set:ZEN; Mountain|Tapped|Set:ZEN; Volcanic Dragon|Id:420; Typhoid Rats; Skulking Fugitive; Vulshok Refugee; Mindslicer|Id:424; Accorder's Shield|AttachedTo:424; Torment|AttachedTo:422;
 aihand=Lightning Bolt; Guerrilla Tactics; Skullcrack; Pyrotechnics
 aigraveyard=
 ailibrary=

forge-gui/res/puzzle/PC_44.pzl

@@ -8,10 +8,10 @@ ActivePlayer=Human
 ActivePhase=Main1
 HumanLife=1
 AILife=33
-HumanPlay=Perilous Myr|Id:80; Grafted Exoskeleton|Attaching:80; Priests of Norn|Counters:M1M1=1; Mycosynth Fiend; Core Prowler|Id:6; Viridian Betrayers; Forest; Forest; Plains; Plains; Phyrexia's Core
+HumanPlay=Perilous Myr|Id:80; Grafted Exoskeleton|AttachedTo:80; Priests of Norn|Counters:M1M1=1; Mycosynth Fiend; Core Prowler|Id:6; Viridian Betrayers; Forest; Forest; Plains; Plains; Phyrexia's Core
 HumanHand=Seize the Initiative
 HumanLibrary=
 HumanGraveyard=
-AIPlay=Suture Priest|Id:83; Loxodon Wayfarer|Tapped; Mortis Dogs|Tapped; Victory's Herald|Tapped; Plains; Plains|Tapped; Plains|Tapped; Swamp; Swamp|Tapped; Swamp|Tapped; Darksteel Axe|Attaching:83; Arrest|Attaching:6
+AIPlay=Suture Priest|Id:83; Loxodon Wayfarer|Tapped; Mortis Dogs|Tapped; Victory's Herald|Tapped; Plains; Plains|Tapped; Plains|Tapped; Swamp; Swamp|Tapped; Swamp|Tapped; Darksteel Axe|AttachedTo:83; Arrest|AttachedTo:6
 AIGraveyard=
 

forge-gui/res/puzzle/PM03.pzl

@@ -10,8 +10,8 @@ ActivePhase=Main1
 HumanLife=7
 AILife=5
 HumanHand=Gut Shot; Karn Liberated; Noxious Revival; Phyrexian Metamorph
-HumanPlay=Shrine of Boundless Growth|Counters:CHARGE=7|Id:5;Viridian Harvest|Attaching:5;Mortis Dogs|Id:7;Strider Harness|Attaching:7;Blind Zealot;Plains;Forest;Swamp;Swamp
+HumanPlay=Shrine of Boundless Growth|Counters:CHARGE=7|Id:5;Viridian Harvest|AttachedTo:5;Mortis Dogs|Id:7;Strider Harness|AttachedTo:7;Blind Zealot;Plains;Forest;Swamp;Swamp
-AIPlay=Caustic Hound|Id:14;Batterskull|Attaching:14;Alpha Tyrranax;Fangren Marauder|Tapped;Soul Conduit;Forest;Forest;Forest;Mountain;Mountain;Mountain
+AIPlay=Caustic Hound|Id:14;Batterskull|AttachedTo:14;Alpha Tyrranax;Fangren Marauder|Tapped;Soul Conduit;Forest;Forest;Forest;Mountain;Mountain;Mountain
 # Ramp difficulty by changing
 # A) Noxious Revival => Surgical Extraction
 # B) Blind Zealot => Pro Artifacts, Apostle's Blessing => Your graveyard

forge-gui/res/puzzle/PP04.pzl

@@ -10,6 +10,6 @@ ActivePhase=Main1
 HumanLife=1
 AILife=5
 humanhand=Kor Skyfisher;Oblivion Ring;Chainer's Edict;Holy Light
-humanbattlefield=Swamp;Swamp;Swamp;Plains;Plains;Plains;Plains;Plains;Thraben Inspector;Foundry Screecher;Kor Sanctifiers;Lone Missionary;Pacifism|Attaching:18
+humanbattlefield=Swamp;Swamp;Swamp;Plains;Plains;Plains;Plains;Plains;Thraben Inspector;Foundry Screecher;Kor Sanctifiers;Lone Missionary;Pacifism|AttachedTo:18
 humanlibrary=Leave No Trace
-aibattlefield=Aura Gnarlid|Id:18;Slippery Bogle|Id:19;Ethereal Armor|Attaching:19;Armadillo Cloak|Attaching:19;Ancestral Mask|Attaching:19;Children of Korlis
+aibattlefield=Aura Gnarlid|Id:18;Slippery Bogle|Id:19;Ethereal Armor|AttachedTo:19;Armadillo Cloak|AttachedTo:19;Ancestral Mask|AttachedTo:19;Children of Korlis

forge-gui/res/puzzle/PP05.pzl

@@ -13,4 +13,4 @@ AILife=52
 humanhand=Twin Bolt;Hydroblast;Borrowed Hostility;Gush
 humanbattlefield=Mountain;Mountain;Island;Island;Insectile Aberration|Transformed;Kiln Fiend;Nivix Cyclops
 humanlibrary=Brainstorm;Apostle's Blessing;Mutagenic Growth;Temur Battle Rage;Echoing Truth;Swiftwater Cliffs
-aibattlefield=Gurmag Angler|Id:18|Counters:P1P0=1|Attacking;Dragon Scales|Attaching:18;Goblin Bushwhacker|Tapped|Counters:P1P0=1|Attacking;Perilous Myr|Tapped|Counters:P1P0=1|Attacking;Perilous Myr|Tapped|Counters:P1P0=1|Attacking
+aibattlefield=Gurmag Angler|Id:18|Counters:P1P0=1|Attacking;Dragon Scales|AttachedTo:18;Goblin Bushwhacker|Tapped|Counters:P1P0=1|Attacking;Perilous Myr|Tapped|Counters:P1P0=1|Attacking;Perilous Myr|Tapped|Counters:P1P0=1|Attacking

forge-gui/res/puzzle/PP09.pzl

@@ -12,4 +12,4 @@ AILife=20
 humanhand=Mountain;Keldon Marauders;Rites of Initiation;Giantbaiting
 humanbattlefield=Forest;Forest;Forest;Swamp;Swamp;Swamp;Swamp;Rugged Highlands;Rugged Highlands;Crypt Rats;Quirion Ranger;Battlefield Scrounger
 humangraveyard=Flame Jab;Viscera Dragger;Lava Dart
-aibattlefield=Young Wolf|Id:20;Favor of the Overbeing|Attaching:20;Aura Gnarlid|Id:22;Rancor|Attaching:22;Slippery Bogle|Id:24;Lifelink|Attaching:24;Ancestral Mask|Attaching:24
+aibattlefield=Young Wolf|Id:20;Favor of the Overbeing|AttachedTo:20;Aura Gnarlid|Id:22;Rancor|AttachedTo:22;Slippery Bogle|Id:24;Lifelink|AttachedTo:24;Ancestral Mask|AttachedTo:24

forge-gui/res/puzzle/PP13.pzl

@@ -12,7 +12,7 @@ HumanLife=1
 AILife=20
 humanhand=Azorius Chancery;Ghostly Flicker;Pestermite;Explore;Sundering Vitae
 humanlibrary=Dream's Grip;Ghostly Flicker
-humanbattlefield=Kabira Crossroads;Secluded Steppe;Island;Forest;Essence Warden|Id:12;Curse of Chains|Attaching:12;Pestermite;Quirion Ranger
+humanbattlefield=Kabira Crossroads;Secluded Steppe;Island;Forest;Essence Warden|Id:12;Curse of Chains|AttachedTo:12;Pestermite;Quirion Ranger
 aihand=Groundswell
 aibattlefield=Shinen of Life's Roar;Nest Invader;Skarrgan Pit-Skulk;River Boa;Silhana Ledgewalker|Counters:P1P1=1;Tangle Golem;Elite Cat Warrior;Vault Skirge
 ailibrary=Forest

forge-gui/res/puzzle/PP14.pzl

@@ -12,5 +12,5 @@ HumanLife=1
 AILife=8
 humanhand=Rites of Initiation;Smash to Smithereens;Pulse of Murasa
 humanlibrary=Aerial Volley;Death Spark;Lightning Bolt;Vithian Stinger
-humanbattlefield=Forest|Tapped;Plains|Tapped;Mountain;Mountain;Mountain|Id:12;Unbridled Growth|Attaching:12;Auramancer;Shambling Shell;Aerie Ouphes|Id:16;Stupefying Touch|Attaching:16;Angelic Renewal
+humanbattlefield=Forest|Tapped;Plains|Tapped;Mountain;Mountain;Mountain|Id:12;Unbridled Growth|AttachedTo:12;Auramancer;Shambling Shell;Aerie Ouphes|Id:16;Stupefying Touch|AttachedTo:16;Angelic Renewal
-aibattlefield=Dawnfeather Eagle|Tapped|Attacking;War Falcon|Tapped|Attacking;War Falcon|Tapped|Attacking;Daru Cavalier|Tapped|Attacking;Veteran Cathar|Id:22|Attacking;Bonesplitter|Attaching:22;Lifelink|Attaching:22
+aibattlefield=Dawnfeather Eagle|Tapped|Attacking;War Falcon|Tapped|Attacking;War Falcon|Tapped|Attacking;Daru Cavalier|Tapped|Attacking;Veteran Cathar|Id:22|Attacking;Bonesplitter|AttachedTo:22;Lifelink|AttachedTo:22

forge-gui/res/puzzle/PP15.pzl

@@ -11,5 +11,5 @@ HumanLife=1
 AILife=5
 humanhand=Cho-Manno's Blessing;Aurora Eidolon
 humangraveyard=Qarsi Sadist;Agent of Shauku;Blind Hunter;Monk Realist
-humanbattlefield=Swamp;Swamp;Swamp;Plains;Plains;Master of Diversion|Id:12;Lashknife|Attaching:12;Sultai Scavenger;Tortured Existence
+humanbattlefield=Swamp;Swamp;Swamp;Plains;Plains;Master of Diversion|Id:12;Lashknife|AttachedTo:12;Sultai Scavenger;Tortured Existence
-aibattlefield=Vampiric Link|Attaching:12;Seraph of Dawn;Gurmag Angler|Id:18;Nimbus Wings|Attaching:18
+aibattlefield=Vampiric Link|AttachedTo:12;Seraph of Dawn;Gurmag Angler|Id:18;Nimbus Wings|AttachedTo:18

forge-gui/res/puzzle/PP16.pzl

@@ -12,4 +12,4 @@ AILife=6
 humanhand=Carrion Feeder;Faerie Macabre;Doom Blade;Rite of Consumption;Dark Dabbling
 humanlibrary=Gurmag Angler
 humanbattlefield=Swamp;Swamp;Swamp;Forest;Forest;Forest;Forest;Arrogant Wurm;Gorgon Recluse
-aibattlefield=Stinkweed Imp|Id:16;Demonic Appetite|Attaching:16
+aibattlefield=Stinkweed Imp|Id:16;Demonic Appetite|AttachedTo:16

forge-gui/res/puzzle/PP17.pzl

@@ -14,4 +14,4 @@ humanlibrary=Jund Hackblade;Otherworldly Journey;Kor Skyfisher;Firebolt
 humanbattlefield=Secluded Steppe;Forgotten Cave;Boros Garrison;Mountain;Mountain;Mountain;Foundry Street Denizen;Cerodon Yearling|Id:17
 aihand=Goblin Bushwhacker;Burning-Tree Emissary;Burning-Tree Emissary;Burning-Tree Emissary;Burning-Tree Emissary;Manamorphose
 ailibrary=Thunderous Wrath;Mountain
-aibattlefield=Greel's Caress|Attaching:17;Mountain|Tapped;Mountain|Tapped;Swamp|Tapped;Swamp|Tapped;Chittering Rats
+aibattlefield=Greel's Caress|AttachedTo:17;Mountain|Tapped;Mountain|Tapped;Swamp|Tapped;Swamp|Tapped;Chittering Rats

forge-gui/res/puzzle/PP22.pzl

@@ -10,5 +10,5 @@ ActivePhase=Main1
 HumanLife=2
 AILife=14
 humanhand=Wings of Velis Vel;Ebony Charm;Shrivel;Twin Bolt
-humanbattlefield=Thornbow Archer|Id:5;Crown of Suspicion|Attaching:5;Mountain;Mountain;Island;Island;Swamp;Swamp;Swamp;Plague Witch;Scarred Vinebreeder
+humanbattlefield=Thornbow Archer|Id:5;Crown of Suspicion|AttachedTo:5;Mountain;Mountain;Island;Island;Swamp;Swamp;Swamp;Plague Witch;Scarred Vinebreeder
 aibattlefield=Slippery Bogle;Silhana Ledgewalker;t:Plant,P:0,T:1,Cost:no cost,Color:G,Types:Creature-Plant,Keywords:,Image:g_0_1_plant;Valeron Outlander

forge-gui/res/puzzle/PP24.pzl

@@ -10,5 +10,5 @@ ActivePhase=Main1
 HumanLife=1
 AILife=6
 humanhand=Nourish;Pit Fight;Mutagenic Growth;Elemental Uprising
-humanbattlefield=Vault Skirge|Id:5;Rancor|Attaching:5;Quirion Ranger;Skarrgan Pit-Skulk|Id:6;Bonesplitter|Attaching:6;Forest;Forest;Forest
+humanbattlefield=Vault Skirge|Id:5;Rancor|AttachedTo:5;Quirion Ranger;Skarrgan Pit-Skulk|Id:6;Bonesplitter|AttachedTo:6;Forest;Forest;Forest
 aibattlefield=Twisted Abomination;Falkenrath Noble;Sultai Scavenger

forge-gui/res/puzzle/PS_AKH5.pzl

@@ -10,6 +10,6 @@ ActivePhase=Main1
 HumanLife=20
 AILife=10
 humanhand=Djeru's Resolve;Disperse;Invocation of Saint Traft;True-Faith Censer;Consuming Fervor
-humanbattlefield=Irrigated Farmland;Irrigated Farmland;Spirebluff Canal;Spirebluff Canal;Spirebluff Canal;Sigarda's Aid;Kari Zev, Skyship Raider|Id:420;Hedron Blade|Attaching:420;Pathmaker Initiate;Glory-Bound Initiate|Tapped
+humanbattlefield=Irrigated Farmland;Irrigated Farmland;Spirebluff Canal;Spirebluff Canal;Spirebluff Canal;Sigarda's Aid;Kari Zev, Skyship Raider|Id:420;Hedron Blade|AttachedTo:420;Pathmaker Initiate;Glory-Bound Initiate|Tapped
 humanlibrary=Plains;Plains;Plains;Plains;Plains;Plains;Plains;Plains;Plains;Plains
 aibattlefield=Shimmerscale Drake;Labyrinth Guardian;Labyrinth Guardian

forge-gui/res/puzzle/PS_AKH6.pzl

@@ -11,5 +11,5 @@ HumanLife=20
 humancounters=ENERGY=1
 AILife=12
 humanhand=Rhonas the Indomitable;Rhonas the Indomitable;Aviary Mechanic;Khenra Charioteer
-humanbattlefield=Longtusk Cub|Id:5;Cartouche of Strength|Attaching:5;Scattered Groves;Scattered Groves;Scattered Groves;Scattered Groves;Aether Hub;Rhonas's Monument;Rhonas the Indomitable;Greenbelt Rampager
+humanbattlefield=Longtusk Cub|Id:5;Cartouche of Strength|AttachedTo:5;Scattered Groves;Scattered Groves;Scattered Groves;Scattered Groves;Aether Hub;Rhonas's Monument;Rhonas the Indomitable;Greenbelt Rampager
 aibattlefield=Channeler Initiate;Champion of Rhonas;Naga Vitalist

forge-gui/res/puzzle/PS_DOM0.pzl

@@ -12,6 +12,6 @@ turn=1
 activeplayer=human
 activephase=MAIN1
 humanhand=Giant Spectacle;Plummet;Overcome;Gift of Strength
-humanbattlefield=Gaea's Protector|Id:4;Cartouche of Knowledge|Attaching:4;Ghalta, Primal Hunger;Frontline Devastator;Island|Set:XLN;Mountain|Set:XLN;Mountain|Set:XLN;Forest|Set:XLN;Forest|Set:XLN
+humanbattlefield=Gaea's Protector|Id:4;Cartouche of Knowledge|AttachedTo:4;Ghalta, Primal Hunger;Frontline Devastator;Island|Set:XLN;Mountain|Set:XLN;Mountain|Set:XLN;Forest|Set:XLN;Forest|Set:XLN
 aibattlefield=Ancient Brontodon;Rekindling Phoenix;Renegade Wheelsmith
 

forge-gui/res/puzzle/PS_DOM3.pzl

@@ -12,5 +12,5 @@ turn=1
 activeplayer=human
 activephase=MAIN1
 humanhand=Captain's Hook;Shatter;Sorcerer's Wand;Reckless Rage;Saheeli Rai
-humanbattlefield=Tiana, Ship's Caretaker|Id:4;Forebear's Blade|Attaching:4;Forebear's Blade|Attaching:4;Traxos, Scourge of Kroog|Tapped;Storm Fleet Pyromancer;Sulfur Falls|Set:DOM;Sulfur Falls|Set:DOM;Clifftop Retreat|Set:DOM;Clifftop Retreat|Set:DOM;Mountain|Set:DOM
+humanbattlefield=Tiana, Ship's Caretaker|Id:4;Forebear's Blade|AttachedTo:4;Forebear's Blade|AttachedTo:4;Traxos, Scourge of Kroog|Tapped;Storm Fleet Pyromancer;Sulfur Falls|Set:DOM;Sulfur Falls|Set:DOM;Clifftop Retreat|Set:DOM;Clifftop Retreat|Set:DOM;Mountain|Set:DOM
 aibattlefield=Serra Disciple;Teshar, Ancestor's Apostle;Pardic Wanderer

forge-gui/res/puzzle/PS_DOM6.pzl

@@ -13,4 +13,4 @@ activeplayer=human
 activephase=MAIN1
 humanhand=Shivan Fire;Jaya's Immolating Inferno;Squee, the Immortal;Goblin Chainwhirler
 humanbattlefield=Skirk Prospector|Set:DOM;Siege-Gang Commander|Set:DOM;t:Goblin,P:1,T:1,Cost:no cost,Color:R,Types:Creature-Goblin,Keywords:,Image:r_1_1_goblin_dom;t:Goblin,P:1,T:1,Cost:no cost,Color:R,Types:Creature-Goblin,Keywords:,Image:r_1_1_goblin_dom;t:Goblin,P:1,T:1,Cost:no cost,Color:R,Types:Creature-Goblin,Keywords:,Image:r_1_1_goblin_dom;t:Goblin,P:1,T:1,Cost:no cost,Color:R,Types:Creature-Goblin,Keywords:,Image:r_1_1_goblin_dom;Bloodstone Goblin;Mountain|Set:DOM;Mountain|Set:DOM;Mountain|Set:DOM;Mountain|Set:DOM;Mountain|Set:DOM
-aibattlefield=Arvad the Cursed|Id:1;Short Sword|Attaching:1;Vona, Butcher of Magan;Dusk Legion Zealot;Hope of Ghirapur
+aibattlefield=Arvad the Cursed|Id:1;Short Sword|AttachedTo:1;Vona, Butcher of Magan;Dusk Legion Zealot;Hope of Ghirapur

forge-gui/res/puzzle/PS_DOM9.pzl

@@ -13,5 +13,5 @@ turn=1
 activeplayer=human
 activephase=MAIN1
 humanhand=Demystify;Ixalan's Binding;Nissa, Vital Force;Dive Down
-humanbattlefield=Thrashing Brontodon|Id:999;Deep Freeze|Attaching:3;Slippery Scoundrel;Rhonas's Stalwart;Plains|Set:DOM;Hinterland Harbor;Hinterland Harbor;Hinterland Harbor;Glacial Fortress;Glacial Fortress;Glacial Fortress
+humanbattlefield=Thrashing Brontodon|Id:999;Deep Freeze|AttachedTo:3;Slippery Scoundrel;Rhonas's Stalwart;Plains|Set:DOM;Hinterland Harbor;Hinterland Harbor;Hinterland Harbor;Glacial Fortress;Glacial Fortress;Glacial Fortress
 aibattlefield=Evra, Halcyon Witness;Ninth Bridge Patrol|Counters:P1P1=1;Lyra Dawnbringer|Id:3;Cast Out|ExecuteScript:TrigExile->999

forge-gui/res/puzzle/PS_GRN2.pzl

@@ -13,5 +13,5 @@ activeplayer=human
 activephase=MAIN1
 humanhand=Arclight Phoenix;Sonic Assault;Invert // Invent;Response // Resurgence
 humanlibrary=Plains|Set:GRN;Island|Set:GRN;Swamp|Set:GRN;Mountain|Set:GRN;Forest|Set:GRN
-humanbattlefield=Runaway Steam-Kin|Counters:P1P1=1|Id:1;Tilonalli's Crown|Attaching:1;Rampaging Monument|Counters:P1P1=3;Sacred Foundry|Set:GRN|NoETBTrigs;Sacred Foundry|Set:GRN|NoETBTrigs;Steam Vents|Set:GRN|NoETBTrigs;Steam Vents|Set:GRN|NoETBTrigs;Izzet Guildgate|Set:GRN;Izzet Guildgate|Set:GRN
+humanbattlefield=Runaway Steam-Kin|Counters:P1P1=1|Id:1;Tilonalli's Crown|AttachedTo:1;Rampaging Monument|Counters:P1P1=3;Sacred Foundry|Set:GRN|NoETBTrigs;Sacred Foundry|Set:GRN|NoETBTrigs;Steam Vents|Set:GRN|NoETBTrigs;Steam Vents|Set:GRN|NoETBTrigs;Izzet Guildgate|Set:GRN;Izzet Guildgate|Set:GRN
-aibattlefield=Looming Altisaur;Territorial Allosaurus;Verdant Sun's Avatar;Polyraptor;Emissary of Sunrise|Id:2;Forebear's Blade|Attaching:2
+aibattlefield=Looming Altisaur;Territorial Allosaurus;Verdant Sun's Avatar;Polyraptor;Emissary of Sunrise|Id:2;Forebear's Blade|AttachedTo:2

forge-gui/res/puzzle/PS_GRN3.pzl

@@ -12,5 +12,5 @@ turn=1
 activeplayer=human
 activephase=MAIN1
 humanhand=Justice Strike;Dual Shot;Ashes of the Abhorrent;Silverclad Ferocidons;Hunted Witness
-humanbattlefield=Roc Charger|Id:1;Glaive of the Guildpact|Attaching:1;Desecrated Tomb;Pitiless Plunderer;Undercity Necrolisk;Oathsworn Vampire;Boros Guildgate|Set:GRN;Boros Guildgate|Set:GRN;Boros Guildgate|Set:GRN;Boros Guildgate|Set:GRN;Gateway Plaza|NoETBTrigs;Gateway Plaza|NoETBTrigs;Gateway Plaza|NoETBTrigs;Gateway Plaza|NoETBTrigs
+humanbattlefield=Roc Charger|Id:1;Glaive of the Guildpact|AttachedTo:1;Desecrated Tomb;Pitiless Plunderer;Undercity Necrolisk;Oathsworn Vampire;Boros Guildgate|Set:GRN;Boros Guildgate|Set:GRN;Boros Guildgate|Set:GRN;Boros Guildgate|Set:GRN;Gateway Plaza|NoETBTrigs;Gateway Plaza|NoETBTrigs;Gateway Plaza|NoETBTrigs;Gateway Plaza|NoETBTrigs
 aibattlefield=Rekindling Phoenix;Rekindling Phoenix;Aurelia, Exemplar of Justice

forge-gui/res/puzzle/PS_GRN5.pzl

@@ -14,4 +14,4 @@ activephase=MAIN1
 humanhand=Mutiny;Metamorphic Alteration;Direct Current;Maximize Velocity;Enigma Drake
 humanlibrary=Ghitu Lavarunner;Academy Journeymage
 humanbattlefield=Sparring Construct;Dream Eater;Ral, Izzet Viceroy|Counters:LOYALTY=3;Mountain|Set:GRN;Mountain|Set:GRN;Island|Set:GRN;Island|Set:GRN;Island|Set:GRN;Island|Set:GRN
-aibattlefield=Nullhide Ferox;Muldrotha, the Gravetide;Aggressive Mammoth|Id:1;One With the Wind|Attaching:1
+aibattlefield=Nullhide Ferox;Muldrotha, the Gravetide;Aggressive Mammoth|Id:1;One With the Wind|AttachedTo:1

forge-gui/res/puzzle/PS_GRN6.pzl

@@ -13,5 +13,5 @@ activeplayer=human
 activephase=MAIN1
 humanhand=Arcane Flight;Huatli, Warrior Poet;Disperse;Curious Obsession;Sea Legs
 humanlibrary=Fog;Fog;Fog;Fog;Fog;Fog;Fog;Fog;Fog;Fog;Fog;Fog;Fog;Fog;Fog;Fog;Fog;Fog;Fog;Fog
-humanbattlefield=Surge Mare|Id:5;Helm of the Host|Attaching:5;Valduk, Keeper of the Flame;Divine Visitation;Steam Vents|NoETBTrigs;Steam Vents|NoETBTrigs;Steam Vents|NoETBTrigs;Glacial Fortress;Glacial Fortress;t:Angel,P:4,T:4,Cost:no cost,Color:W,Types:Creature-Angel,Keywords:Flying-Vigilance,Image:w_4_4_angel_flying_vigilance_grn
+humanbattlefield=Surge Mare|Id:5;Helm of the Host|AttachedTo:5;Valduk, Keeper of the Flame;Divine Visitation;Steam Vents|NoETBTrigs;Steam Vents|NoETBTrigs;Steam Vents|NoETBTrigs;Glacial Fortress;Glacial Fortress;t:Angel,P:4,T:4,Cost:no cost,Color:W,Types:Creature-Angel,Keywords:Flying-Vigilance,Image:w_4_4_angel_flying_vigilance_grn
 aibattlefield=Murmuring Mystic;t:Bird Illusion,P:1,T:1,Cost:no cost,Color:U,Types:Creature-Bird-Illusion,Keywords:Flying,Image:u_1_1_bird_illusion_flying_grn;t:Bird Illusion,P:1,T:1,Cost:no cost,Color:U,Types:Creature-Bird-Illusion,Keywords:Flying,Image:u_1_1_bird_illusion_flying_grn;t:Bird Illusion,P:1,T:1,Cost:no cost,Color:U,Types:Creature-Bird-Illusion,Keywords:Flying,Image:u_1_1_bird_illusion_flying_grn;t:Bird Illusion,P:1,T:1,Cost:no cost,Color:U,Types:Creature-Bird-Illusion,Keywords:Flying,Image:u_1_1_bird_illusion_flying_grn;t:Bird Illusion,P:1,T:1,Cost:no cost,Color:U,Types:Creature-Bird-Illusion,Keywords:Flying,Image:u_1_1_bird_illusion_flying_grn;Dreamcaller Siren

forge-gui/res/puzzle/PS_HOU0.pzl

@@ -13,7 +13,7 @@ activephase=MAIN1
 humanhand=Precise Strike
 humanlibrary=Swamp|Set:ZEN;Swamp|Set:ZEN;Swamp|Set:ZEN;Swamp|Set:ZEN;Swamp|Set:ZEN;Swamp|Set:ZEN;
 humangraveyard=
-humanbattlefield=Swamp|Set:ZEN;Swamp|Set:ZEN;Canyon Slough;Canyon Slough;Canyon Slough;Key to the City;The Scorpion God;Furyblade Vampire|Id:420;Stitcher's Graft|Attaching:420;Skirsdag Supplicant;
+humanbattlefield=Swamp|Set:ZEN;Swamp|Set:ZEN;Canyon Slough;Canyon Slough;Canyon Slough;Key to the City;The Scorpion God;Furyblade Vampire|Id:420;Stitcher's Graft|AttachedTo:420;Skirsdag Supplicant;
 humanexile=
 humancommand=
 aihand=

forge-gui/res/puzzle/PS_M191.pzl

@@ -13,4 +13,4 @@ activeplayer=human
 activephase=MAIN1
 humanhand=Switcheroo;Atzocan Archer;Strider Harness;Recollect
 humanbattlefield=Overwhelming Splendor|EnchantingPlayer:AI;Daybreak Chaplain;Aggressive Mammoth;Thrashing Brontodon;Sunpetal Grove;Sunpetal Grove;Sunpetal Grove;Sunpetal Grove;Hinterland Harbor;Hinterland Harbor;Hinterland Harbor;Hinterland Harbor
-aibattlefield=Hungering Hydra|Id:1|Counters:P1P1=3;Oakenform|Attaching:1;Darigaaz Reincarnated|SummonSick;Glorybringer|SummonSick;Guttersnipe
+aibattlefield=Hungering Hydra|Id:1|Counters:P1P1=3;Oakenform|AttachedTo:1;Darigaaz Reincarnated|SummonSick;Glorybringer|SummonSick;Guttersnipe

forge-gui/res/puzzle/PS_M193.pzl

@@ -12,4 +12,4 @@ activeplayer=human
 activephase=MAIN1
 humanhand=Metamorphic Alteration;Metamorphic Alteration;Metamorphic Alteration;Strider Harness
 humanbattlefield=Thallid Omnivore;Dragon Egg;Slither Blade;Powerstone Shard;Powerstone Shard;Spirebluff Canal;Spirebluff Canal;Spirebluff Canal;Swamp|Set:M19;Swamp|Set:M19;Swamp|Set:M19
-aibattlefield=Hungering Hydra|Counters:P1P1=6;Boggart Brute|Id:1;Cobbled Wings|Attaching:1
+aibattlefield=Hungering Hydra|Counters:P1P1=6;Boggart Brute|Id:1;Cobbled Wings|AttachedTo:1

forge-gui/res/puzzle/PS_M199.pzl

@@ -16,4 +16,4 @@ humanlibrary=One with Nothing;One with Nothing;One with Nothing;One with Nothing
 humanbattlefield=Sai, Master Thopterist;Cunning Survivor;Captain Lannery Storm;Mox Amber;Powerstone Shard;Powerstone Shard;Cultivator's Caravan;Spirebluff Canal;Spirebluff Canal;Spirebluff Canal
 aihand=Wastes;Wastes
 ailibrary=One with Nothing;One with Nothing;One with Nothing;One with Nothing;One with Nothing;One with Nothing;One with Nothing;One with Nothing;One with Nothing;One with Nothing;One with Nothing;One with Nothing;One with Nothing;One with Nothing;One with Nothing;One with Nothing;One with Nothing;One with Nothing;One with Nothing;One with Nothing;One with Nothing;One with Nothing;One with Nothing;One with Nothing;One with Nothing;One with Nothing;One with Nothing;One with Nothing;One with Nothing;One with Nothing;One with Nothing;One with Nothing;One with Nothing;One with Nothing;One with Nothing;One with Nothing;One with Nothing;One with Nothing;One with Nothing
-aibattlefield=Perpetual Timepiece;Nezahal, Primal Tide|Id:2;Desert's Hold|Attaching:2;Ripjaw Raptor;Oasis Ritualist;Anointer Priest
+aibattlefield=Perpetual Timepiece;Nezahal, Primal Tide|Id:2;Desert's Hold|AttachedTo:2;Ripjaw Raptor;Oasis Ritualist;Anointer Priest

forge-gui/res/puzzle/PS_RIX1.pzl

@@ -19,6 +19,6 @@ humancommand=
 aihand=
 ailibrary=
 aigraveyard=
-aibattlefield=Compulsory Rest|Attaching:1;Protection of the Hekma;Rampaging Ferocidon;Gifted Aetherborn;Regal Caracal;t:Cat,P:1,T:1,Cost:no cost,Color:W,Types:Creature-Cat,Keywords:Lifelink,Image:w_1_1_cat;t:Cat,P:1,T:1,Cost:no cost,Color:W,Types:Creature-Cat,Keywords:Lifelink,Image:w_1_1_cat;
+aibattlefield=Compulsory Rest|AttachedTo:1;Protection of the Hekma;Rampaging Ferocidon;Gifted Aetherborn;Regal Caracal;t:Cat,P:1,T:1,Cost:no cost,Color:W,Types:Creature-Cat,Keywords:Lifelink,Image:w_1_1_cat;t:Cat,P:1,T:1,Cost:no cost,Color:W,Types:Creature-Cat,Keywords:Lifelink,Image:w_1_1_cat;
 aiexile=
 aicommand=

forge-gui/res/puzzle/PS_RIX5.pzl

@@ -21,6 +21,6 @@ humancommand=
 aihand=
 ailibrary=
 aigraveyard=
-aibattlefield=Labyrinth Guardian;Ornithopter;Deadlock Trap;Captured by the Consulate|Attaching:4
+aibattlefield=Labyrinth Guardian;Ornithopter;Deadlock Trap;Captured by the Consulate|AttachedTo:4
 aiexile=
 aicommand=

forge-gui/res/puzzle/PS_RIX6.pzl

@@ -14,7 +14,7 @@ activephase=MAIN1
 humanhand=Vizier of Deferment;Siren's Ruse;Rallying Roar;Aether Tradewinds
 humanlibrary=Harnessed Lightning;Harnessed Lightning;Harnessed Lightning;Harnessed Lightning;Harnessed Lightning;Harnessed Lightning;Harnessed Lightning;Harnessed Lightning;Harnessed Lightning;Harnessed Lightning;Harnessed Lightning;Harnessed Lightning;Harnessed Lightning;Harnessed Lightning;Harnessed Lightning;Harnessed Lightning;Harnessed Lightning;Harnessed Lightning;Harnessed Lightning;Harnessed Lightning
 humangraveyard=
-humanbattlefield=Deadeye Brawler;Angel of Condemnation;Dire Fleet Ravager|Id:6;Inventor's Goggles|Attaching:6;Fetid Pools;Fetid Pools;Fetid Pools;Plains|Set:XLN;Plains|Set:XLN
+humanbattlefield=Deadeye Brawler;Angel of Condemnation;Dire Fleet Ravager|Id:6;Inventor's Goggles|AttachedTo:6;Fetid Pools;Fetid Pools;Fetid Pools;Plains|Set:XLN;Plains|Set:XLN
 humanexile=
 humancommand=
 aihand=

forge-gui/res/puzzle/PS_XLN3.pzl

@@ -14,7 +14,7 @@ humanhand=Captain Lannery Storm; Mountain|Set:XLN; Chandra's Pyrohelix; Angrath'
 humangraveyard=
 humanlibrary=
 humanbattlefield=Pathmaker Initiate; Combat Celebrant; Tilonalli's Skinshifter; Burning Sun's Avatar|Tapped|Id:420; Carrion Screecher; Dragonskull Summit|Set:XLN; Dragonskull Summit|Set:XLN; Dragonskull Summit|Set:XLN; Mountain|Set:XLN; Mountain|Set:XLN; Mountain|Set:XLN; 
-aibattlefield=Seraph of the Suns; Nimble Obstructionist; Protection of the Hekma; Unquenchable Thirst|Attaching:420;
+aibattlefield=Seraph of the Suns; Nimble Obstructionist; Protection of the Hekma; Unquenchable Thirst|AttachedTo:420;
 aiprecast=Deeproot Waters:TrigToken;Deeproot Waters:TrigToken;Deeproot Waters:TrigToken; 
 aigraveyard=
 ailibrary=

forge-gui/res/puzzle/PS_XLN7.pzl

@@ -14,7 +14,7 @@ humanhand=Duskborne Skymarcher; Gilded Sentinel; Regisaur Alpha; Merciless Javel
 humanprecast=
 humangraveyard=Reckless Fireweaver; Gearseeker Serpent; Storm Sculptor; Temmet, Vizier of Naktamun;
 humanlibrary=
-humanbattlefield=Mechanized Production|Attaching:420; God-Pharaoh's Gift|Id:420; God-Pharaoh's Gift; Huatli, Warrior Poet|Counters:LOYALTY=3; Pia Nalaar; Anointed Procession; Spire of Industry; Spire of Industry; Spire of Industry; Inspiring Vantage|Set:KLD; Inspiring Vantage|Set:KLD; Inspiring Vantage|Set:KLD; Inspiring Vantage|Set:KLD; 
+humanbattlefield=Mechanized Production|AttachedTo:420; God-Pharaoh's Gift|Id:420; God-Pharaoh's Gift; Huatli, Warrior Poet|Counters:LOYALTY=3; Pia Nalaar; Anointed Procession; Spire of Industry; Spire of Industry; Spire of Industry; Inspiring Vantage|Set:KLD; Inspiring Vantage|Set:KLD; Inspiring Vantage|Set:KLD; Inspiring Vantage|Set:KLD;
 aibattlefield=Trueheart Duelist; Trueheart Duelist; Trueheart Duelist; Trueheart Duelist; Queen's Agent|Counters:P1P1=1; Queen's Agent|Counters:P1P1=1; Queen's Agent|Counters:P1P1=1; Queen's Agent|Counters:P1P1=1; Ashes of the Abhorrent;
 aiprecast=Trespasser's Curse;
 aigraveyard=

forge-gui/res/puzzle/PS_XLN9.pzl

@@ -14,7 +14,7 @@ humanhand=Disallow; Sand Strangler; Siren's Ruse; Exemplar of Strength; Harnesse
 humanprecast=
 humangraveyard=
 humanlibrary=
-humanbattlefield=Consuming Fervor|Attaching:420; Spontaneous Artist|Counters:M1M1=4|Id:420; Chaos Maw; Nef-Crop Entangler; Ramunap Ruins; Sheltered Thicket|Set:AKH; Sheltered Thicket|Set:AKH; Sheltered Thicket|Set:AKH; Spirebluff Canal|Set:KLD; Spirebluff Canal|Set:KLD; Spirebluff Canal|Set:KLD; 
+humanbattlefield=Consuming Fervor|AttachedTo:420; Spontaneous Artist|Counters:M1M1=4|Id:420; Chaos Maw; Nef-Crop Entangler; Ramunap Ruins; Sheltered Thicket|Set:AKH; Sheltered Thicket|Set:AKH; Sheltered Thicket|Set:AKH; Spirebluff Canal|Set:KLD; Spirebluff Canal|Set:KLD; Spirebluff Canal|Set:KLD;
 aibattlefield=Island|Set:XLN; Adanto Vanguard; Raptor Hatchling; Siren Stormtamer|Tapped; Aethergeode Miner;
 aiprecast=Aether Chaser:TrigEnergy;
 aigraveyard=

forge-gui/res/puzzle/forge_tutorial02.pzl

@@ -25,7 +25,7 @@ humanlibrary=
 
 humangraveyard=
 
-humanbattlefield=Llanowar Druid|Set:WTH; Gustrider Exuberant|Set:ALA; Herd Gnarr|Set:TSP; Waker of the Wilds|Set:XLN; Plains|Set:AKH; Plains|Set:AKH; Plains|Set:AKH; Plains|Set:AKH; Plains|Set:AKH|Id:141; Wild Growth|Set:7ED|Attaching:141; Forest|Set:AKH; Forest|Set:AKH; Forest|Set:AKH
+humanbattlefield=Llanowar Druid|Set:WTH; Gustrider Exuberant|Set:ALA; Herd Gnarr|Set:TSP; Waker of the Wilds|Set:XLN; Plains|Set:AKH; Plains|Set:AKH; Plains|Set:AKH; Plains|Set:AKH; Plains|Set:AKH|Id:141; Wild Growth|Set:7ED|AttachedTo:141; Forest|Set:AKH; Forest|Set:AKH; Forest|Set:AKH
 
 humanexile=
 

forge-gui/src/main/java/forge/card/CardDetailUtil.java

@@ -441,8 +441,8 @@ public class CardDetailUtil {
             area.append(")");
         }
 
-        // attached by
+        // a card has something attached to it
-        if (card.isAttachedByCards()) {
+        if (card.hasCardAttachments()) {
             if (area.length() != 0) {
                 area.append("\n");
             }
@@ -451,18 +451,18 @@ public class CardDetailUtil {
             area.append("=");
         }
 
-        // attaching
+        // a card is attached to something
-        if (card.getAttachingCard() != null) {
+        if (card.getAttachedTo() != null) {
             if (area.length() != 0) {
                 area.append("\n");
             }
-            area.append("*Attached to ").append(card.getAttachingCard()).append("*");
+            area.append("*Attached to ").append(card.getAttachedTo()).append("*");
         }
-        if (card.getAttachingPlayer() != null) {
+        if (card.getEnchantedPlayer() != null) {
             if (area.length() != 0) {
                 area.append("\n");
             }
-            area.append("*Enchanting ").append(card.getAttachingPlayer()).append("*");
+            area.append("*Enchanting ").append(card.getEnchantedPlayer()).append("*");
         }
 
         // controlling