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

force ante - three-state boolean behaviour restored

Browse Source
This commit is contained in:
Maxmtg
2013-05-22 15:01:25 +00:00
parent 3206d4b985
commit fb43bc503c
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/forge/game/MatchController.java
View File

@@ -68,9 +68,10 @@ public class MatchController {
gameType = type; gameType = type;
} }
public MatchController(GameType type, Map<LobbyPlayer, PlayerStartConditions> map, boolean forceAnte) { public MatchController(GameType type, Map<LobbyPlayer, PlayerStartConditions> map, Boolean forceAnte) {
this(type, map); this(type, map);
this.useAnte |= forceAnte; if( forceAnte != null )
this.useAnte |= forceAnte.booleanValue();
} }
/** /**

2
src/main/java/forge/gui/home/quest/SSubmenuQuestUtil.java
View File

@@ -403,7 +403,7 @@ public class SSubmenuQuestUtil {
int extraLifeHuman = 0; int extraLifeHuman = 0;
Integer lifeHuman = null; Integer lifeHuman = null;
boolean useBazaar = true; boolean useBazaar = true;
boolean forceAnte = false; Boolean forceAnte = null;
int lifeAI = 20; int lifeAI = 20;
if (event instanceof QuestEventChallenge) { if (event instanceof QuestEventChallenge) {
QuestEventChallenge qc = ((QuestEventChallenge) event); QuestEventChallenge qc = ((QuestEventChallenge) event);

6
src/main/java/forge/quest/QuestEventChallenge.java
View File

@@ -58,7 +58,7 @@ public class QuestEventChallenge extends QuestEvent {
private boolean repeatable = false; private boolean repeatable = false;
private boolean useBazaar = true; private boolean useBazaar = true;
private boolean forceAnte = false; private Boolean forceAnte = false;
/** The wins reqd. */ /** The wins reqd. */
private int winsReqd = 20; private int winsReqd = 20;
@@ -289,14 +289,14 @@ public class QuestEventChallenge extends QuestEvent {
/** /**
* @return the forceAnte * @return the forceAnte
*/ */
public boolean isForceAnte() { public Boolean isForceAnte() {
return forceAnte; return forceAnte;
} }
/** /**
* @param forceAnte the forceAnte to set * @param forceAnte the forceAnte to set
*/ */
public void setForceAnte(boolean forceAnte) { public void setForceAnte(Boolean forceAnte) {
this.forceAnte = forceAnte; this.forceAnte = forceAnte;
} }