Add RagsToRiches achievement

This commit is contained in:
drdev
2014-09-27 20:16:21 +00:00
parent 35a31fc2d3
commit a5be45a160
9 changed files with 52 additions and 13 deletions

View File

@@ -5,4 +5,5 @@ import java.util.HashSet;
//class for storing information during a game that is used at the end of the game to determine achievements
public class AchievementTracker {
public final HashSet<String> activatedUltimates = new HashSet<String>();
public int mulliganTo = 7;
}

View File

@@ -88,7 +88,6 @@ public class Game implements IGameStateObject {
private final ReplacementHandler replacementHandler = new ReplacementHandler(this);
private final EventBus events = new EventBus("game events");
private final GameLog gameLog = new GameLog();
private final AchievementTracker achievementTracker = new AchievementTracker();
private final Zone stackZone = new Zone(ZoneType.Stack, this);
@@ -333,15 +332,6 @@ public class Game implements IGameStateObject {
return gameLog;
}
/**
* Gets the achievement tracker
*
* @return the achievement tracker
*/
public final AchievementTracker getAchievementTracker() {
return achievementTracker;
}
/**
* Gets the stack zone.
*

View File

@@ -1641,8 +1641,9 @@ public class GameAction {
Player p = whoCanMulligan.get(i);
List<Card> toMulligan = p.canMulligan() ? p.getController().getCardsToMulligan(isCommander, firstPlayer) : null;
if (game.isGameOver()) // conceded on mulligan prompt
if (game.isGameOver()) { // conceded on mulligan prompt
return;
}
if (toMulligan != null && !toMulligan.isEmpty()) {
if (!isCommander) {

View File

@@ -190,6 +190,12 @@ public class Player extends GameEntity implements Comparable<Player>, IIdentifia
private int numManaConversion = 0;
private final AchievementTracker achievementTracker = new AchievementTracker();
public final AchievementTracker getAchievementTracker() {
return achievementTracker;
}
public final PlayerOutcome getOutcome() {
return stats.getOutcome();
}
@@ -3351,6 +3357,7 @@ public class Player extends GameEntity implements Comparable<Player>, IIdentifia
final int newHand = getCardsIn(ZoneType.Hand).size();
stats.notifyHasMulliganed();
stats.notifyOpeningHandSize(newHand);
achievementTracker.mulliganTo = newHand;
}
/**