pma-locals 1.0.10 → 1.0.12

package/dist/index.d.mts

@@ -1,4 +1,4 @@
-import { AnimationFlags, Vector3 } from "@nativewrappers/redm";
+import { AnimationFlags } from "@nativewrappers/redm";
 
 //#region types/index.d.ts
 interface Animation {
@@ -16,15 +16,15 @@ interface Props {
 //#region client/ped-handler.d.ts
 interface PedConfig {
   modelName: string;
-  coords: Vector3;
+  coords: number[];
   heading: number;
   spawnDistance: number;
   collisions?: boolean;
   animation?: Animation;
   propData?: Props;
 }
-declare function registerPed(modelName: string, coords: Vector3, heading: number, spawnDistance?: number, collisions?: boolean, animation?: Animation, propData?: Props): void;
-declare function processSpawning(playerPos: Vector3): Promise<void>;
+declare function registerPed(modelName: string, coords: number[], heading: number, spawnDistance?: number, collisions?: boolean, animation?: Animation, propData?: Props): void;
+declare function processSpawning(playerPos: number[]): Promise<void>;
 declare function cleanupPeds(): void;
 //#endregion
 export { type Animation, type PedConfig, type Props, cleanupPeds, processSpawning, registerPed };

package/dist/index.mjs

@@ -1,5 +1,3 @@
-import { IkControlFlags, Model, createPed, createProp } from "@nativewrappers/redm";
-
 //#region client/ped-handler.ts
 const pedConfigs = [];
 const activePeds = /* @__PURE__ */ new Map();
@@ -15,12 +13,12 @@ function registerPed(modelName, coords, heading, spawnDistance = 100, collisions
 	});
 }
 function getConfigKey(config) {
-	return `${config.coords.x}_${config.coords.y}_${config.coords.z}`;
+	return `${config.coords[0]}_${config.coords[1]}_${config.coords[2]}`;
 }
 function isPlayerNearCoords(playerPos, targetPos, distance) {
-	const dx = playerPos.x - targetPos.x;
-	const dy = playerPos.y - targetPos.y;
-	const dz = playerPos.z - targetPos.z;
+	const dx = playerPos[0] - targetPos[0];
+	const dy = playerPos[1] - targetPos[1];
+	const dz = playerPos[2] - targetPos[2];
 	return Math.sqrt(dx * dx + dy * dy + dz * dz) <= distance;
 }
 async function processSpawning(playerPos) {
@@ -33,19 +31,26 @@ async function processSpawning(playerPos) {
 	}
 }
 async function spawnPed(config, key) {
-	const ped = await createPed(new Model(config.modelName), config.coords, 0, false, true);
+	const { dict, anim } = config.animation || {
+		dict: "",
+		anim: ""
+	};
+	const { model, offset, rotation, boneId } = config.propData || {};
+	const ped = CreatePed(GetHashKey(config.modelName), config.coords[0], config.coords[1], config.coords[2], config.heading, false, true, false, false);
 	if (!ped) return;
-	SetRandomOutfitVariation(ped.Handle, true);
-	ped.IsPositionFrozen = true;
-	SetEntityInvincible(ped.Handle, true);
-	if (config.collisions) SetEntityCollision(ped.Handle, false, false);
-	SetBlockingOfNonTemporaryEvents(ped.Handle, true);
-	if (config.heading) ped.Heading = config.heading;
-	if (config.animation) await ped.Tasks.playAnimation(config.animation.dict, config.animation.anim, 8, 8, -1, 1, config.animation.flag, IkControlFlags.BlockNonAnimSceneLooks);
+	SetRandomOutfitVariation(ped, true);
+	SetEntityInvincible(ped, true);
+	if (config.collisions) SetEntityCollision(ped, false, false);
+	SetBlockingOfNonTemporaryEvents(ped, true);
+	if (config.animation) {
+		RequestAnimDict(dict);
+		while (!HasAnimDictLoaded(dict)) await new Promise((resolve) => setTimeout(resolve, 0));
+		TaskPlayAnim(ped, dict, anim, 1, -1, 1, 0, 0, false, false, false);
+	}
 	let prop = null;
 	if (config.propData) {
-		prop = await createProp(new Model(config.propData.model), ped.Position, 0, false, true);
-		if (prop) AttachEntityToEntity(prop.Handle, ped.Handle, config.propData.boneId, config.propData.offset[0], config.propData.offset[1], config.propData.offset[2], config.propData.rotation[0], config.propData.rotation[1], config.propData.rotation[2], true, false, false, true, 1, true);
+		prop = CreateObjectNoOffset(GetHashKey(config.propData.model), ped.Position[0], ped.Position[1], ped.Position[2], false, true, true);
+		if (prop && boneId && offset && rotation) AttachEntityToEntity(prop, ped, boneId, offset[0], offset[1], offset[2], rotation[0], rotation[1], rotation[2], true, false, false, true, 1, true);
 	}
 	activePeds.set(key, {
 		ped,
@@ -56,14 +61,14 @@ async function spawnPed(config, key) {
 function despawnPed(key) {
 	const activePed = activePeds.get(key);
 	if (!activePed) return;
-	if (activePed.prop) activePed.prop.delete();
-	if (activePed.ped) activePed.ped.delete();
+	if (activePed.prop) DeleteEntity(activePed.prop);
+	if (activePed.ped) DeleteEntity(activePed.ped);
 	activePeds.delete(key);
 }
 function cleanupPeds() {
 	for (const [key, activePed] of activePeds) {
-		if (activePed.prop) activePed.prop.delete();
-		if (activePed.ped) activePed.ped.delete();
+		if (activePed.prop) DeleteEntity(activePed.prop);
+		if (activePed.ped) DeleteEntity(activePed.ped);
 		activePeds.delete(key);
 	}
 }

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "pma-locals",
-  "version": "1.0.10",
-  "description": "RedM ped spawning and management library with TypeScript support",
-  "main": "./dist/index.js",
-  "types": "./dist/index.d.ts",
+  "version": "1.0.12",
+  "description": "RedM/Fivem ped spawning and management library with TypeScript support",
+  "main": "./dist/index.mjs",
+  "types": "./dist/index.d.mts",
   "type": "module",
   "exports": {
     ".": {
-      "types": "./dist/index.d.ts",
-      "import": "./dist/index.js"
+      "types": "./dist/index.d.mts",
+      "import": "./dist/index.mjs"
     }
   },
   "files": [