diff --git a/src/main/java/forge/GameAction.java b/src/main/java/forge/GameAction.java
index f92ee6330f8..f5189750168 100644
--- a/src/main/java/forge/GameAction.java
+++ b/src/main/java/forge/GameAction.java
@@ -626,7 +626,7 @@ public class GameAction {
* @param c
* a {@link forge.Card} object.
*/
- public final void discard_PutIntoPlayInstead(final Card c) {
+ public final void discardPutIntoPlayInstead(final Card c) {
this.moveToPlay(c);
if (c.getName().equals("Dodecapod")) {
@@ -642,7 +642,7 @@ public class GameAction {
* @param c
* a {@link forge.Card} object.
*/
- public final void discard_madness(final Card c) {
+ public final void discardMadness(final Card c) {
// Whenever a card with madness is discarded, you may cast it for it's
// madness cost
if (!c.hasMadness()) {
@@ -1287,7 +1287,7 @@ public class GameAction {
Constant.Quest.FANTASY_QUEST[0] = true;
}
- private boolean Start_Cut = false;
+ private boolean startCut = false;
/**
*
@@ -1347,7 +1347,7 @@ public class GameAction {
}
}
}
- final ArrayList RAICards = new ArrayList();
+ final ArrayList rAICards = new ArrayList();
for (final Entry stackOfCards : computerDeck.getMain()) {
final CardPrinted cardPrinted = stackOfCards.getKey();
for (int i = 0; i < stackOfCards.getValue(); i++) {
@@ -1371,7 +1371,7 @@ public class GameAction {
AllZone.getComputerPlayer().getZone(Zone.Library).add(card);
if (card.getSVar("RemAIDeck").equals("True")) {
- RAICards.add(card.getName());
+ rAICards.add(card.getName());
// get card picture so that it is in the image cache
// ImageCache.getImage(card);
}
@@ -1383,14 +1383,14 @@ public class GameAction {
}
}
}
- if (RAICards.size() > 0) {
+ if (rAICards.size() > 0) {
final StringBuilder sb = new StringBuilder(
"AI deck contains the following cards that it can't play or may be buggy:\n");
- for (int i = 0; i < RAICards.size(); i++) {
- sb.append(RAICards.get(i));
+ for (int i = 0; i < rAICards.size(); i++) {
+ sb.append(rAICards.get(i));
if (((i % 4) == 0) && (i > 0)) {
sb.append("\n");
- } else if (i != (RAICards.size() - 1)) {
+ } else if (i != (rAICards.size() - 1)) {
sb.append(", ");
}
}
@@ -1423,7 +1423,7 @@ public class GameAction {
if (this.isStartCut()) {
this.seeWhoPlaysFirst();
} else {
- this.seeWhoPlaysFirst_CoinToss();
+ this.seeWhoPlaysFirstCoinToss();
}
} else if (AllZone.getMatchState().hasWonLastGame(AllZone.getHumanPlayer().getName())) {
// if player won last, AI starts
@@ -1598,40 +1598,40 @@ public class GameAction {
* seeWhoPlaysFirst_CoinToss.
*
*/
- public final void seeWhoPlaysFirst_CoinToss() {
+ public final void seeWhoPlaysFirstCoinToss() {
final Object[] possibleValues = { ForgeProps.getLocalized(GameActionText.HEADS),
ForgeProps.getLocalized(GameActionText.TAILS) };
final Object q = JOptionPane.showOptionDialog(null, ForgeProps.getLocalized(GameActionText.HEADS_OR_TAILS),
ForgeProps.getLocalized(GameActionText.COIN_TOSS), JOptionPane.DEFAULT_OPTION,
JOptionPane.INFORMATION_MESSAGE, null, possibleValues, possibleValues[0]);
- final int Flip = MyRandom.getRandom().nextInt(2);
- String Human_Flip = " ";
- String Computer_Flip = " ";
+ final int flip = MyRandom.getRandom().nextInt(2);
+ String humanFlip = " ";
+ String computerFlip = " ";
// JOptionPane.showMessageDialog(null, q, "",
// JOptionPane.INFORMATION_MESSAGE);
if (q.equals(0)) {
- Human_Flip = ForgeProps.getLocalized(GameActionText.HEADS);
- Computer_Flip = ForgeProps.getLocalized(GameActionText.TAILS);
+ humanFlip = ForgeProps.getLocalized(GameActionText.HEADS);
+ computerFlip = ForgeProps.getLocalized(GameActionText.TAILS);
} else {
- Human_Flip = ForgeProps.getLocalized(GameActionText.TAILS);
- Computer_Flip = ForgeProps.getLocalized(GameActionText.HEADS);
+ humanFlip = ForgeProps.getLocalized(GameActionText.TAILS);
+ computerFlip = ForgeProps.getLocalized(GameActionText.HEADS);
}
- if (((Flip == 0) && q.equals(0)) || ((Flip == 1) && q.equals(1))) {
+ if (((flip == 0) && q.equals(0)) || ((flip == 1) && q.equals(1))) {
JOptionPane.showMessageDialog(null,
- Human_Flip + "\r\n" + ForgeProps.getLocalized(GameActionText.HUMAN_WIN), "",
+ humanFlip + "\r\n" + ForgeProps.getLocalized(GameActionText.HUMAN_WIN), "",
JOptionPane.INFORMATION_MESSAGE);
} else {
this.computerStartsGame();
JOptionPane.showMessageDialog(null,
- Computer_Flip + "\r\n" + ForgeProps.getLocalized(GameActionText.COMPUTER_WIN), "",
+ computerFlip + "\r\n" + ForgeProps.getLocalized(GameActionText.COMPUTER_WIN), "",
JOptionPane.INFORMATION_MESSAGE);
}
} // seeWhoPlaysFirst_CoinToss()
- private Card HumanCut = null;
- private Card ComputerCut = null;
+ private Card humanCut = null;
+ private Card computerCut = null;
/**
*
@@ -1640,21 +1640,21 @@ public class GameAction {
*/
public final void seeWhoPlaysFirst() {
- CardList HLibrary = AllZone.getHumanPlayer().getCardsIn(Zone.Library);
- HLibrary = HLibrary.filter(CardListFilter.NON_LANDS);
- CardList CLibrary = AllZone.getComputerPlayer().getCardsIn(Zone.Library);
- CLibrary = CLibrary.filter(CardListFilter.NON_LANDS);
+ CardList hLibrary = AllZone.getHumanPlayer().getCardsIn(Zone.Library);
+ hLibrary = hLibrary.filter(CardListFilter.NON_LANDS);
+ CardList cLibrary = AllZone.getComputerPlayer().getCardsIn(Zone.Library);
+ cLibrary = cLibrary.filter(CardListFilter.NON_LANDS);
- final boolean Starter_Determined = false;
- int Cut_Count = 0;
- final int Cut_CountMax = 20;
- for (int i = 0; i < Cut_CountMax; i++) {
- if (Starter_Determined) {
+ final boolean starterDetermined = false;
+ int cutCount = 0;
+ final int cutCountMax = 20;
+ for (int i = 0; i < cutCountMax; i++) {
+ if (starterDetermined) {
break;
}
- if (HLibrary.size() > 0) {
- this.setHumanCut(HLibrary.get(MyRandom.getRandom().nextInt(HLibrary.size())));
+ if (hLibrary.size() > 0) {
+ this.setHumanCut(hLibrary.get(MyRandom.getRandom().nextInt(hLibrary.size())));
} else {
this.computerStartsGame();
JOptionPane.showMessageDialog(null, ForgeProps.getLocalized(GameActionText.HUMAN_MANA_COST) + "\r\n"
@@ -1662,15 +1662,15 @@ public class GameAction {
return;
}
- if (CLibrary.size() > 0) {
- this.setComputerCut(CLibrary.get(MyRandom.getRandom().nextInt(CLibrary.size())));
+ if (cLibrary.size() > 0) {
+ this.setComputerCut(cLibrary.get(MyRandom.getRandom().nextInt(cLibrary.size())));
} else {
JOptionPane.showMessageDialog(null, ForgeProps.getLocalized(GameActionText.COMPUTER_MANA_COST) + "\r\n"
+ ForgeProps.getLocalized(GameActionText.HUMAN_STARTS), "", JOptionPane.INFORMATION_MESSAGE);
return;
}
- Cut_Count = Cut_Count + 1;
+ cutCount = cutCount + 1;
AllZone.getGameAction().moveTo(AllZone.getHumanPlayer().getZone(Constant.Zone.Library),
AllZone.getGameAction().getHumanCut());
AllZone.getGameAction().moveTo(AllZone.getComputerPlayer().getZone(Constant.Zone.Library),
@@ -1681,7 +1681,7 @@ public class GameAction {
+ this.getHumanCut().getManaCost() + ")" + "\r\n");
sb.append(ForgeProps.getLocalized(GameActionText.COMPUTER_CUT) + this.getComputerCut().getName() + " ("
+ this.getComputerCut().getManaCost() + ")" + "\r\n");
- sb.append("\r\n" + "Number of times the deck has been cut: " + Cut_Count + "\r\n");
+ sb.append("\r\n" + "Number of times the deck has been cut: " + cutCount + "\r\n");
if (CardUtil.getConvertedManaCost(this.getComputerCut().getManaCost()) > CardUtil.getConvertedManaCost(this
.getHumanCut().getManaCost())) {
this.computerStartsGame();
@@ -1695,7 +1695,7 @@ public class GameAction {
return;
} else {
sb.append(ForgeProps.getLocalized(GameActionText.EQUAL_CONVERTED_MANA) + "\r\n");
- if (i == (Cut_CountMax - 1)) {
+ if (i == (cutCountMax - 1)) {
sb.append(ForgeProps.getLocalized(GameActionText.RESOLVE_STARTER));
if (MyRandom.getRandom().nextInt(2) == 1) {
JOptionPane.showMessageDialog(null, sb + ForgeProps.getLocalized(GameActionText.HUMAN_WIN), "",
@@ -1898,10 +1898,10 @@ public class GameAction {
}
/** The Cost cutting_ get multi micker mana cost paid. */
- int CostCutting_GetMultiMickerManaCostPaid = 0;
+ private int costCuttingGetMultiMickerManaCostPaid = 0;
/** The Cost cutting_ get multi micker mana cost paid_ colored. */
- String CostCutting_GetMultiMickerManaCostPaid_Colored = "";
+ private String costCuttingGetMultiMickerManaCostPaidColored = "";
/**
*
@@ -2051,7 +2051,7 @@ public class GameAction {
int xBonus = 0;
final int max = 25;
if (sa.isMultiKicker()) {
- this.CostCutting_GetMultiMickerManaCostPaid_Colored = "";
+ this.setCostCuttingGetMultiMickerManaCostPaidColored("");
}
if (mana.toString().length() == 0) {
@@ -2166,8 +2166,8 @@ public class GameAction {
}
if (k[7].contains("Affinity")) {
final String spilt = k[7];
- final String[] color_spilt = spilt.split("/");
- k[7] = color_spilt[1];
+ final String[] colorSpilt = spilt.split("/");
+ k[7] = colorSpilt[1];
CardList playerList = controller.getCardsIn(Zone.Battlefield);
playerList = playerList.getType(k[7]);
k[3] = String.valueOf(playerList.size());
@@ -2204,18 +2204,18 @@ public class GameAction {
for (int no = 0; no < max; no++) {
numbers[no] = String.valueOf(no);
}
- String Number_ManaCost = " ";
+ String numberManaCost = " ";
if (mana.toString().length() == 1) {
- Number_ManaCost = mana.toString().substring(0, 1);
+ numberManaCost = mana.toString().substring(0, 1);
} else if (mana.toString().length() == 0) {
- Number_ManaCost = "0"; // Should Never Occur
+ numberManaCost = "0"; // Should Never Occur
} else {
- Number_ManaCost = mana.toString().substring(0, 2);
+ numberManaCost = mana.toString().substring(0, 2);
}
- Number_ManaCost = Number_ManaCost.trim();
+ numberManaCost = numberManaCost.trim();
for (int check = 0; check < max; check++) {
- if (Number_ManaCost.equals(numbers[check])) {
+ if (numberManaCost.equals(numbers[check])) {
mana = mana.replaceFirst(String.valueOf(check),
String.valueOf(check + Integer.valueOf(k[3])));
}
@@ -2247,15 +2247,15 @@ public class GameAction {
final Card card = cardsInPlay.get(i);
final ArrayList a = card.getKeyword();
int costKeywords = 0;
- final int[] costKeyword_Number = new int[a.size()];
+ final int[] costKeywordNumber = new int[a.size()];
for (int x = 0; x < a.size(); x++) {
if (a.get(x).toString().startsWith("CostChange")) {
- costKeyword_Number[costKeywords] = x;
+ costKeywordNumber[costKeywords] = x;
costKeywords = costKeywords + 1;
}
}
for (int cKeywords = 0; cKeywords < costKeywords; cKeywords++) {
- final String parse = card.getKeyword().get(costKeyword_Number[cKeywords]).toString();
+ final String parse = card.getKeyword().get(costKeywordNumber[cKeywords]).toString();
final String[] k = parse.split(":");
if (card.equals(originalCard)) {
if (!k[4].equals("Self")) {
@@ -2373,18 +2373,18 @@ public class GameAction {
for (int no = 0; no < max; no++) {
numbers[no] = String.valueOf(no);
}
- String Number_ManaCost = " ";
+ String numberManaCost = " ";
if (mana.toString().length() == 1) {
- Number_ManaCost = mana.toString().substring(0, 1);
+ numberManaCost = mana.toString().substring(0, 1);
} else if (mana.toString().length() == 0) {
- Number_ManaCost = "0"; // Should Never Occur
+ numberManaCost = "0"; // Should Never Occur
} else {
- Number_ManaCost = mana.toString().substring(0, 2);
+ numberManaCost = mana.toString().substring(0, 2);
}
- Number_ManaCost = Number_ManaCost.trim();
+ numberManaCost = numberManaCost.trim();
for (int check = 0; check < max; check++) {
- if (Number_ManaCost.equals(numbers[check])) {
+ if (numberManaCost.equals(numbers[check])) {
if ((spell.isXCost()) || ((spell.isMultiKicker()) && ((check - value) < 0))) {
xBonus = (xBonus - check) + value;
}
@@ -2408,8 +2408,8 @@ public class GameAction {
// Not Included as X Costs are not in
// Colored Mana
if (sa.isMultiKicker()) {
- this.CostCutting_GetMultiMickerManaCostPaid_Colored = this.CostCutting_GetMultiMickerManaCostPaid_Colored
- + k[3];
+ this.setCostCuttingGetMultiMickerManaCostPaidColored(this.getCostCuttingGetMultiMickerManaCostPaidColored()
+ + k[3]);
// JOptionPane.showMessageDialog(null,
// CostCutting_GetMultiMickerManaCostPaid_Colored,
// "", JOptionPane.INFORMATION_MESSAGE);
@@ -2438,14 +2438,14 @@ public class GameAction {
}
}
if (sa.isXCost()) {
- for (int XPaid = 0; XPaid < xBonus; XPaid++) {
+ for (int xPaid = 0; xPaid < xBonus; xPaid++) {
originalCard.addXManaCostPaid(1);
}
}
if (sa.isMultiKicker()) {
- this.CostCutting_GetMultiMickerManaCostPaid = 0;
- for (int XPaid = 0; XPaid < xBonus; XPaid++) {
- this.CostCutting_GetMultiMickerManaCostPaid = this.CostCutting_GetMultiMickerManaCostPaid + 1;
+ this.setCostCuttingGetMultiMickerManaCostPaid(0);
+ for (int xPaid = 0; xPaid < xBonus; xPaid++) {
+ this.setCostCuttingGetMultiMickerManaCostPaid(this.getCostCuttingGetMultiMickerManaCostPaid() + 1);
}
}
@@ -2550,7 +2550,7 @@ public class GameAction {
* @param skipTargeting
* a boolean.
*/
- public final void playSpellAbility_NoStack(final SpellAbility sa, final boolean skipTargeting) {
+ public final void playSpellAbilityNoStack(final SpellAbility sa, final boolean skipTargeting) {
sa.setActivatingPlayer(AllZone.getHumanPlayer());
if (sa.getPayCosts() != null) {
@@ -2627,7 +2627,7 @@ public class GameAction {
* a {@link forge.Card} object.
*/
public final void setComputerCut(final Card computerCut) {
- this.ComputerCut = computerCut;
+ this.computerCut = computerCut;
}
/**
@@ -2638,7 +2638,7 @@ public class GameAction {
* @return a {@link forge.Card} object.
*/
public final Card getComputerCut() {
- return this.ComputerCut;
+ return this.computerCut;
}
/**
@@ -2650,7 +2650,7 @@ public class GameAction {
* a boolean.
*/
public final void setStartCut(final boolean startCutIn) {
- this.Start_Cut = startCutIn;
+ this.startCut = startCutIn;
}
/**
@@ -2661,7 +2661,7 @@ public class GameAction {
* @return a boolean.
*/
public final boolean isStartCut() {
- return this.Start_Cut;
+ return this.startCut;
}
/**
@@ -2673,7 +2673,7 @@ public class GameAction {
* a {@link forge.Card} object.
*/
public final void setHumanCut(final Card humanCut) {
- this.HumanCut = humanCut;
+ this.humanCut = humanCut;
}
/**
@@ -2684,6 +2684,34 @@ public class GameAction {
* @return a {@link forge.Card} object.
*/
public final Card getHumanCut() {
- return this.HumanCut;
+ return this.humanCut;
+ }
+
+ /**
+ * @return the costCuttingGetMultiMickerManaCostPaid
+ */
+ public int getCostCuttingGetMultiMickerManaCostPaid() {
+ return costCuttingGetMultiMickerManaCostPaid;
+ }
+
+ /**
+ * @param costCuttingGetMultiMickerManaCostPaid the costCuttingGetMultiMickerManaCostPaid to set
+ */
+ public void setCostCuttingGetMultiMickerManaCostPaid(int costCuttingGetMultiMickerManaCostPaid) {
+ this.costCuttingGetMultiMickerManaCostPaid = costCuttingGetMultiMickerManaCostPaid; // TODO: Add 0 to parameter's name.
+ }
+
+ /**
+ * @return the costCuttingGetMultiMickerManaCostPaidColored
+ */
+ public String getCostCuttingGetMultiMickerManaCostPaidColored() {
+ return costCuttingGetMultiMickerManaCostPaidColored;
+ }
+
+ /**
+ * @param costCuttingGetMultiMickerManaCostPaidColored the costCuttingGetMultiMickerManaCostPaidColored to set
+ */
+ public void setCostCuttingGetMultiMickerManaCostPaidColored(String costCuttingGetMultiMickerManaCostPaidColored) {
+ this.costCuttingGetMultiMickerManaCostPaidColored = costCuttingGetMultiMickerManaCostPaidColored; // TODO: Add 0 to parameter's name.
}
}
diff --git a/src/main/java/forge/MagicStack.java b/src/main/java/forge/MagicStack.java
index 34ba9e340c1..7e8b485a75b 100644
--- a/src/main/java/forge/MagicStack.java
+++ b/src/main/java/forge/MagicStack.java
@@ -273,7 +273,7 @@ public class MagicStack extends MyObservable {
ManaCost manaCost = new ManaCost(sa.getManaCost());
String mana = manaCost.toString();
- int multiKickerPaid = AllZone.getGameAction().CostCutting_GetMultiMickerManaCostPaid;
+ int multiKickerPaid = AllZone.getGameAction().getCostCuttingGetMultiMickerManaCostPaid();
String numberManaCost = " ";
@@ -292,12 +292,12 @@ public class MagicStack extends MyObservable {
if ((check - multiKickerPaid) < 0) {
multiKickerPaid = multiKickerPaid - check;
- AllZone.getGameAction().CostCutting_GetMultiMickerManaCostPaid = multiKickerPaid;
+ AllZone.getGameAction().setCostCuttingGetMultiMickerManaCostPaid(multiKickerPaid);
mana = mana.replaceFirst(String.valueOf(check), "0");
} else {
mana = mana.replaceFirst(String.valueOf(check), String.valueOf(check - multiKickerPaid));
multiKickerPaid = 0;
- AllZone.getGameAction().CostCutting_GetMultiMickerManaCostPaid = multiKickerPaid;
+ AllZone.getGameAction().setCostCuttingGetMultiMickerManaCostPaid(multiKickerPaid);
}
}
mana = mana.trim();
@@ -306,16 +306,15 @@ public class MagicStack extends MyObservable {
}
manaCost = new ManaCost(mana);
}
- final String colorCut = AllZone.getGameAction().CostCutting_GetMultiMickerManaCostPaid_Colored;
+ final String colorCut = AllZone.getGameAction().getCostCuttingGetMultiMickerManaCostPaidColored();
for (int colorCutIx = 0; colorCutIx < colorCut.length(); colorCutIx++) {
if ("WUGRB".contains(colorCut.substring(colorCutIx, colorCutIx + 1))
&& !mana.equals(mana.replaceFirst((colorCut.substring(colorCutIx, colorCutIx + 1)), ""))) {
mana = mana.replaceFirst(colorCut.substring(colorCutIx, colorCutIx + 1), "");
- AllZone.getGameAction().CostCutting_GetMultiMickerManaCostPaid_Colored
- = AllZone.getGameAction().CostCutting_GetMultiMickerManaCostPaid_Colored
- .replaceFirst(colorCut.substring(colorCutIx, colorCutIx + 1), "");
+ AllZone.getGameAction().setCostCuttingGetMultiMickerManaCostPaidColored(AllZone.getGameAction().getCostCuttingGetMultiMickerManaCostPaidColored()
+ .replaceFirst(colorCut.substring(colorCutIx, colorCutIx + 1), ""));
mana = mana.trim();
if (mana.equals("")) {
@@ -492,8 +491,8 @@ public class MagicStack extends MyObservable {
if (manaCost.isPaid()) {
this.execute();
} else {
- if ((AllZone.getGameAction().CostCutting_GetMultiMickerManaCostPaid == 0)
- && AllZone.getGameAction().CostCutting_GetMultiMickerManaCostPaid_Colored
+ if ((AllZone.getGameAction().getCostCuttingGetMultiMickerManaCostPaid() == 0)
+ && AllZone.getGameAction().getCostCuttingGetMultiMickerManaCostPaidColored()
.equals("")) {
AllZone.getInputControl().setInput(
@@ -509,13 +508,13 @@ public class MagicStack extends MyObservable {
+ "\r\n"
+ "Mana in Reserve: "
+ ((AllZone.getGameAction()
- .CostCutting_GetMultiMickerManaCostPaid != 0)
+ .getCostCuttingGetMultiMickerManaCostPaid() != 0)
? AllZone
.getGameAction()
- .CostCutting_GetMultiMickerManaCostPaid
+ .getCostCuttingGetMultiMickerManaCostPaid()
: "")
+ AllZone.getGameAction()
- .CostCutting_GetMultiMickerManaCostPaid_Colored
+ .getCostCuttingGetMultiMickerManaCostPaidColored()
+ "\r\n" + "Times Kicked: "
+ sa.getSourceCard().getMultiKickerMagnitude() + "\r\n",
manaCost.toString(), this, unpaidCommand));
@@ -530,8 +529,8 @@ public class MagicStack extends MyObservable {
if (manaCost.isPaid()) {
paidCommand.execute();
} else {
- if ((AllZone.getGameAction().CostCutting_GetMultiMickerManaCostPaid == 0)
- && AllZone.getGameAction().CostCutting_GetMultiMickerManaCostPaid_Colored.equals("")) {
+ if ((AllZone.getGameAction().getCostCuttingGetMultiMickerManaCostPaid() == 0)
+ && AllZone.getGameAction().getCostCuttingGetMultiMickerManaCostPaidColored().equals("")) {
AllZone.getInputControl().setInput(
new Input_PayManaCost_Ability("Multikicker for " + sa.getSourceCard() + "\r\n"
+ "Times Kicked: " + sa.getSourceCard().getMultiKickerMagnitude() + "\r\n",
@@ -545,13 +544,13 @@ public class MagicStack extends MyObservable {
+ "\r\n"
+ "Mana in Reserve: "
+ ((AllZone.getGameAction()
- .CostCutting_GetMultiMickerManaCostPaid != 0)
+ .getCostCuttingGetMultiMickerManaCostPaid() != 0)
? AllZone
.getGameAction()
- .CostCutting_GetMultiMickerManaCostPaid
+ .getCostCuttingGetMultiMickerManaCostPaid()
: "")
+ AllZone.getGameAction()
- .CostCutting_GetMultiMickerManaCostPaid_Colored
+ .getCostCuttingGetMultiMickerManaCostPaidColored()
+ "\r\n" + "Times Kicked: "
+ sa.getSourceCard().getMultiKickerMagnitude() + "\r\n",
manaCost.toString(), paidCommand, unpaidCommand));
diff --git a/src/main/java/forge/Player.java b/src/main/java/forge/Player.java
index 19d86a18144..8b3eb55bb72 100644
--- a/src/main/java/forge/Player.java
+++ b/src/main/java/forge/Player.java
@@ -1402,7 +1402,7 @@ public abstract class Player extends GameEntity {
}
}
- AllZone.getGameAction().discard_madness(c);
+ AllZone.getGameAction().discardMadness(c);
if ((c.hasKeyword("If a spell or ability an opponent controls causes "
+ "you to discard CARDNAME, put it onto the battlefield instead of putting it into your graveyard.") || c
@@ -1410,7 +1410,7 @@ public abstract class Player extends GameEntity {
+ "you to discard CARDNAME, put it onto the battlefield with two +1/+1 "
+ "counters on it instead of putting it into your graveyard."))
&& null != sa && !c.getController().equals(sa.getSourceCard().getController())) {
- AllZone.getGameAction().discard_PutIntoPlayInstead(c);
+ AllZone.getGameAction().discardPutIntoPlayInstead(c);
} else if (c.hasKeyword("If a spell or ability an opponent controls "
+ "causes you to discard CARDNAME, return it to your hand.")) {
} else {
diff --git a/src/main/java/forge/Upkeep.java b/src/main/java/forge/Upkeep.java
index 3f4aeac9a1e..d04a715ccaa 100644
--- a/src/main/java/forge/Upkeep.java
+++ b/src/main/java/forge/Upkeep.java
@@ -88,23 +88,23 @@ public class Upkeep implements java.io.Serializable {
*/
public final void executeAt() {
AllZone.getStack().freezeStack();
- Upkeep.upkeep_Braid_Of_Fire();
+ Upkeep.upkeepBraidOfFire();
- Upkeep.upkeep_Slowtrips(); // for
+ Upkeep.upkeepSlowtrips(); // for
// "Draw a card at the beginning of the next turn's upkeep."
- Upkeep.upkeep_UpkeepCost(); // sacrifice unless upkeep cost is paid
- Upkeep.upkeep_Echo();
+ Upkeep.upkeepUpkeepCost(); // sacrifice unless upkeep cost is paid
+ Upkeep.upkeepEcho();
- Upkeep.upkeep_The_Abyss();
+ Upkeep.upkeepTheAbyss();
Upkeep.upkeepYawgmothDemon();
Upkeep.upkeepLordOfThePit();
Upkeep.upkeepDropOfHoney();
Upkeep.upkeepDemonicHordes();
- Upkeep.upkeep_Carnophage();
- Upkeep.upkeep_Sangrophage();
- Upkeep.upkeep_Dega_Sanctuary();
- Upkeep.upkeep_Ceta_Sanctuary();
- Upkeep.upkeep_Tangle_Wire();
+ Upkeep.upkeepCarnophage();
+ Upkeep.upkeepSangrophage();
+ Upkeep.upkeepDegaSanctuary();
+ Upkeep.upkeepCetaSanctuary();
+ Upkeep.upkeepTangleWire();
Upkeep.upkeepVesuvanDoppelgangerKeyword();
@@ -113,29 +113,29 @@ public class Upkeep implements java.io.Serializable {
Upkeep.upkeepKithkinZephyrnaut();
Upkeep.upkeepLeafCrownedElder();
Upkeep.upkeepMudbuttonClanger();
- Upkeep.upkeep_Nightshade_Schemers();
- Upkeep.upkeep_Pyroclast_Consul();
- Upkeep.upkeep_Sensation_Gorger();
- Upkeep.upkeep_Squeaking_Pie_Grubfellows();
- Upkeep.upkeep_Wandering_Graybeard();
- Upkeep.upkeep_Waterspout_Weavers();
- Upkeep.upkeep_Winnower_Patrol();
- Upkeep.upkeep_Wolf_Skull_Shaman();
+ Upkeep.upkeepNightshadeSchemers();
+ Upkeep.upkeepPyroclastConsul();
+ Upkeep.upkeepSensationGorger();
+ Upkeep.upkeepSqueakingPieGrubfellows();
+ Upkeep.upkeepWanderingGraybeard();
+ Upkeep.upkeepWaterspoutWeavers();
+ Upkeep.upkeepWinnowerPatrol();
+ Upkeep.upkeepWolfSkullShaman();
// upkeep_Dragon_Broodmother(); //put this before bitterblossom and
// mycoloth, so that they will resolve FIRST
- Upkeep.upkeep_Karma();
- Upkeep.upkeep_Oath_of_Druids();
- Upkeep.upkeep_Oath_of_Ghouls();
- Upkeep.upkeep_Suspend();
- Upkeep.upkeep_Vanishing();
- Upkeep.upkeep_Fading();
- Upkeep.upkeep_Masticore();
- Upkeep.upkeep_Eldrazi_Monument();
- Upkeep.upkeep_Blaze_Counters();
+ Upkeep.upkeepKarma();
+ Upkeep.upkeepOathOfDruids();
+ Upkeep.upkeepOathOfGhouls();
+ Upkeep.upkeepSuspend();
+ Upkeep.upkeepVanishing();
+ Upkeep.upkeepFading();
+ Upkeep.upkeepMasticore();
+ Upkeep.upkeepEldraziMonument();
+ Upkeep.upkeepBlazeCounters();
// upkeep_Dark_Confidant(); // keep this one semi-last
- Upkeep.upkeep_Power_Surge();
+ Upkeep.upkeepPowerSurge();
Upkeep.upkeepAlurenAI();
// experimental, AI abuse aluren
@@ -149,7 +149,7 @@ public class Upkeep implements java.io.Serializable {
* upkeep_Braid_Of_Fire.
*
*/
- private static void upkeep_Braid_Of_Fire() {
+ private static void upkeepBraidOfFire() {
final Player player = AllZone.getPhase().getPlayerTurn();
final CardList braids = player.getCardsIn(Zone.Battlefield, "Braid of Fire");
@@ -189,7 +189,7 @@ public class Upkeep implements java.io.Serializable {
* upkeep_Echo.
*
*/
- private static void upkeep_Echo() {
+ private static void upkeepEcho() {
CardList list = AllZone.getPhase().getPlayerTurn().getCardsIn(Zone.Battlefield);
list = list.filter(new CardListFilter() {
@Override
@@ -247,7 +247,7 @@ public class Upkeep implements java.io.Serializable {
* upkeep_Slowtrips. Draw a card at the beginning of the next turn's upkeep.
*
*/
- private static void upkeep_Slowtrips() {
+ private static void upkeepSlowtrips() {
final Player player = AllZone.getPhase().getPlayerTurn();
CardList list = player.getSlowtripList();
@@ -301,7 +301,7 @@ public class Upkeep implements java.io.Serializable {
* upkeep_UpkeepCost.
*
*/
- private static void upkeep_UpkeepCost() {
+ private static void upkeepUpkeepCost() {
final CardList list = AllZone.getPhase().getPlayerTurn().getCardsIn(Zone.Battlefield);
for (int i = 0; i < list.size(); i++) {
@@ -486,7 +486,7 @@ public class Upkeep implements java.io.Serializable {
* upkeep_The_Abyss.
*
*/
- private static void upkeep_The_Abyss() {
+ private static void upkeepTheAbyss() {
/*
* At the beginning of each player's upkeep, destroy target nonartifact
* creature that player controls of his or her choice. It can't be
@@ -1309,7 +1309,7 @@ public class Upkeep implements java.io.Serializable {
* upkeep_Nightshade_Schemers.
*
*/
- private static void upkeep_Nightshade_Schemers() {
+ private static void upkeepNightshadeSchemers() {
final Player player = AllZone.getPhase().getPlayerTurn();
final CardList kinship = player.getCardsIn(Zone.Battlefield, "Nightshade Schemers");
final Player opponent = player.getOpponent();
@@ -1395,7 +1395,7 @@ public class Upkeep implements java.io.Serializable {
* upkeep_Pyroclast_Consul.
*
*/
- private static void upkeep_Pyroclast_Consul() {
+ private static void upkeepPyroclastConsul() {
final Player player = AllZone.getPhase().getPlayerTurn();
final CardList kinship = player.getCardsIn(Zone.Battlefield, "Pyroclast Consul");
@@ -1495,7 +1495,7 @@ public class Upkeep implements java.io.Serializable {
* upkeep_Sensation_Gorger.
*
*/
- private static void upkeep_Sensation_Gorger() {
+ private static void upkeepSensationGorger() {
final Player player = AllZone.getPhase().getPlayerTurn();
final CardList kinship = player.getCardsIn(Zone.Battlefield, "Sensation Gorger");
final Player opponent = player.getOpponent();
@@ -1588,7 +1588,7 @@ public class Upkeep implements java.io.Serializable {
* upkeep_Squeaking_Pie_Grubfellows.
*
*/
- private static void upkeep_Squeaking_Pie_Grubfellows() {
+ private static void upkeepSqueakingPieGrubfellows() {
final Player player = AllZone.getPhase().getPlayerTurn();
final CardList kinship = player.getCardsIn(Zone.Battlefield, "Squeaking Pie Grubfellows");
final Player opponent = player.getOpponent();
@@ -1675,7 +1675,7 @@ public class Upkeep implements java.io.Serializable {
* upkeep_Wandering_Graybeard.
*
*/
- private static void upkeep_Wandering_Graybeard() {
+ private static void upkeepWanderingGraybeard() {
final Player player = AllZone.getPhase().getPlayerTurn();
final CardList kinship = player.getCardsIn(Zone.Battlefield, "Wandering Graybeard");
@@ -1760,7 +1760,7 @@ public class Upkeep implements java.io.Serializable {
* upkeep_Waterspout_Weavers.
*
*/
- private static void upkeep_Waterspout_Weavers() {
+ private static void upkeepWaterspoutWeavers() {
final Player player = AllZone.getPhase().getPlayerTurn();
final CardList kinship = player.getCardsIn(Zone.Battlefield, "Waterspout Weavers");
@@ -1866,7 +1866,7 @@ public class Upkeep implements java.io.Serializable {
* upkeep_Winnower_Patrol.
*
*/
- private static void upkeep_Winnower_Patrol() {
+ private static void upkeepWinnowerPatrol() {
final Player player = AllZone.getPhase().getPlayerTurn();
final CardList kinship = player.getCardsIn(Zone.Battlefield, "Winnower Patrol");
@@ -1951,7 +1951,7 @@ public class Upkeep implements java.io.Serializable {
* upkeep_Wolf_Skull_Shaman.
*
*/
- private static void upkeep_Wolf_Skull_Shaman() {
+ private static void upkeepWolfSkullShaman() {
final Player player = AllZone.getPhase().getPlayerTurn();
final CardList kinship = player.getCardsIn(Zone.Battlefield, "Wolf-Skull Shaman");
@@ -2076,7 +2076,7 @@ public class Upkeep implements java.io.Serializable {
* upkeep_Suspend.
*
*/
- public static void upkeep_Suspend() {
+ public static void upkeepSuspend() {
final Player player = AllZone.getPhase().getPlayerTurn();
CardList list = player.getCardsIn(Zone.Exile);
@@ -2105,7 +2105,7 @@ public class Upkeep implements java.io.Serializable {
* upkeep_Vanishing.
*
*/
- private static void upkeep_Vanishing() {
+ private static void upkeepVanishing() {
final Player player = AllZone.getPhase().getPlayerTurn();
CardList list = player.getCardsIn(Zone.Battlefield);
@@ -2141,7 +2141,7 @@ public class Upkeep implements java.io.Serializable {
* upkeep_Fading.
*
*/
- private static void upkeep_Fading() {
+ private static void upkeepFading() {
final Player player = AllZone.getPhase().getPlayerTurn();
CardList list = player.getCardsIn(Zone.Battlefield);
@@ -2182,7 +2182,7 @@ public class Upkeep implements java.io.Serializable {
* upkeep_Oath_of_Druids.
*
*/
- private static void upkeep_Oath_of_Druids() {
+ private static void upkeepOathOfDruids() {
final CardList oathList = AllZoneUtil.getCardsIn(Zone.Battlefield, "Oath of Druids");
if (oathList.isEmpty()) {
return;
@@ -2263,7 +2263,7 @@ public class Upkeep implements java.io.Serializable {
* upkeep_Oath_of_Ghouls.
*
*/
- private static void upkeep_Oath_of_Ghouls() {
+ private static void upkeepOathOfGhouls() {
final CardList oathList = AllZoneUtil.getCardsIn(Zone.Battlefield, "Oath of Ghouls");
if (oathList.isEmpty()) {
return;
@@ -2312,7 +2312,7 @@ public class Upkeep implements java.io.Serializable {
* upkeep_Karma.
*
*/
- private static void upkeep_Karma() {
+ private static void upkeepKarma() {
final Player player = AllZone.getPhase().getPlayerTurn();
final CardList karmas = AllZoneUtil.getCardsIn(Zone.Battlefield, "Karma");
final CardList swamps = player.getCardsIn(Zone.Battlefield).getType("Swamp");
@@ -2351,7 +2351,7 @@ public class Upkeep implements java.io.Serializable {
* upkeep_Dega_Sanctuary.
*
*/
- private static void upkeep_Dega_Sanctuary() {
+ private static void upkeepDegaSanctuary() {
final Player player = AllZone.getPhase().getPlayerTurn();
final CardList list = player.getCardsIn(Zone.Battlefield, "Dega Sanctuary");
@@ -2390,7 +2390,7 @@ public class Upkeep implements java.io.Serializable {
* upkeep_Ceta_Sanctuary.
*
*/
- private static void upkeep_Ceta_Sanctuary() {
+ private static void upkeepCetaSanctuary() {
final Player player = AllZone.getPhase().getPlayerTurn();
final CardList list = player.getCardsIn(Zone.Battlefield, "Ceta Sanctuary");
@@ -2435,7 +2435,7 @@ public class Upkeep implements java.io.Serializable {
* upkeep_Power_Surge.
*
*/
- private static void upkeep_Power_Surge() {
+ private static void upkeepPowerSurge() {
/*
* At the beginning of each player's upkeep, Power Surge deals X damage
* to that player, where X is the number of untapped lands he or she
@@ -2556,7 +2556,8 @@ public class Upkeep implements java.io.Serializable {
});
}
};
- ability.setDescription("At the beginning of your upkeep, you may have this creature become a copy of target creature except it doesn't copy that creature's color. If you do, this creature gains this ability.");
+ ability.setDescription("At the beginning of your upkeep, you may have this creature become "
+ + "a copy of target creature except it doesn't copy that creature's color. If you do, this creature gains this ability.");
ability.setStackDescription(c.getName() + " - you may have this creature become a copy of target creature.");
AllZone.getStack().addSimultaneousStackEntry(ability);
@@ -2569,7 +2570,7 @@ public class Upkeep implements java.io.Serializable {
* upkeep_Tangle_Wire.
*
*/
- private static void upkeep_Tangle_Wire() {
+ private static void upkeepTangleWire() {
final Player player = AllZone.getPhase().getPlayerTurn();
final CardList wires = AllZoneUtil.getCardsIn(Zone.Battlefield, "Tangle Wire");
@@ -2635,7 +2636,7 @@ public class Upkeep implements java.io.Serializable {
* upkeep_Masticore.
*
*/
- private static void upkeep_Masticore() {
+ private static void upkeepMasticore() {
final Player player = AllZone.getPhase().getPlayerTurn();
final CardList list = player.getCardsIn(Zone.Battlefield, "Masticore");
@@ -2706,7 +2707,7 @@ public class Upkeep implements java.io.Serializable {
* upkeep_Eldrazi_Monument.
*
*/
- private static void upkeep_Eldrazi_Monument() {
+ private static void upkeepEldraziMonument() {
final Player player = AllZone.getPhase().getPlayerTurn();
final CardList list = player.getCardsIn(Zone.Battlefield, "Eldrazi Monument");
@@ -2754,7 +2755,7 @@ public class Upkeep implements java.io.Serializable {
* upkeep_Blaze_Counters.
*
*/
- private static void upkeep_Blaze_Counters() {
+ private static void upkeepBlazeCounters() {
final Player player = AllZone.getPhase().getPlayerTurn();
CardList blaze = player.getCardsIn(Zone.Battlefield);
@@ -2789,7 +2790,7 @@ public class Upkeep implements java.io.Serializable {
* upkeep_Carnophage.
*
*/
- private static void upkeep_Carnophage() {
+ private static void upkeepCarnophage() {
final Player player = AllZone.getPhase().getPlayerTurn();
final CardList list = player.getCardsIn(Zone.Battlefield, "Carnophage");
@@ -2821,7 +2822,7 @@ public class Upkeep implements java.io.Serializable {
* upkeep_Sangrophage.
*
*/
- private static void upkeep_Sangrophage() {
+ private static void upkeepSangrophage() {
final Player player = AllZone.getPhase().getPlayerTurn();
final CardList list = player.getCardsIn(Zone.Battlefield, "Sangrophage");
diff --git a/src/main/java/forge/card/cardFactory/CardFactoryUtil.java b/src/main/java/forge/card/cardFactory/CardFactoryUtil.java
index af39634a6b8..3fe064db4a2 100644
--- a/src/main/java/forge/card/cardFactory/CardFactoryUtil.java
+++ b/src/main/java/forge/card/cardFactory/CardFactoryUtil.java
@@ -4951,7 +4951,7 @@ public class CardFactoryUtil {
AllZone.getTriggerHandler().clearSuppression("ChangesZone");
if (card.getController().isHuman()) {
- AllZone.getGameAction().playSpellAbility_NoStack(origSA, false);
+ AllZone.getGameAction().playSpellAbilityNoStack(origSA, false);
} else {
ComputerUtil.playNoStack(origSA);
}
diff --git a/src/main/java/forge/card/cost/Cost.java b/src/main/java/forge/card/cost/Cost.java
index 6ae7c04f892..0322de0b8d4 100644
--- a/src/main/java/forge/card/cost/Cost.java
+++ b/src/main/java/forge/card/cost/Cost.java
@@ -112,20 +112,20 @@ public class Cost {
private final String name;
// Parsing Strings
- private static final String tapXStr = "tapXType<";
- private static final String subStr = "SubCounter<";
- private static final String addStr = "AddCounter<";
- private static final String lifeStr = "PayLife<";
- private static final String lifeGainStr = "OppGainLife<";
- private static final String millStr = "Mill<";
- private static final String discStr = "Discard<";
- private static final String sacStr = "Sac<";
- private static final String exileStr = "Exile<";
- private static final String exileFromHandStr = "ExileFromHand<";
- private static final String exileFromGraveStr = "ExileFromGrave<";
- private static final String exileFromTopStr = "ExileFromTop<";
- private static final String returnStr = "Return<";
- private static final String revealStr = "Reveal<";
+ private static final String TAP_X_STR = "tapXType<";
+ private static final String SUB_STR = "SubCounter<";
+ private static final String ADD_STR = "AddCounter<";
+ private static final String LIFE_STR = "PayLife<";
+ private static final String LIFE_GAIN_STR = "OppGainLife<";
+ private static final String MILL_STR = "Mill<";
+ private static final String DISC_STR = "Discard<";
+ private static final String SAC_STR = "Sac<";
+ private static final String EXILE_STR = "Exile<";
+ private static final String EXILE_FROM_HAND_STR = "ExileFromHand<";
+ private static final String EXILE_FROM_GRAVE_STR = "ExileFromGrave<";
+ private static final String EXILE_FROM_TOP_STR = "ExileFromTop<";
+ private static final String RETURN_STR = "Return<";
+ private static final String REVEAL_STR = "Reveal<";
/**
*
@@ -144,18 +144,18 @@ public class Cost {
// when adding new costs for cost string, place them here
this.name = cardName;
- while (parse.contains(Cost.tapXStr)) {
- final String[] splitStr = this.abCostParse(parse, Cost.tapXStr, 3);
- parse = this.abUpdateParse(parse, Cost.tapXStr);
+ while (parse.contains(Cost.TAP_X_STR)) {
+ final String[] splitStr = this.abCostParse(parse, Cost.TAP_X_STR, 3);
+ parse = this.abUpdateParse(parse, Cost.TAP_X_STR);
final String description = splitStr.length > 2 ? splitStr[2] : null;
this.costParts.add(new CostTapType(splitStr[0], splitStr[1], description));
}
- while (parse.contains(Cost.subStr)) {
+ while (parse.contains(Cost.SUB_STR)) {
// SubCounter
- final String[] splitStr = this.abCostParse(parse, Cost.subStr, 4);
- parse = this.abUpdateParse(parse, Cost.subStr);
+ final String[] splitStr = this.abCostParse(parse, Cost.SUB_STR, 4);
+ parse = this.abUpdateParse(parse, Cost.SUB_STR);
final String type = splitStr.length > 2 ? splitStr[2] : "CARDNAME";
final String description = splitStr.length > 3 ? splitStr[3] : null;
@@ -163,10 +163,10 @@ public class Cost {
this.costParts.add(new CostRemoveCounter(splitStr[0], Counters.valueOf(splitStr[1]), type, description));
}
- while (parse.contains(Cost.addStr)) {
+ while (parse.contains(Cost.ADD_STR)) {
// AddCounter
- final String[] splitStr = this.abCostParse(parse, Cost.addStr, 4);
- parse = this.abUpdateParse(parse, Cost.addStr);
+ final String[] splitStr = this.abCostParse(parse, Cost.ADD_STR, 4);
+ parse = this.abUpdateParse(parse, Cost.ADD_STR);
final String type = splitStr.length > 2 ? splitStr[2] : "CARDNAME";
final String description = splitStr.length > 3 ? splitStr[3] : null;
@@ -176,91 +176,91 @@ public class Cost {
// While no card has "PayLife<2> PayLife<3> there might be a card that
// Changes Cost by adding a Life Payment
- while (parse.contains(Cost.lifeStr)) {
+ while (parse.contains(Cost.LIFE_STR)) {
// PayLife
- final String[] splitStr = this.abCostParse(parse, Cost.lifeStr, 1);
- parse = this.abUpdateParse(parse, Cost.lifeStr);
+ final String[] splitStr = this.abCostParse(parse, Cost.LIFE_STR, 1);
+ parse = this.abUpdateParse(parse, Cost.LIFE_STR);
this.costParts.add(new CostPayLife(splitStr[0]));
}
- while (parse.contains(Cost.lifeGainStr)) {
+ while (parse.contains(Cost.LIFE_GAIN_STR)) {
// PayLife
- final String[] splitStr = this.abCostParse(parse, Cost.lifeGainStr, 1);
- parse = this.abUpdateParse(parse, Cost.lifeGainStr);
+ final String[] splitStr = this.abCostParse(parse, Cost.LIFE_GAIN_STR, 1);
+ parse = this.abUpdateParse(parse, Cost.LIFE_GAIN_STR);
this.costParts.add(new CostGainLife(splitStr[0]));
}
- while (parse.contains(Cost.millStr)) {
+ while (parse.contains(Cost.MILL_STR)) {
// PayLife
- final String[] splitStr = this.abCostParse(parse, Cost.millStr, 1);
- parse = this.abUpdateParse(parse, Cost.millStr);
+ final String[] splitStr = this.abCostParse(parse, Cost.MILL_STR, 1);
+ parse = this.abUpdateParse(parse, Cost.MILL_STR);
this.costParts.add(new CostMill(splitStr[0]));
}
- while (parse.contains(Cost.discStr)) {
+ while (parse.contains(Cost.DISC_STR)) {
// Discard
- final String[] splitStr = this.abCostParse(parse, Cost.discStr, 3);
- parse = this.abUpdateParse(parse, Cost.discStr);
+ final String[] splitStr = this.abCostParse(parse, Cost.DISC_STR, 3);
+ parse = this.abUpdateParse(parse, Cost.DISC_STR);
final String description = splitStr.length > 2 ? splitStr[2] : null;
this.costParts.add(new CostDiscard(splitStr[0], splitStr[1], description));
}
- while (parse.contains(Cost.sacStr)) {
+ while (parse.contains(Cost.SAC_STR)) {
this.sacCost = true;
- final String[] splitStr = this.abCostParse(parse, Cost.sacStr, 3);
- parse = this.abUpdateParse(parse, Cost.sacStr);
+ final String[] splitStr = this.abCostParse(parse, Cost.SAC_STR, 3);
+ parse = this.abUpdateParse(parse, Cost.SAC_STR);
final String description = splitStr.length > 2 ? splitStr[2] : null;
this.costParts.add(new CostSacrifice(splitStr[0], splitStr[1], description));
}
- while (parse.contains(Cost.exileStr)) {
- final String[] splitStr = this.abCostParse(parse, Cost.exileStr, 3);
- parse = this.abUpdateParse(parse, Cost.exileStr);
+ while (parse.contains(Cost.EXILE_STR)) {
+ final String[] splitStr = this.abCostParse(parse, Cost.EXILE_STR, 3);
+ parse = this.abUpdateParse(parse, Cost.EXILE_STR);
final String description = splitStr.length > 2 ? splitStr[2] : null;
this.costParts.add(new CostExile(splitStr[0], splitStr[1], description, Constant.Zone.Battlefield));
}
- while (parse.contains(Cost.exileFromHandStr)) {
- final String[] splitStr = this.abCostParse(parse, Cost.exileFromHandStr, 3);
- parse = this.abUpdateParse(parse, Cost.exileFromHandStr);
+ while (parse.contains(Cost.EXILE_FROM_HAND_STR)) {
+ final String[] splitStr = this.abCostParse(parse, Cost.EXILE_FROM_HAND_STR, 3);
+ parse = this.abUpdateParse(parse, Cost.EXILE_FROM_HAND_STR);
final String description = splitStr.length > 2 ? splitStr[2] : null;
this.costParts.add(new CostExile(splitStr[0], splitStr[1], description, Constant.Zone.Hand));
}
- while (parse.contains(Cost.exileFromGraveStr)) {
- final String[] splitStr = this.abCostParse(parse, Cost.exileFromGraveStr, 3);
- parse = this.abUpdateParse(parse, Cost.exileFromGraveStr);
+ while (parse.contains(Cost.EXILE_FROM_GRAVE_STR)) {
+ final String[] splitStr = this.abCostParse(parse, Cost.EXILE_FROM_GRAVE_STR, 3);
+ parse = this.abUpdateParse(parse, Cost.EXILE_FROM_GRAVE_STR);
final String description = splitStr.length > 2 ? splitStr[2] : null;
this.costParts.add(new CostExile(splitStr[0], splitStr[1], description, Constant.Zone.Graveyard));
}
- while (parse.contains(Cost.exileFromTopStr)) {
- final String[] splitStr = this.abCostParse(parse, Cost.exileFromTopStr, 3);
- parse = this.abUpdateParse(parse, Cost.exileFromTopStr);
+ while (parse.contains(Cost.EXILE_FROM_TOP_STR)) {
+ final String[] splitStr = this.abCostParse(parse, Cost.EXILE_FROM_TOP_STR, 3);
+ parse = this.abUpdateParse(parse, Cost.EXILE_FROM_TOP_STR);
final String description = splitStr.length > 2 ? splitStr[2] : null;
this.costParts.add(new CostExile(splitStr[0], splitStr[1], description, Constant.Zone.Library));
}
- while (parse.contains(Cost.returnStr)) {
- final String[] splitStr = this.abCostParse(parse, Cost.returnStr, 3);
- parse = this.abUpdateParse(parse, Cost.returnStr);
+ while (parse.contains(Cost.RETURN_STR)) {
+ final String[] splitStr = this.abCostParse(parse, Cost.RETURN_STR, 3);
+ parse = this.abUpdateParse(parse, Cost.RETURN_STR);
final String description = splitStr.length > 2 ? splitStr[2] : null;
this.costParts.add(new CostReturn(splitStr[0], splitStr[1], description));
}
- while (parse.contains(Cost.revealStr)) {
- final String[] splitStr = this.abCostParse(parse, Cost.revealStr, 3);
- parse = this.abUpdateParse(parse, Cost.revealStr);
+ while (parse.contains(Cost.REVEAL_STR)) {
+ final String[] splitStr = this.abCostParse(parse, Cost.REVEAL_STR, 3);
+ parse = this.abUpdateParse(parse, Cost.REVEAL_STR);
final String description = splitStr.length > 2 ? splitStr[2] : null;
this.costParts.add(new CostReveal(splitStr[0], splitStr[1], description));
@@ -533,10 +533,10 @@ public class Cost {
* Constant.
* numNames="{zero, a, two, three, four, five, six, "{trunked}
*/
- private static final String[] numNames = { "zero", "a", "two", "three", "four", "five", "six", "seven", "eight",
+ private static final String[] NUM_NAMES = { "zero", "a", "two", "three", "four", "five", "six", "seven", "eight",
"nine", "ten" };
/** Constant vowelPattern. */
- private static final Pattern vowelPattern = Pattern.compile("^[aeiou]", Pattern.CASE_INSENSITIVE);
+ private static final Pattern VOWEL_PATTERN = Pattern.compile("^[aeiou]", Pattern.CASE_INSENSITIVE);
/**
* Convert amount type to words.
@@ -571,12 +571,12 @@ public class Cost {
public static String convertIntAndTypeToWords(final int i, final String type) {
final StringBuilder sb = new StringBuilder();
- if (i >= Cost.numNames.length) {
+ if (i >= Cost.NUM_NAMES.length) {
sb.append(i);
- } else if ((1 == i) && Cost.vowelPattern.matcher(type).find()) {
+ } else if ((1 == i) && Cost.VOWEL_PATTERN.matcher(type).find()) {
sb.append("an");
} else {
- sb.append(Cost.numNames[i]);
+ sb.append(Cost.NUM_NAMES[i]);
}
sb.append(" ");
diff --git a/src/main/java/forge/card/mana/ManaPool.java b/src/main/java/forge/card/mana/ManaPool.java
index 2fb0dad9cd3..129904051ed 100644
--- a/src/main/java/forge/card/mana/ManaPool.java
+++ b/src/main/java/forge/card/mana/ManaPool.java
@@ -29,12 +29,12 @@ public class ManaPool extends Card {
private final ArrayList floatingMana = new ArrayList();
private final int[] floatingTotals = new int[7]; // WUBRGCS
/** Constant map. */
- private static final Map map = new HashMap();
+ private static final Map MAP = new HashMap();
/** Constant colors="WUBRG". */
- public static final String colors = "WUBRG";
+ public static final String COLORS = "WUBRG";
/** Constant mcolors="1WUBRG". */
- public static final String mcolors = "1WUBRG";
+ public static final String M_COLORS = "1WUBRG";
private final Player owner;
/**
@@ -56,13 +56,13 @@ public class ManaPool extends Card {
this.addIntrinsicKeyword("Indestructible");
this.setImmutable(true);
this.clearPool();
- ManaPool.map.put(Constant.Color.WHITE, 0);
- ManaPool.map.put(Constant.Color.BLUE, 1);
- ManaPool.map.put(Constant.Color.BLACK, 2);
- ManaPool.map.put(Constant.Color.RED, 3);
- ManaPool.map.put(Constant.Color.GREEN, 4);
- ManaPool.map.put(Constant.Color.COLORLESS, 5);
- ManaPool.map.put(Constant.Color.SNOW, 6);
+ ManaPool.MAP.put(Constant.Color.WHITE, 0);
+ ManaPool.MAP.put(Constant.Color.BLUE, 1);
+ ManaPool.MAP.put(Constant.Color.BLACK, 2);
+ ManaPool.MAP.put(Constant.Color.RED, 3);
+ ManaPool.MAP.put(Constant.Color.GREEN, 4);
+ ManaPool.MAP.put(Constant.Color.COLORLESS, 5);
+ ManaPool.MAP.put(Constant.Color.SNOW, 6);
}
/**
@@ -82,9 +82,9 @@ public class ManaPool extends Card {
for (final Mana m : pool) {
if (m.isSnow()) {
- snowMana[ManaPool.map.get(m.getColor())] += m.getAmount();
+ snowMana[ManaPool.MAP.get(m.getColor())] += m.getAmount();
} else {
- normalMana[ManaPool.map.get(m.getColor())] += m.getAmount();
+ normalMana[ManaPool.MAP.get(m.getColor())] += m.getAmount();
}
}
@@ -135,9 +135,9 @@ public class ManaPool extends Card {
for (final Mana m : pool) {
if (m.isSnow()) {
- snowMana[ManaPool.map.get(m.getColor())] += m.getAmount();
+ snowMana[ManaPool.MAP.get(m.getColor())] += m.getAmount();
} else {
- normalMana[ManaPool.map.get(m.getColor())] += m.getAmount();
+ normalMana[ManaPool.MAP.get(m.getColor())] += m.getAmount();
}
}
@@ -182,7 +182,7 @@ public class ManaPool extends Card {
* @return a int.
*/
public final int getAmountOfColor(final String color) {
- return this.floatingTotals[ManaPool.map.get(color)];
+ return this.floatingTotals[ManaPool.MAP.get(color)];
}
/**
@@ -223,7 +223,7 @@ public class ManaPool extends Card {
final String[] parts = manaCost.split(" ");
final StringBuilder res = new StringBuilder();
for (String s : parts) {
- if ((s.length() == 2) && ManaPool.colors.contains(s.charAt(1) + "")) {
+ if ((s.length() == 2) && ManaPool.COLORS.contains(s.charAt(1) + "")) {
s = s.charAt(0) + "/" + s.charAt(1);
}
if (s.length() == 3) {
@@ -253,9 +253,9 @@ public class ManaPool extends Card {
public final void addManaToPool(final ArrayList pool, final Mana mana) {
pool.add(mana);
if (pool.equals(this.floatingMana)) {
- this.floatingTotals[ManaPool.map.get(mana.getColor())] += mana.getAmount();
+ this.floatingTotals[ManaPool.MAP.get(mana.getColor())] += mana.getAmount();
if (mana.isSnow()) {
- this.floatingTotals[ManaPool.map.get(Constant.Color.SNOW)] += mana.getAmount();
+ this.floatingTotals[ManaPool.MAP.get(Constant.Color.SNOW)] += mana.getAmount();
}
}
}
@@ -391,7 +391,7 @@ public class ManaPool extends Card {
// give preference to Colorless Snow mana over Colored snow
// mana
choice = mana;
- } else if (this.floatingTotals[ManaPool.map.get(mana.getColor())] > this.floatingTotals[ManaPool.map
+ } else if (this.floatingTotals[ManaPool.MAP.get(mana.getColor())] > this.floatingTotals[ManaPool.MAP
.get(choice.getColor())]) {
// give preference to Colored mana that there is more of to
// pay Snow costs
@@ -425,9 +425,9 @@ public class ManaPool extends Card {
// loop through manaChoices adding
for (final Mana m : manaChoices) {
if (m.isSnow()) {
- snowMana[ManaPool.map.get(m.getColor())] += m.getAmount();
+ snowMana[ManaPool.MAP.get(m.getColor())] += m.getAmount();
} else {
- normalMana[ManaPool.map.get(m.getColor())] += m.getAmount();
+ normalMana[ManaPool.MAP.get(m.getColor())] += m.getAmount();
}
}
@@ -575,9 +575,9 @@ public class ManaPool extends Card {
choice.decrementAmount();
}
if (pool.equals(this.floatingMana)) {
- this.floatingTotals[ManaPool.map.get(choice.getColor())] -= choice.getAmount();
+ this.floatingTotals[ManaPool.MAP.get(choice.getColor())] -= choice.getAmount();
if (choice.isSnow()) {
- this.floatingTotals[ManaPool.map.get(Constant.Color.SNOW)] -= choice.getAmount();
+ this.floatingTotals[ManaPool.MAP.get(Constant.Color.SNOW)] -= choice.getAmount();
}
}
}
@@ -662,7 +662,7 @@ public class ManaPool extends Card {
}
}
final String s = c + "";
- if (ManaPool.colors.contains(s)) {
+ if (ManaPool.COLORS.contains(s)) {
res.add(s);
if (clessString.trim().equals("")) {
continue;
diff --git a/src/main/java/forge/card/trigger/TriggerHandler.java b/src/main/java/forge/card/trigger/TriggerHandler.java
index e01989b8be0..98ad6f0661e 100644
--- a/src/main/java/forge/card/trigger/TriggerHandler.java
+++ b/src/main/java/forge/card/trigger/TriggerHandler.java
@@ -968,7 +968,7 @@ public class TriggerHandler {
// Card src =
// (Card)(sa[0].getSourceCard().getTriggeringObject("Card"));
// System.out.println("Trigger resolving for "+mode+". Card = "+src);
- AllZone.getGameAction().playSpellAbility_NoStack(sa[0], true);
+ AllZone.getGameAction().playSpellAbilityNoStack(sa[0], true);
} else {
// commented out because i don't think this should be called
// again here
@@ -1000,7 +1000,7 @@ public class TriggerHandler {
// System.out.println("Trigger going on stack for "+mode+". Card = "+src);
if (params.containsKey("Static") && params.get("Static").equals("True")) {
- AllZone.getGameAction().playSpellAbility_NoStack(wrapperAbility, false);
+ AllZone.getGameAction().playSpellAbilityNoStack(wrapperAbility, false);
} else {
AllZone.getStack().addSimultaneousStackEntry(wrapperAbility);
}
diff --git a/src/main/java/forge/game/limited/BoosterDraftAI.java b/src/main/java/forge/game/limited/BoosterDraftAI.java
index e97e88f2da4..078e2078ad7 100644
--- a/src/main/java/forge/game/limited/BoosterDraftAI.java
+++ b/src/main/java/forge/game/limited/BoosterDraftAI.java
@@ -85,7 +85,8 @@ public class BoosterDraftAI {
}
});
- if (this.playerColors.get(player).getColor1().equals("none") && this.playerColors.get(player).getColor2().equals("none")) {
+ if (this.playerColors.get(player).getColor1().equals("none")
+ && this.playerColors.get(player).getColor2().equals("none")) {
//
final CardList creatures = aiPlayables.getType("Creature").getColored();
creatures.sort(this.bestCreature);
@@ -100,19 +101,20 @@ public class BoosterDraftAI {
System.out.println("Player[" + player + "] Color1: " + this.playerColors.get(player).getColor1());
}
- this.playerColors.get(player).setMana1(this.playerColors.get(player).colorToMana(
- this.playerColors.get(player).getColor1()));
+ this.playerColors.get(player).setMana1(
+ this.playerColors.get(player).colorToMana(this.playerColors.get(player).getColor1()));
// if the first pick has more than one color add the second as
// second color to draft
if (pickedCard.getColor().get(0).toStringArray().size() > 1) {
this.playerColors.get(player).setColor2(pickedCard.getColor().get(0).toStringArray().get(1));
if (Constant.Runtime.DEV_MODE[0]) {
- System.out.println("Player[" + player + "] Color2: " + this.playerColors.get(player).getColor2());
+ System.out.println("Player[" + player + "] Color2: "
+ + this.playerColors.get(player).getColor2());
}
- this.playerColors.get(player).setMana2(this.playerColors.get(player).colorToMana(
- this.playerColors.get(player).getColor2()));
+ this.playerColors.get(player).setMana2(
+ this.playerColors.get(player).colorToMana(this.playerColors.get(player).getColor2()));
}
hasPicked = true;
@@ -132,8 +134,8 @@ public class BoosterDraftAI {
System.out.println("Player[" + player + "] Color2: " + this.playerColors.get(player).getColor2());
}
- this.playerColors.get(player).setMana2(this.playerColors.get(player).colorToMana(
- this.playerColors.get(player).getColor2()));
+ this.playerColors.get(player).setMana2(
+ this.playerColors.get(player).colorToMana(this.playerColors.get(player).getColor2()));
hasPicked = true;
}
} else {
@@ -406,7 +408,8 @@ public class BoosterDraftAI {
cardsNeeded--;
aiPlayables.remove(c);
- others = aiPlayables.getNotType("Creature").getNotType("Land").getOnly2Colors(pClrs.getColor1(), pClrs.getColor2());
+ others = aiPlayables.getNotType("Creature").getNotType("Land")
+ .getOnly2Colors(pClrs.getColor1(), pClrs.getColor2());
if (Constant.Runtime.DEV_MODE[0]) {
System.out.println("Others[" + ii++ + "]:" + c.getName() + " (" + c.getManaCost() + ")");
@@ -450,7 +453,7 @@ public class BoosterDraftAI {
}
if (landsNeeded > 0) {
- // attempt to optimize basic land counts according
+ // attempt to optimize basic land counts according
// to color representation
final CCnt[] clrCnts = { new CCnt("Plains", 0), new CCnt("Island", 0), new CCnt("Swamp", 0),
@@ -489,8 +492,9 @@ public class BoosterDraftAI {
// tmpDeck += "totalColor:" + totalColor + "\n";
for (i = 0; i < 5; i++) {
- if (clrCnts[i].getCount() > 0) { // calculate number of lands for
- // each color
+ if (clrCnts[i].getCount() > 0) { // calculate number of lands
+ // for
+ // each color
final float p = (float) clrCnts[i].getCount() / (float) totalColor;
final int nLand = (int) (landsNeeded * p) + 1;
// tmpDeck += "nLand-" + ClrCnts[i].Color + ":" + nLand +
@@ -504,7 +508,8 @@ public class BoosterDraftAI {
// CardCounts.put(ClrCnts[i].Color, nLand);
for (int j = 0; j <= nLand; j++) {
- final Card c = AllZone.getCardFactory().getCard(clrCnts[i].getColor(), AllZone.getComputerPlayer());
+ final Card c = AllZone.getCardFactory().getCard(clrCnts[i].getColor(),
+ AllZone.getComputerPlayer());
c.setCurSetCode(BoosterDraft.LAND_SET_CODE[0]);
outList.add(c);
landsNeeded--;
@@ -648,13 +653,14 @@ public class BoosterDraftAI {
* @return the bd
*/
public BoosterDraft getBd() {
- return bd;
+ return this.bd;
}
/**
- * @param bd the bd to set
+ * @param bd
+ * the bd to set
*/
- public void setBd(BoosterDraft bd) {
+ public void setBd(final BoosterDraft bd) {
this.bd = bd; // TODO: Add 0 to parameter's name.
}
diff --git a/src/main/java/forge/game/limited/BoosterDraft_1.java b/src/main/java/forge/game/limited/BoosterDraft_1.java
index 7268637ffaa..56535cac4b9 100644
--- a/src/main/java/forge/game/limited/BoosterDraft_1.java
+++ b/src/main/java/forge/game/limited/BoosterDraft_1.java
@@ -47,7 +47,7 @@ public final class BoosterDraft_1 implements BoosterDraft {
private List> pack; // size 8
/** The draft picks. */
- private Map draftPicks = new TreeMap();
+ private final Map draftPicks = new TreeMap();
private final CardPoolLimitation draftFormat;
private final ArrayList, BoosterGenerator>> packs = new ArrayList, BoosterGenerator>>();
@@ -143,34 +143,34 @@ public final class BoosterDraft_1 implements BoosterDraft {
private void setupCustomDraft(final CustomLimited draft) {
final DeckManager dio = AllZone.getDeckManager();
- final Deck dPool = dio.getDeck(draft.DeckFile);
+ final Deck dPool = dio.getDeck(draft.getDeckFile());
if (dPool == null) {
- throw new RuntimeException("BoosterGenerator : deck not found - " + draft.DeckFile);
+ throw new RuntimeException("BoosterGenerator : deck not found - " + draft.getDeckFile());
}
final BoosterGenerator bpCustom = new BoosterGenerator(dPool);
final Lambda1, BoosterGenerator> fnPick = new Lambda1, BoosterGenerator>() {
@Override
public List apply(final BoosterGenerator pack) {
- if (draft.IgnoreRarity) {
- if (!draft.Singleton) {
- return pack.getBoosterPack(0, 0, 0, 0, 0, 0, 0, draft.NumCards, 0);
+ if (draft.getIgnoreRarity()) {
+ if (!draft.getSingleton()) {
+ return pack.getBoosterPack(0, 0, 0, 0, 0, 0, 0, draft.getNumCards(), 0);
} else {
- return pack.getSingletonBoosterPack(draft.NumCards);
+ return pack.getSingletonBoosterPack(draft.getNumCards());
}
}
- return pack.getBoosterPack(draft.NumCommons, draft.NumUncommons, 0, draft.NumRares, draft.NumMythics,
- draft.NumSpecials, 0, 0, 0);
+ return pack.getBoosterPack(draft.getNumCommons(), draft.getNumUncommons(), 0, draft.getNumRares(), draft.getNumMythics(),
+ draft.getNumSpecials(), 0, 0, 0);
}
};
final Closure1, BoosterGenerator> picker = new Closure1, BoosterGenerator>(
fnPick, bpCustom);
- for (int i = 0; i < draft.NumPacks; i++) {
+ for (int i = 0; i < draft.getNumPacks(); i++) {
this.packs.add(picker);
}
- BoosterDraft.LAND_SET_CODE[0] = draft.LandSetCode;
+ BoosterDraft.LAND_SET_CODE[0] = draft.getLandSetCode();
}
/** Looks for res/draft/*.draft files, reads them, returns a list. */
diff --git a/src/main/java/forge/game/limited/CardPoolLimitation.java b/src/main/java/forge/game/limited/CardPoolLimitation.java
index da92a743671..6dee3253f41 100644
--- a/src/main/java/forge/game/limited/CardPoolLimitation.java
+++ b/src/main/java/forge/game/limited/CardPoolLimitation.java
@@ -8,8 +8,8 @@ public enum CardPoolLimitation {
/** The Full. */
Full,
- /** The Block. */
- Block,
- /** The Custom. */
- Custom
+ /** The Block. */
+ Block,
+ /** The Custom. */
+ Custom
}
diff --git a/src/main/java/forge/game/limited/CustomLimited.java b/src/main/java/forge/game/limited/CustomLimited.java
index c8985c10567..974624b3035 100644
--- a/src/main/java/forge/game/limited/CustomLimited.java
+++ b/src/main/java/forge/game/limited/CustomLimited.java
@@ -15,46 +15,46 @@ import forge.AllZone;
class CustomLimited {
/** The Name. */
- public String Name;
+ private String name;
/** The Type. */
- public String Type;
+ private String type;
/** The Deck file. */
- public String DeckFile;
+ private String deckFile;
/** The Ignore rarity. */
- public Boolean IgnoreRarity;
+ private Boolean ignoreRarity;
/** The Singleton. */
- public Boolean Singleton = false;
+ private Boolean singleton = false;
/** The Num cards. */
- public int NumCards = 15;
+ private int numCards = 15;
/** The Num specials. */
- public int NumSpecials = 0;
+ private int numSpecials = 0;
/** The Num mythics. */
- public int NumMythics = 1;
+ private int numMythics = 1;
/** The Num rares. */
- public int NumRares = 1;
+ private int numRares = 1;
/** The Num uncommons. */
- public int NumUncommons = 3;
+ private int numUncommons = 3;
/** The Num commons. */
- public int NumCommons = 11;
+ private int numCommons = 11;
/** The Num double faced. */
- public int NumDoubleFaced = 0;
+ private int numDoubleFaced = 0;
/** The Num packs. */
- public int NumPacks = 3;
+ private int numPacks = 3;
/** The Land set code. */
- public String LandSetCode = AllZone.getCardFactory().getCard("Plains", AllZone.getHumanPlayer()).getMostRecentSet();
+ private String landSetCode = AllZone.getCardFactory().getCard("Plains", AllZone.getHumanPlayer()).getMostRecentSet();
/*
* (non-Javadoc)
@@ -63,7 +63,7 @@ class CustomLimited {
*/
@Override
public String toString() {
- return this.Name;
+ return this.getName();
}
/**
@@ -82,49 +82,231 @@ class CustomLimited {
final String value = v.length > 1 ? v[1].trim() : "";
if (key.equalsIgnoreCase("Name")) {
- cd.Name = value;
+ cd.setName(value);
}
if (key.equalsIgnoreCase("Type")) {
- cd.Type = value;
+ cd.type = value;
}
if (key.equalsIgnoreCase("DeckFile")) {
- cd.DeckFile = value;
+ cd.setDeckFile(value);
}
if (key.equalsIgnoreCase("IgnoreRarity")) {
- cd.IgnoreRarity = value.equals("True");
+ cd.setIgnoreRarity(value.equals("True"));
}
if (key.equalsIgnoreCase("Singleton")) {
- cd.Singleton = value.equals("True");
+ cd.setSingleton(value.equals("True"));
}
if (key.equalsIgnoreCase("LandSetCode")) {
- cd.LandSetCode = value;
+ cd.setLandSetCode(value);
}
if (key.equalsIgnoreCase("NumCards")) {
- cd.NumCards = Integer.parseInt(value);
+ cd.setNumCards(Integer.parseInt(value));
}
if (key.equalsIgnoreCase("NumDoubleFaced")) {
- cd.NumDoubleFaced = Integer.parseInt(value);
+ cd.setNumDoubleFaced(Integer.parseInt(value));
}
if (key.equalsIgnoreCase("NumSpecials")) {
- cd.NumSpecials = Integer.parseInt(value);
+ cd.setNumSpecials(Integer.parseInt(value));
}
if (key.equalsIgnoreCase("NumMythics")) {
- cd.NumMythics = Integer.parseInt(value);
+ cd.setNumMythics(Integer.parseInt(value));
}
if (key.equalsIgnoreCase("NumRares")) {
- cd.NumRares = Integer.parseInt(value);
+ cd.setNumRares(Integer.parseInt(value));
}
if (key.equalsIgnoreCase("NumUncommons")) {
- cd.NumUncommons = Integer.parseInt(value);
+ cd.setNumUncommons(Integer.parseInt(value));
}
if (key.equalsIgnoreCase("NumCommons")) {
- cd.NumCommons = Integer.parseInt(value);
+ cd.setNumCommons(Integer.parseInt(value));
}
if (key.equalsIgnoreCase("NumPacks")) {
- cd.NumPacks = Integer.parseInt(value);
+ cd.setNumPacks(Integer.parseInt(value));
}
}
return cd;
}
+
+ /**
+ * @return the numCards
+ */
+ public int getNumCards() {
+ return numCards;
+ }
+
+ /**
+ * @param numCards the numCards to set
+ */
+ public void setNumCards(int numCards) {
+ this.numCards = numCards; // TODO: Add 0 to parameter's name.
+ }
+
+ /**
+ * @return the numPacks
+ */
+ public int getNumPacks() {
+ return numPacks;
+ }
+
+ /**
+ * @param numPacks the numPacks to set
+ */
+ public void setNumPacks(int numPacks) {
+ this.numPacks = numPacks; // TODO: Add 0 to parameter's name.
+ }
+
+ /**
+ * @return the numSpecials
+ */
+ public int getNumSpecials() {
+ return numSpecials;
+ }
+
+ /**
+ * @param numSpecials the numSpecials to set
+ */
+ public void setNumSpecials(int numSpecials) {
+ this.numSpecials = numSpecials; // TODO: Add 0 to parameter's name.
+ }
+
+ /**
+ * @return the singleton
+ */
+ public Boolean getSingleton() {
+ return singleton;
+ }
+
+ /**
+ * @param singleton the singleton to set
+ */
+ public void setSingleton(Boolean singleton) {
+ this.singleton = singleton; // TODO: Add 0 to parameter's name.
+ }
+
+ /**
+ * @return the ignoreRarity
+ */
+ public Boolean getIgnoreRarity() {
+ return ignoreRarity;
+ }
+
+ /**
+ * @param ignoreRarity the ignoreRarity to set
+ */
+ public void setIgnoreRarity(Boolean ignoreRarity) {
+ this.ignoreRarity = ignoreRarity; // TODO: Add 0 to parameter's name.
+ }
+
+ /**
+ * @return the numUncommons
+ */
+ public int getNumUncommons() {
+ return numUncommons;
+ }
+
+ /**
+ * @param numUncommons the numUncommons to set
+ */
+ public void setNumUncommons(int numUncommons) {
+ this.numUncommons = numUncommons; // TODO: Add 0 to parameter's name.
+ }
+
+ /**
+ * @return the numCommons
+ */
+ public int getNumCommons() {
+ return numCommons;
+ }
+
+ /**
+ * @param numCommons the numCommons to set
+ */
+ public void setNumCommons(int numCommons) {
+ this.numCommons = numCommons; // TODO: Add 0 to parameter's name.
+ }
+
+ /**
+ * @return the numRares
+ */
+ public int getNumRares() {
+ return numRares;
+ }
+
+ /**
+ * @param numRares the numRares to set
+ */
+ public void setNumRares(int numRares) {
+ this.numRares = numRares; // TODO: Add 0 to parameter's name.
+ }
+
+ /**
+ * @return the numMythics
+ */
+ public int getNumMythics() {
+ return numMythics;
+ }
+
+ /**
+ * @param numMythics the numMythics to set
+ */
+ public void setNumMythics(int numMythics) {
+ this.numMythics = numMythics; // TODO: Add 0 to parameter's name.
+ }
+
+ /**
+ * @return the deckFile
+ */
+ public String getDeckFile() {
+ return deckFile;
+ }
+
+ /**
+ * @param deckFile the deckFile to set
+ */
+ public void setDeckFile(String deckFile) {
+ this.deckFile = deckFile; // TODO: Add 0 to parameter's name.
+ }
+
+ /**
+ * @return the landSetCode
+ */
+ public String getLandSetCode() {
+ return landSetCode;
+ }
+
+ /**
+ * @param landSetCode the landSetCode to set
+ */
+ public void setLandSetCode(String landSetCode) {
+ this.landSetCode = landSetCode; // TODO: Add 0 to parameter's name.
+ }
+
+ /**
+ * @return the numDoubleFaced
+ */
+ public int getNumDoubleFaced() {
+ return numDoubleFaced;
+ }
+
+ /**
+ * @param numDoubleFaced the numDoubleFaced to set
+ */
+ public void setNumDoubleFaced(int numDoubleFaced) {
+ this.numDoubleFaced = numDoubleFaced; // TODO: Add 0 to parameter's name.
+ }
+
+ /**
+ * @return the name
+ */
+ private String getName() {
+ return name;
+ }
+
+ /**
+ * @param name the name to set
+ */
+ private void setName(String name1) {
+ this.name = name; // TODO: Add 0 to parameter's name.
+ }
}
diff --git a/src/main/java/forge/game/limited/DeckColors.java b/src/main/java/forge/game/limited/DeckColors.java
index 2116e7ebee9..d084daff163 100644
--- a/src/main/java/forge/game/limited/DeckColors.java
+++ b/src/main/java/forge/game/limited/DeckColors.java
@@ -74,13 +74,14 @@ class DeckColors {
* @return the color1
*/
public String getColor1() {
- return color1;
+ return this.color1;
}
/**
- * @param color1 the color1 to set
+ * @param color1
+ * the color1 to set
*/
- public void setColor1(String color1) {
+ public void setColor1(final String color1) {
this.color1 = color1; // TODO: Add 0 to parameter's name.
}
@@ -88,13 +89,14 @@ class DeckColors {
* @return the mana1
*/
public String getMana1() {
- return mana1;
+ return this.mana1;
}
/**
- * @param mana1 the mana1 to set
+ * @param mana1
+ * the mana1 to set
*/
- public void setMana1(String mana1) {
+ public void setMana1(final String mana1) {
this.mana1 = mana1; // TODO: Add 0 to parameter's name.
}
@@ -102,13 +104,14 @@ class DeckColors {
* @return the mana2
*/
public String getMana2() {
- return mana2;
+ return this.mana2;
}
/**
- * @param mana2 the mana2 to set
+ * @param mana2
+ * the mana2 to set
*/
- public void setMana2(String mana2) {
+ public void setMana2(final String mana2) {
this.mana2 = mana2; // TODO: Add 0 to parameter's name.
}
@@ -116,13 +119,14 @@ class DeckColors {
* @return the color2
*/
public String getColor2() {
- return color2;
+ return this.color2;
}
/**
- * @param color2 the color2 to set
+ * @param color2
+ * the color2 to set
*/
- public void setColor2(String color2) {
+ public void setColor2(final String color2) {
this.color2 = color2; // TODO: Add 0 to parameter's name.
}
diff --git a/src/main/java/forge/game/limited/SealedDeck.java b/src/main/java/forge/game/limited/SealedDeck.java
index b5d8b640a8a..2d63e5ffca0 100644
--- a/src/main/java/forge/game/limited/SealedDeck.java
+++ b/src/main/java/forge/game/limited/SealedDeck.java
@@ -138,31 +138,31 @@ public class SealedDeck {
customs.toArray());
final DeckManager dio = AllZone.getDeckManager();
- final Deck dPool = dio.getDeck(draft.DeckFile);
+ final Deck dPool = dio.getDeck(draft.getDeckFile());
if (dPool == null) {
- throw new RuntimeException("BoosterGenerator : deck not found - " + draft.DeckFile);
+ throw new RuntimeException("BoosterGenerator : deck not found - " + draft.getDeckFile());
}
final BoosterGenerator bpCustom = new BoosterGenerator(dPool);
final Lambda1, BoosterGenerator> fnPick = new Lambda1, BoosterGenerator>() {
@Override
public List apply(final BoosterGenerator pack) {
- if (draft.IgnoreRarity) {
- return pack.getBoosterPack(0, 0, 0, 0, 0, 0, 0, draft.NumCards, 0);
+ if (draft.getIgnoreRarity()) {
+ return pack.getBoosterPack(0, 0, 0, 0, 0, 0, 0, draft.getNumCards(), 0);
}
- return pack.getBoosterPack(draft.NumCommons, draft.NumUncommons, 0, draft.NumRares,
- draft.NumMythics, draft.NumSpecials, draft.NumDoubleFaced, 0, 0);
+ return pack.getBoosterPack(draft.getNumCommons(), draft.getNumUncommons(), 0, draft.getNumRares(),
+ draft.getNumMythics(), draft.getNumSpecials(), draft.getNumDoubleFaced(), 0, 0);
}
};
final Closure1, BoosterGenerator> picker = new Closure1, BoosterGenerator>(
fnPick, bpCustom);
- for (int i = 0; i < draft.NumPacks; i++) {
+ for (int i = 0; i < draft.getNumPacks(); i++) {
this.packs.add(picker);
}
- this.getLandSetCode()[0] = draft.LandSetCode;
+ this.getLandSetCode()[0] = draft.getLandSetCode();
}
}
}
@@ -335,7 +335,7 @@ public class SealedDeck {
}
if (landsNeeded > 0) {
- // attempt to optimize basic land counts
+ // attempt to optimize basic land counts
// according to color representation
final CCnt[] clrCnts = { new CCnt("Plains", 0), new CCnt("Island", 0), new CCnt("Swamp", 0),
new CCnt("Mountain", 0), new CCnt("Forest", 0) };
@@ -427,13 +427,14 @@ public class SealedDeck {
* @return the landSetCode
*/
public String[] getLandSetCode() {
- return landSetCode;
+ return this.landSetCode;
}
/**
- * @param landSetCode the landSetCode to set
+ * @param landSetCode
+ * the landSetCode to set
*/
- public void setLandSetCode(String[] landSetCode) {
+ public void setLandSetCode(final String[] landSetCode) {
this.landSetCode = landSetCode; // TODO: Add 0 to parameter's name.
}
diff --git a/src/main/java/forge/gui/input/Input_Mulligan.java b/src/main/java/forge/gui/input/Input_Mulligan.java
index 32a7e5a337b..7054822e2da 100644
--- a/src/main/java/forge/gui/input/Input_Mulligan.java
+++ b/src/main/java/forge/gui/input/Input_Mulligan.java
@@ -135,7 +135,7 @@ public class Input_Mulligan extends Input {
if (GameActionUtil.showYesNoDialog(c, "Use this card's ability?")) {
// If we ever let the AI memorize cards in the players
// hand, this would be a place to do so.
- AllZone.getGameAction().playSpellAbility_NoStack(effect, false);
+ AllZone.getGameAction().playSpellAbilityNoStack(effect, false);
}
}
}
diff --git a/src/main/java/forge/quest/data/ReadPriceList.java b/src/main/java/forge/quest/data/ReadPriceList.java
index d932ebdd7cd..8a1f73fe761 100644
--- a/src/main/java/forge/quest/data/ReadPriceList.java
+++ b/src/main/java/forge/quest/data/ReadPriceList.java
@@ -25,7 +25,7 @@ import forge.properties.NewConstants;
public class ReadPriceList implements NewConstants {
/** Constant comment="//". */
- private static final String comment = "//";
+ private static final String COMMENT = "//";
private HashMap priceMap;
@@ -69,7 +69,7 @@ public class ReadPriceList implements NewConstants {
// stop reading if end of file or blank line is read
while ((line != null) && (line.trim().length() != 0)) {
- if (!line.startsWith(ReadPriceList.comment)) {
+ if (!line.startsWith(ReadPriceList.COMMENT)) {
final String[] s = line.split("=");
final String name = s[0].trim();
final String price = s[1].trim();
diff --git a/src/main/java/forge/view/swing/ApplicationView.java b/src/main/java/forge/view/swing/ApplicationView.java
index 840089b714f..e4fee33dc0c 100644
--- a/src/main/java/forge/view/swing/ApplicationView.java
+++ b/src/main/java/forge/view/swing/ApplicationView.java
@@ -99,7 +99,7 @@ public class ApplicationView implements FView {
OldGuiNewGame.getUseLAFFonts().setSelected(preferences.isLafFonts());
// newGuiCheckBox.setSelected(preferences.newGui);
OldGuiNewGame.getSmoothLandCheckBox().setSelected(preferences.isStackAiLand());
- OldGuiNewGame.devModeCheckBox.setSelected(preferences.isDeveloperMode());
+ OldGuiNewGame.getDevModeCheckBox().setSelected(preferences.isDeveloperMode());
OldGuiNewGame.getCardOverlay().setSelected(preferences.isCardOverlay());
// FindBugs doesn't like the next line.
@@ -109,8 +109,8 @@ public class ApplicationView implements FView {
CardStackOffsetAction.set(preferences.getStackOffset());
CardStackAction.setVal(preferences.getMaxStackSize());
CardSizesAction.set(preferences.getCardSize());
- OldGuiNewGame.upldDrftCheckBox.setSelected(preferences.isUploadDraftAI());
- OldGuiNewGame.foilRandomCheckBox.setSelected(preferences.isRandCFoil());
+ OldGuiNewGame.getUpldDrftCheckBox().setSelected(preferences.isUploadDraftAI());
+ OldGuiNewGame.getFoilRandomCheckBox().setSelected(preferences.isRandCFoil());
AllZone.setSkin(new FSkin(preferences.getSkin()));
diff --git a/src/main/java/forge/view/swing/OldGuiNewGame.java b/src/main/java/forge/view/swing/OldGuiNewGame.java
index b409e1d20db..c487454caf3 100644
--- a/src/main/java/forge/view/swing/OldGuiNewGame.java
+++ b/src/main/java/forge/view/swing/OldGuiNewGame.java
@@ -129,22 +129,22 @@ public class OldGuiNewGame extends JFrame implements NewConstants, NewConstants.
/** Constant smoothLandCheckBox. */
private static JCheckBox smoothLandCheckBox = new JCheckBox("", false);
/** Constant devModeCheckBox. */
- static JCheckBox devModeCheckBox = new JCheckBox("", true);
+ private static JCheckBox devModeCheckBox = new JCheckBox("", true);
/** The upld drft check box. */
- static JCheckBox upldDrftCheckBox = new JCheckBox("", true);
+ private static JCheckBox upldDrftCheckBox = new JCheckBox("", true);
/** The foil random check box. */
- static JCheckBox foilRandomCheckBox = new JCheckBox("", true);
+ private static JCheckBox foilRandomCheckBox = new JCheckBox("", true);
// GenerateConstructedDeck.get2Colors() and GenerateSealedDeck.get2Colors()
// use these two variables
/** Constant removeSmallCreatures. */
- public static JCheckBoxMenuItem removeSmallCreatures = new JCheckBoxMenuItem(
+ private static JCheckBoxMenuItem removeSmallCreatures = new JCheckBoxMenuItem(
ForgeProps.getLocalized(MenuBar.Options.Generate.REMOVE_SMALL));
/** Constant removeArtifacts. */
- public static JCheckBoxMenuItem removeArtifacts = new JCheckBoxMenuItem(
+ private static JCheckBoxMenuItem removeArtifacts = new JCheckBoxMenuItem(
ForgeProps.getLocalized(MenuBar.Options.Generate.REMOVE_ARTIFACTS));
/** Constant useLAFFonts. */
private static JCheckBoxMenuItem useLAFFonts = new JCheckBoxMenuItem(ForgeProps.getLocalized(MenuBar.Options.FONT));
@@ -156,20 +156,20 @@ public class OldGuiNewGame extends JFrame implements NewConstants, NewConstants.
ForgeProps.getLocalized(MenuBar.Options.CARD_SCALE));
private final JButton questButton = new JButton();
- private final Action LOOK_AND_FEEL_ACTION = new LookAndFeelAction(this);
+ private final Action lookAndFeelAction = new LookAndFeelAction(this);
// private Action DOWNLOAD_ACTION = new DownloadAction();
- private final Action DOWNLOAD_ACTION_LQ = new DownloadActionLQ();
- private final Action DOWNLOAD_ACTION_SETLQ = new DownloadActionSetLQ();
- private final Action DOWNLOAD_ACTION_QUEST = new DownloadActionQuest();
- private final Action IMPORT_PICTURE = new ImportPictureAction();
- private final Action CARD_SIZES_ACTION = new CardSizesAction();
- private final Action CARD_STACK_ACTION = new CardStackAction();
- private final Action CARD_STACK_OFFSET_ACTION = new CardStackOffsetAction();
- private final Action ABOUT_ACTION = new AboutAction();
- private final Action HOW_TO_PLAY_ACTION = new HowToPlayAction();
- private final Action DNLD_PRICES_ACTION = new DownloadPriceAction();
- private final Action BUGZ_REPORTER_ACTION = new BugzReporterAction();
- private final Action EXIT_ACTION = new ExitAction();
+ private final Action downloadActionLQ = new DownloadActionLQ();
+ private final Action downloadActionSetLQ = new DownloadActionSetLQ();
+ private final Action downloadActionQuest = new DownloadActionQuest();
+ private final Action importPicture = new ImportPictureAction();
+ private final Action cardSizesAction = new CardSizesAction();
+ private final Action cardStackAction = new CardStackAction();
+ private final Action cardStackOffsetAction = new CardStackOffsetAction();
+ private final Action aboutAction = new AboutAction();
+ private final Action howToPlayAction = new HowToPlayAction();
+ private final Action dnldPricesAction = new DownloadPriceAction();
+ private final Action bugzReporterAction = new BugzReporterAction();
+ private final Action exitAction = new ExitAction();
/**
*
@@ -242,15 +242,15 @@ public class OldGuiNewGame extends JFrame implements NewConstants, NewConstants.
// LOOK_AND_FEEL_ACTION, DNLD_PRICES_ACTION, DOWNLOAD_ACTION,
// DOWNLOAD_ACTION_LQ, DOWNLOAD_ACTION_SETLQ, IMPORT_PICTURE,
// CARD_SIZES_ACTION,
- LOOK_AND_FEEL_ACTION, this.DNLD_PRICES_ACTION, this.DOWNLOAD_ACTION_LQ, this.DOWNLOAD_ACTION_SETLQ,
- this.DOWNLOAD_ACTION_QUEST, this.IMPORT_PICTURE, this.CARD_SIZES_ACTION, this.CARD_STACK_ACTION,
- this.CARD_STACK_OFFSET_ACTION, this.BUGZ_REPORTER_ACTION, ErrorViewer.ALL_THREADS_ACTION,
- this.ABOUT_ACTION, this.EXIT_ACTION };
+ lookAndFeelAction, this.dnldPricesAction, this.downloadActionLQ, this.downloadActionSetLQ,
+ this.downloadActionQuest, this.importPicture, this.cardSizesAction, this.cardStackAction,
+ this.cardStackOffsetAction, this.bugzReporterAction, ErrorViewer.ALL_THREADS_ACTION,
+ this.aboutAction, this.exitAction };
final JMenu menu = new JMenu(ForgeProps.getLocalized(Menu.TITLE));
for (final Action a : actions) {
menu.add(a);
- if (a.equals(this.LOOK_AND_FEEL_ACTION) || a.equals(this.IMPORT_PICTURE)
- || a.equals(this.CARD_STACK_OFFSET_ACTION) || a.equals(ErrorViewer.ALL_THREADS_ACTION)) {
+ if (a.equals(this.lookAndFeelAction) || a.equals(this.importPicture)
+ || a.equals(this.cardStackOffsetAction) || a.equals(ErrorViewer.ALL_THREADS_ACTION)) {
menu.addSeparator();
}
}
@@ -295,7 +295,7 @@ public class OldGuiNewGame extends JFrame implements NewConstants, NewConstants.
final JMenu helpMenu = new JMenu(ForgeProps.getLocalized(MenuBar.Help.TITLE));
- final Action[] helpActions = { this.HOW_TO_PLAY_ACTION };
+ final Action[] helpActions = { this.howToPlayAction };
for (final Action a : helpActions) {
helpMenu.add(a);
}
@@ -539,36 +539,36 @@ public class OldGuiNewGame extends JFrame implements NewConstants, NewConstants.
// newGuiCheckBox.setText(ForgeProps.getLocalized(NEW_GAME_TEXT.NEW_GUI));
OldGuiNewGame.getSmoothLandCheckBox().setText(ForgeProps.getLocalized(NewGameText.AI_LAND));
- OldGuiNewGame.devModeCheckBox.setText(ForgeProps.getLocalized(NewGameText.DEV_MODE));
- OldGuiNewGame.devModeCheckBox.addActionListener(new java.awt.event.ActionListener() {
+ OldGuiNewGame.getDevModeCheckBox().setText(ForgeProps.getLocalized(NewGameText.DEV_MODE));
+ OldGuiNewGame.getDevModeCheckBox().addActionListener(new java.awt.event.ActionListener() {
@Override
public void actionPerformed(final ActionEvent e) {
- Constant.Runtime.DEV_MODE[0] = OldGuiNewGame.devModeCheckBox.isSelected();
+ Constant.Runtime.DEV_MODE[0] = OldGuiNewGame.getDevModeCheckBox().isSelected();
Singletons.getModel().getPreferences().setDeveloperMode(Constant.Runtime.DEV_MODE[0]);
}
});
- OldGuiNewGame.upldDrftCheckBox.setText("Upload Draft Picks");
+ OldGuiNewGame.getUpldDrftCheckBox().setText("Upload Draft Picks");
- OldGuiNewGame.upldDrftCheckBox
+ OldGuiNewGame.getUpldDrftCheckBox()
.setToolTipText("Your picks and all other participants' picks will help the Forge AI"
+ " make better draft picks.");
- OldGuiNewGame.upldDrftCheckBox.addActionListener(new java.awt.event.ActionListener() {
+ OldGuiNewGame.getUpldDrftCheckBox().addActionListener(new java.awt.event.ActionListener() {
@Override
public void actionPerformed(final ActionEvent e) {
- Constant.Runtime.UPLOAD_DRAFT[0] = OldGuiNewGame.upldDrftCheckBox.isSelected();
+ Constant.Runtime.UPLOAD_DRAFT[0] = OldGuiNewGame.getUpldDrftCheckBox().isSelected();
Singletons.getModel().getPreferences().setUploadDraftAI(Constant.Runtime.UPLOAD_DRAFT[0]);
}
});
- OldGuiNewGame.foilRandomCheckBox.setText("Random Foiling");
- OldGuiNewGame.foilRandomCheckBox
+ OldGuiNewGame.getFoilRandomCheckBox().setText("Random Foiling");
+ OldGuiNewGame.getFoilRandomCheckBox()
.setToolTipText("Approximately 1:20 cards will appear with foiling effects applied.");
- OldGuiNewGame.foilRandomCheckBox.addActionListener(new java.awt.event.ActionListener() {
+ OldGuiNewGame.getFoilRandomCheckBox().addActionListener(new java.awt.event.ActionListener() {
@Override
public void actionPerformed(final ActionEvent e) {
- Constant.Runtime.RANDOM_FOIL[0] = OldGuiNewGame.foilRandomCheckBox.isSelected();
+ Constant.Runtime.RANDOM_FOIL[0] = OldGuiNewGame.getFoilRandomCheckBox().isSelected();
Singletons.getModel().getPreferences().setRandCFoil(Constant.Runtime.RANDOM_FOIL[0]);
}
});
@@ -620,9 +620,9 @@ public class OldGuiNewGame extends JFrame implements NewConstants, NewConstants.
// jPanel3.add(newGuiCheckBox, "wrap");
this.jPanel3.add(OldGuiNewGame.getSmoothLandCheckBox(), "wrap");
- this.jPanel3.add(OldGuiNewGame.devModeCheckBox, "wrap");
- this.jPanel3.add(OldGuiNewGame.upldDrftCheckBox, "wrap");
- this.jPanel3.add(OldGuiNewGame.foilRandomCheckBox, "wrap");
+ this.jPanel3.add(OldGuiNewGame.getDevModeCheckBox(), "wrap");
+ this.jPanel3.add(OldGuiNewGame.getUpldDrftCheckBox(), "wrap");
+ this.jPanel3.add(OldGuiNewGame.getFoilRandomCheckBox(), "wrap");
this.updatePanelDisplay(this.jPanel3);
this.getContentPane().add(this.startButton, "sg buttons, align 50% 50%, split 2, flowy");
@@ -1016,53 +1016,53 @@ public class OldGuiNewGame extends JFrame implements NewConstants, NewConstants.
@Override
public final void actionPerformed(final ActionEvent e) {
final LookAndFeelInfo[] info = UIManager.getInstalledLookAndFeels();
- final HashMap LAFMap = new HashMap();
+ final HashMap lafMap = new HashMap();
for (final LookAndFeelInfo anInfo : info) {
- LAFMap.put(anInfo.getName(), anInfo.getClassName());
+ lafMap.put(anInfo.getName(), anInfo.getClassName());
}
// add Substance LAFs:
- LAFMap.put("Autumn", "org.pushingpixels.substance.api.skin.SubstanceAutumnLookAndFeel");
- LAFMap.put("Business", "org.pushingpixels.substance.api.skin.SubstanceBusinessLookAndFeel");
- LAFMap.put("Business Black Steel",
+ lafMap.put("Autumn", "org.pushingpixels.substance.api.skin.SubstanceAutumnLookAndFeel");
+ lafMap.put("Business", "org.pushingpixels.substance.api.skin.SubstanceBusinessLookAndFeel");
+ lafMap.put("Business Black Steel",
"org.pushingpixels.substance.api.skin.SubstanceBusinessBlackSteelLookAndFeel");
- LAFMap.put("Business Blue Steel",
+ lafMap.put("Business Blue Steel",
"org.pushingpixels.substance.api.skin.SubstanceBusinessBlueSteelLookAndFeel");
- LAFMap.put("Challenger Deep", "org.pushingpixels.substance.api.skin.SubstanceChallengerDeepLookAndFeel");
- LAFMap.put("Creme", "org.pushingpixels.substance.api.skin.SubstanceCremeLookAndFeel");
- LAFMap.put("Creme Coffee", "org.pushingpixels.substance.api.skin.SubstanceCremeCoffeeLookAndFeel");
- LAFMap.put("Dust", "org.pushingpixels.substance.api.skin.SubstanceDustLookAndFeel");
- LAFMap.put("Dust Coffee", "org.pushingpixels.substance.api.skin.SubstanceDustCoffeeLookAndFeel");
- LAFMap.put("Emerald Dusk", "org.pushingpixels.substance.api.skin.SubstanceEmeraldDuskLookAndFeel");
- LAFMap.put("Gemini", "org.pushingpixels.substance.api.skin.SubstanceGeminiLookAndFeel");
- LAFMap.put("Graphite", "org.pushingpixels.substance.api.skin.SubstanceGraphiteLookAndFeel");
- LAFMap.put("Graphite Aqua", "org.pushingpixels.substance.api.skin.SubstanceGraphiteAquaLookAndFeel");
- LAFMap.put("Graphite Glass", "org.pushingpixels.substance.api.skin.SubstanceGraphiteGlassLookAndFeel");
- LAFMap.put("Magma", "org.pushingpixels.substance.api.skin.SubstanceMagmaLookAndFeel");
- LAFMap.put("Magellan", "org.pushingpixels.substance.api.skin.SubstanceMagellanLookAndFeel");
+ lafMap.put("Challenger Deep", "org.pushingpixels.substance.api.skin.SubstanceChallengerDeepLookAndFeel");
+ lafMap.put("Creme", "org.pushingpixels.substance.api.skin.SubstanceCremeLookAndFeel");
+ lafMap.put("Creme Coffee", "org.pushingpixels.substance.api.skin.SubstanceCremeCoffeeLookAndFeel");
+ lafMap.put("Dust", "org.pushingpixels.substance.api.skin.SubstanceDustLookAndFeel");
+ lafMap.put("Dust Coffee", "org.pushingpixels.substance.api.skin.SubstanceDustCoffeeLookAndFeel");
+ lafMap.put("Emerald Dusk", "org.pushingpixels.substance.api.skin.SubstanceEmeraldDuskLookAndFeel");
+ lafMap.put("Gemini", "org.pushingpixels.substance.api.skin.SubstanceGeminiLookAndFeel");
+ lafMap.put("Graphite", "org.pushingpixels.substance.api.skin.SubstanceGraphiteLookAndFeel");
+ lafMap.put("Graphite Aqua", "org.pushingpixels.substance.api.skin.SubstanceGraphiteAquaLookAndFeel");
+ lafMap.put("Graphite Glass", "org.pushingpixels.substance.api.skin.SubstanceGraphiteGlassLookAndFeel");
+ lafMap.put("Magma", "org.pushingpixels.substance.api.skin.SubstanceMagmaLookAndFeel");
+ lafMap.put("Magellan", "org.pushingpixels.substance.api.skin.SubstanceMagellanLookAndFeel");
// LAFMap.put("Mariner",
// "org.pushingpixels.substance.api.skin.SubstanceMarinerLookAndFeel");
- LAFMap.put("Mist Aqua", "org.pushingpixels.substance.api.skin.SubstanceMistAquaLookAndFeel");
- LAFMap.put("Mist Silver", "org.pushingpixels.substance.api.skin.SubstanceMistSilverLookAndFeel");
- LAFMap.put("Moderate", "org.pushingpixels.substance.api.skin.SubstanceModerateLookAndFeel");
- LAFMap.put("Nebula", "org.pushingpixels.substance.api.skin.SubstanceNebulaLookAndFeel");
- LAFMap.put("Nebula Brick Wall", "org.pushingpixels.substance.api.skin.SubstanceNebulaBrickWallLookAndFeel");
+ lafMap.put("Mist Aqua", "org.pushingpixels.substance.api.skin.SubstanceMistAquaLookAndFeel");
+ lafMap.put("Mist Silver", "org.pushingpixels.substance.api.skin.SubstanceMistSilverLookAndFeel");
+ lafMap.put("Moderate", "org.pushingpixels.substance.api.skin.SubstanceModerateLookAndFeel");
+ lafMap.put("Nebula", "org.pushingpixels.substance.api.skin.SubstanceNebulaLookAndFeel");
+ lafMap.put("Nebula Brick Wall", "org.pushingpixels.substance.api.skin.SubstanceNebulaBrickWallLookAndFeel");
// LAFMap.put("Office Black 2007",
// "org.pushingpixels.substance.api.skin.SubstanceOfficeBlack2007LookAndFeel");
- LAFMap.put("Office Blue 2007", "org.pushingpixels.substance.api.skin.SubstanceOfficeBlue2007LookAndFeel");
- LAFMap.put("Office Silver 2007",
+ lafMap.put("Office Blue 2007", "org.pushingpixels.substance.api.skin.SubstanceOfficeBlue2007LookAndFeel");
+ lafMap.put("Office Silver 2007",
"org.pushingpixels.substance.api.skin.SubstanceOfficeSilver2007LookAndFeel");
- LAFMap.put("Raven", "org.pushingpixels.substance.api.skin.SubstanceRavenLookAndFeel");
- LAFMap.put("Raven Graphite", "org.pushingpixels.substance.api.skin.SubstanceRavenGraphiteLookAndFeel");
+ lafMap.put("Raven", "org.pushingpixels.substance.api.skin.SubstanceRavenLookAndFeel");
+ lafMap.put("Raven Graphite", "org.pushingpixels.substance.api.skin.SubstanceRavenGraphiteLookAndFeel");
// LAFMap.put("Raven Graphite Glass",
// "org.pushingpixels.substance.api.skin.SubstanceRavenGraphiteGlassLookAndFeel");
- LAFMap.put("Sahara", "org.pushingpixels.substance.api.skin.SubstanceSaharaLookAndFeel");
- LAFMap.put("Twilight", "org.pushingpixels.substance.api.skin.SubstanceTwilightLookAndFeel");
+ lafMap.put("Sahara", "org.pushingpixels.substance.api.skin.SubstanceSaharaLookAndFeel");
+ lafMap.put("Twilight", "org.pushingpixels.substance.api.skin.SubstanceTwilightLookAndFeel");
- final String[] keys = new String[LAFMap.size()];
+ final String[] keys = new String[lafMap.size()];
int count = 0;
- for (final String s1 : LAFMap.keySet()) {
+ for (final String s1 : lafMap.keySet()) {
keys[count++] = s1;
}
Arrays.sort(keys);
@@ -1076,8 +1076,8 @@ public class OldGuiNewGame extends JFrame implements NewConstants, NewConstants.
return;
}
// UIManager.setLookAndFeel(info[index].getClassName());
- Singletons.getModel().getPreferences().setLaf(LAFMap.get(name));
- UIManager.setLookAndFeel(LAFMap.get(name));
+ Singletons.getModel().getPreferences().setLaf(lafMap.get(name));
+ UIManager.setLookAndFeel(lafMap.get(name));
SwingUtilities.updateComponentTreeUI(this.c);
} catch (final Exception ex) {
@@ -1922,4 +1922,46 @@ public class OldGuiNewGame extends JFrame implements NewConstants, NewConstants.
OldGuiNewGame.smoothLandCheckBox = smoothLandCheckBox; // TODO: Add 0 to parameter's name.
}
+ /**
+ * @return the devModeCheckBox
+ */
+ public static JCheckBox getDevModeCheckBox() {
+ return devModeCheckBox;
+ }
+
+ /**
+ * @param devModeCheckBox the devModeCheckBox to set
+ */
+ public static void setDevModeCheckBox(JCheckBox devModeCheckBox) {
+ OldGuiNewGame.devModeCheckBox = devModeCheckBox; // TODO: Add 0 to parameter's name.
+ }
+
+ /**
+ * @return the upldDrftCheckBox
+ */
+ public static JCheckBox getUpldDrftCheckBox() {
+ return upldDrftCheckBox;
+ }
+
+ /**
+ * @param upldDrftCheckBox the upldDrftCheckBox to set
+ */
+ public static void setUpldDrftCheckBox(JCheckBox upldDrftCheckBox) {
+ OldGuiNewGame.upldDrftCheckBox = upldDrftCheckBox; // TODO: Add 0 to parameter's name.
+ }
+
+ /**
+ * @return the foilRandomCheckBox
+ */
+ public static JCheckBox getFoilRandomCheckBox() {
+ return foilRandomCheckBox;
+ }
+
+ /**
+ * @param foilRandomCheckBox the foilRandomCheckBox to set
+ */
+ public static void setFoilRandomCheckBox(JCheckBox foilRandomCheckBox) {
+ OldGuiNewGame.foilRandomCheckBox = foilRandomCheckBox; // TODO: Add 0 to parameter's name.
+ }
+
}