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.

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

Fire - Add fire damage to wrecks #9962

Merged
merged 41 commits into from
Dec 13, 2024
Merged
Changes from 40 commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
13e3ba3
Reworked fire module
johnb432 Jan 26, 2024
623ce0b
Merge branch 'master' into fire-refactor
johnb432 Jan 26, 2024
ccb09e6
Update fnc_burn.sqf
johnb432 Feb 3, 2024
41bd5bf
Fire deals more damage
johnb432 Feb 5, 2024
e2f94af
Merge branch 'master' into fire-refactor
johnb432 Feb 5, 2024
8f3a1e9
Update fnc_burnEffects.sqf
johnb432 Feb 5, 2024
7586048
Merged main
johnb432 Feb 6, 2024
a35864c
Minor tweaks
johnb432 Feb 6, 2024
b5dfe0a
Removed outdated comment
johnb432 Feb 12, 2024
70b21f6
Minor cleanup
johnb432 Feb 12, 2024
eb02fd7
Use eyePos for better position
johnb432 Feb 13, 2024
a9dde6d
Merge branch 'master' into fire-refactor
johnb432 Mar 24, 2024
1aaaa37
Update fnc_burnSimulation.sqf
johnb432 Mar 26, 2024
c0344ee
Merge branch 'master' into fire-refactor
johnb432 Apr 1, 2024
2af0da4
Fixed headers, made fire simulation local
johnb432 Apr 1, 2024
4f51eed
Merge branch 'master' into fire-refactor
johnb432 Apr 4, 2024
2bf85c0
Medical damage fix for dead units, cleanup
johnb432 Apr 10, 2024
02539ef
Merge branch 'master' into fire-refactor
johnb432 Apr 19, 2024
46e5817
Make wrecks cause fire damage
johnb432 Apr 20, 2024
201366c
Merge branch 'master' into fire-refactor
johnb432 May 26, 2024
4b3d283
Update XEH_PREP.hpp
johnb432 May 26, 2024
9546ca2
Update fnc_cookOffEffect.sqf
johnb432 May 26, 2024
48f3d19
Update compats
johnb432 Jun 2, 2024
a93c0b4
Added TRACE macros
johnb432 Jun 2, 2024
0f24464
Minor tweaks
johnb432 Jun 2, 2024
acc9e09
Merge branch 'master' into fire-refactor
johnb432 Jun 2, 2024
94acbf2
Update initSettings.inc.sqf
johnb432 Jun 2, 2024
de652d5
Update comment to bring up to standard
johnb432 Jun 5, 2024
dcbefb2
Merge branch 'master' into fire-refactor
johnb432 Jun 5, 2024
8c3dacc
Update fnc_cookOffServer.sqf
johnb432 Jun 5, 2024
209d3ff
Update XEH_postInit.sqf
johnb432 Jun 6, 2024
a4968b5
Minor tweaks and cleanup
johnb432 Jun 6, 2024
0a60466
Merge branch 'fire-refactor' into add-fire-sources-to-wrecks
johnb432 Jun 6, 2024
32f3dca
Merge branch 'master' into add-fire-sources-to-wrecks
johnb432 Aug 11, 2024
5aeb44c
Update XEH_postInit.sqf
johnb432 Aug 11, 2024
21b5b7a
Merge branch 'master' into add-fire-sources-to-wrecks
johnb432 Nov 3, 2024
1003978
Merge branch 'master' into add-fire-sources-to-wrecks
johnb432 Nov 16, 2024
401b5d1
Update addons/fire/XEH_postInit.sqf
johnb432 Nov 16, 2024
c9c5a98
Update addons/fire/XEH_postInit.sqf
johnb432 Nov 16, 2024
0bb80ab
Update XEH_postInit.sqf
johnb432 Nov 16, 2024
c56ccc5
Update addons/fire/XEH_postInit.sqf
johnb432 Nov 16, 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
16 changes: 16 additions & 0 deletions addons/fire/XEH_postInit.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,22 @@
[QGVAR(burnEffects), LINKFUNC(burnEffects)] call CBA_fnc_addEventHandler;
[QGVAR(burnSimulation), LINKFUNC(burnSimulation)] call CBA_fnc_addEventHandler;

// Make burning wrecks into fire sources
["AllVehicles", "Killed", {
params ["_vehicle", "", "", "_useEffects"];

if (_useEffects && {_vehicle getEntityInfo 13}) then {
[QGVAR(addFireSource), [
_vehicle,
(boundingBoxReal [_vehicle, "FireGeometry"]) select 2,
BURN_MAX_INTENSITY,
QGVAR(wreck) + hashValue _vehicle,
{_this getEntityInfo 13},
_vehicle
]] call CBA_fnc_serverEvent;
};
}, true, ["Man", "StaticWeapon"], true] call CBA_fnc_addClassEventHandler; // Use "Man" to excluded animals as well
johnb432 marked this conversation as resolved.
Show resolved Hide resolved

[QGVAR(playScream), {
params ["_scream", "_source"];

Expand Down