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

feat(participants): Allow teams in participants table #4022

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open

feat(participants): Allow teams in participants table #4022

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3f08458
feat(participants): Allow teams in table
iMarbot Feb 22, 2024
ca7fb7e
actually probably better without.
iMarbot Feb 22, 2024
46deb8c
apply to all wiki customs
iMarbot Feb 26, 2024
53b5bfa
Don't error on missing team template
iMarbot Feb 26, 2024
fd4bde7
Merge branch 'main' into participant-table-teams
iMarbot Nov 22, 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
5 changes: 2 additions & 3 deletions components/participant_table/commons/participant_table_base.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,8 +216,7 @@ function ParticipantTable:readEntry(sectionArgs, key, index, config)
note = valueFromArgs('note'),
}

assert(Opponent.isType(opponentArgs.type) and opponentArgs.type ~= Opponent.team,
'Missing or unsupported opponent type for "' .. sectionArgs[key] .. '"')
assert(Opponent.isType(opponentArgs.type), 'Invalid opponent type for "' .. sectionArgs[key] .. '"')

local opponent = Opponent.readOpponentArgs(opponentArgs) or {}

Expand All @@ -233,7 +232,7 @@ function ParticipantTable:readEntry(sectionArgs, key, index, config)
dq = Logic.readBool(opponentArgs.dq),
note = opponentArgs.note,
opponent = opponent,
name = Opponent.toName(opponent),
name = Logic.emptyOr(Opponent.toName(opponent), opponent.template),
inputIndex = index,
}
end
Expand Down
5 changes: 1 addition & 4 deletions components/participant_table/commons/starcraft_starcraft2/participant_table_starcraft.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,9 +120,6 @@ function StarcraftParticipantTable:readEntry(sectionArgs, key, index, config)
race = valueFromArgs('race'),
}

assert(Opponent.isType(opponentArgs.type) and opponentArgs.type ~= Opponent.team,
'Missing or unsupported opponent type for "' .. sectionArgs[key] .. '"')

--unset wiki var for random events to not read players as random if prize pool already sets them as random
if config.isRandomEvent and opponentArgs.type == Opponent.solo then
Variables.varDefine(opponentArgs.name .. '_race', '')
Expand All @@ -142,7 +139,7 @@ function StarcraftParticipantTable:readEntry(sectionArgs, key, index, config)
dq = Logic.readBool(opponentArgs.dq),
note = opponentArgs.note,
opponent = opponent,
name = Opponent.toName(opponent),
name = Logic.emptyOr(Opponent.toName(opponent), opponent.template),
isQualified = Logic.nilOr(Logic.readBoolOrNil(sectionArgs[key .. 'qualified']), config.isQualified),
}
end
Expand Down
5 changes: 1 addition & 4 deletions components/participant_table/wikis/stormgate/participant_table_custom.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,9 +119,6 @@ function StormgateParticipantTable:readEntry(sectionArgs, key, index, config)
faction = valueFromArgs('faction'),
}

assert(Opponent.isType(opponentArgs.type) and opponentArgs.type ~= Opponent.team,
'Missing or unsupported opponent type for "' .. sectionArgs[key] .. '"')

local opponent = Opponent.readOpponentArgs(opponentArgs) or {}

if config.sortPlayers and opponent.players then
Expand All @@ -136,7 +133,7 @@ function StormgateParticipantTable:readEntry(sectionArgs, key, index, config)
dq = Logic.readBool(opponentArgs.dq),
note = opponentArgs.note,
opponent = opponent,
name = Opponent.toName(opponent),
name = Logic.emptyOr(Opponent.toName(opponent), opponent.template),
isQualified = Logic.nilOr(Logic.readBoolOrNil(sectionArgs[key .. 'qualified']), config.isQualified),
}
end
Expand Down
5 changes: 1 addition & 4 deletions components/participant_table/wikis/warcraft/participant_table_custom.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,9 +106,6 @@ function CustomParticipantTable:readEntry(sectionArgs, key, index, config)
race = valueFromArgs('race'),
}

assert(Opponent.isType(opponentArgs.type) and opponentArgs.type ~= Opponent.team,
'Missing or unsupported opponent type for "' .. sectionArgs[key] .. '"')

local opponent = Opponent.readOpponentArgs(opponentArgs) or {}

if config.sortPlayers and opponent.players then
Expand All @@ -123,7 +120,7 @@ function CustomParticipantTable:readEntry(sectionArgs, key, index, config)
dq = Logic.readBool(opponentArgs.dq),
note = opponentArgs.note,
opponent = opponent,
name = Opponent.toName(opponent),
name = Logic.emptyOr(Opponent.toName(opponent), opponent.template),
}
end

Expand Down
Loading