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

Fixed bug with not counting keycards as lands in the land count causing various issues. Fixed final keyword issue causing build warnings.

Browse Source
This commit is contained in:
austinio7116
2018-03-02 19:49:42 +00:00
committed by maustin
parent cb5791276a
commit b67c060211
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
forge-gui-desktop/src/main/java/forge/view/SimulateMatch.java
View File

@@ -161,10 +161,10 @@ public class SimulateMatch {
private static void simulateSingleMatch(Match mc, int iGame, boolean outputGamelog) { private static void simulateSingleMatch(Match mc, int iGame, boolean outputGamelog) {
StopWatch sw = new StopWatch(); final StopWatch sw = new StopWatch();
sw.start(); sw.start();
Game g1 = mc.createGame(); final Game g1 = mc.createGame();
// will run match in the same thread // will run match in the same thread
long startTime = System.currentTimeMillis(); long startTime = System.currentTimeMillis();

2
forge-gui/src/main/java/forge/deck/DeckgenUtil.java
View File

@@ -217,7 +217,7 @@ public class DeckgenUtil {
System.out.println("Wrong card count "+deck.getMain().countAll()); System.out.println("Wrong card count "+deck.getMain().countAll());
deck=buildCardGenDeck(format,isForAI); deck=buildCardGenDeck(format,isForAI);
} }
if(deck.getMain().countAll(Predicates.compose(CardRulesPredicates.Presets.IS_LAND, PaperCard.FN_GET_RULES))>30){ if(deck.getMain().countAll(Predicates.compose(CardRulesPredicates.Presets.IS_LAND, PaperCard.FN_GET_RULES))>27){
System.out.println("Too many lands "+deck.getMain().countAll(Predicates.compose(CardRulesPredicates.Presets.IS_LAND, PaperCard.FN_GET_RULES))); System.out.println("Too many lands "+deck.getMain().countAll(Predicates.compose(CardRulesPredicates.Presets.IS_LAND, PaperCard.FN_GET_RULES)));
deck=buildCardGenDeck(format,isForAI); deck=buildCardGenDeck(format,isForAI);
} }

6
forge-gui/src/main/java/forge/limited/CardThemedDeckBuilder.java
View File

@@ -59,8 +59,8 @@ public class CardThemedDeckBuilder extends DeckGeneratorBase {
protected Iterable<PaperCard> onColorNonCreatures; protected Iterable<PaperCard> onColorNonCreatures;
protected Iterable<PaperCard> keyCards; protected Iterable<PaperCard> keyCards;
protected static final boolean logToConsole = false; protected static final boolean logToConsole = true;
protected static final boolean logColorsToConsole = false; protected static final boolean logColorsToConsole = true;
public CardThemedDeckBuilder(IDeckGenPool pool, DeckFormat format){ public CardThemedDeckBuilder(IDeckGenPool pool, DeckFormat format){
@@ -313,6 +313,7 @@ public class CardThemedDeckBuilder extends DeckGeneratorBase {
deckList.addAll(keyCardList); deckList.addAll(keyCardList);
aiPlayables.removeAll(keyCardList); aiPlayables.removeAll(keyCardList);
rankedColorList.removeAll(keyCardList); rankedColorList.removeAll(keyCardList);
landsNeeded--;
} }
// Add the deck card // Add the deck card
if(secondKeyCard.getRules().getMainPart().getType().isLand()) { if(secondKeyCard.getRules().getMainPart().getType().isLand()) {
@@ -321,6 +322,7 @@ public class CardThemedDeckBuilder extends DeckGeneratorBase {
deckList.addAll(keyCardList); deckList.addAll(keyCardList);
aiPlayables.removeAll(keyCardList); aiPlayables.removeAll(keyCardList);
rankedColorList.removeAll(keyCardList); rankedColorList.removeAll(keyCardList);
landsNeeded--;
} }
} }