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

feat: unequipping weapons & deleting loadout configs (#160)

Browse Source
This commit is contained in:
Sainan 2024-05-04 23:11:55 +02:00 committed by GitHub
parent 477f678244
commit 9bded04dfd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/models/inventoryModels/loadoutModel.ts
View File

@ -19,7 +19,8 @@ const EquipmentSelectionSchema = new Schema<IEquipmentSelection>(
default: { $oid: "000000000000000000000000" } default: { $oid: "000000000000000000000000" }
}, },
mod: Number, mod: Number,
cus: Number cus: Number,
hide: Boolean
}, },
{ {
_id: false _id: false

8
src/services/saveLoadoutService.ts
View File

@ -77,6 +77,11 @@ export const handleInventoryItemConfigChange = async (
// all non-empty entries are one loadout slot // all non-empty entries are one loadout slot
for (const [loadoutId, loadoutConfig] of Object.entries(newLoadout)) { for (const [loadoutId, loadoutConfig] of Object.entries(newLoadout)) {
if (loadoutConfig.Remove) {
loadout[loadoutSlot].pull({ _id: loadoutId });
continue;
}
const oldLoadoutConfig = loadout[loadoutSlot].find( const oldLoadoutConfig = loadout[loadoutSlot].find(
loadout => loadout._id.toString() === loadoutId loadout => loadout._id.toString() === loadoutId
); );
@ -106,8 +111,7 @@ export const handleInventoryItemConfigChange = async (
throw new Error("loadout index not found"); throw new Error("loadout index not found");
} }
//perhaps .overwrite() is better loadout[loadoutSlot][loadoutIndex].overwrite(loadoutConfig);
loadout[loadoutSlot][loadoutIndex].set(loadoutConfig);
} }
} }
await loadout.save(); await loadout.save();

22
src/types/saveLoadoutTypes.ts
View File

@ -76,17 +76,19 @@ export interface ILoadoutConfigDatabase extends Omit<ILoadoutConfigClient, "Item
// for request and response from and to client // for request and response from and to client
export interface ILoadoutConfigClient { export interface ILoadoutConfigClient {
ItemId: IOid; ItemId: IOid;
n: string; Remove?: boolean; // when client wants to remove a config, it only includes ItemId & Remove.
PresetIcon: string; n?: string;
Favorite: boolean; PresetIcon?: string;
s: IEquipmentSelection; Favorite?: boolean;
p: IEquipmentSelection; s?: IEquipmentSelection;
l: IEquipmentSelection; p?: IEquipmentSelection;
m: IEquipmentSelection; l?: IEquipmentSelection;
m?: IEquipmentSelection;
} }
export interface IEquipmentSelection { export interface IEquipmentSelection {
ItemId: IOid; ItemId?: IOid;
mod: number; mod?: number;
cus: number; cus?: number;
hide?: boolean;
} }