@nativewrappers/redm-codegen 0.0.4 → 0.0.6

package/src/classes/Weapon.ts

@@ -19,132 +19,6 @@ export class Weapon {
     this.ped = ped;
   }
 
-  /**
-   * @param weaponHash Refer to [enum: eWeaponHash]
-   * @param ammoHash Refer to [enum: eAmmoType]
-   */
-  enableAmmoTypeForPedWeapon(weaponHash: eWeaponHash, ammoHash: eAmmoType): void {
-    inv<void>('0x23FB9FACA28779C1', this.ped.handle, weaponHash, ammoHash);
-  }
-
-  /**
-   * @param toggle 
-   */
-  N_0x431240A58484D5D0(toggle: boolean): void {
-    inv<void>('0x431240A58484D5D0', this.ped.handle, toggle);
-  }
-
-  /**
-   * @param p2 
-   * @param p3 
-   * @returns outGUID
-   */
-  getBestPedShortarmGuid(p2: boolean, p3: boolean): number {
-    const result = inv<number>('0xF52BD94B47CCF736', this.ped.handle, pvi(), p2, p3);
-    return result;
-  }
-
-  /**
-   * @returns coords
-   */
-  getPedLastWeaponImpactCoord(): [boolean, Vector3] {
-    const result = inv<[boolean, number[]]>('0x6C4D0409BA1A2BC2', this.ped.handle, pvv(), rai());
-    return [!!result[0], Vector3.fromArray(result[1])];
-  }
-
-  /**
-   * Returns WeaponAttachPoint
-   *
-   * @param attachPoint Refer to [enum: eWeaponAttachPoint]
-   * @returns
-   */
-  getWeaponAttachPoint(attachPoint: number): number {
-    return inv<number>('0xCAD4FE9398820D24', this.ped.handle, attachPoint, rai());
-  }
-
-  /**
-   * @param p2 
-   * @param attachPoint Refer to [enum: eWeaponAttachPoint]
-   * @param p4 
-   * @returns weaponHash: Refer to [enum: eWeaponHash]
-   */
-  getCurrentPedWeapon(p2: boolean, attachPoint: number, p4: boolean): [boolean, number] {
-    const result = inv<[boolean, number]>('0x3A87E44BB9A01D54', this.ped.handle, pvi(), p2, attachPoint, p4, rai());
-    return [!!result[0], result[1]];
-  }
-
-  /**
-   * Returns whether the ped has a revolver p1: 0 or 1
-   *
-   * @param p1 
-   * @returns
-   */
-  doesPedHaveRevolver(p1: number): any {
-    return inv<number>('0x5B235F24472F2C3B', this.ped.handle, p1);
-  }
-
-  /**
-   * Returns emote Hash
-   *
-   * @returns
-   */
-  getPedGunSpinningEquippedKitEmoteTwirl(): number {
-    return (inv<number>('0x2C4FEC3D0EFA9FC0', this.ped.handle, rai())) & 0xFFFFFFFF;
-  }
-
-  /**
-   * Returns ammoHash from weaponObject (Returned by 0x6CA484C9A7377E4F)
-   *
-   * @param weaponObject 
-   * @returns
-   */
-  getCurrentPedWeaponAmmoType(weaponObject: Prop): number {
-    return (inv<number>('0x7E7B19A4355FEE13', this.ped.handle, weaponObject.handle, rai())) & 0xFFFFFFFF;
-  }
-
-  /**
-   * @param p1 
-   * @param p2 
-   * @param p3 
-   * @returns
-   */
-  getPedWorstWeapon(p1: boolean, p2: boolean, p3: boolean): number {
-    return (inv<number>('0xDA37A053C1522F5D', this.ped.handle, p1, p2, p3, rai())) & 0xFFFFFFFF;
-  }
-
-  /**
-   * @param toggle 
-   */
-  setPedDropsWeaponsWhenDead(toggle: boolean): void {
-    inv<void>('0x476AE72C1D19D1A8', this.ped.handle, toggle);
-  }
-
-  /**
-   * Returns ammoHash
-   *
-   * @returns Returns the [enum: eAmmoType]; weaponGuid
-   */
-  getCurrentAmmoTypeFromGuid(): [number, number] {
-    const result = inv<[number, number]>('0xAF9D167A5656D6A6', this.ped.handle, pvi(), rai());
-    return [result[0] & 0xFFFFFFFF, result[1]];
-  }
-
-  /**
-   * @param toggle 
-   */
-  setPedInfiniteAmmoClip(toggle: boolean): void {
-    inv<void>('0xFBAA1E06B6BCA741', this.ped.handle, toggle);
-  }
-
-  /**
-   * returns the amount of peds that were restrained with the weapon thrown bolas
-   *
-   * @returns
-   */
-  getNumPedsRestrainedFromWeaponBolas(): any {
-    return inv<number>('0x46D42883E873C1D7', this.ped.handle);
-  }
-
   /**
    * Stores longarms to your horse on dismount
    * Params: p2 = 0
@@ -225,7 +99,7 @@ export class Weapon {
    * @returns
    */
   isTargetPedConstrainedByPedUsingBolas(targetPed: Ped): boolean {
-    return inv<boolean>('0x8D50F43298AB9545', this.ped.handle, targetPed.handle, rai());
+    return !!inv<boolean>('0x8D50F43298AB9545', this.ped.handle, targetPed.handle, rai());
   }
 
   /**
@@ -237,68 +111,85 @@ export class Weapon {
     return [result[0], result[1]];
   }
 
+  /**
+   * @param visible 
+   */
+  set PedAllWeaponsVisibility(visible: boolean) {
+    inv<void>('0x4F806A6CFED89468', this.ped.handle, visible);
+  }
+
   /**
    * @param weaponHash Refer to [enum: eWeaponHash]
+   * @param ammo 
+   * @returns
    */
-  enableAmmoTypeForPed(weaponHash: eWeaponHash): void {
-    inv<void>('0x3B7B7908B7ADFB4B', this.ped.handle, weaponHash);
+  setAmmoInClip(weaponHash: eWeaponHash, ammo: number): boolean {
+    return !!inv<boolean>('0xDCD2A934D65CB497', this.ped.handle, weaponHash, ammo, rai());
   }
 
   /**
-   * Detaches the weapon from the ped and actually removes the ped's weapon
+   * _GET_M* - _GET_PED_A*
    *
    * @param p1 
    * @returns
    */
-  getWeaponObjectFromPed(p1: boolean): Prop | null {
-    return createFromHandle<Prop>('Prop', inv<number>('0xC6A6789BB405D11C', this.ped.handle, p1, rai()));
+  getPedWeaponObject(p1: boolean): Prop | null {
+    return createFromHandle<Prop>('Prop', inv<number>('0x6CA484C9A7377E4F', this.ped.handle, p1, rai()));
   }
 
   /**
+   * slotHash is usually just the weaponHash name, but WEAPON_* is replaced with SLOT_*
+   *
+   * @param slotHash 
    * @returns
    */
-  isPedCurrentWeaponHolstered(): any {
-    return inv<number>('0xBDD9C235D8D1052E', this.ped.handle);
+  getPedWeaponInSlot(slotHash: string | number): number {
+    return (inv<number>('0xDBC4B552B2AE9A83', this.ped.handle, _h(slotHash), rai())) & 0xFFFFFFFF;
   }
 
   /**
-   * @param toggle 
+   * Outputs cached guids
+   *
+   * @returns guidPrimary; guidSecondary
    */
-  setInstantlyEquipWeaponPickups(toggle: boolean): void {
-    inv<void>('0x739B9C6D0E7F7F93', this.ped.handle, toggle);
+  get PlayerPedQuickSwapWeaponByGuid(): [number, number] {
+    const result = inv<[number, number]>('0xB7E52A058B07C7E2', this.ped.handle, pvi(), pvi());
+    return [result[0], result[1]];
   }
 
   /**
-   * Hides the ped's weapon during a cutscene.
+   * Returns true if the ped is currently holstering or unholstering a weapon
    *
-   * @param toggle 
+   * @returns
    */
-  hidePedWeaponForScriptedCutscene(toggle: boolean): void {
-    inv<void>('0x6F6981D2253C208F', this.ped.handle, toggle);
+  get IsWeaponHolsterStateChanging(): boolean {
+    return !!inv<boolean>('0x2387D6E9C6B478AA', this.ped.handle, rai());
   }
 
   /**
-   * @returns guidPrimary; guidSecondary
+   * @param ammoHash Refer to [enum: eAmmoType]
+   * @returns
    */
-  setPlayerPedQuickSwapWeaponByGuid(): [number, number] {
-    const result = inv<[number, number]>('0xEC1F85DA51D3D6C4', this.ped.handle, pvi(), pvi());
-    return [result[0], result[1]];
+  N_0x44C8F4908F1B2622(ammoHash: eAmmoType): boolean {
+    return !!inv<boolean>('0x44C8F4908F1B2622', this.ped.handle, ammoHash, rai());
   }
 
   /**
-   * @returns Returns the total ammo in the ped weapon from it's guid, or `0`.; guid
+   * @param p2 
+   * @returns clipInventoryUid
    */
-  getAmmoInPedWeaponFromGuid(): [number, number] {
-    const result = inv<[number, number]>('0x4823F13A21F51964', this.ped.handle, pvi(), rai());
+  refillAmmoInClip(p2: number): [any, number] {
+    const result = inv<[number, number]>('0xDF4A3404D022ADDE', this.ped.handle, pvi(), p2);
     return [result[0], result[1]];
   }
 
   /**
+   * _SET_A* - _SET_B*
+   *
    * @param p1 
-   * @param p2 
    */
-  removeAllPedWeapons(p1: boolean, p2: boolean): void {
-    inv<void>('0xF25DF915FA38C5F3', this.ped.handle, p1, p2);
+  N_0x2EBF70E1D8C06683(p1: string | number): void {
+    inv<void>('0x2EBF70E1D8C06683', this.ped.handle, _h(p1));
   }
 
   /**
@@ -370,15 +261,6 @@ export class Weapon {
     return [!!result[0], result[1]];
   }
 
-  /**
-   * emote hashes: KIT_EMOTE_TWIRL_GUN, KIT_EMOTE_TWIRL_GUN_LEFT_HOLSTER, KIT_EMOTE_TWIRL_GUN_DUAL, 0 (to unequip)
-   *
-   * @param emote 
-   */
-  setActiveGunSpinningEquipKitEmoteTwirl(emote: string | number): void {
-    inv<void>('0xCBCFFF805F1B4596', this.ped.handle, _h(emote));
-  }
-
   /**
    * @returns
    */
@@ -395,7 +277,7 @@ export class Weapon {
    * @returns
    */
   isPedHoldingWeapon(weapon: string | number): boolean {
-    return inv<boolean>('0x07E1C35F0078C3F9', this.ped.handle, _h(weapon), rai());
+    return !!inv<boolean>('0x07E1C35F0078C3F9', this.ped.handle, _h(weapon), rai());
   }
 
   /**
@@ -404,15 +286,15 @@ export class Weapon {
    * @returns
    */
   N_0x0DE0944ECCB3DF5D(): boolean {
-    return inv<boolean>('0x0DE0944ECCB3DF5D', this.ped.handle, rai());
+    return !!inv<boolean>('0x0DE0944ECCB3DF5D', this.ped.handle, rai());
   }
 
   /**
    * @param flags 
    * @returns
    */
-  isPedArmed(flags: number): any {
-    return inv<number>('0xCB690F680A3EA971', this.ped.handle, flags);
+  isPedArmed(flags: number): boolean {
+    return !!inv<boolean>('0xCB690F680A3EA971', this.ped.handle, flags, rai());
   }
 
   /**
@@ -431,7 +313,7 @@ export class Weapon {
    *
    * @returns
    */
-  getDefaultUnarmedWeaponHash(): number {
+  get DefaultUnarmedWeaponHash(): number {
     return (inv<number>('0x08FF1099ED2E6E21', this.ped.handle, rai())) & 0xFFFFFFFF;
   }
 
@@ -453,96 +335,139 @@ export class Weapon {
   }
 
   /**
+   * @param weaponHash Refer to [enum: eWeaponHash]
+   */
+  enableAmmoTypeForPed(weaponHash: eWeaponHash): void {
+    inv<void>('0x3B7B7908B7ADFB4B', this.ped.handle, weaponHash);
+  }
+
+  /**
+   * Detaches the weapon from the ped and actually removes the ped's weapon
+   *
+   * @param p1 
    * @returns
    */
-  isPedWeaponReadyToShoot(): boolean {
-    return inv<boolean>('0xB80CA294F2F26749', this.ped.handle, rai());
+  getWeaponObjectFromPed(p1: boolean): Prop | null {
+    return createFromHandle<Prop>('Prop', inv<number>('0xC6A6789BB405D11C', this.ped.handle, p1, rai()));
   }
 
   /**
-   * @param componentHash 
-   * @param weaponHash Refer to [enum: eWeaponHash]
+   * @returns
    */
-  removeWeaponComponentFromPed(componentHash: string | number, weaponHash: eWeaponHash): void {
-    inv<void>('0x19F70C4D80494FF8', this.ped.handle, _h(componentHash), weaponHash);
+  get IsPedCurrentWeaponHolstered(): any {
+    return inv<number>('0xBDD9C235D8D1052E', this.ped.handle);
   }
 
   /**
-   * @param visible 
-   * @param deselectWeapon 
-   * @param p3 
-   * @param p4 
+   * @param toggle 
    */
-  setPedCurrentWeaponVisible(visible: boolean, deselectWeapon: boolean, p3: boolean, p4: boolean): void {
-    inv<void>('0x0725A4CCFDED9A70', this.ped.handle, visible, deselectWeapon, p3, p4);
+  set InstantlyEquipWeaponPickups(toggle: boolean) {
+    inv<void>('0x739B9C6D0E7F7F93', this.ped.handle, toggle);
   }
 
   /**
-   * Old name: _DROP_CURRENT_PED_WEAPON
+   * Hides the ped's weapon during a cutscene.
    *
-   * @param p1 
-   * @param attachPoint Refer to [enum: eWeaponAttachPoint]
-   * @param p3 
-   * @param p4 
-   * @returns
+   * @param toggle 
    */
-  makePedDropWeapon(p1: boolean, attachPoint: number, p3: boolean, p4: boolean): Entity | null {
-    return createFromHandle<Entity>('Entity', inv<number>('0xCEF4C65DE502D367', this.ped.handle, p1, attachPoint, p3, p4, rai()));
+  hidePedWeaponForScriptedCutscene(toggle: boolean): void {
+    inv<void>('0x6F6981D2253C208F', this.ped.handle, toggle);
   }
 
-  removeAllPedAmmo(): void {
-    inv<void>('0x1B83C0DEEBCBB214', this.ped.handle);
+  /**
+   * @returns guidPrimary; guidSecondary
+   */
+  setPlayerPedQuickSwapWeaponByGuid(): [number, number] {
+    const result = inv<[number, number]>('0xEC1F85DA51D3D6C4', this.ped.handle, pvi(), pvi());
+    return [result[0], result[1]];
   }
 
   /**
-   * @param allow 
+   * @returns Returns the total ammo in the ped weapon from it's guid, or `0`.; guid
    */
-  setAllowDualWield(allow: boolean): void {
-    inv<void>('0x83B8D50EB9446BBA', this.ped.handle, allow);
+  get AmmoInPedWeaponFromGuid(): [number, number] {
+    const result = inv<[number, number]>('0x4823F13A21F51964', this.ped.handle, pvi(), rai());
+    return [result[0], result[1]];
   }
 
   /**
-   * Returns weaponEmoteVariation WEAPON_EMOTE_VARIATION_INVALID = -2,
-   * WEAPON_EMOTE_VARIATION_BASE,
-   * WEAPON_EMOTE_VARIATION_A,
-   * WEAPON_EMOTE_VARIATION_B,
-   * WEAPON_EMOTE_VARIATION_C,
-   * WEAPON_EMOTE_VARIATION_D,
-   * WEAPON_EMOTE_VARIATION_PREVIEW,
-   * WEAPON_EMOTE_NUM_VARIATIONS
-   *
-   * @param variation 
-   * @returns
+   * @param p1 
+   * @param p2 
    */
-  getWeaponEmoteVariation(variation: number): number {
-    return inv<number>('0x86147D05FA831D3A', this.ped.handle, variation, rai());
+  removeAllPedWeapons(p1: boolean, p2: boolean): void {
+    inv<void>('0xF25DF915FA38C5F3', this.ped.handle, p1, p2);
   }
 
   /**
-   * @param weaponHash Refer to [enum: eWeaponHash]
    * @returns
    */
-  isPedCarryingWeapon(weaponHash: eWeaponHash): any {
-    return inv<number>('0xF29A186ED428B552', this.ped.handle, weaponHash);
+  get AllowDualWield(): any {
+    return inv<number>('0x918990BD9CE08582', this.ped.handle);
   }
 
   /**
-   * @returns
-   */
-  refillAmmoInCurrentPedWeapon(): any {
-    return inv<number>('0x0A2AB7B7ABC055F4', this.ped.handle);
+   * Returns eCurrentHeldWeapon
+   * _GET_R* - _GET_T*
+   *
+   * @returns
+   */
+  get PedCurrentHeldWeapon(): number {
+    return (inv<number>('0x8425C5F057012DAB', this.ped.handle, rai())) & 0xFFFFFFFF;
   }
 
   /**
-   * Unequip current weapon and set current weapon to WEAPON_UNARMED.
-   * p0 usually 2 in R* scripts. Doesn't seem to have any effect if changed....
-   * immediately: if true it will instantly switch to unarmed
+   * @param toggle 
+   */
+  set ForceAutoEquip(toggle: boolean) {
+    inv<void>('0xBE711B14A159E84F', this.ped.handle, toggle);
+  }
+
+  /**
+   * @param weaponHash Refer to [enum: eWeaponHash]
+   * @param ammo 
+   */
+  setPedAmmo(weaponHash: eWeaponHash, ammo: number): void {
+    inv<void>('0x14E56BC5B5DB6A19', this.ped.handle, weaponHash, ammo);
+  }
+
+  /**
+   * Gives the ped the weapon.
+   * List: https://github.com/femga/rdr3_discoveries/blob/master/weapons/weapons.lua Params: p7 is 0.5f, and p8 is 1.0f. p11 and p12 are both 0 in R* Scripts
+   * permanentDegradation: default 0.5, any higher than 0 it will automatically make the weapon worn, you can also adjust the value to change the weapons maximum cleanliness
    *
-   * @param p0 
-   * @param immediately 
+   * @param weaponHash Refer to [enum: eWeaponHash]
+   * @param ammoCount 
+   * @param bForceInHand 
+   * @param bForceInHolster 
+   * @param attachPoint Refer to [enum: eWeaponAttachPoint]
+   * @param bAllowMultipleCopies 
+   * @param p7 
+   * @param p8 
+   * @param addReason Refer to [enum: eAddItemReason]
+   * @param bIgnoreUnlocks 
+   * @param permanentDegradation 
+   * @param p12 
+   * @returns
    */
-  hidePedWeapons(p0: number, immediately: boolean): void {
-    inv<void>('0xFCCC886EDE3C63EC', this.ped.handle, p0, immediately);
+  giveWeaponToPed(weaponHash: eWeaponHash, ammoCount: number, bForceInHand: boolean, bForceInHolster: boolean, attachPoint: number, bAllowMultipleCopies: boolean, p7: number, p8: number, addReason: eAddItemReason, bIgnoreUnlocks: boolean, permanentDegradation: number, p12: boolean): number {
+    return (inv<number>('0x5E3BDDBCB83F3D84', this.ped.handle, weaponHash, ammoCount, bForceInHand, bForceInHolster, attachPoint, bAllowMultipleCopies, f(p7), f(p8), addReason, bIgnoreUnlocks, f(permanentDegradation), p12, rai())) & 0xFFFFFFFF;
+  }
+
+  /**
+   * @param weaponHash Refer to [enum: eWeaponHash]
+   * @returns
+   */
+  getAmmoInPedWeapon(weaponHash: eWeaponHash): number {
+    return inv<number>('0x015A522136D7F951', this.ped.handle, weaponHash, rai());
+  }
+
+  /**
+   * @param attachPoint Refer to [enum: eWeaponAttachPoint]
+   * @returns weaponGuid
+   */
+  getPedWeaponGuidAtAttachPoint(attachPoint: number): [any, number] {
+    const result = inv<[number, number]>('0x6929E22158E52265', this.ped.handle, attachPoint, pvi());
+    return [result[0], result[1]];
   }
 
   /**
@@ -633,167 +558,268 @@ export class Weapon {
   /**
    * @returns
    */
-  getMaxLockonDistanceOfCurrentPedWeapon(): number {
+  get MaxLockonDistanceOfCurrentPedWeapon(): number {
     return inv<number>('0x79B1A6E780266DB0', this.ped.handle, raf());
   }
 
   /**
-   * @param visible 
+   * @param ammoType 
+   * @returns
    */
-  setPedAllWeaponsVisibility(visible: boolean): void {
-    inv<void>('0x4F806A6CFED89468', this.ped.handle, visible);
+  getPedAmmoByType(ammoType: string | number): number {
+    return inv<number>('0x39D22031557946C1', this.ped.handle, _h(ammoType), rai());
+  }
+
+  /**
+   * @param p1 
+   * @param p2 
+   * @returns
+   */
+  getBestPedWeapon(p1: boolean, p2: boolean): number {
+    return (inv<number>('0x8483E98E8B888AE2', this.ped.handle, p1, p2, rai())) & 0xFFFFFFFF;
+  }
+
+  /**
+   * @param toggle 
+   * @param weaponHash Refer to [enum: eWeaponHash]
+   */
+  setPedInfiniteAmmo(toggle: boolean, weaponHash: eWeaponHash): void {
+    inv<void>('0x3EDCB0505123623B', this.ped.handle, toggle, weaponHash);
+  }
+
+  /**
+   * @param weaponHash Refer to [enum: eWeaponHash]
+   * @param ammoHash Refer to [enum: eAmmoType]
+   */
+  setAmmoTypeForPedWeapon(weaponHash: eWeaponHash, ammoHash: eAmmoType): void {
+    inv<void>('0xCC9C4393523833E2', this.ped.handle, weaponHash, ammoHash);
+  }
+
+  /**
+   * *GET_BEST** - *GET_CLOSEST**
+   *
+   * @returns weaponGuid
+   */
+  get CorrectKitEmoteTwirlGun(): [boolean, number] {
+    const result = inv<[boolean, number]>('0xCD356B42C57BFE01', this.ped.handle, pvi(), rai());
+    return [!!result[0], result[1]];
   }
 
   /**
    * @param weaponHash Refer to [enum: eWeaponHash]
-   * @param ammo 
    * @returns
    */
-  setAmmoInClip(weaponHash: eWeaponHash, ammo: number): boolean {
-    return inv<boolean>('0xDCD2A934D65CB497', this.ped.handle, weaponHash, ammo, rai());
+  setCurrentPedVehicleWeapon(weaponHash: eWeaponHash): boolean {
+    return !!inv<boolean>('0x75C55983C2C39DAA', this.ped.handle, weaponHash, rai());
   }
 
   /**
-   * _GET_M* - _GET_PED_A*
+   * Returns whether the ped has a rifle p1: 0 or 1
    *
    * @param p1 
    * @returns
    */
-  getPedWeaponObject(p1: boolean): Prop | null {
-    return createFromHandle<Prop>('Prop', inv<number>('0x6CA484C9A7377E4F', this.ped.handle, p1, rai()));
+  doesPedHaveRifle(p1: number): any {
+    return inv<number>('0x95CA12E2C68043E5', this.ped.handle, p1);
   }
 
   /**
-   * slotHash is usually just the weaponHash name, but WEAPON_* is replaced with SLOT_*
+   * Puts the gun visibly in your horse's holster without having to be close to the horse. Use `_SEND_WEAPON_TO_INVENTORY` before using this native
+   * _A* or _B*
    *
-   * @param slotHash 
-   * @returns
+   * @param weaponHash Refer to [enum: eWeaponHash]
+   * @param ped 
    */
-  getPedWeaponInSlot(slotHash: string | number): number {
-    return (inv<number>('0xDBC4B552B2AE9A83', this.ped.handle, _h(slotHash), rai())) & 0xFFFFFFFF;
+  N_0x14FF0C2545527F9B(weaponHash: eWeaponHash, ped: Ped): void {
+    inv<void>('0x14FF0C2545527F9B', this.ped.handle, weaponHash, ped.handle);
   }
 
   /**
-   * Outputs cached guids
+   * Returns iSpinHash / iVariationSpin
    *
-   * @returns guidPrimary; guidSecondary
+   * @param weaponEmoteVariation 
+   * @returns
    */
-  getPlayerPedQuickSwapWeaponByGuid(): [number, number] {
-    const result = inv<[number, number]>('0xB7E52A058B07C7E2', this.ped.handle, pvi(), pvi());
-    return [result[0], result[1]];
+  getPedGunSpinningHashFromWeaponEmoteVariation(weaponEmoteVariation: number): number {
+    return (inv<number>('0xF3B1620B920D1708', this.ped.handle, weaponEmoteVariation, rai())) & 0xFFFFFFFF;
   }
 
   /**
-   * Returns true if the ped is currently holstering or unholstering a weapon
+   * Returns whether the ped has a repeater p1: 0 or 1
    *
+   * @param p1 
    * @returns
    */
-  isWeaponHolsterStateChanging(): boolean {
-    return inv<boolean>('0x2387D6E9C6B478AA', this.ped.handle, rai());
+  doesPedHaveRepeater(p1: number): any {
+    return inv<number>('0x495A04CAEC263AF8', this.ped.handle, p1);
+  }
+
+  /**
+   * @param weaponCollection 
+   */
+  giveWeaponCollectionToPed(weaponCollection: string | number): void {
+    inv<void>('0x899A04AFCC725D04', this.ped.handle, _h(weaponCollection));
   }
 
   /**
-   * @param ammoHash Refer to [enum: eAmmoType]
    * @returns
    */
-  N_0x44C8F4908F1B2622(ammoHash: eAmmoType): boolean {
-    return inv<boolean>('0x44C8F4908F1B2622', this.ped.handle, ammoHash, rai());
+  get IsPedWeaponReadyToShoot(): boolean {
+    return !!inv<boolean>('0xB80CA294F2F26749', this.ped.handle, rai());
   }
 
   /**
-   * @param p2 
-   * @returns clipInventoryUid
+   * @param componentHash 
+   * @param weaponHash Refer to [enum: eWeaponHash]
    */
-  refillAmmoInClip(p2: number): [any, number] {
-    const result = inv<[number, number]>('0xDF4A3404D022ADDE', this.ped.handle, pvi(), p2);
-    return [result[0], result[1]];
+  removeWeaponComponentFromPed(componentHash: string | number, weaponHash: eWeaponHash): void {
+    inv<void>('0x19F70C4D80494FF8', this.ped.handle, _h(componentHash), weaponHash);
   }
 
   /**
-   * _SET_A* - _SET_B*
+   * @param visible 
+   * @param deselectWeapon 
+   * @param p3 
+   * @param p4 
+   */
+  setPedCurrentWeaponVisible(visible: boolean, deselectWeapon: boolean, p3: boolean, p4: boolean): void {
+    inv<void>('0x0725A4CCFDED9A70', this.ped.handle, visible, deselectWeapon, p3, p4);
+  }
+
+  /**
+   * Old name: _DROP_CURRENT_PED_WEAPON
    *
    * @param p1 
+   * @param attachPoint Refer to [enum: eWeaponAttachPoint]
+   * @param p3 
+   * @param p4 
+   * @returns
    */
-  N_0x2EBF70E1D8C06683(p1: string | number): void {
-    inv<void>('0x2EBF70E1D8C06683', this.ped.handle, _h(p1));
+  makePedDropWeapon(p1: boolean, attachPoint: number, p3: boolean, p4: boolean): Entity | null {
+    return createFromHandle<Entity>('Entity', inv<number>('0xCEF4C65DE502D367', this.ped.handle, p1, attachPoint, p3, p4, rai()));
+  }
+
+  removeAllPedAmmo(): void {
+    inv<void>('0x1B83C0DEEBCBB214', this.ped.handle);
   }
 
   /**
-   * @returns
+   * @param allow 
    */
-  getAllowDualWield(): any {
-    return inv<number>('0x918990BD9CE08582', this.ped.handle);
+  set AllowDualWield(allow: boolean) {
+    inv<void>('0x83B8D50EB9446BBA', this.ped.handle, allow);
   }
 
   /**
-   * Returns eCurrentHeldWeapon
-   * _GET_R* - _GET_T*
+   * Returns weaponEmoteVariation WEAPON_EMOTE_VARIATION_INVALID = -2,
+   * WEAPON_EMOTE_VARIATION_BASE,
+   * WEAPON_EMOTE_VARIATION_A,
+   * WEAPON_EMOTE_VARIATION_B,
+   * WEAPON_EMOTE_VARIATION_C,
+   * WEAPON_EMOTE_VARIATION_D,
+   * WEAPON_EMOTE_VARIATION_PREVIEW,
+   * WEAPON_EMOTE_NUM_VARIATIONS
    *
+   * @param variation 
    * @returns
    */
-  getPedCurrentHeldWeapon(): number {
-    return (inv<number>('0x8425C5F057012DAB', this.ped.handle, rai())) & 0xFFFFFFFF;
+  getWeaponEmoteVariation(variation: number): number {
+    return inv<number>('0x86147D05FA831D3A', this.ped.handle, variation, rai());
   }
 
   /**
-   * @param toggle 
+   * @param weaponHash Refer to [enum: eWeaponHash]
+   * @returns
    */
-  setForceAutoEquip(toggle: boolean): void {
-    inv<void>('0xBE711B14A159E84F', this.ped.handle, toggle);
+  isPedCarryingWeapon(weaponHash: eWeaponHash): boolean {
+    return !!inv<boolean>('0xF29A186ED428B552', this.ped.handle, weaponHash, rai());
   }
 
   /**
-   * @param weaponHash Refer to [enum: eWeaponHash]
-   * @param ammo 
+   * @returns
    */
-  setPedAmmo(weaponHash: eWeaponHash, ammo: number): void {
-    inv<void>('0x14E56BC5B5DB6A19', this.ped.handle, weaponHash, ammo);
+  refillAmmoInCurrentPedWeapon(): any {
+    return inv<number>('0x0A2AB7B7ABC055F4', this.ped.handle);
   }
 
   /**
-   * Gives the ped the weapon.
-   * List: https://github.com/femga/rdr3_discoveries/blob/master/weapons/weapons.lua Params: p7 is 0.5f, and p8 is 1.0f. p11 and p12 are both 0 in R* Scripts
-   * permanentDegradation: default 0.5, any higher than 0 it will automatically make the weapon worn, you can also adjust the value to change the weapons maximum cleanliness
+   * Unequip current weapon and set current weapon to WEAPON_UNARMED.
+   * p0 usually 2 in R* scripts. Doesn't seem to have any effect if changed....
+   * immediately: if true it will instantly switch to unarmed
    *
-   * @param weaponHash Refer to [enum: eWeaponHash]
-   * @param ammoCount 
-   * @param bForceInHand 
-   * @param bForceInHolster 
-   * @param attachPoint Refer to [enum: eWeaponAttachPoint]
-   * @param bAllowMultipleCopies 
-   * @param p7 
-   * @param p8 
-   * @param addReason Refer to [enum: eAddItemReason]
-   * @param bIgnoreUnlocks 
-   * @param permanentDegradation 
-   * @param p12 
+   * @param p0 
+   * @param immediately 
+   */
+  hidePedWeapons(p0: number, immediately: boolean): void {
+    inv<void>('0xFCCC886EDE3C63EC', this.ped.handle, p0, immediately);
+  }
+
+  /**
+   * Returns ammoHash from weaponObject (Returned by 0x6CA484C9A7377E4F)
+   *
+   * @param weaponObject 
    * @returns
    */
-  giveWeaponToPed(weaponHash: eWeaponHash, ammoCount: number, bForceInHand: boolean, bForceInHolster: boolean, attachPoint: number, bAllowMultipleCopies: boolean, p7: number, p8: number, addReason: eAddItemReason, bIgnoreUnlocks: boolean, permanentDegradation: number, p12: boolean): number {
-    return (inv<number>('0x5E3BDDBCB83F3D84', this.ped.handle, weaponHash, ammoCount, bForceInHand, bForceInHolster, attachPoint, bAllowMultipleCopies, f(p7), f(p8), addReason, bIgnoreUnlocks, f(permanentDegradation), p12, rai())) & 0xFFFFFFFF;
+  getCurrentPedWeaponAmmoType(weaponObject: Prop): number {
+    return (inv<number>('0x7E7B19A4355FEE13', this.ped.handle, weaponObject.handle, rai())) & 0xFFFFFFFF;
   }
 
   /**
-   * @param weaponHash Refer to [enum: eWeaponHash]
+   * @param p1 
+   * @param p2 
+   * @param p3 
    * @returns
    */
-  getAmmoInPedWeapon(weaponHash: eWeaponHash): number {
-    return inv<number>('0x015A522136D7F951', this.ped.handle, weaponHash, rai());
+  getPedWorstWeapon(p1: boolean, p2: boolean, p3: boolean): number {
+    return (inv<number>('0xDA37A053C1522F5D', this.ped.handle, p1, p2, p3, rai())) & 0xFFFFFFFF;
   }
 
   /**
-   * @param attachPoint Refer to [enum: eWeaponAttachPoint]
-   * @returns weaponGuid
+   * @param toggle 
    */
-  getPedWeaponGuidAtAttachPoint(attachPoint: number): [any, number] {
-    const result = inv<[number, number]>('0x6929E22158E52265', this.ped.handle, attachPoint, pvi());
-    return [result[0], result[1]];
+  set PedDropsWeaponsWhenDead(toggle: boolean) {
+    inv<void>('0x476AE72C1D19D1A8', this.ped.handle, toggle);
+  }
+
+  /**
+   * Returns ammoHash
+   *
+   * @returns Returns the [enum: eAmmoType]; weaponGuid
+   */
+  get CurrentAmmoTypeFromGuid(): [number, number] {
+    const result = inv<[number, number]>('0xAF9D167A5656D6A6', this.ped.handle, pvi(), rai());
+    return [result[0] & 0xFFFFFFFF, result[1]];
   }
 
   /**
    * @param toggle 
    */
-  setAllowAnyWeaponDrop(toggle: boolean): void {
+  set PedInfiniteAmmoClip(toggle: boolean) {
+    inv<void>('0xFBAA1E06B6BCA741', this.ped.handle, toggle);
+  }
+
+  /**
+   * returns the amount of peds that were restrained with the weapon thrown bolas
+   *
+   * @returns
+   */
+  get NumPedsRestrainedFromWeaponBolas(): any {
+    return inv<number>('0x46D42883E873C1D7', this.ped.handle);
+  }
+
+  /**
+   * emote hashes: KIT_EMOTE_TWIRL_GUN, KIT_EMOTE_TWIRL_GUN_LEFT_HOLSTER, KIT_EMOTE_TWIRL_GUN_DUAL, 0 (to unequip)
+   *
+   * @param emote 
+   */
+  set ActiveGunSpinningEquipKitEmoteTwirl(emote: string | number) {
+    inv<void>('0xCBCFFF805F1B4596', this.ped.handle, _h(emote));
+  }
+
+  /**
+   * @param toggle 
+   */
+  set AllowAnyWeaponDrop(toggle: boolean) {
     inv<void>('0x78030C7867D8B9B6', this.ped.handle, toggle);
   }
 
@@ -840,102 +866,76 @@ export class Weapon {
   }
 
   /**
-   * @param ammoType 
-   * @returns
-   */
-  getPedAmmoByType(ammoType: string | number): number {
-    return inv<number>('0x39D22031557946C1', this.ped.handle, _h(ammoType), rai());
-  }
-
-  /**
-   * @param p1 
-   * @param p2 
-   * @returns
-   */
-  getBestPedWeapon(p1: boolean, p2: boolean): number {
-    return (inv<number>('0x8483E98E8B888AE2', this.ped.handle, p1, p2, rai())) & 0xFFFFFFFF;
-  }
-
-  /**
-   * @param toggle 
    * @param weaponHash Refer to [enum: eWeaponHash]
+   * @param ammoHash Refer to [enum: eAmmoType]
    */
-  setPedInfiniteAmmo(toggle: boolean, weaponHash: eWeaponHash): void {
-    inv<void>('0x3EDCB0505123623B', this.ped.handle, toggle, weaponHash);
+  enableAmmoTypeForPedWeapon(weaponHash: eWeaponHash, ammoHash: eAmmoType): void {
+    inv<void>('0x23FB9FACA28779C1', this.ped.handle, weaponHash, ammoHash);
   }
 
   /**
-   * @param weaponHash Refer to [enum: eWeaponHash]
-   * @param ammoHash Refer to [enum: eAmmoType]
+   * @param toggle 
    */
-  setAmmoTypeForPedWeapon(weaponHash: eWeaponHash, ammoHash: eAmmoType): void {
-    inv<void>('0xCC9C4393523833E2', this.ped.handle, weaponHash, ammoHash);
+  N_0x431240A58484D5D0(toggle: boolean): void {
+    inv<void>('0x431240A58484D5D0', this.ped.handle, toggle);
   }
 
   /**
-   * *GET_BEST** - *GET_CLOSEST**
-   *
-   * @returns weaponGuid
+   * @param p2 
+   * @param p3 
+   * @returns outGUID
    */
-  getCorrectKitEmoteTwirlGun(): [boolean, number] {
-    const result = inv<[boolean, number]>('0xCD356B42C57BFE01', this.ped.handle, pvi(), rai());
-    return [!!result[0], result[1]];
+  getBestPedShortarmGuid(p2: boolean, p3: boolean): number {
+    const result = inv<number>('0xF52BD94B47CCF736', this.ped.handle, pvi(), p2, p3);
+    return result;
   }
 
   /**
-   * @param weaponHash Refer to [enum: eWeaponHash]
-   * @returns
+   * @returns coords
    */
-  setCurrentPedVehicleWeapon(weaponHash: eWeaponHash): boolean {
-    return inv<boolean>('0x75C55983C2C39DAA', this.ped.handle, weaponHash, rai());
+  get PedLastWeaponImpactCoord(): [boolean, Vector3] {
+    const result = inv<[boolean, number[]]>('0x6C4D0409BA1A2BC2', this.ped.handle, pvv(), rai());
+    return [!!result[0], Vector3.fromArray(result[1])];
   }
 
   /**
-   * Returns whether the ped has a rifle p1: 0 or 1
+   * Returns WeaponAttachPoint
    *
-   * @param p1 
+   * @param attachPoint Refer to [enum: eWeaponAttachPoint]
    * @returns
    */
-  doesPedHaveRifle(p1: number): any {
-    return inv<number>('0x95CA12E2C68043E5', this.ped.handle, p1);
+  getWeaponAttachPoint(attachPoint: number): number {
+    return inv<number>('0xCAD4FE9398820D24', this.ped.handle, attachPoint, rai());
   }
 
   /**
-   * Puts the gun visibly in your horse's holster without having to be close to the horse. Use `_SEND_WEAPON_TO_INVENTORY` before using this native
-   * _A* or _B*
-   *
-   * @param weaponHash Refer to [enum: eWeaponHash]
-   * @param ped 
+   * @param p2 
+   * @param attachPoint Refer to [enum: eWeaponAttachPoint]
+   * @param p4 
+   * @returns weaponHash: Refer to [enum: eWeaponHash]
    */
-  N_0x14FF0C2545527F9B(weaponHash: eWeaponHash, ped: Ped): void {
-    inv<void>('0x14FF0C2545527F9B', this.ped.handle, weaponHash, ped.handle);
+  getCurrentPedWeapon(p2: boolean, attachPoint: number, p4: boolean): [boolean, number] {
+    const result = inv<[boolean, number]>('0x3A87E44BB9A01D54', this.ped.handle, pvi(), p2, attachPoint, p4, rai());
+    return [!!result[0], result[1]];
   }
 
   /**
-   * Returns iSpinHash / iVariationSpin
+   * Returns whether the ped has a revolver p1: 0 or 1
    *
-   * @param weaponEmoteVariation 
+   * @param p1 
    * @returns
    */
-  getPedGunSpinningHashFromWeaponEmoteVariation(weaponEmoteVariation: number): number {
-    return (inv<number>('0xF3B1620B920D1708', this.ped.handle, weaponEmoteVariation, rai())) & 0xFFFFFFFF;
+  doesPedHaveRevolver(p1: number): any {
+    return inv<number>('0x5B235F24472F2C3B', this.ped.handle, p1);
   }
 
   /**
-   * Returns whether the ped has a repeater p1: 0 or 1
+   * Returns emote Hash
    *
-   * @param p1 
    * @returns
    */
-  doesPedHaveRepeater(p1: number): any {
-    return inv<number>('0x495A04CAEC263AF8', this.ped.handle, p1);
-  }
-
-  /**
-   * @param weaponCollection 
-   */
-  giveWeaponCollectionToPed(weaponCollection: string | number): void {
-    inv<void>('0x899A04AFCC725D04', this.ped.handle, _h(weaponCollection));
+  get PedGunSpinningEquippedKitEmoteTwirl(): number {
+    return (inv<number>('0x2C4FEC3D0EFA9FC0', this.ped.handle, rai())) & 0xFFFFFFFF;
   }
 
   /**
@@ -948,7 +948,7 @@ export class Weapon {
   /**
    * @returns ammo; inventoryUid
    */
-  getAmmoInClipByInventoryUid(): [any, number, number] {
+  get AmmoInClipByInventoryUid(): [any, number, number] {
     const result = inv<[number, number, number]>('0x678F00858980F516', this.ped.handle, pvi(), pvi());
     return [result[0], result[1], result[2]];
   }
@@ -969,7 +969,7 @@ export class Weapon {
    *
    * @param disableAnim 
    */
-  setPedWeaponOnBack(disableAnim: boolean): void {
+  set PedWeaponOnBack(disableAnim: boolean) {
     inv<void>('0x4820A6939D7CEF28', this.ped.handle, disableAnim);
   }
 
@@ -992,14 +992,14 @@ export class Weapon {
   /**
    * @param attachPoint Refer to [enum: eWeaponAttachPoint]
    */
-  setForceCurrentWeaponIntoCockedState(attachPoint: number): void {
+  set ForceCurrentWeaponIntoCockedState(attachPoint: number) {
     inv<void>('0x5230D3F6EE56CFE6', this.ped.handle, attachPoint);
   }
 
   /**
    * @returns
    */
-  getPedHogtieWeapon(): number {
+  get PedHogtieWeapon(): number {
     return (inv<number>('0x90EB1CB189923587', this.ped.handle, rai())) & 0xFFFFFFFF;
   }
 
@@ -1018,14 +1018,14 @@ export class Weapon {
    *
    * @param emoteType 
    */
-  setGunSpinningInventorySlotIdActivate(emoteType: number): void {
+  set GunSpinningInventorySlotIdActivate(emoteType: number) {
     inv<void>('0x408CF580C5E96D49', this.ped.handle, emoteType);
   }
 
   /**
    * @returns weaponHash: Refer to [enum: eWeaponHash]
    */
-  getCurrentPedVehicleWeapon(): [boolean, number] {
+  get CurrentPedVehicleWeapon(): [boolean, number] {
     const result = inv<[boolean, number]>('0x1017582BCD3832DC', this.ped.handle, pvi(), rai());
     return [!!result[0], result[1]];
   }
@@ -1057,7 +1057,7 @@ export class Weapon {
    * @returns
    */
   hasPedGotWeapon(weaponHash: eWeaponHash, p2: number, onlyCheckPlayerInventory: boolean): boolean {
-    return inv<boolean>('0x8DECB02F88F428BC', this.ped.handle, weaponHash, p2, onlyCheckPlayerInventory, rai());
+    return !!inv<boolean>('0x8DECB02F88F428BC', this.ped.handle, weaponHash, p2, onlyCheckPlayerInventory, rai());
   }
 
 }