Skip to content

Fire - Mini-Rewrite#9757

Merged
LinkIsGrim merged 37 commits intomasterfrom
fire-refactor
Jun 22, 2024
Merged

Fire - Mini-Rewrite#9757
LinkIsGrim merged 37 commits intomasterfrom
fire-refactor

Conversation

@johnb432
Copy link
Copy Markdown
Contributor

@johnb432 johnb432 commented Jan 26, 2024

When merged this pull request will:

  • If you want to burn something now, you call a targeted event ace_fire_burn (previously it was a global event).
  • Fixes a bug where invulnerable units can burn. Repro steps: Go into the arsenal mission and stand next to a vehicle cooking off (advanced vehicle damage must be enabled).
  • Split fire effects and simulation.
  • Simulation PFH runs where unit is local on every machine, but code is only executed if unit is local.
  • The above makes fire JIP compatible for both simulation and effects (at least, looking at the code suggests it wasn't compatible).
  • There was a mention of fire propagation in the code, which did not work as I expected.
    Changed it so that if a unit is close to a burning unit, said unit can start burning. For this to happen, the fire must be above a threshold (#define BURN_THRESHOLD_INTENSE 3, can be changed).
  • Dead units can now catch fire.
  • Code cleanup.

Tested in SP and MP.

IMPORTANT

  • If the contribution affects the documentation, please include your changes in this pull request so the documentation will appear on the website.
  • Development Guidelines are read, understood and applied.
  • Title of this PR uses our standard template Component - Add|Fix|Improve|Change|Make|Remove {changes}.

Comment thread addons/fire/functions/fnc_burnSimulation.sqf Outdated
@johnb432 johnb432 added this to the 3.18.0 milestone Mar 5, 2024
@veteran29 veteran29 self-requested a review March 27, 2024 00:55
@johnb432
Copy link
Copy Markdown
Contributor Author

johnb432 commented Apr 10, 2024

I was able to test this on a dedicated server:

  • Medical damage did not work on dead units, as the API function in medical doesn't like dead units. Changed it so that it uses events directly instead.
  • JIP works.
  • Units propagating fire between each other works.
  • Fire sources work.

@johnb432 johnb432 added the kind/enhancement Release Notes: **IMPROVED:** label Apr 19, 2024
@johnb432 johnb432 mentioned this pull request Apr 20, 2024
1 task
@johnb432 johnb432 marked this pull request as draft April 28, 2024 11:48
@johnb432 johnb432 changed the title Fire - Improve multiple aspects Fire - Mini-Rewrite Apr 28, 2024
@johnb432 johnb432 marked this pull request as ready for review May 26, 2024 08:08
@johnb432
Copy link
Copy Markdown
Contributor Author

BURN_MAX_INTENSITY is never enforced anywhere. Is it a limit that we want/should enforce?

@Mike-MF
Copy link
Copy Markdown
Member

Mike-MF commented Jun 1, 2024

Can you change the burn event for SOG in this PR too?

["ace_fire_burn", [_unit, _intensity]] call CBA_fnc_globalEvent;

Comment thread addons/fire/functions/fnc_burnSimulation.sqf Outdated
LinkIsGrim and others added 3 commits June 20, 2024 01:22
Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
@LinkIsGrim LinkIsGrim merged commit f45dff8 into master Jun 22, 2024
@LinkIsGrim LinkIsGrim deleted the fire-refactor branch June 22, 2024 18:07
blake8090 pushed a commit to blake8090/ACE3 that referenced this pull request Aug 18, 2024
Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

kind/enhancement Release Notes: **IMPROVED:**

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants