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

Merge branch 'master' into 'fixes'

Browse Source
This commit is contained in:
Hans Mackowiak
2018-03-07 13:59:49 +00:00
parent d9df1243b6 090d4dc2c5
commit 83b1965733
16 changed files with 591 additions and 1213 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
forge-gui-desktop/src/main/java/forge/deckchooser/FDeckViewer.java
View File

@@ -184,23 +184,18 @@ public class FDeckViewer extends FDialog {
}
deckList.append(s.toString()).append(": ");
sectionCards = new TreeMap<>();
if (s.isSingleCard()) {
deckList.append(cp.get(0).getName()).append(nl);
deckList.append(nl);
for (final Entry<PaperCard, Integer> ev : cp) {
cardName = ev.getKey().toString();
if (sectionCards.containsKey(cardName)) {
sectionCards.put(cardName, (int)sectionCards.get(cardName) + ev.getValue());
}
else {
sectionCards.put(cardName, ev.getValue());
}
}
else {
deckList.append(nl);
for (final Entry<PaperCard, Integer> ev : cp) {
cardName = ev.getKey().toString();
if (sectionCards.containsKey(cardName)) {
sectionCards.put(cardName, (int)sectionCards.get(cardName) + ev.getValue());
}
else {
sectionCards.put(cardName, ev.getValue());
}
}
for (final Entry<String, Integer> ev: sectionCards.entrySet()) {
deckList.append(ev.getValue()).append(" ").append(ev.getKey()).append(nl);
}
for (final Entry<String, Integer> ev: sectionCards.entrySet()) {
deckList.append(ev.getValue()).append(" ").append(ev.getKey()).append(nl);
}
deckList.append(nl);
}

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

@@ -257,6 +257,7 @@ public class VLobby implements ILobbyView {
final LobbySlot slot = lobby.getSlot(i);
final FDeckChooser deckChooser = getDeckChooser(i);
final FDeckChooser commanderDeckChooser = getCommanderDeckChooser(i);
final FDeckChooser tinyLeaderDeckChooser = getTinyLeaderDeckChooser(i);
final PlayerPanel panel;
final boolean isNewPanel;
if (hasPanel) {
@@ -272,6 +273,7 @@ public class VLobby implements ILobbyView {
playersScroll.add(panel, constraints);
deckChooser.restoreSavedState();
commanderDeckChooser.restoreSavedState();
tinyLeaderDeckChooser.restoreSavedState();
if (i == 0) {
changePlayerFocus(0);
}
@@ -291,8 +293,12 @@ public class VLobby implements ILobbyView {
panel.setMayRemove(lobby.mayRemove(i));
panel.update();
deckChooser.setIsAi(slot.getType() == LobbySlotType.AI);
if (fullUpdate && (type == LobbySlotType.LOCAL || type == LobbySlotType.AI)) {
final boolean isSlotAI = slot.getType() == LobbySlotType.AI;
deckChooser.setIsAi(isSlotAI);
commanderDeckChooser.setIsAi(isSlotAI);
tinyLeaderDeckChooser.setIsAi(isSlotAI);
if (fullUpdate && (type == LobbySlotType.LOCAL || isSlotAI)) {
selectDeck(i);
}
if (isNewPanel) {
@@ -363,7 +369,7 @@ public class VLobby implements ILobbyView {
@SuppressWarnings("serial")
private void buildDeckPanels(final int playerIndex) {
// Main deck
final FDeckChooser mainChooser = new FDeckChooser(null, false, GameType.Constructed, false);
final FDeckChooser mainChooser = new FDeckChooser(null, isPlayerAI(playerIndex), GameType.Constructed, false);
mainChooser.getLstDecks().setSelectCommand(new UiCommand() {
@Override public final void run() {
selectMainDeck(playerIndex);
@@ -385,7 +391,7 @@ public class VLobby implements ILobbyView {
selectCommanderDeck(playerIndex);
}
});*/
final FDeckChooser commanderChooser = new FDeckChooser(null, false, GameType.Commander, true);
final FDeckChooser commanderChooser = new FDeckChooser(null, isPlayerAI(playerIndex), GameType.Commander, true);
commanderChooser.getLstDecks().setSelectCommand(new UiCommand() {
@Override public final void run() {
selectCommanderDeck(playerIndex);
@@ -394,7 +400,7 @@ public class VLobby implements ILobbyView {
commanderChooser.initialize();
commanderDeckChoosers.add(commanderChooser);
final FDeckChooser tinyLeaderChooser = new FDeckChooser(null, false, GameType.TinyLeaders, true);
final FDeckChooser tinyLeaderChooser = new FDeckChooser(null, isPlayerAI(playerIndex), GameType.TinyLeaders, true);
tinyLeaderChooser.getLstDecks().setSelectCommand(new UiCommand() {
@Override public final void run() {
selectTinyLeadersDeck(playerIndex);