prettier

Re #2312

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

README.md

@@ -35,4 +35,4 @@ SpaceNinjaServer requires a `config.json`. To set it up, you can copy the [confi
   - `RadioLegionIntermissionSyndicate` for Intermission I
   - `RadioLegionSyndicate` for The Wolf of Saturn Six
 - `allTheFissures` can be set to `normal` or `hard` to enable all fissures either in normal or steel path, respectively.
-- `worldState.circuitGameModes` can be provided with an array of valid game modes (`Survival`, `VoidFlood`, `Excavation`, `Defense`, `Exterminate`, `Assassination`, `Alchemy`)
+- `worldState.circuitGameModes` can be set to an array of game modes which will override the otherwise-random pattern in The Circuit. Valid element values are `Survival`, `VoidFlood`, `Excavation`, `Defense`, `Exterminate`, `Assassination`, and `Alchemy`.

config.json.example

@@ -39,6 +39,7 @@
   "noArgonCrystalDecay": false,
   "noMasteryRankUpCooldown": false,
   "noVendorPurchaseLimits": false,
+  "noDarvoDealPurchaseLimit": false,
   "noDeathMarks": false,
   "noKimCooldowns": false,
   "fullyStockedVendors": false,
@@ -75,7 +76,8 @@
     "duviriOverride": "",
     "nightwaveOverride": "",
     "allTheFissures": "",
-    "circuitGameModes": null
+    "circuitGameModes": null,
+    "darvoStockMultiplier": 1
   },
   "dev": {
     "keepVendorsExpired": false

src/controllers/api/getDailyDealStockLevelsController.ts

@@ -1,8 +1,10 @@
+import { DailyDeal } from "@/src/models/worldStateModel";
 import { RequestHandler } from "express";
 
-export const getDailyDealStockLevelsController: RequestHandler = (req, res) => {
+export const getDailyDealStockLevelsController: RequestHandler = async (req, res) => {
+    const dailyDeal = (await DailyDeal.findOne({ StoreItem: req.query.productName }, "AmountSold"))!;
     res.json({
         StoreItem: req.query.productName,
-        AmountSold: 0
+        AmountSold: dailyDeal.AmountSold
     });
 };

src/controllers/api/giftingController.ts

@@ -9,15 +9,26 @@ import {
     updateCurrency
 } from "@/src/services/inventoryService";
 import { getAccountForRequest, getSuffixedName } from "@/src/services/loginService";
-import { handleStoreItemAcquisition } from "@/src/services/purchaseService";
+import { handleDailyDealPurchase, handleStoreItemAcquisition } from "@/src/services/purchaseService";
 import { IOid } from "@/src/types/commonTypes";
-import { IInventoryChanges, IPurchaseParams, PurchaseSource } from "@/src/types/purchaseTypes";
+import { IPurchaseParams, IPurchaseResponse, PurchaseSource } from "@/src/types/purchaseTypes";
 import { RequestHandler } from "express";
 import { ExportBundles, ExportFlavour } from "warframe-public-export-plus";
 
+const checkPurchaseParams = (params: IPurchaseParams): boolean => {
+    switch (params.Source) {
+        case PurchaseSource.Market:
+            return params.UsePremium;
+
+        case PurchaseSource.DailyDeal:
+            return true;
+    }
+    return false;
+};
+
 export const giftingController: RequestHandler = async (req, res) => {
     const data = getJSONfromString<IGiftingRequest>(String(req.body));
-    if (data.PurchaseParams.Source != PurchaseSource.Market || !data.PurchaseParams.UsePremium) {
+    if (!checkPurchaseParams(data.PurchaseParams)) {
         throw new Error(`unexpected purchase params in gifting request: ${String(req.body)}`);
     }
 
@@ -58,16 +69,19 @@ export const giftingController: RequestHandler = async (req, res) => {
     }
     senderInventory.GiftsRemaining -= 1;
 
-    const inventoryChanges: IInventoryChanges = updateCurrency(
+    const response: IPurchaseResponse = {
-        senderInventory,
+        InventoryChanges: {}
-        data.PurchaseParams.ExpectedPrice,
+    };
-        true
+    if (data.PurchaseParams.Source == PurchaseSource.DailyDeal) {
-    );
+        await handleDailyDealPurchase(senderInventory, data.PurchaseParams, response);
+    } else {
+        updateCurrency(senderInventory, data.PurchaseParams.ExpectedPrice, true, response.InventoryChanges);
+    }
     if (data.PurchaseParams.StoreItem in ExportBundles) {
         const bundle = ExportBundles[data.PurchaseParams.StoreItem];
         if (bundle.giftingBonus) {
             combineInventoryChanges(
-                inventoryChanges,
+                response.InventoryChanges,
                 (await handleStoreItemAcquisition(bundle.giftingBonus, senderInventory)).InventoryChanges
             );
         }
@@ -99,9 +113,7 @@ export const giftingController: RequestHandler = async (req, res) => {
         }
     ]);
 
-    res.json({
+    res.json(response);
-        InventoryChanges: inventoryChanges
-    });
 };
 
 interface IGiftingRequest {

src/controllers/custom/getItemListsController.ts

@@ -55,6 +55,7 @@ interface ItemLists {
     EvolutionProgress: ListedItem[];
     mods: ListedItem[];
     Boosters: ListedItem[];
+    //circuitGameModes: ListedItem[];
 }
 
 const relicQualitySuffixes: Record<TRelicQuality, string> = {
@@ -64,6 +65,10 @@ const relicQualitySuffixes: Record<TRelicQuality, string> = {
     VPQ_PLATINUM: " [Exceptional]"
 };
 
+/*const toTitleCase = (str: string): string => {
+    return str.replace(/[^\s-]+/g, word => word.charAt(0).toUpperCase() + word.substr(1).toLowerCase());
+};*/
+
 const getItemListsController: RequestHandler = (req, response) => {
     const lang = getDict(typeof req.query.lang == "string" ? req.query.lang : "en");
     const res: ItemLists = {
@@ -87,6 +92,36 @@ const getItemListsController: RequestHandler = (req, response) => {
         EvolutionProgress: [],
         mods: [],
         Boosters: []
+        /*circuitGameModes: [
+            {
+                uniqueName: "Survival",
+                name: toTitleCase(getString("/Lotus/Language/Missions/MissionName_Survival", lang))
+            },
+            {
+                uniqueName: "VoidFlood",
+                name: toTitleCase(getString("/Lotus/Language/Missions/MissionName_Corruption", lang))
+            },
+            {
+                uniqueName: "Excavation",
+                name: toTitleCase(getString("/Lotus/Language/Missions/MissionName_Excavation", lang))
+            },
+            {
+                uniqueName: "Defense",
+                name: toTitleCase(getString("/Lotus/Language/Missions/MissionName_Defense", lang))
+            },
+            {
+                uniqueName: "Exterminate",
+                name: toTitleCase(getString("/Lotus/Language/Missions/MissionName_Exterminate", lang))
+            },
+            {
+                uniqueName: "Assassination",
+                name: toTitleCase(getString("/Lotus/Language/Missions/MissionName_Assassination", lang))
+            },
+            {
+                uniqueName: "Alchemy",
+                name: toTitleCase(getString("/Lotus/Language/Missions/MissionName_Alchemy", lang))
+            }
+        ]*/
     };
     for (const [uniqueName, item] of Object.entries(ExportWarframes)) {
         res[item.productCategory].push({

src/controllers/dynamic/worldStateController.ts

@@ -1,15 +1,19 @@
 import { RequestHandler } from "express";
-import { getWorldState, populateFissures } from "@/src/services/worldStateService";
+import { getWorldState, populateDailyDeal, populateFissures } from "@/src/services/worldStateService";
 import { version_compare } from "@/src/helpers/inventoryHelpers";
 
 export const worldStateController: RequestHandler = async (req, res) => {
     const buildLabel = req.query.buildLabel as string | undefined;
     const worldState = getWorldState(buildLabel);
 
+    const populatePromises = [populateDailyDeal(worldState)];
+
     // Omitting void fissures for versions prior to Dante Unbound to avoid script errors.
     if (!buildLabel || version_compare(buildLabel, "2024.03.24.20.00") >= 0) {
-        await populateFissures(worldState);
+        populatePromises.push(populateFissures(worldState));
     }
 
+    await Promise.all(populatePromises);
+
     res.json(worldState);
 };

src/models/inventoryModels/inventoryModel.ts

@@ -1625,6 +1625,9 @@ const inventorySchema = new Schema<IInventoryDatabase, InventoryDocumentProps>(
         PendingSpectreLoadouts: { type: [spectreLoadoutsSchema], default: undefined },
         SpectreLoadouts: { type: [spectreLoadoutsSchema], default: undefined },
 
+        //Darvo Deal
+        UsedDailyDeals: [String],
+
         //New Quest Email
         EmailItems: [typeCountSchema],
 
@@ -1741,7 +1744,6 @@ const inventorySchema = new Schema<IInventoryDatabase, InventoryDocumentProps>(
         //ChallengeInstanceStates: [Schema.Types.Mixed],
         RecentVendorPurchases: { type: [recentVendorPurchaseSchema], default: undefined },
         //Robotics: [Schema.Types.Mixed],
-        //UsedDailyDeals: [Schema.Types.Mixed],
         CollectibleSeries: { type: [collectibleEntrySchema], default: undefined },
         HasResetAccount: { type: Boolean, default: false },
 

src/models/worldStateModel.ts

@@ -1,4 +1,4 @@
-import { IFissureDatabase } from "@/src/types/worldStateTypes";
+import { IDailyDealDatabase, IFissureDatabase } from "@/src/types/worldStateTypes";
 import { model, Schema } from "mongoose";
 
 const fissureSchema = new Schema<IFissureDatabase>({
@@ -12,3 +12,19 @@ const fissureSchema = new Schema<IFissureDatabase>({
 fissureSchema.index({ Expiry: 1 }, { expireAfterSeconds: 0 }); // With this, MongoDB will automatically delete expired entries.
 
 export const Fissure = model<IFissureDatabase>("Fissure", fissureSchema);
+
+const dailyDealSchema = new Schema<IDailyDealDatabase>({
+    StoreItem: { type: String, required: true },
+    Activation: { type: Date, required: true },
+    Expiry: { type: Date, required: true },
+    Discount: { type: Number, required: true },
+    OriginalPrice: { type: Number, required: true },
+    SalePrice: { type: Number, required: true },
+    AmountTotal: { type: Number, required: true },
+    AmountSold: { type: Number, required: true }
+});
+
+dailyDealSchema.index({ StoreItem: 1 }, { unique: true });
+dailyDealSchema.index({ Expiry: 1 }, { expireAfterSeconds: 0 });
+
+export const DailyDeal = model<IDailyDealDatabase>("DailyDeal", dailyDealSchema);

src/services/configService.ts

@@ -46,6 +46,7 @@ export interface IConfig {
     noArgonCrystalDecay?: boolean;
     noMasteryRankUpCooldown?: boolean;
     noVendorPurchaseLimits?: boolean;
+    noDarvoDealPurchaseLimit?: boolean;
     noDeathMarks?: boolean;
     noKimCooldowns?: boolean;
     fullyStockedVendors?: boolean;
@@ -83,6 +84,7 @@ export interface IConfig {
         nightwaveOverride?: string;
         allTheFissures?: string;
         circuitGameModes?: string[];
+        darvoStockMultiplier?: number;
     };
     dev?: {
         keepVendorsExpired?: boolean;

src/services/purchaseService.ts

@@ -16,7 +16,8 @@ import {
     IPurchaseResponse,
     SlotPurchase,
     IInventoryChanges,
-    PurchaseSource
+    PurchaseSource,
+    IPurchaseParams
 } from "@/src/types/purchaseTypes";
 import { logger } from "@/src/utils/logger";
 import { getWorldState } from "./worldStateService";
@@ -35,6 +36,7 @@ import {
 import { config } from "./configService";
 import { TInventoryDatabaseDocument } from "../models/inventoryModels/inventoryModel";
 import { fromStoreItem, toStoreItem } from "./itemDataService";
+import { DailyDeal } from "../models/worldStateModel";
 
 export const getStoreItemCategory = (storeItem: string): string => {
     const storeItemString = getSubstringFromKeyword(storeItem, "StoreItems/");
@@ -240,6 +242,12 @@ export const handlePurchase = async (
                 }
             }
             break;
+        case PurchaseSource.DailyDeal:
+            if (purchaseRequest.PurchaseParams.ExpectedPrice) {
+                throw new Error(`daily deal purchase should not have an expected price`);
+            }
+            await handleDailyDealPurchase(inventory, purchaseRequest.PurchaseParams, purchaseResponse);
+            break;
         case PurchaseSource.Vendor:
             if (purchaseRequest.PurchaseParams.SourceId! in ExportVendors) {
                 const vendor = ExportVendors[purchaseRequest.PurchaseParams.SourceId!];
@@ -328,6 +336,25 @@ const handleItemPrices = (
     }
 };
 
+export const handleDailyDealPurchase = async (
+    inventory: TInventoryDatabaseDocument,
+    purchaseParams: IPurchaseParams,
+    purchaseResponse: IPurchaseResponse
+): Promise<void> => {
+    const dailyDeal = (await DailyDeal.findOne({ StoreItem: purchaseParams.StoreItem }))!;
+    dailyDeal.AmountSold += 1;
+    await dailyDeal.save();
+
+    if (!config.dontSubtractPurchasePlatinumCost) {
+        updateCurrency(inventory, dailyDeal.SalePrice, true, purchaseResponse.InventoryChanges);
+    }
+
+    if (!config.noDarvoDealPurchaseLimit) {
+        inventory.UsedDailyDeals.push(purchaseParams.StoreItem);
+        purchaseResponse.DailyDealUsed = purchaseParams.StoreItem;
+    }
+};
+
 export const handleBundleAcqusition = async (
     storeItemName: string,
     inventory: TInventoryDatabaseDocument,

src/services/worldStateService.ts

@@ -4,6 +4,7 @@ import fissureMissions from "@/static/fixed_responses/worldState/fissureMissions
 import sortieTilesets from "@/static/fixed_responses/worldState/sortieTilesets.json";
 import sortieTilesetMissions from "@/static/fixed_responses/worldState/sortieTilesetMissions.json";
 import syndicateMissions from "@/static/fixed_responses/worldState/syndicateMissions.json";
+import darvoDeals from "@/static/fixed_responses/worldState/darvoDeals.json";
 import { buildConfig } from "@/src/services/buildConfigService";
 import { unixTimesInMs } from "@/src/constants/timeConstants";
 import { config } from "@/src/services/configService";
@@ -27,7 +28,7 @@ import {
 } from "../types/worldStateTypes";
 import { toMongoDate, toOid, version_compare } from "../helpers/inventoryHelpers";
 import { logger } from "../utils/logger";
-import { Fissure } from "../models/worldStateModel";
+import { DailyDeal, Fissure } from "../models/worldStateModel";
 
 const sortieBosses = [
     "SORTIE_BOSS_HYENA",
@@ -1122,6 +1123,7 @@ export const getWorldState = (buildLabel?: string): IWorldState => {
         GlobalUpgrades: [],
         VoidTraders: [],
         VoidStorms: [],
+        DailyDeals: [],
         EndlessXpChoices: [],
         KnownCalendarSeasons: [],
         ...staticWorldState,
@@ -1561,6 +1563,22 @@ export const populateFissures = async (worldState: IWorldState): Promise<void> =
     }
 };
 
+export const populateDailyDeal = async (worldState: IWorldState): Promise<void> => {
+    const dailyDeals = await DailyDeal.find({});
+    for (const dailyDeal of dailyDeals) {
+        worldState.DailyDeals.push({
+            StoreItem: dailyDeal.StoreItem,
+            Activation: toMongoDate(dailyDeal.Activation),
+            Expiry: toMongoDate(dailyDeal.Expiry),
+            Discount: dailyDeal.Discount,
+            OriginalPrice: dailyDeal.OriginalPrice,
+            SalePrice: dailyDeal.SalePrice,
+            AmountTotal: Math.round(dailyDeal.AmountTotal * (config.worldState?.darvoStockMultiplier ?? 1)),
+            AmountSold: dailyDeal.AmountSold
+        });
+    }
+};
+
 export const idToBountyCycle = (id: string): number => {
     return Math.trunc((parseInt(id.substring(0, 8), 16) * 1000) / 9000_000);
 };
@@ -1689,7 +1707,7 @@ const nightwaveTagToSeason: Record<string, number> = {
     RadioLegionSyndicate: 0 // The Wolf of Saturn Six
 };
 
-export const updateWorldStateCollections = async (): Promise<void> => {
+const updateFissures = async (): Promise<void> => {
     const fissures = await Fissure.find();
 
     const activeNodes = new Set<string>();
@@ -1742,3 +1760,38 @@ export const updateWorldStateCollections = async (): Promise<void> => {
         }
     }
 };
+
+const updateDailyDeal = async (): Promise<void> => {
+    let darvoIndex = Math.trunc((Date.now() - 25200000) / (26 * unixTimesInMs.hour));
+    let darvoEnd;
+    do {
+        const darvoStart = darvoIndex * (26 * unixTimesInMs.hour) + 25200000;
+        darvoEnd = darvoStart + 26 * unixTimesInMs.hour;
+        const darvoOid = ((darvoStart / 1000) & 0xffffffff).toString(16).padStart(8, "0") + "adc51a72f7324d95";
+        if (!(await DailyDeal.findById(darvoOid))) {
+            const seed = new SRng(darvoIndex).randomInt(0, 100_000);
+            const rng = new SRng(seed);
+            let deal;
+            do {
+                deal = rng.randomReward(darvoDeals)!; // Using an actual sampling collected over roughly a year because I can't extrapolate an algorithm from it with enough certainty.
+                //const [storeItem, meta] = rng.randomElement(Object.entries(darvoDeals))!;
+                //const discount = Math.min(rng.randomInt(1, 9) * 10, (meta as { MaxDiscount?: number }).MaxDiscount ?? 1);
+            } while (await DailyDeal.exists({ StoreItem: deal.StoreItem }));
+            await DailyDeal.insertOne({
+                _id: darvoOid,
+                StoreItem: deal.StoreItem,
+                Activation: new Date(darvoStart),
+                Expiry: new Date(darvoEnd),
+                Discount: deal.Discount,
+                OriginalPrice: deal.OriginalPrice,
+                SalePrice: deal.SalePrice, //Math.trunc(deal.OriginalPrice * (1 - discount))
+                AmountTotal: deal.AmountTotal,
+                AmountSold: 0
+            });
+        }
+    } while (darvoEnd < Date.now() + 6 * unixTimesInMs.minute && ++darvoIndex);
+};
+
+export const updateWorldStateCollections = async (): Promise<void> => {
+    await Promise.all([updateFissures(), updateDailyDeal()]);
+};

src/types/inventoryTypes/inventoryTypes.ts

@@ -287,6 +287,7 @@ export interface IInventoryClient extends IDailyAffiliations, InventoryClientEqu
     ArchwingEnabled?: boolean;
     PendingSpectreLoadouts?: ISpectreLoadout[];
     SpectreLoadouts?: ISpectreLoadout[];
+    UsedDailyDeals: string[];
     EmailItems: ITypeCount[];
     CompletedSyndicates: string[];
     FocusXP?: IFocusXP;
@@ -351,7 +352,6 @@ export interface IInventoryClient extends IDailyAffiliations, InventoryClientEqu
     //LeagueTickets: any[];
     //Quests: any[];
     //Robotics: any[];
-    //UsedDailyDeals: any[];
     LibraryPersonalTarget?: string;
     LibraryPersonalProgress: ILibraryPersonalProgress[];
     CollectibleSeries?: ICollectibleEntry[];

src/types/purchaseTypes.ts

@@ -105,6 +105,7 @@ export interface IPurchaseResponse {
     Standing?: IAffiliationMods[];
     FreeFavorsUsed?: IAffiliationMods[];
     BoosterPackItems?: string;
+    DailyDealUsed?: string;
 }
 
 export type IBinChanges = {

src/types/worldStateTypes.ts

@@ -15,6 +15,7 @@ export interface IWorldState {
     NodeOverrides: INodeOverride[];
     VoidTraders: IVoidTrader[];
     VoidStorms: IVoidStorm[];
+    DailyDeals: IDailyDeal[];
     PVPChallengeInstances: IPVPChallengeInstance[];
     EndlessXpChoices: IEndlessXpChoice[];
     SeasonInfo?: {
@@ -169,6 +170,28 @@ export interface IVoidStorm {
     ActiveMissionTier: string;
 }
 
+export interface IDailyDeal {
+    StoreItem: string;
+    Activation: IMongoDate;
+    Expiry: IMongoDate;
+    Discount: number;
+    OriginalPrice: number;
+    SalePrice: number;
+    AmountTotal: number;
+    AmountSold: number;
+}
+
+export interface IDailyDealDatabase {
+    StoreItem: string;
+    Activation: Date;
+    Expiry: Date;
+    Discount: number;
+    OriginalPrice: number;
+    SalePrice: number;
+    AmountTotal: number;
+    AmountSold: number;
+}
+
 export interface IPVPChallengeInstance {
     _id: IOid;
     challengeTypeRefID: string;

static/fixed_responses/worldState/darvoDeals.json

@@ -0,0 +1,158 @@
+[
+  { "StoreItem": "/Lotus/StoreItems/Powersuits/Archwing/DemolitionJetPack/DemolitionJetPack", "Discount": 60, "OriginalPrice": 275, "SalePrice": 110, "AmountTotal": 300, "probability": 2 },
+  { "StoreItem": "/Lotus/StoreItems/Powersuits/Bard/Bard", "Discount": 30, "OriginalPrice": 225, "SalePrice": 157, "AmountTotal": 100, "probability": 1 },
+  { "StoreItem": "/Lotus/StoreItems/Powersuits/Ember/Ember", "Discount": 30, "OriginalPrice": 225, "SalePrice": 157, "AmountTotal": 100, "probability": 1 },
+  { "StoreItem": "/Lotus/StoreItems/Powersuits/Ember/Ember", "Discount": 60, "OriginalPrice": 225, "SalePrice": 90, "AmountTotal": 100, "probability": 1 },
+  { "StoreItem": "/Lotus/StoreItems/Powersuits/Magician/Magician", "Discount": 20, "OriginalPrice": 200, "SalePrice": 160, "AmountTotal": 200, "probability": 1 },
+  { "StoreItem": "/Lotus/StoreItems/Powersuits/Magician/Magician", "Discount": 30, "OriginalPrice": 200, "SalePrice": 140, "AmountTotal": 200, "probability": 1 },
+  { "StoreItem": "/Lotus/StoreItems/Powersuits/Magician/Magician", "Discount": 40, "OriginalPrice": 200, "SalePrice": 120, "AmountTotal": 200, "probability": 1 },
+  { "StoreItem": "/Lotus/StoreItems/Powersuits/Magician/Magician", "Discount": 50, "OriginalPrice": 200, "SalePrice": 100, "AmountTotal": 200, "probability": 2 },
+  { "StoreItem": "/Lotus/StoreItems/Powersuits/Sandman/Sandman", "Discount": 20, "OriginalPrice": 225, "SalePrice": 180, "AmountTotal": 100, "probability": 4 },
+  { "StoreItem": "/Lotus/StoreItems/Powersuits/Sandman/Sandman", "Discount": 30, "OriginalPrice": 225, "SalePrice": 157, "AmountTotal": 100, "probability": 1 },
+  { "StoreItem": "/Lotus/StoreItems/Powersuits/Trapper/Trapper", "Discount": 40, "OriginalPrice": 300, "SalePrice": 180, "AmountTotal": 150, "probability": 3 },
+  { "StoreItem": "/Lotus/StoreItems/Powersuits/Trapper/Trapper", "Discount": 50, "OriginalPrice": 300, "SalePrice": 150, "AmountTotal": 100, "probability": 3 },
+  { "StoreItem": "/Lotus/StoreItems/Types/Game/CatbrowPet/CatbrowGeneticSignature", "Discount": 20, "OriginalPrice": 5, "SalePrice": 4, "AmountTotal": 500, "probability": 1 },
+  { "StoreItem": "/Lotus/StoreItems/Types/Game/CatbrowPet/CatbrowGeneticSignature", "Discount": 30, "OriginalPrice": 5, "SalePrice": 3, "AmountTotal": 415, "probability": 1 },
+  { "StoreItem": "/Lotus/StoreItems/Types/Game/KubrowPet/Eggs/KubrowEgg", "Discount": 50, "OriginalPrice": 10, "SalePrice": 5, "AmountTotal": 100, "probability": 1 },
+  { "StoreItem": "/Lotus/StoreItems/Types/Game/KubrowPet/Eggs/KubrowEgg", "Discount": 60, "OriginalPrice": 10, "SalePrice": 4, "AmountTotal": 100, "probability": 3 },
+  { "StoreItem": "/Lotus/StoreItems/Types/Items/MiscItems/Forma", "Discount": 30, "OriginalPrice": 20, "SalePrice": 14, "AmountTotal": 150, "probability": 1 },
+  { "StoreItem": "/Lotus/StoreItems/Types/Items/MiscItems/Forma", "Discount": 45, "OriginalPrice": 20, "SalePrice": 11, "AmountTotal": 150, "probability": 2 },
+  { "StoreItem": "/Lotus/StoreItems/Types/Items/MiscItems/OrokinReactor", "Discount": 40, "OriginalPrice": 20, "SalePrice": 12, "AmountTotal": 100, "probability": 1 },
+  { "StoreItem": "/Lotus/StoreItems/Types/Items/Research/BioComponent", "Discount": 10, "OriginalPrice": 10, "SalePrice": 9, "AmountTotal": 200, "probability": 2 },
+  { "StoreItem": "/Lotus/StoreItems/Types/Items/Research/BioComponent", "Discount": 20, "OriginalPrice": 10, "SalePrice": 8, "AmountTotal": 165, "probability": 2 },
+  { "StoreItem": "/Lotus/StoreItems/Types/Items/Research/BioComponent", "Discount": 30, "OriginalPrice": 10, "SalePrice": 7, "AmountTotal": 135, "probability": 5 },
+  { "StoreItem": "/Lotus/StoreItems/Types/Items/Research/BioComponent", "Discount": 40, "OriginalPrice": 10, "SalePrice": 6, "AmountTotal": 100, "probability": 5 },
+  { "StoreItem": "/Lotus/StoreItems/Types/Items/Research/ChemComponent", "Discount": 10, "OriginalPrice": 10, "SalePrice": 9, "AmountTotal": 200, "probability": 3 },
+  { "StoreItem": "/Lotus/StoreItems/Types/Items/Research/ChemComponent", "Discount": 20, "OriginalPrice": 10, "SalePrice": 8, "AmountTotal": 165, "probability": 5 },
+  { "StoreItem": "/Lotus/StoreItems/Types/Items/Research/ChemComponent", "Discount": 30, "OriginalPrice": 10, "SalePrice": 7, "AmountTotal": 135, "probability": 2 },
+  { "StoreItem": "/Lotus/StoreItems/Types/Items/Research/EnergyComponent", "Discount": 10, "OriginalPrice": 10, "SalePrice": 9, "AmountTotal": 200, "probability": 5 },
+  { "StoreItem": "/Lotus/StoreItems/Types/Items/Research/EnergyComponent", "Discount": 20, "OriginalPrice": 10, "SalePrice": 8, "AmountTotal": 165, "probability": 2 },
+  { "StoreItem": "/Lotus/StoreItems/Types/Items/Research/EnergyComponent", "Discount": 30, "OriginalPrice": 10, "SalePrice": 7, "AmountTotal": 135, "probability": 1 },
+  { "StoreItem": "/Lotus/StoreItems/Types/Items/Research/EnergyComponent", "Discount": 40, "OriginalPrice": 10, "SalePrice": 6, "AmountTotal": 100, "probability": 2 },
+  { "StoreItem": "/Lotus/StoreItems/Upgrades/Focus/AttackLensGreater", "Discount": 10, "OriginalPrice": 40, "SalePrice": 36, "AmountTotal": 150, "probability": 1 },
+  { "StoreItem": "/Lotus/StoreItems/Upgrades/Focus/AttackLensGreater", "Discount": 20, "OriginalPrice": 40, "SalePrice": 32, "AmountTotal": 125, "probability": 1 },
+  { "StoreItem": "/Lotus/StoreItems/Upgrades/Focus/AttackLensGreater", "Discount": 40, "OriginalPrice": 40, "SalePrice": 24, "AmountTotal": 75, "probability": 1 },
+  { "StoreItem": "/Lotus/StoreItems/Upgrades/Focus/DefenseLensGreater", "Discount": 10, "OriginalPrice": 40, "SalePrice": 36, "AmountTotal": 150, "probability": 2 },
+  { "StoreItem": "/Lotus/StoreItems/Upgrades/Focus/DefenseLensGreater", "Discount": 40, "OriginalPrice": 40, "SalePrice": 24, "AmountTotal": 75, "probability": 1 },
+  { "StoreItem": "/Lotus/StoreItems/Upgrades/Focus/DefenseLensGreater", "Discount": 50, "OriginalPrice": 40, "SalePrice": 20, "AmountTotal": 50, "probability": 2 },
+  { "StoreItem": "/Lotus/StoreItems/Upgrades/Focus/PowerLensGreater", "Discount": 50, "OriginalPrice": 40, "SalePrice": 20, "AmountTotal": 50, "probability": 1 },
+  { "StoreItem": "/Lotus/StoreItems/Upgrades/Focus/TacticLensGreater", "Discount": 10, "OriginalPrice": 40, "SalePrice": 36, "AmountTotal": 150, "probability": 1 },
+  { "StoreItem": "/Lotus/StoreItems/Upgrades/Focus/TacticLensGreater", "Discount": 20, "OriginalPrice": 40, "SalePrice": 32, "AmountTotal": 125, "probability": 2 },
+  { "StoreItem": "/Lotus/StoreItems/Upgrades/Focus/TacticLensGreater", "Discount": 30, "OriginalPrice": 40, "SalePrice": 28, "AmountTotal": 100, "probability": 1 },
+  { "StoreItem": "/Lotus/StoreItems/Upgrades/Focus/TacticLensGreater", "Discount": 40, "OriginalPrice": 40, "SalePrice": 24, "AmountTotal": 75, "probability": 1 },
+  { "StoreItem": "/Lotus/StoreItems/Upgrades/Focus/TacticLensGreater", "Discount": 50, "OriginalPrice": 40, "SalePrice": 20, "AmountTotal": 50, "probability": 1 },
+  { "StoreItem": "/Lotus/StoreItems/Upgrades/Focus/WardLensGreater", "Discount": 40, "OriginalPrice": 40, "SalePrice": 24, "AmountTotal": 75, "probability": 1 },
+  { "StoreItem": "/Lotus/StoreItems/Weapons/Corpus/Bow/Longbow/CrpBow", "Discount": 20, "OriginalPrice": 235, "SalePrice": 188, "AmountTotal": 300, "probability": 2 },
+  { "StoreItem": "/Lotus/StoreItems/Weapons/Corpus/Bow/Longbow/CrpBow", "Discount": 30, "OriginalPrice": 235, "SalePrice": 164, "AmountTotal": 250, "probability": 1 },
+  { "StoreItem": "/Lotus/StoreItems/Weapons/Corpus/Bow/Longbow/CrpBow", "Discount": 50, "OriginalPrice": 235, "SalePrice": 117, "AmountTotal": 150, "probability": 2 },
+  { "StoreItem": "/Lotus/StoreItems/Weapons/Corpus/Bow/Longbow/CrpBow", "Discount": 60, "OriginalPrice": 235, "SalePrice": 94, "AmountTotal": 100, "probability": 5 },
+  { "StoreItem": "/Lotus/StoreItems/Weapons/Corpus/Melee/KickAndPunch/KickPunchWeapon", "Discount": 20, "OriginalPrice": 125, "SalePrice": 100, "AmountTotal": 100, "probability": 2 },
+  { "StoreItem": "/Lotus/StoreItems/Weapons/Corpus/Melee/KickAndPunch/KickPunchWeapon", "Discount": 30, "OriginalPrice": 125, "SalePrice": 87, "AmountTotal": 90, "probability": 3 },
+  { "StoreItem": "/Lotus/StoreItems/Weapons/Corpus/Melee/KickAndPunch/KickPunchWeapon", "Discount": 60, "OriginalPrice": 125, "SalePrice": 50, "AmountTotal": 65, "probability": 3 },
+  { "StoreItem": "/Lotus/StoreItems/Weapons/Corpus/Pistols/CorpusMinigun/CorpusMinigun", "Discount": 30, "OriginalPrice": 175, "SalePrice": 122, "AmountTotal": 100, "probability": 1 },
+  { "StoreItem": "/Lotus/StoreItems/Weapons/Corpus/Pistols/CorpusMinigun/CorpusMinigun", "Discount": 40, "OriginalPrice": 175, "SalePrice": 105, "AmountTotal": 90, "probability": 2 },
+  { "StoreItem": "/Lotus/StoreItems/Weapons/Corpus/Pistols/CorpusMinigun/CorpusMinigun", "Discount": 50, "OriginalPrice": 175, "SalePrice": 87, "AmountTotal": 80, "probability": 3 },
+  { "StoreItem": "/Lotus/StoreItems/Weapons/Corpus/Pistols/CorpusMinigun/CorpusMinigun", "Discount": 60, "OriginalPrice": 175, "SalePrice": 70, "AmountTotal": 70, "probability": 2 },
+  { "StoreItem": "/Lotus/StoreItems/Weapons/Corpus/Pistols/CorpusMinigun/CorpusMinigun", "Discount": 70, "OriginalPrice": 175, "SalePrice": 52, "AmountTotal": 60, "probability": 1 },
+  { "StoreItem": "/Lotus/StoreItems/Weapons/Grineer/GrineerPistol/GrineerLightPistol", "Discount": 10, "OriginalPrice": 75, "SalePrice": 67, "AmountTotal": 100, "probability": 6 },
+  { "StoreItem": "/Lotus/StoreItems/Weapons/Grineer/GrineerPistol/GrineerLightPistol", "Discount": 20, "OriginalPrice": 75, "SalePrice": 60, "AmountTotal": 100, "probability": 2 },
+  { "StoreItem": "/Lotus/StoreItems/Weapons/Grineer/GrineerPistol/GrineerLightPistol", "Discount": 30, "OriginalPrice": 75, "SalePrice": 52, "AmountTotal": 100, "probability": 1 },
+  { "StoreItem": "/Lotus/StoreItems/Weapons/Grineer/LongGuns/BurstRifle/GrnBurstRifle", "Discount": 30, "OriginalPrice": 225, "SalePrice": 157, "AmountTotal": 500, "probability": 2 },
+  { "StoreItem": "/Lotus/StoreItems/Weapons/Grineer/LongGuns/BurstRifle/GrnBurstRifle", "Discount": 40, "OriginalPrice": 225, "SalePrice": 135, "AmountTotal": 500, "probability": 1 },
+  { "StoreItem": "/Lotus/StoreItems/Weapons/Grineer/LongGuns/BurstRifle/GrnBurstRifle", "Discount": 60, "OriginalPrice": 225, "SalePrice": 90, "AmountTotal": 500, "probability": 3 },
+  { "StoreItem": "/Lotus/StoreItems/Weapons/Grineer/LongGuns/GrnSpark/GrnSparkRifle", "Discount": 20, "OriginalPrice": 150, "SalePrice": 120, "AmountTotal": 300, "probability": 2 },
+  { "StoreItem": "/Lotus/StoreItems/Weapons/Grineer/LongGuns/GrnSpark/GrnSparkRifle", "Discount": 30, "OriginalPrice": 150, "SalePrice": 105, "AmountTotal": 250, "probability": 4 },
+  { "StoreItem": "/Lotus/StoreItems/Weapons/Grineer/LongGuns/GrnSpark/GrnSparkRifle", "Discount": 50, "OriginalPrice": 150, "SalePrice": 75, "AmountTotal": 150, "probability": 4 },
+  { "StoreItem": "/Lotus/StoreItems/Weapons/Grineer/Melee/GrineerMachetteAndCleaver/DualCleaverWeapon", "Discount": 30, "OriginalPrice": 225, "SalePrice": 157, "AmountTotal": 200, "probability": 3 },
+  { "StoreItem": "/Lotus/StoreItems/Weapons/Grineer/Melee/GrineerMachetteAndCleaver/DualCleaverWeapon", "Discount": 40, "OriginalPrice": 225, "SalePrice": 135, "AmountTotal": 175, "probability": 4 },
+  { "StoreItem": "/Lotus/StoreItems/Weapons/Grineer/Melee/GrineerMachetteAndCleaver/DualCleaverWeapon", "Discount": 50, "OriginalPrice": 225, "SalePrice": 112, "AmountTotal": 150, "probability": 2 },
+  { "StoreItem": "/Lotus/StoreItems/Weapons/Grineer/Melee/GrineerMachetteAndCleaver/DualCleaverWeapon", "Discount": 60, "OriginalPrice": 225, "SalePrice": 90, "AmountTotal": 125, "probability": 5 },
+  { "StoreItem": "/Lotus/StoreItems/Weapons/Grineer/Melee/GrineerMachetteAndCleaver/DualCleaverWeapon", "Discount": 70, "OriginalPrice": 225, "SalePrice": 67, "AmountTotal": 100, "probability": 3 },
+  { "StoreItem": "/Lotus/StoreItems/Weapons/Infested/Melee/Swords/Mire/MireSword", "Discount": 10, "OriginalPrice": 150, "SalePrice": 135, "AmountTotal": 300, "probability": 1 },
+  { "StoreItem": "/Lotus/StoreItems/Weapons/Infested/Melee/Swords/Mire/MireSword", "Discount": 20, "OriginalPrice": 150, "SalePrice": 120, "AmountTotal": 270, "probability": 1 },
+  { "StoreItem": "/Lotus/StoreItems/Weapons/Infested/Melee/Swords/Mire/MireSword", "Discount": 30, "OriginalPrice": 150, "SalePrice": 105, "AmountTotal": 240, "probability": 1 },
+  { "StoreItem": "/Lotus/StoreItems/Weapons/Infested/Melee/Swords/Mire/MireSword", "Discount": 40, "OriginalPrice": 150, "SalePrice": 90, "AmountTotal": 205, "probability": 1 },
+  { "StoreItem": "/Lotus/StoreItems/Weapons/Infested/Melee/Swords/Mire/MireSword", "Discount": 60, "OriginalPrice": 150, "SalePrice": 60, "AmountTotal": 145, "probability": 3 },
+  { "StoreItem": "/Lotus/StoreItems/Weapons/Infested/Melee/Swords/Mire/MireSword", "Discount": 80, "OriginalPrice": 150, "SalePrice": 30, "AmountTotal": 80, "probability": 1 },
+  { "StoreItem": "/Lotus/StoreItems/Weapons/Tenno/Akimbo/AkimboShotGun", "Discount": 20, "OriginalPrice": 225, "SalePrice": 180, "AmountTotal": 200, "probability": 1 },
+  { "StoreItem": "/Lotus/StoreItems/Weapons/Tenno/Akimbo/AkimboShotGun", "Discount": 40, "OriginalPrice": 225, "SalePrice": 135, "AmountTotal": 165, "probability": 3 },
+  { "StoreItem": "/Lotus/StoreItems/Weapons/Tenno/Akimbo/AkimboShotGun", "Discount": 50, "OriginalPrice": 225, "SalePrice": 112, "AmountTotal": 150, "probability": 5 },
+  { "StoreItem": "/Lotus/StoreItems/Weapons/Tenno/Melee/Dagger/Dagger", "Discount": 30, "OriginalPrice": 75, "SalePrice": 52, "AmountTotal": 350, "probability": 1 },
+  { "StoreItem": "/Lotus/StoreItems/Weapons/Tenno/Melee/Dagger/Dagger", "Discount": 40, "OriginalPrice": 75, "SalePrice": 45, "AmountTotal": 300, "probability": 7 },
+  { "StoreItem": "/Lotus/StoreItems/Weapons/Tenno/Melee/Dagger/Dagger", "Discount": 50, "OriginalPrice": 75, "SalePrice": 37, "AmountTotal": 250, "probability": 2 },
+  { "StoreItem": "/Lotus/StoreItems/Weapons/Tenno/Melee/Dagger/Dagger", "Discount": 60, "OriginalPrice": 75, "SalePrice": 30, "AmountTotal": 200, "probability": 3 },
+  { "StoreItem": "/Lotus/StoreItems/Weapons/Tenno/Melee/DualShortSword/DualHeatSwords", "Discount": 30, "OriginalPrice": 175, "SalePrice": 122, "AmountTotal": 200, "probability": 2 },
+  { "StoreItem": "/Lotus/StoreItems/Weapons/Tenno/Melee/DualShortSword/DualHeatSwords", "Discount": 70, "OriginalPrice": 175, "SalePrice": 52, "AmountTotal": 200, "probability": 2 },
+  { "StoreItem": "/Lotus/StoreItems/Weapons/Tenno/Melee/Fist/Fist", "Discount": 10, "OriginalPrice": 125, "SalePrice": 112, "AmountTotal": 500, "probability": 3 },
+  { "StoreItem": "/Lotus/StoreItems/Weapons/Tenno/Melee/Fist/Fist", "Discount": 20, "OriginalPrice": 125, "SalePrice": 100, "AmountTotal": 250, "probability": 6 },
+  { "StoreItem": "/Lotus/StoreItems/Weapons/Tenno/Melee/Gauntlet/Gauntlet", "Discount": 20, "OriginalPrice": 125, "SalePrice": 100, "AmountTotal": 100, "probability": 5 },
+  { "StoreItem": "/Lotus/StoreItems/Weapons/Tenno/Melee/Gauntlet/Gauntlet", "Discount": 30, "OriginalPrice": 125, "SalePrice": 87, "AmountTotal": 125, "probability": 2 },
+  { "StoreItem": "/Lotus/StoreItems/Weapons/Tenno/Melee/Gauntlet/Gauntlet", "Discount": 40, "OriginalPrice": 125, "SalePrice": 75, "AmountTotal": 150, "probability": 3 },
+  { "StoreItem": "/Lotus/StoreItems/Weapons/Tenno/Melee/Glaives/Boomerang/BoomerangWeapon", "Discount": 30, "OriginalPrice": 150, "SalePrice": 105, "AmountTotal": 300, "probability": 4 },
+  { "StoreItem": "/Lotus/StoreItems/Weapons/Tenno/Melee/Glaives/Boomerang/BoomerangWeapon", "Discount": 40, "OriginalPrice": 150, "SalePrice": 90, "AmountTotal": 250, "probability": 4 },
+  { "StoreItem": "/Lotus/StoreItems/Weapons/Tenno/Melee/Glaives/Boomerang/BoomerangWeapon", "Discount": 50, "OriginalPrice": 150, "SalePrice": 75, "AmountTotal": 200, "probability": 5 },
+  { "StoreItem": "/Lotus/StoreItems/Weapons/Tenno/Melee/Hammer/IceHammer/IceHammer", "Discount": 20, "OriginalPrice": 165, "SalePrice": 132, "AmountTotal": 300, "probability": 4 },
+  { "StoreItem": "/Lotus/StoreItems/Weapons/Tenno/Melee/Hammer/IceHammer/IceHammer", "Discount": 30, "OriginalPrice": 165, "SalePrice": 115, "AmountTotal": 250, "probability": 1 },
+  { "StoreItem": "/Lotus/StoreItems/Weapons/Tenno/Melee/Hammer/IceHammer/IceHammer", "Discount": 40, "OriginalPrice": 165, "SalePrice": 99, "AmountTotal": 200, "probability": 3 },
+  { "StoreItem": "/Lotus/StoreItems/Weapons/Tenno/Melee/Hammer/IceHammer/IceHammer", "Discount": 50, "OriginalPrice": 165, "SalePrice": 82, "AmountTotal": 150, "probability": 3 },
+  { "StoreItem": "/Lotus/StoreItems/Weapons/Tenno/Melee/Hammer/IceHammer/IceHammer", "Discount": 60, "OriginalPrice": 165, "SalePrice": 66, "AmountTotal": 100, "probability": 3 },
+  { "StoreItem": "/Lotus/StoreItems/Weapons/Tenno/Melee/LongSword/LongSword", "Discount": 50, "OriginalPrice": 150, "SalePrice": 75, "AmountTotal": 300, "probability": 4 },
+  { "StoreItem": "/Lotus/StoreItems/Weapons/Tenno/Melee/LongSword/LongSword", "Discount": 60, "OriginalPrice": 150, "SalePrice": 60, "AmountTotal": 265, "probability": 2 },
+  { "StoreItem": "/Lotus/StoreItems/Weapons/Tenno/Melee/LongSword/LongSword", "Discount": 70, "OriginalPrice": 150, "SalePrice": 45, "AmountTotal": 225, "probability": 2 },
+  { "StoreItem": "/Lotus/StoreItems/Weapons/Tenno/Melee/LongSword/LongSword", "Discount": 90, "OriginalPrice": 150, "SalePrice": 15, "AmountTotal": 150, "probability": 3 },
+  { "StoreItem": "/Lotus/StoreItems/Weapons/Tenno/Melee/Scythe/EtherScytheWeapon", "Discount": 40, "OriginalPrice": 230, "SalePrice": 138, "AmountTotal": 250, "probability": 3 },
+  { "StoreItem": "/Lotus/StoreItems/Weapons/Tenno/Melee/Scythe/EtherScytheWeapon", "Discount": 60, "OriginalPrice": 230, "SalePrice": 92, "AmountTotal": 150, "probability": 1 },
+  { "StoreItem": "/Lotus/StoreItems/Weapons/Tenno/Melee/Swords/GreatSword/TennoGreatSword", "Discount": 20, "OriginalPrice": 175, "SalePrice": 140, "AmountTotal": 100, "probability": 2 },
+  { "StoreItem": "/Lotus/StoreItems/Weapons/Tenno/Melee/Swords/GreatSword/TennoGreatSword", "Discount": 30, "OriginalPrice": 175, "SalePrice": 122, "AmountTotal": 100, "probability": 3 },
+  { "StoreItem": "/Lotus/StoreItems/Weapons/Tenno/Melee/Swords/GreatSword/TennoGreatSword", "Discount": 40, "OriginalPrice": 175, "SalePrice": 105, "AmountTotal": 100, "probability": 2 },
+  { "StoreItem": "/Lotus/StoreItems/Weapons/Tenno/Melee/Swords/GreatSword/TennoGreatSword", "Discount": 90, "OriginalPrice": 175, "SalePrice": 17, "AmountTotal": 100, "probability": 1 },
+  {
+    "StoreItem": "/Lotus/StoreItems/Weapons/Tenno/Melee/SwordsAndBoards/MeleeContestWinnerOne/TennoSwordShield",
+    "Discount": 30,
+    "OriginalPrice": 150,
+    "SalePrice": 105,
+    "AmountTotal": 100,
+    "probability": 1
+  },
+  {
+    "StoreItem": "/Lotus/StoreItems/Weapons/Tenno/Melee/SwordsAndBoards/MeleeContestWinnerOne/TennoSwordShield",
+    "Discount": 70,
+    "OriginalPrice": 150,
+    "SalePrice": 45,
+    "AmountTotal": 100,
+    "probability": 1
+  },
+  {
+    "StoreItem": "/Lotus/StoreItems/Weapons/Tenno/Melee/SwordsAndBoards/MeleeContestWinnerOne/TennoSwordShield",
+    "Discount": 90,
+    "OriginalPrice": 150,
+    "SalePrice": 15,
+    "AmountTotal": 100,
+    "probability": 1
+  },
+  { "StoreItem": "/Lotus/StoreItems/Weapons/Tenno/Pistol/CrossBow", "Discount": 30, "OriginalPrice": 175, "SalePrice": 122, "AmountTotal": 300, "probability": 2 },
+  { "StoreItem": "/Lotus/StoreItems/Weapons/Tenno/Pistol/CrossBow", "Discount": 40, "OriginalPrice": 175, "SalePrice": 105, "AmountTotal": 250, "probability": 6 },
+  { "StoreItem": "/Lotus/StoreItems/Weapons/Tenno/Pistol/CrossBow", "Discount": 50, "OriginalPrice": 175, "SalePrice": 87, "AmountTotal": 200, "probability": 1 },
+  { "StoreItem": "/Lotus/StoreItems/Weapons/Tenno/Pistol/CrossBow", "Discount": 60, "OriginalPrice": 175, "SalePrice": 70, "AmountTotal": 150, "probability": 3 },
+  { "StoreItem": "/Lotus/StoreItems/Weapons/Tenno/Pistol/HandShotGun", "Discount": 20, "OriginalPrice": 190, "SalePrice": 152, "AmountTotal": 300, "probability": 3 },
+  { "StoreItem": "/Lotus/StoreItems/Weapons/Tenno/Pistol/HandShotGun", "Discount": 30, "OriginalPrice": 190, "SalePrice": 133, "AmountTotal": 200, "probability": 2 },
+  { "StoreItem": "/Lotus/StoreItems/Weapons/Tenno/Pistol/HandShotGun", "Discount": 40, "OriginalPrice": 190, "SalePrice": 114, "AmountTotal": 100, "probability": 5 },
+  { "StoreItem": "/Lotus/StoreItems/Weapons/Tenno/Pistol/RevolverPistol", "Discount": 20, "OriginalPrice": 190, "SalePrice": 152, "AmountTotal": 200, "probability": 3 },
+  { "StoreItem": "/Lotus/StoreItems/Weapons/Tenno/Pistol/RevolverPistol", "Discount": 30, "OriginalPrice": 190, "SalePrice": 133, "AmountTotal": 150, "probability": 4 },
+  { "StoreItem": "/Lotus/StoreItems/Weapons/Tenno/Pistol/RevolverPistol", "Discount": 40, "OriginalPrice": 190, "SalePrice": 114, "AmountTotal": 100, "probability": 3 },
+  { "StoreItem": "/Lotus/StoreItems/Weapons/Tenno/Pistol/RevolverPistol", "Discount": 50, "OriginalPrice": 190, "SalePrice": 95, "AmountTotal": 50, "probability": 4 },
+  { "StoreItem": "/Lotus/StoreItems/Weapons/Tenno/Pistols/TnBardPistol/TnBardPistolGun", "Discount": 20, "OriginalPrice": 190, "SalePrice": 152, "AmountTotal": 300, "probability": 3 },
+  { "StoreItem": "/Lotus/StoreItems/Weapons/Tenno/Pistols/TnBardPistol/TnBardPistolGun", "Discount": 30, "OriginalPrice": 190, "SalePrice": 133, "AmountTotal": 250, "probability": 1 },
+  { "StoreItem": "/Lotus/StoreItems/Weapons/Tenno/Pistols/TnBardPistol/TnBardPistolGun", "Discount": 40, "OriginalPrice": 190, "SalePrice": 114, "AmountTotal": 200, "probability": 2 },
+  { "StoreItem": "/Lotus/StoreItems/Weapons/Tenno/Pistols/TnBardPistol/TnBardPistolGun", "Discount": 50, "OriginalPrice": 190, "SalePrice": 95, "AmountTotal": 150, "probability": 3 },
+  { "StoreItem": "/Lotus/StoreItems/Weapons/Tenno/Pistols/TnBardPistol/TnBardPistolGun", "Discount": 60, "OriginalPrice": 190, "SalePrice": 76, "AmountTotal": 100, "probability": 3 },
+  { "StoreItem": "/Lotus/StoreItems/Weapons/Tenno/Rifle/TennoSniperRifle", "Discount": 10, "OriginalPrice": 250, "SalePrice": 225, "AmountTotal": 100, "probability": 1 },
+  { "StoreItem": "/Lotus/StoreItems/Weapons/Tenno/Rifle/TennoSniperRifle", "Discount": 30, "OriginalPrice": 250, "SalePrice": 175, "AmountTotal": 100, "probability": 3 },
+  { "StoreItem": "/Lotus/StoreItems/Weapons/Tenno/Rifle/TennoSniperRifle", "Discount": 50, "OriginalPrice": 250, "SalePrice": 125, "AmountTotal": 100, "probability": 1 },
+  { "StoreItem": "/Lotus/StoreItems/Weapons/Tenno/Shotgun/QuadShotgun", "Discount": 50, "OriginalPrice": 225, "SalePrice": 112, "AmountTotal": 100, "probability": 1 },
+  { "StoreItem": "/Lotus/StoreItems/Weapons/Tenno/Shotgun/QuadShotgun", "Discount": 70, "OriginalPrice": 225, "SalePrice": 67, "AmountTotal": 100, "probability": 1 },
+  { "StoreItem": "/Lotus/StoreItems/Weapons/Tenno/ThrowingWeapons/Kunai", "Discount": 10, "OriginalPrice": 175, "SalePrice": 157, "AmountTotal": 100, "probability": 1 },
+  { "StoreItem": "/Lotus/StoreItems/Weapons/Tenno/ThrowingWeapons/Kunai", "Discount": 20, "OriginalPrice": 175, "SalePrice": 140, "AmountTotal": 100, "probability": 1 },
+  { "StoreItem": "/Lotus/StoreItems/Weapons/Tenno/ThrowingWeapons/Kunai", "Discount": 30, "OriginalPrice": 175, "SalePrice": 122, "AmountTotal": 100, "probability": 1 },
+  { "StoreItem": "/Lotus/StoreItems/Weapons/Tenno/ThrowingWeapons/Kunai", "Discount": 40, "OriginalPrice": 175, "SalePrice": 105, "AmountTotal": 100, "probability": 2 }
+]

static/fixed_responses/worldState/worldState.json

@@ -510,18 +510,6 @@
   "PrimeAccessAvailability": { "State": "PRIME1" },
   "PrimeVaultAvailabilities": [false, false, false, false, false],
   "PrimeTokenAvailability": true,
-  "DailyDeals": [
-    {
-      "StoreItem": "/Lotus/StoreItems/Upgrades/Focus/PowerLensGreater",
-      "Activation": { "$date": { "$numberLong": "1715058000000" } },
-      "Expiry": { "$date": { "$numberLong": "2000000000000" } },
-      "Discount": 50,
-      "OriginalPrice": 40,
-      "SalePrice": 20,
-      "AmountTotal": 50,
-      "AmountSold": 0
-    }
-  ],
   "LibraryInfo": { "LastCompletedTargetType": "/Lotus/Types/Game/Library/Targets/Research7Target" },
   "PVPChallengeInstances": [
     {

static/webui/index.html

@@ -692,6 +692,10 @@
                                         <input class="form-check-input" type="checkbox" id="noVendorPurchaseLimits" />
                                         <label class="form-check-label" for="noVendorPurchaseLimits" data-loc="cheats_noVendorPurchaseLimits"></label>
                                     </div>
+                                    <div class="form-check">
+                                        <input class="form-check-input" type="checkbox" id="noDarvoDealPurchaseLimit" />
+                                        <label class="form-check-label" for="noDarvoDealPurchaseLimit" data-loc="cheats_noDarvoDealPurchaseLimit"></label>
+                                    </div>
                                     <div class="form-check">
                                         <input class="form-check-input" type="checkbox" id="noDeathMarks" />
                                         <label class="form-check-label" for="noDeathMarks" data-loc="cheats_noDeathMarks"></label>
@@ -768,14 +772,14 @@
                                         <input class="form-check-input" type="checkbox" id="unlockAllSimarisResearchEntries" />
                                         <label class="form-check-label" for="unlockAllSimarisResearchEntries" data-loc="cheats_unlockAllSimarisResearchEntries"></label>
                                     </div>
-                                    <form class="form-group mt-2" onsubmit="doSaveConfig('spoofMasteryRank'); return false;">
+                                    <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" />
                                             <button class="btn btn-primary" type="submit" data-loc="cheats_save"></button>
                                         </div>
                                     </form>
-                                    <form class="form-group mt-2" onsubmit="doSaveConfig('nightwaveStandingMultiplier'); return false;">
+                                    <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" value="1" />
@@ -892,6 +896,13 @@
                                         <option value="hard" data-loc="worldState_allAtOnceSteelPath"></option>
                                     </select>
                                 </div>
+                                <form class="form-group mt-2" onsubmit="doSaveConfigStringArray('worldState.circuitGameModes'); return false;">
+                                    <label class="form-label" for="worldState.circuitGameModes" data-loc="worldState_theCircuitOverride"></label>
+                                    <div class="input-group">
+                                        <input id="worldState.circuitGameModes" type="text" class="form-control tags-input" list="datalist-circuitGameModes" />
+                                        <button class="btn btn-primary" type="submit" data-loc="cheats_save"></button>
+                                    </div>
+                                </form>
                             </div>
                         </div>
                     </div>
@@ -923,10 +934,7 @@
     <datalist id="datalist-KubrowPets"></datalist>
     <datalist id="datalist-QuestKeys"></datalist>
     <datalist id="datalist-miscitems"></datalist>
-    <datalist id="datalist-mods">
+    <datalist id="datalist-mods"></datalist>
-        <option data-key="/Lotus/Upgrades/Mods/Fusers/LegendaryModFuser" value="Legendary Core"></option>
-        <option data-key="/Lotus/Upgrades/CosmeticEnhancers/Peculiars/CyoteMod" value="Traumatic Peculiar"></option>
-    </datalist>
     <datalist id="datalist-archonCrystalUpgrades"></datalist>
     <datalist id="datalist-OperatorAmps"></datalist>
     <datalist id="datalist-EvolutionProgress"></datalist>
@@ -958,6 +966,15 @@
     <datalist id="datalist-ModularParts-KUBROW_ANTIGEN"></datalist>
     <datalist id="datalist-ModularParts-KUBROW_MUTAGEN"></datalist>
     <datalist id="datalist-Boosters"></datalist>
+    <datalist id="datalist-circuitGameModes">
+        <option>Survival</option>
+        <option>VoidFlood</option>
+        <option>Excavation</option>
+        <option>Defense</option>
+        <option>Exterminate</option>
+        <option>Assassination</option>
+        <option>Alchemy</option>
+    </datalist>
     <script src="/webui/libs/jquery-3.6.0.min.js"></script>
     <script src="/webui/libs/whirlpool-js.min.js"></script>
     <script src="/webui/libs/single.js"></script>

static/webui/script.js

@@ -1882,12 +1882,27 @@ for (const id of uiConfigs) {
     }
 }
 
-function doSaveConfig(id) {
+function doSaveConfigInt(id) {
-    const elm = document.getElementById(id);
     $.post({
         url: "/custom/setConfig?" + window.authz + "&wsid=" + wsid,
         contentType: "application/json",
-        data: JSON.stringify({ [id]: parseInt(elm.value) })
+        data: JSON.stringify({
+            [id]: parseInt(document.getElementById(id).value)
+        })
+    });
+}
+
+function doSaveConfigStringArray(id) {
+    $.post({
+        url: "/custom/setConfig?" + window.authz + "&wsid=" + wsid,
+        contentType: "application/json",
+        data: JSON.stringify({
+            [id]: document
+                .getElementById(id)
+                .getAttribute("data-tags-value")
+                .split(", ")
+                .filter(x => x)
+        })
     });
 }
 
@@ -1914,7 +1929,12 @@ single.getRoute("/webui/cheats").on("beforeload", function () {
                             if (x.type == "checkbox") {
                                 x.checked = value;
                             } else if (x.type == "number") {
-                                x.setAttribute("value", `${value}`);
+                                x.setAttribute("value", value);
+                            } else if (x.classList.contains("tags-input")) {
+                                x.value = value.join(", ");
+                                x.oninput();
+                            } else {
+                                x.value = value;
                             }
                         }
                     });
@@ -2597,3 +2617,27 @@ const importSamples = {
 function setImportSample(key) {
     $("#import-inventory").val(JSON.stringify(importSamples[key], null, 2));
 }
+
+document.querySelectorAll(".tags-input").forEach(input => {
+    const datalist = document.getElementById(input.getAttribute("list"));
+    const options = [...datalist.querySelectorAll("option")].map(x => x.textContent);
+    input.oninput = function () {
+        const value = [];
+        for (const tag of this.value.split(",")) {
+            const index = options.map(x => x.toLowerCase()).indexOf(tag.trim().toLowerCase());
+            if (index != -1) {
+                value.push(options[index]);
+            }
+        }
+
+        this.setAttribute("data-tags-value", value.join(", "));
+
+        datalist.innerHTML = "";
+        for (const option of options) {
+            const elm = document.createElement("option");
+            elm.textContent = [...value, option, ""].join(", ");
+            datalist.appendChild(elm);
+        }
+    };
+    input.oninput();
+});

static/webui/translations/de.js

@@ -156,6 +156,7 @@ dict = {
     cheats_noArgonCrystalDecay: `Argon-Kristalle verschwinden niemals`,
     cheats_noMasteryRankUpCooldown: `Keine Wartezeit beim Meisterschaftsrangaufstieg`,
     cheats_noVendorPurchaseLimits: `Keine Kaufbeschränkungen bei Händlern`,
+    cheats_noDarvoDealPurchaseLimit: `[UNTRANSLATED] No Darvo Deal Purchase Limit`,
     cheats_noDeathMarks: `Keine Todesmarkierungen`,
     cheats_noKimCooldowns: `Keine Wartezeit bei KIM`,
     cheats_fullyStockedVendors: `[UNTRANSLATED] Fully Stocked Vendors`,
@@ -230,6 +231,7 @@ dict = {
     normal: `[UNTRANSLATED] Normal`,
     worldState_allAtOnceNormal: `[UNTRANSLATED] All At Once, Normal`,
     worldState_allAtOnceSteelPath: `[UNTRANSLATED] All At Once, Steel Path`,
+    worldState_theCircuitOverride: `[UNTRANSLATED] The Circuit Override`,
 
     import_importNote: `Du kannst hier eine vollständige oder teilweise Inventarantwort (Client-Darstellung) einfügen. Alle Felder, die vom Importer unterstützt werden, <b>werden in deinem Account überschrieben</b>.`,
     import_submit: `Absenden`,

static/webui/translations/en.js

@@ -155,6 +155,7 @@ dict = {
     cheats_noArgonCrystalDecay: `No Argon Crystal Decay`,
     cheats_noMasteryRankUpCooldown: `No Mastery Rank Up Cooldown`,
     cheats_noVendorPurchaseLimits: `No Vendor Purchase Limits`,
+    cheats_noDarvoDealPurchaseLimit: `No Darvo Deal Purchase Limit`,
     cheats_noDeathMarks: `No Death Marks`,
     cheats_noKimCooldowns: `No KIM Cooldowns`,
     cheats_fullyStockedVendors: `Fully Stocked Vendors`,
@@ -229,6 +230,7 @@ dict = {
     normal: `Normal`,
     worldState_allAtOnceNormal: `All At Once, Normal`,
     worldState_allAtOnceSteelPath: `All At Once, Steel Path`,
+    worldState_theCircuitOverride: `The Circuit Override`,
 
     import_importNote: `You can provide a full or partial inventory response (client respresentation) here. All fields that are supported by the importer <b>will be overwritten</b> in your account.`,
     import_submit: `Submit`,

static/webui/translations/es.js

@@ -156,6 +156,7 @@ dict = {
     cheats_noArgonCrystalDecay: `Sin descomposición de cristal de Argón`,
     cheats_noMasteryRankUpCooldown: `Sin tiempo de espera para rango de maestría`,
     cheats_noVendorPurchaseLimits: `Sin límite de compras de vendedores`,
+    cheats_noDarvoDealPurchaseLimit: `[UNTRANSLATED] No Darvo Deal Purchase Limit`,
     cheats_noDeathMarks: `Sin marcas de muerte`,
     cheats_noKimCooldowns: `Sin tiempo de espera para conversaciones KIM`,
     cheats_fullyStockedVendors: `Vendedores con stock completo`,
@@ -230,6 +231,7 @@ dict = {
     normal: `[UNTRANSLATED] Normal`,
     worldState_allAtOnceNormal: `[UNTRANSLATED] All At Once, Normal`,
     worldState_allAtOnceSteelPath: `[UNTRANSLATED] All At Once, Steel Path`,
+    worldState_theCircuitOverride: `[UNTRANSLATED] The Circuit Override`,
 
     import_importNote: `Puedes proporcionar una respuesta de inventario completa o parcial (representación del cliente) aquí. Todos los campos compatibles con el importador <b>serán sobrescritos</b> en tu cuenta.`,
     import_submit: `Enviar`,

static/webui/translations/fr.js

@@ -156,6 +156,7 @@ dict = {
     cheats_noArgonCrystalDecay: `Aucune désintégration des Cristaux d'Argon`,
     cheats_noMasteryRankUpCooldown: `Aucune attente pour la montée de rang de maîtrise`,
     cheats_noVendorPurchaseLimits: `Aucune limite d'achat chez les PNJ`,
+    cheats_noDarvoDealPurchaseLimit: `[UNTRANSLATED] No Darvo Deal Purchase Limit`,
     cheats_noDeathMarks: `Aucune marque d'assassin`,
     cheats_noKimCooldowns: `Aucun cooldown sur le KIM`,
     cheats_fullyStockedVendors: `Les vendeurs ont un stock à 100%`,
@@ -230,6 +231,7 @@ dict = {
     normal: `[UNTRANSLATED] Normal`,
     worldState_allAtOnceNormal: `[UNTRANSLATED] All At Once, Normal`,
     worldState_allAtOnceSteelPath: `[UNTRANSLATED] All At Once, Steel Path`,
+    worldState_theCircuitOverride: `[UNTRANSLATED] The Circuit Override`,
 
     import_importNote: `Import manuel. Toutes les modifcations supportées par l'inventaire <b>écraseront celles présentes dans la base de données</b>.`,
     import_submit: `Soumettre`,

static/webui/translations/ru.js

@@ -156,6 +156,7 @@ dict = {
     cheats_noArgonCrystalDecay: `Без распада аргоновых кристаллов`,
     cheats_noMasteryRankUpCooldown: `Повышение ранга мастерства без кулдауна`,
     cheats_noVendorPurchaseLimits: `Отсутствие лимитов на покупки у вендоров`,
+    cheats_noDarvoDealPurchaseLimit: `[UNTRANSLATED] No Darvo Deal Purchase Limit`,
     cheats_noDeathMarks: `Без меток сметри`,
     cheats_noKimCooldowns: `Чаты KIM без кулдауна`,
     cheats_fullyStockedVendors: `[UNTRANSLATED] Fully Stocked Vendors`,
@@ -230,6 +231,7 @@ dict = {
     normal: `[UNTRANSLATED] Normal`,
     worldState_allAtOnceNormal: `[UNTRANSLATED] All At Once, Normal`,
     worldState_allAtOnceSteelPath: `[UNTRANSLATED] All At Once, Steel Path`,
+    worldState_theCircuitOverride: `[UNTRANSLATED] The Circuit Override`,
 
     import_importNote: `Вы можете загрузить полный или частичный ответ инвентаря (клиентское представление) здесь. Все поддерживаемые поля <b>будут перезаписаны</b> в вашем аккаунте.`,
     import_submit: `Отправить`,

static/webui/translations/zh.js

@@ -156,6 +156,7 @@ dict = {
     cheats_noArgonCrystalDecay: `氩结晶无衰变`,
     cheats_noMasteryRankUpCooldown: `段位考核无冷却时间`,
     cheats_noVendorPurchaseLimits: `商城或商人无购买限制`,
+    cheats_noDarvoDealPurchaseLimit: `[UNTRANSLATED] No Darvo Deal Purchase Limit`,
     cheats_noDeathMarks: `无死亡标记(不会被 Stalker/Grustrag 三霸/Zanuka 猎人等标记)`,
     cheats_noKimCooldowns: `即时通无冷却时间`,
     cheats_fullyStockedVendors: `商人贩卖所有商品`,
@@ -230,6 +231,7 @@ dict = {
     normal: `正常`,
     worldState_allAtOnceNormal: `全部开启（普通）`,
     worldState_allAtOnceSteelPath: `全部开启（钢铁之路）`,
+    worldState_theCircuitOverride: `[UNTRANSLATED] The Circuit Override`,
 
     import_importNote: `您可以在此处提供完整或部分库存响应（客户端表示）。支持的所有字段<b>将被覆盖</b>到您的账户中。`,
     import_submit: `提交`,