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

*Variants: Added error handling for managing not to select deck/avatar in vanguard mode.

Browse Source 
*Variants: Prevented user from selecting multiple avatars.
This commit is contained in:
Hellfish
2012-11-25 13:18:37 +00:00
parent 4645ab8571
commit f9efa46ca1
2 changed files with 34 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/main/java/forge/gui/home/variant/CSubmenuVanguard.java
View File

@@ -12,6 +12,7 @@ import javax.swing.SwingWorker;
import com.google.common.collect.Iterables; import com.google.common.collect.Iterables;
import forge.Command; import forge.Command;
import forge.GameActionUtil;
import forge.Singletons; import forge.Singletons;
import forge.control.Lobby; import forge.control.Lobby;
import forge.deck.Deck; import forge.deck.Deck;
@@ -117,27 +118,28 @@ public enum CSubmenuVanguard implements ICDoc {
final SwingWorker<Object, Void> worker = new SwingWorker<Object, Void>() { final SwingWorker<Object, Void> worker = new SwingWorker<Object, Void>() {
@Override @Override
public Object doInBackground() { public Object doInBackground() {
List<Deck> playerDecks = new ArrayList<Deck>();
for(FDeckChooser fdc : view.getDeckChoosers())
{
playerDecks.add(fdc.getDeck());
}
List<Object> playerAvatars = new ArrayList<Object>();
for(FList fl : view.getAvatarLists())
{
playerAvatars.add(fl.getSelectedValue());
}
Lobby lobby = Singletons.getControl().getLobby();
MatchStartHelper helper = new MatchStartHelper();
Random rnd = new Random(); Random rnd = new Random();
List<Deck> playerDecks = new ArrayList<Deck>();
for(int i=0;i<view.getNumPlayers();i++) for(int i=0;i<view.getNumPlayers();i++)
{ {
LobbyPlayer player = lobby.findLocalPlayer(i == 0 ? PlayerType.HUMAN : PlayerType.COMPUTER); Deck d = view.getDeckChoosers().get(i).getDeck();
if(d == null)
{
//ERROR!
GameActionUtil.showInfoDialg("No deck selected for player " + (i+1));
return null;
}
playerDecks.add(d);
}
List<CardPrinted> playerAvatars = new ArrayList<CardPrinted>();
for(int i=0;i<view.getNumPlayers();i++)
{
CardPrinted avatar = null; CardPrinted avatar = null;
if(playerAvatars.get(i) instanceof String) Object obj = view.getAvatarLists().get(i).getSelectedValue();
if(obj instanceof String)
{ {
//Random is the only string in the list so grab a random avatar. //Random is the only string in the list so grab a random avatar.
if(i == 0) if(i == 0)
@@ -155,8 +157,22 @@ public enum CSubmenuVanguard implements ICDoc {
{ {
avatar = (CardPrinted)playerAvatars.get(i); avatar = (CardPrinted)playerAvatars.get(i);
} }
if(avatar == null)
{
//ERROR!
GameActionUtil.showInfoDialg("No avatar selected for player " + (i+1));
return null;
}
playerAvatars.add(avatar);
}
helper.addVanguardPlayer(player, playerDecks.get(i), avatar); Lobby lobby = Singletons.getControl().getLobby();
MatchStartHelper helper = new MatchStartHelper();
for(int i=0;i<view.getNumPlayers();i++)
{
LobbyPlayer player = lobby.findLocalPlayer(i == 0 ? PlayerType.HUMAN : PlayerType.COMPUTER);
helper.addVanguardPlayer(player, playerDecks.get(i), playerAvatars.get(i));
} }
MatchController mc = Singletons.getModel().getMatch(); MatchController mc = Singletons.getModel().getMatch();
mc.initMatch(GameType.Vanguard, helper.getPlayerMap()); mc.initMatch(GameType.Vanguard, helper.getPlayerMap());

1
src/main/java/forge/gui/home/variant/VSubmenuVanguard.java
View File

@@ -161,6 +161,7 @@ public enum VSubmenuVanguard implements IVSubmenu<CSubmenuVanguard> {
tempList.setListData(i == 0 ? humanListData : aiListData); tempList.setListData(i == 0 ? humanListData : aiListData);
tempList.setSelectedIndex(0); tempList.setSelectedIndex(0);
tempList.setSelectionMode(javax.swing.ListSelectionModel.SINGLE_SELECTION);
deckChoosers.add(tempChooser); deckChoosers.add(tempChooser);
avatarLists.add(tempList); avatarLists.add(tempList);