From 17ba3e07a9b6cc4c459288d30944d9a9ed211dcc Mon Sep 17 00:00:00 2001 From: jendave Date: Sat, 6 Aug 2011 09:47:57 +0000 Subject: [PATCH] add Upwelling (from Scourge) --- .gitattributes | 1 + res/cardsfolder/upwelling.txt | 7 +++++++ src/forge/Phase.java | 5 +++-- 3 files changed, 11 insertions(+), 2 deletions(-) create mode 100644 res/cardsfolder/upwelling.txt diff --git a/.gitattributes b/.gitattributes index a93a7360189..02eaeb6cfb6 100644 --- a/.gitattributes +++ b/.gitattributes @@ -4567,6 +4567,7 @@ res/cardsfolder/unyaro_bee_sting.txt -text svneol=native#text/plain res/cardsfolder/unyaro_bees.txt -text svneol=native#text/plain res/cardsfolder/upheaval.txt -text svneol=native#text/plain res/cardsfolder/uproot.txt -text svneol=native#text/plain +res/cardsfolder/upwelling.txt -text svneol=native#text/plain res/cardsfolder/ur_drago.txt -text svneol=native#text/plain res/cardsfolder/ur_golems_eye.txt -text svneol=native#text/plain res/cardsfolder/urborg_drake.txt -text svneol=native#text/plain diff --git a/res/cardsfolder/upwelling.txt b/res/cardsfolder/upwelling.txt new file mode 100644 index 00000000000..913bf96beed --- /dev/null +++ b/res/cardsfolder/upwelling.txt @@ -0,0 +1,7 @@ +Name:Upwelling +ManaCost:3 G +Types:Enchantment +Text:Mana pools don't empty as steps and phases end. +SVar:Rarity:Rare +SVar:Picture:http://www.wizards.com/global/images/magic/general/upwelling.jpg +End diff --git a/src/forge/Phase.java b/src/forge/Phase.java index b6ad1fc35d3..6793075791d 100644 --- a/src/forge/Phase.java +++ b/src/forge/Phase.java @@ -134,8 +134,9 @@ public class Phase extends MyObservable // c.setExtrinsicKeyword(new ArrayList()); //} - - AllZone.ManaPool.clearPool(); + + if(!AllZoneUtil.isCardInPlay("Upwelling")) AllZone.ManaPool.clearPool(); + if (getPhase().equals(Constant.Phase.Combat_Declare_Attackers)) { nCombatsThisTurn++; } else if (getPhase().equals(Constant.Phase.Main1)) {