Skip to content

feat(StageWinningsCalculation): support default result matches #8049

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 2 commits into
base: main
Choose a base branch
from
+24 −8
Open

feat(StageWinningsCalculation): support default result matches #8049

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1236d34
feat(StageWinningsCalculation): support default result matches
hjpalpha Sep 5, 2026
2478627
Merge branch 'main' into resolve-8045
mbergen Sep 8, 2026
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
30 changes: 22 additions & 8 deletions lua/wikis/commons/StageWinningsCalculation.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,9 @@
local Lua = require('Module:Lua')

local Array = Lua.import('Module:Array')
local Logic = Lua.import('Module:Logic')
local MatchGroupInputUtil = Lua.import('Module:MatchGroup/Input/Util')
local Opponent = Lua.import('Module:Opponent/Custom')
local OpponentDisplay = Lua.import('Module:OpponentDisplay/Custom')
local TournamentStructure = Lua.import('Module:TournamentStructure')

local Condition = Lua.import('Module:Condition')
Expand Down Expand Up @@ -37,7 +38,8 @@ local StageWinningsCalculation = {}
---@param props {matchGroupsSpecProps: table<string, string>, startDate: integer?, endDate: integer?, mode: string,
---startValue: number, valuePerWin: number, valueByScore: table<string, number>?,
---pointsStart: number, pointsPerWin: number, pointsByScore: table<string, number>?,
---points2Start: number, points2PerWin: number, points2ByScore: table<string, number>?, hideWinnings: boolean}
---points2Start: number, points2PerWin: number, points2ByScore: table<string, number>?,
---gameCountDefaultResult: number, hideWinnings: boolean}
---@return StageWinningsOpponent[]
function StageWinningsCalculation.run(props)
local matches = mw.ext.LiquipediaDB.lpdb('match2', {
Expand Down Expand Up @@ -87,8 +89,8 @@ function StageWinningsCalculation.run(props)
local opponent1 = match.opponents[1]
local opponent2 = match.opponents[2]

local opponent1Score = OpponentDisplay.InlineScore(opponent1)
local opponent2Score = OpponentDisplay.InlineScore(opponent2)
local opponent1Score = Opponent.getScoreValue(opponent1)
local opponent2Score = Opponent.getScoreValue(opponent2)

local score = opponent1Score .. '-' .. opponent2Score
local reversedScore = opponent2Score .. '-' .. opponent1Score
Expand All @@ -108,14 +110,26 @@ function StageWinningsCalculation.run(props)
opponents[opponent2.globalIndex].matchDraws = opponents[opponent2.globalIndex].matchDraws + 1
end

local numberOfGamesForScoreValue = function(scoreValue)
if Logic.isNumeric(scoreValue) then
return tonumber(scoreValue)
elseif Logic.isEmpty(scoreValue) or scoreValue ~= MatchGroupInputUtil.STATUS.DEFAULT_WIN then
return 0
end
return props.gameCountDefaultResult
Comment thread
mbergen marked this conversation as resolved.
end

local gamesWonOpponent1 = numberOfGamesForScoreValue(opponent1Score)
local gamesWonOpponent2 = numberOfGamesForScoreValue(opponent2Score)

opponents[opponent1.globalIndex].gameWins
= opponents[opponent1.globalIndex].gameWins + (tonumber(opponent1.score) or 0)
= opponents[opponent1.globalIndex].gameWins + gamesWonOpponent1
opponents[opponent2.globalIndex].gameLosses
= opponents[opponent2.globalIndex].gameLosses + (tonumber(opponent1.score) or 0)
= opponents[opponent2.globalIndex].gameLosses + gamesWonOpponent1
opponents[opponent1.globalIndex].gameLosses
= opponents[opponent1.globalIndex].gameLosses + (tonumber(opponent2.score) or 0)
= opponents[opponent1.globalIndex].gameLosses + gamesWonOpponent2
opponents[opponent2.globalIndex].gameWins
= opponents[opponent2.globalIndex].gameWins + (tonumber(opponent2.score) or 0)
= opponents[opponent2.globalIndex].gameWins + gamesWonOpponent2
end)

Array.forEach(opponents, function(opponent)
Expand Down
2 changes: 2 additions & 0 deletions lua/wikis/commons/Widget/StageWinnings.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ local NON_BREAKING_SPACE = '&nbsp;'
---@field pointsPerWin number?
---@field points2Start number?
---@field points2PerWin number?
---@field gameCountDefaultResult number?
---@field n-m number? # n amd m integers
---@field n-m_points number? # n amd m integers
---@field n-m_points2 number? # n amd m integers
Expand Down Expand Up @@ -121,6 +122,7 @@ function StageWinnings:render()
pointsPerWin = tonumber(props.pointsPerWin) or 0,
points2PerWin = tonumber(props.points2PerWin) or 0,
hideWinnings = Logic.readBool(props.hideWinnings),
gameCountDefaultResult = tonumber(props.gameCountDefaultResult) or 0,
}

if Logic.isNotEmpty(props.localcurrency) and Logic.readBool(props.autoexchange) then
Expand Down
Loading