Skip to content

Commit

Permalink
chore(match2): remove temp workaround on sc(2) after cleanup (#5201)
Browse files Browse the repository at this point in the history
* chore(match2): remove temp workaround after cleanup

* as per review
  • Loading branch information
hjpalpha authored Dec 13, 2024
1 parent 561b4f3 commit d5988ea
Showing 1 changed file with 5 additions and 11 deletions.
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

0 comments on commit d5988ea

Please sign in to comment.