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

Refuel - Fix fuel source disabling #9995

Merged
merged 32 commits into from
May 23, 2024
Merged

Conversation

johnb432
Copy link
Contributor

When merged this pull request will:

  • Requires Refuel - Add enable setting #7613.
  • You can now disable fuel sources that don't have a fuel source set in config, but were defined via FUNC(makeSource).
    E.g.
    You call [cursorObject, 100] call FUNC(makeSource) on a quad bike. It's usually not a fuel source, but now it is.
    Previously, if you tried to call [cursorObject, -1] call FUNC(makeSource), it would fail and the quad bike would retain its fuel source. This PR fixes that.

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}.

Dystopian and others added 30 commits March 26, 2020 00:23
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
- Use hashmaps wherever possible
- Reduced pump search radius by ~30%
- Sorted pumps alphabetically and sorted positions by "smallest" first, for consistency
@johnb432 johnb432 added the kind/bug-fix Release Notes: **FIXED:** label Apr 28, 2024
@johnb432 johnb432 added this to the 3.18.0 milestone May 9, 2024
@johnb432 johnb432 merged commit c0d74ba into master May 23, 2024
5 checks passed
@johnb432 johnb432 deleted the refuel-fix-fuel-source-removal branch May 23, 2024 19:56
blake8090 pushed a commit to blake8090/ACE3 that referenced this pull request Aug 18, 2024
* Add enable setting

* Exclude man class init

* Fix multiplayer terrain pump fuel sync

* Add terrain pumps positions

* Add vanilla fuel cargo restoring before destroying

* Add Livonia positions by bux

* Fix terrain pumps destruction

* Improve settings init

* Fix double settings category

* Check enabled var in public functions

* Fix fnc_makeSource

* Handle recent CUP Terrains changes

* Update includes

* Fix issues introduced in acemod#9133

* Change warning

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>

* Optimisations and cleanup

- Use hashmaps wherever possible
- Reduced pump search radius by ~30%
- Sorted pumps alphabetically and sorted positions by "smallest" first, for consistency

* Add init debug trace

* compileScript in dev

* yoda conditions & DFUNC macro

* Wait until CBA settings are ready

* Update Chernarus 2020 and add more maps configs

* Remove vanilla fuel cargo restoring before destroying

* Update fnc_makeSource.sqf

---------

Co-authored-by: Dystopian <sddex@ya.ru>
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/bug-fix Release Notes: **FIXED:**
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants