feat(match2): standardize map opponent enrichment

Liquipedia · Dec 10, 2024 · 9da2afc · 9da2afc
1 parent 61efb80
commit 9da2afc
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 165 deletions.
diff --git a/components/match2/commons/match_summary_ffa.lua b/components/match2/commons/match_summary_ffa.lua
@@ -570,7 +570,26 @@ function MatchSummaryFfa.updateMatchOpponents(match)
 	Array.forEach(match.opponents, function(opponent, idx)
 		opponent.placementStatus = match.extradata.status[idx]
 	end)
+end
+
+---@param game table
+---@param matchOpponents table[]
+function MatchSummaryFfa.updateGameOpponents(game, matchOpponents)
+	-- Add match opponent data to game opponent
+	game.opponents = Array.map(game.opponents,
+		function(gameOpponent, opponentIdx)
+			local matchOpponent = matchOpponents[opponentIdx]
+			local newGameOpponent = Table.merge(matchOpponent, gameOpponent)
+			-- These values are only allowed to come from Game and not Match
+			newGameOpponent.placement = gameOpponent.placement
+			newGameOpponent.score = gameOpponent.score
+			newGameOpponent.status = gameOpponent.status
+			return newGameOpponent
+		end
+	)
 
+	-- Sort game level based on placement
+	Array.sortInPlaceBy(game.opponents, FnUtil.identity, MatchSummaryFfa.placementSortFunction)
 end
 
 return MatchSummaryFfa
diff --git a/components/match2/wikis/apexlegends/game_summary.lua b/components/match2/wikis/apexlegends/game_summary.lua
@@ -35,7 +35,7 @@ function CustomGameSummary.getGameByMatchId(props)
 
 	game.stream = match.stream
 
-	CustomGameSummary._opponents(game, match.opponents)
+	SummaryHelper.updateGameOpponents(game, match.opponents)
 	local scoringData = SummaryHelper.createScoringData(match)
 
 	return MatchSummaryWidgets.Tab{
@@ -66,24 +66,4 @@ function CustomGameSummary._createGameDetails(game)
 	}
 end
 
----@param game table
----@param matchOpponents table[]
-function CustomGameSummary._opponents(game, matchOpponents)
-	-- Add match opponent data to game opponent
-	game.opponents = Array.map(game.opponents,
-		function(gameOpponent, opponentIdx)
-			local matchOpponent = matchOpponents[opponentIdx]
-			local newGameOpponent = Table.merge(matchOpponent, gameOpponent)
-			-- These values are only allowed to come from Game and not Match
-			newGameOpponent.placement = gameOpponent.placement
-			newGameOpponent.score = gameOpponent.score
-			newGameOpponent.status = gameOpponent.status
-			return newGameOpponent
-		end
-	)
-
-	-- Sort game level based on placement
-	Array.sortInPlaceBy(game.opponents, FnUtil.identity, SummaryHelper.placementSortFunction)
-end
-
 return CustomGameSummary
diff --git a/components/match2/wikis/fortnite/game_summary.lua b/components/match2/wikis/fortnite/game_summary.lua
@@ -8,11 +8,8 @@
 
 local CustomGameSummary = {}
 
-local Array = require('Module:Array')
-local FnUtil = require('Module:FnUtil')
 local Lua = require('Module:Lua')
 local Page = require('Module:Page')
-local Table = require('Module:Table')
 
 local MatchGroupUtil = Lua.import('Module:MatchGroup/Util')
 
@@ -35,7 +32,7 @@ function CustomGameSummary.getGameByMatchId(props)
 
 	game.stream = match.stream
 
-	CustomGameSummary._opponents(game, match.opponents)
+	SummaryHelper.updateGameOpponents(game, match.opponents)
 	local scoringData = SummaryHelper.createScoringData(match)
 
 	return MatchSummaryWidgets.Tab{
@@ -66,24 +63,4 @@ function CustomGameSummary._createGameDetails(game)
 	}
 end
 
----@param game table
----@param matchOpponents table[]
-function CustomGameSummary._opponents(game, matchOpponents)
-	-- Add match opponent data to game opponent
-	game.opponents = Array.map(game.opponents,
-		function(gameOpponent, opponentIdx)
-			local matchOpponent = matchOpponents[opponentIdx]
-			local newGameOpponent = Table.merge(matchOpponent, gameOpponent)
-			-- These values are only allowed to come from Game and not Match
-			newGameOpponent.placement = gameOpponent.placement
-			newGameOpponent.score = gameOpponent.score
-			newGameOpponent.status = gameOpponent.status
-			return newGameOpponent
-		end
-	)
-
-	-- Sort game level based on placement
-	Array.sortInPlaceBy(game.opponents, FnUtil.identity, SummaryHelper.placementSortFunction)
-end
-
 return CustomGameSummary
diff --git a/components/match2/wikis/freefire/game_summary.lua b/components/match2/wikis/freefire/game_summary.lua
@@ -8,11 +8,8 @@
 
 local CustomGameSummary = {}
 
-local Array = require('Module:Array')
-local FnUtil = require('Module:FnUtil')
 local Lua = require('Module:Lua')
 local Page = require('Module:Page')
-local Table = require('Module:Table')
 
 local MatchGroupUtil = Lua.import('Module:MatchGroup/Util')
 
@@ -35,7 +32,7 @@ function CustomGameSummary.getGameByMatchId(props)
 
 	game.stream = match.stream
 
-	CustomGameSummary._opponents(game, match.opponents)
+	SummaryHelper.updateGameOpponents(game, match.opponents)
 	local scoringData = SummaryHelper.createScoringData(match)
 
 	return MatchSummaryWidgets.Tab{
@@ -66,24 +63,4 @@ function CustomGameSummary._createGameDetails(game)
 	}
 end
 
----@param game table
----@param matchOpponents table[]
-function CustomGameSummary._opponents(game, matchOpponents)
-	-- Add match opponent data to game opponent
-	game.opponents = Array.map(game.opponents,
-		function(gameOpponent, opponentIdx)
-			local matchOpponent = matchOpponents[opponentIdx]
-			local newGameOpponent = Table.merge(matchOpponent, gameOpponent)
-			-- These values are only allowed to come from Game and not Match
-			newGameOpponent.placement = gameOpponent.placement
-			newGameOpponent.score = gameOpponent.score
-			newGameOpponent.status = gameOpponent.status
-			return newGameOpponent
-		end
-	)
-
-	-- Sort game level based on placement
-	Array.sortInPlaceBy(game.opponents, FnUtil.identity, SummaryHelper.placementSortFunction)
-end
-
 return CustomGameSummary
diff --git a/components/match2/wikis/naraka/game_summary.lua b/components/match2/wikis/naraka/game_summary.lua
@@ -8,11 +8,8 @@
 
 local CustomGameSummary = {}
 
-local Array = require('Module:Array')
-local FnUtil = require('Module:FnUtil')
 local Lua = require('Module:Lua')
 local Page = require('Module:Page')
-local Table = require('Module:Table')
 
 local MatchGroupUtil = Lua.import('Module:MatchGroup/Util')
 
@@ -35,7 +32,7 @@ function CustomGameSummary.getGameByMatchId(props)
 
 	game.stream = match.stream
 
-	CustomGameSummary._opponents(game, match.opponents)
+	SummaryHelper.updateGameOpponents(game, match.opponents)
 	local scoringData = SummaryHelper.createScoringData(match)
 
 	return MatchSummaryWidgets.Tab{
@@ -66,24 +63,4 @@ function CustomGameSummary._createGameDetails(game)
 	}
 end
 
----@param game table
----@param matchOpponents table[]
-function CustomGameSummary._opponents(game, matchOpponents)
-	-- Add match opponent data to game opponent
-	game.opponents = Array.map(game.opponents,
-		function(gameOpponent, opponentIdx)
-			local matchOpponent = matchOpponents[opponentIdx]
-			local newGameOpponent = Table.merge(matchOpponent, gameOpponent)
-			-- These values are only allowed to come from Game and not Match
-			newGameOpponent.placement = gameOpponent.placement
-			newGameOpponent.score = gameOpponent.score
-			newGameOpponent.status = gameOpponent.status
-			return newGameOpponent
-		end
-	)
-
-	-- Sort game level based on placement
-	Array.sortInPlaceBy(game.opponents, FnUtil.identity, SummaryHelper.placementSortFunction)
-end
-
 return CustomGameSummary
diff --git a/components/match2/wikis/pubg/game_summary.lua b/components/match2/wikis/pubg/game_summary.lua
@@ -8,11 +8,8 @@
 
 local CustomGameSummary = {}
 
-local Array = require('Module:Array')
-local FnUtil = require('Module:FnUtil')
 local Lua = require('Module:Lua')
 local Page = require('Module:Page')
-local Table = require('Module:Table')
 
 local MatchGroupUtil = Lua.import('Module:MatchGroup/Util')
 
@@ -35,7 +32,7 @@ function CustomGameSummary.getGameByMatchId(props)
 
 	game.stream = match.stream
 
-	CustomGameSummary._opponents(game, match.opponents)
+	SummaryHelper.updateGameOpponents(game, match.opponents)
 	local scoringData = SummaryHelper.createScoringData(match)
 
 	return MatchSummaryWidgets.Tab{
@@ -66,24 +63,4 @@ function CustomGameSummary._createGameDetails(game)
 	}
 end
 
----@param game table
----@param matchOpponents table[]
-function CustomGameSummary._opponents(game, matchOpponents)
-	-- Add match opponent data to game opponent
-	game.opponents = Array.map(game.opponents,
-		function(gameOpponent, opponentIdx)
-			local matchOpponent = matchOpponents[opponentIdx]
-			local newGameOpponent = Table.merge(matchOpponent, gameOpponent)
-			-- These values are only allowed to come from Game and not Match
-			newGameOpponent.placement = gameOpponent.placement
-			newGameOpponent.score = gameOpponent.score
-			newGameOpponent.status = gameOpponent.status
-			return newGameOpponent
-		end
-	)
-
-	-- Sort game level based on placement
-	Array.sortInPlaceBy(game.opponents, FnUtil.identity, SummaryHelper.placementSortFunction)
-end
-
 return CustomGameSummary
diff --git a/components/match2/wikis/pubgmobile/game_summary.lua b/components/match2/wikis/pubgmobile/game_summary.lua
@@ -8,11 +8,8 @@
 
 local CustomGameSummary = {}
 
-local Array = require('Module:Array')
-local FnUtil = require('Module:FnUtil')
 local Lua = require('Module:Lua')
 local Page = require('Module:Page')
-local Table = require('Module:Table')
 
 local MatchGroupUtil = Lua.import('Module:MatchGroup/Util')
 
@@ -35,7 +32,7 @@ function CustomGameSummary.getGameByMatchId(props)
 
 	game.stream = match.stream
 
-	CustomGameSummary._opponents(game, match.opponents)
+	SummaryHelper.updateGameOpponents(game, match.opponents)
 	local scoringData = SummaryHelper.createScoringData(match)
 
 	return MatchSummaryWidgets.Tab{
@@ -66,24 +63,4 @@ function CustomGameSummary._createGameDetails(game)
 	}
 end
 
----@param game table
----@param matchOpponents table[]
-function CustomGameSummary._opponents(game, matchOpponents)
-	-- Add match opponent data to game opponent
-	game.opponents = Array.map(game.opponents,
-		function(gameOpponent, opponentIdx)
-			local matchOpponent = matchOpponents[opponentIdx]
-			local newGameOpponent = Table.merge(matchOpponent, gameOpponent)
-			-- These values are only allowed to come from Game and not Match
-			newGameOpponent.placement = gameOpponent.placement
-			newGameOpponent.score = gameOpponent.score
-			newGameOpponent.status = gameOpponent.status
-			return newGameOpponent
-		end
-	)
-
-	-- Sort game level based on placement
-	Array.sortInPlaceBy(game.opponents, FnUtil.identity, SummaryHelper.placementSortFunction)
-end
-
 return CustomGameSummary
diff --git a/components/match2/wikis/underlords/game_summary.lua b/components/match2/wikis/underlords/game_summary.lua
@@ -8,11 +8,8 @@
 
 local CustomGameSummary = {}
 
-local Array = require('Module:Array')
-local FnUtil = require('Module:FnUtil')
 local Lua = require('Module:Lua')
 local Page = require('Module:Page')
-local Table = require('Module:Table')
 
 local MatchGroupUtil = Lua.import('Module:MatchGroup/Util')
 
@@ -35,7 +32,7 @@ function CustomGameSummary.getGameByMatchId(props)
 
 	game.stream = match.stream
 
-	CustomGameSummary._opponents(game, match.opponents)
+	SummaryHelper.updateGameOpponents(game, match.opponents)
 	local scoringData = SummaryHelper.createScoringData(match)
 
 	return MatchSummaryWidgets.Tab{
@@ -66,24 +63,4 @@ function CustomGameSummary._createGameDetails(game)
 	}
 end
 
----@param game table
----@param matchOpponents table[]
-function CustomGameSummary._opponents(game, matchOpponents)
-	-- Add match opponent data to game opponent
-	game.opponents = Array.map(game.opponents,
-		function(gameOpponent, opponentIdx)
-			local matchOpponent = matchOpponents[opponentIdx]
-			local newGameOpponent = Table.merge(matchOpponent, gameOpponent)
-			-- These values are only allowed to come from Game and not Match
-			newGameOpponent.placement = gameOpponent.placement
-			newGameOpponent.score = gameOpponent.score
-			newGameOpponent.status = gameOpponent.status
-			return newGameOpponent
-		end
-	)
-
-	-- Sort game level based on placement
-	Array.sortInPlaceBy(game.opponents, FnUtil.identity, SummaryHelper.placementSortFunction)
-end
-
 return CustomGameSummary