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

- Fixed Add Random Duel crashing if a difficulty tier is not available in the quest world.

Browse Source
This commit is contained in:
Agetian
2017-06-29 07:51:45 +00:00
parent ba71e6a7e3
commit d3089c2955
1 changed files with 26 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
forge-gui/src/main/java/forge/quest/QuestEventDuelManager.java
View File

@@ -65,16 +65,10 @@ public class QuestEventDuelManager {
private static List<QuestEventDifficulty> hardOrder = Arrays.asList(QuestEventDifficulty.HARD, QuestEventDifficulty.MEDIUM, QuestEventDifficulty.EASY, QuestEventDifficulty.EXPERT); private static List<QuestEventDifficulty> hardOrder = Arrays.asList(QuestEventDifficulty.HARD, QuestEventDifficulty.MEDIUM, QuestEventDifficulty.EASY, QuestEventDifficulty.EXPERT);
private static List<QuestEventDifficulty> expertOrder = Arrays.asList(QuestEventDifficulty.EXPERT, QuestEventDifficulty.HARD, QuestEventDifficulty.MEDIUM, QuestEventDifficulty.EASY); private static List<QuestEventDifficulty> expertOrder = Arrays.asList(QuestEventDifficulty.EXPERT, QuestEventDifficulty.HARD, QuestEventDifficulty.MEDIUM, QuestEventDifficulty.EASY);
private void addDuel(List<QuestEventDuel> outList, QuestEventDifficulty targetDifficulty, int toAdd) { private List<QuestEventDifficulty> getOrderForDifficulty(QuestEventDifficulty d) {
// if there's no way we can satisfy the request, return now
if (allDuels.size() <= toAdd) {
return;
}
final List<QuestEventDifficulty> difficultyOrder; final List<QuestEventDifficulty> difficultyOrder;
switch (targetDifficulty) { switch (d) {
case EASY: case EASY:
difficultyOrder = easyOrder; difficultyOrder = easyOrder;
break; break;
@@ -88,9 +82,21 @@ public class QuestEventDuelManager {
difficultyOrder = expertOrder; difficultyOrder = expertOrder;
break; break;
default: default:
throw new RuntimeException("unhandled difficulty: " + targetDifficulty); throw new RuntimeException("unhandled difficulty: " + d);
} }
return difficultyOrder;
}
private void addDuel(List<QuestEventDuel> outList, QuestEventDifficulty targetDifficulty, int toAdd) {
// if there's no way we can satisfy the request, return now
if (allDuels.size() <= toAdd) {
return;
}
final List<QuestEventDifficulty> difficultyOrder = getOrderForDifficulty(targetDifficulty);
for (QuestEventDifficulty d : difficultyOrder) { // will add duels from preferred difficulty, will use others if the former has too few options. for (QuestEventDifficulty d : difficultyOrder) { // will add duels from preferred difficulty, will use others if the former has too few options.
for (QuestEventDuel duel : sortedDuels.get(d)) { for (QuestEventDuel duel : sortedDuels.get(d)) {
if (toAdd <= 0) { if (toAdd <= 0) {
@@ -109,7 +115,16 @@ public class QuestEventDuelManager {
QuestEventDuel duel = new QuestEventDuel(); QuestEventDuel duel = new QuestEventDuel();
List<QuestEventDuel> possibleDuels = new ArrayList<>(sortedDuels.get(difficulty)); List<QuestEventDifficulty> difficultyOrder = getOrderForDifficulty(difficulty);
List<QuestEventDuel> possibleDuels = new ArrayList<>();
for (QuestEventDifficulty diff : difficultyOrder) {
possibleDuels = new ArrayList<>(sortedDuels.get(diff));
if (!possibleDuels.isEmpty()) {
break;
}
}
QuestEventDuel randomOpponent = possibleDuels.get(((int) (possibleDuels.size() * Math.random()))); QuestEventDuel randomOpponent = possibleDuels.get(((int) (possibleDuels.size() * Math.random())));
duel.setTitle("Random Opponent"); duel.setTitle("Random Opponent");