Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cookoff - Delay full vehicle destruction #9061

Merged
merged 10 commits into from
May 24, 2024
Merged

Cookoff - Delay full vehicle destruction #9061

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
16b807d
Moved ace_cookoff_canHaveFireJet config logic into vehicle_damage as …
JonBons Oct 5, 2022
d5b30d3
Restricted cookoff jet/ring flame effects to a single execution
JonBons Oct 5, 2022
09f67ad
Added finale feature which rolls chance for a full vehicle destructio…
JonBons Oct 5, 2022
8e16ead
Merge branch 'master' into pr/9061
johnb432 Apr 4, 2024
59a6f31
Update addons/cookoff/initSettings.inc.sqf
LinkIsGrim Apr 11, 2024
711ab21
Update vehicledamage-framework.md
johnb432 Apr 17, 2024
1f14823
Fixed chances
johnb432 Apr 17, 2024
fd0272e
Removed new config, improved existing implementation
johnb432 Apr 17, 2024
b63b098
Update fnc_cookOff.sqf
johnb432 May 13, 2024
8f7793b
Reverted changing params order
johnb432 May 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 29 additions & 8 deletions addons/cookoff/functions/fnc_cookOff.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,24 +61,45 @@ if (_smokeDelayEnabled) then {
[{
params ["_vehicle", "_positions", "_intensity", "_ammoDetonationChance", "_detonateAfterCookoff", "_instigator", "_fireSource", "_canRing", "_canJet"];
_vehicle setVariable [QGVAR(intensity), _intensity];
private _smokeEffects = _vehicle getVariable [QGVAR(effects), []];

[{
params ["_args", "_pfh"];
_args params ["_vehicle", "_positions", "_ammoDetonationChance", "_detonateAfterCookoff", "_instigator", "_fireSource", "_canRing", "_canJet", "_smokeEffects"];
_args params ["_vehicle", "_positions", "_ammoDetonationChance", "_detonateAfterCookoff", "_instigator", "_fireSource", "_canRing", "_canJet"];
private _intensity = _vehicle getVariable [QGVAR(intensity), 0];
private _nextFlameTime = _vehicle getVariable [QGVAR(nextFlame), 0];
if (isNull _vehicle || {_intensity <= 1}) exitWith {
[QGVAR(cleanupEffects), [_vehicle, _smokeEffects]] call CBA_fnc_globalEvent;
_vehicle setVariable [QGVAR(isCookingOff), false, true];
[_pfh] call CBA_fnc_removePerFrameHandler;

if (GVAR(destroyVehicleAfterCookoff) || _detonateAfterCookoff) then {
_vehicle setDamage [1, true];
if (isNull _vehicle) exitWith {};

if (GVAR(destroyVehicleAfterCookoff) || _detonateAfterCookoff) exitWith {
if (_fireSource isEqualTo "") then {
_fireSource = selectRandom _positions;
};

if (_nextFlameTime <= 0) then {
_nextFlameTime = MIN_TIME_BETWEEN_FLAMES max random MAX_TIME_BETWEEN_FLAMES;
};

[{
params ["_vehicle", "_fireSource"];

if (isNull _vehicle) exitWith {};

[QGVAR(cleanupEffects), _vehicle] call CBA_fnc_globalEvent;
_vehicle setVariable [QGVAR(isCookingOff), false, true];

createVehicle ["ACE_ammoExplosionLarge", (_vehicle modelToWorld (_vehicle selectionPosition _fireSource)), [], 0 , "CAN_COLLIDE"];

_vehicle setDamage [1, true];
}, [_vehicle, _fireSource], _nextFlameTime] call CBA_fnc_waitAndExecute;
};

[QGVAR(cleanupEffects), _vehicle] call CBA_fnc_globalEvent;
_vehicle setVariable [QGVAR(isCookingOff), false, true];
};

private _lastFlameTime = _vehicle getVariable [QGVAR(lastFlame), 0];
private _nextFlameTime = _vehicle getVariable [QGVAR(nextFlame), 0];

// Wait until we are ready for the next flame
// dt = Tcurrent - Tlast
Expand Down Expand Up @@ -125,5 +146,5 @@ if (_smokeDelayEnabled) then {
_vehicle setVariable [QGVAR(nextExplosiveDetonation), random 60];
};
};
}, 0.25, [_vehicle, _positions, _ammoDetonationChance, _detonateAfterCookoff, _instigator, _fireSource, _canRing, _canJet, _smokeEffects]] call CBA_fnc_addPerFrameHandler
}, 0.25, [_vehicle, _positions, _ammoDetonationChance, _detonateAfterCookoff, _instigator, _fireSource, _canRing, _canJet]] call CBA_fnc_addPerFrameHandler
}, [_vehicle, _positions, _intensity, _ammoDetonationChance, _detonateAfterCookoff, _instigator, _fireSource, _canRing, _canJet], _delay] call CBA_fnc_waitAndExecute;