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

Merge branch 'master' into 'master'

Browse Source 
Support playing against Net Decks through the Test Deck function on mobile Forge.

See merge request core-developers/forge!307
This commit is contained in:
swordshine
2018-03-23 04:12:02 +00:00
parent 7d39889cef f436fa895b
commit 1bd18eece0
4 changed files with 54 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
forge-gui/src/main/java/forge/gauntlet/GauntletUtil.java
View File

@@ -1,18 +1,16 @@
package forge.gauntlet;
import java.io.File;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.*;
import forge.deck.Deck;
import forge.deck.DeckType;
import forge.deck.DeckgenUtil;
import forge.deck.NetDeckCategory;
import forge.model.FModel;
public class GauntletUtil {
public static GauntletData createQuickGauntlet(final Deck userDeck, final int numOpponents, final List<DeckType> allowedDeckTypes) {
public static GauntletData createQuickGauntlet(final Deck userDeck, final int numOpponents, final List<DeckType> allowedDeckTypes, NetDeckCategory netDecks) {
GauntletData gauntlet = new GauntletData();
setDefaultGauntletName(gauntlet, GauntletIO.PREFIX_QUICK);
FModel.setGauntletData(gauntlet);
@@ -22,6 +20,8 @@ public class GauntletUtil {
final List<String> eventNames = new ArrayList<String>();
final List<Deck> decks = new ArrayList<Deck>();
final Object[] netDeckNames = netDecks != null ? netDecks.getItemNames().toArray() : null;
for (int i = 0; i < numOpponents; i++) {
int randType = (int)Math.floor(Math.random() * allowedDeckTypes.size());
switch (allowedDeckTypes.get(randType)) {
@@ -57,6 +57,11 @@ public class GauntletUtil {
deck = DeckgenUtil.getRandomThemeDeck();
eventNames.add(deck.getName());
break;
case NET_DECK:
int deckIndex = (int)Math.floor(Math.random() * netDeckNames.length);
deck = netDecks.get((String) netDeckNames[deckIndex]);
eventNames.add(deck.getName());
break;
default:
continue;
}