Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(match2): remove temp workaround after cleanup #5201

Merged
merged 2 commits into from
Dec 13, 2024
Merged

chore(match2): remove temp workaround after cleanup #5201

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
91423f2
chore(match2): remove temp workaround after cleanup
hjpalpha Dec 12, 2024
4b6fc44
as per review
hjpalpha Dec 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 5 additions & 11 deletions components/match2/commons/starcraft_starcraft2/match_group_input_starcraft_ffa.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ function MapFunctions.readMap(mapInput, opponentCount, hasScores)
end

map.opponents = Array.map(Array.range(1, opponentCount), function(opponentIndex)
return MapFunctions.getOpponentInfo(mapInput, opponentIndex, hasScores)
return MapFunctions.getOpponentInfo(mapInput, opponentIndex)
end)

map.scores = Array.map(map.opponents, Operator.property('score'))
Expand Down Expand Up @@ -236,16 +236,10 @@ function MapFunctions.isFinished(mapInput, opponentCount, hasScores)
end)
end

---@param mapInput any
---@param opponentIndex any
---@param hasScores any
---@param mapInput table
---@param opponentIndex integer
---@return {placement: integer?, score: integer?, status: string}
function MapFunctions.getOpponentInfo(mapInput, opponentIndex, hasScores)
-- next 3 lines are temp workaround to adjust usage on the wiki after merge
if not hasScores and Logic.isEmpty(mapInput['placement' .. opponentIndex]) then
mapInput['score' .. opponentIndex] = 'L'
end

function MapFunctions.getOpponentInfo(mapInput, opponentIndex)
local score, status = MatchGroupInputUtil.computeOpponentScore{
walkover = mapInput.walkover,
winner = mapInput.winner,
Expand All @@ -255,7 +249,7 @@ function MapFunctions.getOpponentInfo(mapInput, opponentIndex, hasScores)

return {
placement = tonumber(mapInput['placement' .. opponentIndex]),
score = hasScores and score or nil,
score = score,
status = status,
}
end
Expand Down
Loading