diff --git a/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/HallRequestHandler.java b/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/HallRequestHandler.java index 62bd0867a..63314206a 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/HallRequestHandler.java +++ b/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/HallRequestHandler.java @@ -350,20 +350,6 @@ public class HallRequestHandler extends LotroServerRequestHandler implements Uri if (lotroFormat.getValidCards().size() == 0) result.append("none,"); result.append(""); - //Additional Hobbit Draft format section - if (lotroFormat.getLimit2Cards().size() != 0) { - result.append("
  • Cards limited to 2 copies: "); - for (String blueprintId : lotroFormat.getLimit2Cards()) - result.append(GameUtils.getCardLink(blueprintId, _library.getLotroCardBlueprint(blueprintId)) + ", "); - result.append("
    • "); - } - if (lotroFormat.getLimit3Cards().size() != 0) { - result.append("
  • Cards limited to 3 copies: "); - for (String blueprintId : lotroFormat.getLimit3Cards()) - result.append(GameUtils.getCardLink(blueprintId, _library.getLotroCardBlueprint(blueprintId)) + ", "); - result.append("
    • "); - result.append("Click here for additional information"); - } result.append(""); responseWriter.writeHtmlResponse(result.toString()); @@ -398,20 +384,6 @@ public class HallRequestHandler extends LotroServerRequestHandler implements Uri if (lotroFormat.getValidCards().size() == 0) result.append("none,"); result.append(""); - //Additional Hobbit Draft format section - if (lotroFormat.getLimit2Cards().size() != 0) { - result.append("
  • Cards limited to 2 copies: "); - for (String blueprintId : lotroFormat.getLimit2Cards()) - result.append(GameUtils.getCardLink(blueprintId, _library.getLotroCardBlueprint(blueprintId)) + ", "); - result.append("
    • "); - } - if (lotroFormat.getLimit3Cards().size() != 0) { - result.append("
  • Cards limited to 3 copies: "); - for (String blueprintId : lotroFormat.getLimit3Cards()) - result.append(GameUtils.getCardLink(blueprintId, _library.getLotroCardBlueprint(blueprintId)) + ", "); - result.append("
    • "); - result.append("Click here for additional information"); - } result.append(""); } diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/images/cultures/esgaroth.png b/gemp-lotr/gemp-lotr-async/src/main/web/images/cultures/esgaroth.png new file mode 100644 index 000000000..8d81942b2 Binary files /dev/null and b/gemp-lotr/gemp-lotr-async/src/main/web/images/cultures/esgaroth.png differ diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/images/cultures/gundabad.png b/gemp-lotr/gemp-lotr-async/src/main/web/images/cultures/gundabad.png new file mode 100644 index 000000000..f1dd61982 Binary files /dev/null and b/gemp-lotr/gemp-lotr-async/src/main/web/images/cultures/gundabad.png differ diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-019/cardFilter.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-019/cardFilter.js index 6d2a9fc93..5455e7dc6 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-019/cardFilter.js +++ b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-019/cardFilter.js @@ -138,7 +138,7 @@ var CardFilter = Class.extend({ + "" //Additional Hobbit Draft blocks + "" - + "" + + "" + ""); this.nameInput = $(""); this.sortSelect = $("" //Additional Hobbit Draft Shadow cultures + "" - + "" - + "" - + "" - + "" + //+ "" + //+ "" + //+ "" + //+ "" + ""); var combos = $("
    "); @@ -296,7 +296,7 @@ var CardFilter = Class.extend({ $("#type").change(filterOut); //Additional Hobbit Draft labels - $("#labelDWARVEN,#labelELVEN,#labelGANDALF,#labelGONDOR,#labelROHAN,#labelSHIRE,#labelGOLLUM,#labelDUNLAND,#labelISENGARD,#labelMEN,#labelMORIA,#labelORC,#labelRAIDER,#labelSAURON,#labelURUK_HAI,#labelWRAITH,#labelESGAROTH,#labelGUNDABAD,#labelMIRKWOOD,#labelSMAUG,#labelSPIDER,#labelTROLL").click(filterOut); + $("#labelDWARVEN,#labelELVEN,#labelGANDALF,#labelGONDOR,#labelROHAN,#labelSHIRE,#labelGOLLUM,#labelDUNLAND,#labelISENGARD,#labelMEN,#labelMORIA,#labelORC,#labelRAIDER,#labelSAURON,#labelURUK_HAI,#labelWRAITH,#labelESGAROTH,#labelGUNDABAD").click(filterOut); }, layoutUi:function (x, y, width, height) { diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-019/hobbit.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-019/hobbit.js index bcfd98b8b..fcf700db7 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-019/hobbit.js +++ b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-019/hobbit.js @@ -54,7 +54,7 @@ var hobbit = { '30_53': 'http://hobbitdraftgame.free.fr/Cards_Good_def/5_Mirkwood.png', '30_54': 'http://hobbitdraftgame.free.fr/Cards_Good_def/6_Esgaroth.png', '30_55': 'http://hobbitdraftgame.free.fr/Cards_Good_def/7_Erebor.png', - '30_56': "http://hobbitdraftgame.free.fr/Cards_Good_def/8_Smaug's_den.png", + '30_56': 'http://hobbitdraftgame.free.fr/Cards_Good_def/8_Smaug\'s_den.png', '30_57': 'http://hobbitdraftgame.free.fr/Cards_Good_def/9_Battle_of_the_five_armies.png', '30_58': 'http://hobbitdraftgame.free.fr/Cards_Good_def/Smaug.png', '31_1': 'http://hobbitdraftgame.free.fr/Cards_Good_def/Dwarven_Axe.png', @@ -123,9 +123,9 @@ var hobbit = { '31_64': 'http://hobbitdraftgame.free.fr/Cards_Good_def/Troll_Bert.png', '31_65': 'http://hobbitdraftgame.free.fr/Cards_Good_def/Caught_In_A_Sack.png', '31_66': 'http://hobbitdraftgame.free.fr/Cards_Good_def/Troll_Tom.png', - '31_67': 'http://hobbitdraftgame.free.fr/Cards_Good_def/Troll_William.png', + '31_67': 'http://hobbitdraftgame.free.fr/Cards_Good_def/Troll_Troll_Campfire.png', '31_68': 'http://hobbitdraftgame.free.fr/Cards_Good_def/Troll_Troll_Knife.png', - '31_69': 'http://hobbitdraftgame.free.fr/Cards_Good_def/Troll_Troll_Campfire.png', + '31_69': 'http://hobbitdraftgame.free.fr/Cards_Good_def/Troll_William.png', '32_1': 'http://hobbitdraftgame.free.fr/Cards_Good_def/Crown_of_Erebor.png', '32_2': 'http://hobbitdraftgame.free.fr/Cards_Good_def/Dain.png', '32_3': 'http://hobbitdraftgame.free.fr/Cards_Good_def/Du_Bekar.png', diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/leagueAdmin.html b/gemp-lotr/gemp-lotr-async/src/main/web/leagueAdmin.html index 53f652668..de58b21eb 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/leagueAdmin.html +++ b/gemp-lotr/gemp-lotr-async/src/main/web/leagueAdmin.html @@ -209,6 +209,7 @@ + @@ -217,6 +218,8 @@ + + diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set13/elven/Card13_024.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set13/elven/Card13_024.java index 1cd6d400a..921c365e3 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set13/elven/Card13_024.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set13/elven/Card13_024.java @@ -19,7 +19,7 @@ import com.gempukku.lotro.game.state.LotroGame; */ public class Card13_024 extends AbstractEvent { public Card13_024() { - super(Side.FREE_PEOPLE, 2, Culture.ELVEN, "Sprang Forth Nimbly", Phase.SKIRMISH); + super(Side.FREE_PEOPLE, 2, Culture.ELVEN, "Spring Forth Nimbly", Phase.SKIRMISH); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/men/Card15_078.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/men/Card15_078.java index 444b46d12..718508c2b 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/men/Card15_078.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/men/Card15_078.java @@ -38,8 +38,8 @@ public class Card15_078 extends AbstractMinion { @Override public List getOptionalAfterTriggers(String playerId, LotroGame game, EffectResult effectResult, PhysicalCard self) { if (TriggerConditions.startOfPhase(game, effectResult, Phase.MANEUVER) - && PlayConditions.canSpot(game, Filters.not(self), Culture.MEN, Race.MAN) - && (PlayConditions.canSpot(game, 8, Filters.character) + && ((PlayConditions.canSpot(game, Filters.not(self), Culture.MEN, Race.MAN) + && PlayConditions.canSpot(game, 8, Filters.character)) || new CountCulturesEvaluator(Side.FREE_PEOPLE).evaluateExpression(game.getGameState(), game.getModifiersQuerying(), null) >= 3)) { OptionalTriggerAction action = new OptionalTriggerAction(self); action.appendEffect( diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/orc/Card15_113.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/orc/Card15_113.java index c52f8a773..6dc4a8351 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/orc/Card15_113.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/orc/Card15_113.java @@ -48,7 +48,7 @@ public class Card15_113 extends AbstractPermanent { action.appendCost( new RemoveTwilightEffect(2)); action.appendCost( - new ChooseAndExertCharactersEffect(action, playerId, 1, 1, Culture.ORC, Race.ORC)); + new ChooseAndExertCharactersEffect(action, playerId, 1, 1, Culture.ORC, CardType.MINION)); action.appendEffect( new RevealBottomCardsOfDrawDeckEffect(self, playerId, 1) { @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/rohan/Card15_130.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/rohan/Card15_130.java index ab96cba15..8204a89ac 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/rohan/Card15_130.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/rohan/Card15_130.java @@ -28,7 +28,7 @@ import com.gempukku.lotro.logic.modifiers.StrengthModifier; */ public class Card15_130 extends AbstractCompanion { public Card15_130() { - super(3, 5, 3, 6, Culture.ROHAN, Race.MAN, null, "Horesman of the North"); + super(3, 5, 3, 6, Culture.ROHAN, Race.MAN, null, "Horseman of the North"); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set18/men/Card18_075.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set18/men/Card18_075.java index e10166be2..3b2c25330 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set18/men/Card18_075.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set18/men/Card18_075.java @@ -56,7 +56,7 @@ public class Card18_075 extends AbstractMinion { action.appendCost( new SelfExertEffect(action, self)); action.appendEffect( - new ChooseActiveCardEffect(self, playerId, "Choose a MEN minion", Culture.MEN, CardType.MINION) { + new ChooseActiveCardEffect(self, playerId, "Choose a MEN Man", Culture.MEN, Race.MAN) { @Override protected void cardSelected(LotroGame game, final PhysicalCard minion) { action.appendEffect( diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/dwarven/Card3_001.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/dwarven/Card3_001.java index 3badddd52..4a907df01 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/dwarven/Card3_001.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/dwarven/Card3_001.java @@ -22,7 +22,7 @@ import java.util.List; * Game Text: Tale. Bearer must be a Dwarf. At the start of each fellowship phase when the fellowship is at site 4 * or higher, you may draw a card for each Dwarf companion. */ -public class Card3_001 extends AbstractAttachable { +public class Card3_001 extends AbstractAttachableFPPossession { public Card3_001() { super(Side.FREE_PEOPLE, CardType.POSSESSION, 2, Culture.DWARVEN, null, "Book of Mazarbul", null, true); addKeyword(Keyword.TALE); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/shire/Card3_112.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/shire/Card3_112.java index 4fe9b4c65..435f8f1a0 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/shire/Card3_112.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/shire/Card3_112.java @@ -1,6 +1,7 @@ package com.gempukku.lotro.cards.set3.shire; import com.gempukku.lotro.cards.AbstractOldEvent; +import com.gempukku.lotro.cards.PlayConditions; import com.gempukku.lotro.cards.actions.PlayEventAction; import com.gempukku.lotro.cards.effects.AddUntilEndOfPhaseModifierEffect; import com.gempukku.lotro.common.*; @@ -27,7 +28,7 @@ public class Card3_112 extends AbstractOldEvent { @Override public boolean checkPlayRequirements(String playerId, LotroGame game, PhysicalCard self, int withTwilightRemoved, int twilightModifier, boolean ignoreRoamingPenalty, boolean ignoreCheckingDeadPile) { return super.checkPlayRequirements(playerId, game, self, withTwilightRemoved, twilightModifier, ignoreRoamingPenalty, ignoreCheckingDeadPile) - && Filters.canSpot(game.getGameState(), game.getModifiersQuerying(), Culture.SHIRE, CardType.COMPANION); + && PlayConditions.canSpot(game, 2, Culture.SHIRE, CardType.COMPANION); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/gandalf/Card30_027.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/gandalf/Card30_027.java index eb7ee7298..99c361589 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/gandalf/Card30_027.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/gandalf/Card30_027.java @@ -36,7 +36,7 @@ import java.util.List; */ public class Card30_027 extends AbstractCompanion { public Card30_027() { - super(2, 7, 4, 6, Culture.GANDALF, Race.WIZARD, null, "Gandalf", "Powerful Guide", true); + super(2, 7, 4, 6, Culture.GANDALF, Race.WIZARD, null, "Gandalf", "The Grey", true); addKeyword(Keyword.WISE); } @@ -80,4 +80,4 @@ public class Card30_027 extends AbstractCompanion { } return null; } -} \ No newline at end of file +} diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/dwarven/Card31_005.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/dwarven/Card31_005.java index 3239e8ada..3f2e909ef 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/dwarven/Card31_005.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/dwarven/Card31_005.java @@ -30,7 +30,7 @@ import java.util.List; */ public class Card31_005 extends AbstractAttachableFPPossession { public Card31_005() { - super(2, 0, 1, Culture.SHIRE, CardType.ARTIFACT, PossessionClass.ARMOR, "Mithril-coat", null, true); + super(2, 0, 1, Culture.DWARVEN, CardType.ARTIFACT, PossessionClass.ARMOR, "Mithril-coat", null, true); } @Override @@ -54,4 +54,4 @@ public class Card31_005 extends AbstractAttachableFPPossession { }, 2)); return modifiers; } -} \ No newline at end of file +} diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/gandalf/Card31_013.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/gandalf/Card31_013.java index 853cdfc6a..91b820d39 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/gandalf/Card31_013.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/gandalf/Card31_013.java @@ -34,7 +34,7 @@ import java.util.List; */ public class Card31_013 extends AbstractFollower { public Card31_013() { - super(Side.FREE_PEOPLE, 3, 2, 1, 0, Culture.SHIRE, "Beorn", "Skin-Changer", true); + super(Side.FREE_PEOPLE, 3, 2, 1, 0, Culture.GANDALF, "Beorn", "Skin-Changer", true); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/isengard/Card4_164.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/isengard/Card4_164.java index 45158cd1b..98bda3e78 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/isengard/Card4_164.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/isengard/Card4_164.java @@ -33,7 +33,7 @@ import java.util.List; */ public class Card4_164 extends AbstractMinion { public Card4_164() { - super(5, 12, 2, 5, Race.URUK_HAI, Culture.ISENGARD, "Othanc Champion", null, true); + super(5, 12, 2, 5, Race.URUK_HAI, Culture.ISENGARD, "Orthanc Champion", null, true); addKeyword(Keyword.DAMAGE); } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/gandalf/Card5_018.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/gandalf/Card5_018.java index ecf1b619a..d164e4d52 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/gandalf/Card5_018.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/gandalf/Card5_018.java @@ -20,7 +20,7 @@ import com.gempukku.lotro.logic.effects.ChooseAndWoundCharactersEffect; */ public class Card5_018 extends AbstractEvent { public Card5_018() { - super(Side.FREE_PEOPLE, 3, Culture.GANDALF, "Fury of the White Raider", Phase.MANEUVER); + super(Side.FREE_PEOPLE, 3, Culture.GANDALF, "Fury of the White Rider", Phase.MANEUVER); addKeyword(Keyword.SPELL); } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/raider/Card7_140.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/raider/Card7_140.java index a37e909ed..1609f5692 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/raider/Card7_140.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/raider/Card7_140.java @@ -45,7 +45,7 @@ public class Card7_140 extends AbstractMinion { boolean hasInitiative = PlayConditions.hasInitiative(game, Side.SHADOW); int healCount = hasInitiative ? 2 : 1; action.appendEffect( - new ChooseAndHealCharactersEffect(action, playerId, healCount, healCount, Keyword.EASTERLING)); + new ChooseAndHealCharactersEffect(action, playerId, healCount, healCount, Filters.not(self), Keyword.EASTERLING)); return Collections.singletonList(action); } return null; diff --git a/gemp-lotr/gemp-lotr-server/src/main/resources/lotrFormats.json b/gemp-lotr/gemp-lotr-server/src/main/resources/lotrFormats.json index 6fe4a4f64..69f0862cb 100644 --- a/gemp-lotr/gemp-lotr-server/src/main/resources/lotrFormats.json +++ b/gemp-lotr/gemp-lotr-server/src/main/resources/lotrFormats.json @@ -30,17 +30,17 @@ "code":"fotr_poorman", "sites":"FELLOWSHIP", "cancelRingBearerSkirmish":true, - "banned":["1_1", "1_13", "1_14", "1_15", "1_16", "1_22", "1_23", "1_28", "1_30", "1_33", "1_34", "1_35", "1_36", "1_38", "1_40", "1_45", "1_47", "1_49", "1_50", "1_55", "1_62", "1_66", "1_69", - "1_71", "1_72", "1_75", "1_79", "1_80", "1_81", "1_83", "1_87", "1_88", "1_89", "1_90", "1_93", "1_95", "1_96", "1_99", "1_100", "1_111", "1_114", "1_115", "1_118", "1_120", "1_123", "1_124", - "1_125", "1_127", "1_128", "1_129", "1_131", "1_132", "1_137", "1_139", "1_140", "1_143", "1_147", "1_148", "1_155", "1_163", "1_165", "1_166", "1_167", "1_169", "1_170", "1_172", "1_173", - "1_175", "1_183", "1_186", "1_189", "1_190", "1_195", "1_199", "1_200", "1_204", "1_205", "1_206", "1_208", "1_210", "1_212", "1_214", "1_216", "1_217", "1_221", "1_224", "1_228", "1_229", - "1_230", "1_236", "1_237", "1_240", "1_243", "1_244", "1_245", "1_246", "1_247", "1_250", "1_252", "1_253", "1_254", "1_256", "1_259", "1_263", "1_264", "1_265", "1_272", "1_276", "1_279", - "1_282", "1_284", "1_288", "1_289", "1_291", "1_302", "1_307", "1_308", "1_310", "1_313", "1_314", "1_318", "2_1", "2_7", "2_11", "2_12", "2_15", "2_19", "2_20", "2_22", "2_25", "2_27", - "2_32", "2_36", "2_38", "2_39", "2_43", "2_45", "2_46", "2_49", "2_50", "2_52", "2_53", "2_57", "2_66", "2_73", "2_74", "2_75", "2_77", "2_80", "2_84", "2_85", "2_86", "2_93", "2_94", "2_97", - "2_100", "2_105", "2_108", "2_109", "2_112", "2_113", "3_1", "3_3", "3_8", "3_13", "3_15", "3_17", "3_19", "3_21", "3_23", "3_27", "3_29", "3_34", "3_38", "3_39", "3_40", "3_41", "3_42", - "3_44", "3_50", "3_52", "3_54", "3_64", "3_65", "3_66", "3_67", "3_68", "3_71", "3_77", "3_80", "3_81", "3_85", "3_91", "3_93", "3_99", "3_102", "3_103", "3_104", "3_105", "3_110", "3_113"], + "banned":["1_1", "1_13", "1_14", "1_15", "1_16", "1_22", "1_23", "1_28", "1_30", "1_33", "1_34", "1_35", "1_36", "1_38", "1_40", "1_45", "1_47", "1_49", "1_50", "1_55", "1_62", "1_66", "1_69", + "1_71", "1_72", "1_75", "1_79", "1_80", "1_81", "1_83", "1_87", "1_88", "1_89", "1_90", "1_93", "1_95", "1_96", "1_99", "1_100", "1_111", "1_114", "1_115", "1_118", "1_120", "1_123", "1_124", + "1_125", "1_127", "1_128", "1_129", "1_131", "1_132", "1_137", "1_139", "1_140", "1_143", "1_147", "1_148", "1_155", "1_163", "1_165", "1_166", "1_167", "1_169", "1_170", "1_172", "1_173", + "1_175", "1_183", "1_186", "1_189", "1_190", "1_195", "1_199", "1_200", "1_204", "1_205", "1_206", "1_208", "1_210", "1_212", "1_214", "1_216", "1_217", "1_221", "1_224", "1_228", "1_229", + "1_230", "1_236", "1_237", "1_240", "1_243", "1_244", "1_245", "1_246", "1_247", "1_250", "1_252", "1_253", "1_254", "1_256", "1_259", "1_263", "1_264", "1_265", "1_272", "1_276", "1_279", + "1_282", "1_284", "1_288", "1_289", "1_291", "1_302", "1_307", "1_308", "1_310", "1_313", "1_314", "1_318", "2_1", "2_7", "2_11", "2_12", "2_15", "2_19", "2_20", "2_22", "2_25", "2_27", + "2_32", "2_36", "2_38", "2_39", "2_43", "2_45", "2_46", "2_49", "2_50", "2_52", "2_53", "2_57", "2_66", "2_73", "2_74", "2_75", "2_77", "2_80", "2_84", "2_85", "2_86", "2_93", "2_94", "2_97", + "2_100", "2_105", "2_108", "2_109", "2_112", "2_113", "3_1", "3_3", "3_8", "3_13", "3_15", "3_17", "3_19", "3_21", "3_23", "3_27", "3_29", "3_34", "3_38", "3_39", "3_40", "3_41", "3_42", + "3_44", "3_50", "3_52", "3_54", "3_64", "3_65", "3_66", "3_67", "3_68", "3_71", "3_77", "3_80", "3_81", "3_85", "3_91", "3_93", "3_99", "3_102", "3_103", "3_104", "3_105", "3_110", "3_113"], "restricted":["1_248"], - "set":[1, 2, 3], + "set":[1, 2, 3], "hall":false }, { @@ -133,6 +133,24 @@ "restricted":["7_49"], "set":[7, 8, 10] }, + { + "name":"King block - Set 7", + "code":"king1_block", + "sites":"KING", + "cancelRingBearerSkirmish":true, + "restricted":["7_49"], + "set":[7], + "hall":false + }, + { + "name":"King block - Sets 7-8", + "code":"king2_block", + "sites":"KING", + "cancelRingBearerSkirmish":true, + "restricted":["7_49"], + "set":[7, 8], + "hall":false + }, { "name":"Movie block", "code":"movie",