diff --git a/gemp-lotr/db/extract-gameplay-replays.sql b/gemp-lotr/db/extract-gameplay-replays.sql
index 27c1398f7..4f728fa9f 100644
--- a/gemp-lotr/db/extract-gameplay-replays.sql
+++ b/gemp-lotr/db/extract-gameplay-replays.sql
@@ -35,6 +35,34 @@ ORDER BY COUNT(*) DESC;
+SET @player = 'Chadwick537';
+
+SELECT
+ @player AS player
+ ,CASE WHEN winner = @player THEN loser ELSE winner END AS opponent
+ ,winner
+ ,win_reason
+ ,start_date
+ ,end_date
+ ,format_name
+ ,tournament
+ ,CASE WHEN winner = @player THEN winner_deck_name ELSE loser_deck_name END AS deck_name
+ ,CONCAT('https://play.lotrtcgpc.net/share/deck?id=',
+ CASE
+ WHEN winner = @player THEN TO_BASE64(CONCAT(winner, '|', winner_deck_name))
+ ELSE TO_BASE64(CONCAT(loser, '|', loser_deck_name))
+ END) AS DeckURL
+ ,CONCAT('https://play.lotrtcgpc.net/gemp-lotr/game.html?replayId=',
+ CASE
+ WHEN winner = @player THEN CONCAT(REPLACE(winner, '_', '%5F'), '$', win_recording_id)
+ ELSE CONCAT(REPLACE(loser, '_', '%5F'), '$', lose_recording_id)
+ END) AS ReplayURL
+
+FROM game_history gh
+WHERE (winner = @player OR loser = @player)
+ AND (start_date > '2024-09-15')
+
+
diff --git a/gemp-lotr/db/extract-tourney-replays.sql b/gemp-lotr/db/extract-tourney-replays.sql
index 699759a1b..a7b6a1229 100644
--- a/gemp-lotr/db/extract-tourney-replays.sql
+++ b/gemp-lotr/db/extract-tourney-replays.sql
@@ -33,7 +33,7 @@
-SET @player = 'Axter', @rank=0;
+SET @player = 'sempolPL', @rank=0;
SELECT
@player AS player
@@ -41,14 +41,14 @@ SELECT
CASE
WHEN winner = @player THEN CONCAT(REPLACE(winner, '_', '%5F'), '$', win_recording_id)
ELSE CONCAT(REPLACE(loser, '_', '%5F'), '$', lose_recording_id)
- END, ']', @rank:=@rank+1,'[/url] • ') AS URL
+ END, ']', @rank:=@rank+1,'[/url] • ') AS URL
FROM game_history gh
INNER JOIN player p
ON p.name = @player
INNER JOIN deck d
ON d.player_id = p.id
AND (d.name = winner_deck_name OR d.name = loser_deck_name OR d.name = 'denethor / tentacle V2')
-WHERE tournament = '2023 PC-Expanded Championship'
+WHERE tournament = '2024 Championship Tournament - PC-Fellowship Deck Registration'
AND start_date > '2023-07-20'
AND (winner = @player OR loser = @player)
ORDER BY gh.id;
@@ -60,7 +60,8 @@ SELECT winner, loser, win_reason, lose_reason, start_date, end_date
,CONCAT('https://play.lotrtcgpc.net/gemp-lotr/game.html?replayId=',REPLACE(winner, '_', '%5F'), '$', win_recording_id) AS winner_replay
,CONCAT('https://play.lotrtcgpc.net/gemp-lotr/game.html?replayId=',REPLACE(loser, '_', '%5F'), '$', lose_recording_id) AS loser_replay
FROM game_history gh
-WHERE tournament = '2023 WC Group Stage'
+WHERE tournament = '2024 Championship Tournament - PC-Movie Deck Registration'
+ORDER BY start_date ASC
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/PC_Cards.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/PC_Cards.js
index 8ec9d6b98..8f0661956 100644
--- a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/PC_Cards.js
+++ b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/PC_Cards.js
@@ -660,7 +660,15 @@ var PCCards = {
'53_80' : 'https://i.lotrtcgpc.net/errata/LOTR-EN03E080.2_card.jpg',
'53_85' : 'https://i.lotrtcgpc.net/errata/LOTR-EN03E085.2_card.jpg',
'53_103' : 'https://i.lotrtcgpc.net/errata/LOTR-EN03E103.3_card.jpg',
- '53_105' : 'https://i.lotrtcgpc.net/errata/LOTR-EN03E105.2_card.jpg'
+ '53_105' : 'https://i.lotrtcgpc.net/errata/LOTR-EN03E105.2_card.jpg',
+
+ //2024 World Championship promos
+ //Unbranded - Do not release until 2025 WC has concluded.
+ //'1_393': 'https://i.lotrtcgpc.net/promos/LOTR-EN01U196.0_card.jpg',
+ '1_394': 'https://i.lotrtcgpc.net/promos/LOTR-EN01U196.1_card.jpg',
+ '1_395': 'https://i.lotrtcgpc.net/promos/LOTR-EN01U196.2_card.jpg',
+ '1_396': 'https://i.lotrtcgpc.net/promos/LOTR-EN01U196.3_card.jpg',
+ '1_397': 'https://i.lotrtcgpc.net/promos/LOTR-EN01U196.4_card.jpg'
}
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/hallUi.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/hallUi.js
index a6a8668e3..f2dbc5969 100644
--- a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/hallUi.js
+++ b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/hallUi.js
@@ -732,9 +732,9 @@ var GempLotrHallUI = Class.extend({
name += "";
- //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")) {
- name = "| 2024 Last-chance Walk-on Qualifiers" + userDesc + " | "
+ name = "2024 World Championship" + userDesc + " | "
}
row.append(name);
row.append("" + statusDescription + " | ");
diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/blueprintMapping.txt b/gemp-lotr/gemp-lotr-cards/src/main/resources/blueprintMapping.txt
index e6a80e348..f89e2d5e4 100644
--- a/gemp-lotr/gemp-lotr-cards/src/main/resources/blueprintMapping.txt
+++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/blueprintMapping.txt
@@ -395,4 +395,14 @@ gl_theOneRing,1_2
#Legolas, Greenleaf FA
1_391,1_50
#2023 WC - Non-branded Goblin Runner FA for general consumption
-1_392,1_178
\ No newline at end of file
+1_392,1_178
+#Unbranded - They Are Coming FA - Do not release until 2025 WC has concluded
+1_393,1_196
+#2024 World Championship - They Are Coming FA
+1_394,1_196
+#2024 WC Top 8 - They Are Coming FA
+1_395,1_196
+#2024 WC World Challenger - They Are Coming FA
+1_396,1_196
+#2024 WC World Champion - They Are Coming FA
+1_397,1_196
\ No newline at end of file
diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/hobbit/set33/set33-fp.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/hobbit/set33/set33-fp.hjson
index 0811446ed..a90479581 100644
--- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/hobbit/set33/set33-fp.hjson
+++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/hobbit/set33/set33-fp.hjson
@@ -604,10 +604,6 @@
Take from your discard pile
]
effects: [
- {
- type: putCardsFromDiscardIntoHand
- select: choose(or(culture(elven),culture(mirkwood)))
- }
{
type: putCardsFromDeckIntoHand
select: choose(or(culture(elven),culture(mirkwood)))
@@ -615,6 +611,10 @@
shuffle: true
showAll: true
}
+ {
+ type: putCardsFromDiscardIntoHand
+ filter: choose(or(culture(elven),culture(mirkwood)))
+ }
]
}
}
diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/product/Misc-Packs.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/product/Misc-Packs.hjson
index 250cbba90..b6ee61937 100644
--- a/gemp-lotr/gemp-lotr-cards/src/main/resources/product/Misc-Packs.hjson
+++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/product/Misc-Packs.hjson
@@ -403,9 +403,9 @@
1x5_129
#To be released after the 2024 WC concludes
#Legolas, Greenleaf FA
- #1x1_391
+ 1x1_391
#Goblin Runner FA
- #1x1_392
+ 1x1_392
]
}
@@ -503,9 +503,9 @@
1x5_129
#To be released after the 2024 WC concludes
#Legolas, Greenleaf FA
- #1x1_391
+ 1x1_391
#Goblin Runner FA
- #1x1_392
+ 1x1_392
]
}