From b89326f0585adca573fa6dbeddaafae77ec978b1 Mon Sep 17 00:00:00 2001
From: elcnesh <elcnesh@cardforge.org>
Date: Mon, 28 Jul 2014 10:29:18 +0000
Subject: [PATCH] Add Burning-Eye Zubera and Rushing-Tide Zubera.

---
 .gitattributes                                |  2 ++
 .../game/trigger/TriggerChangesZone.java      | 29 +++++++++++++++++--
 .../res/cardsfolder/b/burning_eye_zubera.txt  |  8 +++++
 .../res/cardsfolder/r/rushing_tide_zubera.txt |  8 +++++
 4 files changed, 45 insertions(+), 2 deletions(-)
 create mode 100644 forge-gui/res/cardsfolder/b/burning_eye_zubera.txt
 create mode 100644 forge-gui/res/cardsfolder/r/rushing_tide_zubera.txt

diff --git a/.gitattributes b/.gitattributes
index 3c679f64f57..1a70df30060 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -2791,6 +2791,7 @@ forge-gui/res/cardsfolder/b/burning-tree_emissary.txt -text
 forge-gui/res/cardsfolder/b/burning_anger.txt -text
 forge-gui/res/cardsfolder/b/burning_cloak.txt svneol=native#text/plain
 forge-gui/res/cardsfolder/b/burning_earth.txt -text
+forge-gui/res/cardsfolder/b/burning_eye_zubera.txt -text
 forge-gui/res/cardsfolder/b/burning_fields.txt svneol=native#text/plain
 forge-gui/res/cardsfolder/b/burning_inquiry.txt svneol=native#text/plain
 forge-gui/res/cardsfolder/b/burning_of_xinye.txt -text
@@ -11267,6 +11268,7 @@ forge-gui/res/cardsfolder/r/ruric_thar_the_unbowed.txt -text
 forge-gui/res/cardsfolder/r/rush_of_blood.txt -text
 forge-gui/res/cardsfolder/r/rush_of_knowledge.txt svneol=native#text/plain
 forge-gui/res/cardsfolder/r/rushing_river.txt -text
+forge-gui/res/cardsfolder/r/rushing_tide_zubera.txt -text
 forge-gui/res/cardsfolder/r/rushwood_dryad.txt svneol=native#text/plain
 forge-gui/res/cardsfolder/r/rushwood_elemental.txt svneol=native#text/plain
 forge-gui/res/cardsfolder/r/rushwood_grove.txt -text
diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerChangesZone.java b/forge-game/src/main/java/forge/game/trigger/TriggerChangesZone.java
index f369f9c4933..a3a94d40fa3 100644
--- a/forge-game/src/main/java/forge/game/trigger/TriggerChangesZone.java
+++ b/forge-game/src/main/java/forge/game/trigger/TriggerChangesZone.java
@@ -101,8 +101,33 @@ public class TriggerChangesZone extends Trigger {
             if (!Expressions.compare(actualValue, comparator.substring(0, 2), referenceValue)) {
                 return false;
             }
-        }        
-        
+        }
+
+        // Check amount of damage dealt to the triggered card
+        if (this.mapParams.containsKey("DamageReceivedCondition")) {
+            final String cond = this.mapParams.get("DamageReceivedCondition");
+            if (cond.length() < 3) {
+                return false;
+            }
+
+            final Card card;
+            final int rightSide;
+            try {
+                card = (Card) runParams2.get("Card");
+                rightSide = Integer.parseInt(cond.substring(2));
+            } catch (NumberFormatException | ClassCastException e) {
+                return false;
+            }
+            if (card == null) {
+                return false;
+            }
+
+            final boolean expr = Expressions.compare(card.getTotalDamageRecievedThisTurn(), cond, rightSide);
+            if (!expr) {
+                return false;
+            }
+        }
+
         return true;
     }
 
diff --git a/forge-gui/res/cardsfolder/b/burning_eye_zubera.txt b/forge-gui/res/cardsfolder/b/burning_eye_zubera.txt
new file mode 100644
index 00000000000..56224e856d2
--- /dev/null
+++ b/forge-gui/res/cardsfolder/b/burning_eye_zubera.txt
@@ -0,0 +1,8 @@
+Name:Burning-Eye Zubera
+ManaCost:2 R R
+Types:Creature Zubera Spirit
+PT:3/3
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | DamageReceivedCondition$ GE4 | Execute$ TrigDealDamage | TriggerDescription$ When CARDNAME dies, if 4 or more damage was dealt to it this turn, CARDNAME deals 3 damage to target creature or player.
+SVar:TrigDealDamage:AB$ DealDamage | Cost$ 0 | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | NumDmg$ 3
+SVar:Picture:http://www.wizards.com/global/images/magic/general/rushing_tide_zubera.jpg
+Oracle:When Burning-Eye Zubera dies, if 4 or more damage was dealt to it this turn, Burning-Eye Zubera deals 3 damage to target creature or player.
diff --git a/forge-gui/res/cardsfolder/r/rushing_tide_zubera.txt b/forge-gui/res/cardsfolder/r/rushing_tide_zubera.txt
new file mode 100644
index 00000000000..d55c9131687
--- /dev/null
+++ b/forge-gui/res/cardsfolder/r/rushing_tide_zubera.txt
@@ -0,0 +1,8 @@
+Name:Rushing-Tide Zubera
+ManaCost:2 U U
+Types:Creature Zubera Spirit
+PT:3/3
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | DamageReceivedCondition$ GE4 | Execute$ TrigDraw | TriggerDescription$ When CARDNAME dies, if 4 or more damage was dealt to it this turn, draw three cards.
+SVar:TrigDraw:AB$ Draw | Cost$ 0 | NumCards$ 3
+SVar:Picture:http://www.wizards.com/global/images/magic/general/rushing_tide_zubera.jpg
+Oracle:When Rushing-Tide Zubera dies, if 4 or more damage was dealt to it this turn, draw three cards.