From ee2a13fea0f29f6f442e107fe539e68c757197b3 Mon Sep 17 00:00:00 2001 From: Fabian Date: Wed, 21 Apr 2021 19:45:09 +0200 Subject: [PATCH] test damage stuff --- ReallifeGamemode.Client/util/weapondamage.ts | 8 ++++++++ ReallifeGamemode.Server/Events/PlayerEvent.cs | 6 ++++++ 2 files changed, 14 insertions(+) diff --git a/ReallifeGamemode.Client/util/weapondamage.ts b/ReallifeGamemode.Client/util/weapondamage.ts index 1907a03a..e0ded85c 100644 --- a/ReallifeGamemode.Client/util/weapondamage.ts +++ b/ReallifeGamemode.Client/util/weapondamage.ts @@ -7,6 +7,14 @@ player.setSuffersCriticalHits(false); }); + mp.events.add('outgoingDamage', (sourceEntity, targetEntity, sourcePlayer, weapon, boneIndex, damage) => { + mp.gui.chat.push("outdmg"); + }); + + mp.events.add('incomingDamage', (sourceEntity, targetEntity, sourcePlayer, weapon, boneIndex, damage) => { + mp.gui.chat.push("indmg"); + }); + mp.events.add("render", () => { if (blockInput) { mp.game.controls.disableControlAction(32, 142, true); diff --git a/ReallifeGamemode.Server/Events/PlayerEvent.cs b/ReallifeGamemode.Server/Events/PlayerEvent.cs index 886d25fe..c504344d 100644 --- a/ReallifeGamemode.Server/Events/PlayerEvent.cs +++ b/ReallifeGamemode.Server/Events/PlayerEvent.cs @@ -3,11 +3,17 @@ using System.Collections.Generic; using System.Text; using GTANetworkAPI; using ReallifeGamemode.Server.Extensions; +using ReallifeGamemode.Server.Services; namespace ReallifeGamemode.Server.Events { internal class PlayerEvent : Script { + [ServerEvent(Event.PlayerDamage)] + public void OnPlayerDamage(Player player, float healthLoss, float armorLoss) { + ChatService.Broadcast("dmg"); + } + [RemoteEvent("CLIENT:SET_InFrontOfPos")] public void SetFrontOfPos(Player player, Vector3 pos) {