From d21676d4f76200b8f005b1cf6c20ddc1fd60d354 Mon Sep 17 00:00:00 2001
From: jendave <jendave@cardforge.org>
Date: Sat, 6 Aug 2011 15:04:36 +0000
Subject: [PATCH] replace P0M2 counter with M0M2 counter (only affected Spirit
 Shackle)

---
 src/forge/Card.java            | 2 +-
 src/forge/CardFactoryUtil.java | 3 +--
 src/forge/Counters.java        | 2 +-
 src/forge/GameActionUtil.java  | 2 +-
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/forge/Card.java b/src/forge/Card.java
index b8f6b1ebdd8..8550245c77c 100644
--- a/src/forge/Card.java
+++ b/src/forge/Card.java
@@ -1825,7 +1825,7 @@ public class Card extends MyObservable {
         total += getTempDefenseBoost() + getSemiPermanentDefenseBoost() + getOtherDefenseBoost()
                 + getCounters(Counters.P1P1) + (2*getCounters(Counters.P1P2)) 
                 - getCounters(Counters.M1M1) + getCounters(Counters.P0P1 ) 
-                - (2*getCounters(Counters.P0M2))
+                - (2*getCounters(Counters.M0M2))
                 + (2*getCounters(Counters.P2P2)) - getCounters(Counters.M0M1)
                 - getCounters(Counters.M2M1);
         return total;
diff --git a/src/forge/CardFactoryUtil.java b/src/forge/CardFactoryUtil.java
index 9a8373ebd75..52c1ca75044 100644
--- a/src/forge/CardFactoryUtil.java
+++ b/src/forge/CardFactoryUtil.java
@@ -4422,11 +4422,10 @@ public class CardFactoryUtil {
         BRIBERY(),
         ICE(),
         M1M1("-1/-1"),
-        P0M2("+0/-2"),
         TIME(),
         */
     	return c == Counters.AGE || c == Counters.BLAZE || c == Counters.BRIBERY || c == Counters.DOOM || c == Counters.ICE ||
-        		c == Counters.M1M1 || c == Counters.P0M2 || c == Counters.TIME;
+        		c == Counters.M1M1 || c == Counters.M0M2 || c == Counters.M0M1|| c == Counters.TIME;
     }
 
     public static String checkEmblemKeyword(Card c) 
diff --git a/src/forge/Counters.java b/src/forge/Counters.java
index 5856a025f13..127b292c932 100644
--- a/src/forge/Counters.java
+++ b/src/forge/Counters.java
@@ -45,6 +45,7 @@ public enum Counters {
     LOYALTY(),
     LUCK(),
     M0M1("-0/-1"),
+    M0M2("-0/-2"),
     M1M1("-1/-1"),
     M2M1("-2/-1"),
     MANA(),
@@ -55,7 +56,6 @@ public enum Counters {
     PHYLACTERY,
     POLYP(),
     PUPA(),
-    P0M2("+0/-2"),
     P0P1("+0/+1"),
     P1P0("+1/+0"),
     P1P1("+1/+1"),
diff --git a/src/forge/GameActionUtil.java b/src/forge/GameActionUtil.java
index 71aa82c6540..6cbc6dd747a 100644
--- a/src/forge/GameActionUtil.java
+++ b/src/forge/GameActionUtil.java
@@ -382,7 +382,7 @@ public class GameActionUtil {
 					Ability ability = new Ability(card, "0") {
 						@Override
 						public void resolve() {
-							enchantedCard.addCounter(Counters.P0M2, 1);
+							enchantedCard.addCounter(Counters.M0M2, 1);
 						}
 					};//Ability