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

Renamed *Booster* methods to *Draft*. (A booster is also a set of cards, using the word draft makes the code more precise)

Browse Source
This commit is contained in:
jendave
2011-08-06 22:49:41 +00:00
parent 34226dd0fa
commit 566fc930da
4 changed files with 33 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/forge/Gui_BoosterDraft.java
View File

@@ -559,7 +559,7 @@ public class Gui_BoosterDraft extends JFrame implements CardContainer, NewConsta
human, computer[0], computer[1], computer[2], computer[3], computer[4], computer[5], computer[6]}; human, computer[0], computer[1], computer[2], computer[3], computer[4], computer[5], computer[6]};
DeckManager deckManager = new DeckManager(ForgeProps.getFile(NEW_DECKS)); DeckManager deckManager = new DeckManager(ForgeProps.getFile(NEW_DECKS));
deckManager.addBoosterDeck(all); deckManager.addDraftDeck(all);
//write file //write file
deckManager.close(); deckManager.close();

18
src/forge/Gui_DeckEditor_Menu.java
View File

@@ -343,7 +343,7 @@ public class Gui_DeckEditor_Menu extends JMenuBar implements NewConstants {
currentGameType = Constant.GameType.Draft; currentGameType = Constant.GameType.Draft;
//move all cards from deck main and sideboard to CardList //move all cards from deck main and sideboard to CardList
Deck deck = deckManager.getBoosterDeck(currentDeckName)[0]; Deck deck = deckManager.getDraftDeck(currentDeckName)[0];
setDeckData("", false); setDeckData("", false);
CardList top = new CardList(); CardList top = new CardList();
@@ -621,7 +621,7 @@ public class Gui_DeckEditor_Menu extends JMenuBar implements NewConstants {
//and the other 7 are the computer's deck //and the other 7 are the computer's deck
if (currentGameType.equals(Constant.GameType.Draft)) { if (currentGameType.equals(Constant.GameType.Draft)) {
//read all draft decks //read all draft decks
Deck d[] = deckManager.getBoosterDeck(currentDeckName); Deck d[] = deckManager.getDraftDeck(currentDeckName);
//replace your deck //replace your deck
d[0] = deck; d[0] = deck;
@@ -885,7 +885,7 @@ public class Gui_DeckEditor_Menu extends JMenuBar implements NewConstants {
currentGameType = Constant.GameType.Draft; currentGameType = Constant.GameType.Draft;
newDraftItem.setEnabled(true); newDraftItem.setEnabled(true);
Deck deck = deckManager.getBoosterDeck(name)[0]; Deck deck = deckManager.getDraftDeck(name)[0];
showDraftDeck(deck); showDraftDeck(deck);
}//open draft }//open draft
@@ -928,9 +928,9 @@ public class Gui_DeckEditor_Menu extends JMenuBar implements NewConstants {
else if (currentGameType.equals(Constant.GameType.Draft)) { else if (currentGameType.equals(Constant.GameType.Draft)) {
setDeckData(currentDeckName, true); setDeckData(currentDeckName, true);
//write booster deck //write booster deck
Deck[] all = deckManager.getBoosterDeck(currentDeckName); Deck[] all = deckManager.getDraftDeck(currentDeckName);
all[0] = getDeck(); all[0] = getDeck();
deckManager.addBoosterDeck(all); deckManager.addDraftDeck(all);
} }
else//constructed or sealed else//constructed or sealed
{ {
@@ -952,7 +952,7 @@ public class Gui_DeckEditor_Menu extends JMenuBar implements NewConstants {
} }
else if (currentGameType.equals(Constant.GameType.Draft)) { else if (currentGameType.equals(Constant.GameType.Draft)) {
//MUST copy array //MUST copy array
Deck[] read = deckManager.getBoosterDeck(currentDeckName); Deck[] read = deckManager.getDraftDeck(currentDeckName);
Deck[] all = new Deck[read.length]; Deck[] all = new Deck[read.length];
System.arraycopy(read, 0, all, 0, read.length); System.arraycopy(read, 0, all, 0, read.length);
@@ -960,7 +960,7 @@ public class Gui_DeckEditor_Menu extends JMenuBar implements NewConstants {
setDeckData(name, true); setDeckData(name, true);
all[0] = getDeck(); all[0] = getDeck();
deckManager.addBoosterDeck(all); deckManager.addDraftDeck(all);
} }
else//constructed and sealed else//constructed and sealed
{ {
@@ -985,7 +985,7 @@ public class Gui_DeckEditor_Menu extends JMenuBar implements NewConstants {
} }
if (currentGameType.equals(Constant.GameType.Draft)) { if (currentGameType.equals(Constant.GameType.Draft)) {
deckManager.deleteBoosterDeck(currentDeckName); deckManager.deleteDraftDeck(currentDeckName);
} }
else { else {
deckManager.deleteDeck(currentDeckName); deckManager.deleteDeck(currentDeckName);
@@ -1093,7 +1093,7 @@ public class Gui_DeckEditor_Menu extends JMenuBar implements NewConstants {
//only get decks according to the Gui_NewGame screen option //only get decks according to the Gui_NewGame screen option
if (deckType.equals(Constant.GameType.Draft)) { if (deckType.equals(Constant.GameType.Draft)) {
for (String s : deckManager.getBoosterDecks().keySet()) { for (String s : deckManager.getDraftDecks().keySet()) {
list.add(s); list.add(s);
} }
} }

4
src/forge/Gui_NewGame.java
View File

@@ -538,7 +538,7 @@ public class Gui_NewGame extends JFrame implements NewConstants, NewConstants.LA
return; return;
} else//load old draft } else//load old draft
{ {
Deck[] deck = deckManager.getBoosterDeck(human); Deck[] deck = deckManager.getDraftDeck(human);
int index = Integer.parseInt(computer); int index = Integer.parseInt(computer);
Constant.Runtime.HumanDeck[0] = deck[0]; Constant.Runtime.HumanDeck[0] = deck[0];
@@ -893,7 +893,7 @@ public class Gui_NewGame extends JFrame implements NewConstants, NewConstants.LA
computerComboBox.removeAllItems(); computerComboBox.removeAllItems();
humanComboBox.addItem("New Draft"); humanComboBox.addItem("New Draft");
Object[] key = deckManager.getBoosterDecks().keySet().toArray(); Object[] key = deckManager.getDraftDecks().keySet().toArray();
Arrays.sort(key); Arrays.sort(key);
for (Object aKey : key) { for (Object aKey : key) {

42
src/forge/deck/DeckManager.java
View File

@@ -32,7 +32,7 @@ public class DeckManager {
private File deckDir; private File deckDir;
Map<String, Deck> deckMap; Map<String, Deck> deckMap;
Map<String, Deck[]> boosterMap; Map<String, Deck[]> draftMap;
public DeckManager(File deckDir) { public DeckManager(File deckDir) {
if (deckDir == null) { if (deckDir == null) {
@@ -50,7 +50,7 @@ public class DeckManager {
throw new IOException("Directory can't be created"); throw new IOException("Directory can't be created");
} }
this.deckMap = new HashMap<String, Deck>(); this.deckMap = new HashMap<String, Deck>();
this.boosterMap = new HashMap<String, Deck[]>(); this.draftMap = new HashMap<String, Deck[]>();
readAllDecks(); readAllDecks();
} }
} catch (IOException ex) { } catch (IOException ex) {
@@ -65,7 +65,7 @@ public class DeckManager {
} }
public boolean isUniqueDraft(String deckName) { public boolean isUniqueDraft(String deckName) {
return !boosterMap.keySet().contains(deckName); return !draftMap.keySet().contains(deckName);
} }
public Deck getDeck(String deckName) { public Deck getDeck(String deckName) {
@@ -86,34 +86,34 @@ public class DeckManager {
deckMap.remove(deckName); deckMap.remove(deckName);
} }
public Deck[] getBoosterDeck(String deckName) { public Deck[] getDraftDeck(String deckName) {
if (!boosterMap.containsKey(deckName)) { if (!draftMap.containsKey(deckName)) {
throw new RuntimeException( throw new RuntimeException(
"DeckManager : getBoosterDeck() error, deck name not found - " + deckName); "DeckManager : getDraftDeck() error, deck name not found - " + deckName);
} }
return boosterMap.get(deckName); return draftMap.get(deckName);
} }
public void addBoosterDeck(Deck[] deck) { public void addDraftDeck(Deck[] deck) {
checkBoosterDeck(deck); checkDraftDeck(deck);
boosterMap.put(deck[0].toString(), deck); draftMap.put(deck[0].toString(), deck);
} }
public void deleteBoosterDeck(String deckName) { public void deleteDraftDeck(String deckName) {
if (!boosterMap.containsKey(deckName)) { if (!draftMap.containsKey(deckName)) {
throw new RuntimeException( throw new RuntimeException(
"DeckManager : deleteBoosterDeck() error, deck name not found - " + deckName); "DeckManager : deleteDraftDeck() error, deck name not found - " + deckName);
} }
boosterMap.remove(deckName); draftMap.remove(deckName);
} }
private void checkBoosterDeck(Deck[] deck) { private void checkDraftDeck(Deck[] deck) {
if (deck == null || deck.length != 8 || deck[0].getName().equals("") if (deck == null || deck.length != 8 || deck[0].getName().equals("")
|| (!deck[0].getDeckType().equals(Constant.GameType.Draft))) { || (!deck[0].getDeckType().equals(Constant.GameType.Draft))) {
throw new RuntimeException("DeckManager : checkBoosterDeck() error, invalid deck"); throw new RuntimeException("DeckManager : checkDraftDeck() error, invalid deck");
} }
} }
@@ -122,8 +122,8 @@ public class DeckManager {
return deckMap.values(); return deckMap.values();
} }
public Map<String, Deck[]> getBoosterDecks() { public Map<String, Deck[]> getDraftDecks() {
return new HashMap<String, Deck[]>(boosterMap); return new HashMap<String, Deck[]>(draftMap);
} }
public void close() { public void close() {
@@ -133,7 +133,7 @@ public class DeckManager {
public void readAllDecks() { public void readAllDecks() {
deckMap.clear(); deckMap.clear();
boosterMap.clear(); draftMap.clear();
File[] files; File[] files;
@@ -151,7 +151,7 @@ public class DeckManager {
d[i] = readDeck(new File(file, i + ".dck")); d[i] = readDeck(new File(file, i + ".dck"));
} }
boosterMap.put(d[0].getName(), d); draftMap.put(d[0].getName(), d);
} }
} }
@@ -290,7 +290,7 @@ public class DeckManager {
files.addAll(asList(deckDir.listFiles(BDKFileFilter))); files.addAll(asList(deckDir.listFiles(BDKFileFilter)));
//save the files and remove them from the list //save the files and remove them from the list
for (Entry<String, Deck[]> e : boosterMap.entrySet()) { for (Entry<String, Deck[]> e : draftMap.entrySet()) {
File f = new File(deckDir, deriveFileName(e.getValue()[0].getName()) + ".bdk"); File f = new File(deckDir, deriveFileName(e.getValue()[0].getName()) + ".bdk");
f.mkdir(); f.mkdir();
for (int i = 0; i < e.getValue().length; i++) { for (int i = 0; i < e.getValue().length; i++) {