Merge branch 'master' into feature/auto-league-rewards

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;
+
+
+
+
+
+
+
+
+
+
+
+
+

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}

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'
 }
 

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
+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

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
 		]
 	}
 ]