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

Merge pull request #20 from PhallenCassidy/patch-1

Browse Source 
Changes for The Hobbit Formats
This commit is contained in:
Christian McCarty
2022-11-03 20:38:22 -05:00
committed by GitHub
parent cde04dee37 2e3bd4fc6b
commit 25efc04c43
12 changed files with 49 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
gemp-lotr/gemp-lotr-async/src/main/web/images/cultures/Mirkwood.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
gemp-lotr/gemp-lotr-async/src/main/web/images/cultures/Smaug.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.1 KiB

BIN
gemp-lotr/gemp-lotr-async/src/main/web/images/cultures/Spider.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.3 KiB

BIN
gemp-lotr/gemp-lotr-async/src/main/web/images/cultures/Troll.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.7 KiB

BIN
gemp-lotr/gemp-lotr-async/src/main/web/images/cultures/mirkwood.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
gemp-lotr/gemp-lotr-async/src/main/web/images/cultures/smaug.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.1 KiB

BIN
gemp-lotr/gemp-lotr-async/src/main/web/images/cultures/spider.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.3 KiB

BIN
gemp-lotr/gemp-lotr-async/src/main/web/images/cultures/troll.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.7 KiB

4
gemp-lotr/gemp-lotr-async/src/main/web/includes/info/changeLog.html
View File

@@ -1,5 +1,9 @@
<div class="article"><pre style="white-space: pre-wrap;">
<b>Most recent update</b>
- 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
<b>2022 September 12</b>
- 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!

51
gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/cardFilter.js
View File

@@ -109,8 +109,8 @@ var CardFilter = Class.extend({
this.navigationDiv.append(this.nextPageBut);
this.fullFilterDiv = $("<div id='filter-inputs' style='display:flex;flex-wrap:wrap;'></div>");
this.setSelect = $("<select style='width: 130px; font-size: 80%;'>"
+ "<option value='0-33,101'>All Sets</option>"
this.setSelect = $("<select id='setSelect' style='width: 130px; font-size: 80%;'>"
+ "<option value='0-34,101'>All Sets</option>"
+ "<option value='0-19'>Official Decipher Sets</option>"
+ "<option value='30-33'>The Hobbit Sets</option>"
+ "<option value='50-69'>Player's Council Errata</option>"
@@ -133,8 +133,6 @@ var CardFilter = Class.extend({
+ "<option value='expanded'>Expanded</option>"
+ "<option value='pc_expanded'>Expanded (PC)</option>"
+ "<option value='french'>French Format</option>"
+ "<option value='hobbit_tsr'> The Hobbit: The Short Rest</option>"
+ "<option value='hobbit_tcb'> The Hobbit: The Clouds Burst</option>"
+ "<option disabled>----------</option>"
+ "<option value='0'>00 - Promo</option>"
+ "<option value='1'>01 - The Fellowship of the Ring</option>"
@@ -214,7 +212,7 @@ var CardFilter = Class.extend({
this.filterDiv = $("<div id='culture-buttons' style='display:flex;flex-wrap:wrap;'></div>");
this.filterDiv.append(""
this.filterDiv.append("<div id='culture1'>"
+ "<input type='checkbox' id='DWARVEN'/><label for='DWARVEN' id='labelDWARVEN'><img src='images/cultures/dwarven.png'/></label>"
+ "<input type='checkbox' id='ELVEN'/><label for='ELVEN' id='labelELVEN'><img src='images/cultures/elven.png'/></label>"
+ "<input type='checkbox' id='GANDALF'/><label for='GANDALF' id='labelGANDALF'><img src='images/cultures/gandalf.png'/></label>"
@@ -222,8 +220,6 @@ var CardFilter = Class.extend({
+ "<input type='checkbox' id='ROHAN'/><label for='ROHAN' id='labelROHAN'><img src='images/cultures/rohan.png'/></label>"
+ "<input type='checkbox' id='SHIRE'/><label for='SHIRE' id='labelSHIRE'><img src='images/cultures/shire.png'/></label>"
+ "<input type='checkbox' id='GOLLUM'/><label for='GOLLUM' id='labelGOLLUM'><img src='images/cultures/gollum.png'/></label>"
);
this.filterDiv.append(""
+ "<input type='checkbox' id='DUNLAND'/><label for='DUNLAND' id='labelDUNLAND'><img src='images/cultures/dunland.png'/></label>"
+ "<input type='checkbox' id='ISENGARD'/><label for='ISENGARD' id='labelISENGARD'><img src='images/cultures/isengard.png'/></label>"
+ "<input type='checkbox' id='MEN'/><label for='MEN' id='labelMEN'><img src='images/cultures/men.png'/></label>"
@@ -233,13 +229,16 @@ var CardFilter = Class.extend({
+ "<input type='checkbox' id='SAURON'/><label for='SAURON' id='labelSAURON'><img src='images/cultures/sauron.png'/></label>"
+ "<input type='checkbox' id='URUK_HAI'/><label for='URUK_HAI' id='labelURUK_HAI'><img src='images/cultures/uruk_hai.png'/></label>"
+ "<input type='checkbox' id='WRAITH'/><label for='WRAITH' id='labelWRAITH'><img src='images/cultures/wraith.png'/></label>"
//Additional Hobbit Draft cultures
);
//Additional Hobbit Draft cultures
//var hobbitFilterDiv = $("<div id='culture2' style='display:flex;flex-wrap:wrap;'></div>");
this.filterDiv.append("<div id='culture2'>"
+ "<input type='checkbox' id='ESGAROTH'/><label for='ESGAROTH' id='labelESGAROTH'><img src='images/cultures/esgaroth.png'/></label>"
+ "<input type='checkbox' id='GUNDABAD'/><label for='GUNDABAD' id='labelGUNDABAD'><img src='images/cultures/gundabad.png'/></label>"
//+ "<input type='checkbox' id='MIRKWOOD'/><label for='MIRKWOOD' id='labelMIRKWOOD'><img src='images/cultures/mirkwood.png'/></label>"
//+ "<input type='checkbox' id='SMAUG'/><label for='SMAUG' id='labelSMAUG'><img src='images/cultures/smaug.png'/></label>"
//+ "<input type='checkbox' id='SPIDER'/><label for='SPIDER' id='labelSPIDER'><img src='images/cultures/spider.png'/></label>"
//+ "<input type='checkbox' id='TROLL'/><label for='TROLL' id='labelTROLL'><img src='images/cultures/troll.png'/></label>"
+ "<input type='checkbox' id='MIRKWOOD'/><label for='MIRKWOOD' id='labelMIRKWOOD'><img src='images/cultures/mirkwood.png'/></label>"
+ "<input type='checkbox' id='SMAUG'/><label for='SMAUG' id='labelSMAUG'><img src='images/cultures/smaug.png'/></label>"
+ "<input type='checkbox' id='SPIDER'/><label for='SPIDER' id='labelSPIDER'><img src='images/cultures/spider.png'/></label>"
+ "<input type='checkbox' id='TROLL'/><label for='TROLL' id='labelTROLL'><img src='images/cultures/troll.png'/></label>"
);
var combos = $("<div></div>");
@@ -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 = $("<div id='collection-display' style='display:flex;flex-direction:column;position:relative;'></div>");
//collection-display

2
gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/hobbit/set31/set31-shadow.hjson
View File

@@ -435,7 +435,7 @@
31_29: {
title: Ancestral Feuds
unique: true
culture: gundabad
culture: mirkwood
type: condition
keyword: support area
twilight: 2

42
gemp-lotr/gemp-lotr-cards/src/main/resources/lotrFormats.json
View File

@@ -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],