mirror of
https://github.com/acemod/ACE3.git
synced 2024-08-30 18:23:18 +00:00
Vehicle Damage - Let AP trigger ERA/SLAT (#10169)
Let AP trigger ERA/SLAT
This commit is contained in:
parent
7838dea543
commit
0b2a8f23e6
@ -313,11 +313,11 @@ switch (_hitArea) do {
|
|||||||
case "slat": {
|
case "slat": {
|
||||||
TRACE_2("hit slat",_warheadType,_warheadTypeStr);
|
TRACE_2("hit slat",_warheadType,_warheadTypeStr);
|
||||||
// incredibly small chance of AP destroying SLAT
|
// incredibly small chance of AP destroying SLAT
|
||||||
if (_warheadType isEqualTo WARHEAD_TYPE_HEAT || { _warheadType isEqualTo WARHEAD_TYPE_TANDEM } || { _warheadType isEqualTo WARHEAD_TYPE_HE } || { 0.01 > random 1 }) then {
|
if (_warheadType in [WARHEAD_TYPE_HE, WARHEAD_TYPE_AP, WARHEAD_TYPE_HEAT, WARHEAD_TYPE_TANDEM] || { 0.01 > random 1 }) then {
|
||||||
private _currentDamage = _vehicle getHitIndex _hitIndex;
|
private _currentDamage = _vehicle getHitIndex _hitIndex;
|
||||||
TRACE_3("damaged slat",_warheadType,_warheadTypeStr,_currentDamage);
|
TRACE_3("damaged slat",_warheadType,_warheadTypeStr,_currentDamage);
|
||||||
|
|
||||||
if (_warheadType isEqualTo WARHEAD_TYPE_HEAT || { _warheadType isEqualTo WARHEAD_TYPE_TANDEM }) then {
|
if (_warheadType in [WARHEAD_TYPE_HEAT, WARHEAD_TYPE_TANDEM, WARHEAD_TYPE_AP]) then {
|
||||||
[_vehicle, _hitIndex, _hitpointName, 1] call FUNC(addDamage);
|
[_vehicle, _hitIndex, _hitpointName, 1] call FUNC(addDamage);
|
||||||
} else {
|
} else {
|
||||||
[_vehicle, _hitIndex, _hitpointName, _currentDamage + (0.5 max random 1)] call FUNC(addDamage);
|
[_vehicle, _hitIndex, _hitpointName, _currentDamage + (0.5 max random 1)] call FUNC(addDamage);
|
||||||
@ -330,7 +330,7 @@ switch (_hitArea) do {
|
|||||||
};
|
};
|
||||||
case "era": {
|
case "era": {
|
||||||
TRACE_2("hit era",_warheadType,_warheadTypeStr);
|
TRACE_2("hit era",_warheadType,_warheadTypeStr);
|
||||||
if (_warheadType isEqualTo WARHEAD_TYPE_HEAT || { _warheadType isEqualTo WARHEAD_TYPE_TANDEM } || { 0.05 > random 1 }) then {
|
if (_warheadType in [WARHEAD_TYPE_AP, WARHEAD_TYPE_HEAT, WARHEAD_TYPE_TANDEM] || { 0.05 > random 1 }) then {
|
||||||
private _currentDamage = _vehicle getHitIndex _hitIndex;
|
private _currentDamage = _vehicle getHitIndex _hitIndex;
|
||||||
TRACE_3("damaged era",_warheadType,_warheadTypeStr,_currentDamage);
|
TRACE_3("damaged era",_warheadType,_warheadTypeStr,_currentDamage);
|
||||||
[_vehicle, _hitIndex, _hitpointName, 1] call FUNC(addDamage);
|
[_vehicle, _hitIndex, _hitpointName, 1] call FUNC(addDamage);
|
||||||
|
Loading…
Reference in New Issue
Block a user