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

Small clean ups.

Browse Source
This commit is contained in:
asvitkine
2022-12-18 23:26:01 -07:00
parent 2abafbc2ee
commit 53e3899932
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
forge-gui-desktop/src/main/java/forge/screens/home/VLobby.java
View File

@@ -216,9 +216,8 @@ public class VLobby implements ILobbyView {
@Override @Override
public void update(final int slot, final LobbySlotType type) { public void update(final int slot, final LobbySlotType type) {
final FDeckChooser deckChooser = getPlayerPanel(slot).getDeckChooser(); final FDeckChooser deckChooser = getDeckChooser(slot);
deckChooser.setIsAi(type==LobbySlotType.AI); deckChooser.setIsAi(type==LobbySlotType.AI);
DeckType selectedDeckType = deckChooser.getSelectedDeckType(); DeckType selectedDeckType = deckChooser.getSelectedDeckType();
switch (selectedDeckType){ switch (selectedDeckType){
case STANDARD_CARDGEN_DECK: case STANDARD_CARDGEN_DECK:
@@ -573,7 +572,7 @@ public class VLobby implements ILobbyView {
} }
} }
if (sel.equals("Random")) { if (sel.equals("Random")) {
final Deck randomDeck = RandomDeckGenerator.getRandomUserDeck(lobby, getPlayerPanel(playerIndex).isAi()); final Deck randomDeck = RandomDeckGenerator.getRandomUserDeck(lobby, isPlayerAI(playerIndex));
planePool = randomDeck.get(DeckSection.Planes); planePool = randomDeck.get(DeckSection.Planes);
} }
} else if (selected instanceof Deck) { } else if (selected instanceof Deck) {
@@ -615,7 +614,7 @@ public class VLobby implements ILobbyView {
if (sel.contains("Use deck's default avatar") && deck != null && deck.has(DeckSection.Avatar)) { if (sel.contains("Use deck's default avatar") && deck != null && deck.has(DeckSection.Avatar)) {
vanguardAvatar = deck.get(DeckSection.Avatar).get(0); vanguardAvatar = deck.get(DeckSection.Avatar).get(0);
} else { //Only other string is "Random" } else { //Only other string is "Random"
if (getPlayerPanel(playerIndex).isAi()) { //AI if (isPlayerAI(playerIndex)) { //AI
vanguardAvatar = Aggregates.random(getNonRandomAiAvatars()); vanguardAvatar = Aggregates.random(getNonRandomAiAvatars());
} else { //Human } else { //Human
vanguardAvatar = Aggregates.random(getNonRandomHumanAvatars()); vanguardAvatar = Aggregates.random(getNonRandomHumanAvatars());
@@ -683,7 +682,7 @@ public class VLobby implements ILobbyView {
public JPanel getPanelStart() { return pnlStart; } public JPanel getPanelStart() { return pnlStart; }
public List<FDeckChooser> getDeckChoosers() { public List<FDeckChooser> getDeckChoosers() {
List<FDeckChooser> choosers = new ArrayList<>(playerPanels.size()); List<FDeckChooser> choosers = new ArrayList<>(playerPanels.size());
for (PlayerPanel playerPanel : playerPanels) { for (final PlayerPanel playerPanel : playerPanels) {
choosers.add(playerPanel.getDeckChooser()); choosers.add(playerPanel.getDeckChooser());
} }
return choosers; return choosers;