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

Mission reward - take 4

Browse Source
This commit is contained in:
holmityd 2023-09-04 21:07:31 +04:00
parent 9d2ebe018c
commit dcf21a8e76
3 changed files with 96 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9,16 +9,7 @@ import {
import { RawUpgrade } from "@/src/types/inventoryTypes/inventoryTypes";
import missionsDropTable from "@/static/json/missions-drop-table.json";
import {
modNames,
relicNames,
skinNames,
miscNames,
resourceNames,
gearNames,
arcaneNames,
craftNames
} from "@/static/data/items";
import { modNames, relicNames, miscNames, resourceNames, gearNames, craftNames } from "@/static/data/items";
/*
**** INPUT ****
@ -88,8 +79,10 @@ const missionInventoryUpdateController: RequestHandler = async (req, res) => {
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.RawUpgrades = [];
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));
const Inventory = await missionInventoryUpdate(parsedData, id);
InventoryChanges.RawUpgrades?.forEach(
@ -151,8 +144,19 @@ const getRewards = (
drops.push(...guaranteedDrops);
}
console.log("Mission rewards:", drops);
// const testDrops = [
// { chance: 7.69, name: "Lith W3 Relic", rotation: "B" },
// { chance: 7.69, name: "Lith W3 Relic", rotation: "B" },
// { chance: 10.82, name: "2X Orokin Cell", rotation: "C" },
// { 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" }
// ];
// console.log("Mission rewards:", testDrops);
// return formatRewardsToInventoryType(testDrops);
console.log("Mission rewards:", drops);
return formatRewardsToInventoryType(drops);
};
@ -195,51 +199,78 @@ const formatRewardsToInventoryType = (
const MissionRewards: IMissionRewardResponse[] = [];
rewards.forEach(i => {
const mod = modNames[i.name];
const skin = skinNames[i.name];
const gear = gearNames[i.name];
const arcane = arcaneNames[i.name];
const craft = craftNames[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", "Exceptional")] ||
relicNames[i.name.replace("Relic (Radiant)", "Radiant")];
relicNames[i.name.replace("Relic", "Intact")] || relicNames[i.name.replace("Relic (Radiant)", "Radiant")];
// console.log({
// mod,
// gear,
// misc,
// resource,
// relic,
// craft
// });
if (mod) {
if (!InventoryChanges.RawUpgrades) InventoryChanges.RawUpgrades = [];
InventoryChanges.RawUpgrades.push({ ItemType: mod, ItemCount: 1 });
MissionRewards.push({
StoreItem: mod.replace("/Lotus/", "/Lotus/StoreItems/"),
TypeName: mod,
UpgradeLevel: 0,
ItemCount: 1,
TweetText: `${i.name} (Mod)`,
ProductCategory: "Upgrades"
});
} else if (skin) {
/* skin */
addRewardResponse(InventoryChanges, MissionRewards, i.name, mod, "RawUpgrades");
} else if (gear) {
/* gear */
} else if (arcane) {
/* arcane */
addRewardResponse(InventoryChanges, MissionRewards, i.name, gear, "Consumables");
} else if (misc || resource) {
addRewardResponse(InventoryChanges, MissionRewards, i.name, misc || resource, "MiscItems");
} else if (relic) {
addRewardResponse(InventoryChanges, MissionRewards, i.name, relic, "MiscItems");
} else if (craft) {
/* craft */
} else if (misc || resource) {
if (!InventoryChanges.MiscItems) InventoryChanges.MiscItems = [];
const ItemType = misc || resource;
const ItemCount = parseInt(i.name) || 1;
InventoryChanges.MiscItems.push({ ItemType, ItemCount });
} else if (relic) {
/* relic */
} else if (i.name.includes(" Endo")) {
InventoryChanges.FusionPoints = parseInt(i.name);
if (!InventoryChanges.FusionPoints) InventoryChanges.FusionPoints = 0;
InventoryChanges.FusionPoints += getCountFromName(i.name);
} else if (i.name.includes(" Credits Cache") || i.name.includes("Return: ")) {
InventoryChanges.RegularCredits = parseInt(i.name.replace(/ Credits Cache|Return: |,/g, ""));
if (!InventoryChanges.RegularCredits) InventoryChanges.RegularCredits = 0;
InventoryChanges.RegularCredits += getCountFromName(i.name);
}
});
return { InventoryChanges, MissionRewards };
};
const getCountFromName = (name: string) => {
const regex = /(^(?:\d{1,3}(?:,\d{3})*(?:\.\d+)?)(\s|X))|(\s(?:\d{1,3}(?:,\d{3})*(?:\.\d+)?)$)/;
const countMatches = name.match(regex);
return countMatches ? parseInt(countMatches[0].replace(/,/g, ""), 10) : 1;
};
const addRewardResponse = (
InventoryChanges: IMissionInventoryUpdate,
MissionRewards: IMissionRewardResponse[],
ItemName: string,
ItemType: string,
InventoryCategory: "MiscItems" | "RawUpgrades" | "Consumables"
) => {
if (!ItemType) return;
if (!InventoryChanges[InventoryCategory]) InventoryChanges[InventoryCategory] = [];
const ItemCount = getCountFromName(ItemName);
const TweetText = `${ItemName}`;
const existReward = InventoryChanges[InventoryCategory]!.find(j => j.ItemType === ItemType);
if (existReward) {
existReward.ItemCount += ItemCount;
const missionReward = MissionRewards.find(j => j.TypeName === ItemType);
if (missionReward) missionReward.ItemCount += ItemCount;
} else {
InventoryChanges[InventoryCategory]!.push({ ItemType, ItemCount });
MissionRewards.push({
ItemCount,
TweetText,
ProductCategory: InventoryCategory,
StoreItem: ItemType.replace("/Lotus/", "/Lotus/StoreItems/"),
TypeName: ItemType
});
}
};
// eslint-disable-next-line @typescript-eslint/no-unused-vars
const _missionRewardsCheckAllNamings = () => {
let tempRewards: IReward[] = [];
@ -250,24 +281,18 @@ const _missionRewardsCheckAllNamings = () => {
});
tempRewards = tempRewards
.filter(i => !modNames[i.name])
.filter(i => !skinNames[i.name])
.filter(i => !miscNames[i.name])
.filter(i => !miscNames[i.name.replace(/\d+X\s*/, "")])
.filter(i => !resourceNames[i.name])
.filter(i => !resourceNames[i.name.replace(/\d+X\s*/, "")])
.filter(i => !gearNames[i.name])
.filter(i => !arcaneNames[i.name])
.filter(i => !craftNames[i.name])
.filter(i => {
// return true;
// return !relicNames[i.name.replace("Relic", "Exceptional")];
// console.log(i.name.replace("Relic", "Exceptional"));
return (
!relicNames[i.name.replace("Relic", "Exceptional")] &&
!relicNames[i.name.replace("Relic", "Intact")] &&
!relicNames[i.name.replace("Relic (Radiant)", "Radiant")]
);
})
.filter(i => !craftNames[i.name])
.filter(i => !i.name.includes(" Endo"))
.filter(i => !i.name.includes(" Credits Cache") && !i.name.includes("Return: "));
console.log(tempRewards);

24
src/services/inventoryService.ts
View File

@ -7,6 +7,7 @@ import { SlotType } from "@/src/types/purchaseTypes";
import { IWeaponResponse } from "@/src/types/inventoryTypes/weaponTypes";
import {
ChallengeProgress,
Consumable,
CrewShipSalvagedWeaponSkin,
FlavourItem,
IInventoryDatabaseDocument,
@ -147,6 +148,21 @@ const addMiscItems = (inventory: IInventoryDatabaseDocument, itemsArray: MiscIte
});
};
const addConsumables = (inventory: IInventoryDatabaseDocument, itemsArray: Consumable[] | undefined) => {
const { Consumables } = inventory;
itemsArray?.forEach(({ ItemCount, ItemType }) => {
const itemIndex = Consumables.findIndex(i => i.ItemType === ItemType);
if (itemIndex !== -1) {
Consumables[itemIndex].ItemCount += ItemCount;
inventory.markModified(`Consumables.${itemIndex}.ItemCount`);
} else {
Consumables.push({ ItemCount, ItemType });
}
});
};
const addMods = (inventory: IInventoryDatabaseDocument, itemsArray: RawUpgrade[] | undefined) => {
const { RawUpgrades } = inventory;
itemsArray?.forEach(({ ItemType, ItemCount }) => {
@ -180,20 +196,22 @@ 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 } = data;
const { RawUpgrades, MiscItems, RegularCredits, ChallengeProgress, FusionPoints, Consumables } = data;
const inventory = await getInventory(accountId);
// TODO - multipliers logic for mission reward (looted comes multiplied)
// credits
inventory.RegularCredits += RegularCredits || 0;
// endo
inventory.FusionPoints += FusionPoints || 0;
// gear exp
gearKeys.forEach((key: GearKeysType) => addGearExpByCategory(inventory, data[key], key));
// other
addMods(inventory, RawUpgrades);
addMiscItems(inventory, MiscItems);
addConsumables(inventory, Consumables);
addChallenges(inventory, ChallengeProgress);
const changedInventory = await inventory.save();

3
src/types/missionInventoryUpdateType.ts
View File

@ -68,6 +68,7 @@ export interface IMissionInventoryUpdate {
Melee?: IMissionInventoryUpdateGear[];
RawUpgrades?: IMissionInventoryUpdateItem[];
MiscItems?: IMissionInventoryUpdateItem[];
Consumables?: IMissionInventoryUpdateItem[];
RegularCredits?: number;
ChallengeProgress?: IMissionInventoryUpdateChallange[];
RewardInfo?: IMissionInventoryUpdateRewardInfo;
@ -77,7 +78,7 @@ export interface IMissionInventoryUpdate {
export interface IMissionRewardResponse {
StoreItem?: string;
TypeName: string;
UpgradeLevel: number;
UpgradeLevel?: number;
ItemCount: number;
TweetText: string;
ProductCategory: string;