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

- CheckStyle.

Browse Source
This commit is contained in:
Chris
2012-01-09 18:02:04 +00:00
parent ea3207c202
commit d85981caf2
5 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/forge/GameAction.java
View File

@@ -1347,7 +1347,7 @@ public class GameAction {
// AllZone.getComputer() = new ComputerAI_Input(new // AllZone.getComputer() = new ComputerAI_Input(new
// ComputerAI_General()); // ComputerAI_General());
Constant.Quest.FANTASY_QUEST[0] = false; Constant.Quest.FANTASY_QUEST[0] = false;
AllZone.getComputerPlayer().setStartingLife(20); AllZone.getComputerPlayer().setStartingLife(20);
AllZone.getHumanPlayer().setStartingLife(20); AllZone.getHumanPlayer().setStartingLife(20);

8
src/main/java/forge/Player.java
View File

@@ -53,13 +53,13 @@ public abstract class Player extends GameEntity {
/** The life. */ /** The life. */
private int life; private int life;
/** The life this player started the game with. */ /** The life this player started the game with. */
private int startingLife; private int startingLife;
/** The assigned damage. */ /** The assigned damage. */
private int assignedDamage; private int assignedDamage;
/** The life lost this turn. */ /** The life lost this turn. */
private int lifeLostThisTurn = 0; private int lifeLostThisTurn = 0;
@@ -261,7 +261,7 @@ public abstract class Player extends GameEntity {
this.updateObservers(); this.updateObservers();
return change; return change;
} }
/** /**
* Sets the starting life for a game. Should only be called from newGame()'s. * Sets the starting life for a game. Should only be called from newGame()'s.
* *
@@ -282,7 +282,7 @@ public abstract class Player extends GameEntity {
public final int getLife() { public final int getLife() {
return this.life; return this.life;
} }
/** /**
* <p> * <p>
* Getter for the field <code>startingLife</code>. * Getter for the field <code>startingLife</code>.

6
src/main/java/forge/card/cardfactory/CardFactoryUtil.java
View File

@@ -2832,12 +2832,12 @@ public class CardFactoryUtil {
} }
return CardFactoryUtil.doXMath(n, m, c); return CardFactoryUtil.doXMath(n, m, c);
} }
// Count$YourStartingLife // Count$YourStartingLife
if (sq[0].contains("YourStartingLife")) { if (sq[0].contains("YourStartingLife")) {
return CardFactoryUtil.doXMath(cardController.getStartingLife(), m, c); return CardFactoryUtil.doXMath(cardController.getStartingLife(), m, c);
} }
// Count$OppStartingLife // Count$OppStartingLife
if (sq[0].contains("OppStartingLife")) { if (sq[0].contains("OppStartingLife")) {
return CardFactoryUtil.doXMath(oppController.getStartingLife(), m, c); return CardFactoryUtil.doXMath(oppController.getStartingLife(), m, c);
@@ -2940,7 +2940,7 @@ public class CardFactoryUtil {
return CardFactoryUtil.doXMath(Integer.parseInt(sq[2]), m, c); return CardFactoryUtil.doXMath(Integer.parseInt(sq[2]), m, c);
} }
} }
// Count$FatefulHour.<numFH>.numNotFH> // Count$FatefulHour.<numFH>.numNotFH>
if (sq[0].contains("FatefulHour")) { if (sq[0].contains("FatefulHour")) {
if (cardController.getLife() <= 5) { if (cardController.getLife() <= 5) {

2
src/main/java/forge/card/staticability/StaticAbility.java
View File

@@ -384,7 +384,7 @@ public class StaticAbility {
if ((effectZone != null) && (!this.hostCard.isInZone(effectZone) || this.hostCard.isPhasedOut())) { if ((effectZone != null) && (!this.hostCard.isInZone(effectZone) || this.hostCard.isPhasedOut())) {
return false; return false;
} }
if (this.mapParams.containsKey("FatefulHour") && controller.getLife() > 5) { if (this.mapParams.containsKey("FatefulHour") && controller.getLife() > 5) {
return false; return false;
} }

6
src/main/java/forge/card/trigger/Trigger.java
View File

@@ -343,13 +343,13 @@ public abstract class Trigger extends TriggerReplacementBase {
* @return a boolean. * @return a boolean.
*/ */
public final boolean requirementsCheck() { public final boolean requirementsCheck() {
if(this.getMapParams().containsKey("FatefulHour")) { if (this.getMapParams().containsKey("FatefulHour")) {
if(this.getMapParams().get("FatefulHour").equals("True") if (this.getMapParams().get("FatefulHour").equals("True")
&& !(this.getHostCard().getController().getLife() <= 5)) { && !(this.getHostCard().getController().getLife() <= 5)) {
return false; return false;
} }
} }
if (this.getMapParams().containsKey("Metalcraft")) { if (this.getMapParams().containsKey("Metalcraft")) {
if (this.getMapParams().get("Metalcraft").equals("True") if (this.getMapParams().get("Metalcraft").equals("True")
&& !this.getHostCard().getController().hasMetalcraft()) { && !this.getHostCard().getController().hasMetalcraft()) {