@nativewrappers/redm-codegen 0.0.3 → 0.0.5

package/dist/classes/Weapon.d.ts

@@ -10,287 +10,217 @@ export declare class Weapon {
     protected ped: Ped;
     constructor(ped: Ped);
     /**
-     * @param weaponHash Refer to [enum: eWeaponHash]
-     * @param ammoHash Refer to [enum: eAmmoType]
-     */
-    enableAmmoTypeForPedWeapon(weaponHash: eWeaponHash, ammoHash: eAmmoType): void;
-    /**
-     * @param toggle
-     */
-    N_0x431240A58484D5D0(toggle: boolean): void;
-    /**
-     * @param p2
-     * @param p3
-     * @returns outGUID
-     */
-    getBestPedShortarmGuid(p2: boolean, p3: boolean): number;
-    /**
-     * @returns coords
+     * @param visible
      */
-    getPedLastWeaponImpactCoord(): [boolean, Vector3];
+    set PedAllWeaponsVisibility(visible: boolean);
     /**
-     * Returns WeaponAttachPoint
-     *
-     * @param attachPoint Refer to [enum: eWeaponAttachPoint]
+     * @param weaponHash Refer to [enum: eWeaponHash]
+     * @param ammo
      * @returns
      */
-    getWeaponAttachPoint(attachPoint: number): number;
-    /**
-     * @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];
+    setAmmoInClip(weaponHash: eWeaponHash, ammo: number): boolean;
     /**
-     * Returns whether the ped has a revolver p1: 0 or 1
+     * _GET_M* - _GET_PED_A*
      *
      * @param p1
      * @returns
      */
-    doesPedHaveRevolver(p1: number): any;
+    getPedWeaponObject(p1: boolean): Prop | null;
     /**
-     * Returns emote Hash
+     * slotHash is usually just the weaponHash name, but WEAPON_* is replaced with SLOT_*
      *
+     * @param slotHash
      * @returns
      */
-    getPedGunSpinningEquippedKitEmoteTwirl(): number;
+    getPedWeaponInSlot(slotHash: string | number): number;
     /**
-     * @param weaponHash Refer to [enum: eWeaponHash]
-     * @returns ammo
+     * Outputs cached guids
+     *
+     * @returns guidPrimary; guidSecondary
      */
-    getAmmoInClip(weaponHash: eWeaponHash): [boolean, number];
+    get PlayerPedQuickSwapWeaponByGuid(): [number, number];
     /**
-     * @param toggle
+     * Returns true if the ped is currently holstering or unholstering a weapon
+     *
+     * @returns
      */
-    N_0x16D9841A85FA627E(toggle: boolean): void;
+    get IsWeaponHolsterStateChanging(): boolean;
     /**
-     * @param weaponHash Refer to [enum: eWeaponHash]
-     * @param offset
-     * @param ammoCount
+     * @param ammoHash Refer to [enum: eAmmoType]
+     * @returns
      */
-    setPedDropsInventoryWeapon(weaponHash: eWeaponHash, offset: Vector3, ammoCount: number): void;
+    N_0x44C8F4908F1B2622(ammoHash: eAmmoType): boolean;
     /**
-     * spinHash can be -1, 0 to disable
-     *
-     * @param weaponEmoteTrickType
-     * @param spin
+     * @param p2
+     * @returns clipInventoryUid
      */
-    setActiveGunSpinningKitEmoteTwirl(weaponEmoteTrickType: number, spin: string | number): void;
+    refillAmmoInClip(p2: number): [any, number];
     /**
-     * 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
+     * _SET_A* - _SET_B*
      *
-     * @param weaponHash Refer to [enum: eWeaponHash]
+     * @param p1
      */
-    sendWeaponToInventory(weaponHash: eWeaponHash): void;
+    N_0x2EBF70E1D8C06683(p1: string | number): void;
     /**
-     * If near your horse when called, weapons stored on your horse will be considered
-     * Returns weaponHash
-     *
-     * @param weaponGroup
-     * @param p2
-     * @param p3
+     * @param ammoType
      * @returns
      */
-    getBestPedWeaponInGroup(weaponGroup: string | number, p2: boolean, p3: boolean): number;
+    getPedAmmoByType(ammoType: string | number): number;
     /**
-     * Only used in R* SP Scripts native_son2, native_son3 and smuggler2
-     * Params: p2 = -1
-     *
      * @param p1
      * @param p2
+     * @returns
      */
-    N_0x8A779706DA5CA3DD(p1: boolean, p2: number): void;
+    getBestPedWeapon(p1: boolean, p2: boolean): number;
     /**
+     * @param toggle
      * @param weaponHash Refer to [enum: eWeaponHash]
-     * @param ammoHash Refer to [enum: eAmmoType]
      */
-    disableAmmoTypeForPedWeapon(weaponHash: eWeaponHash, ammoHash: eAmmoType): void;
+    setPedInfiniteAmmo(toggle: boolean, weaponHash: eWeaponHash): void;
     /**
-     * @returns data; outData
+     * @param weaponHash Refer to [enum: eWeaponHash]
+     * @param ammoHash Refer to [enum: eAmmoType]
      */
-    giveWeaponToPedWithOptions(): [boolean, number, number];
+    setAmmoTypeForPedWeapon(weaponHash: eWeaponHash, ammoHash: eAmmoType): void;
     /**
-     * @returns
+     * *GET_BEST** - *GET_CLOSEST**
+     *
+     * @returns weaponGuid
      */
-    getMaxLockonDistanceOfCurrentPedWeapon(): number;
+    get CorrectKitEmoteTwirlGun(): [boolean, number];
     /**
+     * @param weaponHash Refer to [enum: eWeaponHash]
      * @returns
      */
-    getAllowDualWield(): any;
+    setCurrentPedVehicleWeapon(weaponHash: eWeaponHash): boolean;
     /**
-     * Returns eCurrentHeldWeapon
-     * _GET_R* - _GET_T*
+     * Returns whether the ped has a rifle p1: 0 or 1
      *
+     * @param p1
      * @returns
      */
-    getPedCurrentHeldWeapon(): number;
-    /**
-     * @param toggle
-     */
-    setForceAutoEquip(toggle: boolean): void;
+    doesPedHaveRifle(p1: number): any;
     /**
+     * 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 ammo
+     * @param ped
      */
-    setPedAmmo(weaponHash: eWeaponHash, ammo: number): void;
+    N_0x14FF0C2545527F9B(weaponHash: eWeaponHash, ped: Ped): void;
     /**
-     * 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
+     * Returns iSpinHash / iVariationSpin
      *
-     * @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 weaponEmoteVariation
      * @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;
+    getPedGunSpinningHashFromWeaponEmoteVariation(weaponEmoteVariation: number): number;
     /**
-     * @param weaponHash Refer to [enum: eWeaponHash]
+     * Returns whether the ped has a repeater p1: 0 or 1
+     *
+     * @param p1
      * @returns
      */
-    getAmmoInPedWeapon(weaponHash: eWeaponHash): number;
-    /**
-     * @param attachPoint Refer to [enum: eWeaponAttachPoint]
-     * @returns weaponGuid
-     */
-    getPedWeaponGuidAtAttachPoint(attachPoint: number): [any, number];
+    doesPedHaveRepeater(p1: number): any;
     /**
-     * @param toggle
+     * @param weaponCollection
      */
-    setAllowAnyWeaponDrop(toggle: boolean): void;
+    giveWeaponCollectionToPed(weaponCollection: string | number): void;
     /**
      * @returns
      */
-    makePedReload(): any;
-    /**
-     * @param weaponHash Refer to [enum: eWeaponHash]
-     * @param ammoCount
-     * @param p3
-     * @param addReason Refer to [enum: eAddItemReason]
-     */
-    giveDelayedWeaponToPed(weaponHash: eWeaponHash, ammoCount: number, p3: boolean, addReason: eAddItemReason): void;
-    /**
-     * @param toggle
-     */
-    N_0x45E57FDD531C9477(toggle: boolean): void;
-    /**
-     * @param ammoHash Refer to [enum: eAmmoType]
-     * @returns weaponInventoryUid
-     */
-    setAmmoTypeForPedWeaponInventory(ammoHash: eAmmoType): number;
+    enableWeaponRestore(): any;
     /**
-     * @param weaponHash Refer to [enum: eWeaponHash]
-     * @param p2
-     * @param removeReason Refer to [enum: eRemoveItemReason]
+     * 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
      */
-    removeWeaponFromPed(weaponHash: eWeaponHash, p2: boolean, removeReason: eRemoveItemReason): void;
+    isPedHoldingWeapon(weapon: string | number): boolean;
     /**
-     * @param visible
+     * _GET_D* - _GET_L*
+     *
+     * @returns
      */
-    setPedAllWeaponsVisibility(visible: boolean): void;
+    N_0x0DE0944ECCB3DF5D(): boolean;
     /**
-     * @param weaponHash Refer to [enum: eWeaponHash]
-     * @param ammo
+     * @param flags
      * @returns
      */
-    setAmmoInClip(weaponHash: eWeaponHash, ammo: number): boolean;
+    isPedArmed(flags: number): boolean;
     /**
-     * _GET_M* - _GET_PED_A*
+     * Returns whether the ped has a sniper p1: 0 or 1
      *
      * @param p1
      * @returns
      */
-    getPedWeaponObject(p1: boolean): Prop | null;
+    doesPedHaveSniper(p1: number): any;
     /**
-     * slotHash is usually just the weaponHash name, but WEAPON_* is replaced with SLOT_*
+     * 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 slotHash
      * @returns
      */
-    getPedWeaponInSlot(slotHash: string | number): number;
+    get DefaultUnarmedWeaponHash(): number;
     /**
-     * Outputs cached guids
-     *
-     * @returns guidPrimary; guidSecondary
-     */
-    getPlayerPedQuickSwapWeaponByGuid(): [number, number];
-    /**
-     * Returns true if the ped is currently holstering or unholstering a weapon
-     *
+     * @param weaponHash Refer to [enum: eWeaponHash]
+     * @param p2
      * @returns
      */
-    isWeaponHolsterStateChanging(): boolean;
+    getMaxAmmoInClip(weaponHash: eWeaponHash, p2: boolean): number;
     /**
-     * @param ammoHash Refer to [enum: eAmmoType]
-     * @returns
+     * @param attachPoint Refer to [enum: eWeaponAttachPoint]
+     * @returns Returns the weapon entity
      */
-    N_0x44C8F4908F1B2622(ammoHash: eAmmoType): boolean;
+    getCurrentPedWeaponEntityIndex(attachPoint: number): Entity | null;
     /**
-     * @param p2
-     * @returns clipInventoryUid
+     * @param weaponHash Refer to [enum: eWeaponHash]
+     * @param ammoHash Refer to [enum: eAmmoType]
      */
-    refillAmmoInClip(p2: number): [any, number];
+    enableAmmoTypeForPedWeapon(weaponHash: eWeaponHash, ammoHash: eAmmoType): void;
     /**
-     * _SET_A* - _SET_B*
-     *
-     * @param p1
+     * @param toggle
      */
-    N_0x2EBF70E1D8C06683(p1: string | number): void;
+    N_0x431240A58484D5D0(toggle: boolean): void;
     /**
-     * @param ammoHash Refer to [enum: eAmmoType]
+     * @param p2
+     * @param p3
+     * @returns outGUID
      */
-    disableAmmoTypeForPed(ammoHash: eAmmoType): void;
+    getBestPedShortarmGuid(p2: boolean, p3: boolean): number;
     /**
-     * Returns whether the ped has a shotgun p1: 0 or 1
-     *
-     * @param p1
-     * @returns
+     * @returns coords
      */
-    doesPedHaveShotgun(p1: number): any;
-    clearPedLastWeaponDamage(): void;
+    get PedLastWeaponImpactCoord(): [boolean, Vector3];
     /**
-     * Returns true if ped is on a horse while inside of a town
-     * Params: p1 = 0
-     * GET_L* - GET_MA*
+     * Returns WeaponAttachPoint
      *
-     * @param p1
+     * @param attachPoint Refer to [enum: eWeaponAttachPoint]
      * @returns
      */
-    N_0x5A695BD328586B44(p1: number): any;
-    /**
-     * @param weaponHash Refer to [enum: eWeaponHash]
-     * @param amount
-     * @param removeReason Refer to [enum: eRemoveItemReason]
-     */
-    removeAmmoFromPed(weaponHash: eWeaponHash, amount: number, removeReason: eRemoveItemReason): void;
+    getWeaponAttachPoint(attachPoint: number): number;
     /**
-     * @param p1
      * @param p2
+     * @param attachPoint Refer to [enum: eWeaponAttachPoint]
+     * @param p4
+     * @returns weaponHash: Refer to [enum: eWeaponHash]
      */
-    setPedAmmoToDrop(p1: number, p2: number): void;
+    getCurrentPedWeapon(p2: boolean, attachPoint: number, p4: boolean): [boolean, number];
     /**
-     * Returns the current ammo type of the specified ped's specified weapon.
+     * Returns whether the ped has a revolver p1: 0 or 1
      *
-     * @param weaponHash Refer to [enum: eWeaponHash]
+     * @param p1
      * @returns
      */
-    getPedAmmoTypeFromWeapon(weaponHash: eWeaponHash): number;
+    doesPedHaveRevolver(p1: number): any;
     /**
-     * @param weaponHash Refer to [enum: eWeaponHash]
-     * @returns ammo
+     * Returns emote Hash
+     *
+     * @returns
      */
-    getMaxAmmo(weaponHash: eWeaponHash): [boolean, number];
+    get PedGunSpinningEquippedKitEmoteTwirl(): number;
     /**
      * @param weaponHash Refer to [enum: eWeaponHash]
      */
@@ -305,11 +235,11 @@ export declare class Weapon {
     /**
      * @returns
      */
-    isPedCurrentWeaponHolstered(): any;
+    get IsPedCurrentWeaponHolstered(): any;
     /**
      * @param toggle
      */
-    setInstantlyEquipWeaponPickups(toggle: boolean): void;
+    set InstantlyEquipWeaponPickups(toggle: boolean);
     /**
      * Hides the ped's weapon during a cutscene.
      *
@@ -323,52 +253,12 @@ export declare class Weapon {
     /**
      * @returns Returns the total ammo in the ped weapon from it's guid, or `0`.; guid
      */
-    getAmmoInPedWeaponFromGuid(): [number, number];
+    get AmmoInPedWeaponFromGuid(): [number, number];
     /**
      * @param p1
      * @param p2
      */
     removeAllPedWeapons(p1: boolean, p2: boolean): void;
-    /**
-     * Returns ammoHash from weaponObject (Returned by 0x6CA484C9A7377E4F)
-     *
-     * @param weaponObject
-     * @returns
-     */
-    getCurrentPedWeaponAmmoType(weaponObject: Prop): number;
-    /**
-     * @param p1
-     * @param p2
-     * @param p3
-     * @returns
-     */
-    getPedWorstWeapon(p1: boolean, p2: boolean, p3: boolean): number;
-    /**
-     * @param toggle
-     */
-    setPedDropsWeaponsWhenDead(toggle: boolean): void;
-    /**
-     * Returns ammoHash
-     *
-     * @returns Returns the [enum: eAmmoType]; weaponGuid
-     */
-    getCurrentAmmoTypeFromGuid(): [number, number];
-    /**
-     * @param toggle
-     */
-    setPedInfiniteAmmoClip(toggle: boolean): void;
-    /**
-     * returns the amount of peds that were restrained with the weapon thrown bolas
-     *
-     * @returns
-     */
-    getNumPedsRestrainedFromWeaponBolas(): any;
-    /**
-     * 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;
     /**
      * Stores longarms to your horse on dismount
      * Params: p2 = 0
@@ -408,29 +298,122 @@ export declare class Weapon {
      * @param weaponHash Refer to [enum: eWeaponHash]
      * @returns
      */
-    hasPedGotWeaponComponent(componentHash: string | number, weaponHash: eWeaponHash): any;
+    hasPedGotWeaponComponent(componentHash: string | number, weaponHash: eWeaponHash): any;
+    /**
+     * @param weaponHash Refer to [enum: eWeaponHash]
+     * @param amount The amount of ped to add to the ammo
+     * @param addReason Refer to [enum: eAddItemReason]
+     */
+    addAmmoToPed(weaponHash: eWeaponHash, amount: number, addReason: eAddItemReason): void;
+    /**
+     * @param ammoType
+     * @param amount
+     * @param addReason Refer to [enum: eAddItemReason]
+     */
+    addAmmoToPedByType(ammoType: string | number, amount: number, addReason: eAddItemReason): void;
+    /**
+     * @param targetPed
+     * @returns
+     */
+    isTargetPedConstrainedByPedUsingBolas(targetPed: Ped): boolean;
+    /**
+     * @param p1
+     * @returns guidPrimary
+     */
+    getBestPedWeaponInInventory(p1: any): [any, number];
+    /**
+     * @param toggle
+     */
+    set AllowAnyWeaponDrop(toggle: boolean);
+    /**
+     * @returns
+     */
+    makePedReload(): any;
+    /**
+     * @param weaponHash Refer to [enum: eWeaponHash]
+     * @param ammoCount
+     * @param p3
+     * @param addReason Refer to [enum: eAddItemReason]
+     */
+    giveDelayedWeaponToPed(weaponHash: eWeaponHash, ammoCount: number, p3: boolean, addReason: eAddItemReason): void;
+    /**
+     * @param toggle
+     */
+    N_0x45E57FDD531C9477(toggle: boolean): void;
+    /**
+     * @param ammoHash Refer to [enum: eAmmoType]
+     * @returns weaponInventoryUid
+     */
+    setAmmoTypeForPedWeaponInventory(ammoHash: eAmmoType): number;
+    /**
+     * @param weaponHash Refer to [enum: eWeaponHash]
+     * @param p2
+     * @param removeReason Refer to [enum: eRemoveItemReason]
+     */
+    removeWeaponFromPed(weaponHash: eWeaponHash, p2: boolean, removeReason: eRemoveItemReason): void;
+    /**
+     * @returns
+     */
+    get IsPedWeaponReadyToShoot(): boolean;
+    /**
+     * @param componentHash
+     * @param weaponHash Refer to [enum: eWeaponHash]
+     */
+    removeWeaponComponentFromPed(componentHash: string | number, weaponHash: eWeaponHash): void;
+    /**
+     * @param visible
+     * @param deselectWeapon
+     * @param p3
+     * @param p4
+     */
+    setPedCurrentWeaponVisible(visible: boolean, deselectWeapon: boolean, p3: boolean, p4: boolean): void;
+    /**
+     * Old name: _DROP_CURRENT_PED_WEAPON
+     *
+     * @param p1
+     * @param attachPoint Refer to [enum: eWeaponAttachPoint]
+     * @param p3
+     * @param p4
+     * @returns
+     */
+    makePedDropWeapon(p1: boolean, attachPoint: number, p3: boolean, p4: boolean): Entity | null;
+    removeAllPedAmmo(): void;
+    /**
+     * @param allow
+     */
+    set AllowDualWield(allow: boolean);
+    /**
+     * 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
+     */
+    getWeaponEmoteVariation(variation: number): number;
     /**
      * @param weaponHash Refer to [enum: eWeaponHash]
-     * @param amount The amount of ped to add to the ammo
-     * @param addReason Refer to [enum: eAddItemReason]
-     */
-    addAmmoToPed(weaponHash: eWeaponHash, amount: number, addReason: eAddItemReason): void;
-    /**
-     * @param ammoType
-     * @param amount
-     * @param addReason Refer to [enum: eAddItemReason]
+     * @returns
      */
-    addAmmoToPedByType(ammoType: string | number, amount: number, addReason: eAddItemReason): void;
+    isPedCarryingWeapon(weaponHash: eWeaponHash): boolean;
     /**
-     * @param targetPed
      * @returns
      */
-    isTargetPedConstrainedByPedUsingBolas(targetPed: Ped): boolean;
+    refillAmmoInCurrentPedWeapon(): any;
     /**
-     * @param p1
-     * @returns guidPrimary
+     * 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 p0
+     * @param immediately
      */
-    getBestPedWeaponInInventory(p1: any): [any, number];
+    hidePedWeapons(p0: number, immediately: boolean): void;
     /**
      * @param toggle
      */
@@ -438,7 +421,7 @@ export declare class Weapon {
     /**
      * @returns ammo; inventoryUid
      */
-    getAmmoInClipByInventoryUid(): [any, number, number];
+    get AmmoInClipByInventoryUid(): [any, number, number];
     /**
      * removeReason must be REMOVE_REASON_USED, REMOVE_REASON_GIVEN, REMOVE_REASON_DROPPED or REMOVE_REASON_DEBUG, unless amount is -1
      *
@@ -452,7 +435,7 @@ export declare class Weapon {
      *
      * @param disableAnim
      */
-    setPedWeaponOnBack(disableAnim: boolean): void;
+    set PedWeaponOnBack(disableAnim: boolean);
     /**
      * @param ammoType
      * @param ammo
@@ -466,188 +449,149 @@ export declare class Weapon {
     /**
      * @param attachPoint Refer to [enum: eWeaponAttachPoint]
      */
-    setForceCurrentWeaponIntoCockedState(attachPoint: number): void;
+    set ForceCurrentWeaponIntoCockedState(attachPoint: number);
     /**
-     * @returns
+     * @param weaponHash Refer to [enum: eWeaponHash]
+     * @returns ammo
      */
-    enableWeaponRestore(): any;
+    getAmmoInClip(weaponHash: eWeaponHash): [boolean, number];
     /**
-     * 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 toggle
      */
-    isPedHoldingWeapon(weapon: string | number): boolean;
+    N_0x16D9841A85FA627E(toggle: boolean): void;
     /**
-     * _GET_D* - _GET_L*
-     *
-     * @returns
+     * @param weaponHash Refer to [enum: eWeaponHash]
+     * @param offset
+     * @param ammoCount
      */
-    N_0x0DE0944ECCB3DF5D(): boolean;
+    setPedDropsInventoryWeapon(weaponHash: eWeaponHash, offset: Vector3, ammoCount: number): void;
     /**
-     * @param flags
-     * @returns
+     * spinHash can be -1, 0 to disable
+     *
+     * @param weaponEmoteTrickType
+     * @param spin
      */
-    isPedArmed(flags: number): any;
+    setActiveGunSpinningKitEmoteTwirl(weaponEmoteTrickType: number, spin: string | number): void;
     /**
-     * Returns whether the ped has a sniper p1: 0 or 1
+     * 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 p1
-     * @returns
+     * @param weaponHash Refer to [enum: eWeaponHash]
      */
-    doesPedHaveSniper(p1: number): any;
+    sendWeaponToInventory(weaponHash: eWeaponHash): void;
     /**
-     * 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.
+     * If near your horse when called, weapons stored on your horse will be considered
+     * Returns weaponHash
      *
+     * @param weaponGroup
+     * @param p2
+     * @param p3
      * @returns
      */
-    getDefaultUnarmedWeaponHash(): number;
+    getBestPedWeaponInGroup(weaponGroup: string | number, p2: boolean, p3: boolean): number;
     /**
-     * @param weaponHash Refer to [enum: eWeaponHash]
+     * Only used in R* SP Scripts native_son2, native_son3 and smuggler2
+     * Params: p2 = -1
+     *
+     * @param p1
      * @param p2
-     * @returns
      */
-    getMaxAmmoInClip(weaponHash: eWeaponHash, p2: boolean): number;
+    N_0x8A779706DA5CA3DD(p1: boolean, p2: number): void;
     /**
-     * @param attachPoint Refer to [enum: eWeaponAttachPoint]
-     * @returns Returns the weapon entity
+     * @param weaponHash Refer to [enum: eWeaponHash]
+     * @param ammoHash Refer to [enum: eAmmoType]
      */
-    getCurrentPedWeaponEntityIndex(attachPoint: number): Entity | null;
+    disableAmmoTypeForPedWeapon(weaponHash: eWeaponHash, ammoHash: eAmmoType): void;
     /**
-     * @param ammoType
-     * @returns
+     * @returns data; outData
      */
-    getPedAmmoByType(ammoType: string | number): number;
+    giveWeaponToPedWithOptions(): [boolean, number, number];
     /**
-     * @param p1
-     * @param p2
      * @returns
      */
-    getBestPedWeapon(p1: boolean, p2: boolean): number;
-    /**
-     * @param toggle
-     * @param weaponHash Refer to [enum: eWeaponHash]
-     */
-    setPedInfiniteAmmo(toggle: boolean, weaponHash: eWeaponHash): void;
+    get MaxLockonDistanceOfCurrentPedWeapon(): number;
     /**
-     * @param weaponHash Refer to [enum: eWeaponHash]
      * @param ammoHash Refer to [enum: eAmmoType]
      */
-    setAmmoTypeForPedWeapon(weaponHash: eWeaponHash, ammoHash: eAmmoType): void;
+    disableAmmoTypeForPed(ammoHash: eAmmoType): void;
     /**
-     * *GET_BEST** - *GET_CLOSEST**
+     * Returns whether the ped has a shotgun p1: 0 or 1
      *
-     * @returns weaponGuid
-     */
-    getCorrectKitEmoteTwirlGun(): [boolean, number];
-    /**
-     * @param weaponHash Refer to [enum: eWeaponHash]
+     * @param p1
      * @returns
      */
-    setCurrentPedVehicleWeapon(weaponHash: eWeaponHash): boolean;
+    doesPedHaveShotgun(p1: number): any;
+    clearPedLastWeaponDamage(): void;
     /**
-     * Returns whether the ped has a rifle p1: 0 or 1
+     * Returns true if ped is on a horse while inside of a town
+     * Params: p1 = 0
+     * GET_L* - GET_MA*
      *
      * @param p1
      * @returns
      */
-    doesPedHaveRifle(p1: number): any;
+    N_0x5A695BD328586B44(p1: number): any;
     /**
-     * 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
-     */
-    N_0x14FF0C2545527F9B(weaponHash: eWeaponHash, ped: Ped): void;
-    /**
-     * Returns iSpinHash / iVariationSpin
-     *
-     * @param weaponEmoteVariation
-     * @returns
+     * @param amount
+     * @param removeReason Refer to [enum: eRemoveItemReason]
      */
-    getPedGunSpinningHashFromWeaponEmoteVariation(weaponEmoteVariation: number): number;
+    removeAmmoFromPed(weaponHash: eWeaponHash, amount: number, removeReason: eRemoveItemReason): void;
     /**
-     * Returns whether the ped has a repeater p1: 0 or 1
-     *
      * @param p1
-     * @returns
-     */
-    doesPedHaveRepeater(p1: number): any;
-    /**
-     * @param weaponCollection
+     * @param p2
      */
-    giveWeaponCollectionToPed(weaponCollection: string | number): void;
+    setPedAmmoToDrop(p1: number, p2: number): void;
     /**
+     * Returns the current ammo type of the specified ped's specified weapon.
+     *
+     * @param weaponHash Refer to [enum: eWeaponHash]
      * @returns
      */
-    isPedWeaponReadyToShoot(): boolean;
+    getPedAmmoTypeFromWeapon(weaponHash: eWeaponHash): number;
     /**
-     * @param componentHash
      * @param weaponHash Refer to [enum: eWeaponHash]
+     * @returns ammo
      */
-    removeWeaponComponentFromPed(componentHash: string | number, weaponHash: eWeaponHash): void;
+    getMaxAmmo(weaponHash: eWeaponHash): [boolean, number];
     /**
-     * @param visible
-     * @param deselectWeapon
-     * @param p3
-     * @param p4
+     * Returns ammoHash from weaponObject (Returned by 0x6CA484C9A7377E4F)
+     *
+     * @param weaponObject
+     * @returns
      */
-    setPedCurrentWeaponVisible(visible: boolean, deselectWeapon: boolean, p3: boolean, p4: boolean): void;
+    getCurrentPedWeaponAmmoType(weaponObject: Prop): number;
     /**
-     * Old name: _DROP_CURRENT_PED_WEAPON
-     *
      * @param p1
-     * @param attachPoint Refer to [enum: eWeaponAttachPoint]
+     * @param p2
      * @param p3
-     * @param p4
      * @returns
      */
-    makePedDropWeapon(p1: boolean, attachPoint: number, p3: boolean, p4: boolean): Entity | null;
-    removeAllPedAmmo(): void;
+    getPedWorstWeapon(p1: boolean, p2: boolean, p3: boolean): number;
     /**
-     * @param allow
+     * @param toggle
      */
-    setAllowDualWield(allow: boolean): void;
+    set PedDropsWeaponsWhenDead(toggle: boolean);
     /**
-     * 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
+     * Returns ammoHash
      *
-     * @param variation
-     * @returns
-     */
-    getWeaponEmoteVariation(variation: number): number;
-    /**
-     * @param weaponHash Refer to [enum: eWeaponHash]
-     * @returns
+     * @returns Returns the [enum: eAmmoType]; weaponGuid
      */
-    isPedCarryingWeapon(weaponHash: eWeaponHash): any;
+    get CurrentAmmoTypeFromGuid(): [number, number];
     /**
-     * @returns
+     * @param toggle
      */
-    refillAmmoInCurrentPedWeapon(): any;
+    set PedInfiniteAmmoClip(toggle: boolean);
     /**
-     * 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
+     * returns the amount of peds that were restrained with the weapon thrown bolas
      *
-     * @param p0
-     * @param immediately
+     * @returns
      */
-    hidePedWeapons(p0: number, immediately: boolean): void;
+    get NumPedsRestrainedFromWeaponBolas(): any;
     /**
      * @returns
      */
-    getPedHogtieWeapon(): number;
+    get PedHogtieWeapon(): number;
     /**
      * Returns whether the ped has a pistol p1: 0 or 1
      *
@@ -660,11 +604,11 @@ export declare class Weapon {
      *
      * @param emoteType
      */
-    setGunSpinningInventorySlotIdActivate(emoteType: number): void;
+    set GunSpinningInventorySlotIdActivate(emoteType: number);
     /**
      * @returns weaponHash: Refer to [enum: eWeaponHash]
      */
-    getCurrentPedVehicleWeapon(): [boolean, number];
+    get CurrentPedVehicleWeapon(): [boolean, number];
     /**
      * @param attachPoint Refer to [enum: eWeaponAttachPoint]
      * @param visible
@@ -686,5 +630,61 @@ export declare class Weapon {
      * @returns
      */
     hasPedGotWeapon(weaponHash: eWeaponHash, p2: number, onlyCheckPlayerInventory: boolean): boolean;
+    /**
+     * @returns
+     */
+    get AllowDualWield(): any;
+    /**
+     * Returns eCurrentHeldWeapon
+     * _GET_R* - _GET_T*
+     *
+     * @returns
+     */
+    get PedCurrentHeldWeapon(): number;
+    /**
+     * @param toggle
+     */
+    set ForceAutoEquip(toggle: boolean);
+    /**
+     * @param weaponHash Refer to [enum: eWeaponHash]
+     * @param ammo
+     */
+    setPedAmmo(weaponHash: eWeaponHash, ammo: number): void;
+    /**
+     * 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: eWeaponHash, ammoCount: number, bForceInHand: boolean, bForceInHolster: boolean, attachPoint: number, bAllowMultipleCopies: boolean, p7: number, p8: number, addReason: eAddItemReason, bIgnoreUnlocks: boolean, permanentDegradation: number, p12: boolean): number;
+    /**
+     * @param weaponHash Refer to [enum: eWeaponHash]
+     * @returns
+     */
+    getAmmoInPedWeapon(weaponHash: eWeaponHash): number;
+    /**
+     * @param attachPoint Refer to [enum: eWeaponAttachPoint]
+     * @returns weaponGuid
+     */
+    getPedWeaponGuidAtAttachPoint(attachPoint: number): [any, number];
+    /**
+     * 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);
 }
 //# sourceMappingURL=Weapon.d.ts.map