From 979697648ebb29125521b36ecdbd25be01a3f699 Mon Sep 17 00:00:00 2001
From: jendave <jendave@cardforge.org>
Date: Sat, 6 Aug 2011 04:48:34 +0000
Subject: [PATCH] Added +1+0 counters, and Lightning Serpent with it.

---
 res/card-pictures.txt                | 1 +
 res/cards.txt                        | 9 +++++++++
 src/forge/Card.java                  | 2 +-
 src/forge/CardFactory_Creatures.java | 5 +++--
 src/forge/Counters.java              | 1 +
 5 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/res/card-pictures.txt b/res/card-pictures.txt
index 13c2071a86f..136c7e9ab0f 100644
--- a/res/card-pictures.txt
+++ b/res/card-pictures.txt
@@ -38,6 +38,7 @@ snow_covered_mountain.jpg        http://www.wizards.com/global/images/magic/gene
 snow_covered_mountain1.jpg       http://www.wizards.com/global/images/magic/general/snow_covered_mountain.jpg
 snow_covered_mountain2.jpg       http://www.magickartenmarkt.de/img/cards/Ice_Age/snow_covered_mountain.jpg
 snow_covered_mountain3.jpg       http://www.magickartenmarkt.de/img/cards/Ice_Age/snow_covered_mountain.jpg
+lightning_serpent.jpg				http://www.wizards.com/global/images/magic/general/lightning_serpent.jpg
 ivy_elemental.jpg				http://www.wizards.com/global/images/magic/general/ivy_elemental.jpg
 krakilin.jpg					http://gatherer.wizards.com/Handlers/Image.ashx?multiverseid=4769&type=card
 maga_traitor_to_mortals.jpg		http://www.wizards.com/global/images/magic/general/maga_traitor_to_mortals.jpg
diff --git a/res/cards.txt b/res/cards.txt
index 34763e52c38..76f42a8c5f3 100644
--- a/res/cards.txt
+++ b/res/cards.txt
@@ -1,3 +1,12 @@
+Lightning Serpent
+X R
+Creature Elemental Serpent
+Lightning Serpent enters the battlefield with X +1/+0 counters on it.
+2/1
+Trample
+Haste
+At the beginning of the end step, sacrifice CARDNAME.
+
 Ivy Elemental
 X G
 Creature Elemental
diff --git a/src/forge/Card.java b/src/forge/Card.java
index f7abd88ed4c..6fc654b4dae 100644
--- a/src/forge/Card.java
+++ b/src/forge/Card.java
@@ -1233,7 +1233,7 @@ public class Card extends MyObservable {
     public int getNetAttack() {
         int total = getBaseAttack();
         total += getTempAttackBoost() + getSemiPermanentAttackBoost() + getOtherAttackBoost()
-                + getCounters(Counters.P1P1) - getCounters(Counters.M1M1);
+                + getCounters(Counters.P1P1) + getCounters(Counters.P1P0) - getCounters(Counters.M1M1);
         return total;
     }
     
diff --git a/src/forge/CardFactory_Creatures.java b/src/forge/CardFactory_Creatures.java
index 13bcbd65cb9..40a2bc5a8ab 100644
--- a/src/forge/CardFactory_Creatures.java
+++ b/src/forge/CardFactory_Creatures.java
@@ -14701,7 +14701,7 @@ public class CardFactory_Creatures {
         
         //*************** START *********** START **************************
         else if(cardName.equals("Shifting Wall") || cardName.equals("Maga, Traitor to Mortals")
-        		|| cardName.equals("Krakilin") || cardName.equals("Ivy Elemental")) { 
+        		|| cardName.equals("Krakilin") || cardName.equals("Ivy Elemental") || cardName.equals("Lightning Serpent")) { 
         	
         	if(!card.getName().equals("Krakilin")) {
             SpellAbility spell = new Spell_Permanent(card) {
@@ -14731,7 +14731,8 @@ public class CardFactory_Creatures {
                 
                 public void execute() {
                 	int XCounters = card.getXManaCostPaid();
-                	card.addCounter(Counters.P1P1, XCounters);
+                	if(card.getName().equals("Lightning Serpent")) card.addCounter(Counters.P1P0, XCounters);
+                	else card.addCounter(Counters.P1P1, XCounters);
                 	if(card.getName().equals("Maga, Traitor to Mortals")) {
                         ability.setStackDescription(ability.getTargetPlayer() + " - loses life equal to the number of +1/+1 counters on " + card.getName());
                         if(card.getController() == Constant.Player.Human) AllZone.InputControl.setInput(CardFactoryUtil.input_targetPlayer(ability));
diff --git a/src/forge/Counters.java b/src/forge/Counters.java
index 48bcccbb944..4893b1d0bd7 100644
--- a/src/forge/Counters.java
+++ b/src/forge/Counters.java
@@ -29,6 +29,7 @@ public enum Counters {
     P0M1("+0/-1"),
     P0M2("+0/-2"),
     P1P1("+1/+1"),
+    P1P0("+1/+0"),
     QUEST(),
     SPORE(),
     TIME(),