diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/images/cultures/Mirkwood.png b/gemp-lotr/gemp-lotr-async/src/main/web/images/cultures/Mirkwood.png new file mode 100644 index 000000000..27ff2ee94 Binary files /dev/null and b/gemp-lotr/gemp-lotr-async/src/main/web/images/cultures/Mirkwood.png differ diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/images/cultures/Smaug.png b/gemp-lotr/gemp-lotr-async/src/main/web/images/cultures/Smaug.png new file mode 100644 index 000000000..929620b36 Binary files /dev/null and b/gemp-lotr/gemp-lotr-async/src/main/web/images/cultures/Smaug.png differ diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/images/cultures/Spider.png b/gemp-lotr/gemp-lotr-async/src/main/web/images/cultures/Spider.png new file mode 100644 index 000000000..b4af01b2f Binary files /dev/null and b/gemp-lotr/gemp-lotr-async/src/main/web/images/cultures/Spider.png differ diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/images/cultures/Troll.png b/gemp-lotr/gemp-lotr-async/src/main/web/images/cultures/Troll.png new file mode 100644 index 000000000..8ef3b2c42 Binary files /dev/null and b/gemp-lotr/gemp-lotr-async/src/main/web/images/cultures/Troll.png differ diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/images/cultures/mirkwood.png b/gemp-lotr/gemp-lotr-async/src/main/web/images/cultures/mirkwood.png new file mode 100644 index 000000000..27ff2ee94 Binary files /dev/null and b/gemp-lotr/gemp-lotr-async/src/main/web/images/cultures/mirkwood.png differ diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/images/cultures/smaug.png b/gemp-lotr/gemp-lotr-async/src/main/web/images/cultures/smaug.png new file mode 100644 index 000000000..929620b36 Binary files /dev/null and b/gemp-lotr/gemp-lotr-async/src/main/web/images/cultures/smaug.png differ diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/images/cultures/spider.png b/gemp-lotr/gemp-lotr-async/src/main/web/images/cultures/spider.png new file mode 100644 index 000000000..b4af01b2f Binary files /dev/null and b/gemp-lotr/gemp-lotr-async/src/main/web/images/cultures/spider.png differ diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/images/cultures/troll.png b/gemp-lotr/gemp-lotr-async/src/main/web/images/cultures/troll.png new file mode 100644 index 000000000..8ef3b2c42 Binary files /dev/null and b/gemp-lotr/gemp-lotr-async/src/main/web/images/cultures/troll.png differ diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/includes/info/changeLog.html b/gemp-lotr/gemp-lotr-async/src/main/web/includes/info/changeLog.html index a6cf460a2..c24d43ac9 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/includes/info/changeLog.html +++ b/gemp-lotr/gemp-lotr-async/src/main/web/includes/info/changeLog.html @@ -1,5 +1,9 @@ 
 Most recent update
+- The Hobbit's "Bilbo, Master of Riddles" is now properly strength +2 when skirmishing Smaug
+- Added "The Hobbit Draft Game" to the game hall, which allows decks to be constructed for The Hobbit across all of its expansions
+- "The Hobbit Draft Game" is also available in the deckbuilder to properly validate decks in the format
+- Added remaining cultures for The Hobbit to the deckbuilder, and set them to only appear when "The Hobbit Sets" or one of its expansions is selected
 
 2022 September 12
 - Revamped several back-end systems to be hot-reloadable. What this means is, any future changes to formats, packs, draft or sealed events, or card definitions can all be pushed and updated without requiring a server restart, even mid-game. Certain bugfixes should be deployed much faster now! 
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/cardFilter.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/cardFilter.js
index 369c45f6f..2fd73e6be 100644
--- a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/cardFilter.js
+++ b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/cardFilter.js
@@ -109,8 +109,8 @@ var CardFilter = Class.extend({
         this.navigationDiv.append(this.nextPageBut);
         
         this.fullFilterDiv = $("
");
-        this.setSelect = $(""
+            + ""
             + ""
             + ""
             + ""
@@ -133,8 +133,6 @@ var CardFilter = Class.extend({
             + ""
             + ""
             + ""
-            + ""
-            + ""
             + ""
             + ""
             + ""
@@ -214,7 +212,7 @@ var CardFilter = Class.extend({
 
         this.filterDiv = $("
");
 
-        this.filterDiv.append(""
+        this.filterDiv.append("
"
             + ""
             + ""
             + ""
@@ -222,8 +220,6 @@ var CardFilter = Class.extend({
             + ""
             + ""
             + ""
-        );
-        this.filterDiv.append(""
             + ""
             + ""
             + ""
@@ -233,13 +229,16 @@ var CardFilter = Class.extend({
             + ""
             + ""
             + ""
-            //Additional Hobbit Draft cultures
+        );
+        //Additional Hobbit Draft cultures
+        //var hobbitFilterDiv = $("
");
+        this.filterDiv.append("
"
             + ""
             + ""
-            //+ ""
-            //+ ""
-            //+ ""
-            //+ ""
+            + ""
+            + ""
+            + ""
+            + ""
         );
 
         var combos = $("
");
@@ -372,6 +371,26 @@ var CardFilter = Class.extend({
         
 
         $("#culture-buttons").buttonset();
+        
+        var setFilterChanged = function () {
+            var setSelected = $("#setSelect option:selected").prop("value");
+            if (setSelected.includes("30-33") || setSelected.includes("30") || setSelected.includes("31")
+                    || setSelected.includes("32") || setSelected.includes("33")) {
+                $("#culture2").show();
+            } else {
+                $("#labelESGAROTH").removeClass("ui-state-active");
+                $("#labelGUNDABAD").removeClass("ui-state-active");
+                $("#labelMIRKWOOD").removeClass("ui-state-active");
+                $("#labelSMAUG").removeClass("ui-state-active");
+                $("#labelSPIDER").removeClass("ui-state-active");
+                $("#labelTROLL").removeClass("ui-state-active");
+                $("#culture2").hide();
+            }
+            that.filter = that.calculateNormalFilter();
+            that.start = 0
+            that.getCollection();
+            return true;
+        };
 
         var fullFilterChanged = function () {
             that.start = 0;
@@ -379,7 +398,10 @@ var CardFilter = Class.extend({
             return true;
         };
 
-        this.setSelect.change(fullFilterChanged);
+        //Hide Hobbit cultures by default
+        $("#culture2").hide();
+
+        this.setSelect.change(setFilterChanged);
         this.nameInput.change(fullFilterChanged);
         this.sortSelect.change(fullFilterChanged);
         this.raritySelect.change(fullFilterChanged);
@@ -438,8 +460,9 @@ var CardFilter = Class.extend({
         $("#itemClass").change(filterOut);
         $("#phase").change(filterOut);
 
+        $("#labelDWARVEN,#labelELVEN,#labelGANDALF,#labelGONDOR,#labelROHAN,#labelSHIRE,#labelGOLLUM,#labelDUNLAND,#labelISENGARD,#labelMEN,#labelMORIA,#labelORC,#labelRAIDER,#labelSAURON,#labelURUK_HAI,#labelWRAITH").click(filterOut);
         //Additional Hobbit Draft labels
-        $("#labelDWARVEN,#labelELVEN,#labelGANDALF,#labelGONDOR,#labelROHAN,#labelSHIRE,#labelGOLLUM,#labelDUNLAND,#labelISENGARD,#labelMEN,#labelMORIA,#labelORC,#labelRAIDER,#labelSAURON,#labelURUK_HAI,#labelWRAITH,#labelESGAROTH,#labelGUNDABAD").click(filterOut);
+        $("#labelESGAROTH,#labelGUNDABAD,#labelMIRKWOOD,#labelSMAUG,#labelSPIDER,#labelTROLL").click(filterOut);
         
         this.collectionDiv = $("
");
         //collection-display
diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/hobbit/set31/set31-shadow.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/hobbit/set31/set31-shadow.hjson
index 0d9d5ce5d..ddd6730eb 100644
--- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/hobbit/set31/set31-shadow.hjson
+++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/hobbit/set31/set31-shadow.hjson
@@ -435,7 +435,7 @@
 	31_29: {
 		title: Ancestral Feuds
 		unique: true
-		culture: gundabad
+		culture: mirkwood
 		type: condition
 		keyword: support area
 		twilight: 2
diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/lotrFormats.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/lotrFormats.json
index 9ec465234..033e0a5c0 100644
--- a/gemp-lotr/gemp-lotr-cards/src/main/resources/lotrFormats.json
+++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/lotrFormats.json
@@ -407,48 +407,20 @@
         "hall":false
     },
     {
-        "name":"Hobbit: The Short Rest",
-        "code":"hobbit_tsr",
+        "name":"The Hobbit Draft Game",
+        "code":"hobbit",
         "order": 40,
         "sites":"HOBBIT",
         "cancelRingBearerSkirmish":true,
-        "restricted":["30_2", "30_5", "30_6", "30_7", "30_8", "30_9", "30_10", "30_11", "30_12", "30_15", "30_16", "30_17", "30_18", "30_19", "30_29", "30_47", "30_48", "30_58", "31_13", "31_14", "31_16", "31_23", "31_56"],
-        "limit2":["30_1", "30_24", "31_1", "31_38"],
-        "limit3":[],
-        "set":[30, 31],
+        "restricted":["30_2", "30_5", "30_6", "30_7", "30_8", "30_9", "30_10", "30_11", "30_12", "30_15", "30_16", "30_17", "30_18", "30_19", "30_29", "30_47", "30_48", "30_58"],
+        "set":[30, 31, 32, 33],
         "restrictedName":["Gandalf", "Bilbo"],
         "hall":true
     },
-    {
-        "name": "Hobbit: The Clouds Burst",
-        "code": "hobbit_tcb",
-        "order": 41,
-        "sites": "HOBBIT",
-        "cancelRingBearerSkirmish": true,
-        "restricted": ["30_2", "30_5", "30_6", "30_7", "30_8", "30_9", "30_10", "30_11", "30_12", "30_15", "30_16", "30_17", "30_18", "30_19", "30_29", "30_47", "30_48", "30_58"], 
-        "limit2": ["30_24", "32_21", "32_22"],
-        "limit3": [],
-        "set": [30, 32],
-        "restrictedName": ["Gandalf", "Bilbo"],
-        "hall": true
-    },
-    {
-        "name": "Hobbit: Fire and Water",
-        "code": "hobbit_faw",
-        "order": 42,
-        "sites": "HOBBIT",
-        "cancelRingBearerSkirmish": true,
-        "restricted": ["30_2", "30_5", "30_6", "30_7", "30_8", "30_9", "30_10", "30_11", "30_12", "30_15", "30_16", "30_17", "30_18", "30_19", "30_29", "30_47", "30_48", "30_58"],
-        "limit2": ["30_1", "30_24"],
-        "limit3": [],
-        "set": [30, 33],
-        "restrictedName": ["Gandalf","Bilbo"],
-        "hall": false
-    },
     {
         "name":"PLAYTEST - Fellowship Block (PC)",
         "code":"test_pc_fotr_block",
-        "order": 43,
+        "order": 41,
         "sites":"FELLOWSHIP",
         "cancelRingBearerSkirmish":true,
         "hall":true,
@@ -468,7 +440,7 @@
     {
         "name":"PLAYTEST - Movie Block (PC)",
         "code":"test_pc_movie",
-        "order": 44,
+        "order": 42,
         "sites":"KING",
         "hall":true,
         "playtest":true,
@@ -492,7 +464,7 @@
         "name":"PLAYTEST - Expanded (PC)",
         "code":"test_pc_expanded",
         "sites":"SHADOWS",
-        "order": 45,
+        "order": 43,
         "hall":true,
         "playtest":true,
         "set":[0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 101, 151],