From 48dac75fe78312d515e605e4a9405d7fda2d4143 Mon Sep 17 00:00:00 2001
From: Sloth <sloth@cardforge.org>
Date: Sun, 11 Sep 2011 16:45:32 +0000
Subject: [PATCH] - Added Gravity Sphere. - Run scripts.

---
 .gitattributes                                       |  1 +
 res/cardsfolder/a/arm_with_aether.txt                |  2 ++
 res/cardsfolder/g/gravity_sphere.txt                 | 12 ++++++++++++
 .../java/forge/card/staticAbility/StaticAbility.java |  3 ++-
 4 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 res/cardsfolder/g/gravity_sphere.txt

diff --git a/.gitattributes b/.gitattributes
index ef830dbf5dd..259a46e9f0f 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -3289,6 +3289,7 @@ res/cardsfolder/g/gravelgill_duo.txt svneol=native#text/plain
 res/cardsfolder/g/graven_cairns.txt svneol=native#text/plain
 res/cardsfolder/g/gravespawn_sovereign.txt svneol=native#text/plain
 res/cardsfolder/g/gravitational_shift.txt svneol=native#text/plain
+res/cardsfolder/g/gravity_sphere.txt -text
 res/cardsfolder/g/gray_ogre.txt svneol=native#text/plain
 res/cardsfolder/g/graypelt_hunter.txt svneol=native#text/plain
 res/cardsfolder/g/graypelt_refuge.txt svneol=native#text/plain
diff --git a/res/cardsfolder/a/arm_with_aether.txt b/res/cardsfolder/a/arm_with_aether.txt
index 074930653c2..3f8d12b9d73 100644
--- a/res/cardsfolder/a/arm_with_aether.txt
+++ b/res/cardsfolder/a/arm_with_aether.txt
@@ -6,4 +6,6 @@ A:SP$Effect | Cost$ 2 U | StaticAbilities$ PumpTrigs | SVars$ Trig,Eff | Name$ A
 SVar:PumpTrigs:Mode$ Continuous | Affected$ Creature.YouCtrl | AddTrigger$ Trig | AddSVar$ Eff | Description$ Creatures you control have "Whenever this creature deals damage to an opponent, you may return target creature that player controls to its owner's hand."
 SVar:Trig:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Opponent | Execute$ Eff | TriggerDescription$ Whenever this creature deals damage to an opponent, you may return target creature that player controls to its owner's hand.
 SVar:Eff:AB$ ChangeZone | Cost$ 0 | ValidTgts$ Creature.YouDontCtrl | TgtPrompt$ Select target creature you don't control. | Origin$ Battlefield | Destination$ Hand
+SetInfo:NPH|Uncommon|http://magiccards.info/scans/en/nph/28.jpg
+Oracle:Until end of turn, creatures you control gain "Whenever this creature deals damage to an opponent, you may return target creature that player controls to its owner's hand."
 End
\ No newline at end of file
diff --git a/res/cardsfolder/g/gravity_sphere.txt b/res/cardsfolder/g/gravity_sphere.txt
new file mode 100644
index 00000000000..7057dedb055
--- /dev/null
+++ b/res/cardsfolder/g/gravity_sphere.txt
@@ -0,0 +1,12 @@
+Name:Gravity Sphere
+ManaCost:2 R
+Types:World Enchantment
+Text:no text
+S:Mode$ Continuous | Affected$ Creature | RemoveKeyword$ Flying | Description$ All creatures lose flying.
+SVar:PlayMain1:TRUE
+SVar:RemRandomDeck:True
+SVar:Rarity:Rare
+SVar:Picture:http://www.wizards.com/global/images/magic/general/gravity_sphere.jpg
+SetInfo:LEG|Rare|http://magiccards.info/scans/en/lg/149.jpg
+Oracle:All creatures lose flying.
+End
\ No newline at end of file
diff --git a/src/main/java/forge/card/staticAbility/StaticAbility.java b/src/main/java/forge/card/staticAbility/StaticAbility.java
index 3d23cc4c341..29a59e01cac 100644
--- a/src/main/java/forge/card/staticAbility/StaticAbility.java
+++ b/src/main/java/forge/card/staticAbility/StaticAbility.java
@@ -93,7 +93,8 @@ public class StaticAbility {
             return 6; //Layer 6
         
         if(mapParams.containsKey("AddKeyword") || mapParams.containsKey("AddAbility")
-                || mapParams.containsKey("AddTrigger") || mapParams.containsKey("RemoveTriggers"))
+                || mapParams.containsKey("AddTrigger") || mapParams.containsKey("RemoveTriggers")
+                || mapParams.containsKey("RemoveKeyword"))
             return 7; //Layer 6 (dependent)
         
     	if(mapParams.containsKey("CharacteristicDefining"))