external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-19 04:08:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

reverting r9653 (remove Reality Twist and Naked Singularity)

Browse Source
This commit is contained in:
jendave
2011-08-07 01:46:19 +00:00
parent 473aa83163
commit 75ed9fb4ee
4 changed files with 11 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitattributes vendored
View File

@@ -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/nacatl_savage.txt -text svneol=native#text/plain
res/cardsfolder/nacre_talisman.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/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_inversion.txt -text svneol=native#text/plain
res/cardsfolder/nameless_one.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 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/reach_through_mists.txt -text svneol=native#text/plain
res/cardsfolder/reality_spasm.txt 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_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/reanimate.txt -text svneol=native#text/plain
res/cardsfolder/reap_and_sow.txt svneol=native#text/plain res/cardsfolder/reap_and_sow.txt svneol=native#text/plain
res/cardsfolder/reaper_king.txt svneol=native#text/plain res/cardsfolder/reaper_king.txt svneol=native#text/plain

9
res/cardsfolder/naked_singularity.txt
View File

@@ -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

9
res/cardsfolder/reality_twist.txt
View File

@@ -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

13
src/forge/GameActionUtil.java
View File

@@ -5325,10 +5325,13 @@ public class GameActionUtil {
private static final long serialVersionUID = 8005448956536998277L; private static final long serialVersionUID = 8005448956536998277L;
public void execute() { public void execute() {
HashMap<String,String> produces = new HashMap<String,String>();
/*
* for future use
boolean naked = AllZoneUtil.isCardInPlay("Naked Singularity"); boolean naked = AllZoneUtil.isCardInPlay("Naked Singularity");
boolean twist = AllZoneUtil.isCardInPlay("Reality Twist"); boolean twist = AllZoneUtil.isCardInPlay("Reality Twist");
HashMap<String,String> produces = new HashMap<String,String>();
//set up what they produce //set up what they produce
produces.put("Forest", naked || twist ? "B" : "G"); produces.put("Forest", naked || twist ? "B" : "G");
produces.put("Island", naked == true ? "G" : "U"); produces.put("Island", naked == true ? "G" : "U");
@@ -5339,6 +5342,12 @@ public class GameActionUtil {
if(naked) produces.put("Swamp", "W"); if(naked) produces.put("Swamp", "W");
else if(twist) produces.put("Swamp", "G"); else if(twist) produces.put("Swamp", "G");
else produces.put("Swamp", "B"); 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(); CardList lands = AllZoneUtil.getCardsInGame();
lands = lands.filter(AllZoneUtil.lands); lands = lands.filter(AllZoneUtil.lands);