From 8222330952ff2ddbe7c70867042480152012eb43 Mon Sep 17 00:00:00 2001
From: Vortrex <3858226+VortrexFTW@users.noreply.github.com>
Date: Wed, 19 Jan 2022 13:01:41 -0600
Subject: [PATCH] Fixes for damage system

---
 scripts/server/item.js | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/scripts/server/item.js b/scripts/server/item.js
index 3d7367ba..49bce08b 100644
--- a/scripts/server/item.js
+++ b/scripts/server/item.js
@@ -826,8 +826,9 @@ function playerUseItem(client, hotBarSlot) {
 
 		case VRR_ITEM_USETYPE_SMOKEDRUG:
 			meActionToNearbyPlayers(client, `smokes some ${getItemName(itemIndex)}`);
-			if(getPlayerData(client).incomingDamageMultiplier-getItemTypeData(getItemData(itemIndex).itemTypeIndex).useValue > 25) {
-				getPlayerData(client).incomingDamageMultiplier = getPlayerData(client).incomingDamageMultiplier-getItemTypeData(getItemData(itemIndex).itemTypeIndex).useValue;
+			getPlayerData(client).incomingDamageMultiplier = getPlayerData(client).incomingDamageMultiplier-(getItemTypeData(getItemData(itemIndex).itemTypeIndex).useValue/100);
+			if(getPlayerData(client).incomingDamageMultiplier < 0.25) {
+				getPlayerData(client).incomingDamageMultiplier = 0.25;
 			}
 			deleteItem(itemIndex);
 			switchPlayerActiveHotBarSlot(client, -1);
@@ -835,8 +836,9 @@ function playerUseItem(client, hotBarSlot) {
 
 		case VRR_ITEM_USETYPE_SNORTDRUG:
 			meActionToNearbyPlayers(client, `snorts some ${getItemName(itemIndex)}`);
-			if(getPlayerData(client).incomingDamageMultiplier-getItemTypeData(getItemData(itemIndex).itemTypeIndex).useValue > 25) {
-				getPlayerData(client).incomingDamageMultiplier = getPlayerData(client).incomingDamageMultiplier-getItemTypeData(getItemData(itemIndex).itemTypeIndex).useValue;
+			getPlayerData(client).incomingDamageMultiplier = getPlayerData(client).incomingDamageMultiplier-(getItemTypeData(getItemData(itemIndex).itemTypeIndex).useValue/100);
+			if(getPlayerData(client).incomingDamageMultiplier < 0.25) {
+				getPlayerData(client).incomingDamageMultiplier = 0.25;
 			}
 			deleteItem(itemIndex);
 			switchPlayerActiveHotBarSlot(client, -1);
@@ -844,8 +846,9 @@ function playerUseItem(client, hotBarSlot) {
 
 		case VRR_ITEM_USETYPE_INJECTDRUG:
 			meActionToNearbyPlayers(client, `shoots up some ${getItemName(itemIndex)}`);
-			if(getPlayerData(client).incomingDamageMultiplier-getItemTypeData(getItemData(itemIndex).itemTypeIndex).useValue > 25) {
-				getPlayerData(client).incomingDamageMultiplier = getPlayerData(client).incomingDamageMultiplier-getItemTypeData(getItemData(itemIndex).itemTypeIndex).useValue;
+			getPlayerData(client).incomingDamageMultiplier = getPlayerData(client).incomingDamageMultiplier-(getItemTypeData(getItemData(itemIndex).itemTypeIndex).useValue/100);
+			if(getPlayerData(client).incomingDamageMultiplier < 0.25) {
+				getPlayerData(client).incomingDamageMultiplier = 0.25;
 			}
 			deleteItem(itemIndex);
 			switchPlayerActiveHotBarSlot(client, -1);