hamyack/GTA4RP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes for damage system

Browse Source
This commit is contained in:
Vortrex
2022-01-19 12:58:06 -06:00
parent 1427c8ff6c
commit 62efe28936
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
scripts/server/client.js
View File

@@ -25,6 +25,7 @@ function addAllNetworkHandlers() {
addNetworkEventHandler("vrr.promptAnswerNo", playerPromptAnswerNo); addNetworkEventHandler("vrr.promptAnswerNo", playerPromptAnswerNo);
addNetworkEventHandler("vrr.promptAnswerYes", playerPromptAnswerYes); addNetworkEventHandler("vrr.promptAnswerYes", playerPromptAnswerYes);
addNetworkEventHandler("vrr.toggleGUI", playerToggledGUI); addNetworkEventHandler("vrr.toggleGUI", playerToggledGUI);
addNetworkEventHandler("vrr.2fa", checkPlayerTwoFactorAuthentication);
// AFK // AFK
addNetworkEventHandler("vrr.afk", playerChangeAFKState); addNetworkEventHandler("vrr.afk", playerChangeAFKState);
@@ -708,15 +709,13 @@ function playerDamagedByPlayer(client, damagerEntityName, weaponId, pedPiece, he
break; break;
case VRR_WEAPON_DAMAGE_EVENT_NORMAL: case VRR_WEAPON_DAMAGE_EVENT_NORMAL:
let reducedDamage = healthLoss*getPlayerData(client).incomingDamageMultiplier; logToConsole(LOG_DEBUG, `[VRR.Client] ${getPlayerDisplayForConsole(client)}'s damager ${getPlayerDisplayForConsole(damagerEntity)} caused ${healthLoss} damage (damage reduction makes it ${(healthLoss*getPlayerData(client).incomingDamageMultiplier)})`);
logToConsole(LOG_DEBUG, `[VRR.Client] ${getPlayerDisplayForConsole(client)}'s damager ${getPlayerDisplayForConsole(damagerEntity)} caused ${healthLoss} damage (damage reduction makes it ${reducedDamage})`); setPlayerHealth(client, getPlayerHealth(client)-(healthLoss*getPlayerData(client).incomingDamageMultiplier));
getPlayerData(client).health = getPlayerData(client).health-reducedDamage;
setPlayerHealth(client, getPlayerData(client).health);
break; break;
default: default:
getPlayerData(client).health = getPlayerData(client).health-(healthLoss*getPlayerData(client).incomingDamageMultiplier); logToConsole(LOG_DEBUG, `[VRR.Client] ${getPlayerDisplayForConsole(client)}'s damager ${getPlayerDisplayForConsole(damagerEntity)} caused ${healthLoss} damage (damage reduction makes it ${(healthLoss*getPlayerData(client).incomingDamageMultiplier)})`);
setPlayerHealth(client, getPlayerData(client).health); setPlayerHealth(client, getPlayerHealth(client)-(healthLoss*getPlayerData(client).incomingDamageMultiplier));
break; break;
} }
} }