Eternity/SpaceNinjaServer
1
0
Fork 0
forked from OpenWF/SpaceNinjaServer
Code Pull Requests Activity

fix: considering Zaw parts to be weapons instead of miscitems (#280)

Browse Source
This commit is contained in:
Sainan 2024-06-06 14:23:46 +02:00 committed by GitHub
parent f80da06754
commit 7d169b7c56
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/controllers/custom/getItemListsController.ts
View File

@ -1,5 +1,5 @@
import { RequestHandler } from "express"; import { RequestHandler } from "express";
import { MinItem, warframes, weapons, items, getEnglishString } from "@/src/services/itemDataService"; import { MinItem, MinWeapon, warframes, weapons, items, getEnglishString } from "@/src/services/itemDataService";
import badItems from "@/static/json/exclude-mods.json"; import badItems from "@/static/json/exclude-mods.json";
import ExportArcanes from "@/node_modules/warframe-public-export-plus/ExportArcanes.json"; import ExportArcanes from "@/node_modules/warframe-public-export-plus/ExportArcanes.json";
@ -29,9 +29,15 @@ const getItemListsController: RequestHandler = (_req, res) => {
} }
res.json({ res.json({
warframes: reduceItems(warframes), warframes: reduceItems(warframes),
weapons: reduceItems(weapons.filter(item => item.productCategory != "OperatorAmps")), weapons: reduceItems(weapons.filter(item => item.productCategory != "OperatorAmps" && item.totalDamage != 0)),
miscitems: reduceItems( miscitems: reduceItems(
items.filter(item => item.category == "Misc" || item.category == "Resources" || item.category == "Fish") items.filter(
item =>
item.category == "Misc" ||
item.category == "Resources" ||
item.category == "Fish" ||
((item as any).productCategory == "Pistols" && (item as MinWeapon).totalDamage == 0)
)
), ),
mods, mods,
badItems badItems

5
src/services/itemDataService.ts
View File

@ -41,6 +41,11 @@ export const getWeaponType = (weaponName: string) => {
throw new Error(`unknown weapon ${weaponName}`); throw new Error(`unknown weapon ${weaponName}`);
} }
// Many non-weapon items are "Pistols" in Public Export, so some duck typing is needed.
if (weaponInfo.totalDamage == 0) {
throw new Error(`${weaponName} doesn't quack like a weapon`);
}
const weaponType = weaponInfo.productCategory as WeaponTypeInternal; const weaponType = weaponInfo.productCategory as WeaponTypeInternal;
if (!weaponType) { if (!weaponType) {