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 new file mode 100644 index 000000000..f9ad96c1f --- /dev/null +++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/formats/ExpandedFormat.java @@ -0,0 +1,71 @@ +package com.gempukku.lotro.game.formats; + +import com.gempukku.lotro.common.Block; +import com.gempukku.lotro.game.LotroCardBlueprintLibrary; + +public class ExpandedFormat extends DefaultLotroFormat { + public ExpandedFormat(LotroCardBlueprintLibrary library) { + super(library, Block.OTHER, true, 60, 4, true, false); + addValidSet(0); + addValidSet(1); + addValidSet(2); + addValidSet(3); + addValidSet(4); + addValidSet(5); + addValidSet(6); + addValidSet(7); + addValidSet(8); + addValidSet(9); + addValidSet(10); + addValidSet(11); + addValidSet(12); + addValidSet(13); + addValidSet(14); + addValidSet(15); + addValidSet(16); + addValidSet(17); + addValidSet(18); + addValidSet(19); + + addBannedCard("1_45"); + addBannedCard("1_138"); + addBannedCard("1_234"); + addBannedCard("1_311"); + addBannedCard("1_313"); + addBannedCard("1_316"); + addBannedCard("2_121"); + addBannedCard("3_17"); + addBannedCard("3_38"); + addBannedCard("3_42"); + addBannedCard("3_67"); + addBannedCard("3_68"); + addBannedCard("3_108"); + addBannedCard("3_113"); + addBannedCard("4_73"); + addBannedCard("7_49"); + addBannedCard("8_1"); + addBannedCard("10_2"); + addBannedCard("10_11"); + addBannedCard("10_91"); + addBannedCard("11_31"); + addBannedCard("11_100"); + addBannedCard("11_132"); + + addRestrictedCard("1_40"); + addRestrictedCard("1_80"); + addRestrictedCard("1_108"); + addRestrictedCard("1_139"); + addRestrictedCard("1_195"); + addRestrictedCard("1_248"); + addRestrictedCard("2_32"); + addRestrictedCard("2_75"); + addRestrictedCard("3_106"); + 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/hall/HallServer.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/hall/HallServer.java index 1edc1c3c5..a98131915 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 @@ -47,8 +47,9 @@ public class HallServer extends AbstractServer { addFormat("c_king_block", "Community King block", "default", new KingBlockFormat(library, true)); addFormat("movie", "Movie block", "default", new MovieFormat(library)); addFormat("war_block", "War of the Ring block", "default", new WarOfTheRingBlockFormat(library, false)); - addFormat("open", "Open", "default", new OpenFormat(library)); addFormat("c_war_block", "Community War of the Ring block", "default", new WarOfTheRingBlockFormat(library, true)); + addFormat("open", "Open", "default", new OpenFormat(library)); + addFormat("expanded", "Expanded", "default", new ExpandedFormat(library)); addFormat("whatever", "Format for testing", "default", new FreeFormat(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 f2f84c83d..1efc3c7d8 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 @@ -111,3 +111,44 @@