Add Vehicle Damage (ACE2 port) & Enhance Cook-Off

addons/aircraft/CfgAmmo.hpp

@@ -23,6 +23,7 @@ class CfgAmmo {
         explosive = 0;
         CraterEffects = "";
         explosionEffects = "";
+        EGVAR(vehicle_damage,incendiary) = 0.5;
     };
 
     // adjust minigun caliber and deflection to other ammo
@@ -58,6 +59,7 @@ class CfgAmmo {
        indirectHit = 2.5; // default: 4
        indirectHitRange = 1; // default: 3
        fuseDistance = 0.2; // default: 10
+       EGVAR(vehicle_damage,incendiary) = 1.0;
     };
 
    // adds submunition logic, enabling multiple rounds per frame
@@ -69,6 +71,7 @@ class CfgAmmo {
        model = "\A3\Weapons_f\Data\bullettracer\tracer_red.p3d";
        triggerTime = 0.005;
        ACE_caliber = 1.4;
+       EGVAR(vehicle_damage,incendiary) = 1.0;
    };
 
    class ACE_Gatling_30mm_Sub_AP: ACE_Gatling_30mm_Sub_HEI {

addons/ballistics/CfgAmmo.hpp

@@ -614,6 +614,7 @@ class CfgAmmo {
         ACE_dragModel=7;
         ACE_muzzleVelocities[]={880, 895, 900};
         ACE_barrelLengths[]={508.0, 685.8, 711.2};
+        EGVAR(vehicle_damage,incendiary) = 1.0;
     };
     class B_127x33_Ball: BulletBase {
         tracerScale = 1.3; //1.2;
@@ -665,6 +666,7 @@ class CfgAmmo {
         ACE_dragModel=1;
         ACE_muzzleVelocities[]={900};
         ACE_barrelLengths[]={736.6};
+        EGVAR(vehicle_damage,incendiary) = 1.0;
     };
     class ACE_127x99_Ball_AMAX : B_127x99_Ball {
         timeToLive=10;

addons/cookoff/CfgVehicles.hpp

@@ -15,24 +15,6 @@ class CfgVehicles {
         sound = QGVAR(CookOff_high);
     };
 
-    class ThingX;
-    class GVAR(Turret_MBT_01): ThingX {
-        author = ECSTRING(common,ACETeam);
-        _generalMacro = QGVAR(Turret_MBT_01);
-        scope = 1;
-        displayName = CSTRING(generic_turret_wreck);
-        model = "\A3\Structures_F\Wrecks\Wreck_Slammer_turret_F.p3d";
-        icon = "\A3\armor_f_gamma\MBT_01\Data\ui\map_slammer_mk4_ca.paa";
-    };
-    class GVAR(Turret_MBT_02): ThingX {
-        author = ECSTRING(common,ACETeam);
-        _generalMacro = QGVAR(Turret_MBT_02);
-        scope = 1;
-        displayName = CSTRING(generic_turret_wreck);
-        model = "\A3\Structures_F\Wrecks\Wreck_T72_turret_F.p3d";
-        icon = "\A3\armor_f_gamma\MBT_02\Data\UI\map_MBT_02_ca.paa";
-    };
-
     class Tank;
     class Tank_F: Tank {
         GVAR(ammoLocation) = "HitHull";
@@ -60,15 +42,6 @@ class CfgVehicles {
         GVAR(ignoreTurret) = 1;
     };
 
-    class B_MBT_01_base_F;
-    class B_MBT_01_cannon_F: B_MBT_01_base_F {
-        GVAR(turret)[] = {QGVAR(Turret_MBT_01),{0,-1,0.5}};
-    };
-
-    class O_MBT_02_base_F;
-    class O_MBT_02_cannon_F: O_MBT_02_base_F {
-        GVAR(turret)[] = {QGVAR(Turret_MBT_02),{0,-1,0}};
-    };
 
     class MRAP_01_base_F: Car_F {
         GVAR(engineSmokeOffset)[] = {0,-2,0};

addons/cookoff/XEH_PREP.hpp

@@ -2,8 +2,9 @@
 PREP(handleDamage);
 PREP(engineFire);
 PREP(cookOff);
+PREP(smoke);
+PREP(cookOffEffect);
 PREP(cookOffBox);
-PREP(blowOffTurret);
 PREP(detonateAmmunition);
 PREP(getVehicleAmmo);
-PREP(handleDamageEjectIfDestroyed);
+

addons/cookoff/XEH_postInit.sqf

@@ -1,72 +1,31 @@
 #include "script_component.hpp"
 
 [QGVAR(engineFire), FUNC(engineFire)] call CBA_fnc_addEventHandler;
-[QGVAR(cookOff), FUNC(cookOff)] call CBA_fnc_addEventHandler;
-[QGVAR(cookOffBox), FUNC(cookOffBox)] call CBA_fnc_addEventHandler;
-
-GVAR(cacheTankDuplicates) = call CBA_fnc_createNamespace;
-
-// cookoff and burning engine
-["Tank", "init", {
+[QGVAR(cookOff), {
     params ["_vehicle"];
-
-    private _typeOf = typeOf _vehicle;
-
-    if (isNil {GVAR(cacheTankDuplicates) getVariable _typeOf}) then {
-        private _hitpoints = (getAllHitPointsDamage _vehicle param [0, []]) apply {toLower _x};
-        private _duplicateHitpoints = [];
-
-        {
-            if ((_x != "") && {_x in (_hitpoints select [0,_forEachIndex])}) then {
-                _duplicateHitpoints pushBack _forEachIndex;
-            };
-        } forEach _hitpoints;
-
-        TRACE_2("dupes",_typeOf,_duplicateHitpoints);
-        GVAR(cacheTankDuplicates) setVariable [_typeOf, _duplicateHitpoints];
+    if (local _vehicle) then {
+        _this call FUNC(cookOff);
     };
+}] call CBA_fnc_addEventHandler;
+[QGVAR(cookOffEffect), FUNC(cookOffEffect)] call CBA_fnc_addEventHandler;
+[QGVAR(smoke), FUNC(smoke)] call CBA_fnc_addEventHandler;
+[QGVAR(cookOffBox), FUNC(cookOffBox)] call CBA_fnc_addEventHandler;
 
-    _vehicle addEventHandler ["HandleDamage", {
-        ["tank", _this] call FUNC(handleDamage);
-    }];
-}, nil, nil, true] call CBA_fnc_addClassEventHandler;
-
-["Wheeled_APC_F", "init", {
-    params ["_vehicle"];
-
-    private _typeOf = typeOf _vehicle;
-
-    if (isNil {GVAR(cacheTankDuplicates) getVariable _typeOf}) then {
-        private _hitpoints = (getAllHitPointsDamage _vehicle param [0, []]) apply {toLower _x};
-        private _duplicateHitpoints = [];
-
-        {
-            if ((_x != "") && {_x in (_hitpoints select [0,_forEachIndex])}) then {
-                _duplicateHitpoints pushBack _forEachIndex;
-            };
-        } forEach _hitpoints;
-
-        TRACE_2("dupes",_typeOf,_duplicateHitpoints);
-        GVAR(cacheTankDuplicates) setVariable [_typeOf, _duplicateHitpoints];
+[QGVAR(cleanupEffects), {
+    params ["_vehicle", ["_effects", []]];
+
+    _effects = _effects + _vehicle getVariable [QGVAR(effects), []];
+    if !(_effects isEqualTo []) then {
+         { deleteVehicle _x } count _effects;
     };
+}] call CBA_fnc_addEventHandler;
 
-    _vehicle addEventHandler ["HandleDamage", {
-        ["tank", _this] call FUNC(handleDamage);
-    }];
-}, nil, nil, true] call CBA_fnc_addClassEventHandler;
-
-["Car", "init", {
-    params ["_vehicle"];
-
-    _vehicle addEventHandler ["HandleDamage", {
-        ["car", _this] call FUNC(handleDamage);
-    }];
-}, nil, ["Wheeled_APC_F"], true] call CBA_fnc_addClassEventHandler;
+GVAR(cacheTankDuplicates) = call CBA_fnc_createNamespace;
 
 ["ReammoBox_F", "init", {
     (_this select 0) addEventHandler ["HandleDamage", {
         if ((_this select 0) getVariable [QGVAR(enableAmmoCookoff), GVAR(enableAmmobox)]) then {
-            ["box", _this] call FUNC(handleDamage);
+            _this call FUNC(handleDamage);
         };
     }];
 }, nil, nil, true] call CBA_fnc_addClassEventHandler;
@@ -83,39 +42,3 @@ GVAR(cacheTankDuplicates) = call CBA_fnc_createNamespace;
         [_vehicle, _mags, _total] call FUNC(detonateAmmunition);
     };
 }, nil, ["Man","StaticWeapon"]] call CBA_fnc_addClassEventHandler;
-
-// blow off turret effect
-["Tank", "killed", {
-    params ["_vehicle", "", "", "_useEffects"];
-    if (
-        _useEffects &&
-        _vehicle getVariable [QGVAR(enable), GVAR(enable)] in [1, 2, true]
-    ) then {
-        if (random 1 < 0.15) then {
-            _vehicle call FUNC(blowOffTurret);
-        };
-    };
-}] call CBA_fnc_addClassEventHandler;
-
-// event to add a turret to a curator if the vehicle already belonged to that curator
-if (isServer) then {
-    [QGVAR(addTurretToEditable), {
-        params ["_vehicle", "_turret"];
-
-        {
-            if (_vehicle in curatorEditableObjects _x) then {
-                _x addCuratorEditableObjects [[_turret], false];
-            };
-        } forEach allCurators;
-    }] call CBA_fnc_addEventHandler;
-};
-
-// init eject from destroyed vehicle
-{
-    [_x, "init", {
-        params ["_vehicle"];
-        if (!alive _vehicle) exitWith {};
-        TRACE_2("ejectIfDestroyed init",_vehicle,typeOf _vehicle);
-        _vehicle addEventHandler ["HandleDamage", {call FUNC(handleDamageEjectIfDestroyed)}];
-    }, true, [], true] call CBA_fnc_addClassEventHandler;
-} forEach EJECT_IF_DESTROYED_VEHICLES;