From a260edd435d22cc1a5f852a971e82bd556675bae Mon Sep 17 00:00:00 2001 From: Christian 'ketura' McCarty Date: Thu, 20 Jun 2024 00:03:11 -0500 Subject: [PATCH 1/3] Explicitly setting default docker volume bindings to "consistent", which may be necessary with new versions of Docker Desktop --- gemp-lotr/docker/docker-compose.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/gemp-lotr/docker/docker-compose.yml b/gemp-lotr/docker/docker-compose.yml index dc11742e7..a283d9cfc 100644 --- a/gemp-lotr/docker/docker-compose.yml +++ b/gemp-lotr/docker/docker-compose.yml @@ -1,5 +1,3 @@ -version: "3.4" - services: build: @@ -26,18 +24,23 @@ services: - type: bind source: ../gemp-lotr-async/src/main/web target: /etc/gemp-lotr/web + consistency: consistent - type: bind source: ../../gemp-lotr target: /etc/gemp-lotr + consistency: consistent - type: bind source: ../../logs target: /logs + consistency: consistent - type: bind source: ../../replay target: /etc/gemp-lotr/replay + consistency: consistent - type: bind source: ../../logs/nohup.out target: /etc/gemp-lotr/nohup.out + consistency: consistent networks: gemp_net_1: ipv4_address: ${APP_IP} From 7855aa1cc8c49fbe23db49631b02741a3dd69181 Mon Sep 17 00:00:00 2001 From: Christian 'ketura' McCarty Date: Thu, 20 Jun 2024 00:17:01 -0500 Subject: [PATCH 2/3] Adding May + June weekend league prizes --- .../src/main/web/js/gemp-022/PC_Cards.js | 14 +++++++++++++- .../src/main/resources/blueprintMapping.txt | 10 +++++++++- .../src/main/resources/product/Misc-Packs.hjson | 11 ++++++++++- 3 files changed, 32 insertions(+), 3 deletions(-) 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 f51ed5858..32dbc3ade 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 @@ -627,6 +627,18 @@ var PCCards = { //Troop of Uruk-hai FA '1_389': 'https://i.lotrtcgpc.net/promos/LOTR-EN01U143.0_card.jpg', //Gandalf's Staff MW - '2_127': 'https://i.lotrtcgpc.net/promos/LOTR-EN02O022.0_card.jpg' + '2_127': 'https://i.lotrtcgpc.net/promos/LOTR-EN02O022.0_card.jpg', + + //May 2024 Weekend League + //Freca, Hungry Savage FA + '9_60': 'https://i.lotrtcgpc.net/promos/LOTR-EN09U002.0_card.jpg', + //Sting, Bane of the Eight Legs MW + '8_126': 'https://i.lotrtcgpc.net/promos/LOTR-EN08O113.0_card.jpg', + + //June 2024 Weekend League + //Dwarven Bracers FA + '2_128': 'https://i.lotrtcgpc.net/promos/LOTR-EN02U003.0_card.jpg', + //Ulaire Cantea, Lieutenant of Dol Guldur MW + '1_390': 'https://i.lotrtcgpc.net/promos/LOTR-EN01O230.0_card.jpg' } 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 689d49598..d56bd0fb7 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/blueprintMapping.txt +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/blueprintMapping.txt @@ -379,4 +379,12 @@ gl_theOneRing,1_2 #Troop of Uruk-hai FA 1_389,1_143 #Gandalf's Staff MW -2_127,2_22 \ No newline at end of file +2_127,2_22 +#Freca, Hungry Savage FA +9_60,9_2 +#Sting, Bane of the Eight Legs MW +8_126,8_113 +#Dwarven Bracers FA +2_128,2_3 +#Ulaire Cantea, Lieutenant of Dol Guldur MW +1_390,1_230 \ No newline at end of file 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 1bcc012ff..b25b82f0b 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 @@ -380,6 +380,10 @@ 1x1_389 #Gandalf's Staff MW 1x2_127 + #Freca, Hungry Savage FA + 1x9_60 + #Sting, Bane of the Eight Legs MW + 1x8_126 ] } @@ -467,7 +471,8 @@ 1x10_128 #Troop of Uruk-hai FA 1x1_389 - + #Freca, Hungry Savage FA + 1x9_60 ] } @@ -593,6 +598,8 @@ 1x9_58 #Gandalf's Staff MW 1x2_127 + #Sting, Bane of the Eight Legs MW + 1x8_126 ] } @@ -718,6 +725,8 @@ 1x9_58 #Gandalf's Staff MW 1x2_127 + #Sting, Bane of the Eight Legs MW + 1x8_126 ] } ] \ No newline at end of file From cc37b093a8907c41d18e2dd92310ca28a62a653f Mon Sep 17 00:00:00 2001 From: Christian 'ketura' McCarty Date: Thu, 20 Jun 2024 00:17:18 -0500 Subject: [PATCH 3/3] adding helper db script for extracting a range of replays for a given player --- gemp-lotr/db/extract-gameplay-replays.sql | 47 +++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 gemp-lotr/db/extract-gameplay-replays.sql diff --git a/gemp-lotr/db/extract-gameplay-replays.sql b/gemp-lotr/db/extract-gameplay-replays.sql new file mode 100644 index 000000000..27c1398f7 --- /dev/null +++ b/gemp-lotr/db/extract-gameplay-replays.sql @@ -0,0 +1,47 @@ + + +-- SELECT * +-- FROM game_history gh +-- WHERE tournament LIKE '%Yuletide%' +-- AND (winner = 'm_scarpato' OR loser = 'm_scarpato') +-- + +# Get IDs from the appropriate yuletide leagues: + +SELECT * +FROM league l +WHERE name LIKE '%Yuletide%' +ORDER BY id DESC; + + +# Stick those IDs in both of these clauses: + +SELECT player, count(*) AS matches +FROM ( + SELECT winner AS player, + CONCAT('[url=https://play.lotrtcgpc.net/gemp-lotr/game.html?replayId=', CONCAT(REPLACE(winner, '_', '%5F'), '$', win_recording_id), ']') AS ReplayURL + FROM league_match w + WHERE w.league_type IN ('1702871717631', '1702871696832', '1702871668557') + + UNION ALL + + SELECT loser AS player, + CONCAT('[url=https://play.lotrtcgpc.net/gemp-lotr/game.html?replayId=', CONCAT(REPLACE(loser, '_', '%5F'), '$', lose_recording_id), ']') AS ReplayURL + FROM league_match l + WHERE l.league_type IN ('1702871717631', '1702871696832', '1702871668557') +) players +GROUP BY players.player +ORDER BY COUNT(*) DESC; + + + + + + + + + + + + +