chore: move skipClanKeyCrafting back to config.json (#2690)

Reviewed-on: #2690
Co-authored-by: Sainan <63328889+Sainan@users.noreply.github.com>
Co-committed-by: Sainan <63328889+Sainan@users.noreply.github.com>

config-vanilla.json

@@ -22,6 +22,7 @@
   "baroAlwaysAvailable": false,
   "baroFullyStocked": false,
   "unlockAllProfitTakerStages": false,
+  "skipClanKeyCrafting": false,
   "noDojoRoomBuildStage": false,
   "noDecoBuildStage": false,
   "fastDojoRoomDestruction": false,

src/models/inventoryModels/inventoryModel.ts

@@ -1451,7 +1451,6 @@ const inventorySchema = new Schema<IInventoryDatabase, InventoryDocumentProps>(
         noVendorPurchaseLimits: Boolean,
         noDeathMarks: Boolean,
         noKimCooldowns: Boolean,
-        skipClanKeyCrafting: Boolean,
         claimingBlueprintRefundsIngredients: Boolean,
         instantResourceExtractorDrones: Boolean,
         noResourceExtractorDronesDamage: Boolean,

src/services/configService.ts

@@ -30,6 +30,7 @@ export interface IConfig extends IConfigRemovedOptions {
     baroAlwaysAvailable?: boolean;
     baroFullyStocked?: boolean;
     unlockAllProfitTakerStages?: boolean;
+    skipClanKeyCrafting?: boolean;
     noDojoRoomBuildStage?: boolean;
     noDojoDecoBuildStage?: boolean;
     fastDojoRoomDestruction?: boolean;
@@ -119,8 +120,7 @@ export const configRemovedOptionsKeys = [
     "syndicateMissionsRepeatable",
     "instantFinishRivenChallenge",
     "instantResourceExtractorDrones",
-    "noResourceExtractorDronesDamage",
-    "skipClanKeyCrafting"
+    "noResourceExtractorDronesDamage"
 ] as const;
 
 type IConfigRemovedOptions = {

src/services/guildService.ts

@@ -690,7 +690,7 @@ export const checkClanAscensionHasRequiredContributors = async (guild: TGuildDat
 };
 
 export const giveClanKey = (inventory: TInventoryDatabaseDocument, inventoryChanges?: IInventoryChanges): void => {
-    if (inventory.skipClanKeyCrafting) {
+    if (config.skipClanKeyCrafting) {
         const levelKeyChanges = [
             {
                 ItemType: "/Lotus/Types/Keys/DojoKey",

src/types/inventoryTypes/inventoryTypes.ts

@@ -45,7 +45,6 @@ export interface IAccountCheats {
     noVendorPurchaseLimits?: boolean;
     noDeathMarks?: boolean;
     noKimCooldowns?: boolean;
-    skipClanKeyCrafting?: boolean;
     claimingBlueprintRefundsIngredients?: boolean;
     instantResourceExtractorDrones?: boolean;
     noResourceExtractorDronesDamage?: boolean;

static/webui/index.html

@@ -703,6 +703,10 @@
                                         <input class="form-check-input" type="checkbox" id="unlockAllProfitTakerStages" />
                                         <label class="form-check-label" for="unlockAllProfitTakerStages" data-loc="cheats_unlockAllProfitTakerStages"></label>
                                     </div>
+                                    <div class="form-check">
+                                        <input class="form-check-input" type="checkbox" id="skipClanKeyCrafting" />
+                                        <label class="form-check-label" for="skipClanKeyCrafting" data-loc="cheats_skipClanKeyCrafting"></label>
+                                    </div>
                                     <div class="form-check">
                                         <input class="form-check-input" type="checkbox" id="noDojoRoomBuildStage" />
                                         <label class="form-check-label" for="noDojoRoomBuildStage" data-loc="cheats_noDojoRoomBuildStage"></label>
@@ -884,10 +888,6 @@
                                     <input class="form-check-input" type="checkbox" id="instantResourceExtractorDrones" />
                                     <label class="form-check-label" for="instantResourceExtractorDrones" data-loc="cheats_instantResourceExtractorDrones"></label>
                                 </div>
-                                <div class="form-check">
-                                    <input class="form-check-input" type="checkbox" id="skipClanKeyCrafting" />
-                                    <label class="form-check-label" for="skipClanKeyCrafting" data-loc="cheats_skipClanKeyCrafting"></label>
-                                </div>
                                 <div class="form-check">
                                     <input class="form-check-input" type="checkbox" id="claimingBlueprintRefundsIngredients" />
                                     <label class="form-check-label" for="claimingBlueprintRefundsIngredients" data-loc="cheats_claimingBlueprintRefundsIngredients"></label>