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

Add battle bar to Multiverse screen

Browse Source
This commit is contained in:
drdev
2016-02-06 21:16:16 +00:00
parent b25f8cb5f6
commit 1e21568aa9
6 changed files with 169 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forge-gui/src/main/java/forge/limited/BoosterDraftAI.java
View File

@@ -78,7 +78,7 @@ public class BoosterDraftAI {
final ColorSet currentChoice = deckCols.getChosenColors();
final boolean canAddMoreColors = deckCols.canChoseMoreColors();
final List<Pair<PaperCard, Double>> rankedCards = rankCards(chooseFrom, bd.CUSTOM_RANKINGS_FILE[0]);
final List<Pair<PaperCard, Double>> rankedCards = rankCards(chooseFrom, IBoosterDraft.CUSTOM_RANKINGS_FILE[0]);
for (final Pair<PaperCard, Double> p : rankedCards) {
double valueBoost = 0;

6
forge-gui/src/main/java/forge/planarconquest/ConquestBattle.java
View File

@@ -15,6 +15,7 @@ public abstract class ConquestBattle {
private final int tier;
private Deck opponentDeck;
private boolean conquered;
private boolean finished;
protected ConquestBattle(ConquestLocation location0, int tier0) {
location = location0;
@@ -59,6 +60,11 @@ public abstract class ConquestBattle {
}
public void onFinished(final ConquestData model, final IWinLoseView<? extends IButton> view) {
finished = true;
}
public boolean isFinished() {
return finished;
}
protected abstract Deck buildOpponentDeck();

7
forge-gui/src/main/java/forge/planarconquest/ConquestChaosBattle.java
View File

@@ -24,7 +24,6 @@ public class ConquestChaosBattle extends ConquestBattle {
private final QuestWorld world;
private final QuestEventDuel duel;
private ConquestAwardPool awardPool;
private boolean finished;
public ConquestChaosBattle() {
super(null, 0);
@@ -112,7 +111,7 @@ public class ConquestChaosBattle extends ConquestBattle {
model.getChaosBattleRecord().addLoss();
model.saveData();
}
finished = true;
super.onFinished(model, view);
}
public ConquestAwardPool getAwardPool() {
@@ -121,8 +120,4 @@ public class ConquestChaosBattle extends ConquestBattle {
}
return awardPool;
}
public boolean isFinished() {
return finished;
}
}