feat(PrizePool): Placement Badges for W/L/DQ

lua/spec/placement_spec.lua

@@ -18,7 +18,7 @@ describe('placement', function()
 		it('check', function()
 			assert.is_nil(Placement.getBgClass{placement = 'DummyDummy'})
 			assert.are_equal('background-color-first-place', Placement.getBgClass{placement = 1})
-			assert.are_equal('bg-dq', Placement.getBgClass{placement = 'dq'})
+			assert.are_equal('background-color-dq-place', Placement.getBgClass{placement = 'dq'})
 		end)
 	end)
 

lua/spec/prize_pool_spec.lua

@@ -67,6 +67,19 @@ describe('prize pool', function()
 		[2] = {usdprize = '130,000', playershare = '100,000', [1] = {'t1'}},
 	}
 
+	local specialPrizePoolArgs = {
+		type = {type = 'solo'},
+		import = false,
+		lpdb_storage = false,
+		cutafter = 7,
+		[1] = {dq = true},
+		[2] = {dnp = true},
+		[3] = {dnf = true},
+		[4] = {w = true},
+		[5] = {d = true},
+		[6] = {l = true},
+	}
+
 	it('parameters are correctly parsed', function()
 		local ppt = PrizePool(prizePoolArgs):create()
 
@@ -199,6 +212,7 @@ describe('prize pool', function()
 			GoldenTest('prize_pool', tostring(PrizePool(prizePoolArgs):create():build()))
 			local clubShareNoStore = Table.merge(clubSharePoolArgs, {storelpdb = false})
 			GoldenTest('prize_pool_club_share', tostring(PrizePool(clubShareNoStore):create():build()))
+			GoldenTest('prize_pool_special_placements', tostring(PrizePool(specialPrizePoolArgs):create():build()))
 		end)
 
 		it('lpdb storage', function()

lua/wikis/commons/Placement.lua

@@ -52,7 +52,7 @@ local PLACEMENT_CLASSES = {
 	['q'] = 'placement-win',
 	['w'] = 'placement-win',
 	['l'] = 'placement-lose',
-	['dq'] = 'placement-lose',
+	['dq'] = 'placement-disqualified',
 	['dnf'] = 'placement-dnp',
 	['dns'] = 'placement-dnp',
 	['dnpq'] = 'placement-dnp',
@@ -88,16 +88,16 @@ local prizepoolClasses = {
 	'background-color-first-place',
 	'background-color-second-place',
 	'background-color-third-place',
-	w = 'bg-win',
-	q = 'bg-win',
-	l = 'bg-lose',
-	dq = 'bg-dq',
-	dnq = 'bg-dq',
-	dns = 'bg-dq',
-	dnf = 'bg-dq',
-	dnp = 'bg-dq',
-	dnpq = 'bg-dq',
-	nc = 'bg-dq',
+	w = 'background-color-win-place',
+	q = 'background-color-win-place',
+	l = 'background-color-lose-place',
+	dq = 'background-color-dq-place',
+	dnq = 'background-color-dq-place',
+	dns = 'background-color-dq-place',
+	dnf = 'background-color-dq-place',
+	dnp = 'background-color-dq-place',
+	dnpq = 'background-color-dq-place',
+	nc = 'background-color-dq-place',
 }
 
 local USE_BLACK_TEXT = {
@@ -203,7 +203,7 @@ end
 
 ---Takes string place value and returns prize pool color class.
 ---May return `nil` if no color is registered.
----@param args {placement: string|number}
+---@param args {placement: string|number?}
 ---@return string?
 function Placement.getBgClass(args)
 	return prizepoolClasses[args.placement]

lua/wikis/commons/PrizePool/Legacy.lua

@@ -22,7 +22,7 @@ local Opponent = Lua.import('Module:Opponent/Custom')
 
 local LegacyPrizePool = {}
 
-local SPECIAL_PLACES = {dq = 'dq', dnf = 'dnf', dnp = 'dnp', w = 'w', d = 'd', l = 'l', q = 'q'}
+local SPECIAL_PLACES = {dq = 'dq', dnf = 'dnf', dnp = 'dnp', w = 'w', d = 'd', l = 'l'}
 
 local CACHED_DATA = {
 	next = {points = 1, qual = 1, freetext = 1},

lua/wikis/commons/PrizePool/Legacy/Starcraft.lua

@@ -25,7 +25,7 @@ local Opponent = Lua.import('Module:Opponent/Custom')
 local StarcraftLegacyPrizePool = {}
 
 local AUTOMATION_START_DATE = '2022-01-14'
-local SPECIAL_PLACES = {dq = 'dq', dnf = 'dnf', dnp = 'dnp', w = 'w', d = 'd', l = 'l', q = 'q'}
+local SPECIAL_PLACES = {dq = 'dq', dnf = 'dnf', dnp = 'dnp', w = 'w', d = 'd', l = 'l'}
 local BASE_CURRENCY_PRIZE = LegacyPrizePool.BASE_CURRENCY:lower() .. 'prize'
 
 local CACHED_DATA = {
@@ -422,12 +422,12 @@ function StarcraftLegacyPrizePool._readOpponentArgs(props)
 		if not nameInput then
 			return nil, argsIndex
 		end
-		nameInput = mw.text.split(nameInput, '|')
+		local nameInputArray = Array.parseCommaSeparatedString(nameInput, '|')
 		return {
 			type = CACHED_DATA.defaultOpponentType,
 			isarchon = CACHED_DATA.defaultIsArchon,
-			[1] = nameInput[#nameInput],
-			link = slot[prefix .. 'link' .. opponentIndex] or slot[prefix .. opponentIndex .. 'link'] or nameInput[1],
+			[1] = nameInputArray[#nameInputArray],
+			link = slot[prefix .. 'link' .. opponentIndex] or slot[prefix .. opponentIndex .. 'link'] or nameInputArray[1],
 			flag = slot[prefix .. 'flag' .. opponentIndex] or slot[prefix .. opponentIndex .. 'flag'],
 			team = slot[prefix .. 'team' .. opponentIndex] or slot[prefix .. opponentIndex .. 'team'],
 			race = slot[prefix .. 'race' .. opponentIndex] or slot[prefix .. opponentIndex .. 'race'],
@@ -452,11 +452,11 @@ function StarcraftLegacyPrizePool._readOpponentArgs(props)
 		if not nameInput then
 			return nil, newArgsIndex
 		end
-		nameInput = mw.text.split(nameInput, '|')
+		local nameInputArray = Array.parseCommaSeparatedString(nameInput, '|')
 
-		opponentData['p' .. playerIndex] = nameInput[#nameInput]
+		opponentData['p' .. playerIndex] = nameInputArray[#nameInputArray]
 		opponentData['p' .. playerIndex .. 'link'] = slot[prefix .. 'link' .. opponentIndex .. 'p' .. playerIndex]
-			or nameInput[1]
+			or nameInputArray[1]
 		opponentData['p' .. playerIndex .. 'flag'] = slot[prefix .. 'flag' .. opponentIndex .. 'p' .. playerIndex]
 		opponentData['p' .. playerIndex .. 'team'] = slot[prefix .. 'team' .. opponentIndex .. 'p' .. playerIndex]
 		opponentData['p' .. playerIndex .. 'race'] = slot[prefix .. 'race' .. opponentIndex .. 'p' .. playerIndex]

lua/wikis/commons/PrizePool/Placement.lua

@@ -7,11 +7,9 @@
 
 local Lua = require('Module:Lua')
 
-local Abbreviation = Lua.import('Module:Abbreviation')
 local Array = Lua.import('Module:Array')
 local Class = Lua.import('Module:Class')
 local Logic = Lua.import('Module:Logic')
-local Medals = Lua.import('Module:Medals')
 local PlacementInfo = Lua.import('Module:Placement')
 local String = Lua.import('Module:StringUtils')
 local Table = Lua.import('Module:Table')
@@ -49,7 +47,7 @@ Placement.specialStatuses = {
 			return Logic.readBool(args.dq)
 		end,
 		display = function ()
-			return Abbreviation.make{text = 'DQ', title = 'Disqualified'}
+			return 'DQ'
 		end,
 		lpdb = 'DQ',
 	},
@@ -58,7 +56,7 @@ Placement.specialStatuses = {
 			return Logic.readBool(args.dnf)
 		end,
 		display = function ()
-			return Abbreviation.make{text = 'DNF', title = 'Did not finish'}
+			return 'DNF'
 		end,
 		lpdb = 'DNF',
 	},
@@ -67,7 +65,7 @@ Placement.specialStatuses = {
 			return Logic.readBool(args.dnp)
 		end,
 		display = function ()
-			return Abbreviation.make{text = 'DNP', title = 'Did not participate'}
+			return 'DNP'
 		end,
 		lpdb = 'DNP',
 	},
@@ -98,15 +96,6 @@ Placement.specialStatuses = {
 		end,
 		lpdb = 'L',
 	},
-	Q = {
-		active = function (args)
-			return Logic.readBool(args.q)
-		end,
-		display = function ()
-			return Abbreviation.make{text = 'Q', title = 'Qualified Automatically'}
-		end,
-		lpdb = 'Q',
-	},
 }
 
 Placement.additionalData = {
@@ -327,40 +316,27 @@ end
 
 ---@return string?
 function Placement:getBackground()
-	for statusName, status in pairs(Placement.specialStatuses) do
-		if status.active(self.args) then
-			return PlacementInfo.getBgClass{placement = statusName:lower()}
-		end
-	end
-
-	return PlacementInfo.getBgClass{placement = self.placeStart}
+	return PlacementInfo.getBgClass{placement = self:getSpecialStatus() or self.placeStart}
 end
 
 ---Returns the placement-badge color class for top-3 placements, else nil.
 ---Colored by the top of the range (placeStart).
 ---@return string?
 function Placement:getBadgeClass()
-	if self:hasSpecialStatus() or self.placeStart > 3 then
+	local specialStatus = self:getSpecialStatus()
+	if (not specialStatus) and self.placeStart > 3 then
 		return nil
 	end
-	return PlacementInfo.raw(self.placeStart).backgroundClass
+	return PlacementInfo.raw(specialStatus or self.placeStart).backgroundClass
 end
 
 ---@return string?
-function Placement:getMedal()
-	if self:hasSpecialStatus() then
-		return
-	end
-
-	local medal = Medals.display{medal = self:_lpdbValue()}
-	if medal then
-		return tostring(medal)
+function Placement:getSpecialStatus()
+	for statusName, status in pairs(Placement.specialStatuses) do
+		if status.active(self.args) then
+			return statusName:lower()
+		end
 	end
 end
 
----@return boolean
-function Placement:hasSpecialStatus()
-	return Table.any(Placement.specialStatuses, function(_, status) return status.active(self.args) end)
-end
-
 return Placement

lua/wikis/fortnite/PrizePool/Legacy/Custom.lua

@@ -15,7 +15,7 @@ local LegacyPrizePool = Lua.import('Module:PrizePool/Legacy')
 
 local Opponent = Lua.import('Module:Opponent/Custom')
 
-local SPECIAL_PLACES = {dq = 'dq', dnf = 'dnf', dnp = 'dnp', w = 'w', d = 'd', l = 'l', q = 'q'}
+local SPECIAL_PLACES = {dq = 'dq', dnf = 'dnf', dnp = 'dnp', w = 'w', d = 'd', l = 'l'}
 
 local CustomLegacyPrizePool = {}
 

lua/wikis/freefire/PrizePool/Custom.lua

@@ -66,7 +66,7 @@ function CustomPrizePool.calculateWeight(prizeMoney, tier, place, tournamentType
 
 	local placementFactor = tonumber(place)
 	local prizeMoneyToCalculate = prizeMoney or 0
-	if place == 'w' or place == 'd' or place == 'q' then
+	if place == 'w' or place == 'd' then
 		prizeMoneyToCalculate = prizeMoneyToCalculate == 0 and 0.1 or 2
 		placementFactor = 1
 	end

lua/wikis/starcraft2/PrizePool/Custom.lua

@@ -118,7 +118,7 @@ function CustomPrizePool._weight(lpdbData, placement)
 	prize = prize ~= 0 and prize or DEFAULT_PRIZE_VALUE
 
 	local placementFactor = placement.placeStart or 0
-	if place == 'w' or place == 'd' or place == 'q' then
+	if place == 'w' or place == 'd' then
 		prize = 1
 		placementFactor = 1
 	end

lua/wikis/stormgate/PrizePool/Custom.lua

@@ -78,7 +78,7 @@ function CustomPrizePool._weight(lpdbData, placement)
 	prize = prize ~= 0 and prize or DEFAULT_PRIZE_VALUE
 
 	local placementFactor = placement.placeStart or 0
-	if place == 'w' or place == 'd' or place == 'q' then
+	if place == 'w' or place == 'd' then
 		prize = 1
 		placementFactor = 1
 	end

lua/wikis/warcraft/PrizePool/Legacy/Custom.lua

@@ -14,7 +14,7 @@ local LegacyPrizePool = Lua.import('Module:PrizePool/Legacy')
 
 local Opponent = Lua.import('Module:Opponent/Custom')
 
-local SPECIAL_PLACES = {dq = 'dq', dnf = 'dnf', dnp = 'dnp', w = 'w', d = 'd', l = 'l', q = 'q'}
+local SPECIAL_PLACES = {dq = 'dq', dnf = 'dnf', dnp = 'dnp', w = 'w', d = 'd', l = 'l'}
 
 local CustomLegacyPrizePool = {}
 
@@ -145,12 +145,12 @@ function CustomLegacyPrizePool._readOpponentArgs(props)
 		if not nameInput then
 			return nil
 		end
-		nameInput = mw.text.split(nameInput, '|')
+		local nameInputArray = Array.parseCommaSeparatedString(nameInput, '|')
 
 		return {
 			type = _cache.opponentType,
-			[1] = nameInput[#nameInput],
-			link = slot[prefix .. 'link' .. opponentIndex] or slot[prefix .. opponentIndex .. 'link'] or nameInput[1],
+			[1] = nameInputArray[#nameInputArray],
+			link = slot[prefix .. 'link' .. opponentIndex] or slot[prefix .. opponentIndex .. 'link'] or nameInputArray[1],
 			flag = slot[prefix .. 'flag' .. opponentIndex] or slot[prefix .. opponentIndex .. 'flag'],
 			team = slot[prefix .. 'team' .. opponentIndex] or slot[prefix .. opponentIndex .. 'team'],
 			race = slot[prefix .. 'race' .. opponentIndex] or slot[prefix .. opponentIndex .. 'race'],

stylesheets/commons/Prizepooltable.scss

@@ -19,16 +19,28 @@ so they must stay defined even though the redesigned table no longer uses them.
 	--prizepool-place-2-accent: var( --clr-semantic-silver-40 );
 	--prizepool-place-3-accent: var( --clr-semantic-bronze-40 );
 
+	--prizepool-place-w-accent: var( --position-up-color );
+	--prizepool-place-l-accent: var( --position-down-color );
+	--prizepool-place-dq-accent: var( --position-disqualified-color );
+
 	// Faint full-row tint per place (light theme; dark overrides in `.theme--dark`).
 	--prizepool-place-1-tint: #f7f2d9;
 	--prizepool-place-2-tint: #e6eaeb;
 	--prizepool-place-3-tint: #eceae4;
 
+	--prizepool-place-w-tint: var( --position-up-background-color );
+	--prizepool-place-l-tint: var( --position-down-background-color );
+	--prizepool-place-dq-tint: var( --position-disqualified-background-color );
+
 	// Hover tint derived from the row tint. hsl( from … ) is safe here — `:hover` is
 	// never captured by the exporter, so this value never reaches html2canvas.
 	--prizepool-place-1-tint-hover: hsl( from var( --prizepool-place-1-tint ) h s calc( l * 0.9 ) );
 	--prizepool-place-2-tint-hover: hsl( from var( --prizepool-place-2-tint ) h s calc( l * 0.9 ) );
 	--prizepool-place-3-tint-hover: hsl( from var( --prizepool-place-3-tint ) h s calc( l * 0.9 ) );
+
+	--prizepool-place-w-tint-hover: hsl( from var( --prizepool-place-w-tint ) h s calc( l * 0.9 ) );
+	--prizepool-place-l-tint-hover: hsl( from var( --prizepool-place-l-tint ) h s calc( l * 0.9 ) );
+	--prizepool-place-dq-tint-hover: hsl( from var( --prizepool-place-dq-tint ) h s calc( l * 0.9 ) );
 }
 
 .theme--light {
@@ -61,6 +73,10 @@ so they must stay defined even though the redesigned table no longer uses them.
 	--prizepool-place-1-tint-hover: hsl( from var( --prizepool-place-1-tint ) h s calc( l * 1.25 ) );
 	--prizepool-place-2-tint-hover: hsl( from var( --prizepool-place-2-tint ) h s calc( l * 1.25 ) );
 	--prizepool-place-3-tint-hover: hsl( from var( --prizepool-place-3-tint ) h s calc( l * 1.25 ) );
+
+	--prizepool-place-w-tint-hover: hsl( from var( --prizepool-place-w-tint ) h s calc( l * 1.25 ) );
+	--prizepool-place-l-tint-hover: hsl( from var( --prizepool-place-l-tint ) h s calc( l * 1.25 ) );
+	--prizepool-place-dq-tint-hover: hsl( from var( --prizepool-place-dq-tint ) h s calc( l * 1.25 ) );
 }
 
 /*******************************************************************************
@@ -345,6 +361,18 @@ share the `prizepooltable` class.
 		&.placement-3 {
 			background-color: var( --prizepool-place-3-accent );
 		}
+
+		&.placement-win {
+			background-color: var( --prizepool-place-w-accent );
+		}
+
+		&.placement-lose {
+			background-color: var( --prizepool-place-l-accent );
+		}
+
+		&.placement-disqualified {
+			background-color: var( --prizepool-place-dq-accent );
+		}
 	}
 
 	&.prizepooltable-placement {
@@ -368,7 +396,7 @@ share the `prizepooltable` class.
 		// `border-bottom: 0` drops the legacy per-place coloured row border. The hover tint
 		// re-applies on `table2__row--group-hover` (added by Table2.js to every row in a
 		// hovered group) since the base tint above out-specifies the generic group-hover rule.
-		$prizepool-top-placements: ( first: 1, second: 2, third: 3 );
+		$prizepool-top-placements: ( first: 1, second: 2, third: 3, win: w, lose: l, dq: dq );
 
 		@each $name, $n in $prizepool-top-placements {
 			tr.table2__row--body.background-color-#{ $name }-place {
@@ -394,18 +422,6 @@ share the `prizepooltable` class.
 			}
 		}
 	}
-
-	tr.table2__row--body.bg-win .prizepooltable-place {
-		background-color: var( --clr-forest-background-color, inherit );
-	}
-
-	tr.table2__row--body.bg-lose .prizepooltable-place {
-		background-color: var( --clr-cinnabar-background-color, inherit );
-	}
-
-	tr.table2__row--body.bg-dq .prizepooltable-place {
-		background-color: var( --clr-sapphire-background-color, inherit );
-	}
 }
 
 // Currency toggle: pill stacked above the card.