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

Env-driven switch to stop rejecting AI players and team games #130

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

Env-driven switch to stop rejecting AI players and team games #130

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bff7eee
Env-driven switch to stop rejecting AI players and team games
Logg-y Sep 26, 2024
896e1b0
Merge branch 'erin-fitzpatric:main' into main
Logg-y Nov 9, 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
26 changes: 18 additions & 8 deletions src/server/recParser/recParser.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,15 +90,22 @@ async function parseMetadataFromDecompressedRecordedGame(decompressed: Buffer):
parseProfileKeys(root, couldBeBenchmark, output);
const typedOutput = output as RecordedGameMetadata;

// Now that base data is loaded, trim output.playerdata to the correct number of players
typedOutput.playerData.splice(typedOutput.gameNumPlayers+1, 13-typedOutput.gameNumPlayers);

// Reject any games with AI players
if (typedOutput.playerData.some((player) => { return player.aiPersonality !== undefined && player.aiPersonality.length > 0}))
throw new Error(Errors.GAME_HAS_AI_PLAYERS);
{
if (!process.env.RECPARSER_ACCEPT_AIS)
throw new Error(Errors.GAME_HAS_AI_PLAYERS);
}

// TODO - Fitz should remove this when he wants team games to be uploadable
if (typedOutput.gameNumPlayers > 2)
if (!process.env.RECPARSER_ACCEPT_TGS && typedOutput.gameNumPlayers > 2)
throw new Error(Errors.UNSUPPORTED_GAME_SIZE, {cause:`Currently uploads are limited to 1v1s only - this game has ${typedOutput.gameNumPlayers} players!`});

parseTeams(typedOutput, root);
// Resolves random teams into their real numbers
// and anything else that needs deriving from the player data sections
parsePlayerDataSections(typedOutput, root);
const xmbData = parseRecXMBList(root);

parseMajorGodsToNames(typedOutput, xmbData);
Expand Down Expand Up @@ -255,9 +262,6 @@ function parseProfileKeys(root: RecordedGameHierarchyContainer, couldBeBenchmark
throw new Error(Errors.PARSER_INTERNAL_ERROR, {cause:`Recorded game metadata missing required key ${key}`});
}
}

// Now that everything is there, trim output.playerdata to the correct number of players
typedOutput.playerData.splice(typedOutput.gameNumPlayers+1, 13-typedOutput.gameNumPlayers);
}

function fixMetadataKey(keyName: string)
Expand Down Expand Up @@ -315,7 +319,7 @@ function addMetadataKeyToOutput(output: any, keyName: string, value: number | st
}


function parseTeams(output: RecordedGameMetadata, hierarchy: RecordedGameHierarchyContainer)
function parsePlayerDataSections(output: RecordedGameMetadata, hierarchy: RecordedGameHierarchyContainer)
{
// Profile keys has teamid = -1 for random teams, which is no good
// This gets the real team ids out of the binary player data section instead
Expand Down Expand Up @@ -354,6 +358,12 @@ function parseTeams(output: RecordedGameMetadata, hierarchy: RecordedGameHierarc
if (teamId > 12)
throw new Error(Errors.PARSER_INTERNAL_ERROR, {cause: `Parsing teams for section at ${section.data.byteOffset}: read invalid team ID ${teamId} at ${teamIdOffset} for ${nameOne.content}`});
output.playerData[playerNumber].teamId = teamId;
// For AI players: the profile keys simply names them "Player 2" etc, in this section we just got their "real" name instead
// So using that instead
if (output.playerData[playerNumber].aiPersonality)
{
output.playerData[playerNumber].name = nameOne.content + " (AI)";
}
}
playerNumber++;
}
Expand Down