From 41d976d3629f7c84bd8560656605c121e2f8bbf2 Mon Sep 17 00:00:00 2001 From: Sainan <63328889+Sainan@users.noreply.github.com> Date: Thu, 17 Apr 2025 10:58:40 -0700 Subject: [PATCH] fix: don't trigger G3 capture when LevelKeyName is present (#1699) Reviewed-on: https://onlyg.it/OpenWF/SpaceNinjaServer/pulls/1699 Co-authored-by: Sainan <63328889+Sainan@users.noreply.github.com> Co-committed-by: Sainan <63328889+Sainan@users.noreply.github.com> --- src/services/missionInventoryUpdateService.ts | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/services/missionInventoryUpdateService.ts b/src/services/missionInventoryUpdateService.ts index 3ff26b29..079f2886 100644 --- a/src/services/missionInventoryUpdateService.ts +++ b/src/services/missionInventoryUpdateService.ts @@ -128,11 +128,16 @@ export const addMissionInventoryUpdates = async ( ]); } } + + // Somewhat heuristically detect G3 capture: + // - https://onlyg.it/OpenWF/SpaceNinjaServer/issues/1365 + // - https://onlyg.it/OpenWF/SpaceNinjaServer/issues/1694 if ( inventoryUpdates.MissionFailed && inventoryUpdates.MissionStatus == "GS_FAILURE" && inventoryUpdates.ObjectiveReached && - !inventoryUpdates.LockedWeaponGroup + !inventoryUpdates.LockedWeaponGroup && + !inventoryUpdates.LevelKeyName ) { const loadout = (await Loadout.findById(inventory.LoadOutPresets, "NORMAL"))!; const config = loadout.NORMAL.id(inventory.CurrentLoadOutIds[0].$oid)!;