mirror of
https://github.com/Card-Forge/forge.git
synced 2025-11-20 12:48:00 +00:00
- Made player tabs in Vanguard setup more descriptive
This commit is contained in:
@@ -99,11 +99,9 @@ public enum VSubmenuVanguard implements IVSubmenu<CSubmenuVanguard> {
|
|||||||
Vector<Object> aiListData = new Vector<Object>();
|
Vector<Object> aiListData = new Vector<Object>();
|
||||||
humanListData.add("Random");
|
humanListData.add("Random");
|
||||||
aiListData.add("Random");
|
aiListData.add("Random");
|
||||||
for(CardPrinted cp : allAvatars)
|
for (CardPrinted cp : allAvatars) {
|
||||||
{
|
|
||||||
humanListData.add(cp);
|
humanListData.add(cp);
|
||||||
if(!cp.getCard().getRemAIDecks())
|
if (!cp.getCard().getRemAIDecks()) {
|
||||||
{
|
|
||||||
aiListData.add(cp);
|
aiListData.add(cp);
|
||||||
allAiAvatars.add(cp);
|
allAiAvatars.add(cp);
|
||||||
}
|
}
|
||||||
@@ -115,10 +113,9 @@ public enum VSubmenuVanguard implements IVSubmenu<CSubmenuVanguard> {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void itemStateChanged(ItemEvent arg0) {
|
public void itemStateChanged(ItemEvent arg0) {
|
||||||
FRadioButton aButton = (FRadioButton)arg0.getSource();
|
FRadioButton aButton = (FRadioButton) arg0.getSource();
|
||||||
|
|
||||||
if(arg0.getStateChange() == ItemEvent.SELECTED)
|
if (arg0.getStateChange() == ItemEvent.SELECTED) {
|
||||||
{
|
|
||||||
changeTabs(Integer.parseInt(aButton.getText()));
|
changeTabs(Integer.parseInt(aButton.getText()));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -143,14 +140,14 @@ public enum VSubmenuVanguard implements IVSubmenu<CSubmenuVanguard> {
|
|||||||
grpFields.add(tempRadio);
|
grpFields.add(tempRadio);
|
||||||
tempRadio.setSelected(true);
|
tempRadio.setSelected(true);
|
||||||
tempRadio.addItemListener(iListener);
|
tempRadio.addItemListener(iListener);
|
||||||
radioPane.add(tempRadio,"wrap");
|
radioPane.add(tempRadio, "wrap");
|
||||||
}
|
}
|
||||||
settingsPanel.add(radioPane);
|
settingsPanel.add(radioPane);
|
||||||
settingsPanel.add(new FLabel.Builder().text("Set number of opponents").build());
|
settingsPanel.add(new FLabel.Builder().text("Set number of opponents").build());
|
||||||
tabPane.add("Settings",settingsPanel);
|
tabPane.add("Settings", settingsPanel);
|
||||||
|
|
||||||
//Player panels (Human + 7 AIs)
|
//Player panels (Human + 7 AIs)
|
||||||
for (int i = 0; i < 8;i++) {
|
for (int i = 0; i < 8; i++) {
|
||||||
tempPanel = new FPanel();
|
tempPanel = new FPanel();
|
||||||
tempPanel.setLayout(new MigLayout("insets 0, gap 0 , wrap 2"));
|
tempPanel.setLayout(new MigLayout("insets 0, gap 0 , wrap 2"));
|
||||||
|
|
||||||
@@ -166,15 +163,19 @@ public enum VSubmenuVanguard implements IVSubmenu<CSubmenuVanguard> {
|
|||||||
deckChoosers.add(tempChooser);
|
deckChoosers.add(tempChooser);
|
||||||
avatarLists.add(tempList);
|
avatarLists.add(tempList);
|
||||||
|
|
||||||
tempPanel.add(tempChooser,"span 1 2, w 44%!, gap 0 0 20px 20px, growy, pushy");
|
tempPanel.add(tempChooser, "span 1 2, w 44%!, gap 0 0 20px 20px, growy, pushy");
|
||||||
|
|
||||||
tempPanel.add(new FLabel.Builder().text("Select Avatar:").build());
|
tempPanel.add(new FLabel.Builder().text("Select Avatar:").build());
|
||||||
|
|
||||||
JScrollPane scrAvatar = new FScrollPane(tempList, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
|
JScrollPane scrAvatar = new FScrollPane(tempList, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
|
||||||
tempPanel.add(scrAvatar,"h 90%!");
|
tempPanel.add(scrAvatar, "h 90%!");
|
||||||
|
|
||||||
playerPanels.add(tempPanel);
|
playerPanels.add(tempPanel);
|
||||||
tabPane.add("Player " + (i+1), tempPanel);
|
if (i == 0) {
|
||||||
|
tabPane.add("Human", tempPanel);
|
||||||
|
} else {
|
||||||
|
tabPane.add("Opponent " + i, tempPanel);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
final String strCheckboxConstraints = "w 200px!, h 30px!, gap 0 20px 0 0";
|
final String strCheckboxConstraints = "w 200px!, h 30px!, gap 0 20px 0 0";
|
||||||
@@ -185,23 +186,18 @@ public enum VSubmenuVanguard implements IVSubmenu<CSubmenuVanguard> {
|
|||||||
pnlStart.add(cbRemoveSmall, strCheckboxConstraints);
|
pnlStart.add(cbRemoveSmall, strCheckboxConstraints);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void changeTabs(int toShow)
|
private void changeTabs(int toShow) {
|
||||||
{
|
if (toShow < currentNumTabsShown) {
|
||||||
if(toShow < currentNumTabsShown)
|
for (int i = currentNumTabsShown; i > toShow + 1; i--) {
|
||||||
{
|
|
||||||
for(int i=currentNumTabsShown;i>toShow+1;i--)
|
|
||||||
{
|
|
||||||
tabPane.remove(i);
|
tabPane.remove(i);
|
||||||
}
|
}
|
||||||
currentNumTabsShown = tabPane.getComponentCount()-1;
|
currentNumTabsShown = tabPane.getComponentCount() - 1;
|
||||||
}
|
}
|
||||||
else
|
else {
|
||||||
{
|
for (int i = currentNumTabsShown; i <= toShow; i++) {
|
||||||
for(int i=currentNumTabsShown;i<=toShow;i++)
|
tabPane.add("Player " + (i + 1), playerPanels.get(i));
|
||||||
{
|
|
||||||
tabPane.add("Player " + (i+1),playerPanels.get(i));
|
|
||||||
}
|
}
|
||||||
currentNumTabsShown = tabPane.getComponentCount()-1;
|
currentNumTabsShown = tabPane.getComponentCount() - 1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -239,8 +235,7 @@ public enum VSubmenuVanguard implements IVSubmenu<CSubmenuVanguard> {
|
|||||||
|
|
||||||
VHomeUI.SINGLETON_INSTANCE.getPnlDisplay().add(lblTitle, "w 80%!, h 40px!, gap 0 0 15px 15px, span 2, ax right");
|
VHomeUI.SINGLETON_INSTANCE.getPnlDisplay().add(lblTitle, "w 80%!, h 40px!, gap 0 0 15px 15px, span 2, ax right");
|
||||||
|
|
||||||
for(FDeckChooser fdc : deckChoosers)
|
for (FDeckChooser fdc : deckChoosers) {
|
||||||
{
|
|
||||||
fdc.populate();
|
fdc.populate();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -321,18 +316,15 @@ public enum VSubmenuVanguard implements IVSubmenu<CSubmenuVanguard> {
|
|||||||
*
|
*
|
||||||
* @return a deckchooser for every player
|
* @return a deckchooser for every player
|
||||||
*/
|
*/
|
||||||
public List<FDeckChooser> getDeckChoosers()
|
public List<FDeckChooser> getDeckChoosers() {
|
||||||
{
|
|
||||||
return deckChoosers;
|
return deckChoosers;
|
||||||
}
|
}
|
||||||
|
|
||||||
public List<FList> getAvatarLists()
|
public List<FList> getAvatarLists() {
|
||||||
{
|
|
||||||
return avatarLists;
|
return avatarLists;
|
||||||
}
|
}
|
||||||
|
|
||||||
public int getNumPlayers()
|
public int getNumPlayers() {
|
||||||
{
|
|
||||||
return currentNumTabsShown;
|
return currentNumTabsShown;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user