feat: added some player functions

dockfries · Sep 12, 2022 · bbf89f2 · bbf89f2
1 parent 28e59e5
commit bbf89f2
Show file tree

Hide file tree

Showing 4 changed files with 61 additions and 18 deletions.
diff --git a/src/controllers/player/basePlayer.ts b/src/controllers/player/basePlayer.ts
@@ -3,6 +3,7 @@ import {
   BanEx,
   GetPlayerName,
   SendClientMessage,
+  SendClientMessageToAll,
   SetPlayerName,
 } from "@/utils/helperUtils";
 import {
@@ -113,12 +114,15 @@ import {
   SetPlayerAmmo,
   GetPlayerAmmo,
   SetPlayerArmedWeapon,
+  SendDeathMessageToPlayer,
+  SendDeathMessage,
 } from "@/wrapper/functions";
 import { logger } from "@/logger";
 import { BaseGameMode } from "../gamemode";
 import {
   CameraCutStylesEnum,
   CameraModesEnum,
+  DamageDeathReasonEnum,
   FightingStylesEnum,
   InvalidEnum,
   PlayerStateEnum,
@@ -175,6 +179,14 @@ export abstract class BasePlayer {
     return SendClientMessage(this, color, msg);
   }
 
+  public static sendClientMessageToAll<P extends BasePlayer>(
+    players: Array<P>,
+    color: string,
+    msg: string
+  ) {
+    SendClientMessageToAll(players, color, msg);
+  }
+
   public isNpc(): boolean {
     return this._isNpc;
   }
@@ -714,7 +726,7 @@ export abstract class BasePlayer {
   public getWeaponState(): WeaponStatesEnum {
     return GetPlayerWeaponState(this.id);
   }
-  public giveWeapon(weaponid: number, ammo: number): number {
+  public giveWeapon(weaponid: WeaponEnum, ammo: number): number {
     return GivePlayerWeapon(this.id, weaponid, ammo);
   }
   public setAmmo(weaponid: number, ammo: number) {
@@ -726,4 +738,36 @@ export abstract class BasePlayer {
   public setArmedWeapon(weaponid: number): number {
     return SetPlayerArmedWeapon(this.id, weaponid);
   }
+  // not test
+  public clearDeathMessage() {
+    for (let i = 0; i < 5; i++) {
+      this.sendDeathMessageToPlayer(
+        InvalidEnum.PLAYER_ID,
+        InvalidEnum.PLAYER_ID,
+        DamageDeathReasonEnum.CONNECT
+      );
+    }
+  }
+  public sendDeathMessage<P extends BasePlayer>(
+    killer: P | InvalidEnum.PLAYER_ID,
+    weapon: WeaponEnum | DamageDeathReasonEnum
+  ): void {
+    SendDeathMessage(
+      killer === InvalidEnum.PLAYER_ID ? killer : killer.id,
+      this.id,
+      weapon
+    );
+  }
+  public sendDeathMessageToPlayer<P extends BasePlayer>(
+    killer: P | InvalidEnum.PLAYER_ID,
+    killee: P | InvalidEnum.PLAYER_ID,
+    weapon: WeaponEnum | DamageDeathReasonEnum
+  ): void {
+    SendDeathMessageToPlayer(
+      this.id,
+      killer === InvalidEnum.PLAYER_ID ? killer : killer.id,
+      killee === InvalidEnum.PLAYER_ID ? killee : killee.id,
+      weapon
+    );
+  }
 }
diff --git a/src/controllers/player/playersFunc.ts b/src/controllers/player/playersFunc.ts
diff --git a/src/enums/weapon.ts b/src/enums/weapon.ts
@@ -40,9 +40,6 @@ export enum WeaponEnum {
   FIREEXTINGUISHER = 42,
   CAMERA = 43,
   PARACHUTE = 46,
-  VEHICLE = 49,
-  DROWN = 53,
-  COLLISION = 54,
 }
 export enum WeaponSkillsEnum {
   PISTOL,
@@ -64,10 +61,22 @@ export enum BulletHitTypesEnum {
   OBJECT,
   PLAYER_OBJECT,
 }
+
 export enum WeaponStatesEnum {
   UNKNOWN = -1,
   NO_BULLETS,
   LAST_BULLET,
   MORE_BULLETS,
   RELOADING,
 }
+
+export enum DamageDeathReasonEnum {
+  VEHICLE = 49,
+  HELICOPTERBLADES = 50,
+  EXPLOSION = 51,
+  DROWN = 53,
+  COLLISION = 54,
+  CONNECT = 200,
+  DISCONNECT = 201,
+  SUICIDE = 255,
+}
diff --git a/src/wrapper/functions/index.ts b/src/wrapper/functions/index.ts
@@ -8,6 +8,7 @@ import {
   CameraModesEnum,
   CarModTypeEnum,
   ConnectionStatusEnum,
+  DamageDeathReasonEnum,
   FightingStylesEnum,
   KeysEnum,
   MarkerModesEnum,
@@ -17,6 +18,7 @@ import {
   SpectateModesEnum,
   TextDrawAlignEnum,
   VehicleModelInfoEnum,
+  WeaponEnum,
   WeaponSkillsEnum,
   WeaponStatesEnum,
 } from "@/enums";
@@ -46,7 +48,7 @@ export const SendPlayerMessageToAll = (
 export const SendDeathMessage = (
   killer: number,
   killee: number,
-  weapon: number
+  weapon: WeaponEnum | DamageDeathReasonEnum
 ): number => {
   return samp.callNative("SendDeathMessage", "iii", killer, killee, weapon);
 };
@@ -55,7 +57,7 @@ export const SendDeathMessageToPlayer = (
   playerid: number,
   killer: number,
   killee: number,
-  weapon: number
+  weapon: WeaponEnum | DamageDeathReasonEnum
 ): number => {
   return samp.callNative(
     "SendDeathMessageToPlayer",