@ianlucas/cs2-lib 5.0.0-rc.15 → 5.0.0-rc.16

package/dist/economy-constants.d.ts

@@ -25,6 +25,7 @@ export declare const CS2_MAX_PATCHES = 5;
 export declare const CS2_STICKER_WEAR_FACTOR = 0.1;
 export declare const CS2_WEAR_FACTOR = 0.000001;
 export declare const CS2_NAMETAG_RE: RegExp;
+export declare const CS2_CONTRACT_TOOL_DEF = 62;
 export declare const CS2_NAMETAG_TOOL_DEF = 1200;
 export declare const CS2_STATTRAK_SWAP_TOOL_DEF = 1324;
 export declare const CS2_STORAGE_UNIT_TOOL_DEF = 1201;
@@ -33,7 +34,15 @@ 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_CONTAINER_OR_TOOL_ITEM: CS2ItemTypeValues[];
+export declare const CS2_EQUIPMENT_ITEMS: CS2ItemTypeValues[];
+export declare const CS2_GRAPHIC_ART_ITEMS: CS2ItemTypeValues[];
+export declare const CS2_CONTAINER_ITEMS: CS2ItemTypeValues[];
+export declare const CS2_DISPLAY_ITEMS: CS2ItemTypeValues[];
+export declare const CS2_MIDTIER_CATEGORIES: string[];
+export declare const CS2_RIFLE_CATEGORIES: string[];
+export declare const CS2_MISC_CATEGORIES: string[];
+export declare const CS2_SNIPER_RIFLE_MODELS: string[];
+export declare const CS2_MACHINEGUN_MODELS: string[];
 export declare const CS2_TEAMS_BOTH: CS2TeamValues[];
 export declare const CS2_TEAMS_CT: CS2TeamValues[];
 export declare const CS2_TEAMS_T: CS2TeamValues[];

package/dist/economy-constants.js

@@ -29,6 +29,7 @@ export const CS2_MAX_PATCHES = 5;
 export const CS2_STICKER_WEAR_FACTOR = 0.1;
 export const CS2_WEAR_FACTOR = 0.000001;
 export const CS2_NAMETAG_RE = /^[A-Za-z0-9`!@#$%^&*-+=(){}\[\]\/\|\\,.?:;'_\p{Script=Han}\p{Script=Hiragana}\p{Script=Katakana}\s]{0,20}$/u;
+export const CS2_CONTRACT_TOOL_DEF = 62;
 export const CS2_NAMETAG_TOOL_DEF = 1200;
 export const CS2_STATTRAK_SWAP_TOOL_DEF = 1324;
 export const CS2_STORAGE_UNIT_TOOL_DEF = 1201;
@@ -37,7 +38,15 @@ export const CS2_SEEDABLE_ITEMS = [CS2ItemType.Weapon, CS2ItemType.Melee, CS2Ite
 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_CONTAINER_OR_TOOL_ITEM = [CS2ItemType.Container, CS2ItemType.Tool];
+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];
+export const CS2_DISPLAY_ITEMS = [CS2ItemType.Collectible, CS2ItemType.MusicKit];
+export const CS2_MIDTIER_CATEGORIES = ["heavy", "smg"];
+export const CS2_RIFLE_CATEGORIES = ["rifle"];
+export const CS2_MISC_CATEGORIES = ["c4", "equipment"];
+export const CS2_SNIPER_RIFLE_MODELS = ["awp", "g3sg1", "scar20", "ssg08"];
+export const CS2_MACHINEGUN_MODELS = ["m249", "negev"];
 export const CS2_TEAMS_BOTH = [CS2Team.T, CS2Team.CT];
 export const CS2_TEAMS_CT = [CS2Team.CT];
 export const CS2_TEAMS_T = [CS2Team.T];

package/dist/economy.d.ts

@@ -89,19 +89,34 @@ export declare class CS2EconomyItem implements Interface<Omit<CS2Item, "contents
     get specials(): CS2EconomyItem[] | undefined;
     set teams(value: CS2ItemTeamValues);
     get teams(): CS2TeamValues[] | undefined;
-    isStub(): boolean;
     isC4(): boolean;
+    isPistol(): boolean;
+    isSMG(): boolean;
+    isRifle(): boolean;
+    isSniperRifle(): boolean;
+    isMachinegun(): boolean;
+    isHeavy(): boolean;
+    isEquipment(): boolean;
+    isInMidTiers(): boolean;
+    isInRifles(): boolean;
+    isInMisc(): boolean;
     isAgent(): boolean;
-    isSticker(): boolean;
-    isPatch(): boolean;
+    isCollectible(): boolean;
+    isContainer(): boolean;
+    isContainerKey(): boolean;
     isGloves(): boolean;
+    isGraffiti(): boolean;
+    isMelee(): boolean;
+    isMusicKit(): boolean;
+    isPatch(): boolean;
+    isSticker(): boolean;
+    isStub(): boolean;
+    isTool(): boolean;
+    isWeapon(): boolean;
     isStorageUnit(): boolean;
     isNameTag(): boolean;
     isStatTrakSwapTool(): boolean;
-    isContainer(): boolean;
-    isContainerKey(): boolean;
-    isContainerOrTool(): boolean;
-    isTool(): boolean;
+    isContract(): boolean;
     expectAgent(): this;
     expectPatch(): this;
     expectSticker(): this;
@@ -119,6 +134,11 @@ export declare class CS2EconomyItem implements Interface<Omit<CS2Item, "contents
     isStickerCapsule(): boolean;
     isGraffitiBox(): boolean;
     isSouvenirCase(): boolean;
+    isInEquipments(): boolean;
+    isInGraphicArts(): boolean;
+    isInContainers(): boolean;
+    isInDisplay(): boolean;
+    isHoldable(): boolean;
     groupContents(): Record<string, CS2EconomyItem[]>;
     listContents(hideSpecials?: boolean): CS2EconomyItem[];
     unlockContainer(): CS2UnlockedItem;

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_OR_TOOL_ITEM, 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_MIN_SEED, CS2_MIN_STATTRAK, CS2_MIN_WEAR, CS2_NAMETAGGABLE_ITEMS, CS2_NAMETAG_RE, CS2_NAMETAG_TOOL_DEF, CS2_SEEDABLE_ITEMS, 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_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 { 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";
@@ -273,32 +273,44 @@ export class CS2EconomyItem {
                 return undefined;
         }
     }
-    isStub() {
-        return this.type === CS2ItemType.Stub;
-    }
     isC4() {
         return this.category === "c4";
     }
-    isAgent() {
-        return this.type === CS2ItemType.Agent;
+    isPistol() {
+        return this.category === "secondary";
     }
-    isSticker() {
-        return this.type === CS2ItemType.Sticker;
+    isSMG() {
+        return this.category === "smg";
     }
-    isPatch() {
-        return this.type === CS2ItemType.Patch;
+    isRifle() {
+        return this.category === "rifle";
     }
-    isGloves() {
-        return this.type === CS2ItemType.Gloves;
+    isSniperRifle() {
+        return CS2_SNIPER_RIFLE_MODELS.includes(ensure(this.model));
     }
-    isStorageUnit() {
-        return this.type === CS2ItemType.Tool && this.def === CS2_STORAGE_UNIT_TOOL_DEF;
+    isMachinegun() {
+        return CS2_MACHINEGUN_MODELS.includes(ensure(this.model));
     }
-    isNameTag() {
-        return this.type === CS2ItemType.Tool && this.def === CS2_NAMETAG_TOOL_DEF;
+    isHeavy() {
+        return this.category === "heavy";
     }
-    isStatTrakSwapTool() {
-        return this.type === CS2ItemType.Tool && this.def === CS2_STATTRAK_SWAP_TOOL_DEF;
+    isEquipment() {
+        return this.category === "equipment";
+    }
+    isInMidTiers() {
+        return CS2_MIDTIER_CATEGORIES.includes(ensure(this.category));
+    }
+    isInRifles() {
+        return CS2_RIFLE_CATEGORIES.includes(ensure(this.category));
+    }
+    isInMisc() {
+        return CS2_MISC_CATEGORIES.includes(ensure(this.category));
+    }
+    isAgent() {
+        return this.type === CS2ItemType.Agent;
+    }
+    isCollectible() {
+        return this.type === CS2ItemType.Collectible;
     }
     isContainer() {
         return this.type === CS2ItemType.Container;
@@ -306,12 +318,45 @@ export class CS2EconomyItem {
     isContainerKey() {
         return this.type === CS2ItemType.ContainerKey;
     }
-    isContainerOrTool() {
-        return CS2_CONTAINER_OR_TOOL_ITEM.includes(this.type);
+    isGloves() {
+        return this.type === CS2ItemType.Gloves;
+    }
+    isGraffiti() {
+        return this.type === CS2ItemType.Graffiti;
+    }
+    isMelee() {
+        return this.type === CS2ItemType.Melee;
+    }
+    isMusicKit() {
+        return this.type === CS2ItemType.MusicKit;
+    }
+    isPatch() {
+        return this.type === CS2ItemType.Patch;
+    }
+    isSticker() {
+        return this.type === CS2ItemType.Sticker;
+    }
+    isStub() {
+        return this.type === CS2ItemType.Stub;
     }
     isTool() {
         return this.type === CS2ItemType.Tool;
     }
+    isWeapon() {
+        return this.type === CS2ItemType.Weapon;
+    }
+    isStorageUnit() {
+        return this.isTool() && this.def === CS2_STORAGE_UNIT_TOOL_DEF;
+    }
+    isNameTag() {
+        return this.isTool() && this.def === CS2_NAMETAG_TOOL_DEF;
+    }
+    isStatTrakSwapTool() {
+        return this.isTool() && this.def === CS2_STATTRAK_SWAP_TOOL_DEF;
+    }
+    isContract() {
+        return this.isTool() && this.def === CS2_CONTRACT_TOOL_DEF;
+    }
     expectAgent() {
         assert(this.isAgent());
         return this;
@@ -371,6 +416,21 @@ export class CS2EconomyItem {
     isSouvenirCase() {
         return this.containerType === CS2ContainerType.SouvenirCase;
     }
+    isInEquipments() {
+        return CS2_EQUIPMENT_ITEMS.includes(this.type);
+    }
+    isInGraphicArts() {
+        return CS2_GRAPHIC_ART_ITEMS.includes(this.type);
+    }
+    isInContainers() {
+        return CS2_CONTAINER_ITEMS.includes(this.type);
+    }
+    isInDisplay() {
+        return CS2_DISPLAY_ITEMS.includes(this.type);
+    }
+    isHoldable() {
+        return CS2_WEARABLE_ITEMS.includes(this.type);
+    }
     groupContents() {
         const items = {};
         const specials = this.specials;

package/dist/inventory.js

@@ -162,8 +162,7 @@ export class CS2Inventory {
                 otherItem.equippedT = team === CS2Team.T ? true : otherItem.equippedT;
             }
             else {
-                if (otherItem.type === item.type &&
-                    (item.type !== CS2ItemType.Weapon || otherItem.model === item.model)) {
+                if (otherItem.type === item.type && (!item.isWeapon() || otherItem.model === item.model)) {
                     otherItem.equipped = team === undefined ? undefined : otherItem.equipped;
                     otherItem.equippedCT = team === CS2Team.CT ? undefined : otherItem.equippedCT;
                     otherItem.equippedT = team === CS2Team.T ? undefined : otherItem.equippedT;
@@ -343,7 +342,7 @@ export class CS2Inventory {
         const toItem = this.get(toUid);
         assert(fromItem.statTrak !== undefined && toItem.statTrak !== undefined);
         assert(fromItem.type === toItem.type);
-        assert(fromItem.type === CS2ItemType.MusicKit || fromItem.def === toItem.def);
+        assert(fromItem.isMusicKit() || fromItem.def === toItem.def);
         const fromStattrak = fromItem.statTrak;
         fromItem.statTrak = toItem.statTrak;
         fromItem.updatedAt = getTimestamp();

package/package.json

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