Skip to content

Commit ca63696

Browse files
committed
feat(SkyBlockMemberInventories): Shared Inventory
closes #676
1 parent 3feb2e2 commit ca63696

File tree

3 files changed

+11
-3
lines changed

3 files changed

+11
-3
lines changed

src/Structures/SkyBlock/Member/Inventories/SkyBlockMemberInventories.test.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import SkyBlockMemberInventoriesInventory from './Inventory/SkyBlockMemberInvent
77
import { expect, expectTypeOf, test } from 'vitest';
88

99
test('SkyBlockMemberInventories', () => {
10-
const data = new SkyBlockMemberInventories({ stats: 'meow' });
10+
const data = new SkyBlockMemberInventories({ stats: 'meow' }, { stats: 'meow' });
1111
expect(data).toBeDefined();
1212
expect(data).toBeInstanceOf(SkyBlockMemberInventories);
1313
expectTypeOf(data).toEqualTypeOf<SkyBlockMemberInventories>();
@@ -34,4 +34,8 @@ test('SkyBlockMemberInventories', () => {
3434
expect(data.sacksCounts[item]).toBeGreaterThanOrEqual(0);
3535
expectTypeOf(data.sacksCounts[item]).toEqualTypeOf<number>();
3636
});
37+
expect(data.candy).toBeDefined();
38+
expectTypeOf(data.candy).toEqualTypeOf<SkyBlockMemberInventoriesInventory>();
39+
expect(data.carnivalMask).toBeDefined();
40+
expectTypeOf(data.carnivalMask).toEqualTypeOf<SkyBlockMemberInventoriesInventory>();
3741
});

src/Structures/SkyBlock/Member/Inventories/SkyBlockMemberInventories.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,9 @@ class SkyBlockMemberInventories {
1414
personalVault: SkyBlockMemberInventoriesInventory;
1515
wardrobe: SkyBlockMemberInventoriesInventory;
1616
sacksCounts: Record<string, number>;
17-
constructor(data: Record<string, any>) {
17+
candy: SkyBlockMemberInventoriesInventory;
18+
carnivalMask: SkyBlockMemberInventoriesInventory;
19+
constructor(data: Record<string, any>, shared: Record<string, any>) {
1820
this.inventory = new SkyBlockMemberInventoriesInventory(data?.inv_contents || {});
1921
this.armor = new SkyBlockMemberInventoriesArmor(data?.inv_armor || {});
2022
this.equipment = new SkyBlockMemberInventoriesEquipment(data?.equipment_contents || {});
@@ -27,6 +29,8 @@ class SkyBlockMemberInventories {
2729
this.personalVault = new SkyBlockMemberInventoriesInventory(data?.personal_vault_contents || {});
2830
this.wardrobe = new SkyBlockMemberInventoriesInventory({ ...(data?.wardrobe_contents || {}) });
2931
this.sacksCounts = data?.sacks_counts || {};
32+
this.candy = new SkyBlockMemberInventoriesInventory(shared?.candy_inventory_contents || {});
33+
this.carnivalMask = new SkyBlockMemberInventoriesInventory(shared?.carnival_mask_inventory_contents || {});
3034
}
3135
}
3236

src/Structures/SkyBlock/Member/SkyBlockMember.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ class SkyBlockMember {
7070
this.quests = new SkyBlockMemberQuests(data?.quests || {});
7171
this.slayers = new SkyBlockMemberSlayers(data?.slayer || {});
7272
this.rift = new SkyBlockMemberRift(data?.rift || {});
73-
this.inventory = new SkyBlockMemberInventories(data?.inventory || {});
73+
this.inventory = new SkyBlockMemberInventories(data?.inventory || {}, data?.shared_inventory || {});
7474
}
7575

7676
toString(): UUID {

0 commit comments

Comments
 (0)