Fixed site. Starting refactor of deck generation

This commit is contained in:
jendave
2011-08-12 06:45:28 +00:00
parent bf68273caa
commit 8346d7c079
4 changed files with 34 additions and 12 deletions

1
.gitattributes vendored
View File

@@ -9499,6 +9499,7 @@ src/main/java/forge/NameChanger.java svneol=native#text/plain
src/main/java/forge/Phase.java svneol=native#text/plain src/main/java/forge/Phase.java svneol=native#text/plain
src/main/java/forge/PhaseUtil.java svneol=native#text/plain src/main/java/forge/PhaseUtil.java svneol=native#text/plain
src/main/java/forge/Player.java svneol=native#text/plain src/main/java/forge/Player.java svneol=native#text/plain
src/main/java/forge/PlayerType.java svneol=native#text/plain
src/main/java/forge/PlayerUtil.java svneol=native#text/plain src/main/java/forge/PlayerUtil.java svneol=native#text/plain
src/main/java/forge/PlayerZone.java svneol=native#text/plain src/main/java/forge/PlayerZone.java svneol=native#text/plain
src/main/java/forge/PlayerZone_ComesIntoPlay.java svneol=native#text/plain src/main/java/forge/PlayerZone_ComesIntoPlay.java svneol=native#text/plain

View File

@@ -0,0 +1,19 @@
/**
*
*/
package forge;
/**
* @author jendave
*
*/
public enum PlayerType {
/**
*
*/
HUMAN,
/**
*
*/
COMPUTER
}

View File

@@ -63,6 +63,7 @@ import forge.Gui_DownloadSetPictures_LQ;
import forge.Gui_QuestOptions; import forge.Gui_QuestOptions;
import forge.ImageCache; import forge.ImageCache;
import forge.MyRandom; import forge.MyRandom;
import forge.PlayerType;
import forge.SealedDeck; import forge.SealedDeck;
import forge.deck.Deck; import forge.deck.Deck;
import forge.deck.DeckManager; import forge.deck.DeckManager;
@@ -791,7 +792,7 @@ public class OldGuiNewGame extends JFrame implements NewConstants, NewConstants.
if (humanGenerate) { if (humanGenerate) {
if (constructed) { if (constructed) {
genDecks("H"); genDecks(PlayerType.HUMAN);
} }
// else if(sealed) // else if(sealed)
// Constant.Runtime.HumanDeck[0] = generateSealedDeck(); // Constant.Runtime.HumanDeck[0] = generateSealedDeck();
@@ -811,7 +812,7 @@ public class OldGuiNewGame extends JFrame implements NewConstants, NewConstants.
if (computerGenerate) { if (computerGenerate) {
if (constructed) { if (constructed) {
genDecks("C"); genDecks(PlayerType.COMPUTER);
} // Constant.Runtime.ComputerDeck[0] = } // Constant.Runtime.ComputerDeck[0] =
// generateConstructedDeck(); // generateConstructedDeck();
// else if(sealed) // else if(sealed)
@@ -858,8 +859,9 @@ public class OldGuiNewGame extends JFrame implements NewConstants, NewConstants.
* *
* @param p * @param p
* a {@link java.lang.String} object. * a {@link java.lang.String} object.
* TODO: jendave to refactor deck generation
*/ */
private void genDecks(final String p) { private void genDecks(final PlayerType playerType) {
Deck d = null; Deck d = null;
ArrayList<String> decks = new ArrayList<String>(); ArrayList<String> decks = new ArrayList<String>();
@@ -871,7 +873,7 @@ public class OldGuiNewGame extends JFrame implements NewConstants, NewConstants.
decks.add("3-Color Deck (new)"); decks.add("3-Color Deck (new)");
String prompt = "Generate "; String prompt = "Generate ";
if (p.equals("H")) { if (playerType.equals(PlayerType.HUMAN)) {
prompt += "Human "; prompt += "Human ";
} else { } else {
prompt += "Computer "; prompt += "Computer ";
@@ -889,14 +891,14 @@ public class OldGuiNewGame extends JFrame implements NewConstants, NewConstants.
} else if (o.toString().equals(decks.get(3))) { } else if (o.toString().equals(decks.get(3))) {
d = generateConstructedThemeDeck(); d = generateConstructedThemeDeck();
} else if (o.toString().equals(decks.get(4))) { } else if (o.toString().equals(decks.get(4))) {
d = generate2ColorDeck(p); d = generate2ColorDeck(playerType);
} else if (o.toString().equals(decks.get(5))) { } else if (o.toString().equals(decks.get(5))) {
d = generate3ColorDeck(p); d = generate3ColorDeck(playerType;
} }
if (p.equals("H")) { if (playerType.equals(PlayerType.HUMAN)) {
Constant.Runtime.HumanDeck[0] = d; Constant.Runtime.HumanDeck[0] = d;
} else if (p.equals("C")) { } else if (playerType.equals(PlayerType.COMPUTER)) {
Constant.Runtime.ComputerDeck[0] = d; Constant.Runtime.ComputerDeck[0] = d;
} }
} }

View File

@@ -1,5 +1,5 @@
----- -----
Maven Project Site Forge Maven Project Site
----- -----
----- -----
2011-08-10 2011-08-10
@@ -30,17 +30,17 @@ Forge
Forge supports a number of keywords such as exalted, fear, flying, shadow, flanking, protection, wither, flash, Forge supports a number of keywords such as exalted, fear, flying, shadow, flanking, protection, wither, flash,
defender, reach, and haste. Forge now also has a mana pool and supports creature enchantments. defender, reach, and haste. Forge now also has a mana pool and supports creature enchantments.
Forge runs on Windows, Linux, and Macs. You can download Forge from Forge runs on Windows, Linux, and OSX. You can download Forge from
{{{http://cardforge.org/releases/releases/}here}}. {{{http://cardforge.org/releases/releases/}here}}.
<<Maven Project Links>> <<Maven Project Links>>
* {{{http://cardforge.org/releases/site/index.html}Maven Project Site}}
* {{{http://cardforge.org/releases/site/apidocs/index.html}JavaDocs}} * {{{http://cardforge.org/releases/site/apidocs/index.html}JavaDocs}}
* {{{http://cardforge.org/releases/site/xref/index.html}Browsable Source Code}} * {{{http://cardforge.org/releases/site/xref/index.html}Browsable Source Code}}
* {{{http://cardforge.org/releases/site/project-reports.html}Project Reports}}
<<Related Links>> <<Related Links>>