OpenWF/SpaceNinjaServer
12
6
Fork 15
Code Issues 45 Pull Requests 6 Actions Packages Projects Releases Activity

Mission reward - blueprints

Browse Source
This commit is contained in:
holmityd 2023-09-05 02:03:00 +04:00
parent dcf21a8e76
commit f9b87e44af
4 changed files with 41 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/controllers/api/missionInventoryUpdateController.ts
View File

@ -9,7 +9,7 @@ import {
import { RawUpgrade } from "@/src/types/inventoryTypes/inventoryTypes";
import missionsDropTable from "@/static/json/missions-drop-table.json";
import { modNames, relicNames, miscNames, resourceNames, gearNames, craftNames } from "@/static/data/items";
import { modNames, relicNames, miscNames, resourceNames, gearNames, blueprintNames } from "@/static/data/items";
/*
**** INPUT ****
@ -69,20 +69,15 @@ const missionInventoryUpdateController: RequestHandler = async (req, res) => {
const MissionCredits = [missionCredits, missionCredits];
const CreditsBonus = [creditsBonus, creditsBonus];
const TotalCredits = [totalCredits, totalCredits];
const FusionPoints =
parsedData.FusionPoints || InventoryChanges.FusionPoints
? (parsedData.FusionPoints || 0) + (InventoryChanges.FusionPoints || 0)
: undefined;
const FusionPoints = (parsedData.FusionPoints || 0) + (InventoryChanges.FusionPoints || 0) || undefined;
// combine reward and loot
parsedData.RegularCredits = totalCredits;
if (FusionPoints) parsedData.FusionPoints = FusionPoints;
if (InventoryChanges.RawUpgrades && !parsedData.RawUpgrades) parsedData.RawUpgrades = [];
InventoryChanges.RawUpgrades?.forEach(i => parsedData.RawUpgrades!.push(i));
if (InventoryChanges.MiscItems && !parsedData.MiscItems) parsedData.MiscItems = [];
InventoryChanges.MiscItems?.forEach(i => parsedData.MiscItems!.push(i));
if (InventoryChanges.Consumables && !parsedData.Consumables) parsedData.Consumables = [];
InventoryChanges.Consumables?.forEach(i => parsedData.Consumables!.push(i));
inventoryFields.forEach((field: InventoryFieldType) => {
if (InventoryChanges[field] && !parsedData[field]) parsedData[field] = [];
InventoryChanges[field]?.forEach(i => parsedData[field]!.push(i));
});
const Inventory = await missionInventoryUpdate(parsedData, id);
InventoryChanges.RawUpgrades?.forEach(
@ -115,6 +110,9 @@ const missionInventoryUpdateController: RequestHandler = async (req, res) => {
- [x] FusionPoints
*/
const inventoryFields = ["RawUpgrades", "MiscItems", "Consumables", "Recipes"] as const;
type InventoryFieldType = (typeof inventoryFields)[number];
// need reverse engineer rewardSeed, otherwise ingame displayed rotation loot will be different than added to db
const getRewards = (
rewardInfo: IMissionInventoryUpdateRewardInfo | undefined
@ -151,7 +149,8 @@ const getRewards = (
// { chance: 10.82, name: "Link Armor", rotation: "C" },
// // { chance: 10.82, name: "200 Endo", rotation: "C" },
// { chance: 10.82, name: "2,000,000 Credits Cache", rotation: "C" },
// { chance: 7.69, name: "Health Restore (Large)", rotation: "C" }
// { chance: 7.69, name: "Health Restore (Large)", rotation: "C" },
// { chance: 7.69, name: "Vapor Specter Blueprint", rotation: "C" }
// ];
// console.log("Mission rewards:", testDrops);
// return formatRewardsToInventoryType(testDrops);
@ -200,21 +199,12 @@ const formatRewardsToInventoryType = (
rewards.forEach(i => {
const mod = modNames[i.name];
const gear = gearNames[i.name];
const craft = craftNames[i.name];
const blueprint = blueprintNames[i.name];
const misc = miscNames[i.name] || miscNames[i.name.replace(/\d+X\s*/, "")];
const resource = resourceNames[i.name] || resourceNames[i.name.replace(/\d+X\s*/, "")];
const relic =
relicNames[i.name.replace("Relic", "Intact")] || relicNames[i.name.replace("Relic (Radiant)", "Radiant")];
// console.log({
// mod,
// gear,
// misc,
// resource,
// relic,
// craft
// });
if (mod) {
addRewardResponse(InventoryChanges, MissionRewards, i.name, mod, "RawUpgrades");
} else if (gear) {
@ -223,8 +213,8 @@ const formatRewardsToInventoryType = (
addRewardResponse(InventoryChanges, MissionRewards, i.name, misc || resource, "MiscItems");
} else if (relic) {
addRewardResponse(InventoryChanges, MissionRewards, i.name, relic, "MiscItems");
} else if (craft) {
/* craft */
} else if (blueprint) {
addRewardResponse(InventoryChanges, MissionRewards, i.name, blueprint, "Recipes");
} else if (i.name.includes(" Endo")) {
if (!InventoryChanges.FusionPoints) InventoryChanges.FusionPoints = 0;
InventoryChanges.FusionPoints += getCountFromName(i.name);
@ -247,7 +237,7 @@ const addRewardResponse = (
MissionRewards: IMissionRewardResponse[],
ItemName: string,
ItemType: string,
InventoryCategory: "MiscItems" | "RawUpgrades" | "Consumables"
InventoryCategory: InventoryFieldType
) => {
if (!ItemType) return;
if (!InventoryChanges[InventoryCategory]) InventoryChanges[InventoryCategory] = [];
@ -292,7 +282,7 @@ const _missionRewardsCheckAllNamings = () => {
!relicNames[i.name.replace("Relic (Radiant)", "Radiant")]
);
})
.filter(i => !craftNames[i.name])
.filter(i => !blueprintNames[i.name])
.filter(i => !i.name.includes(" Endo"))
.filter(i => !i.name.includes(" Credits Cache") && !i.name.includes("Return: "));
console.log(tempRewards);

18
src/services/inventoryService.ts
View File

@ -163,6 +163,21 @@ const addConsumables = (inventory: IInventoryDatabaseDocument, itemsArray: Consu
});
};
const addRecipes = (inventory: IInventoryDatabaseDocument, itemsArray: Consumable[] | undefined) => {
const { Recipes } = inventory;
itemsArray?.forEach(({ ItemCount, ItemType }) => {
const itemIndex = Recipes.findIndex(i => i.ItemType === ItemType);
if (itemIndex !== -1) {
Recipes[itemIndex].ItemCount += ItemCount;
inventory.markModified(`Recipes.${itemIndex}.ItemCount`);
} else {
Recipes.push({ ItemCount, ItemType });
}
});
};
const addMods = (inventory: IInventoryDatabaseDocument, itemsArray: RawUpgrade[] | undefined) => {
const { RawUpgrades } = inventory;
itemsArray?.forEach(({ ItemType, ItemCount }) => {
@ -196,7 +211,7 @@ const gearKeys = ["Suits", "Pistols", "LongGuns", "Melee"] as const;
type GearKeysType = (typeof gearKeys)[number];
export const missionInventoryUpdate = async (data: IMissionInventoryUpdate, accountId: string) => {
const { RawUpgrades, MiscItems, RegularCredits, ChallengeProgress, FusionPoints, Consumables } = data;
const { RawUpgrades, MiscItems, RegularCredits, ChallengeProgress, FusionPoints, Consumables, Recipes } = data;
const inventory = await getInventory(accountId);
// credits
@ -212,6 +227,7 @@ export const missionInventoryUpdate = async (data: IMissionInventoryUpdate, acco
addMods(inventory, RawUpgrades);
addMiscItems(inventory, MiscItems);
addConsumables(inventory, Consumables);
addRecipes(inventory, Recipes);
addChallenges(inventory, ChallengeProgress);
const changedInventory = await inventory.save();

1
src/types/missionInventoryUpdateType.ts
View File

@ -69,6 +69,7 @@ export interface IMissionInventoryUpdate {
RawUpgrades?: IMissionInventoryUpdateItem[];
MiscItems?: IMissionInventoryUpdateItem[];
Consumables?: IMissionInventoryUpdateItem[];
Recipes?: IMissionInventoryUpdateItem[];
RegularCredits?: number;
ChallengeProgress?: IMissionInventoryUpdateChallange[];
RewardInfo?: IMissionInventoryUpdateRewardInfo;

8
static/data/items.ts
View File

@ -19,7 +19,7 @@ export const items: MinItem[] = new Items({ category: ["All"] }).map(item => {
const getNamesObj = (category: Category) =>
new Items({ category: [category] }).reduce((acc, i) => {
acc[i.name!] = category !== "Mods" ? i.uniqueName! : i.uniqueName!.replace("'S", "'s");
acc[i.name!.replace("'S", "'s")] = i.uniqueName!;
return acc;
}, {} as ImportAssertions);
@ -52,3 +52,9 @@ export const craftNames: ImportAssertions = Object.fromEntries(
.map(i => [i.drops![0].type, i.uniqueName])
);
craftNames["Forma Blueprint"] = "/Lotus/StoreItems/Types/Items/MiscItems/Forma";
export const blueprintNames: ImportAssertions = Object.fromEntries(
Object.keys(craftNames)
.filter(i => i.includes("Blueprint"))
.map(i => [i, craftNames[i]])
);