Arsenal - Fix the arsenal overfill prevention function by Nomas-X · Pull Request #10946 · acemod/ACE3

Nomas-X · 2025-06-04T02:24:41Z

When merged this pull request will:

This merge will fix issue Arsenal Overfill Prevention Does Not Prevent Magazine / Weapon Overfill #10945 and allow overfill prevention to work properly. Specifically instead of only removing items cargo when the overfill prevention function is called, weapons and magazines now also can be removed.
- Replaced the original item cargo check here with one that checks for all cargo types of weapon, magazine, and items to ensure overfill prevention works properly.
- A switch was added to go through all item types properly.
This merge adds the authors of the code and bug find / fix to the AUTHORS.txt.

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

- Added cargo removal and checking for all 3 cargo types: - weapon - magazine - item - Used `call compile format` to avoid writing 3 extremely similar loops. Co-Authored-By: Sky <22858781+Esmeray6@users.noreply.github.com>

- Switching from `call compile` to switches as I was informed switches are much faster. Co-Authored-By: Sky <22858781+Esmeray6@users.noreply.github.com>

- Added Redwan S. / Nomas and Sky / Esmeray6 to the list of authors as per guideline. Co-Authored-By: Sky <22858781+Esmeray6@users.noreply.github.com>

- Improved readability and also because OCD.

- Added Redwan S. / Nomas & Sky / Esmeray6 to the list of function authors. Co-Authored-By: Sky <22858781+Esmeray6@users.noreply.github.com>

addons/arsenal/functions/fnc_preventOverfilling.sqf

Drofseh

Tabs need to be changed to spaces

addons/arsenal/functions/fnc_preventOverfilling.sqf

Co-authored-by: Drofseh <Drofseh@users.noreply.github.com>

- Fixed indentation as per ACE code guidelines.

Andx667 · 2025-06-04T09:46:25Z

couldnt you technically also have a backpack inside a container, how would the current and the new script handle it?

Nomas-X · 2025-06-04T14:51:57Z

couldnt you technically also have a backpack inside a container, how would the current and the new script handle it?

From what I know and have just tried in the editor you cannot store a backpack inside a player worn container. You can store a vest or uniform but not a backpack.

The uniform and vest are handled as "items" so all functions as intended.

OverlordZorn · 2025-06-04T14:57:54Z

you can put backpacks inside a backpacks, but they need to be empty

@OverlordZorn

- Added support for backpack item type as well. Thanks to @OverlordZorn & @Andx667 for pointing it out.

Nomas-X · 2025-06-04T17:22:31Z

you can put backpacks inside a backpacks, but they need to be empty

Oh, I never was able to put it in because I kept dragging onto the icon or right clicking, just had to drag it into the space...

Fixed now, thanks for pointing it out.

AUTHORS.txt

johnb432 · 2025-06-04T19:22:08Z

addons/arsenal/functions/fnc_preventOverfilling.sqf

    private _currentContainer = _x;
-    {
-        _currentContainer addItemCargoGlobal [_x, -1];
+    private _cargoTypes = ["Weapon", "Magazine", "Item", "Backpack"];


Move outside of the loop, no need to reassign it every iteration.

Done as of 0f13645

addons/arsenal/functions/fnc_preventOverfilling.sqf

Alphabetically ordered

- Moved `_cargoTypes` variable outside of loop, no need to redefine every iteration.

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

Nomas-X

Updated as per @johnb432 notes.

AUTHORS.txt

Nomas-X · 2025-06-04T21:44:02Z

addons/arsenal/functions/fnc_preventOverfilling.sqf

    private _currentContainer = _x;
-    {
-        _currentContainer addItemCargoGlobal [_x, -1];
+    private _cargoTypes = ["Weapon", "Magazine", "Item", "Backpack"];


Done as of 0f13645

Nomas-X · 2025-06-05T17:12:52Z

Is there anything more I need to do besides wait?

I am in no rush, I'm asking because this is my first PR here, just to confirm I am not missing something obvious 😅

outdated

PabstMirror

lgtm

@OverlordZorn

* Update fnc_preventOverfilling.sqf - Added cargo removal and checking for all 3 cargo types: - weapon - magazine - item - Used `call compile format` to avoid writing 3 extremely similar loops. Co-Authored-By: Sky <22858781+Esmeray6@users.noreply.github.com> * Update fnc_preventOverfilling.sqf - Switching from `call compile` to switches as I was informed switches are much faster. Co-Authored-By: Sky <22858781+Esmeray6@users.noreply.github.com> * Update AUTHORS.txt - Added Redwan S. / Nomas and Sky / Esmeray6 to the list of authors as per guideline. Co-Authored-By: Sky <22858781+Esmeray6@users.noreply.github.com> * Update fnc_preventOverfilling.sqf - Improved readability and also because OCD. * Update fnc_preventOverfilling.sqf - Added Redwan S. / Nomas & Sky / Esmeray6 to the list of function authors. Co-Authored-By: Sky <22858781+Esmeray6@users.noreply.github.com> * Apply suggestions from code review Co-authored-by: Drofseh <Drofseh@users.noreply.github.com> * Update fnc_preventOverfilling.sqf - Fixed indentation as per ACE code guidelines. * Update fnc_preventOverfilling.sqf - Added support for backpack item type as well. Thanks to @OverlordZorn & @Andx667 for pointing it out. * Update AUTHORS.txt Alphabetically ordered * Update fnc_preventOverfilling.sqf - Moved `_cargoTypes` variable outside of loop, no need to redefine every iteration. * Update addons/arsenal/functions/fnc_preventOverfilling.sqf Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com> * Update addons/arsenal/functions/fnc_preventOverfilling.sqf Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com> --------- Co-authored-by: Sky <22858781+Esmeray6@users.noreply.github.com> Co-authored-by: Drofseh <Drofseh@users.noreply.github.com> Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>

Nomas-X and others added 5 commits June 4, 2025 03:50

Update fnc_preventOverfilling.sqf

cc47ca8

- Added cargo removal and checking for all 3 cargo types: - weapon - magazine - item - Used `call compile format` to avoid writing 3 extremely similar loops. Co-Authored-By: Sky <22858781+Esmeray6@users.noreply.github.com>

Update fnc_preventOverfilling.sqf

084815d

- Switching from `call compile` to switches as I was informed switches are much faster. Co-Authored-By: Sky <22858781+Esmeray6@users.noreply.github.com>

Update AUTHORS.txt

94c9cfe

- Added Redwan S. / Nomas and Sky / Esmeray6 to the list of authors as per guideline. Co-Authored-By: Sky <22858781+Esmeray6@users.noreply.github.com>

Update fnc_preventOverfilling.sqf

d13345d

- Improved readability and also because OCD.

Update fnc_preventOverfilling.sqf

ce5a042

- Added Redwan S. / Nomas & Sky / Esmeray6 to the list of function authors. Co-Authored-By: Sky <22858781+Esmeray6@users.noreply.github.com>

DartRuffian reviewed Jun 4, 2025

View reviewed changes

addons/arsenal/functions/fnc_preventOverfilling.sqf Show resolved Hide resolved

Drofseh previously requested changes Jun 4, 2025

View reviewed changes

addons/arsenal/functions/fnc_preventOverfilling.sqf Outdated Show resolved Hide resolved

Nomas-X and others added 2 commits June 4, 2025 05:34

Apply suggestions from code review

23eac11

Co-authored-by: Drofseh <Drofseh@users.noreply.github.com>

Update fnc_preventOverfilling.sqf

66e49f2

- Fixed indentation as per ACE code guidelines.

Nomas-X requested review from DartRuffian and Drofseh June 4, 2025 02:41

Update fnc_preventOverfilling.sqf

6509917

- Added support for backpack item type as well. Thanks to @OverlordZorn & @Andx667 for pointing it out.

johnb432 reviewed Jun 4, 2025

View reviewed changes

Nomas-X and others added 4 commits June 5, 2025 00:39

Update AUTHORS.txt

7f8265d

Alphabetically ordered

Update fnc_preventOverfilling.sqf

0f13645

- Moved `_cargoTypes` variable outside of loop, no need to redefine every iteration.

Update addons/arsenal/functions/fnc_preventOverfilling.sqf

cc640c9

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

Update addons/arsenal/functions/fnc_preventOverfilling.sqf

83df139

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

Nomas-X commented Jun 4, 2025

View reviewed changes

Nomas-X requested a review from johnb432 June 4, 2025 21:45

Drofseh requested review from Drofseh and removed request for DartRuffian and Drofseh June 4, 2025 22:03

PabstMirror added this to the 3.20.0 milestone Jun 10, 2025

PabstMirror added the kind/enhancement Release Notes: **IMPROVED:** label Jun 10, 2025

PabstMirror approved these changes Jun 10, 2025

View reviewed changes

johnb432 approved these changes Jun 10, 2025

View reviewed changes

johnb432 changed the title ~~arsenal - Fix the arsenal overfill prevention function fnc_preventOverfilling.sqf~~ Arsenal - Fix the arsenal overfill prevention function Jun 10, 2025

Drofseh approved these changes Jun 11, 2025

View reviewed changes

Drofseh merged commit 5dd9fd7 into acemod:master Jun 11, 2025
4 of 6 checks passed

Andx667 mentioned this pull request Jun 11, 2025

Arsenal Overfill Prevention Does Not Prevent Magazine / Weapon Overfill #10945

Closed

Conversation

Nomas-X commented Jun 4, 2025 • edited by johnb432 Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

IMPORTANT

Uh oh!

Uh oh!

Drofseh left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Andx667 commented Jun 4, 2025

Uh oh!

Nomas-X commented Jun 4, 2025

Uh oh!

OverlordZorn commented Jun 4, 2025

Uh oh!

Nomas-X commented Jun 4, 2025

Uh oh!

Uh oh!

johnb432 Jun 4, 2025

Choose a reason for hiding this comment

Uh oh!

Nomas-X Jun 4, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Nomas-X left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Nomas-X Jun 4, 2025

Choose a reason for hiding this comment

Uh oh!

Nomas-X commented Jun 5, 2025

Uh oh!

PabstMirror left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

Nomas-X commented Jun 4, 2025 •

edited by johnb432

Loading