@nativewrappers/redm-codegen 0.0.4 → 0.0.5

package/dist/classes/Weapon.js

@@ -5,200 +5,295 @@ export class Weapon {
     constructor(ped) {
         this.ped = ped;
     }
+    /**
+     * @param visible
+     */
+    set PedAllWeaponsVisibility(visible) {
+        inv('0x4F806A6CFED89468', this.ped.handle, visible);
+    }
     /**
      * @param weaponHash Refer to [enum: eWeaponHash]
-     * @param ammoHash Refer to [enum: eAmmoType]
+     * @param ammo
+     * @returns
      */
-    enableAmmoTypeForPedWeapon(weaponHash, ammoHash) {
-        inv('0x23FB9FACA28779C1', this.ped.handle, weaponHash, ammoHash);
+    setAmmoInClip(weaponHash, ammo) {
+        return !!inv('0xDCD2A934D65CB497', this.ped.handle, weaponHash, ammo, rai());
     }
     /**
-     * @param toggle
+     * _GET_M* - _GET_PED_A*
+     *
+     * @param p1
+     * @returns
      */
-    N_0x431240A58484D5D0(toggle) {
-        inv('0x431240A58484D5D0', this.ped.handle, toggle);
+    getPedWeaponObject(p1) {
+        return createFromHandle('Prop', inv('0x6CA484C9A7377E4F', this.ped.handle, p1, rai()));
     }
     /**
-     * @param p2
-     * @param p3
-     * @returns outGUID
+     * slotHash is usually just the weaponHash name, but WEAPON_* is replaced with SLOT_*
+     *
+     * @param slotHash
+     * @returns
      */
-    getBestPedShortarmGuid(p2, p3) {
-        const result = inv('0xF52BD94B47CCF736', this.ped.handle, pvi(), p2, p3);
-        return result;
+    getPedWeaponInSlot(slotHash) {
+        return (inv('0xDBC4B552B2AE9A83', this.ped.handle, _h(slotHash), rai())) & 0xFFFFFFFF;
     }
     /**
-     * @returns coords
+     * Outputs cached guids
+     *
+     * @returns guidPrimary; guidSecondary
      */
-    getPedLastWeaponImpactCoord() {
-        const result = inv('0x6C4D0409BA1A2BC2', this.ped.handle, pvv(), rai());
-        return [!!result[0], Vector3.fromArray(result[1])];
+    get PlayerPedQuickSwapWeaponByGuid() {
+        const result = inv('0xB7E52A058B07C7E2', this.ped.handle, pvi(), pvi());
+        return [result[0], result[1]];
     }
     /**
-     * Returns WeaponAttachPoint
+     * Returns true if the ped is currently holstering or unholstering a weapon
      *
-     * @param attachPoint Refer to [enum: eWeaponAttachPoint]
      * @returns
      */
-    getWeaponAttachPoint(attachPoint) {
-        return inv('0xCAD4FE9398820D24', this.ped.handle, attachPoint, rai());
+    get IsWeaponHolsterStateChanging() {
+        return !!inv('0x2387D6E9C6B478AA', this.ped.handle, rai());
+    }
+    /**
+     * @param ammoHash Refer to [enum: eAmmoType]
+     * @returns
+     */
+    N_0x44C8F4908F1B2622(ammoHash) {
+        return !!inv('0x44C8F4908F1B2622', this.ped.handle, ammoHash, rai());
     }
     /**
      * @param p2
-     * @param attachPoint Refer to [enum: eWeaponAttachPoint]
-     * @param p4
-     * @returns weaponHash: Refer to [enum: eWeaponHash]
+     * @returns clipInventoryUid
      */
-    getCurrentPedWeapon(p2, attachPoint, p4) {
-        const result = inv('0x3A87E44BB9A01D54', this.ped.handle, pvi(), p2, attachPoint, p4, rai());
-        return [!!result[0], result[1]];
+    refillAmmoInClip(p2) {
+        const result = inv('0xDF4A3404D022ADDE', this.ped.handle, pvi(), p2);
+        return [result[0], result[1]];
     }
     /**
-     * Returns whether the ped has a revolver p1: 0 or 1
+     * _SET_A* - _SET_B*
      *
      * @param p1
+     */
+    N_0x2EBF70E1D8C06683(p1) {
+        inv('0x2EBF70E1D8C06683', this.ped.handle, _h(p1));
+    }
+    /**
+     * @param ammoType
      * @returns
      */
-    doesPedHaveRevolver(p1) {
-        return inv('0x5B235F24472F2C3B', this.ped.handle, p1);
+    getPedAmmoByType(ammoType) {
+        return inv('0x39D22031557946C1', this.ped.handle, _h(ammoType), rai());
     }
     /**
-     * Returns emote Hash
-     *
+     * @param p1
+     * @param p2
      * @returns
      */
-    getPedGunSpinningEquippedKitEmoteTwirl() {
-        return (inv('0x2C4FEC3D0EFA9FC0', this.ped.handle, rai())) & 0xFFFFFFFF;
+    getBestPedWeapon(p1, p2) {
+        return (inv('0x8483E98E8B888AE2', this.ped.handle, p1, p2, rai())) & 0xFFFFFFFF;
     }
     /**
-     * Returns ammoHash from weaponObject (Returned by 0x6CA484C9A7377E4F)
+     * @param toggle
+     * @param weaponHash Refer to [enum: eWeaponHash]
+     */
+    setPedInfiniteAmmo(toggle, weaponHash) {
+        inv('0x3EDCB0505123623B', this.ped.handle, toggle, weaponHash);
+    }
+    /**
+     * @param weaponHash Refer to [enum: eWeaponHash]
+     * @param ammoHash Refer to [enum: eAmmoType]
+     */
+    setAmmoTypeForPedWeapon(weaponHash, ammoHash) {
+        inv('0xCC9C4393523833E2', this.ped.handle, weaponHash, ammoHash);
+    }
+    /**
+     * *GET_BEST** - *GET_CLOSEST**
      *
-     * @param weaponObject
+     * @returns weaponGuid
+     */
+    get CorrectKitEmoteTwirlGun() {
+        const result = inv('0xCD356B42C57BFE01', this.ped.handle, pvi(), rai());
+        return [!!result[0], result[1]];
+    }
+    /**
+     * @param weaponHash Refer to [enum: eWeaponHash]
      * @returns
      */
-    getCurrentPedWeaponAmmoType(weaponObject) {
-        return (inv('0x7E7B19A4355FEE13', this.ped.handle, weaponObject.handle, rai())) & 0xFFFFFFFF;
+    setCurrentPedVehicleWeapon(weaponHash) {
+        return !!inv('0x75C55983C2C39DAA', this.ped.handle, weaponHash, rai());
     }
     /**
+     * Returns whether the ped has a rifle p1: 0 or 1
+     *
      * @param p1
-     * @param p2
-     * @param p3
      * @returns
      */
-    getPedWorstWeapon(p1, p2, p3) {
-        return (inv('0xDA37A053C1522F5D', this.ped.handle, p1, p2, p3, rai())) & 0xFFFFFFFF;
+    doesPedHaveRifle(p1) {
+        return inv('0x95CA12E2C68043E5', this.ped.handle, p1);
     }
     /**
-     * @param toggle
+     * 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
      */
-    setPedDropsWeaponsWhenDead(toggle) {
-        inv('0x476AE72C1D19D1A8', this.ped.handle, toggle);
+    N_0x14FF0C2545527F9B(weaponHash, ped) {
+        inv('0x14FF0C2545527F9B', this.ped.handle, weaponHash, ped.handle);
     }
     /**
-     * Returns ammoHash
+     * Returns iSpinHash / iVariationSpin
      *
-     * @returns Returns the [enum: eAmmoType]; weaponGuid
+     * @param weaponEmoteVariation
+     * @returns
      */
-    getCurrentAmmoTypeFromGuid() {
-        const result = inv('0xAF9D167A5656D6A6', this.ped.handle, pvi(), rai());
-        return [result[0] & 0xFFFFFFFF, result[1]];
+    getPedGunSpinningHashFromWeaponEmoteVariation(weaponEmoteVariation) {
+        return (inv('0xF3B1620B920D1708', this.ped.handle, weaponEmoteVariation, rai())) & 0xFFFFFFFF;
     }
     /**
-     * @param toggle
+     * Returns whether the ped has a repeater p1: 0 or 1
+     *
+     * @param p1
+     * @returns
      */
-    setPedInfiniteAmmoClip(toggle) {
-        inv('0xFBAA1E06B6BCA741', this.ped.handle, toggle);
+    doesPedHaveRepeater(p1) {
+        return inv('0x495A04CAEC263AF8', this.ped.handle, p1);
     }
     /**
-     * returns the amount of peds that were restrained with the weapon thrown bolas
+     * @param weaponCollection
+     */
+    giveWeaponCollectionToPed(weaponCollection) {
+        inv('0x899A04AFCC725D04', this.ped.handle, _h(weaponCollection));
+    }
+    /**
+     * @returns
+     */
+    enableWeaponRestore() {
+        return inv('0xC395355843BE134B', this.ped.handle);
+    }
+    /**
+     * Returns whether the specified ped is holding a weapon with the given hash.
+     * only these weapons below return true
+     * WEAPON_BOW, WEAPON_KIT_METAL_DETECTOR, WEAPON_MELEE_CLEAVER, WEAPON_MELEE_DAVY_LANTERN, WEAPON_MELEE_HATCHET, WEAPON_MELEE_HATCHET_HUNTER, WEAPON_MELEE_KNIFE_JAWBONE, WEAPON_MELEE_LANTERN WEAPON_MELEE_TORCH, WEAPON_MOONSHINEJUG_MP, WEAPON_RIFLE_BOLTACTION, WEAPON_SHOTGUN_PUMP, WEAPON_THROWN_BOLAS, WEAPON_THROWN_MOLOTOV
      *
+     * @param weapon
      * @returns
      */
-    getNumPedsRestrainedFromWeaponBolas() {
-        return inv('0x46D42883E873C1D7', this.ped.handle);
+    isPedHoldingWeapon(weapon) {
+        return !!inv('0x07E1C35F0078C3F9', this.ped.handle, _h(weapon), rai());
     }
     /**
-     * Stores longarms to your horse on dismount
-     * Params: p2 = 0
-     * SET_[I - M]*
+     * _GET_D* - _GET_L*
      *
-     * @param storeLongarms
-     * @param p2
+     * @returns
      */
-    setInstantlyStoreLongarmsOnDismount(storeLongarms, p2) {
-        inv('0xB832F1A686B9B810', this.ped.handle, storeLongarms, p2);
+    N_0x0DE0944ECCB3DF5D() {
+        return !!inv('0x0DE0944ECCB3DF5D', this.ped.handle, rai());
     }
     /**
-     * @param removeReason Refer to [enum: eRemoveItemReason]
-     * @returns weaponGuid
+     * @param flags
+     * @returns
      */
-    removeWeaponFromPedByGuid(removeReason) {
-        const result = inv('0x51C3B71591811485', this.ped.handle, pvi(), removeReason);
-        return result;
+    isPedArmed(flags) {
+        return !!inv('0xCB690F680A3EA971', this.ped.handle, flags, rai());
     }
     /**
-     * attachPoint:
+     * Returns whether the ped has a sniper p1: 0 or 1
      *
-     * @param weaponHash Refer to [enum: eWeaponHash]
-     * @param equipNow
-     * @param attachPoint Refer to [enum: eWeaponAttachPoint]
-     * @param p4
-     * @param p5
+     * @param p1
+     * @returns
      */
-    setCurrentPedWeapon(weaponHash, equipNow, attachPoint, p4, p5) {
-        inv('0xADF692B254977C0C', this.ped.handle, weaponHash, equipNow, attachPoint, p4, p5);
+    doesPedHaveSniper(p1) {
+        return inv('0x80BB243789008A82', this.ped.handle, p1);
     }
     /**
-     * Equips a weapon from a weaponItem, similar to GIVE_WEAPON_TO_PED
+     * Returns the ped's default unarmed weapon hash as defined in CPedModelInfo (DefaultUnarmedWeapon).
+     * Falls back to WEAPON_UNARMED if the ped doesn't have a valid model info pointer, or 0 if the ped doesn't exist.
      *
-     * @param p2
-     * @param p3
-     * @param p4
-     * @param p5
-     * @returns weaponUid
+     * @returns
      */
-    setCurrentPedWeaponByGuid(p2, p3, p4, p5) {
-        const result = inv('0x12FB95FE3D579238', this.ped.handle, pvi(), p2, p3, p4, p5);
-        return result;
+    get DefaultUnarmedWeaponHash() {
+        return (inv('0x08FF1099ED2E6E21', this.ped.handle, rai())) & 0xFFFFFFFF;
     }
     /**
-     * @param componentHash
      * @param weaponHash Refer to [enum: eWeaponHash]
+     * @param p2
      * @returns
      */
-    hasPedGotWeaponComponent(componentHash, weaponHash) {
-        return inv('0xBBC67A6F965C688A', this.ped.handle, _h(componentHash), weaponHash);
+    getMaxAmmoInClip(weaponHash, p2) {
+        return inv('0xA38DCFFCEA8962FA', this.ped.handle, weaponHash, p2, rai());
+    }
+    /**
+     * @param attachPoint Refer to [enum: eWeaponAttachPoint]
+     * @returns Returns the weapon entity
+     */
+    getCurrentPedWeaponEntityIndex(attachPoint) {
+        return createFromHandle('Entity', inv('0x3B390A939AF0B5FC', this.ped.handle, attachPoint, rai()));
     }
     /**
      * @param weaponHash Refer to [enum: eWeaponHash]
-     * @param amount The amount of ped to add to the ammo
-     * @param addReason Refer to [enum: eAddItemReason]
+     * @param ammoHash Refer to [enum: eAmmoType]
      */
-    addAmmoToPed(weaponHash, amount, addReason) {
-        inv('0xB190BCA3F4042F95', this.ped.handle, weaponHash, amount, addReason);
+    enableAmmoTypeForPedWeapon(weaponHash, ammoHash) {
+        inv('0x23FB9FACA28779C1', this.ped.handle, weaponHash, ammoHash);
     }
     /**
-     * @param ammoType
-     * @param amount
-     * @param addReason Refer to [enum: eAddItemReason]
+     * @param toggle
      */
-    addAmmoToPedByType(ammoType, amount, addReason) {
-        inv('0x106A811C6D3035F3', this.ped.handle, _h(ammoType), amount, addReason);
+    N_0x431240A58484D5D0(toggle) {
+        inv('0x431240A58484D5D0', this.ped.handle, toggle);
     }
     /**
-     * @param targetPed
+     * @param p2
+     * @param p3
+     * @returns outGUID
+     */
+    getBestPedShortarmGuid(p2, p3) {
+        const result = inv('0xF52BD94B47CCF736', this.ped.handle, pvi(), p2, p3);
+        return result;
+    }
+    /**
+     * @returns coords
+     */
+    get PedLastWeaponImpactCoord() {
+        const result = inv('0x6C4D0409BA1A2BC2', this.ped.handle, pvv(), rai());
+        return [!!result[0], Vector3.fromArray(result[1])];
+    }
+    /**
+     * Returns WeaponAttachPoint
+     *
+     * @param attachPoint Refer to [enum: eWeaponAttachPoint]
      * @returns
      */
-    isTargetPedConstrainedByPedUsingBolas(targetPed) {
-        return inv('0x8D50F43298AB9545', this.ped.handle, targetPed.handle, rai());
+    getWeaponAttachPoint(attachPoint) {
+        return inv('0xCAD4FE9398820D24', this.ped.handle, attachPoint, rai());
+    }
+    /**
+     * @param p2
+     * @param attachPoint Refer to [enum: eWeaponAttachPoint]
+     * @param p4
+     * @returns weaponHash: Refer to [enum: eWeaponHash]
+     */
+    getCurrentPedWeapon(p2, attachPoint, p4) {
+        const result = inv('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 guidPrimary
+     * @returns
      */
-    getBestPedWeaponInInventory(p1) {
-        const result = inv('0x7B98500614C8E8B8', this.ped.handle, p1, pvi());
-        return [result[0], result[1]];
+    doesPedHaveRevolver(p1) {
+        return inv('0x5B235F24472F2C3B', this.ped.handle, p1);
+    }
+    /**
+     * Returns emote Hash
+     *
+     * @returns
+     */
+    get PedGunSpinningEquippedKitEmoteTwirl() {
+        return (inv('0x2C4FEC3D0EFA9FC0', this.ped.handle, rai())) & 0xFFFFFFFF;
     }
     /**
      * @param weaponHash Refer to [enum: eWeaponHash]
@@ -218,13 +313,13 @@ export class Weapon {
     /**
      * @returns
      */
-    isPedCurrentWeaponHolstered() {
+    get IsPedCurrentWeaponHolstered() {
         return inv('0xBDD9C235D8D1052E', this.ped.handle);
     }
     /**
      * @param toggle
      */
-    setInstantlyEquipWeaponPickups(toggle) {
+    set InstantlyEquipWeaponPickups(toggle) {
         inv('0x739B9C6D0E7F7F93', this.ped.handle, toggle);
     }
     /**
@@ -245,7 +340,7 @@ export class Weapon {
     /**
      * @returns Returns the total ammo in the ped weapon from it's guid, or `0`.; guid
      */
-    getAmmoInPedWeaponFromGuid() {
+    get AmmoInPedWeaponFromGuid() {
         const result = inv('0x4823F13A21F51964', this.ped.handle, pvi(), rai());
         return [result[0], result[1]];
     }
@@ -257,144 +352,136 @@ export class Weapon {
         inv('0xF25DF915FA38C5F3', this.ped.handle, p1, p2);
     }
     /**
-     * @param ammoHash Refer to [enum: eAmmoType]
-     */
-    disableAmmoTypeForPed(ammoHash) {
-        inv('0xAA5A52204E077883', this.ped.handle, ammoHash);
-    }
-    /**
-     * Returns whether the ped has a shotgun p1: 0 or 1
+     * Stores longarms to your horse on dismount
+     * Params: p2 = 0
+     * SET_[I - M]*
      *
-     * @param p1
-     * @returns
+     * @param storeLongarms
+     * @param p2
      */
-    doesPedHaveShotgun(p1) {
-        return inv('0xABC18A28BAD4B46F', this.ped.handle, p1);
-    }
-    clearPedLastWeaponDamage() {
-        inv('0x087D8F4BC65F68E4', this.ped.handle);
+    setInstantlyStoreLongarmsOnDismount(storeLongarms, p2) {
+        inv('0xB832F1A686B9B810', this.ped.handle, storeLongarms, p2);
     }
     /**
-     * Returns true if ped is on a horse while inside of a town
-     * Params: p1 = 0
-     * GET_L* - GET_MA*
-     *
-     * @param p1
-     * @returns
+     * @param removeReason Refer to [enum: eRemoveItemReason]
+     * @returns weaponGuid
      */
-    N_0x5A695BD328586B44(p1) {
-        return inv('0x5A695BD328586B44', this.ped.handle, p1);
+    removeWeaponFromPedByGuid(removeReason) {
+        const result = inv('0x51C3B71591811485', this.ped.handle, pvi(), removeReason);
+        return result;
     }
     /**
+     * attachPoint:
+     *
      * @param weaponHash Refer to [enum: eWeaponHash]
-     * @param amount
-     * @param removeReason Refer to [enum: eRemoveItemReason]
+     * @param equipNow
+     * @param attachPoint Refer to [enum: eWeaponAttachPoint]
+     * @param p4
+     * @param p5
      */
-    removeAmmoFromPed(weaponHash, amount, removeReason) {
-        inv('0xF4823C813CB8277D', this.ped.handle, weaponHash, amount, removeReason);
+    setCurrentPedWeapon(weaponHash, equipNow, attachPoint, p4, p5) {
+        inv('0xADF692B254977C0C', this.ped.handle, weaponHash, equipNow, attachPoint, p4, p5);
     }
     /**
-     * @param p1
+     * Equips a weapon from a weaponItem, similar to GIVE_WEAPON_TO_PED
+     *
      * @param p2
+     * @param p3
+     * @param p4
+     * @param p5
+     * @returns weaponUid
      */
-    setPedAmmoToDrop(p1, p2) {
-        inv('0xA4EFEF9440A5B0EF', this.ped.handle, p1, p2);
+    setCurrentPedWeaponByGuid(p2, p3, p4, p5) {
+        const result = inv('0x12FB95FE3D579238', this.ped.handle, pvi(), p2, p3, p4, p5);
+        return result;
     }
     /**
-     * Returns the current ammo type of the specified ped's specified weapon.
-     *
+     * @param componentHash
      * @param weaponHash Refer to [enum: eWeaponHash]
      * @returns
      */
-    getPedAmmoTypeFromWeapon(weaponHash) {
-        return (inv('0x7FEAD38B326B9F74', this.ped.handle, weaponHash, rai())) & 0xFFFFFFFF;
+    hasPedGotWeaponComponent(componentHash, weaponHash) {
+        return inv('0xBBC67A6F965C688A', this.ped.handle, _h(componentHash), weaponHash);
     }
     /**
      * @param weaponHash Refer to [enum: eWeaponHash]
-     * @returns ammo
+     * @param amount The amount of ped to add to the ammo
+     * @param addReason Refer to [enum: eAddItemReason]
      */
-    getMaxAmmo(weaponHash) {
-        const result = inv('0xDC16122C7A20C933', this.ped.handle, pvi(), weaponHash, rai());
-        return [!!result[0], result[1]];
+    addAmmoToPed(weaponHash, amount, addReason) {
+        inv('0xB190BCA3F4042F95', this.ped.handle, weaponHash, amount, addReason);
     }
     /**
-     * emote hashes: KIT_EMOTE_TWIRL_GUN, KIT_EMOTE_TWIRL_GUN_LEFT_HOLSTER, KIT_EMOTE_TWIRL_GUN_DUAL, 0 (to unequip)
-     *
-     * @param emote
+     * @param ammoType
+     * @param amount
+     * @param addReason Refer to [enum: eAddItemReason]
      */
-    setActiveGunSpinningEquipKitEmoteTwirl(emote) {
-        inv('0xCBCFFF805F1B4596', this.ped.handle, _h(emote));
+    addAmmoToPedByType(ammoType, amount, addReason) {
+        inv('0x106A811C6D3035F3', this.ped.handle, _h(ammoType), amount, addReason);
     }
     /**
+     * @param targetPed
      * @returns
      */
-    enableWeaponRestore() {
-        return inv('0xC395355843BE134B', this.ped.handle);
+    isTargetPedConstrainedByPedUsingBolas(targetPed) {
+        return !!inv('0x8D50F43298AB9545', this.ped.handle, targetPed.handle, rai());
     }
     /**
-     * Returns whether the specified ped is holding a weapon with the given hash.
-     * only these weapons below return true
-     * WEAPON_BOW, WEAPON_KIT_METAL_DETECTOR, WEAPON_MELEE_CLEAVER, WEAPON_MELEE_DAVY_LANTERN, WEAPON_MELEE_HATCHET, WEAPON_MELEE_HATCHET_HUNTER, WEAPON_MELEE_KNIFE_JAWBONE, WEAPON_MELEE_LANTERN WEAPON_MELEE_TORCH, WEAPON_MOONSHINEJUG_MP, WEAPON_RIFLE_BOLTACTION, WEAPON_SHOTGUN_PUMP, WEAPON_THROWN_BOLAS, WEAPON_THROWN_MOLOTOV
-     *
-     * @param weapon
-     * @returns
+     * @param p1
+     * @returns guidPrimary
      */
-    isPedHoldingWeapon(weapon) {
-        return inv('0x07E1C35F0078C3F9', this.ped.handle, _h(weapon), rai());
+    getBestPedWeaponInInventory(p1) {
+        const result = inv('0x7B98500614C8E8B8', this.ped.handle, p1, pvi());
+        return [result[0], result[1]];
+    }
+    /**
+     * @param toggle
+     */
+    set AllowAnyWeaponDrop(toggle) {
+        inv('0x78030C7867D8B9B6', this.ped.handle, toggle);
     }
     /**
-     * _GET_D* - _GET_L*
-     *
      * @returns
      */
-    N_0x0DE0944ECCB3DF5D() {
-        return inv('0x0DE0944ECCB3DF5D', this.ped.handle, rai());
+    makePedReload() {
+        return inv('0x79E1E511FF7EFB13', this.ped.handle);
     }
     /**
-     * @param flags
-     * @returns
+     * @param weaponHash Refer to [enum: eWeaponHash]
+     * @param ammoCount
+     * @param p3
+     * @param addReason Refer to [enum: eAddItemReason]
      */
-    isPedArmed(flags) {
-        return inv('0xCB690F680A3EA971', this.ped.handle, flags);
+    giveDelayedWeaponToPed(weaponHash, ammoCount, p3, addReason) {
+        inv('0xB282DC6EBD803C75', this.ped.handle, weaponHash, ammoCount, p3, addReason);
     }
     /**
-     * Returns whether the ped has a sniper p1: 0 or 1
-     *
-     * @param p1
-     * @returns
+     * @param toggle
      */
-    doesPedHaveSniper(p1) {
-        return inv('0x80BB243789008A82', this.ped.handle, p1);
+    N_0x45E57FDD531C9477(toggle) {
+        inv('0x45E57FDD531C9477', this.ped.handle, toggle);
     }
     /**
-     * Returns the ped's default unarmed weapon hash as defined in CPedModelInfo (DefaultUnarmedWeapon).
-     * Falls back to WEAPON_UNARMED if the ped doesn't have a valid model info pointer, or 0 if the ped doesn't exist.
-     *
-     * @returns
+     * @param ammoHash Refer to [enum: eAmmoType]
+     * @returns weaponInventoryUid
      */
-    getDefaultUnarmedWeaponHash() {
-        return (inv('0x08FF1099ED2E6E21', this.ped.handle, rai())) & 0xFFFFFFFF;
+    setAmmoTypeForPedWeaponInventory(ammoHash) {
+        const result = inv('0xEBE46B501BC3FBCF', this.ped.handle, pvi(), ammoHash);
+        return result;
     }
     /**
      * @param weaponHash Refer to [enum: eWeaponHash]
      * @param p2
-     * @returns
-     */
-    getMaxAmmoInClip(weaponHash, p2) {
-        return inv('0xA38DCFFCEA8962FA', this.ped.handle, weaponHash, p2, rai());
-    }
-    /**
-     * @param attachPoint Refer to [enum: eWeaponAttachPoint]
-     * @returns Returns the weapon entity
+     * @param removeReason Refer to [enum: eRemoveItemReason]
      */
-    getCurrentPedWeaponEntityIndex(attachPoint) {
-        return createFromHandle('Entity', inv('0x3B390A939AF0B5FC', this.ped.handle, attachPoint, rai()));
+    removeWeaponFromPed(weaponHash, p2, removeReason) {
+        inv('0x4899CB088EDF59B8', this.ped.handle, weaponHash, p2, removeReason);
     }
     /**
      * @returns
      */
-    isPedWeaponReadyToShoot() {
-        return inv('0xB80CA294F2F26749', this.ped.handle, rai());
+    get IsPedWeaponReadyToShoot() {
+        return !!inv('0xB80CA294F2F26749', this.ped.handle, rai());
     }
     /**
      * @param componentHash
@@ -430,7 +517,7 @@ export class Weapon {
     /**
      * @param allow
      */
-    setAllowDualWield(allow) {
+    set AllowDualWield(allow) {
         inv('0x83B8D50EB9446BBA', this.ped.handle, allow);
     }
     /**
@@ -454,7 +541,7 @@ export class Weapon {
      * @returns
      */
     isPedCarryingWeapon(weaponHash) {
-        return inv('0xF29A186ED428B552', this.ped.handle, weaponHash);
+        return !!inv('0xF29A186ED428B552', this.ped.handle, weaponHash, rai());
     }
     /**
      * @returns
@@ -473,411 +560,251 @@ export class Weapon {
     hidePedWeapons(p0, immediately) {
         inv('0xFCCC886EDE3C63EC', this.ped.handle, p0, immediately);
     }
-    /**
-     * @param weaponHash Refer to [enum: eWeaponHash]
-     * @returns ammo
-     */
-    getAmmoInClip(weaponHash) {
-        const result = inv('0x2E1202248937775C', this.ped.handle, pvi(), weaponHash, rai());
-        return [!!result[0], result[1]];
-    }
     /**
      * @param toggle
      */
-    N_0x16D9841A85FA627E(toggle) {
-        inv('0x16D9841A85FA627E', this.ped.handle, toggle);
-    }
-    /**
-     * @param weaponHash Refer to [enum: eWeaponHash]
-     * @param offset
-     * @param ammoCount
-     */
-    setPedDropsInventoryWeapon(weaponHash, offset, ammoCount) {
-        inv('0x208A1888007FC0E6', this.ped.handle, weaponHash, f(offset.x), f(offset.y), f(offset.z), ammoCount);
-    }
-    /**
-     * spinHash can be -1, 0 to disable
-     *
-     * @param weaponEmoteTrickType
-     * @param spin
-     */
-    setActiveGunSpinningKitEmoteTwirl(weaponEmoteTrickType, spin) {
-        inv('0x01F661BB9C71B465', this.ped.handle, weaponEmoteTrickType, _h(spin));
-    }
-    /**
-     * Appears to just send specified weapon to your horse holster without having to be close
-     * However, the weapon is not visible on the horse holster, but you can reach the weapon on the weapon wheel
-     *
-     * @param weaponHash Refer to [enum: eWeaponHash]
-     */
-    sendWeaponToInventory(weaponHash) {
-        inv('0xE9BD19F8121ADE3E', this.ped.handle, weaponHash);
+    N_0xF08D8FEB455F2C8C(toggle) {
+        inv('0xF08D8FEB455F2C8C', this.ped.handle, toggle);
     }
     /**
-     * If near your horse when called, weapons stored on your horse will be considered
-     * Returns weaponHash
-     *
-     * @param weaponGroup
-     * @param p2
-     * @param p3
-     * @returns
+     * @returns ammo; inventoryUid
      */
-    getBestPedWeaponInGroup(weaponGroup, p2, p3) {
-        return (inv('0x9F67929D98E7C6E8', this.ped.handle, _h(weaponGroup), p2, p3, rai())) & 0xFFFFFFFF;
+    get AmmoInClipByInventoryUid() {
+        const result = inv('0x678F00858980F516', this.ped.handle, pvi(), pvi());
+        return [result[0], result[1], result[2]];
     }
     /**
-     * Only used in R* SP Scripts native_son2, native_son3 and smuggler2
-     * Params: p2 = -1
+     * removeReason must be REMOVE_REASON_USED, REMOVE_REASON_GIVEN, REMOVE_REASON_DROPPED or REMOVE_REASON_DEBUG, unless amount is -1
      *
-     * @param p1
-     * @param p2
-     */
-    N_0x8A779706DA5CA3DD(p1, p2) {
-        inv('0x8A779706DA5CA3DD', this.ped.handle, p1, p2);
-    }
-    /**
-     * @param weaponHash Refer to [enum: eWeaponHash]
      * @param ammoHash Refer to [enum: eAmmoType]
+     * @param amount
+     * @param removeReason Refer to [enum: eRemoveItemReason]
      */
-    disableAmmoTypeForPedWeapon(weaponHash, ammoHash) {
-        inv('0xF0D728EEA3C99775', this.ped.handle, weaponHash, ammoHash);
-    }
-    /**
-     * @returns data; outData
-     */
-    giveWeaponToPedWithOptions() {
-        const result = inv('0xBE7E42B07FD317AC', this.ped.handle, pvi(), pvi(), rai());
-        return [!!result[0], result[1], result[2]];
-    }
-    /**
-     * @returns
-     */
-    getMaxLockonDistanceOfCurrentPedWeapon() {
-        return inv('0x79B1A6E780266DB0', this.ped.handle, raf());
-    }
-    /**
-     * @param visible
-     */
-    setPedAllWeaponsVisibility(visible) {
-        inv('0x4F806A6CFED89468', this.ped.handle, visible);
-    }
-    /**
-     * @param weaponHash Refer to [enum: eWeaponHash]
-     * @param ammo
-     * @returns
-     */
-    setAmmoInClip(weaponHash, ammo) {
-        return inv('0xDCD2A934D65CB497', this.ped.handle, weaponHash, ammo, rai());
-    }
-    /**
-     * _GET_M* - _GET_PED_A*
-     *
-     * @param p1
-     * @returns
-     */
-    getPedWeaponObject(p1) {
-        return createFromHandle('Prop', inv('0x6CA484C9A7377E4F', this.ped.handle, p1, rai()));
-    }
-    /**
-     * slotHash is usually just the weaponHash name, but WEAPON_* is replaced with SLOT_*
-     *
-     * @param slotHash
-     * @returns
-     */
-    getPedWeaponInSlot(slotHash) {
-        return (inv('0xDBC4B552B2AE9A83', this.ped.handle, _h(slotHash), rai())) & 0xFFFFFFFF;
-    }
-    /**
-     * Outputs cached guids
-     *
-     * @returns guidPrimary; guidSecondary
-     */
-    getPlayerPedQuickSwapWeaponByGuid() {
-        const result = inv('0xB7E52A058B07C7E2', this.ped.handle, pvi(), pvi());
-        return [result[0], result[1]];
+    removeAmmoFromPedByType(ammoHash, amount, removeReason) {
+        inv('0xB6CFEC32E3742779', this.ped.handle, ammoHash, amount, removeReason);
     }
     /**
-     * Returns true if the ped is currently holstering or unholstering a weapon
+     * Holster the holded shoulder weapon. Precisions: 0 means with anim while 1 means direct holster
      *
-     * @returns
-     */
-    isWeaponHolsterStateChanging() {
-        return inv('0x2387D6E9C6B478AA', this.ped.handle, rai());
-    }
-    /**
-     * @param ammoHash Refer to [enum: eAmmoType]
-     * @returns
+     * @param disableAnim
      */
-    N_0x44C8F4908F1B2622(ammoHash) {
-        return inv('0x44C8F4908F1B2622', this.ped.handle, ammoHash, rai());
+    set PedWeaponOnBack(disableAnim) {
+        inv('0x4820A6939D7CEF28', this.ped.handle, disableAnim);
     }
     /**
-     * @param p2
-     * @returns clipInventoryUid
+     * @param ammoType
+     * @param ammo
      */
-    refillAmmoInClip(p2) {
-        const result = inv('0xDF4A3404D022ADDE', this.ped.handle, pvi(), p2);
-        return [result[0], result[1]];
+    setPedAmmoByType(ammoType, ammo) {
+        inv('0x5FD1E1F011E76D7E', this.ped.handle, _h(ammoType), ammo);
     }
     /**
-     * _SET_A* - _SET_B*
-     *
      * @param p1
-     */
-    N_0x2EBF70E1D8C06683(p1) {
-        inv('0x2EBF70E1D8C06683', this.ped.handle, _h(p1));
-    }
-    /**
-     * @returns
-     */
-    getAllowDualWield() {
-        return inv('0x918990BD9CE08582', this.ped.handle);
-    }
-    /**
-     * Returns eCurrentHeldWeapon
-     * _GET_R* - _GET_T*
-     *
      * @returns
      */
-    getPedCurrentHeldWeapon() {
-        return (inv('0x8425C5F057012DAB', this.ped.handle, rai())) & 0xFFFFFFFF;
-    }
-    /**
-     * @param toggle
-     */
-    setForceAutoEquip(toggle) {
-        inv('0xBE711B14A159E84F', this.ped.handle, toggle);
-    }
-    /**
-     * @param weaponHash Refer to [enum: eWeaponHash]
-     * @param ammo
-     */
-    setPedAmmo(weaponHash, ammo) {
-        inv('0x14E56BC5B5DB6A19', this.ped.handle, weaponHash, ammo);
+    getPedBackupWeapon(p1) {
+        return (inv('0xC71FE230A513C30F', this.ped.handle, p1, rai())) & 0xFFFFFFFF;
     }
     /**
-     * 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 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
      */
-    giveWeaponToPed(weaponHash, ammoCount, bForceInHand, bForceInHolster, attachPoint, bAllowMultipleCopies, p7, p8, addReason, bIgnoreUnlocks, permanentDegradation, p12) {
-        return (inv('0x5E3BDDBCB83F3D84', this.ped.handle, weaponHash, ammoCount, bForceInHand, bForceInHolster, attachPoint, bAllowMultipleCopies, f(p7), f(p8), addReason, bIgnoreUnlocks, f(permanentDegradation), p12, rai())) & 0xFFFFFFFF;
+    set ForceCurrentWeaponIntoCockedState(attachPoint) {
+        inv('0x5230D3F6EE56CFE6', this.ped.handle, attachPoint);
     }
     /**
      * @param weaponHash Refer to [enum: eWeaponHash]
-     * @returns
-     */
-    getAmmoInPedWeapon(weaponHash) {
-        return inv('0x015A522136D7F951', this.ped.handle, weaponHash, rai());
-    }
-    /**
-     * @param attachPoint Refer to [enum: eWeaponAttachPoint]
-     * @returns weaponGuid
+     * @returns ammo
      */
-    getPedWeaponGuidAtAttachPoint(attachPoint) {
-        const result = inv('0x6929E22158E52265', this.ped.handle, attachPoint, pvi());
-        return [result[0], result[1]];
+    getAmmoInClip(weaponHash) {
+        const result = inv('0x2E1202248937775C', this.ped.handle, pvi(), weaponHash, rai());
+        return [!!result[0], result[1]];
     }
     /**
      * @param toggle
-     */
-    setAllowAnyWeaponDrop(toggle) {
-        inv('0x78030C7867D8B9B6', this.ped.handle, toggle);
-    }
-    /**
-     * @returns
-     */
-    makePedReload() {
-        return inv('0x79E1E511FF7EFB13', this.ped.handle);
+     */
+    N_0x16D9841A85FA627E(toggle) {
+        inv('0x16D9841A85FA627E', this.ped.handle, toggle);
     }
     /**
      * @param weaponHash Refer to [enum: eWeaponHash]
+     * @param offset
      * @param ammoCount
-     * @param p3
-     * @param addReason Refer to [enum: eAddItemReason]
-     */
-    giveDelayedWeaponToPed(weaponHash, ammoCount, p3, addReason) {
-        inv('0xB282DC6EBD803C75', this.ped.handle, weaponHash, ammoCount, p3, addReason);
-    }
-    /**
-     * @param toggle
      */
-    N_0x45E57FDD531C9477(toggle) {
-        inv('0x45E57FDD531C9477', this.ped.handle, toggle);
+    setPedDropsInventoryWeapon(weaponHash, offset, ammoCount) {
+        inv('0x208A1888007FC0E6', this.ped.handle, weaponHash, f(offset.x), f(offset.y), f(offset.z), ammoCount);
     }
     /**
-     * @param ammoHash Refer to [enum: eAmmoType]
-     * @returns weaponInventoryUid
+     * spinHash can be -1, 0 to disable
+     *
+     * @param weaponEmoteTrickType
+     * @param spin
      */
-    setAmmoTypeForPedWeaponInventory(ammoHash) {
-        const result = inv('0xEBE46B501BC3FBCF', this.ped.handle, pvi(), ammoHash);
-        return result;
+    setActiveGunSpinningKitEmoteTwirl(weaponEmoteTrickType, spin) {
+        inv('0x01F661BB9C71B465', this.ped.handle, weaponEmoteTrickType, _h(spin));
     }
     /**
+     * Appears to just send specified weapon to your horse holster without having to be close
+     * However, the weapon is not visible on the horse holster, but you can reach the weapon on the weapon wheel
+     *
      * @param weaponHash Refer to [enum: eWeaponHash]
-     * @param p2
-     * @param removeReason Refer to [enum: eRemoveItemReason]
      */
-    removeWeaponFromPed(weaponHash, p2, removeReason) {
-        inv('0x4899CB088EDF59B8', this.ped.handle, weaponHash, p2, removeReason);
+    sendWeaponToInventory(weaponHash) {
+        inv('0xE9BD19F8121ADE3E', this.ped.handle, weaponHash);
     }
     /**
-     * @param ammoType
+     * If near your horse when called, weapons stored on your horse will be considered
+     * Returns weaponHash
+     *
+     * @param weaponGroup
+     * @param p2
+     * @param p3
      * @returns
      */
-    getPedAmmoByType(ammoType) {
-        return inv('0x39D22031557946C1', this.ped.handle, _h(ammoType), rai());
+    getBestPedWeaponInGroup(weaponGroup, p2, p3) {
+        return (inv('0x9F67929D98E7C6E8', this.ped.handle, _h(weaponGroup), p2, p3, rai())) & 0xFFFFFFFF;
     }
     /**
+     * Only used in R* SP Scripts native_son2, native_son3 and smuggler2
+     * Params: p2 = -1
+     *
      * @param p1
      * @param p2
-     * @returns
      */
-    getBestPedWeapon(p1, p2) {
-        return (inv('0x8483E98E8B888AE2', this.ped.handle, p1, p2, rai())) & 0xFFFFFFFF;
+    N_0x8A779706DA5CA3DD(p1, p2) {
+        inv('0x8A779706DA5CA3DD', this.ped.handle, p1, p2);
     }
     /**
-     * @param toggle
      * @param weaponHash Refer to [enum: eWeaponHash]
+     * @param ammoHash Refer to [enum: eAmmoType]
      */
-    setPedInfiniteAmmo(toggle, weaponHash) {
-        inv('0x3EDCB0505123623B', this.ped.handle, toggle, weaponHash);
+    disableAmmoTypeForPedWeapon(weaponHash, ammoHash) {
+        inv('0xF0D728EEA3C99775', this.ped.handle, weaponHash, ammoHash);
     }
     /**
-     * @param weaponHash Refer to [enum: eWeaponHash]
-     * @param ammoHash Refer to [enum: eAmmoType]
+     * @returns data; outData
      */
-    setAmmoTypeForPedWeapon(weaponHash, ammoHash) {
-        inv('0xCC9C4393523833E2', this.ped.handle, weaponHash, ammoHash);
+    giveWeaponToPedWithOptions() {
+        const result = inv('0xBE7E42B07FD317AC', this.ped.handle, pvi(), pvi(), rai());
+        return [!!result[0], result[1], result[2]];
     }
     /**
-     * *GET_BEST** - *GET_CLOSEST**
-     *
-     * @returns weaponGuid
+     * @returns
      */
-    getCorrectKitEmoteTwirlGun() {
-        const result = inv('0xCD356B42C57BFE01', this.ped.handle, pvi(), rai());
-        return [!!result[0], result[1]];
+    get MaxLockonDistanceOfCurrentPedWeapon() {
+        return inv('0x79B1A6E780266DB0', this.ped.handle, raf());
     }
     /**
-     * @param weaponHash Refer to [enum: eWeaponHash]
-     * @returns
+     * @param ammoHash Refer to [enum: eAmmoType]
      */
-    setCurrentPedVehicleWeapon(weaponHash) {
-        return inv('0x75C55983C2C39DAA', this.ped.handle, weaponHash, rai());
+    disableAmmoTypeForPed(ammoHash) {
+        inv('0xAA5A52204E077883', this.ped.handle, ammoHash);
     }
     /**
-     * Returns whether the ped has a rifle p1: 0 or 1
+     * Returns whether the ped has a shotgun p1: 0 or 1
      *
      * @param p1
      * @returns
      */
-    doesPedHaveRifle(p1) {
-        return inv('0x95CA12E2C68043E5', this.ped.handle, p1);
+    doesPedHaveShotgun(p1) {
+        return inv('0xABC18A28BAD4B46F', this.ped.handle, p1);
+    }
+    clearPedLastWeaponDamage() {
+        inv('0x087D8F4BC65F68E4', this.ped.handle);
     }
     /**
-     * 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*
+     * Returns true if ped is on a horse while inside of a town
+     * Params: p1 = 0
+     * GET_L* - GET_MA*
      *
+     * @param p1
+     * @returns
+     */
+    N_0x5A695BD328586B44(p1) {
+        return inv('0x5A695BD328586B44', this.ped.handle, p1);
+    }
+    /**
      * @param weaponHash Refer to [enum: eWeaponHash]
-     * @param ped
+     * @param amount
+     * @param removeReason Refer to [enum: eRemoveItemReason]
      */
-    N_0x14FF0C2545527F9B(weaponHash, ped) {
-        inv('0x14FF0C2545527F9B', this.ped.handle, weaponHash, ped.handle);
+    removeAmmoFromPed(weaponHash, amount, removeReason) {
+        inv('0xF4823C813CB8277D', this.ped.handle, weaponHash, amount, removeReason);
     }
     /**
-     * Returns iSpinHash / iVariationSpin
-     *
-     * @param weaponEmoteVariation
-     * @returns
+     * @param p1
+     * @param p2
      */
-    getPedGunSpinningHashFromWeaponEmoteVariation(weaponEmoteVariation) {
-        return (inv('0xF3B1620B920D1708', this.ped.handle, weaponEmoteVariation, rai())) & 0xFFFFFFFF;
+    setPedAmmoToDrop(p1, p2) {
+        inv('0xA4EFEF9440A5B0EF', this.ped.handle, p1, p2);
     }
     /**
-     * Returns whether the ped has a repeater p1: 0 or 1
+     * Returns the current ammo type of the specified ped's specified weapon.
      *
-     * @param p1
+     * @param weaponHash Refer to [enum: eWeaponHash]
      * @returns
      */
-    doesPedHaveRepeater(p1) {
-        return inv('0x495A04CAEC263AF8', this.ped.handle, p1);
+    getPedAmmoTypeFromWeapon(weaponHash) {
+        return (inv('0x7FEAD38B326B9F74', this.ped.handle, weaponHash, rai())) & 0xFFFFFFFF;
     }
     /**
-     * @param weaponCollection
+     * @param weaponHash Refer to [enum: eWeaponHash]
+     * @returns ammo
      */
-    giveWeaponCollectionToPed(weaponCollection) {
-        inv('0x899A04AFCC725D04', this.ped.handle, _h(weaponCollection));
+    getMaxAmmo(weaponHash) {
+        const result = inv('0xDC16122C7A20C933', this.ped.handle, pvi(), weaponHash, rai());
+        return [!!result[0], result[1]];
     }
     /**
-     * @param toggle
+     * Returns ammoHash from weaponObject (Returned by 0x6CA484C9A7377E4F)
+     *
+     * @param weaponObject
+     * @returns
      */
-    N_0xF08D8FEB455F2C8C(toggle) {
-        inv('0xF08D8FEB455F2C8C', this.ped.handle, toggle);
+    getCurrentPedWeaponAmmoType(weaponObject) {
+        return (inv('0x7E7B19A4355FEE13', this.ped.handle, weaponObject.handle, rai())) & 0xFFFFFFFF;
     }
     /**
-     * @returns ammo; inventoryUid
+     * @param p1
+     * @param p2
+     * @param p3
+     * @returns
      */
-    getAmmoInClipByInventoryUid() {
-        const result = inv('0x678F00858980F516', this.ped.handle, pvi(), pvi());
-        return [result[0], result[1], result[2]];
+    getPedWorstWeapon(p1, p2, p3) {
+        return (inv('0xDA37A053C1522F5D', this.ped.handle, p1, p2, p3, rai())) & 0xFFFFFFFF;
     }
     /**
-     * removeReason must be REMOVE_REASON_USED, REMOVE_REASON_GIVEN, REMOVE_REASON_DROPPED or REMOVE_REASON_DEBUG, unless amount is -1
-     *
-     * @param ammoHash Refer to [enum: eAmmoType]
-     * @param amount
-     * @param removeReason Refer to [enum: eRemoveItemReason]
+     * @param toggle
      */
-    removeAmmoFromPedByType(ammoHash, amount, removeReason) {
-        inv('0xB6CFEC32E3742779', this.ped.handle, ammoHash, amount, removeReason);
+    set PedDropsWeaponsWhenDead(toggle) {
+        inv('0x476AE72C1D19D1A8', this.ped.handle, toggle);
     }
     /**
-     * Holster the holded shoulder weapon. Precisions: 0 means with anim while 1 means direct holster
+     * Returns ammoHash
      *
-     * @param disableAnim
+     * @returns Returns the [enum: eAmmoType]; weaponGuid
      */
-    setPedWeaponOnBack(disableAnim) {
-        inv('0x4820A6939D7CEF28', this.ped.handle, disableAnim);
+    get CurrentAmmoTypeFromGuid() {
+        const result = inv('0xAF9D167A5656D6A6', this.ped.handle, pvi(), rai());
+        return [result[0] & 0xFFFFFFFF, result[1]];
     }
     /**
-     * @param ammoType
-     * @param ammo
+     * @param toggle
      */
-    setPedAmmoByType(ammoType, ammo) {
-        inv('0x5FD1E1F011E76D7E', this.ped.handle, _h(ammoType), ammo);
+    set PedInfiniteAmmoClip(toggle) {
+        inv('0xFBAA1E06B6BCA741', this.ped.handle, toggle);
     }
     /**
-     * @param p1
+     * returns the amount of peds that were restrained with the weapon thrown bolas
+     *
      * @returns
      */
-    getPedBackupWeapon(p1) {
-        return (inv('0xC71FE230A513C30F', this.ped.handle, p1, rai())) & 0xFFFFFFFF;
-    }
-    /**
-     * @param attachPoint Refer to [enum: eWeaponAttachPoint]
-     */
-    setForceCurrentWeaponIntoCockedState(attachPoint) {
-        inv('0x5230D3F6EE56CFE6', this.ped.handle, attachPoint);
+    get NumPedsRestrainedFromWeaponBolas() {
+        return inv('0x46D42883E873C1D7', this.ped.handle);
     }
     /**
      * @returns
      */
-    getPedHogtieWeapon() {
+    get PedHogtieWeapon() {
         return (inv('0x90EB1CB189923587', this.ped.handle, rai())) & 0xFFFFFFFF;
     }
     /**
@@ -894,13 +821,13 @@ export class Weapon {
      *
      * @param emoteType
      */
-    setGunSpinningInventorySlotIdActivate(emoteType) {
+    set GunSpinningInventorySlotIdActivate(emoteType) {
         inv('0x408CF580C5E96D49', this.ped.handle, emoteType);
     }
     /**
      * @returns weaponHash: Refer to [enum: eWeaponHash]
      */
-    getCurrentPedVehicleWeapon() {
+    get CurrentPedVehicleWeapon() {
         const result = inv('0x1017582BCD3832DC', this.ped.handle, pvi(), rai());
         return [!!result[0], result[1]];
     }
@@ -929,6 +856,79 @@ export class Weapon {
      * @returns
      */
     hasPedGotWeapon(weaponHash, p2, onlyCheckPlayerInventory) {
-        return inv('0x8DECB02F88F428BC', this.ped.handle, weaponHash, p2, onlyCheckPlayerInventory, rai());
+        return !!inv('0x8DECB02F88F428BC', this.ped.handle, weaponHash, p2, onlyCheckPlayerInventory, rai());
+    }
+    /**
+     * @returns
+     */
+    get AllowDualWield() {
+        return inv('0x918990BD9CE08582', this.ped.handle);
+    }
+    /**
+     * Returns eCurrentHeldWeapon
+     * _GET_R* - _GET_T*
+     *
+     * @returns
+     */
+    get PedCurrentHeldWeapon() {
+        return (inv('0x8425C5F057012DAB', this.ped.handle, rai())) & 0xFFFFFFFF;
+    }
+    /**
+     * @param toggle
+     */
+    set ForceAutoEquip(toggle) {
+        inv('0xBE711B14A159E84F', this.ped.handle, toggle);
+    }
+    /**
+     * @param weaponHash Refer to [enum: eWeaponHash]
+     * @param ammo
+     */
+    setPedAmmo(weaponHash, ammo) {
+        inv('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 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
+     */
+    giveWeaponToPed(weaponHash, ammoCount, bForceInHand, bForceInHolster, attachPoint, bAllowMultipleCopies, p7, p8, addReason, bIgnoreUnlocks, permanentDegradation, p12) {
+        return (inv('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) {
+        return inv('0x015A522136D7F951', this.ped.handle, weaponHash, rai());
+    }
+    /**
+     * @param attachPoint Refer to [enum: eWeaponAttachPoint]
+     * @returns weaponGuid
+     */
+    getPedWeaponGuidAtAttachPoint(attachPoint) {
+        const result = inv('0x6929E22158E52265', this.ped.handle, attachPoint, pvi());
+        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
+     */
+    set ActiveGunSpinningEquipKitEmoteTwirl(emote) {
+        inv('0xCBCFFF805F1B4596', this.ped.handle, _h(emote));
     }
 }