From 0ed9467ff0ce9bcb71b68593f0873658e6a5c816 Mon Sep 17 00:00:00 2001 From: PhallenCassidy Date: Sun, 23 Oct 2022 21:45:42 -0400 Subject: [PATCH 01/10] By popular demand, an Open format for The Hobbit Though I may be directly responsible for whatever happens as a result of this, I deny all liability. --- .../src/main/resources/lotrFormats.json | 42 ++++--------------- 1 file changed, 7 insertions(+), 35 deletions(-) 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 895350eb2..a0e3d7c5a 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":"Hobbit: Open", + "code":"hobbit_open", "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], From 841d3299ef7f24aaf7fffa3f53443ed0b8527f5f Mon Sep 17 00:00:00 2001 From: PhallenCassidy Date: Sun, 23 Oct 2022 21:58:44 -0400 Subject: [PATCH 02/10] Removed unused Hobbit formats from the deckbuilder Also removed the last Hobbit culture buttons; relics from a forgotten time when all Hobbit cultures were just lumped under Gundabad. In a future update (tm), all Hobbit cultures should appear in their own row after the LotR cultures if any of the set/format filters for The Hobbit Draft Game are selected. --- .../src/main/web/js/gemp-022/cardFilter.js | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) 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..e0b997c34 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 @@ -133,8 +133,6 @@ var CardFilter = Class.extend({ + "" + "" + "" - + "" - + "" + "" + "" + "" @@ -234,8 +232,8 @@ var CardFilter = Class.extend({ + "" + "" //Additional Hobbit Draft cultures - + "" - + "" + //+ "" + //+ "" //+ "" //+ "" //+ "" @@ -438,8 +436,7 @@ var CardFilter = Class.extend({ $("#itemClass").change(filterOut); $("#phase").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").click(filterOut); + $("#labelDWARVEN,#labelELVEN,#labelGANDALF,#labelGONDOR,#labelROHAN,#labelSHIRE,#labelGOLLUM,#labelDUNLAND,#labelISENGARD,#labelMEN,#labelMORIA,#labelORC,#labelRAIDER,#labelSAURON,#labelURUK_HAI,#labelWRAITH").click(filterOut); this.collectionDiv = $("
"); //collection-display From 85f3a586afa2ea7198bcfd43c9bca5a156c0c61e Mon Sep 17 00:00:00 2001 From: PhallenCassidy Date: Sun, 23 Oct 2022 22:13:01 -0400 Subject: [PATCH 03/10] Update changeLog.html Covers changes from myself and SalavecJ --- .../gemp-lotr-async/src/main/web/includes/info/changeLog.html | 4 ++++ 1 file changed, 4 insertions(+) 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..e417dcfb7 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 "Hobbit: Open" to the game hall, which allows decks to be constructed for The Hobbit across all of its expansions
+- Fixed the deckbuilder definition for The Hobbit to properly validate decks in the format
+- Removed the Gundabad and Esgaroth culture filters from the deckbuilder
 
 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! 

From 509c82407575cc472c19a3144bdf8e2257298393 Mon Sep 17 00:00:00 2001
From: PhallenCassidy 
Date: Sun, 23 Oct 2022 22:29:00 -0400
Subject: [PATCH 04/10] More sensical name for the single Hobbit format

---
 gemp-lotr/gemp-lotr-cards/src/main/resources/lotrFormats.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 a0e3d7c5a..22f346b00 100644
--- a/gemp-lotr/gemp-lotr-cards/src/main/resources/lotrFormats.json
+++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/lotrFormats.json
@@ -407,8 +407,8 @@
         "hall":false
     },
     {
-        "name":"Hobbit: Open",
-        "code":"hobbit_open",
+        "name":"The Hobbit Draft Game",
+        "code":"hobbit",
         "order": 40,
         "sites":"HOBBIT",
         "cancelRingBearerSkirmish":true,

From 72f66a6849b5bfa69b2555126eef483a40c9a90b Mon Sep 17 00:00:00 2001
From: PhallenCassidy 
Date: Mon, 24 Oct 2022 00:30:42 -0400
Subject: [PATCH 05/10] Added remaining Hobbit cultures to deckbuilder

A future update has arrived
---
 .../src/main/web/js/gemp-022/cardFilter.js    | 52 ++++++++++++++-----
 1 file changed, 39 insertions(+), 13 deletions(-)

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 e0b997c34..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 = $(""
+            + ""
             + ""
             + ""
             + ""
@@ -212,7 +212,7 @@ var CardFilter = Class.extend({
 
         this.filterDiv = $("
");
 
-        this.filterDiv.append(""
+        this.filterDiv.append("
"
             + ""
             + ""
             + ""
@@ -220,8 +220,6 @@ var CardFilter = Class.extend({
             + ""
             + ""
             + ""
-        );
-        this.filterDiv.append(""
             + ""
             + ""
             + ""
@@ -231,13 +229,16 @@ var CardFilter = Class.extend({
             + ""
             + ""
             + ""
-            //Additional Hobbit Draft cultures
-            //+ ""
-            //+ ""
-            //+ ""
-            //+ ""
-            //+ ""
-            //+ ""
+        );
+        //Additional Hobbit Draft cultures
+        //var hobbitFilterDiv = $("
");
+        this.filterDiv.append("
"
+            + ""
+            + ""
+            + ""
+            + ""
+            + ""
+            + ""
         );
 
         var combos = $("
");
@@ -370,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;
@@ -377,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);
@@ -437,6 +461,8 @@ var CardFilter = Class.extend({
         $("#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
+        $("#labelESGAROTH,#labelGUNDABAD,#labelMIRKWOOD,#labelSMAUG,#labelSPIDER,#labelTROLL").click(filterOut);
         
         this.collectionDiv = $("
");
         //collection-display

From 590348cad4bea41ca3d9a0b9b72408b6251e360e Mon Sep 17 00:00:00 2001
From: PhallenCassidy 
Date: Mon, 24 Oct 2022 00:31:45 -0400
Subject: [PATCH 06/10] Added culture icons for remaining Hobbit cultures

---
 .../src/main/web/images/cultures/Mirkwood.png    | Bin 0 -> 1586 bytes
 .../src/main/web/images/cultures/Smaug.png       | Bin 0 -> 3186 bytes
 .../src/main/web/images/cultures/Spider.png      | Bin 0 -> 2306 bytes
 .../src/main/web/images/cultures/Troll.png       | Bin 0 -> 1787 bytes
 4 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 gemp-lotr/gemp-lotr-async/src/main/web/images/cultures/Mirkwood.png
 create mode 100644 gemp-lotr/gemp-lotr-async/src/main/web/images/cultures/Smaug.png
 create mode 100644 gemp-lotr/gemp-lotr-async/src/main/web/images/cultures/Spider.png
 create mode 100644 gemp-lotr/gemp-lotr-async/src/main/web/images/cultures/Troll.png

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 0000000000000000000000000000000000000000..27ff2ee94bd8657f16eb1ffba8718903e2806f00
GIT binary patch
literal 1586
zcmd5+J!n%=6h8O8m%Nvz(X?2EI9MkUtb;g+nz
zL`SNFh!WYs^jYX`j6Fsa^Noj7r=X$}Lj!4&{Chh4>^@Fnmj_3uiN-QK#H+rE!#LEh
zW>07Id@Pkr9lh&Znjwn3$)-=9JKiN;MuuG6_(!s0+rke+!Fs!p%HNFhrrA|6&Fkx7
z_(@X~=>);^xk}~UvSsaR=hGHw(XuY!@)tu@Z!1D@g-HmJ1EnhfUdvZ1Q+d;DVz>op
z*|wj+`J$m|`yxu!oCk0cSRZgsV5jM-ig%#b3#Q4BR+T28CEI=k=W$pPDx4%12&;q5
ziYMjyjXk+xcm$69zLf94uF9-V5B1PBA@;&40(%x37w8+G*R4`}l9p4nf5K3d5}J^b(dh1k
zrj>rVu8tOPQ1Bq8svSLs(e&5Rwnn}2co{|IhNH6Ura4Z<^K^bm^w;B7kQN?WxA^XI
yi?)4$E%{!ipwIjCbbD-TiR~Kf>H!G7E5&{;-Wiop`xHG
zaZ}w$r7i>)icryo8y5=V2N~8y-jrwJvWrfbcV^CL0JYuw_Fr+
zO_b>4m7;KGUhi%Fek&PnWw4pU(wJvCU&^ZLbNQ+2dfPum@%Ht)zM5NmWwomINYD9n
zJBqq_Ro!{LswSn|YHY}Al(B$y;@JALzw^8k1;LYP7|sy(<=WcwtUqjpVT)~!&)>YyQF2RQ{!+gzp99cI_LBtKX9%9vwIPs+
zgTT}rXdfX1_ORrn0%&qxQ=W@?UBB3iA`^w-QY(sUFXYJRV&+JIkfxjbp
z!$VWcdZjGKaJn3mWq}h7l}rvbykoJUvTCS=awu>DFIELidiu>tXDD0dSdyq0W%DCR
zoxpB406&q<$fuIWe}aI^3Ob-nf}(XblyWAJn$jzCF{i0BpRLY$NLL0PL@zHj7MIstH*BYCo%POJzNr4ZV$DE<3l*@F={4e1=5
z;a)m1CJ<^Dp3ptgX^aFmo+Q_3{s+kJoIoHKkXM-Bh$UT8BMUUaa=<(T!&7%8Nw_^t
z5A1BWpTOpz&Ie3hx;GLSCL^dr->yaEH;E$s`{c%2Dt_0HWD-GdwU}l1Qv21rJDopu
z%%^4=FlPah5qx1=n!f9=(U0OH;9k926wn#$r%bP7e?P3C=-189l$g>Tm`M6Xv7caj3H}$KtAq693a#)oFV`-?S=y3wec>hbUjW>h
ztLVSQ_DlKEa1Pg&oBw)1vZ9<(FG(tNuH4O=d`nLQ;4F?8K{0@>T?D;M(2sZmf8ax&
m`nNoNtnaE7h-RWqf4AQH!MzuMUNoNy*!cYQtene&f

literal 0
HcmV?d00001

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 0000000000000000000000000000000000000000..b4af01b2f6b02fb95c9c9b87740d21fa3c2b09b5
GIT binary patch
literal 2306
zcmds2T}TvB7`=CPcJ{~iFO5Potq3K}48j*5qFB>yag8WQh=`&fiU<;dN(vF8KY9ow
zqKDoLf)I?}gdTd5M9B!k7ZVARR(IA+*PWf)`37g1o!!-5e5kwJy?5?8-#PdD?w#Fx
zM`Nu%Z@HH-=8Lq2k72ApFLNvSzSVR14hH3Hv^C5GeO?arKf#LUYFpC<840P>%O@N#(&!QT6qn}<4&(E*VP9CV}OSX$O~+3j#NdmN5-V19_Hzcj7CM3zT(`Fz6Un`1$rH6oyBW?xj*4g4X_>k<*EJQV4I5Q)<{S;fscHb!(RYgI!q
zIAuJnd{Gth8p>4-;cqbVB7jrJa|ejOQ`kNAc}+_JXVh^6jWt>)GZ+onjmRV~GZ;~6
zM-lW47om?xX2az|6mU45M>ak~znE
z5}XB;r~~hr8{*UGJNJb`DsgbmWhm<;3_oC8Fyji25b7!j6j%he9`D}k0uXI_6us7t
zWiJT8N`T{bLa}F5U=SrgT?D@kT!H4rBKY4ge^%AY5W>Gp@do^X9nEHD2UdH=uA6ag
z@zprM@_rlF;OE15HEv+n&U|DYR$x}M4zmBaB3dLZdLX?EA#!F+{rdf{^9?gJl1tBU?m727{`Z`F?l)syoo%tI
zM3pfnmTFI)M8?H#g!Rf;T?`R9d%P`aJpFD@-@S?@I@o?{*qF`R#Q}5uMlD7slj>-7
z-bEAD5vQ^7_cErszV4n(%fPFwW|A^&FUuOp+G<}3D|`f;7>KK`vF;zDgu7b=eH1j&GWo{$RONM
z$o7ygIb$&HI8O?;GEot5esS^AlILAkB%o%s$g;dS?02x-q}th1k52!G0NYw>6sRan
z_f9Y<-sOfuLz{xZXLK`K8fz>3mdoA8*b0B~om92g2a-)y`g`dDRx(G;E_+^AbtLjy
zaejrj(BH#hoIEYF$4^H80bBB0moK-hr)sH=bw@!rVJY0h6jObQ8fL2c9D3j*a26hi
zn`n0gX+l&cFb-CAs!};2`9!wmRkeKOfGC!g+Gy0ieg^fGeT}02tgKkTFyL-5xWJvC
zpykK%`7KK?BY?6#SivzPNpdkxLt>{cixt|IixF!mR2u*&RdTO}HZ3@I{c-5tEv;Fh
zA0SC`@zUAO!%MPLVGi*E{;9oaU4RVjBe8bc3}XU)Qpu1DsP6Wa-Lb3-P{Ab5=-E)M
z-pc?yq5H(%z?_%p(v={k{p~TV87ksPl(BD*&fN5}3Je4`*
zTlhHud7g~EtQb1NJk%ok@07Ve4Pd8@E?GF}Fxv+>-yo+;TpL^+Z+
Date: Mon, 24 Oct 2022 00:35:14 -0400
Subject: [PATCH 07/10] Fixed culture for The Hobbit's "Ancestral Feuds"

---
 .../resources/cards/unofficial/hobbit/set31/set31-shadow.hjson  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

From 35c790ea8c9f80d462646f14bca7379944fa1bac Mon Sep 17 00:00:00 2001
From: PhallenCassidy 
Date: Mon, 24 Oct 2022 01:10:14 -0400
Subject: [PATCH 08/10] Update changeLog.html

---
 .../gemp-lotr-async/src/main/web/includes/info/changeLog.html   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 e417dcfb7..ff13da607 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
@@ -3,7 +3,7 @@
 - The Hobbit's "Bilbo, Master of Riddles" is now properly strength +2 when skirmishing Smaug
 - Added "Hobbit: Open" to the game hall, which allows decks to be constructed for The Hobbit across all of its expansions
 - Fixed the deckbuilder definition for The Hobbit to properly validate decks in the format
-- Removed the Gundabad and Esgaroth culture filters from the deckbuilder
+- Added remaining cultures for The Hobbit to the deckbuilder, which will appear when "The Hobbit Sets" 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! 

From afa74fa54806dd51741654610cd2d16113fbb235 Mon Sep 17 00:00:00 2001
From: root 
Date: Tue, 25 Oct 2022 01:37:16 +0000
Subject: [PATCH 09/10] Corrected images for The Hobbit cultures

---
 .../src/main/web/images/cultures/mirkwood.png    | Bin 0 -> 1586 bytes
 .../src/main/web/images/cultures/smaug.png       | Bin 0 -> 3186 bytes
 .../src/main/web/images/cultures/spider.png      | Bin 0 -> 2306 bytes
 .../src/main/web/images/cultures/troll.png       | Bin 0 -> 1787 bytes
 4 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 gemp-lotr/gemp-lotr-async/src/main/web/images/cultures/mirkwood.png
 create mode 100644 gemp-lotr/gemp-lotr-async/src/main/web/images/cultures/smaug.png
 create mode 100644 gemp-lotr/gemp-lotr-async/src/main/web/images/cultures/spider.png
 create mode 100644 gemp-lotr/gemp-lotr-async/src/main/web/images/cultures/troll.png

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 0000000000000000000000000000000000000000..27ff2ee94bd8657f16eb1ffba8718903e2806f00
GIT binary patch
literal 1586
zcmd5+J!n%=6h8O8m%Nvz(X?2EI9MkUtb;g+nz
zL`SNFh!WYs^jYX`j6Fsa^Noj7r=X$}Lj!4&{Chh4>^@Fnmj_3uiN-QK#H+rE!#LEh
zW>07Id@Pkr9lh&Znjwn3$)-=9JKiN;MuuG6_(!s0+rke+!Fs!p%HNFhrrA|6&Fkx7
z_(@X~=>);^xk}~UvSsaR=hGHw(XuY!@)tu@Z!1D@g-HmJ1EnhfUdvZ1Q+d;DVz>op
z*|wj+`J$m|`yxu!oCk0cSRZgsV5jM-ig%#b3#Q4BR+T28CEI=k=W$pPDx4%12&;q5
ziYMjyjXk+xcm$69zLf94uF9-V5B1PBA@;&40(%x37w8+G*R4`}l9p4nf5K3d5}J^b(dh1k
zrj>rVu8tOPQ1Bq8svSLs(e&5Rwnn}2co{|IhNH6Ura4Z<^K^bm^w;B7kQN?WxA^XI
yi?)4$E%{!ipwIjCbbD-TiR~Kf>H!G7E5&{;-Wiop`xHG
zaZ}w$r7i>)icryo8y5=V2N~8y-jrwJvWrfbcV^CL0JYuw_Fr+
zO_b>4m7;KGUhi%Fek&PnWw4pU(wJvCU&^ZLbNQ+2dfPum@%Ht)zM5NmWwomINYD9n
zJBqq_Ro!{LswSn|YHY}Al(B$y;@JALzw^8k1;LYP7|sy(<=WcwtUqjpVT)~!&)>YyQF2RQ{!+gzp99cI_LBtKX9%9vwIPs+
zgTT}rXdfX1_ORrn0%&qxQ=W@?UBB3iA`^w-QY(sUFXYJRV&+JIkfxjbp
z!$VWcdZjGKaJn3mWq}h7l}rvbykoJUvTCS=awu>DFIELidiu>tXDD0dSdyq0W%DCR
zoxpB406&q<$fuIWe}aI^3Ob-nf}(XblyWAJn$jzCF{i0BpRLY$NLL0PL@zHj7MIstH*BYCo%POJzNr4ZV$DE<3l*@F={4e1=5
z;a)m1CJ<^Dp3ptgX^aFmo+Q_3{s+kJoIoHKkXM-Bh$UT8BMUUaa=<(T!&7%8Nw_^t
z5A1BWpTOpz&Ie3hx;GLSCL^dr->yaEH;E$s`{c%2Dt_0HWD-GdwU}l1Qv21rJDopu
z%%^4=FlPah5qx1=n!f9=(U0OH;9k926wn#$r%bP7e?P3C=-189l$g>Tm`M6Xv7caj3H}$KtAq693a#)oFV`-?S=y3wec>hbUjW>h
ztLVSQ_DlKEa1Pg&oBw)1vZ9<(FG(tNuH4O=d`nLQ;4F?8K{0@>T?D;M(2sZmf8ax&
m`nNoNtnaE7h-RWqf4AQH!MzuMUNoNy*!cYQtene&f

literal 0
HcmV?d00001

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 0000000000000000000000000000000000000000..b4af01b2f6b02fb95c9c9b87740d21fa3c2b09b5
GIT binary patch
literal 2306
zcmds2T}TvB7`=CPcJ{~iFO5Potq3K}48j*5qFB>yag8WQh=`&fiU<;dN(vF8KY9ow
zqKDoLf)I?}gdTd5M9B!k7ZVARR(IA+*PWf)`37g1o!!-5e5kwJy?5?8-#PdD?w#Fx
zM`Nu%Z@HH-=8Lq2k72ApFLNvSzSVR14hH3Hv^C5GeO?arKf#LUYFpC<840P>%O@N#(&!QT6qn}<4&(E*VP9CV}OSX$O~+3j#NdmN5-V19_Hzcj7CM3zT(`Fz6Un`1$rH6oyBW?xj*4g4X_>k<*EJQV4I5Q)<{S;fscHb!(RYgI!q
zIAuJnd{Gth8p>4-;cqbVB7jrJa|ejOQ`kNAc}+_JXVh^6jWt>)GZ+onjmRV~GZ;~6
zM-lW47om?xX2az|6mU45M>ak~znE
z5}XB;r~~hr8{*UGJNJb`DsgbmWhm<;3_oC8Fyji25b7!j6j%he9`D}k0uXI_6us7t
zWiJT8N`T{bLa}F5U=SrgT?D@kT!H4rBKY4ge^%AY5W>Gp@do^X9nEHD2UdH=uA6ag
z@zprM@_rlF;OE15HEv+n&U|DYR$x}M4zmBaB3dLZdLX?EA#!F+{rdf{^9?gJl1tBU?m727{`Z`F?l)syoo%tI
zM3pfnmTFI)M8?H#g!Rf;T?`R9d%P`aJpFD@-@S?@I@o?{*qF`R#Q}5uMlD7slj>-7
z-bEAD5vQ^7_cErszV4n(%fPFwW|A^&FUuOp+G<}3D|`f;7>KK`vF;zDgu7b=eH1j&GWo{$RONM
z$o7ygIb$&HI8O?;GEot5esS^AlILAkB%o%s$g;dS?02x-q}th1k52!G0NYw>6sRan
z_f9Y<-sOfuLz{xZXLK`K8fz>3mdoA8*b0B~om92g2a-)y`g`dDRx(G;E_+^AbtLjy
zaejrj(BH#hoIEYF$4^H80bBB0moK-hr)sH=bw@!rVJY0h6jObQ8fL2c9D3j*a26hi
zn`n0gX+l&cFb-CAs!};2`9!wmRkeKOfGC!g+Gy0ieg^fGeT}02tgKkTFyL-5xWJvC
zpykK%`7KK?BY?6#SivzPNpdkxLt>{cixt|IixF!mR2u*&RdTO}HZ3@I{c-5tEv;Fh
zA0SC`@zUAO!%MPLVGi*E{;9oaU4RVjBe8bc3}XU)Qpu1DsP6Wa-Lb3-P{Ab5=-E)M
z-pc?yq5H(%z?_%p(v={k{p~TV87ksPl(BD*&fN5}3Je4`*
zTlhHud7g~EtQb1NJk%ok@07Ve4Pd8@E?GF}Fxv+>-yo+;TpL^+Z+
Date: Mon, 24 Oct 2022 21:38:47 -0400
Subject: [PATCH 10/10] Update changeLog.html

---
 .../src/main/web/includes/info/changeLog.html               | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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 ff13da607..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,9 +1,9 @@
 
 Most recent update
 - The Hobbit's "Bilbo, Master of Riddles" is now properly strength +2 when skirmishing Smaug
-- Added "Hobbit: Open" to the game hall, which allows decks to be constructed for The Hobbit across all of its expansions
-- Fixed the deckbuilder definition for The Hobbit to properly validate decks in the format
-- Added remaining cultures for The Hobbit to the deckbuilder, which will appear when "The Hobbit Sets" is selected
+- 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!