From 8bcceb1b72f6a62b2cf882400d090e2b7f9ab12a Mon Sep 17 00:00:00 2001 From: "marcins78@gmail.com" Date: Thu, 12 Jan 2012 14:31:15 +0000 Subject: [PATCH] Mulligan rule is now in every format. --- .../lotro/game/formats/FotRBlockFormat.java | 4 +- .../lotro/game/formats/KingBlockFormat.java | 4 +- .../lotro/game/formats/TTTBlockFormat.java | 4 +- .../game/formats/WarOfTheRingBlockFormat.java | 4 +- .../com/gempukku/lotro/hall/HallServer.java | 12 ++--- .../src/main/webapp/includes/formatRules.html | 44 ------------------- 6 files changed, 12 insertions(+), 60 deletions(-) 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 49b8de99f..b3bcba91d 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 @@ -4,8 +4,8 @@ import com.gempukku.lotro.common.Block; import com.gempukku.lotro.game.LotroCardBlueprintLibrary; public class FotRBlockFormat extends DefaultLotroFormat { - public FotRBlockFormat(LotroCardBlueprintLibrary library, boolean mulliganRule) { - super(library, (mulliganRule ? "Community " : "") + "Fellowship block", Block.FELLOWSHIP, true, 60, 4, mulliganRule, true); + public FotRBlockFormat(LotroCardBlueprintLibrary library) { + super(library, "Fellowship block", Block.FELLOWSHIP, true, 60, 4, true, true); addRestrictedCard("1_248"); addValidSet(1); addValidSet(2); 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 bd635bfa6..5f93cca87 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 @@ -4,8 +4,8 @@ import com.gempukku.lotro.common.Block; import com.gempukku.lotro.game.LotroCardBlueprintLibrary; public class KingBlockFormat extends DefaultLotroFormat { - public KingBlockFormat(LotroCardBlueprintLibrary library, boolean mulliganRule) { - super(library, (mulliganRule ? "Community " : "") + "King block", Block.KING, true, 60, 4, mulliganRule, true); + public KingBlockFormat(LotroCardBlueprintLibrary library) { + super(library, "King block", Block.KING, true, 60, 4, true, true); addRestrictedCard("7_49"); addValidSet(7); addValidSet(8); 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 c7e8d0293..f7884fab0 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 @@ -4,8 +4,8 @@ import com.gempukku.lotro.common.Block; import com.gempukku.lotro.game.LotroCardBlueprintLibrary; public class TTTBlockFormat extends DefaultLotroFormat { - public TTTBlockFormat(LotroCardBlueprintLibrary library, boolean mulliganRule) { - super(library, (mulliganRule ? "Community " : "") + "Two Towers block", Block.TWO_TOWERS, true, 60, 4, mulliganRule, true); + public TTTBlockFormat(LotroCardBlueprintLibrary library) { + super(library, "Two Towers block", Block.TWO_TOWERS, true, 60, 4, true, true); addValidSet(4); addValidSet(5); addValidSet(6); 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 576fb30a7..49674d592 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 @@ -4,8 +4,8 @@ import com.gempukku.lotro.common.Block; import com.gempukku.lotro.game.LotroCardBlueprintLibrary; public class WarOfTheRingBlockFormat extends DefaultLotroFormat { - public WarOfTheRingBlockFormat(LotroCardBlueprintLibrary library, boolean mulliganRule) { - super(library, (mulliganRule ? "Community " : "") + "War of the Ring block", Block.OTHER, true, 60, 4, mulliganRule, false); + public WarOfTheRingBlockFormat(LotroCardBlueprintLibrary library) { + super(library, "War of the Ring block", Block.OTHER, true, 60, 4, true, false); addRestrictedCard("11_132"); addRestrictedCard("11_100"); addValidSet(11); diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/hall/HallServer.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/hall/HallServer.java index a6600332c..bd7e9519b 100644 --- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/hall/HallServer.java +++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/hall/HallServer.java @@ -53,16 +53,12 @@ public class HallServer extends AbstractServer { _collectionsManager = collectionsManager; _chatServer.createChatRoom("Game Hall", 10); - addFormat("fotr_block", new FotRBlockFormat(library, false)); - addFormat("c_fotr_block", new FotRBlockFormat(library, true)); - addFormat("ttt_block", new TTTBlockFormat(library, false)); - addFormat("c_ttt_block", new TTTBlockFormat(library, true)); + addFormat("fotr_block", new FotRBlockFormat(library)); + addFormat("ttt_block", new TTTBlockFormat(library)); addFormat("towers_standard", new TowersStandardFormat(library)); - addFormat("king_block", new KingBlockFormat(library, false)); - addFormat("c_king_block", new KingBlockFormat(library, true)); + addFormat("king_block", new KingBlockFormat(library)); addFormat("movie", new MovieFormat(library)); - addFormat("war_block", new WarOfTheRingBlockFormat(library, false)); - addFormat("c_war_block", new WarOfTheRingBlockFormat(library, true)); + addFormat("war_block", new WarOfTheRingBlockFormat(library)); addFormat("open", new OpenFormat(library)); addFormat("expanded", new ExpandedFormat(library)); } diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/formatRules.html b/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/formatRules.html index 1efc3c7d8..185f4483c 100644 --- a/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/formatRules.html +++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/formatRules.html @@ -5,16 +5,6 @@
  • Ring-bearer skirmish CAN be cancelled,
  • there is no X-list,
  • R-list has one card - Forces of Mordor,
    • -
  • Mulligan rule IS NOT in effect.
    • - -Community Fellowship block - Two Towers block -Community Two Towers block - Towers Standard King block -Community King block - Movie block War of the Ring block -Community War of the Ring block - Open Expanded