Skip to content

Cleanup name override implementation #115

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

Merged
NicEastvillage merged 3 commits into from
Jun 5, 2026
Merged

Cleanup name override implementation #115

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bed0312
Remove unnecessary allocations
NicEastvillage Jun 5, 2026
77e9cf8
Use null to indicate no name override
NicEastvillage Jun 5, 2026
c1e0294
Fix typo
NicEastvillage Jun 5, 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
10 changes: 5 additions & 5 deletions frontend/src/base-players.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ export const BASE_PLAYERS: DraggablePlayer[] = [
id: crypto.randomUUID(),
info: new HumanInfo(),
tags: ["human"],
overrides: { name: "Human", loadout: null, autoStart: true },
overrides: { name: null, loadout: null, autoStart: true },
},
{
displayName: "Psyonix Beginner",
Expand All @@ -20,7 +20,7 @@ export const BASE_PLAYERS: DraggablePlayer[] = [
skill: 0,
}),
tags: ["psyonix"],
overrides: { name: "", loadout: null, autoStart: true },
overrides: { name: null, loadout: null, autoStart: true },
},
{
displayName: "Psyonix Rookie",
Expand All @@ -31,7 +31,7 @@ export const BASE_PLAYERS: DraggablePlayer[] = [
skill: 1,
}),
tags: ["psyonix"],
overrides: { name: "", loadout: null, autoStart: true },
overrides: { name: null, loadout: null, autoStart: true },
},
{
displayName: "Psyonix Pro",
Expand All @@ -42,7 +42,7 @@ export const BASE_PLAYERS: DraggablePlayer[] = [
skill: 2,
}),
tags: ["psyonix"],
overrides: { name: "", loadout: null, autoStart: true },
overrides: { name: null, loadout: null, autoStart: true },
},
{
displayName: "Psyonix Allstar",
Expand All @@ -53,6 +53,6 @@ export const BASE_PLAYERS: DraggablePlayer[] = [
skill: 3,
}),
tags: ["psyonix"],
overrides: { name: "", loadout: null, autoStart: true },
overrides: { name: null, loadout: null, autoStart: true },
},
];
13 changes: 7 additions & 6 deletions frontend/src/components/Teams/PlayerOverridesModal.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,15 @@ let {

function clearOverrides() {
if (player) {
player.overrides.name =
player.info instanceof PsyonixBotInfo ? "" : player.displayName;
player.overrides.name = null;
player.overrides.loadout = null;
player.overrides.autoStart = true;
}
}

function hasNameOverride(): boolean {
if (!player) return false;
let expectedName = player.info instanceof BotInfo ? player.displayName : "";
return player.overrides.name !== expectedName;
return player.overrides.name !== null;
}

async function pickLoadoutOverride() {
Expand All @@ -39,9 +37,12 @@ async function pickLoadoutOverride() {
<p style={hasNameOverride() ? "color: orange;" : ""}>In-game name:</p>
<input
type="text"
placeholder="Bot name"
placeholder=""
id={`edit-name-${player.id}`}
bind:value={player.overrides.name}
bind:value={
() => player?.overrides.name ?? player.displayName,
(v) => player.overrides.name = (v === player.displayName) ? null : v
}
>
<br />
<br />
Expand Down
5 changes: 2 additions & 3 deletions frontend/src/components/Teams/TeamBotList.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,8 @@ function canAutoStart(d: DraggablePlayer): boolean {
}

function hasOverrides(d: DraggablePlayer): boolean {
let expectedName = d.info instanceof BotInfo ? d.displayName : "";
return (
d.overrides.name !== expectedName ||
d.overrides.name !== null ||
!d.overrides.autoStart ||
d.overrides.loadout != null
);
Expand Down Expand Up @@ -169,7 +168,7 @@ const dnd_container_namespace = `team_${crypto.randomUUID()}`;
? "filter: brightness(var(--icon-brightness))" : ""
}
/>
<p>{bot.displayName === bot.overrides.name || (bot.info instanceof PsyonixBotInfo && bot.overrides.name === "") ? bot.displayName : `${bot.overrides.name}`}</p>
<p>{bot.overrides.name === null ? bot.displayName : bot.overrides.name}</p>
{#if bot.uniquePathSegment}
<span class="unique-bot-identifier">({bot.uniquePathSegment})</span>
{/if}
Expand Down
6 changes: 3 additions & 3 deletions frontend/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ export function parseSuperJSON(item: string | null): any | null {
}

export interface PlayerFieldOverrides {
name: string;
name: string | null;
loadout: LoadoutConfig | null;
autoStart: boolean;
}
Expand Down Expand Up @@ -77,7 +77,7 @@ export function draggablePlayerToPlayerJs(d: DraggablePlayer): PlayerJs {
if (d.info instanceof BotInfo) {
const player = BotInfo.createFrom(structuredClone(d.info));
// Apply overrides
player.config.settings.name = d.overrides.name;
player.config.settings.name = d.overrides.name ?? player.config.settings.name;
player.loadout = d.overrides.loadout ?? d.info.loadout;
if (!d.overrides.autoStart) {
player.config.settings.runCommand = "";
Expand All @@ -96,7 +96,7 @@ export function draggablePlayerToPlayerJs(d: DraggablePlayer): PlayerJs {
if (d.info instanceof PsyonixBotInfo) {
const player = PsyonixBotInfo.createFrom(structuredClone(d.info));
// Apply overrides
player.name = d.overrides.name;
player.name = d.overrides.name ?? ""; // Emptry string means random name for Psyonix bots
Copy link
Copy Markdown
Contributor

@VirxEC VirxEC Jun 5, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Minor typo, "Emptry"

player.loadout = d.overrides.loadout ?? d.info.loadout;

return {
Expand Down
37 changes: 13 additions & 24 deletions frontend/src/pages/Home.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ async function updateBots() {
tags: x.config.details.tags,
uniquePathSegment,
overrides: {
name: x.config.settings.name,
name: null,
loadout: null,
autoStart: true,
},
Expand Down Expand Up @@ -332,15 +332,12 @@ async function getLatestBotInfo(tomlPath: string): Promise<BotInfo | null> {
);

if (index !== -1) {
players[index] = {
...players[index],
displayName: found.config.settings.name,
icon: found.icon,
info: botInfo,
tags: found.config.details.tags,
};

players = [...players];
players[index].info = botInfo
players[index].displayName = found.config.settings.name
players[index].icon = found.icon
players[index].tags = found.config.details.tags

bluePlayers = updateTeam(bluePlayers);
orangePlayers = updateTeam(orangePlayers);
}
Expand All @@ -365,22 +362,14 @@ async function getLatestScriptInfo(tomlPath: string): Promise<BotInfo | null> {
const oldAgentId = scripts[index].info.config.settings.agentId;
const newAgentId = found.config.settings.agentId;

scripts[index] = {
...scripts[index],
displayName: found.config.settings.name,
icon: found.config.settings.logoFile,
info: found,
tags: found.config.details.tags,
};

scripts = [...scripts];

if (enabledScripts[newAgentId] === undefined) {
enabledScripts[newAgentId] = false;
}
scripts[index].displayName = found.config.settings.name
scripts[index].icon = found.config.settings.logoFile
scripts[index].info = found
scripts[index].tags = found.config.details.tags

if (oldAgentId !== newAgentId && enabledScripts[oldAgentId] === undefined) {
enabledScripts[oldAgentId] = false;
enabledScripts[newAgentId] = enabledScripts[oldAgentId]
if (oldAgentId !== newAgentId) {
delete enabledScripts[oldAgentId]
}
}

Expand Down