From 75ed9fb4ee2a48f8b2d6d0931e8076e04eae45df Mon Sep 17 00:00:00 2001 From: jendave Date: Sun, 7 Aug 2011 01:46:19 +0000 Subject: [PATCH] reverting r9653 (remove Reality Twist and Naked Singularity) --- .gitattributes | 2 -- res/cardsfolder/naked_singularity.txt | 9 --------- res/cardsfolder/reality_twist.txt | 9 --------- src/forge/GameActionUtil.java | 13 +++++++++++-- 4 files changed, 11 insertions(+), 22 deletions(-) delete mode 100644 res/cardsfolder/naked_singularity.txt delete mode 100644 res/cardsfolder/reality_twist.txt diff --git a/.gitattributes b/.gitattributes index afe557c49ba..a9a501f2979 100644 --- a/.gitattributes +++ b/.gitattributes @@ -4752,7 +4752,6 @@ res/cardsfolder/nacatl_outlander.txt -text svneol=native#text/plain res/cardsfolder/nacatl_savage.txt -text svneol=native#text/plain res/cardsfolder/nacre_talisman.txt -text svneol=native#text/plain res/cardsfolder/nagao_bound_by_honor.txt svneol=native#text/plain -res/cardsfolder/naked_singularity.txt -text svneol=native#text/plain res/cardsfolder/nameless_inversion.txt -text svneol=native#text/plain res/cardsfolder/nameless_one.txt -text svneol=native#text/plain res/cardsfolder/nameless_race.txt -text svneol=native#text/plain @@ -5661,7 +5660,6 @@ res/cardsfolder/reach_of_branches.txt -text svneol=native#text/plain res/cardsfolder/reach_through_mists.txt -text svneol=native#text/plain res/cardsfolder/reality_spasm.txt svneol=native#text/plain res/cardsfolder/reality_strobe.txt svneol=native#text/plain -res/cardsfolder/reality_twist.txt -text svneol=native#text/plain res/cardsfolder/reanimate.txt -text svneol=native#text/plain res/cardsfolder/reap_and_sow.txt svneol=native#text/plain res/cardsfolder/reaper_king.txt svneol=native#text/plain diff --git a/res/cardsfolder/naked_singularity.txt b/res/cardsfolder/naked_singularity.txt deleted file mode 100644 index 6f176c17213..00000000000 --- a/res/cardsfolder/naked_singularity.txt +++ /dev/null @@ -1,9 +0,0 @@ -Name:Naked Singularity -ManaCost:5 -Types:Artifact -Text:If tapped for mana, Plains produce R, Islands produce G, Swamps produce W, Mountains produce U, and Forests produce B instead of any other type. -K:Cumulative upkeep:3 -SVar:RemRandomDeck:True -SVar:Rarity:Rare -SVar:Picture:http://www.wizards.com/global/images/magic/general/naked_singularity.jpg -End \ No newline at end of file diff --git a/res/cardsfolder/reality_twist.txt b/res/cardsfolder/reality_twist.txt deleted file mode 100644 index e0d6cfcbac0..00000000000 --- a/res/cardsfolder/reality_twist.txt +++ /dev/null @@ -1,9 +0,0 @@ -Name:Reality Twist -ManaCost:U U U -Types:Enchantment -Text:If tapped for mana, Plains produce R, Swamps produce G, Mountains produce W, and Forests produce B instead of any other type. -K:Cumulative upkeep:1 U U -SVar:RemRandomDeck:True -SVar:Rarity:Rare -SVar:Picture:http://www.wizards.com/global/images/magic/general/reality_twist.jpg -End \ No newline at end of file diff --git a/src/forge/GameActionUtil.java b/src/forge/GameActionUtil.java index 44b20e9f833..b0404397337 100644 --- a/src/forge/GameActionUtil.java +++ b/src/forge/GameActionUtil.java @@ -5325,10 +5325,13 @@ public class GameActionUtil { private static final long serialVersionUID = 8005448956536998277L; public void execute() { + + + HashMap produces = new HashMap(); + /* + * for future use boolean naked = AllZoneUtil.isCardInPlay("Naked Singularity"); boolean twist = AllZoneUtil.isCardInPlay("Reality Twist"); - HashMap produces = new HashMap(); - //set up what they produce produces.put("Forest", naked || twist ? "B" : "G"); produces.put("Island", naked == true ? "G" : "U"); @@ -5339,6 +5342,12 @@ public class GameActionUtil { if(naked) produces.put("Swamp", "W"); else if(twist) produces.put("Swamp", "G"); else produces.put("Swamp", "B"); + */ + produces.put("Forest", "G"); + produces.put("Island", "U"); + produces.put("Mountain", "R"); + produces.put("Plains", "W"); + produces.put("Swamp", "B"); CardList lands = AllZoneUtil.getCardsInGame(); lands = lands.filter(AllZoneUtil.lands);