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

Merge branch 'master' into feature/event-rewrite

Browse Source
This commit is contained in:
Christian 'ketura' McCarty
2024-08-14 16:12:26 -05:00
parent e6a77a4dcd ce76247de6
commit d0a4f585b4
7 changed files with 81 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/TournamentRequestHandler.java
View File

@@ -62,7 +62,7 @@ public class TournamentRequestHandler extends LotroServerRequestHandler implemen
} else if (uri.startsWith("/") && uri.endsWith("/html") && uri.contains("/deck/") && request.method() == HttpMethod.GET) { } else if (uri.startsWith("/") && uri.endsWith("/html") && uri.contains("/deck/") && request.method() == HttpMethod.GET) {
getTournamentDeck(request, uri.substring(1, uri.indexOf("/deck/")), uri.substring(uri.indexOf("/deck/") + 6, uri.lastIndexOf("/html")), responseWriter); getTournamentDeck(request, uri.substring(1, uri.indexOf("/deck/")), uri.substring(uri.indexOf("/deck/") + 6, uri.lastIndexOf("/html")), responseWriter);
} else if (uri.startsWith("/") && uri.endsWith("/html") && uri.contains("/report/") && request.method() == HttpMethod.GET) { } else if (uri.startsWith("/") && uri.endsWith("/html") && uri.contains("/report/") && request.method() == HttpMethod.GET) {
getTournamentReport(request, uri.substring(1, uri.indexOf("/report/")), uri.substring(uri.indexOf("/report/") + 6, uri.lastIndexOf("/html")), responseWriter); getTournamentReport(request, uri.substring(1, uri.indexOf("/report/")), uri.substring(uri.indexOf("/report/") + 8, uri.lastIndexOf("/html")), responseWriter);
} else if (uri.startsWith("/") && request.method() == HttpMethod.GET) { } else if (uri.startsWith("/") && request.method() == HttpMethod.GET) {
getTournamentInfo(request, uri.substring(1), responseWriter); getTournamentInfo(request, uri.substring(1), responseWriter);
} else { } else {

8
gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/PC_Cards.js
View File

@@ -639,6 +639,12 @@ var PCCards = {
//Dwarven Bracers FA //Dwarven Bracers FA
'2_128': 'https://i.lotrtcgpc.net/promos/LOTR-EN02U003.0_card.jpg', '2_128': 'https://i.lotrtcgpc.net/promos/LOTR-EN02U003.0_card.jpg',
//Ulaire Cantea, Lieutenant of Dol Guldur MW //Ulaire Cantea, Lieutenant of Dol Guldur MW
'1_390': 'https://i.lotrtcgpc.net/promos/LOTR-EN01O230.0_card.jpg' '1_390': 'https://i.lotrtcgpc.net/promos/LOTR-EN01O230.0_card.jpg',
//July 2024 Weekend League
//Theoden, Tall and Proud FA
'8_127': 'https://i.lotrtcgpc.net/promos/LOTR-EN08U092.0_card.jpg',
//Evil-smelling Fens FA
'5_129': 'https://i.lotrtcgpc.net/promos/LOTR-EN05U022.0_card.jpg',
} }

2
gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/hallUi.js
View File

@@ -653,7 +653,7 @@ var GempLotrHallUI = Class.extend({
//TODO: Replace this with an actual fix on the server side //TODO: Replace this with an actual fix on the server side
if(name.includes("Casual - WC")) { if(name.includes("Casual - WC")) {
name = "<td><b>2023 World Championship - " + userDesc + "</b></td>" name = "<td><b>2024 Format Championships" + userDesc + "</b></td>"
} }
row.append(name); row.append(name);
row.append("<td>" + statusDescription + "</td>"); row.append("<td>" + statusDescription + "</td>");

6
gemp-lotr/gemp-lotr-cards/src/main/resources/blueprintMapping.txt
View File

@@ -387,4 +387,8 @@ gl_theOneRing,1_2
#Dwarven Bracers FA #Dwarven Bracers FA
2_128,2_3 2_128,2_3
#Ulaire Cantea, Lieutenant of Dol Guldur MW #Ulaire Cantea, Lieutenant of Dol Guldur MW
1_390,1_230 1_390,1_230
#Theoden, Tall and Proud FA
8_127,8_92
#Evil-smelling Fens FA
5_129,5_22

2
gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set18/set18-Gondor-errata.hjson
View File

@@ -39,7 +39,7 @@
} }
{ {
type: activated type: activated
phase: skirmish phase: maneuver
requires: { requires: {
type: CanSpot type: CanSpot
filter: another,wounded,companion,ResistanceMoreThan(4) filter: another,wounded,companion,ResistanceMoreThan(4)

8
gemp-lotr/gemp-lotr-cards/src/main/resources/product/Misc-Packs.hjson
View File

@@ -384,6 +384,10 @@
1x9_60 1x9_60
#Sting, Bane of the Eight Legs MW #Sting, Bane of the Eight Legs MW
1x8_126 1x8_126
#Theoden, Tall and Proud FA
1x8_127
#Evil-smelling Fens FA
1x5_129
] ]
} }
@@ -473,6 +477,10 @@
1x1_389 1x1_389
#Freca, Hungry Savage FA #Freca, Hungry Savage FA
1x9_60 1x9_60
#Theoden, Tall and Proud FA
1x8_127
#Evil-smelling Fens FA
1x5_129
] ]
} }

116
gemp-lotr/gemp-lotr-cards/src/main/resources/product/TS-Sealed-Starters.hjson
View File

@@ -224,23 +224,23 @@
#Adventure Deck #Adventure Deck
#1 4U328 The Riddermark #1 4U328 The Riddermark
#2 4U331 Eastfold #2 4U335 Uruk Camp
#3 4U337 Barrows of Edoras #3 4U337 Barrows of Edoras
#4 4U343 Ered Nimrais #4 4U343 Ered Nimrais
#5 4U347 Deep of Helm #5 4U348 Deeping Wall
#6 4U354 Hornburg Armory #6 4U354 Hornburg Armory
#7 5U118 Hornburg Wall #7 5U118 Hornburg Wall
#8 4U359 Wizard's Vale #8 4U359 Wizard's Vale
#9 6U120 Saruman's Laboratory #9 5U120 Caverns of Isengard
1x4_328 1x4_328
1x4_331 1x4_335
1x4_337 1x4_337
1x4_343 1x4_343
1x4_347 1x4_348
1x4_354 1x4_354
1x5_118 1x5_118
1x4_359 1x4_359
1x6_120 1x5_120
#Free Peoples Draw Deck #Free Peoples Draw Deck
@@ -289,32 +289,30 @@
#Shadow Draw Deck #Shadow Draw Deck
#3x 4C181 Uruk Chaser #3x 4C153 Grima, Son of Galmod
3x4_181 3x4_153
#2x 4U188 Uruk Hunter #2x 3U57 Isengard Retainer
2x4_188 2x3_57
#2x 4C189 Uruk Plains Runner #2x 3U58 Isengard Servant
2x4_189 2x3_58
#2x 4C190 Uruk Pursuer #2x 3U60 Isengard Smith
2x4_190 2x3_60
#3x 4C193 Uruk Runner #2x 3C62 Isengard Worker
3x4_193 2x3_62
#3x 2C47 Uruk Scout #4x 6C72 Rohirrim Traitor
3x2_47 4x6_72
#2x 4U194 Uruk Searcher #3x 3C69 Saruman, Servant of the Eye
2x4_194 3x3_69
#2x 4C195 Uruk Seeker
2x4_195
#1x 1U231 Ulaire Enquea, Lieutenant of Morgul #1x 1U231 Ulaire Enquea, Lieutenant of Morgul
1x1_231 1x1_231
#2x 4C142 Broad-bladed Sword #3x 4C178 Unferth, Grima's Bodyguard
2x4_142 3x4_178
#2x 4C156 Kill Them Now #3x 4U161 Men Will Fall
2x4_156 3x4_161
#4x 4U159 Many Riddles #4x 6U61 Desertion
4x4_159 4x6_61
#2x 1C133 Saruman's Ambition #1x 6U75 Twisted Tales
2x1_133 1x6_75
#Shadow Total 30 #Shadow Total 30
@@ -640,23 +638,23 @@
#Adventure Deck #Adventure Deck
#1 4U324 Eastemnet Downs #1 4U324 Eastemnet Downs
#2 4U330 Derndingle #2 4U331 Eastfold
#3 4U338 Golden Hall #3 4U338 Golden Hall
#4 4U346 White Rocks #4 4U346 White Rocks
#5 4U348 Deeping Wall #5 4U347 Deep of Helm
#6 4U354 Hornburg Armory #6 4U354 Hornburg Armory
#7 4U356 Hornburg Causeway #7 4U356 Hornburg Causeway
#8 4U359 Wizard's Vale #8 4U359 Wizard's Vale
#9 5U120 Caverns of Isengard #9 6U120 Saruman's Laboratory
1x4_324 1x4_324
1x4_330 1x4_331
1x4_338 1x4_338
1x4_346 1x4_346
1x4_348 1x4_347
1x4_354 1x4_354
1x4_356 1x4_356
1x4_359 1x4_359
1x5_120 1x6_120
#Free Peoples Draw Deck #Free Peoples Draw Deck
@@ -705,28 +703,30 @@
#Shadow Draw Deck #Shadow Draw Deck
#3x 4C153 Grima, Son of Galmod #3x 4C181 Uruk Chaser
3x4_153 3x4_181
#2x 3U57 Isengard Retainer #2x 4U188 Uruk Hunter
2x3_57 2x4_188
#2x 3U58 Isengard Servant #2x 4C189 Uruk Plains Runner
2x3_58 2x4_189
#2x 3U60 Isengard Smith #2x 4C190 Uruk Pursuer
2x3_60 2x4_190
#2x 3C62 Isengard Worker #4x 4C193 Uruk Runner
2x3_62 4x4_193
#4x 6C72 Rohirrim Traitor #3x 2C47 Uruk Scout
4x6_72 3x2_47
#3x 3C69 Saruman, Servant of the Eye #2x 4U194 Uruk Searcher
3x3_69 2x4_194
#3x 4C178 Unferth, Grima's Bodyguard #2x 4C195 Uruk Seeker
3x4_178 2x4_195
#4x 4U161 Men Will Fall #2x 4C142 Broad-bladed Sword
4x4_161 2x4_142
#4x 6U61 Desertion #2x 4C156 Kill Them Now
4x6_61 2x4_156
#1x 6U75 Twisted Tales #4x 4U159 Many Riddles
1x6_75 4x4_159
#2x 1C133 Saruman's Ambition
2x1_133
#Shadow Total 30 #Shadow Total 30