Merge pull request #80 from shr0x/main

General updates & fixes

packages/client/game/object.d.ts

@@ -258,10 +258,14 @@ declare interface GameObject extends GameObjectLegacy {
  * [Number model, Vector3 position, Vector3 rotation, Number distanceSquared(if includeDistance is set to true)]
  * [RAGE:MP Wiki article](https://wiki.rage.mp/index.php?title=Object::getAllInRange)
  */
- getAllInRange(position: Vector3, range?: number, includeDistance?: boolean, sortByDistance?: boolean) : [number, Vector3, Vector3, number?][] | undefined;
+ getAllInRange(position: Vector3, range?: number, includeDistance?: boolean, sortByDistance?: boolean): [number, Vector3, Vector3, number?][] | undefined;
  getAllByHash(hash: number): Vector3[];
-
+ setForceVehiclesToAvoid(object: Handle, enable: boolean): void;
+ doorSystemGetAutomaticDistance(doorHash: Handle): number;
+ clearObjectsInsideGarage(garage: Handle, vehicles: boolean, peds: boolean, objects: boolean, broadcast?: boolean): void;
+ createNonNetworkedAmbientPickup(type: number, x: number, y: number, z: number, flags?: number, amount?: number, customModel?: number, scriptedObject?: boolean, hostObject?: boolean): Handle;
+ createNonNetworkedPortablePickup(type: number, x: number, y: number, z: number, snaptoGround?: boolean, customModel?: number): Handle;
  unk: GameObjectUnk;
 }
 
-declare interface GameObjectMp extends GameObject {}
+declare interface GameObjectMp extends GameObject { }

packages/client/index.d.ts

@@ -1164,7 +1164,7 @@ declare interface IClientEvents {
  boneIndex: number,
  damage: number
  ) => void;
- playerStartEnterVehicle: (vehicle: VehicleMp, seat: number) => void;
+ // playerStartEnterVehicle: (vehicle: VehicleMp, seat: number) => void;
  playerEnterVehicle: (vehicle: VehicleMp, seat: number) => void;
  playerLeaveVehicle: (vehicle: VehicleMp, seat: number) => void;
  playerStartTalking: (player: PlayerMp) => void;
@@ -1253,8 +1253,8 @@ declare interface EventMpPool {
  callRemoteProc<T = any>(procName: string, ...args: any[]): Promise<T>;
 
  callRemoteUnreliable(eventName: string, ...args: any[]): void;
- cancelPendingRpc(procName?: string): void;
- hasPendingRpc(procName?: string): boolean;
+ cancelPendingProc(procName?: string): void;
+ hasPendingProc(procName?: string): boolean;
 
  /**
  * Removes the specified event from events tree.
@@ -1664,13 +1664,18 @@ declare interface PedMpBase extends EntityMp {
  registerTarget(target: Handle): void;
  removeDefensiveArea(toggle: boolean): void;
  removeFromGroup(): void;
- removeHelmet(p2: boolean): void;
+ /**
+ * Removes helmet from player
+ * @param forceRemove whether to force remove it or not
+ * @returns void
+ */
+ removeHelmet(forceRemove: boolean): void;
  removePreferredCoverSet(): void;
  removeWeapon(weapon: RageEnums.Hashes.Weapon | Hash): void;
  removeAllWeapons(): void;
  resetInVehicleContext(): void;
  resetLastVehicle(): void;
- resetMovementClipset(p1: number): void;
+ resetMovementClipset(blendDuration: number): void;
  resetRagdollTimer(): void;
  resetStrafeClipset(): void;
  resetVisibleDamage(): void;
@@ -1689,11 +1694,11 @@ declare interface PedMpBase extends EntityMp {
  setAsEnemy(toggle: boolean): void;
  setAsGroupLeader(groupId: number): void;
  setAsGroupMember(groupId: number): void;
- setBlendFromParents(p1: any, p2: any, p3: number, p4: number): void;
+ setBlendFromParents(firstPed: Handle, secondPed: Handle, blend: number, texBlend: number): void;
  setBlockingOfNonTemporaryEvents(toggle: boolean): void;
- setBoundsOrientation(p1: number, p2: number, p3: number, p4: number, p5: number): void;
+ setBoundsOrientation(pitch: number, heading: number, x: number, y: number, z: number): void;
  setCanArmIk(toggle: boolean): void;
- setCanAttackFriendly(toggle: boolean, p2: boolean): void;
+ setCanAttackFriendly(toggle: boolean, lockOnState: boolean): void;
  setCanBeDraggedOut(toggle: boolean): void;
  setCanBeKnockedOffVehicle(state: number): void;
  setCanBeShotInVehicle(toggle: boolean): void;
@@ -1714,15 +1719,15 @@ declare interface PedMpBase extends EntityMp {
  setCanPlayVisemeAnims(p1: boolean, p2: boolean): void;
  setCanRagdoll(toggle: boolean): void;
  setCanRagdollFromPlayerImpact(toggle: boolean): void;
- setCanSmashGlass(p1: boolean, p2: boolean): void;
+ setCanSmashGlass(glassRagdoll: boolean, glassWeapon: boolean): void;
  setCanSwitchWeapon(toggle: boolean): void;
  setCanTeleportToGroupLeader(groupHandle: number, toggle: boolean): void;
  setCanTorsoIk(toggle: boolean): void;
  setCanUseAutoConversationLookat(toggle: boolean): void;
  setCapsule(value: number): void;
  setCombatAbility(p1: number): void;
  setCombatAttributes(attributeIndex: number, enabled: boolean): void;
- setCombatFloat(combatType: number, p2: number): void;
+ setCombatFloat(combatType: number, attribute: number): void;
  setCombatMovement(combatMovement: number): void;
  setCombatRange(p1: number): void;
  setComponentVariation(componentId: number, drawableId: number, textureId: number, paletteId: number): void;
@@ -1734,15 +1739,15 @@ declare interface PedMpBase extends EntityMp {
  setDefaultComponentVariation(): void;
  setDefensiveAreaAttachedToPed(
  attachPed: Handle,
- p2: number,
- p3: number,
- p4: number,
- p5: number,
- p6: number,
- p7: number,
- p8: number,
- p9: boolean,
- p10: boolean
+ x1: number,
+ y1: number,
+ z1: number,
+ x2: number,
+ y2: number,
+ z2: number,
+ width: number,
+ orientate: boolean,
+ applyToSecondaryDefensiveArea: boolean
  ): void;
  setDefensiveAreaDirection(p1: number, p2: number, p3: number, p4: boolean): void;
  setDefensiveSphereAttachedToPed(p1: any, p2: number, p3: number, p4: number, p5: number, p6: boolean): void;

packages/server/index.d.ts

@@ -578,7 +578,7 @@ declare class PlayerMp extends EntityMp {
  /**
  * TODO: docs
  */
- public cancelPendingRpc(procName?: string): void;
+ public cancelPendingProc(procName?: string): void;
 
  /**
  * TODO: docs
@@ -678,7 +678,7 @@ declare class PlayerMp extends EntityMp {
  /**
  * TODO: docs
  */
- public hasPendingRpc(procName?: string): boolean;
+ public hasPendingProc(procName?: string): boolean;
 
  /**
  * Used for check, player is located in stream distance for another player or not.