From 8783118c04be99f01d683feeae6f93516747eadb Mon Sep 17 00:00:00 2001 From: "marcins78@gmail.com" Date: Wed, 21 Dec 2011 17:10:23 +0000 Subject: [PATCH] Fixing Open and Expanded formats. --- .../game/formats/DefaultLotroFormat.java | 5 ++ .../lotro/game/formats/ExpandedFormat.java | 5 -- .../lotro/game/formats/FotRBlockFormat.java | 5 -- .../lotro/game/formats/KingBlockFormat.java | 5 -- .../lotro/game/formats/MovieFormat.java | 5 -- .../lotro/game/formats/OpenFormat.java | 5 -- .../lotro/game/formats/TTTBlockFormat.java | 5 -- .../game/formats/TowersStandardFormat.java | 5 -- .../game/formats/WarOfTheRingBlockFormat.java | 5 -- .../gempukku/lotro/league/LeagueFormat.java | 50 ------------------- 10 files changed, 5 insertions(+), 90 deletions(-) delete mode 100644 gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/league/LeagueFormat.java diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/formats/DefaultLotroFormat.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/formats/DefaultLotroFormat.java index 3e54ecf19..8c75d41e3 100644 --- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/formats/DefaultLotroFormat.java +++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/formats/DefaultLotroFormat.java @@ -36,6 +36,11 @@ public abstract class DefaultLotroFormat implements LotroFormat { _canCancelRingBearerSkirmish = canCancelRingBearerSkirmish; } + @Override + public final boolean isOrderedSites() { + return _siteBlock != Block.OTHER; + } + @Override public String getName() { return _name; diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/formats/ExpandedFormat.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/formats/ExpandedFormat.java index dd07fdd44..db646798a 100644 --- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/formats/ExpandedFormat.java +++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/formats/ExpandedFormat.java @@ -63,9 +63,4 @@ public class ExpandedFormat extends DefaultLotroFormat { addRestrictedCard("4_276"); addRestrictedCard("4_304"); } - - @Override - public boolean isOrderedSites() { - return true; - } } diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/formats/FotRBlockFormat.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/formats/FotRBlockFormat.java index 6efed41f2..49b8de99f 100644 --- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/formats/FotRBlockFormat.java +++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/formats/FotRBlockFormat.java @@ -11,9 +11,4 @@ public class FotRBlockFormat extends DefaultLotroFormat { addValidSet(2); addValidSet(3); } - - @Override - public boolean isOrderedSites() { - return true; - } } diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/formats/KingBlockFormat.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/formats/KingBlockFormat.java index 692053979..bd635bfa6 100644 --- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/formats/KingBlockFormat.java +++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/formats/KingBlockFormat.java @@ -11,9 +11,4 @@ public class KingBlockFormat extends DefaultLotroFormat { addValidSet(8); addValidSet(10); } - - @Override - public boolean isOrderedSites() { - return true; - } } diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/formats/MovieFormat.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/formats/MovieFormat.java index 78d9502c4..b85912047 100644 --- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/formats/MovieFormat.java +++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/formats/MovieFormat.java @@ -40,9 +40,4 @@ public class MovieFormat extends DefaultLotroFormat { addValidSet(9); addValidSet(10); } - - @Override - public boolean isOrderedSites() { - return true; - } } diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/formats/OpenFormat.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/formats/OpenFormat.java index eaca992c8..d04cdd1cf 100644 --- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/formats/OpenFormat.java +++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/formats/OpenFormat.java @@ -34,9 +34,4 @@ public class OpenFormat extends DefaultLotroFormat { addRestrictedCard("11_100"); addRestrictedCard("11_132"); } - - @Override - public boolean isOrderedSites() { - return true; - } } diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/formats/TTTBlockFormat.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/formats/TTTBlockFormat.java index a7e0123d2..c7e8d0293 100644 --- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/formats/TTTBlockFormat.java +++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/formats/TTTBlockFormat.java @@ -10,9 +10,4 @@ public class TTTBlockFormat extends DefaultLotroFormat { addValidSet(5); addValidSet(6); } - - @Override - public boolean isOrderedSites() { - return true; - } } diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/formats/TowersStandardFormat.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/formats/TowersStandardFormat.java index 540b092cf..b35d29fdc 100644 --- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/formats/TowersStandardFormat.java +++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/formats/TowersStandardFormat.java @@ -30,9 +30,4 @@ public class TowersStandardFormat extends DefaultLotroFormat { addValidSet(5); addValidSet(6); } - - @Override - public boolean isOrderedSites() { - return true; - } } diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/formats/WarOfTheRingBlockFormat.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/formats/WarOfTheRingBlockFormat.java index 0f544b1ec..576fb30a7 100644 --- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/formats/WarOfTheRingBlockFormat.java +++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/formats/WarOfTheRingBlockFormat.java @@ -12,9 +12,4 @@ public class WarOfTheRingBlockFormat extends DefaultLotroFormat { addValidSet(12); addValidSet(13); } - - @Override - public boolean isOrderedSites() { - return false; - } } diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/league/LeagueFormat.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/league/LeagueFormat.java deleted file mode 100644 index 6e7c4ae0a..000000000 --- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/league/LeagueFormat.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.gempukku.lotro.league; - -import com.gempukku.lotro.common.Block; -import com.gempukku.lotro.db.vo.League; -import com.gempukku.lotro.game.*; -import com.gempukku.lotro.game.formats.DefaultLotroFormat; -import com.gempukku.lotro.logic.vo.LotroDeck; - -import java.util.Map; - -public class LeagueFormat extends DefaultLotroFormat { - private LotroCardBlueprintLibrary _library; - private LeagueService _leagueService; - private League _league; - private boolean _orderedSites; - - public LeagueFormat(LotroCardBlueprintLibrary library, LeagueService leagueService, League league, boolean orderedSites) { - super(library, Block.FELLOWSHIP, true, 60, Integer.MAX_VALUE, true, true); - _library = library; - _leagueService = leagueService; - _league = league; - _orderedSites = orderedSites; - } - - @Override - public void validateDeck(Player player, LotroDeck deck) throws DeckInvalidException { - // First validate the deck is valid at all - super.validateDeck(player, deck); - - CardCollection playerCardCollection = _leagueService.getLeagueCollection(player, _league); - - // Now check if player owns all the cards - Map deckCardCounts = CollectionUtils.getTotalCardCountForDeck(deck); - final Map collectionCardCounts = playerCardCollection.getAll(); - - for (Map.Entry cardCount : deckCardCounts.entrySet()) { - final Integer collectionCount = collectionCardCounts.get(cardCount.getKey()); - if (collectionCount == null || collectionCount < cardCount.getValue()) { - String cardName = _library.getLotroCardBlueprint(cardCount.getKey()).getName(); - int owned = (collectionCount == null) ? 0 : collectionCount; - throw new DeckInvalidException("You don't have the required cards in collection: " + cardName + " required " + cardCount.getValue() + ", owned " + owned); - } - } - } - - @Override - public boolean isOrderedSites() { - return _orderedSites; - } -}