feat(core): applyAnimation speed, time params, export animateUtils

dockfries · Jul 6, 2024 · 00ca113 · 00ca113
1 parent 1cbd44b
commit 00ca113
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/packages/core/src/controllers/player/entity.ts b/packages/core/src/controllers/player/entity.ts
@@ -21,7 +21,7 @@ import {
 
 import type { IClientResRaw } from "../../interfaces";
 import type { TPos } from "../../types";
-import { getAnimateDurationByLibName } from "../../utils/animateUtils";
+import { isValidAnimateName } from "../../utils/animateUtils";
 import * as h from "../../utils/helperUtils";
 import { logger } from "../../logger";
 
@@ -548,25 +548,26 @@ export class Player {
   applyAnimation(
     animLib: string,
     animName: string,
+    speed = 4.1,
     loop = false,
     lockX = true,
     lockY = true,
     freeze = false,
+    time = 0,
     forceSync: boolean | ForceSyncEnum = false,
   ): void {
-    const duration = getAnimateDurationByLibName(animLib, animName);
-    if (duration === undefined)
+    if (!isValidAnimateName(animLib, animName))
       return logger.error("[Player]: Invalid anim library or name");
     w.ApplyAnimation(
       this.id,
       animLib,
       animName,
-      4.1,
+      speed,
       loop,
       lockX,
       lockY,
       freeze,
-      loop ? 0 : duration,
+      time,
       +forceSync,
     );
   }

diff --git a/packages/core/src/main.ts b/packages/core/src/main.ts
@@ -6,3 +6,4 @@ export * from "./types";
 export * from "./enums";
 export { rgba } from "./utils/colorUtils";
 export * from "./utils/keyUtils";
+export * from "./utils/animateUtils";
diff --git a/packages/core/src/utils/animateUtils.ts b/packages/core/src/utils/animateUtils.ts
@@ -1,6 +1,6 @@
 import type { IAnimateInfo } from "core/interfaces";
 
-const animateLib = new Map<string, Array<IAnimateInfo>>([
+export const animateLib = new Map<string, Array<IAnimateInfo>>([
   ["AIRPORT", [{ n: "thrw_barl_thrw", d: 2.0 }]],
   [
     "Attractors",
@@ -2496,6 +2496,7 @@ export const isValidAnimateLib = (lib: string) => {
 export const isValidAnimateName = (lib: string, name: string) => {
   const animLib = isValidAnimateLib(lib);
   if (!animLib) return;
+  if (name === "null") return true;
   return animLib.some((anim) => anim.n === name);
 };