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

checkstyle and refactoring

Browse Source
This commit is contained in:
jendave
2011-10-30 07:01:52 +00:00
parent 06829597eb
commit 21301e7b5f
12 changed files with 684 additions and 555 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/forge/Card.java
View File

@@ -565,7 +565,7 @@ public class Card extends GameEntity implements Comparable<Card> {
public final void setTriggers(final ArrayList<Trigger> trigs) {
ArrayList<Trigger> copyList = new ArrayList<Trigger>();
for (Trigger t : trigs) {
if(t.getIsIntrinsic()) {
if (t.getIsIntrinsic()) {
Trigger newtrig = t.getCopy();
newtrig.setHostCard(this);
copyList.add(newtrig);
@@ -7761,7 +7761,7 @@ public class Card extends GameEntity implements Comparable<Card> {
Random r = MyRandom.getRandom();
SetInfo si = getCharacteristics().getSets().get(r.nextInt(getCharacteristics().getSets().size()));
curSetCode = si.Code;
curSetCode = si.getCode();
}
/**
@@ -7797,8 +7797,8 @@ public class Card extends GameEntity implements Comparable<Card> {
*/
public final String getCurSetRarity() {
for (int i = 0; i < getCharacteristics().getSets().size(); i++) {
if (getCharacteristics().getSets().get(i).Code.equals(curSetCode)) {
return getCharacteristics().getSets().get(i).Rarity;
if (getCharacteristics().getSets().get(i).getCode().equals(curSetCode)) {
return getCharacteristics().getSets().get(i).getRarity();
}
}
@@ -7814,8 +7814,8 @@ public class Card extends GameEntity implements Comparable<Card> {
*/
public final String getCurSetURL() {
for (int i = 0; i < getCharacteristics().getSets().size(); i++) {
if (getCharacteristics().getSets().get(i).Code.equals(curSetCode)) {
return getCharacteristics().getSets().get(i).URL;
if (getCharacteristics().getSets().get(i).getCode().equals(curSetCode)) {
return getCharacteristics().getSets().get(i).getUrl();
}
}

4
src/main/java/forge/CardUtil.java
View File

@@ -659,11 +659,11 @@ public final class CardUtil {
Predicate<SetInfo> findSetInfo = new Predicate<SetInfo>() {
@Override
public boolean isTrue(final SetInfo subject) {
return subject.Code.equals(set);
return subject.getCode().equals(set);
}
};
SetInfo neededSet = findSetInfo.first(card.getSets());
int cntPictures = neededSet == null ? 1 : neededSet.PicCount;
int cntPictures = neededSet == null ? 1 : neededSet.getPicCount();
return buildFilename(card.getName(), card.getCurSetCode(), card.getRandomPicture(), cntPictures, token);
}

6
src/main/java/forge/Gui_MigrateLocalMWSSetPictures_HQ.java
View File

@@ -479,13 +479,13 @@ public final class Gui_MigrateLocalMWSSetPictures_HQ extends DefaultBoundedRange
final ArrayList<SetInfo> cSetInfo = c.getSets();
if (cSetInfo.size() > 0) {
for (int j = 0; j < cSetInfo.size(); j++) {
c.setCurSetCode(cSetInfo.get(j).Code);
c.setCurSetCode(cSetInfo.get(j).getCode());
final String setCode3 = c.getCurSetCode();
final String setCode2 = SetUtils.getCode2ByCode(c.getCurSetCode());
int n = 0;
if (cSetInfo.get(j).PicCount > 0) {
n = cSetInfo.get(j).PicCount;
if (cSetInfo.get(j).getPicCount() > 0) {
n = cSetInfo.get(j).getPicCount();
for (int k = 1; k <= n; k++) {
c.setRandomPicture(k);

269
src/main/java/forge/Phase.java
View File

@@ -29,7 +29,7 @@ public class Phase extends MyObservable implements java.io.Serializable {
/** Constant <code>GameBegins=0</code>. */
private static int GameBegins = 0;
private Stack<Player> extraTurns = new Stack<Player>();
private final Stack<Player> extraTurns = new Stack<Player>();
private int extraCombats;
@@ -48,7 +48,7 @@ public class Phase extends MyObservable implements java.io.Serializable {
* @return a boolean.
*/
public final boolean isPlayerTurn(final Player player) {
return playerTurn.isPlayer(player);
return this.playerTurn.isPlayer(player);
}
/**
@@ -60,7 +60,7 @@ public class Phase extends MyObservable implements java.io.Serializable {
* a {@link forge.Player} object.
*/
public final void setPlayerTurn(final Player s) {
playerTurn = s;
this.playerTurn = s;
}
/**
@@ -71,7 +71,7 @@ public class Phase extends MyObservable implements java.io.Serializable {
* @return a {@link forge.Player} object.
*/
public final Player getPlayerTurn() {
return playerTurn;
return this.playerTurn;
}
// priority player
@@ -86,7 +86,7 @@ public class Phase extends MyObservable implements java.io.Serializable {
* @return a {@link forge.Player} object.
*/
public final Player getPriorityPlayer() {
return pPlayerPriority;
return this.pPlayerPriority;
}
/**
@@ -98,7 +98,7 @@ public class Phase extends MyObservable implements java.io.Serializable {
* a {@link forge.Player} object.
*/
public final void setPriorityPlayer(final Player p) {
pPlayerPriority = p;
this.pPlayerPriority = p;
}
private Player pFirstPriority = AllZone.getHumanPlayer();
@@ -111,7 +111,7 @@ public class Phase extends MyObservable implements java.io.Serializable {
* @return a {@link forge.Player} object.
*/
public final Player getFirstPriority() {
return pFirstPriority;
return this.pFirstPriority;
}
/**
@@ -123,7 +123,7 @@ public class Phase extends MyObservable implements java.io.Serializable {
* a {@link forge.Player} object.
*/
public final void setFirstPriority(final Player p) {
pFirstPriority = p;
this.pFirstPriority = p;
}
/**
@@ -139,8 +139,8 @@ public class Phase extends MyObservable implements java.io.Serializable {
AllZone.getStack().chooseOrderOfSimultaneousStackEntryAll();
}
pFirstPriority = p;
pPlayerPriority = p;
this.pFirstPriority = p;
this.pPlayerPriority = p;
}
/**
@@ -149,7 +149,7 @@ public class Phase extends MyObservable implements java.io.Serializable {
* </p>
*/
public final void resetPriority() {
setPriority(playerTurn);
this.setPriority(this.playerTurn);
}
private boolean bPhaseEffects = true;
@@ -162,7 +162,7 @@ public class Phase extends MyObservable implements java.io.Serializable {
* @return a boolean.
*/
public final boolean doPhaseEffects() {
return bPhaseEffects;
return this.bPhaseEffects;
}
/**
@@ -174,7 +174,7 @@ public class Phase extends MyObservable implements java.io.Serializable {
* a boolean.
*/
public final void setPhaseEffects(final boolean b) {
bPhaseEffects = b;
this.bPhaseEffects = b;
}
private boolean bSkipPhase = true;
@@ -187,7 +187,7 @@ public class Phase extends MyObservable implements java.io.Serializable {
* @return a boolean.
*/
public final boolean doSkipPhase() {
return bSkipPhase;
return this.bSkipPhase;
}
/**
@@ -199,7 +199,7 @@ public class Phase extends MyObservable implements java.io.Serializable {
* a boolean.
*/
public final void setSkipPhase(final boolean b) {
bSkipPhase = b;
this.bSkipPhase = b;
}
private boolean bCombat = false;
@@ -212,7 +212,7 @@ public class Phase extends MyObservable implements java.io.Serializable {
* @return a boolean.
*/
public final boolean inCombat() {
return bCombat;
return this.bCombat;
}
/**
@@ -224,7 +224,7 @@ public class Phase extends MyObservable implements java.io.Serializable {
* a boolean.
*/
public final void setCombat(final boolean b) {
bCombat = b;
this.bCombat = b;
}
private boolean bRepeat = false;
@@ -235,12 +235,12 @@ public class Phase extends MyObservable implements java.io.Serializable {
* </p>
*/
public final void repeatPhase() {
bRepeat = true;
this.bRepeat = true;
}
/** The phase order. */
String[] phaseOrder = { Constant.Phase.UNTAP, Constant.Phase.UPKEEP, Constant.Phase.DRAW, Constant.Phase.MAIN1,
Constant.Phase.COMBAT_BEGIN, Constant.Phase.COMBAT_DECLARE_ATTACKERS,
private String[] phaseOrder = { Constant.Phase.UNTAP, Constant.Phase.UPKEEP, Constant.Phase.DRAW,
Constant.Phase.MAIN1, Constant.Phase.COMBAT_BEGIN, Constant.Phase.COMBAT_DECLARE_ATTACKERS,
Constant.Phase.COMBAT_DECLARE_ATTACKERS_INSTANT_ABILITY, Constant.Phase.COMBAT_DECLARE_BLOCKERS,
Constant.Phase.COMBAT_DECLARE_BLOCKERS_INSTANT_ABILITY, Constant.Phase.COMBAT_FIRST_STRIKE_DAMAGE,
Constant.Phase.COMBAT_DAMAGE, Constant.Phase.COMBAT_END, Constant.Phase.MAIN2, Constant.Phase.END_OF_TURN,
@@ -252,7 +252,7 @@ public class Phase extends MyObservable implements java.io.Serializable {
* </p>
*/
public Phase() {
reset();
this.reset();
}
/**
@@ -261,19 +261,19 @@ public class Phase extends MyObservable implements java.io.Serializable {
* </p>
*/
public final void reset() {
turn = 1;
playerTurn = AllZone.getHumanPlayer();
resetPriority();
bPhaseEffects = true;
needToNextPhase = false;
setGameBegins(0);
phaseIndex = 0;
extraTurns.clear();
nCombatsThisTurn = 0;
extraCombats = 0;
bPreventCombatDamageThisTurn = false;
bCombat = false;
bRepeat = false;
this.turn = 1;
this.playerTurn = AllZone.getHumanPlayer();
this.resetPriority();
this.bPhaseEffects = true;
this.needToNextPhase = false;
Phase.setGameBegins(0);
this.phaseIndex = 0;
this.extraTurns.clear();
this.nCombatsThisTurn = 0;
this.extraCombats = 0;
this.bPreventCombatDamageThisTurn = false;
this.bCombat = false;
this.bRepeat = false;
this.updateObservers();
}
@@ -283,7 +283,7 @@ public class Phase extends MyObservable implements java.io.Serializable {
* </p>
*/
public final void turnReset() {
playerTurn.setNumLandsPlayed(0);
this.playerTurn.setNumLandsPlayed(0);
}
/**
@@ -308,7 +308,7 @@ public class Phase extends MyObservable implements java.io.Serializable {
} else if (phase.equals(Constant.Phase.COMBAT_BEGIN)) {
PhaseUtil.verifyCombat();
} else if (phase.equals(Constant.Phase.COMBAT_DECLARE_ATTACKERS_INSTANT_ABILITY)) {
if (inCombat()) {
if (this.inCombat()) {
PhaseUtil.handleDeclareAttackers();
} else {
AllZone.getPhase().setNeedToNextPhase(true);
@@ -317,7 +317,7 @@ public class Phase extends MyObservable implements java.io.Serializable {
// we can skip AfterBlockers and AfterAttackers if necessary
else if (phase.equals(Constant.Phase.COMBAT_DECLARE_BLOCKERS)) {
if (inCombat()) {
if (this.inCombat()) {
PhaseUtil.verifyCombat();
} else {
AllZone.getPhase().setNeedToNextPhase(true);
@@ -325,13 +325,13 @@ public class Phase extends MyObservable implements java.io.Serializable {
} else if (phase.equals(Constant.Phase.COMBAT_DECLARE_BLOCKERS_INSTANT_ABILITY)) {
// After declare blockers are finished being declared mark them
// blocked and trigger blocking things
if (!inCombat()) {
if (!this.inCombat()) {
AllZone.getPhase().setNeedToNextPhase(true);
} else {
PhaseUtil.handleDeclareBlockers();
}
} else if (phase.equals(Constant.Phase.COMBAT_FIRST_STRIKE_DAMAGE)) {
if (!inCombat()) {
if (!this.inCombat()) {
AllZone.getPhase().setNeedToNextPhase(true);
} else {
AllZone.getCombat().verifyCreaturesInPlay();
@@ -340,7 +340,7 @@ public class Phase extends MyObservable implements java.io.Serializable {
if (!AllZone.getCombat().setAssignedFirstStrikeDamage()) {
AllZone.getPhase().setNeedToNextPhase(true);
} else {
if (!isPreventCombatDamageThisTurn()) {
if (!this.isPreventCombatDamageThisTurn()) {
Combat.dealAssignedDamage();
}
@@ -349,14 +349,14 @@ public class Phase extends MyObservable implements java.io.Serializable {
}
}
} else if (phase.equals(Constant.Phase.COMBAT_DAMAGE)) {
if (!inCombat()) {
if (!this.inCombat()) {
AllZone.getPhase().setNeedToNextPhase(true);
} else {
AllZone.getCombat().verifyCreaturesInPlay();
AllZone.getCombat().setAssignedDamage();
if (!isPreventCombatDamageThisTurn()) {
if (!this.isPreventCombatDamageThisTurn()) {
Combat.dealAssignedDamage();
}
@@ -373,8 +373,8 @@ public class Phase extends MyObservable implements java.io.Serializable {
AllZone.getPhase().getPlayerTurn().setAssignedDamage(0);
// Reset Damage received map
CardList list = AllZoneUtil.getCardsIn(Zone.Battlefield);
for (Card c : list) {
final CardList list = AllZoneUtil.getCardsIn(Zone.Battlefield);
for (final Card c : list) {
c.resetPreventNextDamage();
c.resetReceivedDamageFromThisTurn();
c.resetDealtDamageToThisTurn();
@@ -385,19 +385,21 @@ public class Phase extends MyObservable implements java.io.Serializable {
AllZone.getComputerPlayer().resetPreventNextDamage();
AllZone.getEndOfTurn().executeUntil();
CardList cHand = AllZone.getComputerPlayer().getCardsIn(Zone.Hand);
CardList hHand = AllZone.getHumanPlayer().getCardsIn(Zone.Hand);
for (Card c : cHand)
final CardList cHand = AllZone.getComputerPlayer().getCardsIn(Zone.Hand);
final CardList hHand = AllZone.getHumanPlayer().getCardsIn(Zone.Hand);
for (final Card c : cHand) {
c.setDrawnThisTurn(false);
for (Card c : hHand)
}
for (final Card c : hHand) {
c.setDrawnThisTurn(false);
}
AllZone.getHumanPlayer().resetNumDrawnThisTurn();
AllZone.getComputerPlayer().resetNumDrawnThisTurn();
}
if (!AllZone.getPhase().isNeedToNextPhase()) {
// Run triggers if phase isn't being skipped
HashMap<String, Object> runParams = new HashMap<String, Object>();
final HashMap<String, Object> runParams = new HashMap<String, Object>();
runParams.put("Phase", phase);
runParams.put("Player", turn);
AllZone.getTriggerHandler().runTrigger("Phase", runParams);
@@ -409,7 +411,7 @@ public class Phase extends MyObservable implements java.io.Serializable {
if (!phase.equals(Constant.Phase.UNTAP)) {
// during untap
resetPriority();
this.resetPriority();
}
}
@@ -419,7 +421,7 @@ public class Phase extends MyObservable implements java.io.Serializable {
* @return true, if is prevent combat damage this turn
*/
public final boolean isPreventCombatDamageThisTurn() {
return bPreventCombatDamageThisTurn;
return this.bPreventCombatDamageThisTurn;
}
/**
@@ -429,12 +431,12 @@ public class Phase extends MyObservable implements java.io.Serializable {
*/
public final void nextPhase() {
// experimental, add executeCardStateEffects() here:
for (String effect : AllZone.getStaticEffects().getStateBasedMap().keySet()) {
Command com = GameActionUtil.getCommands().get(effect);
for (final String effect : AllZone.getStaticEffects().getStateBasedMap().keySet()) {
final Command com = GameActionUtil.getCommands().get(effect);
com.execute();
}
needToNextPhase = false;
this.needToNextPhase = false;
// If the Stack isn't empty why is nextPhase being called?
if (AllZone.getStack().size() != 0) {
@@ -447,64 +449,64 @@ public class Phase extends MyObservable implements java.io.Serializable {
AllZone.getComputerPlayer().getManaPool().clearPool();
}
if (getPhase().equals(Constant.Phase.COMBAT_DECLARE_ATTACKERS)) {
if (this.getPhase().equals(Constant.Phase.COMBAT_DECLARE_ATTACKERS)) {
AllZone.getStack().unfreezeStack();
nCombatsThisTurn++;
} else if (getPhase().equals(Constant.Phase.UNTAP)) {
nCombatsThisTurn = 0;
this.nCombatsThisTurn++;
} else if (this.getPhase().equals(Constant.Phase.UNTAP)) {
this.nCombatsThisTurn = 0;
}
if (getPhase().equals(Constant.Phase.COMBAT_END)) {
if (this.getPhase().equals(Constant.Phase.COMBAT_END)) {
AllZone.getCombat().reset();
AllZone.getDisplay().showCombat("");
resetAttackedThisCombat(getPlayerTurn());
this.resetAttackedThisCombat(this.getPlayerTurn());
this.bCombat = false;
}
if (phaseOrder[phaseIndex].equals(Constant.Phase.CLEANUP)) {
bPreventCombatDamageThisTurn = false;
if (!bRepeat) {
AllZone.getPhase().setPlayerTurn(handleNextTurn());
if (this.getPhaseOrder()[this.phaseIndex].equals(Constant.Phase.CLEANUP)) {
this.bPreventCombatDamageThisTurn = false;
if (!this.bRepeat) {
AllZone.getPhase().setPlayerTurn(this.handleNextTurn());
}
}
if (is(Constant.Phase.COMBAT_DECLARE_BLOCKERS)) {
if (this.is(Constant.Phase.COMBAT_DECLARE_BLOCKERS)) {
AllZone.getStack().unfreezeStack();
}
if (is(Constant.Phase.COMBAT_END) && extraCombats > 0) {
if (this.is(Constant.Phase.COMBAT_END) && (this.extraCombats > 0)) {
// TODO: ExtraCombat needs to be changed for other spell/abilities
// that give extra combat
// can do it like ExtraTurn stack ExtraPhases
Player player = getPlayerTurn();
Player opp = player.getOpponent();
final Player player = this.getPlayerTurn();
final Player opp = player.getOpponent();
bCombat = true;
extraCombats--;
this.bCombat = true;
this.extraCombats--;
AllZone.getCombat().reset();
AllZone.getCombat().setAttackingPlayer(player);
AllZone.getCombat().setDefendingPlayer(opp);
phaseIndex = findIndex(Constant.Phase.COMBAT_DECLARE_ATTACKERS);
this.phaseIndex = this.findIndex(Constant.Phase.COMBAT_DECLARE_ATTACKERS);
} else {
if (!bRepeat) { // for when Cleanup needs to repeat itself
phaseIndex++;
phaseIndex %= phaseOrder.length;
if (!this.bRepeat) { // for when Cleanup needs to repeat itself
this.phaseIndex++;
this.phaseIndex %= this.getPhaseOrder().length;
} else {
bRepeat = false;
this.bRepeat = false;
}
}
// **** Anything BELOW Here is actually in the next phase. Maybe move
// this to handleBeginPhase
if (getPhase().equals(Constant.Phase.UNTAP)) {
turn++;
if (this.getPhase().equals(Constant.Phase.UNTAP)) {
this.turn++;
}
// When consecutively skipping phases (like in combat) this section
// pushes through that block
this.updateObservers();
if (AllZone.getPhase() != null && AllZone.getPhase().isNeedToNextPhase()) {
if ((AllZone.getPhase() != null) && AllZone.getPhase().isNeedToNextPhase()) {
AllZone.getPhase().setNeedToNextPhase(false);
AllZone.getPhase().nextPhase();
}
@@ -518,7 +520,7 @@ public class Phase extends MyObservable implements java.io.Serializable {
* @return a {@link forge.Player} object.
*/
private Player handleNextTurn() {
Player nextTurn = extraTurns.isEmpty() ? getPlayerTurn().getOpponent() : extraTurns.pop();
final Player nextTurn = this.extraTurns.isEmpty() ? this.getPlayerTurn().getOpponent() : this.extraTurns.pop();
AllZone.getStack().setCardsCastLastTurn();
AllZone.getStack().clearCardsCastThisTurn();
@@ -526,7 +528,7 @@ public class Phase extends MyObservable implements java.io.Serializable {
AllZone.getComputerPlayer().resetProwl();
AllZone.getHumanPlayer().resetProwl();
return skipTurnTimeVault(nextTurn);
return this.skipTurnTimeVault(nextTurn);
}
/**
@@ -542,6 +544,7 @@ public class Phase extends MyObservable implements java.io.Serializable {
// time vault:
CardList vaults = turn.getCardsIn(Zone.Battlefield, "Time Vault");
vaults = vaults.filter(new CardListFilter() {
@Override
public boolean addCard(final Card c) {
return c.isTapped();
}
@@ -553,7 +556,7 @@ public class Phase extends MyObservable implements java.io.Serializable {
if (turn.isHuman()) {
if (GameActionUtil.showYesNoDialog(crd, "Untap " + crd + "?")) {
crd.untap();
turn = extraTurns.isEmpty() ? turn.getOpponent() : extraTurns.pop();
turn = this.extraTurns.isEmpty() ? turn.getOpponent() : this.extraTurns.pop();
}
} else {
// TODO Should AI skip his turn for time vault?
@@ -574,7 +577,7 @@ public class Phase extends MyObservable implements java.io.Serializable {
* @return a boolean.
*/
public final synchronized boolean is(final String phase, final Player player) {
return getPhase().equals(phase) && getPlayerTurn().isPlayer(player);
return this.getPhase().equals(phase) && this.getPlayerTurn().isPlayer(player);
}
/**
@@ -587,7 +590,7 @@ public class Phase extends MyObservable implements java.io.Serializable {
* @return a boolean.
*/
public final synchronized boolean is(final String phase) {
return (getPhase().equals(phase));
return (this.getPhase().equals(phase));
}
/**
@@ -600,7 +603,7 @@ public class Phase extends MyObservable implements java.io.Serializable {
* @return a boolean.
*/
public final boolean isAfter(final String phase) {
return phaseIndex > findIndex(phase);
return this.phaseIndex > this.findIndex(phase);
}
/**
@@ -613,7 +616,7 @@ public class Phase extends MyObservable implements java.io.Serializable {
* @return a boolean.
*/
public final boolean isBefore(final String phase) {
return phaseIndex < findIndex(phase);
return this.phaseIndex < this.findIndex(phase);
}
/**
@@ -626,8 +629,8 @@ public class Phase extends MyObservable implements java.io.Serializable {
* @return a int.
*/
private int findIndex(final String phase) {
for (int i = 0; i < phaseOrder.length; i++) {
if (phase.equals(phaseOrder[i])) {
for (int i = 0; i < this.getPhaseOrder().length; i++) {
if (phase.equals(this.getPhaseOrder()[i])) {
return i;
}
}
@@ -642,7 +645,7 @@ public class Phase extends MyObservable implements java.io.Serializable {
* @return a {@link java.lang.String} object.
*/
public final String getPhase() {
return phaseOrder[phaseIndex];
return this.getPhaseOrder()[this.phaseIndex];
}
/**
@@ -653,7 +656,7 @@ public class Phase extends MyObservable implements java.io.Serializable {
* @return a int.
*/
public final int getTurn() {
return turn;
return this.turn;
}
/**
@@ -664,11 +667,11 @@ public class Phase extends MyObservable implements java.io.Serializable {
* @return a {@link forge.Player} object.
*/
public final Player getNextTurn() {
if (extraTurns.isEmpty()) {
return getPlayerTurn().getOpponent();
if (this.extraTurns.isEmpty()) {
return this.getPlayerTurn().getOpponent();
}
return extraTurns.peek();
return this.extraTurns.peek();
}
/**
@@ -681,7 +684,7 @@ public class Phase extends MyObservable implements java.io.Serializable {
* @return a boolean.
*/
public final boolean isNextTurn(final Player pl) {
Player next = getNextTurn();
final Player next = this.getNextTurn();
return (pl.equals(next));
}
@@ -696,11 +699,11 @@ public class Phase extends MyObservable implements java.io.Serializable {
public final void addExtraTurn(final Player player) {
// use a stack to handle extra turns, make sure the bottom of the stack
// restores original turn order
if (extraTurns.isEmpty()) {
extraTurns.push(getPlayerTurn().getOpponent());
if (this.extraTurns.isEmpty()) {
this.extraTurns.push(this.getPlayerTurn().getOpponent());
}
extraTurns.push(player);
this.extraTurns.push(player);
}
/**
@@ -714,14 +717,14 @@ public class Phase extends MyObservable implements java.io.Serializable {
public final void skipTurn(final Player player) {
// skipping turn without having extras is equivalent to giving your
// opponent an extra turn
if (extraTurns.isEmpty()) {
addExtraTurn(player.getOpponent());
if (this.extraTurns.isEmpty()) {
this.addExtraTurn(player.getOpponent());
} else {
int pos = extraTurns.lastIndexOf(player);
final int pos = this.extraTurns.lastIndexOf(player);
if (pos == -1) {
addExtraTurn(player.getOpponent());
this.addExtraTurn(player.getOpponent());
} else {
extraTurns.remove(pos);
this.extraTurns.remove(pos);
}
}
}
@@ -733,7 +736,7 @@ public class Phase extends MyObservable implements java.io.Serializable {
*/
public final void addExtraCombat() {
// Extra combats can only happen
extraCombats++;
this.extraCombats++;
}
/**
@@ -744,7 +747,7 @@ public class Phase extends MyObservable implements java.io.Serializable {
* @return a boolean.
*/
public final boolean isFirstCombat() {
return (nCombatsThisTurn == 1);
return (this.nCombatsThisTurn == 1);
}
/**
@@ -762,7 +765,7 @@ public class Phase extends MyObservable implements java.io.Serializable {
list = list.getType("Creature");
for (int i = 0; i < list.size(); i++) {
Card c = list.get(i);
final Card c = list.get(i);
if (c.getCreatureAttackedThisCombat()) {
c.setCreatureAttackedThisCombat(false);
}
@@ -782,8 +785,8 @@ public class Phase extends MyObservable implements java.io.Serializable {
* </p>
*/
public final void passPriority() {
Player actingPlayer = getPriorityPlayer();
Player lastToAct = getFirstPriority();
final Player actingPlayer = this.getPriorityPlayer();
final Player lastToAct = this.getFirstPriority();
// actingPlayer is the player who may act
// the lastToAct is the player who gained Priority First in this segment
@@ -791,14 +794,15 @@ public class Phase extends MyObservable implements java.io.Serializable {
if (lastToAct.equals(actingPlayer)) {
// pass the priority to other player
setPriorityPlayer(actingPlayer.getOpponent());
this.setPriorityPlayer(actingPlayer.getOpponent());
AllZone.getInputControl().resetInput();
AllZone.getStack().chooseOrderOfSimultaneousStackEntryAll();
} else {
if (AllZone.getStack().size() == 0) {
// end phase
needToNextPhase = true;
pPlayerPriority = getPlayerTurn(); // this needs to be set early
this.needToNextPhase = true;
this.pPlayerPriority = this.getPlayerTurn(); // this needs to be
// set early
// as we exit the phase
} else {
if (!AllZone.getStack().hasSimultaneousStackEntries()) {
@@ -817,7 +821,7 @@ public class Phase extends MyObservable implements java.io.Serializable {
}
/** The need to next phase. */
boolean needToNextPhase = false;
private boolean needToNextPhase = false;
/**
* <p>
@@ -845,7 +849,7 @@ public class Phase extends MyObservable implements java.io.Serializable {
// This should only be true four times! that is for the initial nextPhases
// in MyObservable
/** The need to next phase init. */
int needToNextPhaseInit = 0;
private int needToNextPhaseInit = 0;
/**
* <p>
@@ -855,8 +859,8 @@ public class Phase extends MyObservable implements java.io.Serializable {
* @return a boolean.
*/
public final boolean isNeedToNextPhaseInit() {
needToNextPhaseInit++;
if (needToNextPhaseInit <= 4) {
this.needToNextPhaseInit++;
if (this.needToNextPhaseInit <= 4) {
return true;
}
return false;
@@ -874,7 +878,7 @@ public class Phase extends MyObservable implements java.io.Serializable {
public static boolean canCastSorcery(final Player player) {
return AllZone.getPhase().isPlayerTurn(player)
&& (AllZone.getPhase().getPhase().equals(Constant.Phase.MAIN2) || AllZone.getPhase().getPhase()
.equals(Constant.Phase.MAIN1)) && AllZone.getStack().size() == 0;
.equals(Constant.Phase.MAIN1)) && (AllZone.getStack().size() == 0);
}
/**
@@ -889,11 +893,11 @@ public class Phase extends MyObservable implements java.io.Serializable {
* @return a {@link java.lang.String} object.
*/
public final String buildActivateString(final String startPhase, final String endPhase) {
StringBuilder sb = new StringBuilder();
final StringBuilder sb = new StringBuilder();
boolean add = false;
for (int i = 0; i < phaseOrder.length; i++) {
if (phaseOrder[i].equals(startPhase)) {
for (int i = 0; i < this.getPhaseOrder().length; i++) {
if (this.getPhaseOrder()[i].equals(startPhase)) {
add = true;
}
@@ -901,10 +905,10 @@ public class Phase extends MyObservable implements java.io.Serializable {
if (sb.length() != 0) {
sb.append(",");
}
sb.append(phaseOrder[i]);
sb.append(this.getPhaseOrder()[i]);
}
if (phaseOrder[i].equals(endPhase)) {
if (this.getPhaseOrder()[i].equals(endPhase)) {
add = false;
}
}
@@ -921,7 +925,7 @@ public class Phase extends MyObservable implements java.io.Serializable {
* a int.
*/
public static void setGameBegins(final int gameBegins) {
GameBegins = gameBegins;
Phase.GameBegins = gameBegins;
}
/**
@@ -932,7 +936,7 @@ public class Phase extends MyObservable implements java.io.Serializable {
* @return a int.
*/
public static int getGameBegins() {
return GameBegins;
return Phase.GameBegins;
}
// this is a hack for the setup game state mode, do not use outside of
@@ -948,7 +952,7 @@ public class Phase extends MyObservable implements java.io.Serializable {
* a {@link java.lang.String} object.
*/
public final void setDevPhaseState(final String phaseID) {
this.phaseIndex = findIndex(phaseID);
this.phaseIndex = this.findIndex(phaseID);
}
/**
@@ -959,6 +963,25 @@ public class Phase extends MyObservable implements java.io.Serializable {
* a boolean
*/
public final void setPreventCombatDamageThisTurn(final boolean b) {
bPreventCombatDamageThisTurn = true;
this.bPreventCombatDamageThisTurn = true;
}
/**
* Gets the phase order.
*
* @return the phaseOrder
*/
public String[] getPhaseOrder() {
return this.phaseOrder;
}
/**
* Sets the phase order.
*
* @param phaseOrder
* the phaseOrder to set
*/
public void setPhaseOrder(final String[] phaseOrder) {
this.phaseOrder = phaseOrder; // TODO: Add 0 to parameter's name.
}
}

36
src/main/java/forge/PhaseUtil.java
View File

@@ -58,9 +58,10 @@ public class PhaseUtil {
// Sickness on first turn
if (turn.getTurn() > 0) {
CardList list = turn.getCardsIncludePhasingIn(Zone.Battlefield);
for (Card c : list)
for (Card c : list) {
c.setSickness(false);
}
}
turn.incrementTurn();
AllZone.getGameAction().resetActivationsPerTurn();
@@ -206,12 +207,12 @@ public class PhaseUtil {
// opponent untapping during your untap phase
CardList opp = player.getOpponent().getCardsIn(Zone.Battlefield);
for (Card oppCard : opp)
if (oppCard.hasKeyword("CARDNAME untaps during each other player's untap step."))
{
for (Card oppCard : opp) {
if (oppCard.hasKeyword("CARDNAME untaps during each other player's untap step.")) {
oppCard.untap();
// end opponent untapping during your untap phase
}
}
if (canOnlyUntapOneLand()) {
if (AllZone.getPhase().getPlayerTurn().isComputer()) {
@@ -244,8 +245,8 @@ public class PhaseUtil {
c.untap();
stop();
}
}// selectCard()
};// Input
} // selectCard()
}; // Input
CardList landList = AllZoneUtil.getPlayerLandsInPlay(AllZone.getHumanPlayer());
landList = landList.filter(CardListFilter.TAPPED).filter(new CardListFilter() {
@Override
@@ -290,8 +291,8 @@ public class PhaseUtil {
c.untap();
stop();
}
}// selectCard()
};// Input
} // selectCard()
}; // Input
CardList artList = AllZone.getHumanPlayer().getCardsIn(Zone.Battlefield);
artList = artList.filter(CardListFilter.ARTIFACTS);
artList = artList.filter(CardListFilter.TAPPED).filter(new CardListFilter() {
@@ -336,8 +337,8 @@ public class PhaseUtil {
c.untap();
stop();
}
}// selectCard()
};// Input
} // selectCard()
}; // Input
CardList creatures = AllZoneUtil.getCreaturesInPlay(AllZone.getHumanPlayer());
creatures = creatures.filter(CardListFilter.TAPPED).filter(new CardListFilter() {
@Override
@@ -357,7 +358,7 @@ public class PhaseUtil {
c.removeExtrinsicKeyword("This card doesn't untap during your next untap step.");
c.removeExtrinsicKeyword("HIDDEN This card doesn't untap during your next untap step.");
}
}// end doUntap
} // end doUntap
/**
* <p>
@@ -378,9 +379,9 @@ public class PhaseUtil {
CardList allp = AllZoneUtil.getCardsIn(Zone.Battlefield);
for (Card ca : allp) {
if (ca.hasStartOfKeyword("Permanents don't untap during their controllers' untap steps")) {
int KeywordPosition = ca
int keywordPosition = ca
.getKeywordPosition("Permanents don't untap during their controllers' untap steps");
String parse = ca.getKeyword().get(KeywordPosition).toString();
String parse = ca.getKeyword().get(keywordPosition).toString();
String[] k = parse.split(":");
final String[] restrictions = k[1].split(",");
final Card card = ca;
@@ -551,8 +552,7 @@ public class PhaseUtil {
CardList exalted = attackingPlayer.getCardsIn(Zone.Battlefield);
exalted = exalted.getKeyword("Exalted");
if (exalted.size() > 0)
{
if (exalted.size() > 0) {
CombatUtil.executeExaltedAbility(list.get(0), exalted.size());
// Make sure exalted effects get applied only once per combat
}
@@ -564,8 +564,9 @@ public class PhaseUtil {
runParams.put("AttackingPlayer", AllZone.getCombat().getAttackingPlayer());
AllZone.getTriggerHandler().runTrigger("AttackersDeclared", runParams);
for (Card c : list)
for (Card c : list) {
CombatUtil.checkDeclareAttackers(c);
}
AllZone.getStack().unfreezeStack();
}
@@ -597,9 +598,10 @@ public class PhaseUtil {
for (Card a : attList) {
CardList blockList = AllZone.getCombat().getBlockers(a);
for (Card b : blockList)
for (Card b : blockList) {
CombatUtil.checkBlockedAttackers(a, b);
}
}
AllZone.getStack().unfreezeStack();
CombatUtil.showCombat();

3
src/main/java/forge/PlayerZoneComesIntoPlay.java
View File

@@ -50,7 +50,8 @@ public class PlayerZoneComesIntoPlay extends DefaultPlayerZone {
final Player player = c.getController();
if (trigger
&& ((CardFactoryUtil.oppHasKismet(c.getController()) && (c.isLand() || c.isCreature() || c.isArtifact()))
&& ((CardFactoryUtil.oppHasKismet(c.getController())
&& (c.isLand() || c.isCreature() || c.isArtifact()))
|| (AllZoneUtil.isCardInPlay("Urabrask the Hidden", c.getController().getOpponent()) && c
.isCreature())
|| (AllZoneUtil.isCardInPlay("Root Maze") && (c.isLand() || c.isArtifact())) || (AllZoneUtil

124
src/main/java/forge/SetInfo.java
View File

@@ -11,16 +11,16 @@ package forge;
public class SetInfo {
/** The Code. */
public String Code;
private String code;
/** The Rarity. */
public String Rarity;
private String rarity;
/** The URL. */
public String URL;
private String url;
/** The Pic count. */
public int PicCount;
private int picCount;
/**
* <p>
@@ -28,10 +28,10 @@ public class SetInfo {
* </p>
*/
public SetInfo() {
Code = "";
Rarity = "";
URL = "";
PicCount = 0;
this.setCode("");
this.setRarity("");
this.setUrl("");
this.setPicCount(0);
}
/**
@@ -47,10 +47,10 @@ public class SetInfo {
* a {@link java.lang.String} object.
*/
public SetInfo(final String c, final String r, final String u) {
Code = c;
Rarity = r;
URL = u;
PicCount = 0;
this.setCode(c);
this.setRarity(r);
this.setUrl(u);
this.setPicCount(0);
}
/**
@@ -68,10 +68,10 @@ public class SetInfo {
* a int.
*/
public SetInfo(final String c, final String r, final String u, final int p) {
Code = c;
Rarity = r;
URL = u;
PicCount = p;
this.setCode(c);
this.setRarity(r);
this.setUrl(u);
this.setPicCount(p);
}
/**
@@ -83,14 +83,14 @@ public class SetInfo {
* a {@link java.lang.String} object.
*/
public SetInfo(final String parse) {
String[] pp = parse.split("\\|");
Code = pp[0];
Rarity = pp[1];
URL = pp[2];
final String[] pp = parse.split("\\|");
this.setCode(pp[0]);
this.setRarity(pp[1]);
this.setUrl(pp[2]);
if (pp.length > 3) {
PicCount = Integer.parseInt(pp[3]);
this.setPicCount(Integer.parseInt(pp[3]));
} else {
PicCount = 0;
this.setPicCount(0);
}
}
@@ -101,18 +101,92 @@ public class SetInfo {
*
* @return a {@link java.lang.String} object.
*/
@Override
public final String toString() {
return Code;
return this.getCode();
}
/** {@inheritDoc} */
@Override
public final boolean equals(final Object o) {
if (o instanceof SetInfo) {
SetInfo siO = (SetInfo) o;
return Code.equals(siO.Code);
final SetInfo siO = (SetInfo) o;
return this.getCode().equals(siO.getCode());
} else {
return false;
}
}
/**
* Gets the code.
*
* @return the code
*/
public String getCode() {
return this.code;
}
/**
* Sets the code.
*
* @param code the code to set
*/
public void setCode(final String code) {
this.code = code; // TODO: Add 0 to parameter's name.
}
/**
* Gets the rarity.
*
* @return the rarity
*/
public String getRarity() {
return this.rarity;
}
/**
* Sets the rarity.
*
* @param rarity the rarity to set
*/
public void setRarity(final String rarity) {
this.rarity = rarity; // TODO: Add 0 to parameter's name.
}
/**
* Gets the url.
*
* @return the url
*/
public String getUrl() {
return this.url;
}
/**
* Sets the url.
*
* @param url the url to set
*/
public void setUrl(final String url) {
this.url = url; // TODO: Add 0 to parameter's name.
}
/**
* Gets the pic count.
*
* @return the picCount
*/
public int getPicCount() {
return this.picCount;
}
/**
* Sets the pic count.
*
* @param picCount the picCount to set
*/
public void setPicCount(final int picCount) {
this.picCount = picCount; // TODO: Add 0 to parameter's name.
}
}

5
src/main/java/forge/StaticEffects.java
View File

@@ -25,7 +25,7 @@ public class StaticEffects {
/**
* staticEffects.
*/
public ArrayList<StaticEffect> staticEffects;
private ArrayList<StaticEffect> staticEffects;
/**
* clearStaticEffect. TODO Write javadoc for this method.
@@ -114,10 +114,11 @@ public class StaticEffects {
// add keywords
if (addKeywords != null) {
for (String keyword : addKeywords)
for (String keyword : addKeywords) {
p.removeKeyword(keyword);
}
}
}
// modify the affected card
for (int i = 0; i < affectedCards.size(); i++) {

741
src/main/java/forge/Upkeep.java
View File

File diff suppressed because it is too large Load Diff

7
src/main/java/forge/ZCTrigger.java
View File

@@ -24,10 +24,10 @@ public enum ZCTrigger {
ENTERGRAVE("is put into a graveyard from anywhere", "any > grave");
/** The rule text. */
public String ruleText;
private String ruleText;
/** The trigger zones. */
public String[] triggerZones;
private String[] triggerZones;
/**
* <p>
@@ -56,7 +56,8 @@ public enum ZCTrigger {
* @return a boolean.
*/
public boolean triggerOn(final String sourceZone, final String destintationZone) {
return ((triggerZones[0].equals("any") || triggerZones[0].equals(sourceZone)) && (triggerZones[1].equals("any") || triggerZones[0]
return ((triggerZones[0].equals("any") || triggerZones[0].equals(sourceZone))
&& (triggerZones[1].equals("any") || triggerZones[0]
.equals(sourceZone)));
}

2
src/main/java/forge/deck/DeckManager.java
View File

@@ -660,7 +660,7 @@ public class DeckManager {
for (Card card : d.getMain().toForgeCardList().toArray()) {
// System.out.println(card.getSets().get(card.getSets().size() -
// 1).URL);
list.add(card.getSets().get(card.getSets().size() - 1).URL);
list.add(card.getSets().get(card.getSets().size() - 1).getUrl());
}
/*
* List<String> nameList = new ArrayList<String>(); for (Card card :

2
src/test/java/forge/PhaseTest.java
View File

@@ -15,7 +15,7 @@ public class PhaseTest {
@Test(groups = {"UnitTest", "fast"}, timeOut = 5000, enabled = false)
public void PhaseTest1() {
Phase phase = new Phase();
for (int i = 0; i < phase.phaseOrder.length; i++) {
for (int i = 0; i < phase.getPhaseOrder().length; i++) {
System.out.println(phase.getPlayerTurn() + " " + phase.getPhase());
phase.nextPhase();
}