mirror of
https://github.com/Card-Forge/forge.git
synced 2025-11-16 10:48:00 +00:00
- CheckStyle.
This commit is contained in:
@@ -321,8 +321,8 @@ public class Deck extends DeckBase {
|
|||||||
int deckDistinct = main.countDistinct();
|
int deckDistinct = main.countDistinct();
|
||||||
Integer max = type.getDeckMaximum();
|
Integer max = type.getDeckMaximum();
|
||||||
|
|
||||||
if (deckSize < type.getDeckMinimum() || (max != null && deckSize > max) ||
|
if (deckSize < type.getDeckMinimum() || (max != null && deckSize > max)
|
||||||
(type.isSingleton() && deckDistinct != deckSize)) {
|
|| (type.isSingleton() && deckDistinct != deckSize)) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -106,7 +106,7 @@ public class DeckSection extends ItemPool<CardPrinted> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Add all from a List of CardPrinted
|
* Add all from a List of CardPrinted.
|
||||||
*
|
*
|
||||||
* @param list
|
* @param list
|
||||||
* CardPrinteds to add
|
* CardPrinteds to add
|
||||||
|
|||||||
@@ -33,6 +33,6 @@ public enum GameEndReason {
|
|||||||
WinsGameSpellEffect, // ones that could be both hardcoded (felidar) and
|
WinsGameSpellEffect, // ones that could be both hardcoded (felidar) and
|
||||||
// scripted ( such as Mayael's Aria )
|
// scripted ( such as Mayael's Aria )
|
||||||
|
|
||||||
/** Used to end multiplayer games where the all humans have lost or conceded while AIs cannot end match by themselves*/
|
/** Used to end multiplayer games where the all humans have lost or conceded while AIs cannot end match by themselves.*/
|
||||||
AllHumansLost,
|
AllHumansLost,
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -71,15 +71,17 @@ public class GameFormat {
|
|||||||
|
|
||||||
private Predicate<CardPrinted> buildFilterPritned() {
|
private Predicate<CardPrinted> buildFilterPritned() {
|
||||||
final Predicate<CardPrinted> banNames = CardPrinted.Predicates.namesExcept(this.bannedCardNames);
|
final Predicate<CardPrinted> banNames = CardPrinted.Predicates.namesExcept(this.bannedCardNames);
|
||||||
if (this.allowedSetCodes == null || this.allowedSetCodes.isEmpty() )
|
if (this.allowedSetCodes == null || this.allowedSetCodes.isEmpty()) {
|
||||||
return banNames;
|
return banNames;
|
||||||
|
}
|
||||||
return Predicates.and(banNames, CardPrinted.Predicates.printedInSets(this.allowedSetCodes, true));
|
return Predicates.and(banNames, CardPrinted.Predicates.printedInSets(this.allowedSetCodes, true));
|
||||||
}
|
}
|
||||||
|
|
||||||
private Predicate<CardPrinted> buildFilterRules() {
|
private Predicate<CardPrinted> buildFilterRules() {
|
||||||
final Predicate<CardPrinted> banNames = CardPrinted.Predicates.namesExcept(this.bannedCardNames);
|
final Predicate<CardPrinted> banNames = CardPrinted.Predicates.namesExcept(this.bannedCardNames);
|
||||||
if ( this.allowedSetCodes == null || this.allowedSetCodes.isEmpty() )
|
if (this.allowedSetCodes == null || this.allowedSetCodes.isEmpty()) {
|
||||||
return banNames;
|
return banNames;
|
||||||
|
}
|
||||||
return Predicates.and(banNames, Predicates.compose(CardRulesPredicates.wasPrintedInSets(this.allowedSetCodes), CardPrinted.FN_GET_RULES));
|
return Predicates.and(banNames, Predicates.compose(CardRulesPredicates.wasPrintedInSets(this.allowedSetCodes), CardPrinted.FN_GET_RULES));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -70,8 +70,9 @@ public class GameNew {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (!useAnte && card.hasKeyword("Remove CARDNAME from your deck before playing if you're not playing for ante.")) {
|
if (!useAnte && card.hasKeyword("Remove CARDNAME from your deck before playing if you're not playing for ante.")) {
|
||||||
if(!removedAnteCards.containsKey(player))
|
if (!removedAnteCards.containsKey(player)) {
|
||||||
removedAnteCards.put(player, new ArrayList<String>());
|
removedAnteCards.put(player, new ArrayList<String>());
|
||||||
|
}
|
||||||
removedAnteCards.get(player).add(card.getName());
|
removedAnteCards.get(player).add(card.getName());
|
||||||
} else {
|
} else {
|
||||||
library.add(card);
|
library.add(card);
|
||||||
@@ -92,9 +93,10 @@ public class GameNew {
|
|||||||
// do this instead of shuffling Computer's deck
|
// do this instead of shuffling Computer's deck
|
||||||
final Iterable<Card> c1 = GameNew.smoothComputerManaCurve(player.getCardsIn(ZoneType.Library));
|
final Iterable<Card> c1 = GameNew.smoothComputerManaCurve(player.getCardsIn(ZoneType.Library));
|
||||||
player.getZone(ZoneType.Library).setCards(c1);
|
player.getZone(ZoneType.Library).setCards(c1);
|
||||||
} else
|
} else {
|
||||||
player.shuffle();
|
player.shuffle();
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -142,7 +144,6 @@ public class GameNew {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
if (rAICards.size() > 0) {
|
if (rAICards.size() > 0) {
|
||||||
String message = buildFourColumnList("AI deck contains the following cards that it can't play or may be buggy:", rAICards);
|
String message = buildFourColumnList("AI deck contains the following cards that it can't play or may be buggy:", rAICards);
|
||||||
JOptionPane.showMessageDialog(null, message, "", JOptionPane.INFORMATION_MESSAGE);
|
JOptionPane.showMessageDialog(null, message, "", JOptionPane.INFORMATION_MESSAGE);
|
||||||
@@ -374,8 +375,9 @@ public class GameNew {
|
|||||||
sb.append(" lost the last game.");
|
sb.append(" lost the last game.");
|
||||||
}
|
}
|
||||||
if (goesFirst.isHuman()) {
|
if (goesFirst.isHuman()) {
|
||||||
if( !humanPlayOrDraw(sb.toString()) )
|
if (!humanPlayOrDraw(sb.toString())) {
|
||||||
goesFirst = goesFirst.getOpponent();
|
goesFirst = goesFirst.getOpponent();
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
sb.append("\nComputer Going First");
|
sb.append("\nComputer Going First");
|
||||||
JOptionPane.showMessageDialog(null, sb.toString(),
|
JOptionPane.showMessageDialog(null, sb.toString(),
|
||||||
|
|||||||
@@ -77,11 +77,12 @@ public final class GameOutcome implements Iterable<Entry<LobbyPlayer, PlayerStat
|
|||||||
* @return true, if is draw
|
* @return true, if is draw
|
||||||
*/
|
*/
|
||||||
public boolean isDraw() {
|
public boolean isDraw() {
|
||||||
for( PlayerStatistics pv : playerRating.values())
|
for (PlayerStatistics pv : playerRating.values()) {
|
||||||
{
|
|
||||||
if ( pv.getOutcome().hasWon() )
|
if (pv.getOutcome().hasWon()) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -103,11 +104,12 @@ public final class GameOutcome implements Iterable<Entry<LobbyPlayer, PlayerStat
|
|||||||
* @return the winner
|
* @return the winner
|
||||||
*/
|
*/
|
||||||
public LobbyPlayer getWinner() {
|
public LobbyPlayer getWinner() {
|
||||||
for( Entry<LobbyPlayer, PlayerStatistics> ps : playerRating.entrySet())
|
for (Entry<LobbyPlayer, PlayerStatistics> ps : playerRating.entrySet()) {
|
||||||
{
|
|
||||||
if ( ps.getValue().getOutcome().hasWon() )
|
if (ps.getValue().getOutcome().hasWon()) {
|
||||||
return ps.getKey();
|
return ps.getKey();
|
||||||
}
|
}
|
||||||
|
}
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -155,11 +157,12 @@ public final class GameOutcome implements Iterable<Entry<LobbyPlayer, PlayerStat
|
|||||||
* @return the win spell effect
|
* @return the win spell effect
|
||||||
*/
|
*/
|
||||||
public String getWinSpellEffect() {
|
public String getWinSpellEffect() {
|
||||||
for( PlayerStatistics pv : playerRating.values())
|
for (PlayerStatistics pv : playerRating.values()) {
|
||||||
{
|
|
||||||
if ( pv.getOutcome().hasWon() )
|
if (pv.getOutcome().hasWon()) {
|
||||||
return pv.getOutcome().altWinSourceName;
|
return pv.getOutcome().altWinSourceName;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user