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

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";
@@ -62,7 +44,7 @@ class CfgVehicles {
 
     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;

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,29 @@
 #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", {
-    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];
-    };
-
-    _vehicle addEventHandler ["HandleDamage", {
-        ["tank", _this] call FUNC(handleDamage);
-    }];
-}, nil, nil, true] call CBA_fnc_addClassEventHandler;
-
-["Wheeled_APC_F", "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;
-
-["Car", "init", {
+[QGVAR(cleanupEffects), {
     params ["_vehicle"];
+
+    private _effects = _vehicle getVariable [QGVAR(effects), []];
+    _effects count {deleteVehicle _x };
+}] call CBA_fnc_addEventHandler;
 
-    _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;
@@ -81,34 +38,4 @@ GVAR(cacheTankDuplicates) = call CBA_fnc_createNamespace;
     };
 }, nil, ["Man","StaticWeapon"]] call CBA_fnc_addClassEventHandler;
 
-// blow off turret effect
-["Tank", "killed", {
-    if ((_this select 0) getVariable [QGVAR(enable), GVAR(enable)] in [1, 2, true]) then {
-        if (random 1 < 0.15) then {
-            (_this select 0) 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;

addons/cookoff/functions/fnc_cookOff.sqf

@@ -1,140 +1,97 @@
 #include "script_component.hpp"
 /*
- * Author: KoffeinFlummi, commy2
+ * Author: Brandon (TCVM)
  * Start a cook-off in the given vehicle.
  *
  * Arguments:
  * 0: Vehicle <Object>
+ * 1: Intensity of fire <Number>
  *
  * Return Value:
  * None
  *
  * Example:
- * [(vehicle player)] call ace_cookoff_fnc_cookOff
+ * [(vehicle player), 3] call ace_cookoff_fnc_cookOff
  *
  * Public: No
  */
 
-params ["_vehicle"];
+params ["_vehicle", "_intensity", ["_instigator", objNull], ["_smokeDelayEnabled", true], ["_ammoDetonationChance", 0], ["_detonateAfterCookoff", false]];
 
 if (_vehicle getVariable [QGVAR(isCookingOff), false]) exitWith {};
-_vehicle setVariable [QGVAR(isCookingOff), true];
+_vehicle setVariable [QGVAR(isCookingOff), true, true];
 
-if (local _vehicle) then {
-    [QGVAR(cookOff), _vehicle] call CBA_fnc_globalEvent;
-};
-
-[{
-    params ["_vehicle"];
-
-    private _config = _vehicle call CBA_fnc_getObjectConfig;
-    private _positions = getArray (_config >> QGVAR(cookoffSelections)) select {!((_vehicle selectionPosition _x) isEqualTo [0,0,0])};
+private _config = _vehicle call CBA_fnc_getObjectConfig;
+private _positions = getArray (_config >> QGVAR(cookoffSelections)) select {!((_vehicle selectionPosition _x) isEqualTo [0,0,0])};
 
+if (_positions isEqualTo []) then {
+    WARNING_1("no valid selection for cookoff found. %1", typeOf _vehicle);
+    {
+        private _pos = _vehicle selectionPosition _x;
+        if (_pos isEqualTo [0, 0, 0]) exitWith {};
+        _positions pushBack _x;
+    } forEach DEFAULT_COMMANDER_HATCHES;
+
     if (_positions isEqualTo []) then {
-        WARNING_1("no valid selection for cookoff found. %1", typeOf _vehicle);
         _positions pushBack "#noselection";
     };
+};
 
-    private _turretConfig = [_vehicle, [0]] call CBA_fnc_getTurret;
-    private _positionBarrelEnd = getText (_turretConfig >> "gunBeg");
-
-    // smoke out of cannon and hatches
-    private _smokeBarrel = "#particlesource" createVehicleLocal [0,0,0];
-    _smokeBarrel setParticleClass "MediumDestructionSmoke";
-    _smokeBarrel attachTo [_vehicle, [0,0,0], _positionBarrelEnd];
-
-    private _effects = [_smokeBarrel];
-
-    {
-        private _position = [0,-2,0];
-
-        if !(_x isEqualTo "#noselection") then {
-            _position = _vehicle selectionPosition _x;
-        };
-
-        private _smoke = "#particlesource" createVehicleLocal [0,0,0];
-        _smoke setParticleClass "ObjectDestructionSmoke1_2Smallx";
-        _smoke attachTo [_vehicle, _position];
+private _delay = 0;
+if (_smokeDelayEnabled) then {
+    _delay = SMOKE_TIME + random SMOKE_TIME;
+};
+[QGVAR(smoke), [_vehicle, _positions]] call CBA_fnc_globalEvent;
 
-        _effects pushBack _smoke;
-    } forEach _positions;
+[{
+    params ["_vehicle", "_positions", "_intensity", "_ammoDetonationChance", "_detonateAfterCookoff", "_instigator"];
+    _vehicle setVariable [QGVAR(intensity), _intensity];
 
     [{
-        params ["_vehicle", "_effects", "_positions"];
-
-        // this shit is busy being on fire, can't go driving around all over the place
-        if (local _vehicle) then {
-            _vehicle setFuel 0;
-        };
-
-        private _light = "#lightpoint" createVehicleLocal [0,0,0];
-        _light setLightBrightness 0.7;
-        _light setLightAmbient [1,0.4,0.15];
-        _light setLightColor [1,0.4,0.15];
-        _light lightAttachObject [_vehicle, [0,0,4]];
-
-        _effects pushBack _light;
-
-        // cookoffs
-        {
-            private _position = [0,-2,0];
-
-            if !(_x isEqualTo "#noselection") then {
-                _position = _vehicle selectionPosition _x;
-            };
-
-            private _fire = "#particlesource" createVehicleLocal [0,0,0];
-            _fire setParticleClass QGVAR(CookOff);
-            _fire attachTo [_vehicle, _position];
-
-            _effects pushBack _fire;
-        } forEach _positions;
-
-        if (isServer) then {
-            private _soundName = selectRandomWeighted [QGVAR(Sound_low), 0.1, QGVAR(Sound_mid), 0.25, QGVAR(Sound_high), 0.65];
-            // TODO - Players in the vehicle hear no sound (even after exiting the vehicle)
-            private _sound = createSoundSource [_soundName, position _vehicle, [], 0];
-
-            _effects pushBack _sound;
-        };
-
-        // indicator for the crew - yo, your shit's on fire
-        private _fnc_FlameEffect = {
-            params ["_vehicle", "_fnc_FlameEffect", "_counter"];
-
-            if (_vehicle == cameraOn) then {
-                [] call BIS_fnc_flamesEffect;
-            };
-
-            DEC(_counter);
-
-            if (_counter > 0) then {
-                [_fnc_FlameEffect, [_vehicle, _fnc_FlameEffect, _counter], FLAME_EFFECT_DELAY] call CBA_fnc_waitAndExecute
+        params ["_args", "_pfh"];
+        _args params ["_vehicle", "_positions", "_ammoDetonationChance", "_detonateAfterCookoff", "_instigator"];
+        private _intensity = _vehicle getVariable [QGVAR(intensity), 0];
+        if (_intensity <= 1) exitWith {
+            [QGVAR(cleanupEffects), _vehicle] call CBA_fnc_globalEvent;
+            _vehicle setVariable [QGVAR(isCookingOff), false, true];
+            [_pfh] call CBA_fnc_removePerFrameHandler;
+
+            if (_detonateAfterCookoff) then {
+                _vehicle setDamage 1;
             };
         };
-
-        // Recursive function, occurs for duration of cookoff
-        [_vehicle, _fnc_FlameEffect, ceil(COOKOFF_TIME/FLAME_EFFECT_DELAY)] call _fnc_FlameEffect;
-
-        private _randomPosition = _vehicle getPos [100, random 360];
-
-        {
-            if (local _x && {!(_x call EFUNC(common,isPlayer))}) then {
-                _x leaveVehicle _vehicle;
-                _x doMove _randomPosition;
+
+        private _lastFlameTime = _vehicle getVariable [QGVAR(lastFlame), 0];
+        private _nextFlameTime = _vehicle getVariable [QGVAR(nextFlame), 0];
+        if ((CBA_missionTime - _lastFlameTime) >= _nextFlameTime) then {
+            private _ring = (0.2 > random 1);
+            if (!_ring && _intensity >= 2) then {
+                _ring = (0.7 > random 1);
             };
-        } forEach crew _vehicle;
-
-        [{
-            params ["_vehicle", "_effects"];
-
+
+            private _time = linearConversion [0, 10, _intensity, 5, 20] + random COOKOFF_TIME;
+            [QGVAR(cookOffEffect), [_vehicle, true, _ring, _time, selectRandom _positions]] call CBA_fnc_globalEvent;
+
+            _intensity = _intensity - (0.5 max random 1);
+            _vehicle setVariable [QGVAR(intensity), _intensity];
+            _vehicle setVariable [QGVAR(lastFlame), CBA_missionTime];
+            _vehicle setVariable [QGVAR(nextFlame), _time + (MIN_TIME_BETWEEN_FLAMES max random MAX_TIME_BETWEEN_FLAMES)];
+
             {
-                deleteVehicle _x;
-            } forEach _effects;
-
-            if (local _vehicle) then {
-                _vehicle setDamage 1;
+                [QEGVAR(fire,burn), [_x, _intensity * 1.5, _instigator]] call CBA_fnc_globalEvent;
+            } forEach crew _vehicle
+        };
+
+        if (_ammoDetonationChance > random 1) then {
+            private _lastExplosiveDetonationTime = _vehicle getVariable [QGVAR(lastExplosiveDetonation), 0];
+            private _nextExplosiveDetonation = _vehicle getVariable [QGVAR(nextExplosiveDetonation), 0];
+
+            if ((CBA_missionTime - _lastExplosiveDetonationTime) > _nextExplosiveDetonation) then {
+                createVehicle ["ACE_ammoExplosionLarge", (_vehicle modelToWorld (_vehicle selectionPosition selectRandom _positions)), [], 0 , "CAN_COLLIDE"];
+
+                _vehicle setVariable [QGVAR(lastExplosiveDetonation), CBA_missionTime];
+                _vehicle setVariable [QGVAR(nextExplosiveDetonation), random 60];
             };
-        }, [_vehicle, _effects], COOKOFF_TIME] call CBA_fnc_waitAndExecute; // TODO: Randomise cook off time with locality in mind
-    }, [_vehicle, _effects, _positions], SMOKE_TIME] call CBA_fnc_waitAndExecute;
-}, _vehicle, IGNITE_TIME] call CBA_fnc_waitAndExecute;
+        };
+    }, 0.25, [_vehicle, _positions, _ammoDetonationChance, _detonateAfterCookoff, _instigator]] call CBA_fnc_addPerFrameHandler
+}, [_vehicle, _positions, _intensity, _ammoDetonationChance, _detonateAfterCookoff, _instigator], _delay] call CBA_fnc_waitAndExecute;