Skip to content

Update web model to include multiple breakthroughs #4435

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Jazzxhands wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update web model to include multiple breakthroughs #4435

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 7 additions & 13 deletions src/main/java/ti4/website/model/WebPlayerArea.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,7 @@ public static class BreakthroughInfo {
private final String breakthroughId;
private final boolean unlocked;
private final boolean exhausted;
// TODO: MemePhilosopher uncomment this
// private final boolean active;
private final boolean active;
private final int tradeGoodsStored;
}

Expand Down Expand Up @@ -179,9 +178,8 @@ public static class PlotCardInfo {
// Debt tokens: debt that this player is OWED by other players (faction/color -> count)
private Map<String, Integer> debtTokens;

// Breakthrough (Thunder's Edge)
// TODO: MemePhilosopher make this a list
private BreakthroughInfo breakthrough;
// Breakthroughs (Thunder's Edge)
private List<BreakthroughInfo> breakthroughs;

// Plot cards (Firmament/Obsidian)
private List<PlotCardInfo> plotCards;
Expand Down Expand Up @@ -378,20 +376,16 @@ public static WebPlayerArea fromPlayer(Player player, Game game) {
boolean act = player.isBreakthroughActive(btID);
int tgs = player.getBreakthroughTGs(btID);

// TODO: MemePhilosopher replace this ...
breakthroughs.add(new BreakthroughInfo(btID, unl, exh, tgs));
// ... with this
// breakthroughs.add(new BreakthroughInfo(btID, unl, exh, act, tgs));
breakthroughs.add(new BreakthroughInfo(btID, unl, exh, act, tgs));
}

// TODO: MemePhilosopher make this a list
if (!breakthroughs.isEmpty()) {
webPlayerArea.setBreakthrough(breakthroughs.getFirst());
webPlayerArea.setBreakthroughs(breakthroughs);
} else {
webPlayerArea.setBreakthrough(null);
webPlayerArea.setBreakthroughs(null);
}
} else {
webPlayerArea.setBreakthrough(null);
webPlayerArea.setBreakthroughs(null);
}

// Plot cards (Firmament/Obsidian)
Expand Down