@ianlucas/cs2-lib 5.0.0-rc.21 → 5.0.0-rc.23

package/dist/economy-constants.d.ts

@@ -33,7 +33,7 @@ export declare const CS2_NAMETAGGABLE_ITEMS: CS2ItemTypeValues[];
 export declare const CS2_SEEDABLE_ITEMS: CS2ItemTypeValues[];
 export declare const CS2_STATTRAKABLE_ITEMS: CS2ItemTypeValues[];
 export declare const CS2_STICKERABLE_ITEMS: CS2ItemTypeValues[];
-export declare const CS2_WEARABLE_ITEMS: CS2ItemTypeValues[];
+export declare const CS2_PAINTABLE_ITEMS: CS2ItemTypeValues[];
 export declare const CS2_EQUIPMENT_ITEMS: CS2ItemTypeValues[];
 export declare const CS2_GRAPHIC_ART_ITEMS: CS2ItemTypeValues[];
 export declare const CS2_CONTAINER_ITEMS: CS2ItemTypeValues[];

package/dist/economy-constants.js

@@ -37,7 +37,7 @@ export const CS2_NAMETAGGABLE_ITEMS = [CS2ItemType.Melee, CS2ItemType.Weapon];
 export const CS2_SEEDABLE_ITEMS = [CS2ItemType.Weapon, CS2ItemType.Melee, CS2ItemType.Gloves];
 export const CS2_STATTRAKABLE_ITEMS = [CS2ItemType.Melee, CS2ItemType.Weapon, CS2ItemType.MusicKit];
 export const CS2_STICKERABLE_ITEMS = [CS2ItemType.Weapon];
-export const CS2_WEARABLE_ITEMS = [CS2ItemType.Gloves, CS2ItemType.Melee, CS2ItemType.Weapon];
+export const CS2_PAINTABLE_ITEMS = [CS2ItemType.Gloves, CS2ItemType.Melee, CS2ItemType.Weapon];
 export const CS2_EQUIPMENT_ITEMS = [CS2ItemType.Weapon, CS2ItemType.Agent, CS2ItemType.Gloves, CS2ItemType.Melee, CS2ItemType.MusicKit];
 export const CS2_GRAPHIC_ART_ITEMS = [CS2ItemType.Patch, CS2ItemType.Sticker, CS2ItemType.Graffiti];
 export const CS2_CONTAINER_ITEMS = [CS2ItemType.Container, CS2ItemType.Tool];

package/dist/economy.d.ts

@@ -138,7 +138,7 @@ export declare class CS2EconomyItem implements Interface<Omit<CS2Item, "contents
     isInGraphicArts(): boolean;
     isInContainers(): boolean;
     isInDisplay(): boolean;
-    isHoldable(): boolean;
+    isPaintable(): boolean;
     getMinimumWear(): number;
     getMaximumWear(): number;
     groupContents(): Record<string, CS2EconomyItem[]>;

package/dist/economy.js

@@ -2,7 +2,7 @@
  *  Copyright (c) Ian Lucas. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-import { CS2_CONTAINER_ITEMS, CS2_CONTRACT_TOOL_DEF, CS2_DISPLAY_ITEMS, CS2_EQUIPMENT_ITEMS, CS2_GRAPHIC_ART_ITEMS, CS2_MACHINEGUN_MODELS, CS2_MAX_FACTORY_NEW_WEAR, CS2_MAX_FIELD_TESTED_WEAR, CS2_MAX_MINIMAL_WEAR_WEAR, CS2_MAX_SEED, CS2_MAX_STATTRAK, CS2_MAX_WEAR, CS2_MAX_WELL_WORN_WEAR, CS2_MIDTIER_CATEGORIES, CS2_MIN_SEED, CS2_MIN_STATTRAK, CS2_MIN_WEAR, CS2_MISC_CATEGORIES, CS2_NAMETAGGABLE_ITEMS, CS2_NAMETAG_RE, CS2_NAMETAG_TOOL_DEF, CS2_RIFLE_CATEGORIES, CS2_SEEDABLE_ITEMS, CS2_SNIPER_RIFLE_MODELS, CS2_STATTRAKABLE_ITEMS, CS2_STATTRAK_SWAP_TOOL_DEF, CS2_STICKERABLE_ITEMS, CS2_STORAGE_UNIT_TOOL_DEF, CS2_TEAMS_BOTH, CS2_TEAMS_CT, CS2_TEAMS_T, CS2_WEARABLE_ITEMS, CS2_WEAR_FACTOR } from "./economy-constants.js";
+import { CS2_CONTAINER_ITEMS, CS2_CONTRACT_TOOL_DEF, CS2_DISPLAY_ITEMS, CS2_EQUIPMENT_ITEMS, CS2_GRAPHIC_ART_ITEMS, CS2_MACHINEGUN_MODELS, CS2_MAX_FACTORY_NEW_WEAR, CS2_MAX_FIELD_TESTED_WEAR, CS2_MAX_MINIMAL_WEAR_WEAR, CS2_MAX_SEED, CS2_MAX_STATTRAK, CS2_MAX_WEAR, CS2_MAX_WELL_WORN_WEAR, CS2_MIDTIER_CATEGORIES, CS2_MIN_SEED, CS2_MIN_STATTRAK, CS2_MIN_WEAR, CS2_MISC_CATEGORIES, CS2_NAMETAGGABLE_ITEMS, CS2_NAMETAG_RE, CS2_NAMETAG_TOOL_DEF, CS2_PAINTABLE_ITEMS, CS2_RIFLE_CATEGORIES, CS2_SEEDABLE_ITEMS, CS2_SNIPER_RIFLE_MODELS, CS2_STATTRAKABLE_ITEMS, CS2_STATTRAK_SWAP_TOOL_DEF, CS2_STICKERABLE_ITEMS, CS2_STORAGE_UNIT_TOOL_DEF, CS2_TEAMS_BOTH, CS2_TEAMS_CT, CS2_TEAMS_T, CS2_WEAR_FACTOR } from "./economy-constants.js";
 import { CS2RarityColorName, CS2RarityColorOrder, CS2RaritySoundName, CS2_BASE_ODD, CS2_RARITY_COLOR_DEFAULT, CS2_RARITY_ORDER, CS2_STATTRAK_ODD, randomFloat, randomInt } from "./economy-container.js";
 import { CS2ContainerType, CS2ItemTeam, CS2ItemType, CS2ItemWear } from "./economy-types.js";
 import { assert, compare, ensure, safe } from "./utils.js";
@@ -243,7 +243,11 @@ export class CS2EconomyItem {
         return ensure(this._contents).map((id) => this.economy.get(id));
     }
     get parent() {
-        return this.baseId !== undefined ? this.economy.get(this.baseId) : undefined;
+        return this.baseId !== undefined
+            ? this.economy.items.has(this.baseId)
+                ? this.economy.get(this.baseId)
+                : undefined
+            : undefined;
     }
     get rawContents() {
         return this._contents;
@@ -390,7 +394,7 @@ export class CS2EconomyItem {
         return this;
     }
     hasWear() {
-        return CS2_WEARABLE_ITEMS.includes(this.type) && !this.free && this.index !== 0;
+        return CS2_PAINTABLE_ITEMS.includes(this.type) && !this.free && this.index !== 0;
     }
     hasSeed() {
         return CS2_SEEDABLE_ITEMS.includes(this.type) && !this.free && this.index !== 0;
@@ -428,8 +432,8 @@ export class CS2EconomyItem {
     isInDisplay() {
         return CS2_DISPLAY_ITEMS.includes(this.type);
     }
-    isHoldable() {
-        return CS2_WEARABLE_ITEMS.includes(this.type);
+    isPaintable() {
+        return CS2_PAINTABLE_ITEMS.includes(this.type);
     }
     getMinimumWear() {
         return this.wearMin ?? CS2_MIN_WEAR;

package/dist/inventory.d.ts

@@ -45,6 +45,7 @@ export declare class CS2Inventory {
     readonly options: Readonly<CS2InventoryOptions>;
     static parse(stringValue: string | undefined | null, economy?: CS2EconomyInstance): CS2InventoryData | undefined;
     constructor({ economy, data, maxItems, storageUnitMaxItems }?: Partial<CS2InventorySpec>);
+    private validateAddable;
     private validateStickers;
     private validatePatches;
     validateBaseInventoryItem({ id, nameTag, patches, seed, statTrak, stickers, wear }: CS2BaseInventoryItem): void;

package/dist/inventory.js

@@ -39,6 +39,11 @@ export class CS2Inventory {
             storageUnitMaxItems: storageUnitMaxItems ?? 32
         };
     }
+    validateAddable(item) {
+        if (item.isGloves()) {
+            assert(item.free || !item.base);
+        }
+    }
     validateStickers(stickers, item) {
         if (stickers === undefined) {
             return;
@@ -74,11 +79,14 @@ export class CS2Inventory {
         this.economy.validateSeed(seed, item);
         this.economy.validateNametag(nameTag, item);
         this.economy.validateStatTrak(statTrak, item);
+        this.validateAddable(item);
         this.validatePatches(patches, item);
         this.validateStickers(stickers, item);
     }
     toInventoryItems(items) {
-        return new Map(Object.entries(items).map(([key, value]) => {
+        return new Map(Object.entries(items)
+            .filter(([, { id }]) => this.economy.items.has(id))
+            .map(([key, value]) => {
             const uid = parseInt(key, 10);
             return [uid, new CS2InventoryItem(this, uid, value, this.economy.getById(value.id))];
         }));
@@ -393,18 +401,24 @@ export class CS2InventoryItem extends CS2EconomyItem {
     wear;
     assign({ patches, stickers, storage }) {
         if (patches !== undefined) {
-            this.patches = new Map(Object.entries(patches).map(([key, value]) => [parseInt(key, 10), value]));
+            this.patches = new Map(Object.entries(patches)
+                .filter(([, patchId]) => this.economy.items.has(patchId))
+                .map(([slot, patchId]) => [parseInt(slot, 10), patchId]));
         }
         if (stickers !== undefined) {
-            this.stickers = new Map(Object.entries(stickers).map(([key, value]) => [parseInt(key, 10), value]));
+            this.stickers = new Map(Object.entries(stickers)
+                .filter(([, sticker]) => this.economy.items.has(sticker.id))
+                .map(([slot, sticker]) => [parseInt(slot, 10), sticker]));
         }
         if (storage !== undefined) {
             assert(this.isStorageUnit());
-            this.storage = new Map(Object.entries(storage).map(([key, value]) => {
-                const storedEconomyItem = this.economy.getById(value.id);
+            this.storage = new Map(Object.entries(storage)
+                .filter(([, { id }]) => this.economy.items.has(id))
+                .map(([key, value]) => {
+                const economyItem = this.economy.getById(value.id);
                 assert(value.storage === undefined);
                 const uid = parseInt(key, 10);
-                return [uid, new CS2InventoryItem(this.inventory, uid, value, storedEconomyItem)];
+                return [uid, new CS2InventoryItem(this.inventory, uid, value, economyItem)];
             }));
         }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ianlucas/cs2-lib",
-    "version": "5.0.0-rc.21",
+    "version": "5.0.0-rc.23",
     "description": "A TypeScript library for manipulating Counter-Strike 2 data",
     "license": "MIT",
     "author": "Ian Lucas",