@nativewrappers/fivem 0.0.109 → 0.0.111

package/NetworkedScene.d.ts

@@ -1,11 +1,17 @@
 import type { Vector3 } from "./common/utils/Vector";
 import type { BaseEntity } from "./models/BaseEntity";
 import type { Ped } from "./models/Ped";
+import { SyncedSceneFlags } from "./enums/SyncedSceneFlags";
+import type { EntityBone } from "./models/EntityBone";
 export declare class NetworkedScene {
     private scene;
-    constructor(pos: Vector3, rot: Vector3, rotationOrder: number, holdLastFrame: boolean, looped: boolean, sceneHash: number, animTime: number, animSpeed: number);
-    addPed(ped: Ped, animDict: string, animName: string, blendInSpeed: number, blendOutSpeed: number, duration: number, flag: number, playbackRate: number, p9: number): void;
-    addEntity(entity: BaseEntity, animDict: string, animName: string, speed: number, speedMultiplier: number, flag: number): void;
+    static set AllowRemoveSyncedScenes(allow: boolean);
+    constructor(pos: Vector3, rot: Vector3, rotationOrder?: number, holdLastFrame?: boolean, looped?: boolean, phaseToStopScene?: number, phaseToStartScene?: number, animSpeed?: number);
+    addPed(ped: Ped, animDict: string, animName: string, blendInSpeed?: number, blendOutSpeed?: number, syncedSceneFlags?: SyncedSceneFlags, ragdollBlockingFlags?: number, moverBlendInData?: number, ikFlags?: number): void;
+    addEntity(entity: BaseEntity, animDict: string, animName: string, blendInSpeed?: number, blendOutSpeed?: number, syncedSceneFlags?: SyncedSceneFlags): void;
+    forceLocalUseOfSyncedSceneCamera(): void;
+    attachSceneToEntityBone(entity: BaseEntity, bone: EntityBone): void;
+    get LocalScene(): number;
     start(): void;
     stop(): void;
 }

package/NetworkedScene.js

@@ -1,11 +1,20 @@
 var __defProp = Object.defineProperty;
 var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
+import { SyncedSceneFlags } from "./enums/SyncedSceneFlags";
 class NetworkedScene {
   static {
     __name(this, "NetworkedScene");
   }
   scene;
-  constructor(pos, rot, rotationOrder, holdLastFrame, looped, sceneHash, animTime, animSpeed) {
+  /*
+    * Allows the current client to receive removed synced scene requests
+    * WARNING: This is unsecure, you shouldn't leave this set to true,
+    * you should disable this as fast as soon as possible to mitigate any possible exploits.
+  */
+  static set AllowRemoveSyncedScenes(allow) {
+    Citizen.invokeNative("0x144DA052257AE7D8", allow);
+  }
+  constructor(pos, rot, rotationOrder = 2, holdLastFrame = false, looped = false, phaseToStopScene = 1, phaseToStartScene = 0, animSpeed = 1) {
     this.scene = NetworkCreateSynchronisedScene(
       pos.x,
       pos.y,
@@ -16,12 +25,12 @@ class NetworkedScene {
       rotationOrder,
       holdLastFrame,
       looped,
-      sceneHash,
-      animTime + 0,
+      phaseToStopScene,
+      phaseToStartScene + 0,
       animSpeed + 0
     );
   }
-  addPed(ped, animDict, animName, blendInSpeed, blendOutSpeed, duration, flag, playbackRate, p9) {
+  addPed(ped, animDict, animName, blendInSpeed = 8, blendOutSpeed = -8, syncedSceneFlags = SyncedSceneFlags.None, ragdollBlockingFlags = 0, moverBlendInData = 1e3, ikFlags = 0) {
     NetworkAddPedToSynchronisedScene(
       ped.Handle,
       this.scene,
@@ -29,14 +38,23 @@ class NetworkedScene {
       animName,
       blendInSpeed,
       blendOutSpeed,
-      duration,
-      flag,
-      playbackRate,
-      p9
+      syncedSceneFlags,
+      ragdollBlockingFlags,
+      moverBlendInData,
+      ikFlags
     );
   }
-  addEntity(entity, animDict, animName, speed, speedMultiplier, flag) {
-    NetworkAddEntityToSynchronisedScene(entity.Handle, this.scene, animDict, animName, speed, speedMultiplier, flag);
+  addEntity(entity, animDict, animName, blendInSpeed = 8, blendOutSpeed = -8, syncedSceneFlags = SyncedSceneFlags.None) {
+    NetworkAddEntityToSynchronisedScene(entity.Handle, this.scene, animDict, animName, blendInSpeed, blendOutSpeed, syncedSceneFlags);
+  }
+  forceLocalUseOfSyncedSceneCamera() {
+    NetworkForceLocalUseOfSyncedSceneCamera(this.scene);
+  }
+  attachSceneToEntityBone(entity, bone) {
+    NetworkAttachSynchronisedSceneToEntity(this.scene, entity.Handle, bone.Index);
+  }
+  get LocalScene() {
+    return NetworkGetLocalSceneFromNetworkId(this.scene);
   }
   start() {
     NetworkStartSynchronisedScene(this.scene);

package/World.d.ts

@@ -426,7 +426,7 @@ export declare abstract class World {
      * Gets the cloest [[`Vehicle`]] to the current coords, or null if none are found
      * @returns the closest vehicle or null
      */
-    static getClosestVehicle(coords: Vector3): Vehicle | null;
+    static getClosestVehicle(coords: Vector3, startingDistance?: number): Vehicle | null;
     /**
      * Get all [[`Pickup`]] entities using the GetGamePool.
      * @returns Array of Pickups.

package/World.js

@@ -874,10 +874,10 @@ class World {
    * Gets the cloest [[`Vehicle`]] to the current coords, or null if none are found
    * @returns the closest vehicle or null
    */
-  static getClosestVehicle(coords) {
+  static getClosestVehicle(coords, startingDistance = 9999) {
     const vehicles = this.getAllVehicles();
     let currentVeh = null;
-    let lastDistance = 9999;
+    let lastDistance = startingDistance;
     for (const vehicle of vehicles) {
       if (!currentVeh) {
         currentVeh = vehicle;

package/enums/SyncedSceneFlags.d.ts

@@ -0,0 +1,21 @@
+export declare enum SyncedSceneFlags {
+    None = 0,
+    UsePhysics = 1,
+    TagSyncOut = 2,
+    DontInterrupt = 4,
+    OnAbortStopScene = 8,
+    AbortOnWeaponDamage = 16,
+    BlockMoverUpdate = 32,
+    LoopWithinScene = 64,
+    PreserveVelocity = 128,
+    ExpandPedCapsuleFromSkeleton = 256,
+    ActivateRagdollOnCollision = 512,
+    HideWeapon = 1024,
+    AbortOnDeath = 2048,
+    VehicleAbortOnLargeImppapct = 4096,
+    VehicleAllowPlayerEntry = 8192,
+    ProcessAttachmentOnStart = 16384,
+    NetOnEarlyNoPedStopReturnToStart = 32768,
+    SetPedOutOfVehicleAtStart = 65536,
+    NetDisregardAttachmentChecks = 131072
+}

package/enums/SyncedSceneFlags.js

@@ -0,0 +1,25 @@
+var SyncedSceneFlags = /* @__PURE__ */ ((SyncedSceneFlags2) => {
+  SyncedSceneFlags2[SyncedSceneFlags2["None"] = 0] = "None";
+  SyncedSceneFlags2[SyncedSceneFlags2["UsePhysics"] = 1] = "UsePhysics";
+  SyncedSceneFlags2[SyncedSceneFlags2["TagSyncOut"] = 2] = "TagSyncOut";
+  SyncedSceneFlags2[SyncedSceneFlags2["DontInterrupt"] = 4] = "DontInterrupt";
+  SyncedSceneFlags2[SyncedSceneFlags2["OnAbortStopScene"] = 8] = "OnAbortStopScene";
+  SyncedSceneFlags2[SyncedSceneFlags2["AbortOnWeaponDamage"] = 16] = "AbortOnWeaponDamage";
+  SyncedSceneFlags2[SyncedSceneFlags2["BlockMoverUpdate"] = 32] = "BlockMoverUpdate";
+  SyncedSceneFlags2[SyncedSceneFlags2["LoopWithinScene"] = 64] = "LoopWithinScene";
+  SyncedSceneFlags2[SyncedSceneFlags2["PreserveVelocity"] = 128] = "PreserveVelocity";
+  SyncedSceneFlags2[SyncedSceneFlags2["ExpandPedCapsuleFromSkeleton"] = 256] = "ExpandPedCapsuleFromSkeleton";
+  SyncedSceneFlags2[SyncedSceneFlags2["ActivateRagdollOnCollision"] = 512] = "ActivateRagdollOnCollision";
+  SyncedSceneFlags2[SyncedSceneFlags2["HideWeapon"] = 1024] = "HideWeapon";
+  SyncedSceneFlags2[SyncedSceneFlags2["AbortOnDeath"] = 2048] = "AbortOnDeath";
+  SyncedSceneFlags2[SyncedSceneFlags2["VehicleAbortOnLargeImppapct"] = 4096] = "VehicleAbortOnLargeImppapct";
+  SyncedSceneFlags2[SyncedSceneFlags2["VehicleAllowPlayerEntry"] = 8192] = "VehicleAllowPlayerEntry";
+  SyncedSceneFlags2[SyncedSceneFlags2["ProcessAttachmentOnStart"] = 16384] = "ProcessAttachmentOnStart";
+  SyncedSceneFlags2[SyncedSceneFlags2["NetOnEarlyNoPedStopReturnToStart"] = 32768] = "NetOnEarlyNoPedStopReturnToStart";
+  SyncedSceneFlags2[SyncedSceneFlags2["SetPedOutOfVehicleAtStart"] = 65536] = "SetPedOutOfVehicleAtStart";
+  SyncedSceneFlags2[SyncedSceneFlags2["NetDisregardAttachmentChecks"] = 131072] = "NetDisregardAttachmentChecks";
+  return SyncedSceneFlags2;
+})(SyncedSceneFlags || {});
+export {
+  SyncedSceneFlags
+};

package/index.d.ts

@@ -143,6 +143,7 @@ export * from "./enums/Relationship";
 export * from "./enums/RopeType";
 export * from "./enums/ScreenEffect";
 export * from "./enums/SpeechModifier";
+export * from "./enums/SyncedSceneFlags";
 export * from "./enums/Vehicle";
 export * from "./enums/Weather";
 export * from "./enums/ZoneID";

package/index.js

@@ -143,6 +143,7 @@ export * from "./enums/Relationship";
 export * from "./enums/RopeType";
 export * from "./enums/ScreenEffect";
 export * from "./enums/SpeechModifier";
+export * from "./enums/SyncedSceneFlags";
 export * from "./enums/Vehicle";
 export * from "./enums/Weather";
 export * from "./enums/ZoneID";

package/models/Ped.d.ts

@@ -25,7 +25,7 @@ export declare class Ped extends BaseEntity {
     private static readonly speechModifierNames;
     private tasks;
     constructor(handle: number);
-    get Player(): Player;
+    get Player(): Player | null;
     get Money(): number;
     set Money(amount: number);
     get Gender(): Gender;

package/models/Ped.js

@@ -79,7 +79,11 @@ class Ped extends BaseEntity {
     super(handle);
   }
   get Player() {
-    return new Player(NetworkGetPlayerIndexFromPed(this.handle));
+    const playerIndex = NetworkGetPlayerIndexFromPed(this.handle);
+    if (playerIndex === -1) {
+      return null;
+    }
+    return new Player(playerIndex);
   }
   get Money() {
     return GetPedMoney(this.handle);

package/package.json

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