From aeef172b8c6b072d10dec2e9903ff51c5732d980 Mon Sep 17 00:00:00 2001 From: suanjiansalt <127009844+suanjiansalt@users.noreply.github.com> Date: Mon, 18 Nov 2024 18:29:12 +0800 Subject: [PATCH 1/5] main function --- components/contracts/contractRouting.ts | 6 +++++- components/flags.ts | 6 ++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/components/contracts/contractRouting.ts b/components/contracts/contractRouting.ts index 3807361e..7f8f7f23 100644 --- a/components/contracts/contractRouting.ts +++ b/components/contracts/contractRouting.ts @@ -57,6 +57,7 @@ import { GetForPlay2Body } from "../types/gameSchemas" import assert from "assert" import { getUserData } from "../databaseHandler" import { getCpd } from "../evergreen" +import { getFlag } from "../flags" const contractRoutingRouter = Router() @@ -110,7 +111,10 @@ contractRoutingRouter.post( } // Edit usercreated contract data HERE - if (contractTypes.includes(contractData.Metadata.Type)) { + if ( + contractTypes.includes(contractData.Metadata.Type) && + getFlag("enableContractsModeSaving") + ) { contractData.Data.EnableSaving = false } diff --git a/components/flags.ts b/components/flags.ts index 5e1e043c..5cd35937 100644 --- a/components/flags.ts +++ b/components/flags.ts @@ -61,6 +61,12 @@ export const defaultFlags: Flags = { desc: "Show elusive targets in instinct like normal targets would appear on normal missions. (for speedrunners who are submitting to speedrun.com, just as a reminder, this tool is for practice only!)", default: false, }, + enableContractsModeSaving: { + category: "Gameplay", + title: "enableContractsModeSaving", + desc: "Enable saving in Contracts Mode, including both usercreated and featured contracts.", + default: false, + }, legacyNoticedKillScoring: { category: "Gameplay", title: "legacyNoticedKillScoring", From 4237e6faef0ed558971abf48ec8aa85f5198546c Mon Sep 17 00:00:00 2001 From: suanjiansalt <127009844+suanjiansalt@users.noreply.github.com> Date: Mon, 18 Nov 2024 18:38:37 +0800 Subject: [PATCH 2/5] expand escalation saving --- components/contracts/contractRouting.ts | 9 ++++++++- components/flags.ts | 6 +++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/components/contracts/contractRouting.ts b/components/contracts/contractRouting.ts index 7f8f7f23..d5b77a01 100644 --- a/components/contracts/contractRouting.ts +++ b/components/contracts/contractRouting.ts @@ -97,6 +97,13 @@ contractRoutingRouter.post( } // Add escalation data to Contract data HERE + if ( + escalationTypes.includes(contractData.Metadata.Type) && + getFlag("enableSpeacialModesSaving") + ) { + contractData.Data.EnableSaving = false + } + contractData.Metadata = { ...contractData.Metadata, ...(escalationTypes.includes(contractData.Metadata.Type) @@ -113,7 +120,7 @@ contractRoutingRouter.post( // Edit usercreated contract data HERE if ( contractTypes.includes(contractData.Metadata.Type) && - getFlag("enableContractsModeSaving") + getFlag("enableSpeacialModesSaving") ) { contractData.Data.EnableSaving = false } diff --git a/components/flags.ts b/components/flags.ts index 5cd35937..08e3e288 100644 --- a/components/flags.ts +++ b/components/flags.ts @@ -61,10 +61,10 @@ export const defaultFlags: Flags = { desc: "Show elusive targets in instinct like normal targets would appear on normal missions. (for speedrunners who are submitting to speedrun.com, just as a reminder, this tool is for practice only!)", default: false, }, - enableContractsModeSaving: { + enableSpeacialModesSaving: { category: "Gameplay", - title: "enableContractsModeSaving", - desc: "Enable saving in Contracts Mode, including both usercreated and featured contracts.", + title: "enableSpeacialModesSaving", + desc: "Enable saving in Escalations and Contracts Mode, including both usercreated and featured contracts.", default: false, }, legacyNoticedKillScoring: { From 8c426a38cd49e2a19d61266042c8296977ffd9a8 Mon Sep 17 00:00:00 2001 From: suanjiansalt <127009844+suanjiansalt@users.noreply.github.com> Date: Mon, 18 Nov 2024 18:40:23 +0800 Subject: [PATCH 3/5] enable disability --- components/contracts/contractRouting.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/contracts/contractRouting.ts b/components/contracts/contractRouting.ts index d5b77a01..18a85ab4 100644 --- a/components/contracts/contractRouting.ts +++ b/components/contracts/contractRouting.ts @@ -99,7 +99,7 @@ contractRoutingRouter.post( // Add escalation data to Contract data HERE if ( escalationTypes.includes(contractData.Metadata.Type) && - getFlag("enableSpeacialModesSaving") + !getFlag("enableSpeacialModesSaving") ) { contractData.Data.EnableSaving = false } @@ -120,7 +120,7 @@ contractRoutingRouter.post( // Edit usercreated contract data HERE if ( contractTypes.includes(contractData.Metadata.Type) && - getFlag("enableSpeacialModesSaving") + !getFlag("enableSpeacialModesSaving") ) { contractData.Data.EnableSaving = false } From 5176f3f0c3f49c89ee44774a1aee11262fcc3627 Mon Sep 17 00:00:00 2001 From: suanjiansalt <127009844+suanjiansalt@users.noreply.github.com> Date: Mon, 18 Nov 2024 18:43:44 +0800 Subject: [PATCH 4/5] nah we shouldn't --- components/contracts/contractRouting.ts | 7 ++----- components/flags.ts | 6 +++--- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/components/contracts/contractRouting.ts b/components/contracts/contractRouting.ts index 18a85ab4..5cc8ccf2 100644 --- a/components/contracts/contractRouting.ts +++ b/components/contracts/contractRouting.ts @@ -97,10 +97,7 @@ contractRoutingRouter.post( } // Add escalation data to Contract data HERE - if ( - escalationTypes.includes(contractData.Metadata.Type) && - !getFlag("enableSpeacialModesSaving") - ) { + if (escalationTypes.includes(contractData.Metadata.Type)) { contractData.Data.EnableSaving = false } @@ -120,7 +117,7 @@ contractRoutingRouter.post( // Edit usercreated contract data HERE if ( contractTypes.includes(contractData.Metadata.Type) && - !getFlag("enableSpeacialModesSaving") + !getFlag("enableContractsModeSaving") ) { contractData.Data.EnableSaving = false } diff --git a/components/flags.ts b/components/flags.ts index 08e3e288..5cd35937 100644 --- a/components/flags.ts +++ b/components/flags.ts @@ -61,10 +61,10 @@ export const defaultFlags: Flags = { desc: "Show elusive targets in instinct like normal targets would appear on normal missions. (for speedrunners who are submitting to speedrun.com, just as a reminder, this tool is for practice only!)", default: false, }, - enableSpeacialModesSaving: { + enableContractsModeSaving: { category: "Gameplay", - title: "enableSpeacialModesSaving", - desc: "Enable saving in Escalations and Contracts Mode, including both usercreated and featured contracts.", + title: "enableContractsModeSaving", + desc: "Enable saving in Contracts Mode, including both usercreated and featured contracts.", default: false, }, legacyNoticedKillScoring: { From d9c80d64bd2ca9e12b1d7423ec27c7451b1f8b36 Mon Sep 17 00:00:00 2001 From: suanjiansalt <127009844+suanjiansalt@users.noreply.github.com> Date: Mon, 18 Nov 2024 19:22:46 +0800 Subject: [PATCH 5/5] desc --- components/flags.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/flags.ts b/components/flags.ts index 5cd35937..b048104f 100644 --- a/components/flags.ts +++ b/components/flags.ts @@ -64,7 +64,7 @@ export const defaultFlags: Flags = { enableContractsModeSaving: { category: "Gameplay", title: "enableContractsModeSaving", - desc: "Enable saving in Contracts Mode, including both usercreated and featured contracts.", + desc: "Enable saving in Contracts Mode, including both usercreated and featured contracts. Please note that even if you enable this, the saving function is consistent with the setting in the contract.", default: false, }, legacyNoticedKillScoring: {