From 8a206bcaf893612133c244979a96900268baa864 Mon Sep 17 00:00:00 2001 From: Vortrex <3858226+VortrexFTW@users.noreply.github.com> Date: Thu, 2 Mar 2023 08:08:36 -0600 Subject: [PATCH] Add weapon damage multiplier --- scripts/client/core.js | 1 + scripts/client/event.js | 11 +++++++++++ scripts/client/netevents.js | 7 +++++++ 3 files changed, 19 insertions(+) diff --git a/scripts/client/core.js b/scripts/client/core.js index 459f599d..3997e9a8 100644 --- a/scripts/client/core.js +++ b/scripts/client/core.js @@ -32,6 +32,7 @@ let logLevel = LOG_INFO | LOG_DEBUG; let weaponDamageEnabled = {}; let weaponDamageEvent = {}; +let weaponDamageMultiplier = 1.0; let forceWeapon = 0; let forceWeaponAmmo = 0; diff --git a/scripts/client/event.js b/scripts/client/event.js index 151f4d1f..10ab468f 100644 --- a/scripts/client/event.js +++ b/scripts/client/event.js @@ -47,6 +47,7 @@ function addAllEventHandlers() { addEventHandler("OnMapLoaded", onMapLoaded); addEventHandler("OnPedEnteringVehicle", onPedEnteredVehicle); addEventHandler("OnPedExitingVehicle", onPedExitedVehicle); + addEventHandler("OnPedInflictDamage", onPedHit); } } @@ -262,6 +263,16 @@ function onPedInflictDamage(event, damagedEntity, damagerEntity, weaponId, healt // =========================================================================== +function onPedHit(event, hitPed, vec1, vec2, vec3, hitType, damage, bodyPart) { + logToConsole(LOG_DEBUG, `[V.RP.Event] Ped ${hitPed.id} (${hitPed.name}) hit using type ${hitType}, causing ${damage} to body part ${bodyPart}`); + event.preventDefault(); + if (hitPed == localPlayer) { + localPlayer.health = localPlayer.health - (damage * weaponDamageMultiplier); + } +} + +// =========================================================================== + function onPedEnteredSphere(event, ped, sphere) { if (sphere == jobRouteLocationSphere) { enteredJobRouteSphere(); diff --git a/scripts/client/netevents.js b/scripts/client/netevents.js index dd23d24c..2eba3781 100644 --- a/scripts/client/netevents.js +++ b/scripts/client/netevents.js @@ -176,6 +176,7 @@ function addAllNetworkHandlers() { addNetworkEventHandler("v.rp.profanityFilter", setProfanityFilterState); addNetworkEventHandler("v.rp.currencyString", receiveCurrencyStringFromServer); addNetworkEventHandler("v.rp.token", serverRequestedToken); + addNetworkEventHandler("v.rp.incomingDamageMultiplier", setIncomingDamageMultiplier); } // =========================================================================== @@ -495,4 +496,10 @@ function serverRequestedToken() { sendNetworkEventToServer("v.rp.token", token); } +// =========================================================================== + +function setIncomingDamageMultiplier(tempMultiplier) { + weaponDamageMultiplier = tempMultiplier; +} + // =========================================================================== \ No newline at end of file