revert melee damage and damage reduction factors

This commit is contained in:
[VB]AWOL
2013-11-11 07:34:12 -06:00
parent 332dc68919
commit 5b03d18ce2
4 changed files with 6 additions and 20 deletions

View File

@@ -44,7 +44,7 @@ class CfgAmmo {
}; };
class Melee; class Melee;
class Machete_Swing_Ammo : Melee { class Machete_Swing_Ammo : Melee {
hit = 53; hit = 15;
simulation = "shotBullet"; simulation = "shotBullet";
minRange = 1; minRange = 1;
minRangeProbab = 0.8; minRangeProbab = 0.8;
@@ -59,7 +59,7 @@ class CfgAmmo {
soundEngine[] = {"", db-80, 4}; soundEngine[] = {"", db-80, 4};
}; };
class Hatchet_Swing_Ammo : Melee { class Hatchet_Swing_Ammo : Melee {
hit = 50; hit = 12;
simulation = "shotBullet"; simulation = "shotBullet";
minRange = 1; minRange = 1;
minRangeProbab = 0.8; minRangeProbab = 0.8;
@@ -74,7 +74,7 @@ class CfgAmmo {
soundEngine[] = {"", db-80, 4}; soundEngine[] = {"", db-80, 4};
}; };
class Crowbar_Swing_Ammo : Melee { class Crowbar_Swing_Ammo : Melee {
hit = 48; hit = 10;
simulation = "shotBullet"; simulation = "shotBullet";
minRange = 1; minRange = 1;
minRangeProbab = 0.8; minRangeProbab = 0.8;
@@ -89,7 +89,7 @@ class CfgAmmo {
soundEngine[] = {"", db-80, 4}; soundEngine[] = {"", db-80, 4};
}; };
class Fishing_Swing_Ammo : Melee { class Fishing_Swing_Ammo : Melee {
hit = 45; hit = 7;
simulation = "shotBullet"; simulation = "shotBullet";
minRange = 1; minRange = 1;
minRangeProbab = 1; minRangeProbab = 1;
@@ -104,7 +104,7 @@ class CfgAmmo {
soundEngine[] = {"", db-80, 4}; soundEngine[] = {"", db-80, 4};
}; };
class Sledge_Swing_Ammo : Melee { class Sledge_Swing_Ammo : Melee {
hit = 49; hit = 15;
simulation = "shotBullet"; simulation = "shotBullet";
minRange = 1; minRange = 1;
minRangeProbab = 0.8; minRangeProbab = 0.8;

View File

@@ -15,10 +15,6 @@ _source = _this select 3;
_ammo = _this select 4; _ammo = _this select 4;
_type = [_damage,_ammo] call fnc_usec_damageType; _type = [_damage,_ammo] call fnc_usec_damageType;
if (_type == 3) then {
_damage = _damage * 0.024;
};
_isMinor = (_hit in USEC_MinorWounds); _isMinor = (_hit in USEC_MinorWounds);
_isHeadHit = (_hit == "head_hit"); _isHeadHit = (_hit == "head_hit");
//_evType = ""; //_evType = "";

View File

@@ -9,13 +9,7 @@ _unit = _this select 0;
_hit = _this select 1; _hit = _this select 1;
_damage = _this select 2; _damage = _this select 2;
//_source = _this select 3; //_source = _this select 3;
_ammo = _this select 4; //_ammo = _this select 4;
_type = [_damage,_ammo] call fnc_usec_damageType;
if (_type == 3) then {
_damage = _damage * 0.024;
};
_total = _damage; _total = _damage;

View File

@@ -11,10 +11,6 @@ _projectile = _this select 4;
if (local _zed) then { if (local _zed) then {
if (_projectile isKindOf "Melee") then {
_damage = _damage * 0.024;
};
if (_damage > 1 and _projectile != "") then { if (_damage > 1 and _projectile != "") then {
//Record deliberate critical damages //Record deliberate critical damages
switch (_selection) do { switch (_selection) do {