@nativewrappers/redm 0.0.92 → 0.0.94

package/entities/Ped.js

@@ -1,6 +1,7 @@
 var __defProp = Object.defineProperty;
 var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
 import { Tasks } from "../Task";
+import { ItemAddReason } from "../inventory/InventoryTypes";
 import { _N } from "../utils/Native";
 import { Attributes } from "../Attribute";
 import { BaseEntity } from "./BaseEntity";
@@ -41,6 +42,20 @@ class Ped extends BaseEntity {
   constructor(handle) {
     super(handle);
   }
+  /**
+   * @returns the current horse or vehicle the ped is on, or null if they're not on either
+   */
+  get MountedEntity() {
+    const veh = this.CurrentVehicle;
+    if (veh !== null) {
+      return veh;
+    }
+    const horse = this.Mount;
+    if (horse !== null) {
+      return horse;
+    }
+    return null;
+  }
   /**
    * Blocks scenarios inbetween the specified vectors
    * @todo Move to Game
@@ -133,10 +148,16 @@ class Ped extends BaseEntity {
   /**
    * @returns the last mount that this ped was on, or null if it doesn't exist
    */
-  get Mount() {
+  get LastMount() {
     const pedId = _N("0x4C8B59171957BCF7", this.handle, Citizen.resultAsInteger());
     return Ped.fromHandle(pedId);
   }
+  /**
+   * @returns the the current mount that the ped is on, or null if there isn't one
+   */
+  get Mount() {
+    return Ped.fromHandle(GetMount(this.handle));
+  }
   /**
    * returns the horse that this ped is leading
    */
@@ -390,6 +411,28 @@ class Ped extends BaseEntity {
   resetStamina() {
     _N("0x36513AFFC703C60D", this.handle);
   }
+  setOwnsAnimal(ped, p2 = 0) {
+    _N("0x931B241409216C1F", this.handle, ped.Handle, p2);
+  }
+  // WEAPON NAMESPACE
+  addAmmo(weapon, amount, addReason = ItemAddReason.Default) {
+    Citizen.invokeNative("0xB190BCA3F4042F95", this.handle, weapon.Hash, amount, addReason);
+  }
+  clearLastDamage() {
+    Citizen.invokeNative("0x087D8F4BC65F68E4", this.handle);
+  }
+  disableAmmoType(ammo) {
+    Citizen.invokeNative("0xAA5A52204E077883", this.handle, ammo.Hash);
+  }
+  disableAmmoForWeapon(weapon, ammo) {
+    Citizen.invokeNative("0xF0D728EEA3C99775", this.handle, weapon.Hash, ammo.Hash);
+  }
+  get HasPistol() {
+    return Citizen.invokeNative("0xBFCA7AFABF9D7967", this.handle);
+  }
+  get HasRepeater() {
+    return Citizen.invokeNative("0x495A04CAEC263AF8", this.handle);
+  }
 }
 export {
   Ped

package/entities/Player.d.ts

@@ -1,3 +1,4 @@
+import type { Ped } from "./Ped";
 export declare class Player {
     private handle;
     static fromPedHandle(handle: number): Player;
@@ -18,4 +19,5 @@ export declare class Player {
     addStaminaUpgrade(amount: number): void;
     addHealthUpgrade(amount: number): void;
     addDeadeyeUpgrade(amount: number): void;
+    setOwnsMount(mount: Ped): void;
 }

package/entities/Player.js

@@ -51,6 +51,9 @@ class Player {
   addDeadeyeUpgrade(amount) {
     handleUpgrade("UPGRADE_DEADEYE_TANK_1", amount);
   }
+  setOwnsMount(mount) {
+    _N("0xE6D4E435B56D5BD0", this.handle, mount.Handle);
+  }
 }
 export {
   Player

package/index.d.ts

@@ -1,4 +1,6 @@
+export * from "./Ammo";
 export * from "./Attribute";
+export * from "./BufferedClass";
 export * from "./Controls";
 export * from "./Game";
 export * from "./GameConstants";
@@ -8,6 +10,7 @@ export * from "./RawKeymaps";
 export * from "./RelationshipGroup";
 export * from "./Task";
 export * from "./Volume";
+export * from "./Weapons";
 export * from "./world/createDraftVehicle";
 export * from "./world/createPed";
 export * from "./world/createProp";
@@ -15,6 +18,11 @@ export * from "./world/createVehicle";
 export * from "./utils/Animations";
 export * from "./utils/Native";
 export * from "./types/Throwable";
+export * from "./models/AmmoModel";
+export * from "./models/WeaponModel";
+export * from "./inventory/Inventory";
+export * from "./inventory/InventoryGUID";
+export * from "./inventory/InventoryTypes";
 export * from "./interfaces/Dimensions";
 export * from "./enums/AnimationFlags";
 export * from "./enums/Attributes";
@@ -29,6 +37,7 @@ export * from "./enums/Relationship";
 export * from "./enums/VehicleSeat";
 export * from "./entities/BaseEntity";
 export * from "./entities/Entity";
+export * from "./entities/HorsePeltEntries";
 export * from "./entities/Ped";
 export * from "./entities/Pickup";
 export * from "./entities/Player";

package/index.js

@@ -1,4 +1,6 @@
+export * from "./Ammo";
 export * from "./Attribute";
+export * from "./BufferedClass";
 export * from "./Controls";
 export * from "./Game";
 export * from "./GameConstants";
@@ -8,6 +10,7 @@ export * from "./RawKeymaps";
 export * from "./RelationshipGroup";
 export * from "./Task";
 export * from "./Volume";
+export * from "./Weapons";
 export * from "./world/createDraftVehicle";
 export * from "./world/createPed";
 export * from "./world/createProp";
@@ -15,6 +18,11 @@ export * from "./world/createVehicle";
 export * from "./utils/Animations";
 export * from "./utils/Native";
 export * from "./types/Throwable";
+export * from "./models/AmmoModel";
+export * from "./models/WeaponModel";
+export * from "./inventory/Inventory";
+export * from "./inventory/InventoryGUID";
+export * from "./inventory/InventoryTypes";
 export * from "./interfaces/Dimensions";
 export * from "./enums/AnimationFlags";
 export * from "./enums/Attributes";
@@ -29,6 +37,7 @@ export * from "./enums/Relationship";
 export * from "./enums/VehicleSeat";
 export * from "./entities/BaseEntity";
 export * from "./entities/Entity";
+export * from "./entities/HorsePeltEntries";
 export * from "./entities/Ped";
 export * from "./entities/Pickup";
 export * from "./entities/Player";

package/inventory/Inventory.d.ts

@@ -0,0 +1,21 @@
+import type { Model } from "../Model";
+import { RDRInventoryGUID } from "./InventoryGUID";
+import { InventoryIndex, ItemAddReason } from "./InventoryTypes";
+declare enum FailReason {
+    Success = 0,
+    ItemWasntValid = 1,
+    NoCharacterGuid = 2,
+    NoWardrobeGuid = 3,
+    ItemDidntExist = 4,
+    FailedToEquip = 5
+}
+export declare const CHARACTER_HASH: number;
+export declare const WARDROBE_HASH: number;
+export declare const PLAYER_INVENTORY_ID = InventoryIndex.SinglePlayer;
+export declare class RDRInventory {
+    GetGuidFromItemId(inventoryId: InventoryIndex, itemData: RDRInventoryGUID | null, category: number, slotId: number): RDRInventoryGUID | null;
+    AddItem(inventoryId: InventoryIndex, itemHash: number, amount: number, slotHash: number, inventoryGuid: RDRInventoryGUID, addReason?: ItemAddReason): RDRInventoryGUID | null;
+    EquipItemWithGUID(inventoryId: InventoryIndex, itemGUID: RDRInventoryGUID, equipped?: boolean): boolean;
+    AddItemToPlayer(itemName: Model, amount: number, slotHash: number): (boolean | FailReason)[];
+}
+export {};

package/inventory/Inventory.js

@@ -0,0 +1,70 @@
+var __defProp = Object.defineProperty;
+var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
+import { RDRInventoryGUID } from "./InventoryGUID";
+import { InventoryIndex, ItemAddReason } from "./InventoryTypes";
+const CHARACTER_HASH = GetHashKey("CHARACTER");
+const WARDROBE_HASH = GetHashKey("WARDROBE");
+const PLAYER_INVENTORY_ID = InventoryIndex.SinglePlayer;
+class RDRInventory {
+  static {
+    __name(this, "RDRInventory");
+  }
+  GetGuidFromItemId(inventoryId, itemData, category, slotId) {
+    const outInventoryGuid = new RDRInventoryGUID();
+    const success = Citizen.invokeNative(
+      "0x886DFD3E185C8A89",
+      inventoryId,
+      itemData?.buffer ?? 0,
+      category,
+      slotId,
+      outInventoryGuid.buffer
+    );
+    return success ? outInventoryGuid : null;
+  }
+  AddItem(inventoryId, itemHash, amount, slotHash, inventoryGuid, addReason = ItemAddReason.Default) {
+    const itemData = new RDRInventoryGUID();
+    const wasAdded = Citizen.invokeNative(
+      "0xCB5D11F9508A928D",
+      inventoryId,
+      itemData.buffer,
+      inventoryGuid.buffer,
+      itemHash,
+      slotHash,
+      amount,
+      addReason
+    );
+    return wasAdded ? itemData : null;
+  }
+  EquipItemWithGUID(inventoryId, itemGUID, equipped = true) {
+    return Citizen.invokeNative("0x734311E2852760D0", inventoryId, itemGUID, equipped);
+  }
+  AddItemToPlayer(itemName, amount, slotHash) {
+    const isValid = Citizen.invokeNative("0x6D5D51B188333FD1", itemName.Hash, 0);
+    if (!isValid) {
+      return [false, 1 /* ItemWasntValid */];
+    }
+    const characterGuid = this.GetGuidFromItemId(PLAYER_INVENTORY_ID, null, CHARACTER_HASH, 2703302912);
+    if (!characterGuid) {
+      return [false, 2 /* NoCharacterGuid */];
+    }
+    const wardrobeGuid = this.GetGuidFromItemId(PLAYER_INVENTORY_ID, characterGuid, WARDROBE_HASH, 1034665895);
+    if (!wardrobeGuid) {
+      return [false, 3 /* NoWardrobeGuid */];
+    }
+    const itemGuid = this.AddItem(PLAYER_INVENTORY_ID, itemName.Hash, amount, slotHash, wardrobeGuid);
+    if (!itemGuid) {
+      return [false, 4 /* ItemDidntExist */];
+    }
+    const equipped = this.EquipItemWithGUID(PLAYER_INVENTORY_ID, itemGuid, true);
+    if (!equipped) {
+      return [false, 5 /* FailedToEquip */];
+    }
+    return [true, 0 /* Success */];
+  }
+}
+export {
+  CHARACTER_HASH,
+  PLAYER_INVENTORY_ID,
+  RDRInventory,
+  WARDROBE_HASH
+};

package/inventory/InventoryGUID.d.ts

@@ -0,0 +1,17 @@
+import { BufferedClass } from "../BufferedClass";
+export declare class RDRInventoryGUID extends BufferedClass {
+    constructor();
+    get Unk1(): number;
+    get Unk2(): number;
+    get ItemCategory(): number;
+    get Unk3(): number;
+    get ItemHash(): number;
+    get Unk4(): number;
+    get Unk5(): number;
+    get Unk6(): number;
+    get Unk7(): number;
+    get Unk8(): number;
+    get CatalogueType(): number;
+    get Quantity(): number;
+    get Unk9(): number;
+}

package/inventory/InventoryGUID.js

@@ -0,0 +1,53 @@
+var __defProp = Object.defineProperty;
+var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
+import { BufferedClass } from "../BufferedClass";
+class RDRInventoryGUID extends BufferedClass {
+  static {
+    __name(this, "RDRInventoryGUID");
+  }
+  constructor() {
+    super(104);
+  }
+  get Unk1() {
+    return this.view.getUint32(8 * 0 /* Unk1 */);
+  }
+  get Unk2() {
+    return this.view.getUint32(8 * 1 /* Unk2 */);
+  }
+  get ItemCategory() {
+    return this.view.getUint32(8 * 2 /* InventoryCategory */);
+  }
+  get Unk3() {
+    return this.view.getUint32(8 * 3 /* Unk3 */);
+  }
+  get ItemHash() {
+    return this.view.getUint32(8 * 4 /* ItemHash */);
+  }
+  get Unk4() {
+    return this.view.getUint32(8 * 5 /* Unk4 */);
+  }
+  get Unk5() {
+    return this.view.getUint32(8 * 6 /* Unk5 */);
+  }
+  get Unk6() {
+    return this.view.getUint32(8 * 7 /* Unk6 */);
+  }
+  get Unk7() {
+    return this.view.getUint32(8 * 8 /* Unk7 */);
+  }
+  get Unk8() {
+    return this.view.getUint32(8 * 9 /* Unk8 */);
+  }
+  get CatalogueType() {
+    return this.view.getUint32(8 * 10 /* CatalogueType */);
+  }
+  get Quantity() {
+    return this.view.getUint32(8 * 11 /* Quantity */);
+  }
+  get Unk9() {
+    return this.view.getUint32(8 * 12 /* Unk9 */);
+  }
+}
+export {
+  RDRInventoryGUID
+};

package/inventory/InventoryTypes.d.ts

@@ -0,0 +1,37 @@
+export declare enum InventoryIndex {
+    Invalid = 0,
+    SinglePlayer = 1,
+    MultiPlayer = 2,
+    MultiplayerMission = 3,
+    SecondScreen = 4,
+    SinglePlayerBackup = 5,
+    SinglePlayerSnapshot = 6,
+    UNK_0xDE2AE452 = 7,
+    UNK_0x399D9B3A = 8,
+    UNK_0x4BD43FA7 = 9,
+    UNK_0x9529D251 = 10,
+    UNK_0xA75776AC = 11
+}
+export declare enum InventoryItemSlots {
+}
+export declare enum InventoryCategory {
+}
+export declare enum ItemAddReason {
+    Default = 752097756,
+    Incentive = -1965281643,
+    Syncing = -1924444172,
+    Awards = -1216041698,
+    Notification = -983395630,
+    Loadout = -902540058,
+    Looted = -897553835,
+    UseFailed = -746211728,
+    GetInventory = -669481339,
+    CreateCharacter = -490406031,
+    MpMission = -334626412,
+    Pickup = 444010018,
+    SetAmount = 1157919518,
+    Purchased = 1248274121,
+    LoadSaveGame = 1445013766,
+    Debug = 1543882317,
+    Melee = 2073812199
+}

package/inventory/InventoryTypes.js

@@ -0,0 +1,47 @@
+var InventoryIndex = /* @__PURE__ */ ((InventoryIndex2) => {
+  InventoryIndex2[InventoryIndex2["Invalid"] = 0] = "Invalid";
+  InventoryIndex2[InventoryIndex2["SinglePlayer"] = 1] = "SinglePlayer";
+  InventoryIndex2[InventoryIndex2["MultiPlayer"] = 2] = "MultiPlayer";
+  InventoryIndex2[InventoryIndex2["MultiplayerMission"] = 3] = "MultiplayerMission";
+  InventoryIndex2[InventoryIndex2["SecondScreen"] = 4] = "SecondScreen";
+  InventoryIndex2[InventoryIndex2["SinglePlayerBackup"] = 5] = "SinglePlayerBackup";
+  InventoryIndex2[InventoryIndex2["SinglePlayerSnapshot"] = 6] = "SinglePlayerSnapshot";
+  InventoryIndex2[InventoryIndex2["UNK_0xDE2AE452"] = 7] = "UNK_0xDE2AE452";
+  InventoryIndex2[InventoryIndex2["UNK_0x399D9B3A"] = 8] = "UNK_0x399D9B3A";
+  InventoryIndex2[InventoryIndex2["UNK_0x4BD43FA7"] = 9] = "UNK_0x4BD43FA7";
+  InventoryIndex2[InventoryIndex2["UNK_0x9529D251"] = 10] = "UNK_0x9529D251";
+  InventoryIndex2[InventoryIndex2["UNK_0xA75776AC"] = 11] = "UNK_0xA75776AC";
+  return InventoryIndex2;
+})(InventoryIndex || {});
+var InventoryItemSlots = /* @__PURE__ */ ((InventoryItemSlots2) => {
+  return InventoryItemSlots2;
+})(InventoryItemSlots || {});
+var InventoryCategory = /* @__PURE__ */ ((InventoryCategory2) => {
+  return InventoryCategory2;
+})(InventoryCategory || {});
+var ItemAddReason = /* @__PURE__ */ ((ItemAddReason2) => {
+  ItemAddReason2[ItemAddReason2["Default"] = 752097756] = "Default";
+  ItemAddReason2[ItemAddReason2["Incentive"] = -1965281643] = "Incentive";
+  ItemAddReason2[ItemAddReason2["Syncing"] = -1924444172] = "Syncing";
+  ItemAddReason2[ItemAddReason2["Awards"] = -1216041698] = "Awards";
+  ItemAddReason2[ItemAddReason2["Notification"] = -983395630] = "Notification";
+  ItemAddReason2[ItemAddReason2["Loadout"] = -902540058] = "Loadout";
+  ItemAddReason2[ItemAddReason2["Looted"] = -897553835] = "Looted";
+  ItemAddReason2[ItemAddReason2["UseFailed"] = -746211728] = "UseFailed";
+  ItemAddReason2[ItemAddReason2["GetInventory"] = -669481339] = "GetInventory";
+  ItemAddReason2[ItemAddReason2["CreateCharacter"] = -490406031] = "CreateCharacter";
+  ItemAddReason2[ItemAddReason2["MpMission"] = -334626412] = "MpMission";
+  ItemAddReason2[ItemAddReason2["Pickup"] = 444010018] = "Pickup";
+  ItemAddReason2[ItemAddReason2["SetAmount"] = 1157919518] = "SetAmount";
+  ItemAddReason2[ItemAddReason2["Purchased"] = 1248274121] = "Purchased";
+  ItemAddReason2[ItemAddReason2["LoadSaveGame"] = 1445013766] = "LoadSaveGame";
+  ItemAddReason2[ItemAddReason2["Debug"] = 1543882317] = "Debug";
+  ItemAddReason2[ItemAddReason2["Melee"] = 2073812199] = "Melee";
+  return ItemAddReason2;
+})(ItemAddReason || {});
+export {
+  InventoryCategory,
+  InventoryIndex,
+  InventoryItemSlots,
+  ItemAddReason
+};

package/models/AmmoModel.d.ts

@@ -0,0 +1,3 @@
+import { Model } from "../Model";
+export declare class AmmoModel extends Model {
+}

package/models/AmmoModel.js

@@ -0,0 +1,11 @@
+var __defProp = Object.defineProperty;
+var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
+import { Model } from "../Model";
+class AmmoModel extends Model {
+  static {
+    __name(this, "AmmoModel");
+  }
+}
+export {
+  AmmoModel
+};

package/models/WeaponModel.d.ts

@@ -0,0 +1,3 @@
+import { Model } from "../Model";
+export declare class WeaponModel extends Model {
+}

package/models/WeaponModel.js

@@ -0,0 +1,11 @@
+var __defProp = Object.defineProperty;
+var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
+import { Model } from "../Model";
+class WeaponModel extends Model {
+  static {
+    __name(this, "WeaponModel");
+  }
+}
+export {
+  WeaponModel
+};

package/package.json

@@ -8,7 +8,7 @@
   ],
   "license": "MIT",
   "type": "module",
-  "version": "0.0.92",
+  "version": "0.0.94",
   "repository": {
     "type": "git",
     "url": "https://github.com/nativewrappers/nativewrappers.git"