Skip to content

fix(match2): bo1 reset match display #7947

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

Open
hjpalpha wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(match2): bo1 reset match display #7947

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 18 additions & 1 deletion lua/wikis/commons/MatchGroup/Util.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,7 @@ MatchGroupUtil.types.Player = TypeUtil.struct({
---@field players standardPlayer[]?
---@field score number?
---@field scoreDisplay number?
---@field scoreDisplay2 number?
---@field score2 number?
---@field status string?
---@field status2 string?
Expand Down Expand Up @@ -920,12 +921,28 @@ function MatchGroupUtil.mergeBracketResetMatch(match, bracketResetMatch)
games = Table.copy(match.games),
})

local bestof = tonumber(bracketResetMatch.bestof)
local game1 = (bracketResetMatch.games or {})[1]
local hasOnlyScores = Array.all(bracketResetMatch.opponents, function(opponent)
return opponent.status == 'S'
end)

for ix, opponent in ipairs(match.opponents) do
local resetOpponent = bracketResetMatch.opponents[ix]

local status = resetOpponent.status
local scoreDisplay
if bestof == 1 and Info.config.match2.gameScoresIfBo1 and game1 and hasOnlyScores then
local mapOpponent = (game1.opponents or {})[ix] or {}
scoreDisplay = tonumber(mapOpponent.score)
status = mapOpponent.status
end

mergedMatch.opponents[ix] = Table.merge(opponent, {
score2 = resetOpponent.score,
status2 = resetOpponent.status,
status2 = status,
placement2 = resetOpponent.placement,
scoreDisplay2 = scoreDisplay,
})
end

Expand Down
Loading