From 5b03d18ce2b8b223488afcc98424c4091a9135f0 Mon Sep 17 00:00:00 2001
From: "[VB]AWOL" <vbawol@veteranbastards.com>
Date: Mon, 11 Nov 2013 07:34:12 -0600
Subject: [PATCH] revert melee damage and damage reduction factors

---
 SQF/dayz_code/Configs/cfgAmmo.hpp                 | 10 +++++-----
 SQF/dayz_code/compile/fn_damageHandler.sqf        |  4 ----
 SQF/dayz_code/compile/fn_damageHandlerVehicle.sqf |  8 +-------
 SQF/dayz_code/compile/fn_damageHandlerZ.sqf       |  4 ----
 4 files changed, 6 insertions(+), 20 deletions(-)

diff --git a/SQF/dayz_code/Configs/cfgAmmo.hpp b/SQF/dayz_code/Configs/cfgAmmo.hpp
index 5b1c1c9fa..e56cabd59 100644
--- a/SQF/dayz_code/Configs/cfgAmmo.hpp
+++ b/SQF/dayz_code/Configs/cfgAmmo.hpp
@@ -44,7 +44,7 @@ class CfgAmmo {
 	};
 	class Melee;
 	class Machete_Swing_Ammo : Melee {
-		hit = 53;
+		hit = 15;
 		simulation = "shotBullet";
 		minRange = 1;
 		minRangeProbab = 0.8;
@@ -59,7 +59,7 @@ class CfgAmmo {
 		soundEngine[] = {"", db-80, 4};
 	};
 	class Hatchet_Swing_Ammo : Melee {
-		hit = 50;
+		hit = 12;
 		simulation = "shotBullet";
 		minRange = 1;
 		minRangeProbab = 0.8;
@@ -74,7 +74,7 @@ class CfgAmmo {
 		soundEngine[] = {"", db-80, 4};
 	};
 	class Crowbar_Swing_Ammo : Melee {
-		hit = 48;
+		hit = 10;
 		simulation = "shotBullet";
 		minRange = 1;
 		minRangeProbab = 0.8;
@@ -89,7 +89,7 @@ class CfgAmmo {
 		soundEngine[] = {"", db-80, 4};
 	};
 	class Fishing_Swing_Ammo : Melee {
-		hit = 45;
+		hit = 7;
 		simulation = "shotBullet";
 		minRange = 1;
 		minRangeProbab = 1;
@@ -104,7 +104,7 @@ class CfgAmmo {
 		soundEngine[] = {"", db-80, 4};
 	};
 	class Sledge_Swing_Ammo : Melee {
-		hit = 49;
+		hit = 15;
 		simulation = "shotBullet";
 		minRange = 1;
 		minRangeProbab = 0.8;
diff --git a/SQF/dayz_code/compile/fn_damageHandler.sqf b/SQF/dayz_code/compile/fn_damageHandler.sqf
index ad506fa55..bbd56e2de 100644
--- a/SQF/dayz_code/compile/fn_damageHandler.sqf
+++ b/SQF/dayz_code/compile/fn_damageHandler.sqf
@@ -15,10 +15,6 @@ _source = _this select 3;
 _ammo = _this select 4;
 _type = [_damage,_ammo] call fnc_usec_damageType;
 
-if (_type == 3) then {
-	_damage = _damage * 0.024;
-};
-
 _isMinor = (_hit in USEC_MinorWounds);
 _isHeadHit = (_hit == "head_hit");
 //_evType = "";
diff --git a/SQF/dayz_code/compile/fn_damageHandlerVehicle.sqf b/SQF/dayz_code/compile/fn_damageHandlerVehicle.sqf
index 8bc0a5958..55244ec11 100644
--- a/SQF/dayz_code/compile/fn_damageHandlerVehicle.sqf
+++ b/SQF/dayz_code/compile/fn_damageHandlerVehicle.sqf
@@ -9,13 +9,7 @@ _unit = _this select 0;
 _hit = _this select 1;
 _damage = _this select 2;
 //_source = _this select 3;
-_ammo = _this select 4;
-
-_type = [_damage,_ammo] call fnc_usec_damageType;
-
-if (_type == 3) then {
-	_damage = _damage * 0.024;
-};
+//_ammo = _this select 4;
 
 _total = _damage;
 
diff --git a/SQF/dayz_code/compile/fn_damageHandlerZ.sqf b/SQF/dayz_code/compile/fn_damageHandlerZ.sqf
index 8ddad3859..6c72c0c73 100644
--- a/SQF/dayz_code/compile/fn_damageHandlerZ.sqf
+++ b/SQF/dayz_code/compile/fn_damageHandlerZ.sqf
@@ -11,10 +11,6 @@ _projectile = 	_this select 4;
 
 if (local _zed) then {
 
-	if (_projectile isKindOf "Melee") then {
-		_damage = _damage * 0.024;
-	};
-
 	if (_damage > 1 and _projectile != "") then {
 		//Record deliberate critical damages
 		switch (_selection) do {