ambidextrous/gemp-lotr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Mulligan rule is now in every format.

Browse Source
This commit is contained in:
marcins78@gmail.com
2012-01-12 14:31:15 +00:00
parent 7957fbfba4
commit 8bcceb1b72
6 changed files with 12 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/formats/FotRBlockFormat.java
View File

@@ -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);

4
gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/formats/KingBlockFormat.java
View File

@@ -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);

4
gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/formats/TTTBlockFormat.java
View File

@@ -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);

4
gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/formats/WarOfTheRingBlockFormat.java
View File

@@ -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);

12
gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/hall/HallServer.java
View File

@@ -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));
}

44
gemp-lotr/gemp-lotr-web/src/main/webapp/includes/formatRules.html
View File

@@ -5,16 +5,6 @@
<li>Ring-bearer skirmish CAN be cancelled,</li>
<li>there is no X-list,</li>
<li>R-list has one card - <i>Forces of Mordor</i>,</li>
<li>Mulligan rule IS NOT in effect.</li>
</ul>
<b>Community Fellowship block</b>
<ul>
<li>cards from sets 01-03 are legal,</li>
<li>sites from Fellowship block are used,</li>
<li>Ring-bearer skirmish CAN be cancelled,</li>
<li>there is no X-list,</li>
<li>R-list has one card - <i>Forces of Mordor</i>,</li>
<li>Mulligan rule IS in effect.</li>
</ul>
<b>Two Towers block</b>
<ul>
@@ -23,16 +13,6 @@
<li>Ring-bearer skirmish CAN be cancelled,</li>
<li>there is no X-list,</li>
<li>there is no R-list,</li>
<li>Mulligan rule IS NOT in effect.</li>
</ul>
<b>Community Two Towers block</b>
<ul>
<li>cards from sets 04-06 are legal,</li>
<li>sites from The Two Towers block are used,</li>
<li>Ring-bearer skirmish CAN be cancelled,</li>
<li>there is no X-list,</li>
<li>there is no R-list,</li>
<li>Mulligan rule IS in effect.</li>
</ul>
<b>Towers Standard</b>
<ul>
@@ -46,7 +26,6 @@
Boromir</i>, <i>Saruman, Keeper of Isengard</i>, <i>Uruk Regular</i>,
</li>
<li>there is no R-list,</li>
<li>Mulligan rule IS in effect.</li>
</ul>
<b>King block</b>
<ul>
@@ -55,16 +34,6 @@
<li>Ring-bearer skirmish CAN be cancelled,</li>
<li>there is no X-list,</li>
<li>R-list has one card - <i>Steadfast Champion</i>,</li>
<li>Mulligan rule IS NOT in effect.</li>
</ul>
<b>Community King block</b>
<ul>
<li>cards from sets 07-08 and 10 are legal,</li>
<li>sites from King block are used,</li>
<li>Ring-bearer skirmish CAN be cancelled,</li>
<li>there is no X-list,</li>
<li>R-list has one card - <i>Steadfast Champion</i>,</li>
<li>Mulligan rule IS in effect.</li>
</ul>
<b>Movie block</b>
<ul>
@@ -79,7 +48,6 @@
Numbers</i>, <i>Steadfast Champion</i>, <i>Sting</i>, <i>Úlairë Nertëa, Messenger of Dol Guldur</i>,
</li>
<li>there is no R-list,</li>
<li>Mulligan rule IS in effect.</li>
</ul>
<b>War of the Ring block</b>
<ul>
@@ -88,16 +56,6 @@
<li>Ring-bearer skirmish CAN NOT be cancelled,</li>
<li>there is no X-list,</li>
<li>R-list has two cards - <i>Orkish Smith</i> and <i>Strange-looking Men</i>,</li>
<li>Mulligan rule IS NOT in effect.</li>
</ul>
<b>Community War of the Ring block</b>
<ul>
<li>cards from sets 11-13 are legal,</li>
<li>sites from Shadows and onward are used,</li>
<li>Ring-bearer skirmish CAN NOT be cancelled,</li>
<li>there is no X-list,</li>
<li>R-list has two cards - <i>Orkish Smith</i> and <i>Strange-looking Men</i>,</li>
<li>Mulligan rule IS in effect.</li>
</ul>
<b>Open</b>
<ul>
@@ -109,7 +67,6 @@
Smith</i>
<i>Steadfast Champion</i> and <i>Strange-looking Men</i>,
</li>
<li>Mulligan rule IS in effect.</li>
</ul>
<b>Expanded</b>
<ul>
@@ -150,5 +107,4 @@
<i>Relics of Moria</i> and
<i>Savagery to Match Their Numbers </i>,
</li>
<li>Mulligan rule IS in effect.</li>
</ul>