OpenWF/SpaceNinjaServer
28
29
Fork 35
Code Issues 23 Pull Requests 1 Actions Packages Projects Releases Activity

fix: better handling of assassination missions in sorties #1930

Merged
Sainan merged 3 commits from sortie-boss-fix into main 2025-04-30 13:28:34 -07:00
Conversation 0 Commits 3 Files Changed 2 +18 -26
2 changed files with 18 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 08111f819a - Show all commits

6
src/services/rngService.ts
View File

@ -6,7 +6,7 @@ export interface IRngResult {
probability: number; probability: number;
} }
export const getRandomElement = <T>(arr: T[]): T | undefined => { export const getRandomElement = <T>(arr: readonly T[]): T | undefined => {
return arr[Math.floor(Math.random() * arr.length)]; return arr[Math.floor(Math.random() * arr.length)];
}; };
@ -113,7 +113,7 @@ export class CRng {
return min; return min;
} }
randomElement<T>(arr: T[]): T | undefined { randomElement<T>(arr: readonly T[]): T | undefined {
return arr[Math.floor(this.random() * arr.length)]; return arr[Math.floor(this.random() * arr.length)];
} }
@ -145,7 +145,7 @@ export class SRng {
return min; return min;
} }
randomElement<T>(arr: T[]): T | undefined { randomElement<T>(arr: readonly T[]): T | undefined {
return arr[this.randomInt(0, arr.length - 1)]; return arr[this.randomInt(0, arr.length - 1)];
} }

38
src/services/worldStateService.ts
View File

@ -33,9 +33,11 @@ const sortieBosses = [
"SORTIE_BOSS_LEPHANTIS", "SORTIE_BOSS_LEPHANTIS",
"SORTIE_BOSS_INFALAD", "SORTIE_BOSS_INFALAD",
"SORTIE_BOSS_CORRUPTED_VOR" "SORTIE_BOSS_CORRUPTED_VOR"
]; ] as const;
const sortieBossToFaction: Record<string, string> = { type TSortieBoss = (typeof sortieBosses)[number];
const sortieBossToFaction: Record<TSortieBoss, string> = {
SORTIE_BOSS_HYENA: "FC_CORPUS", SORTIE_BOSS_HYENA: "FC_CORPUS",
SORTIE_BOSS_KELA: "FC_GRINEER", SORTIE_BOSS_KELA: "FC_GRINEER",
SORTIE_BOSS_VOR: "FC_GRINEER", SORTIE_BOSS_VOR: "FC_GRINEER",
@ -74,17 +76,18 @@ const sortieFactionToSpecialMissionTileset: Record<string, string> = {
FC_INFESTATION: "CorpusShipTileset" FC_INFESTATION: "CorpusShipTileset"
}; };
const sortieBossNode: Record<string, string> = { const sortieBossNode: Record<Exclude<TSortieBoss, "SORTIE_BOSS_CORRUPTED_VOR">, string> = {
SORTIE_BOSS_ALAD: "SolNode53", SORTIE_BOSS_ALAD: "SolNode53",
SORTIE_BOSS_AMBULAS: "SolNode51", SORTIE_BOSS_AMBULAS: "SolNode51",
SORTIE_BOSS_HEK: "SolNode24", SORTIE_BOSS_HEK: "SolNode24",
SORTIE_BOSS_HYENA: "SolNode127", SORTIE_BOSS_HYENA: "SolNode127",
SORTIE_BOSS_INFALAD: "SolNode705", SORTIE_BOSS_INFALAD: "SolNode166",
SORTIE_BOSS_JACKAL: "SolNode104", SORTIE_BOSS_JACKAL: "SolNode104",
SORTIE_BOSS_KELA: "SolNode193", SORTIE_BOSS_KELA: "SolNode193",
SORTIE_BOSS_KRIL: "SolNode99", SORTIE_BOSS_KRIL: "SolNode99",
SORTIE_BOSS_LEPHANTIS: "SolNode712", SORTIE_BOSS_LEPHANTIS: "SolNode712",
SORTIE_BOSS_NEF: "SettlementNode20", SORTIE_BOSS_NEF: "SettlementNode20",
SORTIE_BOSS_PHORID: "SolNode171",
SORTIE_BOSS_RAPTOR: "SolNode210", SORTIE_BOSS_RAPTOR: "SolNode210",
SORTIE_BOSS_RUK: "SolNode32", SORTIE_BOSS_RUK: "SolNode32",
SORTIE_BOSS_TYL: "SolNode105", SORTIE_BOSS_TYL: "SolNode105",
@ -310,28 +313,17 @@ const pushSortieIfRelevant = (worldState: IWorldState, day: number): void => {
sortieFactionToSpecialMissionTileset[sortieBossToFaction[boss]] sortieFactionToSpecialMissionTileset[sortieBossToFaction[boss]]
); );
if (i == 2 && rng.randomInt(0, 2) == 2) { if (i == 2 && boss != "SORTIE_BOSS_CORRUPTED_VOR" && rng.randomInt(0, 2) == 2) {
const filteredModifiers = modifiers.filter(mod => mod !== "SORTIE_MODIFIER_MELEE_ONLY"); const filteredModifiers = modifiers.filter(mod => mod !== "SORTIE_MODIFIER_MELEE_ONLY");
const modifierType = rng.randomElement(filteredModifiers)!; const modifierType = rng.randomElement(filteredModifiers)!;
if (boss == "SORTIE_BOSS_PHORID") { selectedNodes.push({
selectedNodes.push({ missionType: "MT_ASSASSINATION",
missionType: "MT_ASSASSINATION", modifierType,
modifierType, node: sortieBossNode[boss],
node, tileset: sortieTilesets[sortieBossNode[boss] as keyof typeof sortieTilesets]
tileset: sortieTilesets[node as keyof typeof sortieTilesets] });
}); continue;
nodes.splice(randomIndex, 1);
continue;
} else if (sortieBossNode[boss]) {
selectedNodes.push({
missionType: "MT_ASSASSINATION",
modifierType,
node: sortieBossNode[boss],
tileset: sortieTilesets[sortieBossNode[boss] as keyof typeof sortieTilesets]
});
continue;
}
} }
const missionType = eMissionType[missionIndex].tag; const missionType = eMissionType[missionIndex].tag;