From 48c90d78f78f4aa17e80c923521d80f820d342d5 Mon Sep 17 00:00:00 2001
From: jendave <jendave@cardforge.org>
Date: Sat, 6 Aug 2011 09:40:24 +0000
Subject: [PATCH] add Armor Thrull (from Fallen Empires)

---
 .gitattributes                   |  1 +
 res/cardsfolder/armor_thrull.txt | 10 ++++++++++
 src/forge/Card.java              |  6 ++++--
 src/forge/Counters.java          |  1 +
 4 files changed, 16 insertions(+), 2 deletions(-)
 create mode 100644 res/cardsfolder/armor_thrull.txt

diff --git a/.gitattributes b/.gitattributes
index f6a67ec7035..f2be0fd8667 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -232,6 +232,7 @@ res/cardsfolder/armageddon.txt -text svneol=native#text/plain
 res/cardsfolder/armed_response.txt -text svneol=native#text/plain
 res/cardsfolder/armillary_sphere.txt -text svneol=native#text/plain
 res/cardsfolder/armistice.txt -text svneol=native#text/plain
+res/cardsfolder/armor_thrull.txt -text svneol=native#text/plain
 res/cardsfolder/armored_ascension.txt -text svneol=native#text/plain
 res/cardsfolder/armored_cancrix.txt -text svneol=native#text/plain
 res/cardsfolder/armored_galleon.txt -text svneol=native#text/plain
diff --git a/res/cardsfolder/armor_thrull.txt b/res/cardsfolder/armor_thrull.txt
new file mode 100644
index 00000000000..c68451e80f3
--- /dev/null
+++ b/res/cardsfolder/armor_thrull.txt
@@ -0,0 +1,10 @@
+Name:Armor Thrull
+ManaCost:2 B
+Types:Creature Thrull
+Text:no text
+PT:1/3
+A:AB$PutCounter|Cost$T Sac<1/CARDNAME>|Tgt$TgtC|CounterType$P1P2|CounterNum$1|SpellDescription$Put a +1/+2 counter on target creature.
+SVar:Rarity:Common
+SVar:RemAIDeck:True
+SVar:Picture:http://www.wizards.com/global/images/magic/general/armor_thrull.jpg
+End
\ No newline at end of file
diff --git a/src/forge/Card.java b/src/forge/Card.java
index 85b41a6fe8f..de5e56848e7 100644
--- a/src/forge/Card.java
+++ b/src/forge/Card.java
@@ -1547,14 +1547,16 @@ public class Card extends MyObservable {
     public int getNetAttack() {
         int total = getBaseAttack();
         total += getTempAttackBoost() + getSemiPermanentAttackBoost() + getOtherAttackBoost()
-                + getCounters(Counters.P1P1) + getCounters(Counters.P1P0) - getCounters(Counters.M1M1);
+                + getCounters(Counters.P1P1) + getCounters(Counters.P1P2) 
+                + getCounters(Counters.P1P0) - getCounters(Counters.M1M1);
         return total;
     }
     
     public int getNetDefense() {
         int total = getBaseDefense();
         total += getTempDefenseBoost() + getSemiPermanentDefenseBoost() + getOtherDefenseBoost()
-                + getCounters(Counters.P1P1) - getCounters(Counters.M1M1) - getCounters(Counters.P0M1)
+                + getCounters(Counters.P1P1) +(2*getCounters(Counters.P1P2)) 
+                - getCounters(Counters.M1M1) - getCounters(Counters.P0M1)
                 - (2*getCounters(Counters.P0M2));
         return total;
     }
diff --git a/src/forge/Counters.java b/src/forge/Counters.java
index 6fc2e186ff3..08250df2dd3 100644
--- a/src/forge/Counters.java
+++ b/src/forge/Counters.java
@@ -35,6 +35,7 @@ public enum Counters {
     P0M2("+0/-2"),
     P1P1("+1/+1"),
     P1P0("+1/+0"),
+    P1P2("+1/+2"),
     QUEST(),
     SPORE(),
     STORAGE(),