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

- Changed isFirstTurn to count turns taken.

Browse Source 
- Fixed Serra Avenger's interaction with Time Walk and Flash.
This commit is contained in:
jendave
2011-08-06 12:34:51 +00:00
parent e197a97402
commit b260ce4f79
3 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/forge/CardFactory_Creatures.java
View File

@@ -406,7 +406,11 @@ public class CardFactory_Creatures {
@Override @Override
public boolean canPlay() { public boolean canPlay() {
return super.canPlay() && 6 < AllZone.Phase.getTurn(); Player turn = AllZone.Phase.getPlayerTurn();
if (turn.equals(card.getController()) && turn.getTurn() <= 3)
return false;
return super.canPlay();
} }
}; };
card.clearSpellAbility(); card.clearSpellAbility();

4
src/forge/PhaseUtil.java
View File

@@ -21,11 +21,11 @@ public class PhaseUtil {
AllZone.pwCombat.setDefendingPlayer(turn.getOpponent()); AllZone.pwCombat.setDefendingPlayer(turn.getOpponent());
// For tokens a player starts the game with they don't recover from Sum. Sickness on first turn // For tokens a player starts the game with they don't recover from Sum. Sickness on first turn
if (!turn.isFirstTurn()){ if (turn.getTurn() > 0){
for(int i = 0; i < c.length; i++) for(int i = 0; i < c.length; i++)
c[i].setSickness(false); c[i].setSickness(false);
} }
turn.setFirstTurn(false); turn.incrementTurn();
// Phasing would happen around here // Phasing would happen around here

10
src/forge/Player.java
View File

@@ -20,7 +20,7 @@ public abstract class Player extends MyObservable{
protected boolean altLose = false; protected boolean altLose = false;
protected String loseCondition = ""; protected String loseCondition = "";
protected boolean bFirstTurn; protected int nTurns = 0;
protected Card lastDrawnCard; protected Card lastDrawnCard;
protected int numDrawnThisTurn = 0; protected int numDrawnThisTurn = 0;
@@ -40,7 +40,7 @@ public abstract class Player extends MyObservable{
preventNextDamage = 0; preventNextDamage = 0;
lastDrawnCard = null; lastDrawnCard = null;
numDrawnThisTurn = 0; numDrawnThisTurn = 0;
bFirstTurn = true; nTurns = 0;
altWin = false; altWin = false;
altLose = false; altLose = false;
winCondition = ""; winCondition = "";
@@ -57,7 +57,7 @@ public abstract class Player extends MyObservable{
lastDrawnCard = null; lastDrawnCard = null;
numDrawnThisTurn = 0; numDrawnThisTurn = 0;
slowtripList = new CardList(); slowtripList = new CardList();
bFirstTurn = true; nTurns = 0;
altWin = false; altWin = false;
altLose = false; altLose = false;
winCondition = ""; winCondition = "";
@@ -653,8 +653,8 @@ public abstract class Player extends MyObservable{
slowtripList.add(card); slowtripList.add(card);
} }
public boolean isFirstTurn() { return bFirstTurn; } public int getTurn() { return nTurns; }
public void setFirstTurn(boolean b) { bFirstTurn = b; } public void incrementTurn() { nTurns++; }
//////////////////////////////// ////////////////////////////////
public abstract void sacrificePermanent(String prompt, CardList choices); public abstract void sacrificePermanent(String prompt, CardList choices);