chore: move int cheats into account section (#2916)

Re #2361

Reviewed-on: OpenWF/SpaceNinjaServer#2916
Reviewed-by: Sainan <63328889+sainan@users.noreply.github.com>
Co-authored-by: AMelonInsideLemon <166175391+AMelonInsideLemon@users.noreply.github.com>
Co-committed-by: AMelonInsideLemon <166175391+AMelonInsideLemon@users.noreply.github.com>

config-vanilla.json

@@ -14,9 +14,6 @@
   "unlockAllSkins": false,
   "fullyStockedVendors": false,
   "skipClanKeyCrafting": false,
-  "spoofMasteryRank": -1,
-  "relicRewardItemCountMultiplier": 1,
-  "nightwaveStandingMultiplier": 1,
   "unfaithfulBugFixes": {
     "ignore1999LastRegionPlayed": false,
     "fixXtraCheeseTimer": false,

src/controllers/api/inventoryController.ts

@@ -348,12 +348,12 @@ export const getInventoryResponse = async (
         }
     }
 
-    if (typeof config.spoofMasteryRank === "number" && config.spoofMasteryRank >= 0) {
+    if (inventory.spoofMasteryRank && inventory.spoofMasteryRank >= 0) {
-        inventoryResponse.PlayerLevel = config.spoofMasteryRank;
+        inventoryResponse.PlayerLevel = inventory.spoofMasteryRank;
         if (!xpBasedLevelCapDisabled) {
             // This client has not been patched to accept any mastery rank, need to fake the XP.
             inventoryResponse.XPInfo = [];
-            let numFrames = getExpRequiredForMr(Math.min(config.spoofMasteryRank, 5030)) / 6000;
+            let numFrames = getExpRequiredForMr(Math.min(inventory.spoofMasteryRank, 5030)) / 6000;
             while (numFrames-- > 0) {
                 inventoryResponse.XPInfo.push({
                     ItemType: "/Lotus/Powersuits/Mag/Mag",

src/controllers/api/updateChallengeProgressController.ts

@@ -14,7 +14,7 @@ export const updateChallengeProgressController: RequestHandler = async (req, res
 
     const inventory = await getInventory(
         account._id.toString(),
-        "ChallengesFixVersion ChallengeProgress SeasonChallengeHistory Affiliations CalendarProgress"
+        "ChallengesFixVersion ChallengeProgress SeasonChallengeHistory Affiliations CalendarProgress nightwaveStandingMultiplier"
     );
     let affiliationMods: IAffiliationMods[] = [];
     if (challenges.ChallengeProgress) {

src/helpers/relicHelper.ts

@@ -8,7 +8,6 @@ import { logger } from "../utils/logger.ts";
 import { addMiscItems, combineInventoryChanges } from "../services/inventoryService.ts";
 import { handleStoreItemAcquisition } from "../services/purchaseService.ts";
 import type { IInventoryChanges } from "../types/purchaseTypes.ts";
-import { config } from "../services/configService.ts";
 
 export const crackRelic = async (
     inventory: TInventoryDatabaseDocument,
@@ -29,10 +28,10 @@ export const crackRelic = async (
         ExportRewards[relic.rewardManifest][0] as { type: string; itemCount: number; rarity: TRarity }[], // rarity is nullable in PE+ typings, but always present for relics
         weights
     )!;
-    if (config.relicRewardItemCountMultiplier !== undefined && (config.relicRewardItemCountMultiplier ?? 1) != 1) {
+    if (inventory.relicRewardItemCountMultiplier && inventory.relicRewardItemCountMultiplier != 1) {
         reward = {
             ...reward,
-            itemCount: reward.itemCount * config.relicRewardItemCountMultiplier
+            itemCount: reward.itemCount * inventory.relicRewardItemCountMultiplier
         };
     }
     logger.debug(`relic rolled`, reward);

src/models/inventoryModels/inventoryModel.ts

@@ -1469,6 +1469,9 @@ const inventorySchema = new Schema<IInventoryDatabase, InventoryDocumentProps>(
         nemesisHintProgressMultiplierGrineer: Number,
         nemesisHintProgressMultiplierCorpus: Number,
         nemesisExtraWeapon: Number,
+        spoofMasteryRank: { type: Number, default: -1 },
+        relicRewardItemCountMultiplier: { type: Number, default: 1 },
+        nightwaveStandingMultiplier: { type: Number, default: 1 },
 
         SubscribedToEmails: { type: Number, default: 0 },
         SubscribedToEmailsPersonalized: { type: Number, default: 0 },

src/services/configService.ts

@@ -24,9 +24,6 @@ export interface IConfig {
     unlockAllSkins?: boolean;
     fullyStockedVendors?: boolean;
     skipClanKeyCrafting?: boolean;
-    spoofMasteryRank?: number;
-    relicRewardItemCountMultiplier?: number;
-    nightwaveStandingMultiplier?: number;
     unfaithfulBugFixes?: {
         ignore1999LastRegionPlayed?: boolean;
         fixXtraCheeseTimer?: boolean;
@@ -149,7 +146,10 @@ export const configRemovedOptionsKeys = [
     "fastClanAscension",
     "unlockAllFlavourItems",
     "unlockAllShipDecorations",
-    "unlockAllDecoRecipes"
+    "unlockAllDecoRecipes",
+    "spoofMasteryRank",
+    "relicRewardItemCountMultiplier",
+    "nightwaveStandingMultiplier"
 ];
 
 export const configPath = path.join(repoDir, args.configPath ?? "config.json");

src/services/friendService.ts

@@ -1,6 +1,5 @@
 import type { IFriendInfo } from "../types/friendTypes.ts";
 import { getInventory } from "./inventoryService.ts";
-import { config } from "./configService.ts";
 import { Account } from "../models/loginModel.ts";
 import type { Types } from "mongoose";
 import { Friendship } from "../models/friendModel.ts";
@@ -13,8 +12,8 @@ export const addAccountDataToFriendInfo = async (info: IFriendInfo): Promise<voi
 };
 
 export const addInventoryDataToFriendInfo = async (info: IFriendInfo): Promise<void> => {
-    const inventory = await getInventory(fromOid(info._id), "PlayerLevel ActiveAvatarImageType");
+    const inventory = await getInventory(fromOid(info._id), "PlayerLevel ActiveAvatarImageType spoofMasteryRank");
-    info.PlayerLevel = config.spoofMasteryRank == -1 ? inventory.PlayerLevel : config.spoofMasteryRank;
+    info.PlayerLevel = inventory.spoofMasteryRank == -1 ? inventory.PlayerLevel : inventory.spoofMasteryRank;
     info.ActiveAvatarImageType = inventory.ActiveAvatarImageType;
 };
 

src/services/inventoryService.ts

@@ -2131,7 +2131,7 @@ export const addChallenges = async (
                         ];
                 }
 
-                const standingToAdd = meta.standing! * (config.nightwaveStandingMultiplier ?? 1);
+                const standingToAdd = meta.standing! * (inventory.nightwaveStandingMultiplier ?? 1);
                 affiliation.Standing += standingToAdd;
                 if (affiliationMods.length == 0) {
                     affiliationMods.push({ Tag: nightwaveSyndicateTag });

src/types/inventoryTypes/inventoryTypes.ts

@@ -61,6 +61,9 @@ export interface IAccountCheats {
     nemesisHintProgressMultiplierGrineer?: number;
     nemesisHintProgressMultiplierCorpus?: number;
     nemesisExtraWeapon?: number;
+    spoofMasteryRank?: number;
+    relicRewardItemCountMultiplier?: number;
+    nightwaveStandingMultiplier?: number;
 }
 
 export interface IInventoryDatabase

static/webui/index.html

@@ -1071,6 +1071,20 @@
                                     <input class="form-check-input" type="checkbox" id="finishInvasionsInOneMission" />
                                     <label class="form-check-label" for="finishInvasionsInOneMission" data-loc="cheats_finishInvasionsInOneMission"></label>
                                 </div>
+                                <form class="form-group mt-2" onsubmit="doChangeSupportedSyndicate(); return false;">
+                                    <label class="form-label" for="changeSyndicate" data-loc="cheats_changeSupportedSyndicate"></label>
+                                    <div class="input-group">
+                                        <select class="form-control" id="changeSyndicate"></select>
+                                        <button class="btn btn-secondary" type="submit" data-loc="cheats_changeButton"></button>
+                                    </div>
+                                </form>
+                                <form class="form-group mt-2">
+                                    <label class="form-label" for="spoofMasteryRank" data-loc="cheats_spoofMasteryRank"></label>
+                                    <div class="input-group">
+                                        <input class="form-control" id="spoofMasteryRank" type="number" min="-1" max="65535" data-default="-1" />
+                                        <button class="btn btn-secondary" type="button" data-loc="cheats_save"></button>
+                                    </div>
+                                </form>
                                 <form class="form-group mt-2">
                                     <label class="form-label" for="nemesisHenchmenKillsMultiplierGrineer" data-loc="cheats_nemesisHenchmenKillsMultiplierGrineer"></label>
                                     <div class="input-group">
@@ -1113,6 +1127,20 @@
                                         <button class="btn btn-secondary" type="button" data-loc="cheats_save"></button>
                                     </div>
                                 </form>
+                                <form class="form-group mt-2">
+                                    <label class="form-label" for="relicRewardItemCountMultiplier" data-loc="cheats_relicRewardItemCountMultiplier"></label>
+                                    <div class="input-group">
+                                        <input class="form-control" id="relicRewardItemCountMultiplier" type="number" min="1" max="1000000" data-default="1" />
+                                        <button class="btn btn-secondary" type="button" data-loc="cheats_save"></button>
+                                    </div>
+                                </form>
+                                <form class="form-group mt-2">
+                                    <label class="form-label" for="nightwaveStandingMultiplier" data-loc="cheats_nightwaveStandingMultiplier"></label>
+                                    <div class="input-group">
+                                        <input class="form-control" id="nightwaveStandingMultiplier" type="number" min="1" max="1000000" data-default="1" />
+                                        <button class="btn btn-secondary" type="button" data-loc="cheats_save"></button>
+                                    </div>
+                                </form>
                                 <div class="mt-2 mb-2 d-flex flex-wrap gap-2">
                                     <button class="btn btn-primary" onclick="debounce(doUnlockAllShipFeatures);" data-loc="cheats_unlockAllShipFeatures"></button>
                                     <button class="btn btn-primary" onclick="debounce(unlockAllMissions);" data-loc="cheats_unlockAllMissions"></button>
@@ -1127,13 +1155,6 @@
                                     <button class="btn btn-primary" onclick="debounce(unlockAllProfitTakerStages);" data-loc="cheats_unlockAllProfitTakerStages"></button>
                                     <button class="btn btn-primary" onclick="debounce(unlockAllSimarisResearchEntries);" data-loc="cheats_unlockAllSimarisResearchEntries"></button>
                                 </div>
-                                <form class="mt-2" onsubmit="doChangeSupportedSyndicate(); return false;">
-                                    <label class="form-label" for="changeSyndicate" data-loc="cheats_changeSupportedSyndicate"></label>
-                                    <div class="input-group">
-                                        <select class="form-control" id="changeSyndicate"></select>
-                                        <button class="btn btn-secondary" type="submit" data-loc="cheats_changeButton"></button>
-                                    </div>
-                                </form>
                             </div>
                         </div>
                     </div>
@@ -1161,27 +1182,6 @@
                                         <input class="form-check-input" type="checkbox" id="skipClanKeyCrafting" />
                                         <label class="form-check-label" for="skipClanKeyCrafting" data-loc="cheats_skipClanKeyCrafting"></label>
                                     </div>
-                                    <form class="form-group mt-2" onsubmit="doSaveConfigInt('spoofMasteryRank'); return false;">
-                                        <label class="form-label" for="spoofMasteryRank" data-loc="cheats_spoofMasteryRank"></label>
-                                        <div class="input-group">
-                                            <input class="form-control" id="spoofMasteryRank" type="number" min="-1" max="65535" data-default="-1" />
-                                            <button class="btn btn-secondary" type="submit" data-loc="cheats_save"></button>
-                                        </div>
-                                    </form>
-                                    <form class="form-group mt-2" onsubmit="doSaveConfigInt('relicRewardItemCountMultiplier'); return false;">
-                                        <label class="form-label" for="relicRewardItemCountMultiplier" data-loc="cheats_relicRewardItemCountMultiplier"></label>
-                                        <div class="input-group">
-                                            <input class="form-control" id="relicRewardItemCountMultiplier" type="number" min="1" max="1000000" data-default="1" />
-                                            <button class="btn btn-secondary" type="submit" data-loc="cheats_save"></button>
-                                        </div>
-                                    </form>
-                                    <form class="form-group mt-2" onsubmit="doSaveConfigInt('nightwaveStandingMultiplier'); return false;">
-                                        <label class="form-label" for="nightwaveStandingMultiplier" data-loc="cheats_nightwaveStandingMultiplier"></label>
-                                        <div class="input-group">
-                                            <input class="form-control" id="nightwaveStandingMultiplier" type="number" min="1" max="1000000" data-default="1" />
-                                            <button class="btn btn-secondary" type="submit" data-loc="cheats_save"></button>
-                                        </div>
-                                    </form>
                                 </div>
                             </div>
                         </div>