diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/LotroServer.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/LotroServer.java index 01453a5f7..2310f45a4 100644 --- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/LotroServer.java +++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/LotroServer.java @@ -43,7 +43,7 @@ public class LotroServer extends AbstractServer { _lotroCardBlueprintLibrary = library; _chatServer = chatServer; _defaultCollection = new DefaultCardCollection(library); - for (int i = 1; i <= 6; i++) { + for (int i = 1; i <= 7; i++) { for (int j = 1; j <= 365; j++) { String blueprintId = i + "_" + j; try { @@ -60,7 +60,7 @@ public class LotroServer extends AbstractServer { } if (test) { - for (int i = 7; i <= 7; i++) { + for (int i = 8; i <= 8; i++) { for (int j = 1; j <= 365; j++) { String blueprintId = i + "_" + j; try { 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 new file mode 100644 index 000000000..169d2e04f --- /dev/null +++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/formats/KingBlockFormat.java @@ -0,0 +1,19 @@ +package com.gempukku.lotro.game.formats; + +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, Block.KING, true, 60, 4, mulliganRule); + addRestrictedCard("7_49"); + addValidSet(7); + addValidSet(8); + addValidSet(9); + } + + @Override + public boolean isOrderedSites() { + return true; + } +} 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 33f1a6c52..f338f0b33 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 @@ -6,10 +6,7 @@ import com.gempukku.lotro.db.CollectionDAO; import com.gempukku.lotro.db.vo.League; import com.gempukku.lotro.db.vo.Player; import com.gempukku.lotro.game.*; -import com.gempukku.lotro.game.formats.FotRBlockFormat; -import com.gempukku.lotro.game.formats.FreeFormat; -import com.gempukku.lotro.game.formats.TTTBlockFormat; -import com.gempukku.lotro.game.formats.TowersStandardFormat; +import com.gempukku.lotro.game.formats.*; import com.gempukku.lotro.league.LeagueService; import com.gempukku.lotro.logic.vo.LotroDeck; @@ -48,6 +45,8 @@ public class HallServer extends AbstractServer { addFormat("ttt_block", "Two Towers block", "default", new TTTBlockFormat(_lotroServer.getLotroCardBlueprintLibrary(), false)); addFormat("c_ttt_block", "Community Two Towers block", "default", new TTTBlockFormat(_lotroServer.getLotroCardBlueprintLibrary(), true)); addFormat("towers_standard", "Towers Standard", "default", new TowersStandardFormat(_lotroServer.getLotroCardBlueprintLibrary())); + addFormat("king_block", "King block", "default", new KingBlockFormat(_lotroServer.getLotroCardBlueprintLibrary(), false)); + addFormat("c_king_block", "Community King block", "default", new KingBlockFormat(_lotroServer.getLotroCardBlueprintLibrary(), true)); addFormat("whatever", "Format for testing", "default", new FreeFormat(_lotroServer.getLotroCardBlueprintLibrary())); } diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/hall.html b/gemp-lotr/gemp-lotr-web/src/main/webapp/hall.html index 1956bf1fa..52094397c 100644 --- a/gemp-lotr/gemp-lotr-web/src/main/webapp/hall.html +++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/hall.html @@ -119,7 +119,7 @@ $(document).ready( function() { - $("#latestNews").append("Sets 01-06 are available to play. " + $("#latestNews").append("Sets 01-07 are available to play. " + "If you find any problems with specific card or rules in general, please report it to me directly or " + "on the TLHH forums."); diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/changeLog.html b/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/changeLog.html index 74fe06e95..1a22e9574 100644 --- a/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/changeLog.html +++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/changeLog.html @@ -1,4 +1,7 @@
+10 Nov. 2011
+- Added set 07 (Return of the King).
+
9 Nov. 2011
- "House of Elrond" does not give an option to remove a burden to shadow player anymore.
- Putting "Toss Me" on bottom or top of deck with it's effect does not freeze the game anymore.
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 07c2062d6..57d1ad6e2 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
@@ -48,3 +48,21 @@