From e23d865044d837a88c60b0bfa544db10e9babbd3 Mon Sep 17 00:00:00 2001 From: Sainan <63328889+Sainan@users.noreply.github.com> Date: Sat, 26 Apr 2025 19:27:50 -0700 Subject: [PATCH] fix: use a list of "known good" syndicate missions (#1874) Closes #1870 Reviewed-on: https://onlyg.it/OpenWF/SpaceNinjaServer/pulls/1874 Co-authored-by: Sainan <63328889+Sainan@users.noreply.github.com> Co-committed-by: Sainan <63328889+Sainan@users.noreply.github.com> --- src/services/worldStateService.ts | 16 +- .../worldState/syndicateMissions.json | 157 ++++++++++++++++++ 2 files changed, 159 insertions(+), 14 deletions(-) create mode 100644 static/fixed_responses/worldState/syndicateMissions.json diff --git a/src/services/worldStateService.ts b/src/services/worldStateService.ts index 757f809f..cc93b48a 100644 --- a/src/services/worldStateService.ts +++ b/src/services/worldStateService.ts @@ -1,5 +1,6 @@ import staticWorldState from "@/static/fixed_responses/worldState/worldState.json"; import sortieTilesets from "@/static/fixed_responses/worldState/sortieTilesets.json"; +import syndicateMissions from "@/static/fixed_responses/worldState/syndicateMissions.json"; import { buildConfig } from "@/src/services/buildConfigService"; import { unixTimesInMs } from "@/src/constants/timeConstants"; import { config } from "@/src/services/configService"; @@ -189,20 +190,7 @@ const pushSyndicateMissions = ( idSuffix: string, syndicateTag: string ): void => { - const nodeOptions: string[] = []; - for (const [key, value] of Object.entries(ExportRegions)) { - if ( - !isArchwingMission(value) && - !value.questReq && // Exclude zariman, murmor, and 1999 stuff - !value.hidden && // Exclude the index - !value.darkSectorData && // Exclude dark sectors - value.missionIndex != 10 && // Exclude MT_PVP (for relays) - value.missionIndex != 23 && // no junctions - value.missionIndex < 28 // no open worlds, railjack, etc - ) { - nodeOptions.push(key); - } - } + const nodeOptions: string[] = [...syndicateMissions]; const rng = new CRng(seed); const nodes: string[] = []; diff --git a/static/fixed_responses/worldState/syndicateMissions.json b/static/fixed_responses/worldState/syndicateMissions.json new file mode 100644 index 00000000..4c5b9233 --- /dev/null +++ b/static/fixed_responses/worldState/syndicateMissions.json @@ -0,0 +1,157 @@ +[ + "SettlementNode1", + "SettlementNode11", + "SettlementNode12", + "SettlementNode14", + "SettlementNode15", + "SettlementNode2", + "SettlementNode3", + "SolNode1", + "SolNode10", + "SolNode100", + "SolNode101", + "SolNode102", + "SolNode103", + "SolNode106", + "SolNode107", + "SolNode109", + "SolNode11", + "SolNode113", + "SolNode118", + "SolNode119", + "SolNode12", + "SolNode121", + "SolNode122", + "SolNode123", + "SolNode125", + "SolNode126", + "SolNode128", + "SolNode130", + "SolNode131", + "SolNode132", + "SolNode135", + "SolNode137", + "SolNode138", + "SolNode139", + "SolNode14", + "SolNode140", + "SolNode141", + "SolNode146", + "SolNode147", + "SolNode149", + "SolNode15", + "SolNode153", + "SolNode16", + "SolNode162", + "SolNode164", + "SolNode166", + "SolNode167", + "SolNode17", + "SolNode171", + "SolNode172", + "SolNode173", + "SolNode175", + "SolNode177", + "SolNode18", + "SolNode181", + "SolNode184", + "SolNode185", + "SolNode187", + "SolNode188", + "SolNode189", + "SolNode19", + "SolNode191", + "SolNode195", + "SolNode196", + "SolNode2", + "SolNode20", + "SolNode203", + "SolNode204", + "SolNode205", + "SolNode209", + "SolNode21", + "SolNode211", + "SolNode212", + "SolNode214", + "SolNode215", + "SolNode216", + "SolNode217", + "SolNode22", + "SolNode220", + "SolNode223", + "SolNode224", + "SolNode225", + "SolNode226", + "SolNode23", + "SolNode25", + "SolNode26", + "SolNode27", + "SolNode30", + "SolNode31", + "SolNode36", + "SolNode38", + "SolNode39", + "SolNode4", + "SolNode400", + "SolNode401", + "SolNode402", + "SolNode403", + "SolNode404", + "SolNode405", + "SolNode406", + "SolNode407", + "SolNode408", + "SolNode409", + "SolNode41", + "SolNode410", + "SolNode412", + "SolNode42", + "SolNode43", + "SolNode45", + "SolNode46", + "SolNode48", + "SolNode49", + "SolNode50", + "SolNode56", + "SolNode57", + "SolNode58", + "SolNode59", + "SolNode6", + "SolNode61", + "SolNode62", + "SolNode63", + "SolNode64", + "SolNode66", + "SolNode67", + "SolNode68", + "SolNode70", + "SolNode706", + "SolNode707", + "SolNode708", + "SolNode709", + "SolNode710", + "SolNode711", + "SolNode72", + "SolNode73", + "SolNode74", + "SolNode741", + "SolNode742", + "SolNode743", + "SolNode744", + "SolNode745", + "SolNode746", + "SolNode748", + "SolNode75", + "SolNode76", + "SolNode78", + "SolNode79", + "SolNode81", + "SolNode82", + "SolNode84", + "SolNode85", + "SolNode88", + "SolNode89", + "SolNode93", + "SolNode96", + "SolNode97" +]