From 985d8a50b1babcfd05e1df0a5bd6ad1c3383ac8d Mon Sep 17 00:00:00 2001 From: FutureStunt <55154397+FutureStunt@users.noreply.github.com> Date: Fri, 7 Nov 2025 06:18:15 -0600 Subject: [PATCH 1/2] add(ts): enums and types --- src/components/All.ts | 3 +- src/components/Class.ts | 39 ++-- src/components/Core.ts | 7 +- src/components/Dialog.ts | 5 +- src/components/NPC.ts | 79 +++---- src/components/Object.ts | 15 +- src/components/Player.ts | 105 ++++----- src/components/PlayerObject.ts | 15 +- src/components/PlayerTextDraw.ts | 9 +- src/components/RaceCheckpoint.ts | 5 +- src/components/Recording.ts | 5 +- src/components/TextDraw.ts | 9 +- src/components/Vehicle.ts | 35 +-- src/enums.ts | 373 +++++++++++++++++++++++++++++++ src/globals.ts | 105 ++++----- 15 files changed, 598 insertions(+), 211 deletions(-) create mode 100644 src/enums.ts diff --git a/src/components/All.ts b/src/components/All.ts index 251595b..ee65e82 100644 --- a/src/components/All.ts +++ b/src/components/All.ts @@ -1,5 +1,6 @@ import { Player } from "./index"; import { internal_omp } from "../globals"; +import { WEAPON } from "src/enums"; /** * All class @@ -46,7 +47,7 @@ export default class All { static sendDeathMessage( killer: Player, killee: Player, - weapon: number + weapon: WEAPON ): boolean { const result = internal_omp.All.SendDeathMessage( killer.getPtr(), diff --git a/src/components/Class.ts b/src/components/Class.ts index 44c1778..401b50f 100644 --- a/src/components/Class.ts +++ b/src/components/Class.ts @@ -1,3 +1,4 @@ +import { WEAPON } from "src/enums"; import { PTR, internal_omp } from "../globals"; /** @@ -28,11 +29,11 @@ export default class Class { * @param {number} y * @param {number} z * @param {number} angle - * @param {number} weapon1 + * @param {WEAPON} weapon1 * @param {number} ammo1 - * @param {number} weapon2 + * @param {WEAPON} weapon2 * @param {number} ammo2 - * @param {number} weapon3 + * @param {WEAPON} weapon3 * @param {number} ammo3 * @throws Will throw an error if the class creation fails */ @@ -43,11 +44,11 @@ export default class Class { y: number, z: number, angle: number, - weapon1: number, + weapon1: WEAPON, ammo1: number, - weapon2: number, + weapon2: WEAPON, ammo2: number, - weapon3: number, + weapon3: WEAPON, ammo3: number ); @@ -58,11 +59,11 @@ export default class Class { y?: number, z?: number, angle?: number, - weapon1?: number, + weapon1?: WEAPON, ammo1?: number, - weapon2?: number, + weapon2?: WEAPON, ammo2?: number, - weapon3?: number, + weapon3?: WEAPON, ammo3?: number ) { if (arguments.length < 2) { @@ -150,7 +151,7 @@ export default class Class { /** * @method getData - * @returns {{ret: boolean, teamid: number,skin: number,x: number,y: number,z: number,angle: number,weapon1: number,weapon1_ammo: number,weapon2: number,weapon2_ammo: number,weapon3: number,weapon3_ammo: number}} return object + * @returns {{ret: boolean, teamid: number,skin: number,x: number,y: number,z: number,angle: number,weapon1: WEAPON,weapon1_ammo: number,weapon2: WEAPON,weapon2_ammo: number,weapon3: WEAPON,weapon3_ammo: number}} return object * @throws Will throw an error if the class is invalid */ getData(): { @@ -161,11 +162,11 @@ export default class Class { y: number; z: number; angle: number; - weapon1: number; + weapon1: WEAPON; weapon1_ammo: number; - weapon2: number; + weapon2: WEAPON; weapon2_ammo: number; - weapon3: number; + weapon3: WEAPON; weapon3_ammo: number; } { if (!this.ptr) { @@ -184,11 +185,11 @@ export default class Class { * @param {number} y * @param {number} z * @param {number} angle - * @param {number} weapon1 + * @param {WEAPON} weapon1 * @param {number} ammo1 - * @param {number} weapon2 + * @param {WEAPON} weapon2 * @param {number} ammo2 - * @param {number} weapon3 + * @param {WEAPON} weapon3 * @param {number} ammo3 * @returns {boolean} * @throws Will throw an error if the class is invalid @@ -200,11 +201,11 @@ export default class Class { y: number, z: number, angle: number, - weapon1: number, + weapon1: WEAPON, ammo1: number, - weapon2: number, + weapon2: WEAPON, ammo2: number, - weapon3: number, + weapon3: WEAPON, ammo3: number ): boolean { if (!this.ptr) { diff --git a/src/components/Core.ts b/src/components/Core.ts index d35a56e..5fb7cca 100644 --- a/src/components/Core.ts +++ b/src/components/Core.ts @@ -1,3 +1,4 @@ +import { PLAYER_MARKERS_MODE, WEAPON } from "src/enums"; import { internal_omp } from "../globals"; /** @@ -299,10 +300,10 @@ export default class Core { /** * @method showPlayerMarkers - * @param {number} mode + * @param {PLAYER_MARKERS_MODE} mode * @returns {boolean} */ - static showPlayerMarkers(mode: number): boolean { + static showPlayerMarkers(mode: PLAYER_MARKERS_MODE): boolean { const result = internal_omp.Core.ShowPlayerMarkers(mode); return result.ret; } @@ -408,7 +409,7 @@ export default class Core { * @param {number} weapon * @returns {number} */ - static getWeaponSlot(weapon: number): number { + static getWeaponSlot(weapon: WEAPON): number { const result = internal_omp.Core.GetWeaponSlot(weapon); return result.ret; } diff --git a/src/components/Dialog.ts b/src/components/Dialog.ts index a3d2f9c..c2fe0ec 100644 --- a/src/components/Dialog.ts +++ b/src/components/Dialog.ts @@ -1,5 +1,6 @@ import { Player } from "./index"; import { internal_omp } from "../globals"; +import { DIALOG_STYLE } from "src/enums"; /** * Dialog class @@ -9,7 +10,7 @@ export default class Dialog { * @method show * @param {Player} player * @param {number} dialog - * @param {number} style + * @param {DIALOG_STYLE} style * @param {string} title * @param {string} body * @param {string} button1 @@ -19,7 +20,7 @@ export default class Dialog { static show( player: Player, dialog: number, - style: number, + style: DIALOG_STYLE, title: string, body: string, button1: string, diff --git a/src/components/NPC.ts b/src/components/NPC.ts index 9d05e8d..0c02507 100644 --- a/src/components/NPC.ts +++ b/src/components/NPC.ts @@ -1,5 +1,6 @@ import { Player, Vehicle, ObjectMp, omp, PlayerObject } from "./index"; import { PTR, internal_omp } from "../globals"; +import { FIGHT_STYLE, KEY, SPECIAL_ACTION, WEAPON, WEAPONSKILL } from "src/enums"; /** * NPC class @@ -559,11 +560,11 @@ export default class NPC { /** * @method setWeapon - * @param {number} weapon + * @param {WEAPON} weapon * @returns {boolean} * @throws Will throw an error if the NPC is invalid */ - setWeapon(weapon: number): boolean { + setWeapon(weapon: WEAPON): boolean { if (!this.ptr) { throw new Error("NPC instance is not valid"); } @@ -574,10 +575,10 @@ export default class NPC { /** * @method getWeapon - * @returns {number} + * @returns {WEAPON} * @throws Will throw an error if the NPC is invalid */ - getWeapon(): number { + getWeapon(): WEAPON { if (!this.ptr) { throw new Error("NPC instance is not valid"); } @@ -738,7 +739,7 @@ export default class NPC { * @returns {boolean} * @throws Will throw an error if the NPC is invalid */ - setKeys(upAndDown: number, leftAndRight: number, keys: number): boolean { + setKeys(upAndDown: number, leftAndRight: number, keys: KEY): boolean { if (!this.ptr) { throw new Error("NPC instance is not valid"); } @@ -768,12 +769,12 @@ export default class NPC { /** * @method setWeaponSkillLevel - * @param {number} skill + * @param {WEAPONSKILL} skill * @param {number} level * @returns {boolean} * @throws Will throw an error if the NPC is invalid */ - setWeaponSkillLevel(skill: number, level: number): boolean { + setWeaponSkillLevel(skill: WEAPONSKILL, level: number): boolean { if (!this.ptr) { throw new Error("NPC instance is not valid"); } @@ -784,11 +785,11 @@ export default class NPC { /** * @method getWeaponSkillLevel - * @param {number} skill + * @param {WEAPONSKILL} skill * @returns {number} * @throws Will throw an error if the NPC is invalid */ - getWeaponSkillLevel(skill: number): number { + getWeaponSkillLevel(skill: WEAPONSKILL): number { if (!this.ptr) { throw new Error("NPC instance is not valid"); } @@ -847,11 +848,11 @@ export default class NPC { /** * @method setFightingStyle - * @param {number} style + * @param {FIGHT_STYLE} style * @returns {boolean} * @throws Will throw an error if the NPC is invalid */ - setFightingStyle(style: number): boolean { + setFightingStyle(style: FIGHT_STYLE): boolean { if (!this.ptr) { throw new Error("NPC instance is not valid"); } @@ -862,10 +863,10 @@ export default class NPC { /** * @method getFightingStyle - * @returns {number} + * @returns {FIGHT_STYLE} * @throws Will throw an error if the NPC is invalid */ - getFightingStyle(): number { + getFightingStyle(): FIGHT_STYLE { if (!this.ptr) { throw new Error("NPC instance is not valid"); } @@ -876,7 +877,7 @@ export default class NPC { /** * @method shoot - * @param {number} weapon + * @param {WEAPON} weapon * @param {number} hitId * @param {number} hitType * @param {number} endX @@ -891,7 +892,7 @@ export default class NPC { * @throws Will throw an error if the NPC is invalid */ shoot( - weapon: number, + weapon: WEAPON, hitId: number, hitType: number, endX: number, @@ -1083,12 +1084,12 @@ export default class NPC { /** * @method setWeaponAccuracy - * @param {number} weapon + * @param {WEAPON} weapon * @param {number} accuracy * @returns {boolean} * @throws Will throw an error if the NPC is invalid */ - setWeaponAccuracy(weapon: number, accuracy: number): boolean { + setWeaponAccuracy(weapon: WEAPON, accuracy: number): boolean { if (!this.ptr) { throw new Error("NPC instance is not valid"); } @@ -1103,11 +1104,11 @@ export default class NPC { /** * @method getWeaponAccuracy - * @param {number} weapon + * @param {WEAPON} weapon * @returns {number} * @throws Will throw an error if the NPC is invalid */ - getWeaponAccuracy(weapon: number): number { + getWeaponAccuracy(weapon: WEAPON): number { if (!this.ptr) { throw new Error("NPC instance is not valid"); } @@ -1118,12 +1119,12 @@ export default class NPC { /** * @method setWeaponReloadTime - * @param {number} weapon + * @param {WEAPON} weapon * @param {number} time * @returns {boolean} * @throws Will throw an error if the NPC is invalid */ - setWeaponReloadTime(weapon: number, time: number): boolean { + setWeaponReloadTime(weapon: WEAPON, time: number): boolean { if (!this.ptr) { throw new Error("NPC instance is not valid"); } @@ -1134,11 +1135,11 @@ export default class NPC { /** * @method getWeaponReloadTime - * @param {number} weapon + * @param {WEAPON} weapon * @returns {number} * @throws Will throw an error if the NPC is invalid */ - getWeaponReloadTime(weapon: number): number { + getWeaponReloadTime(weapon: WEAPON): number { if (!this.ptr) { throw new Error("NPC instance is not valid"); } @@ -1149,11 +1150,11 @@ export default class NPC { /** * @method getWeaponActualReloadTime - * @param {number} weapon + * @param {WEAPON} weapon * @returns {number} * @throws Will throw an error if the NPC is invalid */ - getWeaponActualReloadTime(weapon: number): number { + getWeaponActualReloadTime(weapon: WEAPON): number { if (!this.ptr) { throw new Error("NPC instance is not valid"); } @@ -1164,12 +1165,12 @@ export default class NPC { /** * @method setWeaponShootTime - * @param {number} weapon + * @param {WEAPON} weapon * @param {number} time * @returns {boolean} * @throws Will throw an error if the NPC is invalid */ - setWeaponShootTime(weapon: number, time: number): boolean { + setWeaponShootTime(weapon: WEAPON, time: number): boolean { if (!this.ptr) { throw new Error("NPC instance is not valid"); } @@ -1180,11 +1181,11 @@ export default class NPC { /** * @method getWeaponShootTime - * @param {number} weapon + * @param {WEAPON} weapon * @returns {number} * @throws Will throw an error if the NPC is invalid */ - getWeaponShootTime(weapon: number): number { + getWeaponShootTime(weapon: WEAPON): number { if (!this.ptr) { throw new Error("NPC instance is not valid"); } @@ -1195,12 +1196,12 @@ export default class NPC { /** * @method setWeaponClipSize - * @param {number} weapon + * @param {WEAPON} weapon * @param {number} size * @returns {boolean} * @throws Will throw an error if the NPC is invalid */ - setWeaponClipSize(weapon: number, size: number): boolean { + setWeaponClipSize(weapon: WEAPON, size: number): boolean { if (!this.ptr) { throw new Error("NPC instance is not valid"); } @@ -1211,11 +1212,11 @@ export default class NPC { /** * @method getWeaponClipSize - * @param {number} weapon + * @param {WEAPON} weapon * @returns {number} * @throws Will throw an error if the NPC is invalid */ - getWeaponClipSize(weapon: number): number { + getWeaponClipSize(weapon: WEAPON): number { if (!this.ptr) { throw new Error("NPC instance is not valid"); } @@ -1226,11 +1227,11 @@ export default class NPC { /** * @method getWeaponActualClipSize - * @param {number} weapon + * @param {WEAPON} weapon * @returns {number} * @throws Will throw an error if the NPC is invalid */ - getWeaponActualClipSize(weapon: number): number { + getWeaponActualClipSize(weapon: WEAPON): number { if (!this.ptr) { throw new Error("NPC instance is not valid"); } @@ -1730,11 +1731,11 @@ export default class NPC { /** * @method setSpecialAction - * @param {number} action + * @param {SPECIAL_ACTION} action * @returns {boolean} * @throws Will throw an error if the NPC is invalid */ - setSpecialAction(action: number): boolean { + setSpecialAction(action: SPECIAL_ACTION): boolean { if (!this.ptr) { throw new Error("NPC instance is not valid"); } @@ -1745,10 +1746,10 @@ export default class NPC { /** * @method getSpecialAction - * @returns {number} + * @returns {SPECIAL_ACTION} * @throws Will throw an error if the NPC is invalid */ - getSpecialAction(): number { + getSpecialAction(): SPECIAL_ACTION { if (!this.ptr) { throw new Error("NPC instance is not valid"); } diff --git a/src/components/Object.ts b/src/components/Object.ts index e02f0ad..0c69ef9 100644 --- a/src/components/Object.ts +++ b/src/components/Object.ts @@ -1,5 +1,6 @@ import { Player, Vehicle, omp } from "./index"; import { PTR, internal_omp } from "../globals"; +import { OBJECT_MATERIAL_SIZE, OBJECT_MATERIAL_TEXT_ALIGN } from "src/enums"; /** * ObjectMp class @@ -492,26 +493,26 @@ export default class ObjectMp { * @method setMaterialText * @param {string} text * @param {number} materialIndex - * @param {number} materialSize + * @param {OBJECT_MATERIAL_SIZE} materialSize * @param {string} fontface * @param {number} fontsize * @param {boolean} bold * @param {number} fontColor * @param {number} backgroundColor - * @param {number} textalignment + * @param {OBJECT_MATERIAL_TEXT_ALIGN} textalignment * @returns {boolean} * @throws Will throw an error if the object is invalid */ setMaterialText( text: string, materialIndex: number, - materialSize: number, + materialSize: OBJECT_MATERIAL_SIZE, fontface: string, fontsize: number, bold: boolean, fontColor: number, backgroundColor: number, - textalignment: number + textalignment: OBJECT_MATERIAL_TEXT_ALIGN ): boolean { if (!this.ptr) { throw new Error("Object instance is not valid"); @@ -726,19 +727,19 @@ export default class ObjectMp { /** * @method getMaterialText * @param {number} materialIndex - * @returns {{ret: boolean, text: string,materialSize: number,fontFace: string,fontSize: number,bold: boolean,fontColor: number,backgroundColor: number,textAlignment: number}} return object + * @returns {{ret: boolean, text: string,materialSize: OBJECT_MATERIAL_SIZE,fontFace: string,fontSize: number,bold: boolean,fontColor: number,backgroundColor: number,textAlignment: OBJECT_MATERIAL_TEXT_ALIGN}} return object * @throws Will throw an error if the object is invalid */ getMaterialText(materialIndex: number): { ret: boolean; text: string; - materialSize: number; + materialSize: OBJECT_MATERIAL_SIZE; fontFace: string; fontSize: number; bold: boolean; fontColor: number; backgroundColor: number; - textAlignment: number; + textAlignment: OBJECT_MATERIAL_TEXT_ALIGN; } { if (!this.ptr) { throw new Error("Object instance is not valid"); diff --git a/src/components/Player.ts b/src/components/Player.ts index 648c799..ae1679d 100644 --- a/src/components/Player.ts +++ b/src/components/Player.ts @@ -1,5 +1,6 @@ import { Actor, Menu, ObjectMp, PlayerObject, Vehicle, omp } from "./index"; import { PTR, internal_omp } from "../globals"; +import { CAM_MOVE, DIALOG_STYLE, FIGHT_STYLE, FORCE_SYNC, KEY, MAPICON, SPECIAL_ACTION, SPECTATE_MODE, WEAPON, WEAPON_SLOT, WEAPONSKILL } from "src/enums"; /** * Player class @@ -62,11 +63,11 @@ export default class Player { * @param {number} y * @param {number} z * @param {number} angle - * @param {number} weapon1 + * @param {WEAPON} weapon1 * @param {number} ammo1 - * @param {number} weapon2 + * @param {WEAPON} weapon2 * @param {number} ammo2 - * @param {number} weapon3 + * @param {WEAPON} weapon3 * @param {number} ammo3 * @returns {boolean} * @throws Will throw an error if the player is invalid @@ -78,11 +79,11 @@ export default class Player { y: number, z: number, angle: number, - weapon1: number, + weapon1: WEAPON, ammo1: number, - weapon2: number, + weapon2: WEAPON, ammo2: number, - weapon3: number, + weapon3: WEAPON, ammo3: number ): boolean { if (!this.ptr) { @@ -109,7 +110,7 @@ export default class Player { /** * @method getSpawnInfo - * @returns {{ret: boolean, team: number,skin: number,x: number,y: number,z: number,angle: number,weapon1: number,ammo1: number,weapon2: number,ammo2: number,weapon3: number,ammo3: number}} return object + * @returns {{ret: boolean, team: number,skin: number,x: number,y: number,z: number,angle: number,weapon1: WEAPON,ammo1: number,weapon2: WEAPON,ammo2: number,weapon3: WEAPON,ammo3: number}} return object * @throws Will throw an error if the player is invalid */ getSpawnInfo(): { @@ -120,11 +121,11 @@ export default class Player { y: number; z: number; angle: number; - weapon1: number; + weapon1: WEAPON; ammo1: number; - weapon2: number; + weapon2: WEAPON; ammo2: number; - weapon3: number; + weapon3: WEAPON; ammo3: number; } { if (!this.ptr) { @@ -311,13 +312,13 @@ export default class Player { /** * @method getDialogData - * @returns {{ret: boolean, dialogid: number,style: number,title: string,body: string,button1: string,button2: string}} return object + * @returns {{ret: boolean, dialogid: number,style: DIALOG_STYLE,title: string,body: string,button1: string,button2: string}} return object * @throws Will throw an error if the player is invalid */ getDialogData(): { ret: boolean; dialogid: number; - style: number; + style: DIALOG_STYLE; title: string; body: string; button1: string; @@ -531,11 +532,11 @@ export default class Player { * @param {number} x * @param {number} y * @param {number} z - * @param {number} cutType + * @param {CAM_MOVE} cutType * @returns {boolean} * @throws Will throw an error if the player is invalid */ - setCameraLookAt(x: number, y: number, z: number, cutType: number): boolean { + setCameraLookAt(x: number, y: number, z: number, cutType: CAM_MOVE): boolean { if (!this.ptr) { throw new Error("Player instance is not valid"); } @@ -863,12 +864,12 @@ export default class Player { /** * @method giveWeapon - * @param {number} weapon + * @param {WEAPON} weapon * @param {number} ammo * @returns {boolean} * @throws Will throw an error if the player is invalid */ - giveWeapon(weapon: number, ammo: number): boolean { + giveWeapon(weapon: WEAPON, ammo: number): boolean { if (!this.ptr) { throw new Error("Player instance is not valid"); } @@ -879,11 +880,11 @@ export default class Player { /** * @method removeWeapon - * @param {number} weapon + * @param {WEAPON} weapon * @returns {boolean} * @throws Will throw an error if the player is invalid */ - removeWeapon(weapon: number): boolean { + removeWeapon(weapon: WEAPON): boolean { if (!this.ptr) { throw new Error("Player instance is not valid"); } @@ -1080,11 +1081,11 @@ export default class Player { /** * @method setFightingStyle - * @param {number} style + * @param {FIGHT_STYLE} style * @returns {boolean} * @throws Will throw an error if the player is invalid */ - setFightingStyle(style: number): boolean { + setFightingStyle(style: FIGHT_STYLE): boolean { if (!this.ptr) { throw new Error("Player instance is not valid"); } @@ -1095,10 +1096,10 @@ export default class Player { /** * @method getFightingStyle - * @returns {number} + * @returns {FIGHT_STYLE} * @throws Will throw an error if the player is invalid */ - getFightingStyle(): number { + getFightingStyle(): FIGHT_STYLE { if (!this.ptr) { throw new Error("Player instance is not valid"); } @@ -1278,11 +1279,11 @@ export default class Player { /** * @method spectatePlayer * @param {Player} target - * @param {number} mode + * @param {SPECTATE_MODE} mode * @returns {boolean} * @throws Will throw an error if the player is invalid */ - spectatePlayer(target: Player, mode: number): boolean { + spectatePlayer(target: Player, mode: SPECTATE_MODE): boolean { if (!this.ptr) { throw new Error("Player instance is not valid"); } @@ -1298,11 +1299,11 @@ export default class Player { /** * @method spectateVehicle * @param {Player} target - * @param {number} mode + * @param {SPECTATE_MODE} mode * @returns {boolean} * @throws Will throw an error if the player is invalid */ - spectateVehicle(target: Player, mode: number): boolean { + spectateVehicle(target: Player, mode: SPECTATE_MODE): boolean { if (!this.ptr) { throw new Error("Player instance is not valid"); } @@ -1395,11 +1396,11 @@ export default class Player { /** * @method clearAnimations - * @param {number} syncType + * @param {FORCE_SYNC} syncType * @returns {boolean} * @throws Will throw an error if the player is invalid */ - clearAnimations(syncType: number): boolean { + clearAnimations(syncType: FORCE_SYNC): boolean { if (!this.ptr) { throw new Error("Player instance is not valid"); } @@ -1589,7 +1590,7 @@ export default class Player { * @param {number} z * @param {number} type * @param {number} color - * @param {number} style + * @param {MAPICON} style * @returns {boolean} * @throws Will throw an error if the player is invalid */ @@ -1600,7 +1601,7 @@ export default class Player { z: number, type: number, color: number, - style: number + style: MAPICON ): boolean { if (!this.ptr) { throw new Error("Player instance is not valid"); @@ -1651,11 +1652,11 @@ export default class Player { /** * @method setArmedWeapon - * @param {number} weapon + * @param {WEAPON} weapon * @returns {boolean} * @throws Will throw an error if the player is invalid */ - setArmedWeapon(weapon: number): boolean { + setArmedWeapon(weapon: WEAPON): boolean { if (!this.ptr) { throw new Error("Player instance is not valid"); } @@ -1712,12 +1713,12 @@ export default class Player { /** * @method setSkillLevel - * @param {number} weapon + * @param {WEAPON} weapon * @param {number} level * @returns {boolean} * @throws Will throw an error if the player is invalid */ - setSkillLevel(weapon: number, level: number): boolean { + setSkillLevel(weapon: WEAPON, level: number): boolean { if (!this.ptr) { throw new Error("Player instance is not valid"); } @@ -1728,11 +1729,11 @@ export default class Player { /** * @method setSpecialAction - * @param {number} action + * @param {SPECIAL_ACTION} action * @returns {boolean} * @throws Will throw an error if the player is invalid */ - setSpecialAction(action: number): boolean { + setSpecialAction(action: SPECIAL_ACTION): boolean { if (!this.ptr) { throw new Error("Player instance is not valid"); } @@ -1801,7 +1802,7 @@ export default class Player { * @param {boolean} lockY * @param {boolean} freeze * @param {number} time - * @param {number} sync + * @param {FORCE_SYNC} sync * @returns {boolean} * @throws Will throw an error if the player is invalid */ @@ -1814,7 +1815,7 @@ export default class Player { lockY: boolean, freeze: boolean, time: number, - sync: number + sync: FORCE_SYNC ): boolean { if (!this.ptr) { throw new Error("Player instance is not valid"); @@ -1953,10 +1954,10 @@ export default class Player { /** * @method getSpecialAction - * @returns {number} + * @returns {SPECIAL_ACTION} * @throws Will throw an error if the player is invalid */ - getSpecialAction(): number { + getSpecialAction(): SPECIAL_ACTION { if (!this.ptr) { throw new Error("Player instance is not valid"); } @@ -1995,13 +1996,13 @@ export default class Player { /** * @method getWeaponData - * @param {number} slot - * @returns {{ret: boolean, weaponid: number,ammo: number}} return object + * @param {WEAPON_SLOT} slot + * @returns {{ret: boolean, weaponid: WEAPON,ammo: number}} return object * @throws Will throw an error if the player is invalid */ - getWeaponData(slot: number): { + getWeaponData(slot: WEAPON_SLOT): { ret: boolean; - weaponid: number; + weaponid: WEAPON; ammo: number; } { if (!this.ptr) { @@ -2076,7 +2077,7 @@ export default class Player { * @param {number} to_y * @param {number} to_z * @param {number} time - * @param {number} cut + * @param {CAM_MOVE} cut * @returns {boolean} * @throws Will throw an error if the player is invalid */ @@ -2088,7 +2089,7 @@ export default class Player { to_y: number, to_z: number, time: number, - cut: number + cut: CAM_MOVE ): boolean { if (!this.ptr) { throw new Error("Player instance is not valid"); @@ -2206,10 +2207,10 @@ export default class Player { /** * @method getKeys - * @returns {{ret: boolean, keys: number,updown: number,leftright: number}} return object + * @returns {{ret: boolean, keys: KEY,updown: number,leftright: number}} return object * @throws Will throw an error if the player is invalid */ - getKeys(): { ret: boolean; keys: number; updown: number; leftright: number } { + getKeys(): { ret: boolean; keys: KEY; updown: number; leftright: number } { if (!this.ptr) { throw new Error("Player instance is not valid"); } @@ -2787,11 +2788,11 @@ export default class Player { * @method sendDeathMessage * @param {Player} killer * @param {Player} killee - * @param {number} weapon + * @param {WEAPON} weapon * @returns {boolean} * @throws Will throw an error if the player is invalid */ - sendDeathMessage(killer: Player, killee: Player, weapon: number): boolean { + sendDeathMessage(killer: Player, killee: Player, weapon: WEAPON): boolean { if (!this.ptr) { throw new Error("Player instance is not valid"); } @@ -2841,11 +2842,11 @@ export default class Player { /** * @method getSkillLevel - * @param {number} skill + * @param {WEAPONSKILL} skill * @returns {number} * @throws Will throw an error if the player is invalid */ - getSkillLevel(skill: number): number { + getSkillLevel(skill: WEAPONSKILL): number { if (!this.ptr) { throw new Error("Player instance is not valid"); } diff --git a/src/components/PlayerObject.ts b/src/components/PlayerObject.ts index 52f007c..0d9df2f 100644 --- a/src/components/PlayerObject.ts +++ b/src/components/PlayerObject.ts @@ -1,5 +1,6 @@ import { ObjectMp, Player, Vehicle, omp } from "./index"; import { PTR, internal_omp } from "../globals"; +import { OBJECT_MATERIAL_SIZE, OBJECT_MATERIAL_TEXT_ALIGN } from "src/enums"; /** * PlayerObject class @@ -523,26 +524,26 @@ export default class PlayerObject { * @method setMaterialText * @param {string} text * @param {number} materialIndex - * @param {number} materialSize + * @param {OBJECT_MATERIAL_SIZE} materialSize * @param {string} fontface * @param {number} fontsize * @param {boolean} bold * @param {number} fontColor * @param {number} backgroundColor - * @param {number} textalignment + * @param {OBJECT_MATERIAL_TEXT_ALIGN} textalignment * @returns {boolean} * @throws Will throw an error if the playerObject is invalid */ setMaterialText( text: string, materialIndex: number, - materialSize: number, + materialSize: OBJECT_MATERIAL_SIZE, fontface: string, fontsize: number, bold: boolean, fontColor: number, backgroundColor: number, - textalignment: number + textalignment: OBJECT_MATERIAL_TEXT_ALIGN ): boolean { if (!this.ptr || !this.player) { throw new Error("PlayerObject instance is not valid"); @@ -766,19 +767,19 @@ export default class PlayerObject { /** * @method getMaterialText * @param {number} materialIndex - * @returns {{ret: boolean, text: string,materialSize: number,fontFace: string,fontSize: number,bold: boolean,fontColor: number,backgroundColor: number,textAlignment: number}} return object + * @returns {{ret: boolean, text: string,materialSize: OBJECT_MATERIAL_SIZE,fontFace: string,fontSize: number,bold: boolean,fontColor: number,backgroundColor: number,textAlignment: OBJECT_MATERIAL_TEXT_ALIGN}} return object * @throws Will throw an error if the playerObject is invalid */ getMaterialText(materialIndex: number): { ret: boolean; text: string; - materialSize: number; + materialSize: OBJECT_MATERIAL_SIZE; fontFace: string; fontSize: number; bold: boolean; fontColor: number; backgroundColor: number; - textAlignment: number; + textAlignment: OBJECT_MATERIAL_TEXT_ALIGN; } { if (!this.ptr || !this.player) { throw new Error("PlayerObject instance is not valid"); diff --git a/src/components/PlayerTextDraw.ts b/src/components/PlayerTextDraw.ts index a25d4f3..595af6f 100644 --- a/src/components/PlayerTextDraw.ts +++ b/src/components/PlayerTextDraw.ts @@ -1,5 +1,6 @@ import { Player } from "./index"; import { PTR, internal_omp } from "../globals"; +import { TEXT_DRAW_ALIGN, TEXT_DRAW_FONT } from "src/enums"; /** * PlayerTextDraw class @@ -189,11 +190,11 @@ export default class PlayerTextDraw { /** * @method setAlignment - * @param {number} alignment + * @param {TEXT_DRAW_ALIGN} alignment * @returns {boolean} * @throws Will throw an error if the playerTextDraw is invalid */ - setAlignment(alignment: number): boolean { + setAlignment(alignment: TEXT_DRAW_ALIGN): boolean { if (!this.ptr || !this.player) { throw new Error("PlayerTextDraw instance is not valid"); } @@ -322,11 +323,11 @@ export default class PlayerTextDraw { /** * @method setFont - * @param {number} font + * @param {TEXT_DRAW_FONT} font * @returns {boolean} * @throws Will throw an error if the playerTextDraw is invalid */ - setFont(font: number): boolean { + setFont(font: TEXT_DRAW_FONT): boolean { if (!this.ptr || !this.player) { throw new Error("PlayerTextDraw instance is not valid"); } diff --git a/src/components/RaceCheckpoint.ts b/src/components/RaceCheckpoint.ts index 4b583e8..7771d1b 100644 --- a/src/components/RaceCheckpoint.ts +++ b/src/components/RaceCheckpoint.ts @@ -1,5 +1,6 @@ import { Player } from "./index"; import { internal_omp } from "../globals"; +import { CP_TYPE } from "../enums"; /** * RaceCheckpoint class @@ -8,7 +9,7 @@ export default class RaceCheckpoint { /** * @method set * @param {Player} player - * @param {number} type + * @param {CP_TYPE} type * @param {number} x * @param {number} y * @param {number} z @@ -20,7 +21,7 @@ export default class RaceCheckpoint { */ static set( player: Player, - type: number, + type: CP_TYPE, x: number, y: number, z: number, diff --git a/src/components/Recording.ts b/src/components/Recording.ts index dca632f..13726a1 100644 --- a/src/components/Recording.ts +++ b/src/components/Recording.ts @@ -1,5 +1,6 @@ import { Player } from "./index"; import { internal_omp } from "../globals"; +import { PLAYER_RECORDING_TYPE } from "src/enums"; /** * Recording class @@ -8,11 +9,11 @@ export default class Recording { /** * @method start * @param {Player} player - * @param {number} type + * @param {PLAYER_RECORDING_TYPE} type * @param {string} file * @returns {boolean} */ - static start(player: Player, type: number, file: string): boolean { + static start(player: Player, type: PLAYER_RECORDING_TYPE, file: string): boolean { const result = internal_omp.Recording.Start(player.getPtr(), type, file); return result.ret; } diff --git a/src/components/TextDraw.ts b/src/components/TextDraw.ts index bc03b9d..77150ef 100644 --- a/src/components/TextDraw.ts +++ b/src/components/TextDraw.ts @@ -1,5 +1,6 @@ import { Player } from "./index"; import { PTR, internal_omp } from "../globals"; +import { TEXT_DRAW_ALIGN, TEXT_DRAW_FONT } from "src/enums"; /** * TextDraw class @@ -157,11 +158,11 @@ export default class TextDraw { /** * @method setAlignment - * @param {number} alignment + * @param {TEXT_DRAW_ALIGN} alignment * @returns {boolean} * @throws Will throw an error if the textDraw is invalid */ - setAlignment(alignment: number): boolean { + setAlignment(alignment: TEXT_DRAW_ALIGN): boolean { if (!this.ptr) { throw new Error("TextDraw instance is not valid"); } @@ -262,11 +263,11 @@ export default class TextDraw { /** * @method setFont - * @param {number} font + * @param {TEXT_DRAW_FONT} font * @returns {boolean} * @throws Will throw an error if the textDraw is invalid */ - setFont(font: number): boolean { + setFont(font: TEXT_DRAW_FONT): boolean { if (!this.ptr) { throw new Error("TextDraw instance is not valid"); } diff --git a/src/components/Vehicle.ts b/src/components/Vehicle.ts index 4fbc0d9..8d2c7a1 100644 --- a/src/components/Vehicle.ts +++ b/src/components/Vehicle.ts @@ -1,5 +1,6 @@ import { Player } from "./index"; import { PTR, internal_omp, omp } from "../globals"; +import { CARMODTYPE, VEHICLE_DOOR_STATUS, VEHICLE_LIGHT_STATUS, VEHICLE_MODEL_INFO, VEHICLE_PANEL_STATUS, VEHICLE_TIRE_STATUS } from "src/enums"; /** * Vehicle class @@ -666,11 +667,11 @@ export default class Vehicle { /** * @method getComponentInSlot - * @param {number} slot + * @param {CARMODTYPE} slot * @returns {number} * @throws Will throw an error if the vehicle is invalid */ - getComponentInSlot(slot: number): number { + getComponentInSlot(slot: CARMODTYPE): number { if (!this.ptr) { throw new Error("Vehicle instance is not valid"); } @@ -795,15 +796,15 @@ export default class Vehicle { /** * @method getDamageStatus - * @returns {{ret: boolean, panels: number,doors: number,lights: number,tires: number}} return object + * @returns {{ret: boolean, panels: VEHICLE_PANEL_STATUS,doors: VEHICLE_DOOR_STATUS,lights: VEHICLE_LIGHT_STATUS,tires: VEHICLE_TIRE_STATUS}} return object * @throws Will throw an error if the vehicle is invalid */ getDamageStatus(): { ret: boolean; - panels: number; - doors: number; - lights: number; - tires: number; + panels: VEHICLE_PANEL_STATUS; + doors: VEHICLE_DOOR_STATUS; + lights: VEHICLE_LIGHT_STATUS; + tires: VEHICLE_TIRE_STATUS; } { if (!this.ptr) { throw new Error("Vehicle instance is not valid"); @@ -815,18 +816,18 @@ export default class Vehicle { /** * @method updateDamageStatus - * @param {number} panels - * @param {number} doors - * @param {number} lights - * @param {number} tires + * @param {VEHICLE_PANEL_STATUS} panels + * @param {VEHICLE_DOOR_STATUS} doors + * @param {VEHICLE_LIGHT_STATUS} lights + * @param {VEHICLE_TIRE_STATUS} tires * @returns {boolean} * @throws Will throw an error if the vehicle is invalid */ updateDamageStatus( - panels: number, - doors: number, - lights: number, - tires: number + panels: VEHICLE_PANEL_STATUS, + doors: VEHICLE_DOOR_STATUS, + lights: VEHICLE_LIGHT_STATUS, + tires: VEHICLE_TIRE_STATUS ): boolean { if (!this.ptr) { throw new Error("Vehicle instance is not valid"); @@ -845,13 +846,13 @@ export default class Vehicle { /** * @method getModelInfo * @param {number} vehiclemodel - * @param {number} infotype + * @param {VEHICLE_MODEL_INFO} infotype * @returns {{ret: boolean, x: number,y: number,z: number}} return object * @throws Will throw an error if the vehicle is invalid */ static getModelInfo( vehiclemodel: number, - infotype: number + infotype: VEHICLE_MODEL_INFO ): { ret: boolean; x: number; diff --git a/src/enums.ts b/src/enums.ts new file mode 100644 index 0000000..328be17 --- /dev/null +++ b/src/enums.ts @@ -0,0 +1,373 @@ +// ===================== +// Checkpoint Types +// ===================== +export enum CP_TYPE { + GROUND_NORMAL = 0, + GROUND_FINISH = 1, + GROUND_EMPTY = 2, + AIR_NORMAL = 3, + AIR_FINISH = 4, + AIR_ROTATING = 5, + AIR_STROBING = 6, + AIR_SWINGING = 7, + AIR_BOBBING = 8, +} + +// ===================== +// Weapon Types +// ===================== +export enum WEAPON { + FIST = 0, + BRASSKNUCKLE = 1, + GOLFCLUB = 2, + NITESTICK = 3, + NIGHTSTICK = 3, + KNIFE = 4, + BAT = 5, + SHOVEL = 6, + POOLSTICK = 7, + KATANA = 8, + CHAINSAW = 9, + DILDO = 10, + DILDO2 = 11, + VIBRATOR = 12, + VIBRATOR2 = 13, + FLOWER = 14, + CANE = 15, + GRENADE = 16, + TEARGAS = 17, + MOLTOV = 18, + MOLOTOV = 18, + COLT45 = 22, + SILENCED = 23, + DEAGLE = 24, + SHOTGUN = 25, + SAWEDOFF = 26, + SHOTGSPA = 27, + UZI = 28, + MP5 = 29, + AK47 = 30, + M4 = 31, + TEC9 = 32, + RIFLE = 33, + SNIPER = 34, + ROCKETLAUNCHER = 35, + HEATSEEKER = 36, + FLAMETHROWER = 37, + MINIGUN = 38, + SATCHEL = 39, + BOMB = 40, + SPRAYCAN = 41, + FIREEXTINGUISHER = 42, + CAMERA = 43, + NIGHT_VISION_GOGGLES = 44, + THERMAL_GOGGLES = 45, + PARACHUTE = 46, + VEHICLE = 49, + DROWN = 53, + COLLISION = 54, + SPLAT = 54, +} + +// ===================== +// Weapon Slots +// ===================== +export enum WEAPON_SLOT { + UNKNOWN = -1, + UNARMED = 0, + MELEE = 1, + PISTOL = 2, + SHOTGUN = 3, + MACHINE_GUN = 4, + ASSAULT_RIFLE = 5, + LONG_RIFLE = 6, + ARTILLERY = 7, + EXPLOSIVES = 8, + EQUIPMENT = 9, + GIFT = 10, + GADGET = 11, + DETONATOR = 12, +} + +// ===================== +// Player Markers Mode +// ===================== +export enum PLAYER_MARKERS_MODE { + OFF = 0, + GLOBAL = 1, + STREAMED = 2, +} + +// ===================== +// Dialog Styles +// ===================== +export enum DIALOG_STYLE { + MSGBOX = 0, + INPUT = 1, + LIST = 2, + PASSWORD = 3, + TABLIST = 4, + TABLIST_HEADERS = 5, +} + +// ===================== +// Object Material Size +// ===================== +export enum OBJECT_MATERIAL_SIZE { + SIZE_32x32 = 10, + SIZE_64x32 = 20, + SIZE_64x64 = 30, + SIZE_128x32 = 40, + SIZE_128x64 = 50, + SIZE_128x128 = 60, + SIZE_256x32 = 70, + SIZE_256x64 = 80, + SIZE_256x128 = 90, + SIZE_256x256 = 100, + SIZE_512x64 = 110, + SIZE_512x128 = 120, + SIZE_512x256 = 130, + SIZE_512x512 = 140, +} + +// ===================== +// Object Material Text Alignment +// ===================== +export enum OBJECT_MATERIAL_TEXT_ALIGN { + LEFT = 0, + CENTRE = 1, + RIGHT = 2, +} + +// ===================== +// Special Actions +// ===================== +export enum SPECIAL_ACTION { + NONE = 0, + DUCK = 1, + USEJETPACK = 2, + ENTER_VEHICLE = 3, + EXIT_VEHICLE = 4, + DANCE1 = 5, + DANCE2 = 6, + DANCE3 = 7, + DANCE4 = 8, + HANDSUP = 10, + USECELLPHONE = 11, + SITTING = 12, + STOPUSECELLPHONE = 13, + DRINK_BEER = 20, + SMOKE_CIGGY = 21, + DRINK_WINE = 22, + DRINK_SPRUNK = 23, + CUFFED = 24, + CARRY = 25, + PISSING = 68, +} + +// ===================== +// Fighting Styles +// ===================== +export enum FIGHT_STYLE { + NORMAL = 4, + BOXING = 5, + KUNGFU = 6, + KNEEHEAD = 7, + GRABKICK = 15, + ELBOW = 16, +} + +// ===================== +// Weapon Skills +// ===================== +export enum WEAPONSKILL { + PISTOL = 0, + PISTOL_SILENCED = 1, + DESERT_EAGLE = 2, + SHOTGUN = 3, + SAWNOFF_SHOTGUN = 4, + SPAS12_SHOTGUN = 5, + MICRO_UZI = 6, + MP5 = 7, + AK47 = 8, + M4 = 9, + SNIPERRIFLE = 10, +} + +// ===================== +// Player Keys +// ===================== +export enum KEY { + ACTION = 1, + CROUCH = 2, + FIRE = 4, + SPRINT = 8, + SECONDARY_ATTACK = 16, + JUMP = 32, + LOOK_RIGHT = 64, + HANDBRAKE = 128, + LOOK_LEFT = 256, + SUBMISSION = 512, + LOOK_BEHIND = 512, + WALK = 1024, + ANALOG_UP = 2048, + ANALOG_DOWN = 4096, + ANALOG_LEFT = 8192, + ANALOG_RIGHT = 16384, + YES = 65536, + NO = 131072, + CTRL_BACK = 262144, + UP = -128, + DOWN = 128, + LEFT = -128, + RIGHT = 128, +} + +// ===================== +// Camera Movement +// ===================== +export enum CAM_MOVE { + MOVE = 1, + CUT = 2, +} + +// ===================== +// Map Icon Styles +// ===================== +export enum MAPICON { + LOCAL = 0, + GLOBAL = 1, + LOCAL_CHECKPOINT = 2, + GLOBAL_CHECKPOINT = 3, +} + +// ===================== +// Spectate Modes +// ===================== +export enum SPECTATE_MODE { + NORMAL = 1, + FIXED = 2, + SIDE = 3, +} + +// ===================== +// Player Recording Types +// ===================== +export enum PLAYER_RECORDING_TYPE { + NONE = 0, + DRIVER = 1, + ONFOOT = 2, +} + +// ===================== +// Force Sync +// ===================== +export enum FORCE_SYNC { + NONE = 0, + ALL = 1, + OTHER = 2, +} + +// ===================== +// Text Draw Font +// ===================== +export enum TEXT_DRAW_FONT { + FONT_0 = 0, + FONT_1 = 1, + FONT_2 = 2, + FONT_3 = 3, + SPRITE_DRAW = 4, + MODEL_PREVIEW = 5, +} + +// ===================== +// Text Draw Alignment +// ===================== +export enum TEXT_DRAW_ALIGN { + LEFT = 1, + CENTRE = 2, + RIGHT = 3, +} + +// ===================== +// Car Mod Types +// ===================== +export enum CARMODTYPE { + NONE = -1, + SPOILER = 0, + HOOD = 1, + ROOF = 2, + SIDESKIRT = 3, + LAMPS = 4, + NITRO = 5, + EXHAUST = 6, + WHEELS = 7, + STEREO = 8, + HYDRAULICS = 9, + FRONT_BUMPER = 10, + REAR_BUMPER = 11, + VENT_RIGHT = 12, + VENT_LEFT = 13, + FRONT_BULLBAR = 14, + REAR_BULLBAR = 15, +} + +// ===================== +// Vehicle Model Info +// ===================== +export enum VEHICLE_MODEL_INFO { + SIZE = 1, + FRONT_SEAT = 2, + REAR_SEAT = 3, + PETROL_CAP = 4, + WHEELS_FRONT = 5, + WHEELS_REAR = 6, + WHEELS_MID = 7, + FRONT_BUMPER_Z = 8, + REAR_BUMPER_Z = 9, +} + +// ===================== +// Vehicle Panel Status +// ===================== +export enum VEHICLE_PANEL_STATUS { + NONE = 0, +} + +// ===================== +// Vehicle Door Status +// ===================== +export enum VEHICLE_DOOR_STATUS { + NONE = 0, + BONNET_OPEN = 1, + BONNET_DAMAGED = 2, + BONNET_MISSING = 4, + BOOT_OPEN = 256, + BOOT_DAMAGED = 512, + BOOT_MISSING = 1024, + FRONT_LEFT_OPEN = 65536, + FRONT_LEFT_DAMAGED = 131072, + FRONT_LEFT_MISSING = 262144, + FRONT_RIGHT_OPEN = 16777216, + FRONT_RIGHT_DAMAGED = 33554432, + FRONT_RIGHT_MISSING = 67108864, +} + +// ===================== +// Vehicle Light Status +// ===================== +export enum VEHICLE_LIGHT_STATUS { + FRONT_LEFT_BROKEN = 1, + FRONT_RIGHT_BROKEN = 4, + REAR_BROKEN = 1024, +} + +// ===================== +// Vehicle Tyre Status +// ===================== +export enum VEHICLE_TIRE_STATUS { + FRONT_LEFT_POPPED = 8, + FRONT_RIGHT_POPPED = 2, + REAR_LEFT_POPPED = 4, + REAR_RIGHT_POPPED = 1, +} diff --git a/src/globals.ts b/src/globals.ts index 0839188..9dcce06 100644 --- a/src/globals.ts +++ b/src/globals.ts @@ -13,6 +13,7 @@ import { Vehicle, NPC, } from "./components"; +import { KEY, WEAPON } from "./enums"; import { PerPlayerEntityPool, PlayerPool, Pool } from "./pools"; // @ts-ignore @@ -48,7 +49,7 @@ interface IOMP { player: Player, actor: Actor, amount: number, - weapon: number, + weapon: WEAPON, part: number ) => any ): void; @@ -344,7 +345,7 @@ interface IOMP { npc: NPC, damager: NPC, damage: number, - weapon: number, + weapon: WEAPON, bodyPart: number ) => any ): void; @@ -363,7 +364,7 @@ interface IOMP { npc: NPC, damaged: NPC, damage: number, - weapon: number, + weapon: WEAPON, bodyPart: number ) => any ): void; @@ -439,7 +440,7 @@ interface IOMP { eventName: "npcShotMissed", callback: ( npc: NPC, - weapon: number, + weapon: WEAPON, offsetX: number, offsetY: number, offsetZ: number @@ -459,7 +460,7 @@ interface IOMP { callback: ( npc: NPC, player: Player, - weapon: number, + weapon: WEAPON, offsetX: number, offsetY: number, offsetZ: number @@ -479,7 +480,7 @@ interface IOMP { callback: ( npc: NPC, npcTarget: NPC, - weapon: number, + weapon: WEAPON, offsetX: number, offsetY: number, offsetZ: number @@ -499,7 +500,7 @@ interface IOMP { callback: ( npc: NPC, vehicle: Vehicle, - weapon: number, + weapon: WEAPON, offsetX: number, offsetY: number, offsetZ: number @@ -519,7 +520,7 @@ interface IOMP { callback: ( npc: NPC, object: Object, - weapon: number, + weapon: WEAPON, offsetX: number, offsetY: number, offsetZ: number @@ -539,7 +540,7 @@ interface IOMP { callback: ( npc: NPC, playerObject: PlayerObject, - weapon: number, + weapon: WEAPON, offsetX: number, offsetY: number, offsetZ: number @@ -856,7 +857,7 @@ interface IOMP { */ on( eventName: "playerKeyStateChange", - callback: (player: Player, newKeys: number, oldKeys: number) => any + callback: (player: Player, newKeys: KEY, oldKeys: KEY) => any ): void; /** @@ -946,7 +947,7 @@ interface IOMP { eventName: "playerShotMissed", callback: ( player: Player, - weapon: number, + weapon: WEAPON, x: number, y: number, z: number @@ -966,7 +967,7 @@ interface IOMP { callback: ( player: Player, target: Player, - weapon: number, + weapon: WEAPON, x: number, y: number, z: number @@ -986,7 +987,7 @@ interface IOMP { callback: ( player: Player, target: Player, - weapon: number, + weapon: WEAPON, x: number, y: number, z: number @@ -1006,7 +1007,7 @@ interface IOMP { callback: ( player: Player, target: Player, - weapon: number, + weapon: WEAPON, x: number, y: number, z: number @@ -1026,7 +1027,7 @@ interface IOMP { callback: ( player: Player, target: Player, - weapon: number, + weapon: WEAPON, x: number, y: number, z: number @@ -1064,7 +1065,7 @@ interface IOMP { player: Player, from: Player | undefined, amount: number, - weapon: number, + weapon: WEAPON, bodypart: number ) => any ): void; @@ -1083,7 +1084,7 @@ interface IOMP { player: Player, to: Player, amount: number, - weapon: number, + weapon: WEAPON, bodypart: number ) => any ): void; @@ -1389,7 +1390,7 @@ interface IOMP { player: Player, actor: Actor, amount: number, - weapon: number, + weapon: WEAPON, part: number ) => any ): void; @@ -1688,7 +1689,7 @@ interface IOMP { npc: NPC, damager: NPC, damage: number, - weapon: number, + weapon: WEAPON, bodyPart: number ) => any ): void; @@ -1707,7 +1708,7 @@ interface IOMP { npc: NPC, damaged: NPC, damage: number, - weapon: number, + weapon: WEAPON, bodyPart: number ) => any ): void; @@ -1783,7 +1784,7 @@ interface IOMP { eventName: "npcShotMissed", callback: ( npc: NPC, - weapon: number, + weapon: WEAPON, offsetX: number, offsetY: number, offsetZ: number @@ -1803,7 +1804,7 @@ interface IOMP { callback: ( npc: NPC, player: Player, - weapon: number, + weapon: WEAPON, offsetX: number, offsetY: number, offsetZ: number @@ -1823,7 +1824,7 @@ interface IOMP { callback: ( npc: NPC, npcTarget: NPC, - weapon: number, + weapon: WEAPON, offsetX: number, offsetY: number, offsetZ: number @@ -1843,7 +1844,7 @@ interface IOMP { callback: ( npc: NPC, vehicle: Vehicle, - weapon: number, + weapon: WEAPON, offsetX: number, offsetY: number, offsetZ: number @@ -1863,7 +1864,7 @@ interface IOMP { callback: ( npc: NPC, object: Object, - weapon: number, + weapon: WEAPON, offsetX: number, offsetY: number, offsetZ: number @@ -1883,7 +1884,7 @@ interface IOMP { callback: ( npc: NPC, playerObject: PlayerObject, - weapon: number, + weapon: WEAPON, offsetX: number, offsetY: number, offsetZ: number @@ -2209,7 +2210,7 @@ interface IOMP { */ addListener( eventName: "playerKeyStateChange", - callback: (player: Player, newKeys: number, oldKeys: number) => any + callback: (player: Player, newKeys: KEY, oldKeys: KEY) => any ): void; /** @@ -2302,7 +2303,7 @@ interface IOMP { eventName: "playerShotMissed", callback: ( player: Player, - weapon: number, + weapon: WEAPON, x: number, y: number, z: number @@ -2322,7 +2323,7 @@ interface IOMP { callback: ( player: Player, target: Player, - weapon: number, + weapon: WEAPON, x: number, y: number, z: number @@ -2342,7 +2343,7 @@ interface IOMP { callback: ( player: Player, target: Player, - weapon: number, + weapon: WEAPON, x: number, y: number, z: number @@ -2362,7 +2363,7 @@ interface IOMP { callback: ( player: Player, target: Player, - weapon: number, + weapon: WEAPON, x: number, y: number, z: number @@ -2382,7 +2383,7 @@ interface IOMP { callback: ( player: Player, target: Player, - weapon: number, + weapon: WEAPON, x: number, y: number, z: number @@ -2420,7 +2421,7 @@ interface IOMP { player: Player, from: Player | undefined, amount: number, - weapon: number, + weapon: WEAPON, bodypart: number ) => any ): void; @@ -2439,7 +2440,7 @@ interface IOMP { player: Player, to: Player, amount: number, - weapon: number, + weapon: WEAPON, bodypart: number ) => any ): void; @@ -2737,7 +2738,7 @@ interface IOMP { player: Player, actor: Actor, amount: number, - weapon: number, + weapon: WEAPON, part: number ) => any ): void; @@ -2755,7 +2756,7 @@ interface IOMP { player: Player, actor: Actor, amount: number, - weapon: number, + weapon: WEAPON, part: number ) => any ): void; @@ -3031,7 +3032,7 @@ interface IOMP { npc: NPC, damager: NPC, damage: number, - weapon: number, + weapon: WEAPON, bodyPart: number ) => any ): void; @@ -3049,7 +3050,7 @@ interface IOMP { npc: NPC, damaged: NPC, damage: number, - weapon: number, + weapon: WEAPON, bodyPart: number ) => any ): void; @@ -3119,7 +3120,7 @@ interface IOMP { eventName: "npcShotMissed", callback: ( npc: NPC, - weapon: number, + weapon: WEAPON, offsetX: number, offsetY: number, offsetZ: number @@ -3138,7 +3139,7 @@ interface IOMP { callback: ( npc: NPC, player: Player, - weapon: number, + weapon: WEAPON, offsetX: number, offsetY: number, offsetZ: number @@ -3157,7 +3158,7 @@ interface IOMP { callback: ( npc: NPC, npcTarget: NPC, - weapon: number, + weapon: WEAPON, offsetX: number, offsetY: number, offsetZ: number @@ -3176,7 +3177,7 @@ interface IOMP { callback: ( npc: NPC, vehicle: Vehicle, - weapon: number, + weapon: WEAPON, offsetX: number, offsetY: number, offsetZ: number @@ -3195,7 +3196,7 @@ interface IOMP { callback: ( npc: NPC, object: Object, - weapon: number, + weapon: WEAPON, offsetX: number, offsetY: number, offsetZ: number @@ -3214,7 +3215,7 @@ interface IOMP { callback: ( npc: NPC, playerObject: PlayerObject, - weapon: number, + weapon: WEAPON, offsetX: number, offsetY: number, offsetZ: number @@ -3519,7 +3520,7 @@ interface IOMP { */ removeListener( eventName: "playerKeyStateChange", - callback: (player: Player, newKeys: number, oldKeys: number) => any + callback: (player: Player, newKeys: KEY, oldKeys: KEY) => any ): void; /** @@ -3605,7 +3606,7 @@ interface IOMP { eventName: "playerShotMissed", callback: ( player: Player, - weapon: number, + weapon: WEAPON, x: number, y: number, z: number @@ -3624,7 +3625,7 @@ interface IOMP { callback: ( player: Player, target: Player, - weapon: number, + weapon: WEAPON, x: number, y: number, z: number @@ -3643,7 +3644,7 @@ interface IOMP { callback: ( player: Player, target: Player, - weapon: number, + weapon: WEAPON, x: number, y: number, z: number @@ -3662,7 +3663,7 @@ interface IOMP { callback: ( player: Player, target: Player, - weapon: number, + weapon: WEAPON, x: number, y: number, z: number @@ -3681,7 +3682,7 @@ interface IOMP { callback: ( player: Player, target: Player, - weapon: number, + weapon: WEAPON, x: number, y: number, z: number @@ -3717,7 +3718,7 @@ interface IOMP { player: Player, from: Player | undefined, amount: number, - weapon: number, + weapon: WEAPON, bodypart: number ) => any ): void; @@ -3735,7 +3736,7 @@ interface IOMP { player: Player, to: Player, amount: number, - weapon: number, + weapon: WEAPON, bodypart: number ) => any ): void; From 812e1051bc0fb6a3d03f2a7eadc2eb508cad00d8 Mon Sep 17 00:00:00 2001 From: FutureStunt <55154397+FutureStunt@users.noreply.github.com> Date: Fri, 7 Nov 2025 06:58:16 -0600 Subject: [PATCH 2/2] fix path --- src/components/All.ts | 2 +- src/components/Class.ts | 2 +- src/components/Core.ts | 2 +- src/components/Dialog.ts | 2 +- src/components/NPC.ts | 2 +- src/components/Object.ts | 2 +- src/components/Player.ts | 2 +- src/components/PlayerObject.ts | 2 +- src/components/PlayerTextDraw.ts | 2 +- src/components/Recording.ts | 2 +- src/components/TextDraw.ts | 2 +- src/components/Vehicle.ts | 2 +- src/main.ts | 1 + 13 files changed, 13 insertions(+), 12 deletions(-) diff --git a/src/components/All.ts b/src/components/All.ts index ee65e82..6e0f96c 100644 --- a/src/components/All.ts +++ b/src/components/All.ts @@ -1,6 +1,6 @@ import { Player } from "./index"; import { internal_omp } from "../globals"; -import { WEAPON } from "src/enums"; +import { WEAPON } from "../enums"; /** * All class diff --git a/src/components/Class.ts b/src/components/Class.ts index 401b50f..3de0e30 100644 --- a/src/components/Class.ts +++ b/src/components/Class.ts @@ -1,4 +1,4 @@ -import { WEAPON } from "src/enums"; +import { WEAPON } from "../enums"; import { PTR, internal_omp } from "../globals"; /** diff --git a/src/components/Core.ts b/src/components/Core.ts index 5fb7cca..dbdbb68 100644 --- a/src/components/Core.ts +++ b/src/components/Core.ts @@ -1,4 +1,4 @@ -import { PLAYER_MARKERS_MODE, WEAPON } from "src/enums"; +import { PLAYER_MARKERS_MODE, WEAPON } from "../enums"; import { internal_omp } from "../globals"; /** diff --git a/src/components/Dialog.ts b/src/components/Dialog.ts index c2fe0ec..ffb80b1 100644 --- a/src/components/Dialog.ts +++ b/src/components/Dialog.ts @@ -1,6 +1,6 @@ import { Player } from "./index"; import { internal_omp } from "../globals"; -import { DIALOG_STYLE } from "src/enums"; +import { DIALOG_STYLE } from "../enums"; /** * Dialog class diff --git a/src/components/NPC.ts b/src/components/NPC.ts index 1064ea9..b9eb39b 100644 --- a/src/components/NPC.ts +++ b/src/components/NPC.ts @@ -1,6 +1,6 @@ import { Player, Vehicle, ObjectMp, omp, PlayerObject } from "./index"; import { PTR, internal_omp } from "../globals"; -import { FIGHT_STYLE, KEY, SPECIAL_ACTION, WEAPON, WEAPONSKILL } from "src/enums"; +import { FIGHT_STYLE, KEY, SPECIAL_ACTION, WEAPON, WEAPONSKILL } from "../enums"; /** * NPC class diff --git a/src/components/Object.ts b/src/components/Object.ts index 30cb7cd..39178e1 100644 --- a/src/components/Object.ts +++ b/src/components/Object.ts @@ -1,6 +1,6 @@ import { Player, Vehicle, omp } from "./index"; import { PTR, internal_omp } from "../globals"; -import { OBJECT_MATERIAL_SIZE, OBJECT_MATERIAL_TEXT_ALIGN } from "src/enums"; +import { OBJECT_MATERIAL_SIZE, OBJECT_MATERIAL_TEXT_ALIGN } from "../enums"; /** * ObjectMp class diff --git a/src/components/Player.ts b/src/components/Player.ts index 6147bf0..3a8575b 100644 --- a/src/components/Player.ts +++ b/src/components/Player.ts @@ -1,6 +1,6 @@ import { Actor, Menu, ObjectMp, PlayerObject, Vehicle, omp } from "./index"; import { PTR, internal_omp } from "../globals"; -import { CAM_MOVE, DIALOG_STYLE, FIGHT_STYLE, FORCE_SYNC, KEY, MAPICON, SPECIAL_ACTION, SPECTATE_MODE, WEAPON, WEAPON_SLOT, WEAPONSKILL } from "src/enums"; +import { CAM_MOVE, DIALOG_STYLE, FIGHT_STYLE, FORCE_SYNC, KEY, MAPICON, SPECIAL_ACTION, SPECTATE_MODE, WEAPON, WEAPON_SLOT, WEAPONSKILL } from "../enums"; /** * Player class diff --git a/src/components/PlayerObject.ts b/src/components/PlayerObject.ts index 11b7929..ca6742c 100644 --- a/src/components/PlayerObject.ts +++ b/src/components/PlayerObject.ts @@ -1,6 +1,6 @@ import { ObjectMp, Player, Vehicle, omp } from "./index"; import { PTR, internal_omp } from "../globals"; -import { OBJECT_MATERIAL_SIZE, OBJECT_MATERIAL_TEXT_ALIGN } from "src/enums"; +import { OBJECT_MATERIAL_SIZE, OBJECT_MATERIAL_TEXT_ALIGN } from "../enums"; /** * PlayerObject class diff --git a/src/components/PlayerTextDraw.ts b/src/components/PlayerTextDraw.ts index 595af6f..90b388b 100644 --- a/src/components/PlayerTextDraw.ts +++ b/src/components/PlayerTextDraw.ts @@ -1,6 +1,6 @@ import { Player } from "./index"; import { PTR, internal_omp } from "../globals"; -import { TEXT_DRAW_ALIGN, TEXT_DRAW_FONT } from "src/enums"; +import { TEXT_DRAW_ALIGN, TEXT_DRAW_FONT } from "../enums"; /** * PlayerTextDraw class diff --git a/src/components/Recording.ts b/src/components/Recording.ts index 13726a1..905c333 100644 --- a/src/components/Recording.ts +++ b/src/components/Recording.ts @@ -1,6 +1,6 @@ import { Player } from "./index"; import { internal_omp } from "../globals"; -import { PLAYER_RECORDING_TYPE } from "src/enums"; +import { PLAYER_RECORDING_TYPE } from "../enums"; /** * Recording class diff --git a/src/components/TextDraw.ts b/src/components/TextDraw.ts index 77150ef..1e5c837 100644 --- a/src/components/TextDraw.ts +++ b/src/components/TextDraw.ts @@ -1,6 +1,6 @@ import { Player } from "./index"; import { PTR, internal_omp } from "../globals"; -import { TEXT_DRAW_ALIGN, TEXT_DRAW_FONT } from "src/enums"; +import { TEXT_DRAW_ALIGN, TEXT_DRAW_FONT } from "../enums"; /** * TextDraw class diff --git a/src/components/Vehicle.ts b/src/components/Vehicle.ts index b44a6ae..fa8930b 100644 --- a/src/components/Vehicle.ts +++ b/src/components/Vehicle.ts @@ -1,6 +1,6 @@ import { Player } from "./index"; import { PTR, internal_omp, omp } from "../globals"; -import { CARMODTYPE, VEHICLE_DOOR_STATUS, VEHICLE_LIGHT_STATUS, VEHICLE_MODEL_INFO, VEHICLE_PANEL_STATUS, VEHICLE_TIRE_STATUS } from "src/enums"; +import { CARMODTYPE, VEHICLE_DOOR_STATUS, VEHICLE_LIGHT_STATUS, VEHICLE_MODEL_INFO, VEHICLE_PANEL_STATUS, VEHICLE_TIRE_STATUS } from "../enums"; /** * Vehicle class diff --git a/src/main.ts b/src/main.ts index 6e1441b..17ecb01 100644 --- a/src/main.ts +++ b/src/main.ts @@ -24,6 +24,7 @@ import Recording from "./components/Recording"; import { omp } from "./globals"; export * from "./constants"; +export * from "./enums"; export { ObjectMp,