Cargo - Support of object without `ace_cargo_size` defined in config or `-1` config value #6364

Vdauphin · 2018-05-23T09:38:53Z

Actually, if _typeofcargo does not have ace_cargo_size define in config, the _radiusOfItem of the object is 1. This inconsistency can be avoid by using the ace_cargo_fnc_getSizeItem which take an object as parameter and get the size of the object defined manually by user ( ace_cargo_fnc_setsize).

By having a _radiusOfItem more accurate, the ace_common_fnc_findUnloadPosition will find better position for unloading and avoid vehicle explosion when big objects, without ace_cargo_size defined in config, are unloaded.

I don't know if it is the best way to handle this case but at least it is a work around. Cheers.

When merged this pull request will:

ace_common_fnc_findUnloadPosition can take object as parameter
Prefer the config way instead to determine the size of _cargo directly with ace_cargo_fnc_getSizeItem (this avoid inconsistency when player ace_cargo_fnc_setsize of an object lower from the ace_cargo_size defined in config)
Also check if the config value is not -1 to avoid the issue: Offest for large containers too small when being unloaded from trucks #6357 (comment)
If ace_cargo_size is not define in config, use the ace_cargo_fnc_getSizeItem to get object size set by player with ace_cargo_fnc_setsize
Update the ace_cargo_fnc_unloadItem accordingly (use the cargo object instead of the class name).

- use of ace_cargo_fnc_getSizeItem to determine size of item - prefer the config way instead of manually set size - This will also take into account object manually added to the cargo system with ace_cargo_fnc_setsize - use the cargo object for ace_cargo_fnc_unloadItem.

Dystopian · 2018-05-23T13:02:31Z

addons/common/functions/fnc_findUnloadPosition.sqf

+    private _itemSize = if (isNumber (configFile >> "CfgVehicles" >> _typeOfCargo >> QEGVAR(cargo,size))) then {
+        getNumber (configFile >> "CfgVehicles" >> _typeOfCargo >> QEGVAR(cargo,size));
+    } else {
+        [_cargo] call EFUNC(cargo,getSizeItem);


there is error here if cargo module is no loaded

[[_cargo] call EFUNC(cargo,getSizeItem)] param [0, _radiusOfItem]; could resolve that issue.

I meant if cargo module is not loaded there is no EFUNC(cargo,getSizeItem) and you call non-existing function

I just learned in scheduled EFUNC(cargo,getSizeItem) will trow an undefined variables error which is not the case in unscheduled.
If you guys are using an other approach, let me know, I will use it for consistency.

ACE3/addons/gunbag/functions/fnc_offGunbag.sqf

Line 26 in 98da86b

if (["ace_backpacks"] call EFUNC(common,isModLoaded)) then {

PabstMirror · 2018-05-23T14:43:04Z

For safety we could take the max of both numbers

This fix handle the case when cargo module is not loaded for scheduled and unscheduled environnement.

Dystopian · 2018-05-25T05:47:35Z

addons/common/functions/fnc_findUnloadPosition.sqf

-    if (isNumber (configFile >> "CfgVehicles" >> _typeOfCargo >> QEGVAR(cargo,size))) then {
-        _radiusOfItem = (((getNumber (configFile >> "CfgVehicles" >> _typeOfCargo >> QEGVAR(cargo,size))) ^ 0.35) max 0.75);
+    private _typeOfCargo = if (_cargo isEqualType "") then {_cargo} else {typeOf _cargo};
+    private _itemSize = if (isNumber (configFile >> "CfgVehicles" >> _typeOfCargo >> QEGVAR(cargo,size))) then {


this code piece already exists in EFUNC(cargo,getSizeItem), so can be optimized well

I did a choice here as explain in the PR description:

Prefer the config way instead to determine the size of _cargo directly with ace_cargo_fnc_getSizeItem (this avoid inconsistency when player ace_cargo_fnc_setsize of an object lower from the ace_cargo_size defined in config)

I can add a parameter in EFUNC(cargo,getSizeItem) to prefer the config if exist or prefer varaible if exist

I am supposing that ace_cargo_size in config is correct so if I am calling EFUNC(cargo,getSizeItem) and if player has ace_cargo_fnc_setsize an other value (a smaller one for exemple) the function will return a bad position base on a wrong value changed by player. This avoid that case and also cover the objective of this PR where ace_cargo_size in config is not defined.

Dystopian · 2018-05-25T05:48:13Z

addons/common/functions/fnc_findUnloadPosition.sqf

+    private _itemSize = if (isNumber (configFile >> "CfgVehicles" >> _typeOfCargo >> QEGVAR(cargo,size))) then {
+        getNumber (configFile >> "CfgVehicles" >> _typeOfCargo >> QEGVAR(cargo,size));
+    } else {
+        if (["ace_cargo"] call EFUNC(common,isModLoaded)) then {


EFUNC(common,isModLoaded) -> FUNC(isModLoaded)

EFUNC(common,isModLoaded) -> ace_common_fnc_isModload
FUNC(isModLoaded) -> ace_cargo_fnc_isModload

Because the second doesn't exist I am using the first one as suggested by @jonpas here: #6364 (comment)

here we are in common module (addons/common/functions/fnc_findUnloadPosition) so FUNC is ace_common_fnc

Dystopian · 2018-05-25T05:48:42Z

addons/common/functions/fnc_findUnloadPosition.sqf

+            _radiusOfItem;
+        };
+    };
+    if !(_itemSize isEqualTo -1) then {


just _itemSize != -1

With isEqualTo you can compare different type like: nil isEqualTo -1 so the function will never fail

It doesn't throw error when comparing different types, i.e. ("eleven" isEqualTo 11)
But, if ace use it as convention I will change it.

_itemSize here is always number

Dystopian · 2018-05-25T05:58:17Z

addons/common/functions/fnc_findUnloadPosition.sqf

+        };
+    };
+    if !(_itemSize isEqualTo -1) then {
+        _radiusOfItem = (_itemSize ^ 0.35) max 0.75;


most significant change: before this PR if cargo module is not loaded _radiusOfItem was 1 and now it becomes (1 ^ 0.35) max 0.75.

Ahah! I didn't know we could make joke in review!
Thanks a lot for the time you take to review this :-), I appreciate your feedback!

(1 ^ 0.35) max 0.75 = 1 max 0.75 = 1

Sorry I thought you were ironical :/

- _itemSize here is always number - here we are in common module (addons/common/functions/fnc_findUnloadPosition) so FUNC is ace_common_fnc

Vdauphin · 2018-05-26T11:24:32Z

For safety we could take the max of both numbers

@PabstMirror
I presume the config value is the perfect value for the ace_common_fnc_findUnloadPosition.
If user change to a higher, the object could be no more unloadable because the ace_common_fnc_findUnloadPosition will return an [].

The value give by user should only be use if no config value is available.

- this is correcting the unloading position with the ace_cargo_size define as variable - this can be removed when: acemod/ACE3#6364 is merged

- if the config value is -1, get the `ace_cargo_size` from the `ace_cargo_fnc_getSizeItem - #6357 (comment)

PabstMirror · 2018-06-01T03:47:43Z

looks good, it does require that people set reasonable cargo sizes for items they load

…or `-1` config value (#6364) * Add: Now findUnloadPosition support also cargo object - use of ace_cargo_fnc_getSizeItem to determine size of item - prefer the config way instead of manually set size - This will also take into account object manually added to the cargo system with ace_cargo_fnc_setsize - use the cargo object for ace_cargo_fnc_unloadItem. * FIX: old work around * FIX: error when cargo module is not loaded * As suggested by @orbis2358 This fix handle the case when cargo module is not loaded for scheduled and unscheduled environnement. * Use ACE framework to check if module is present * FIX: EFUNC and isEqualto - _itemSize here is always number - here we are in common module (addons/common/functions/fnc_findUnloadPosition) so FUNC is ace_common_fnc * FIX case where config value is `-1` - if the config value is -1, get the `ace_cargo_size` from the `ace_cargo_fnc_getSizeItem - #6357 (comment)

Vdauphin added 2 commits May 23, 2018 11:12

FIX: old work around

9ac401b

Dystopian reviewed May 23, 2018

View reviewed changes

Vdauphin added 3 commits May 24, 2018 10:27

FIX: error when cargo module is not loaded

d8dfaa0

As suggested by @orbis2358

5d3f0b5

This fix handle the case when cargo module is not loaded for scheduled and unscheduled environnement.

Use ACE framework to check if module is present

0d9d82a

Dystopian reviewed May 25, 2018

View reviewed changes

FIX: EFUNC and isEqualto

8ea570e

- _itemSize here is always number - here we are in common module (addons/common/functions/fnc_findUnloadPosition) so FUNC is ace_common_fnc

Vdauphin mentioned this pull request May 25, 2018

Add: ACE cargo Vdauphin/HeartsAndMinds#540

Merged

10 tasks

FIX case where config value is -1

adfa37e

- if the config value is -1, get the `ace_cargo_size` from the `ace_cargo_fnc_getSizeItem - #6357 (comment)

Vdauphin changed the title ~~Cargo - Support of object without ace_cargo_size defined in config~~ Cargo - Support of object without ace_cargo_size defined in config or -1 config value May 31, 2018

PabstMirror added this to the 3.13.0 milestone Jun 1, 2018

PabstMirror added the kind/bug-fix Release Notes: **FIXED:** label Jun 1, 2018

PabstMirror approved these changes Jun 1, 2018

View reviewed changes

PabstMirror merged commit f994365 into acemod:master Jun 1, 2018

Vdauphin deleted the Extend_findUnloadPosition_to_object branch June 1, 2018 06:24

PabstMirror modified the milestones: 3.13.0, 3.12.3 Jul 5, 2018

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Cargo - Support of object without `ace_cargo_size` defined in config or `-1` config value #6364

Cargo - Support of object without `ace_cargo_size` defined in config or `-1` config value #6364

Vdauphin commented May 23, 2018 •

edited

Loading

Dystopian May 23, 2018

Vdauphin May 23, 2018

Dystopian May 24, 2018

Vdauphin May 24, 2018 •

edited

Loading

jonpas May 24, 2018

Vdauphin May 24, 2018

PabstMirror commented May 23, 2018

Dystopian May 25, 2018

Vdauphin May 25, 2018 •

edited

Loading

Vdauphin May 25, 2018

Dystopian May 25, 2018

Vdauphin May 25, 2018

Dystopian May 25, 2018

Vdauphin May 25, 2018

Dystopian May 25, 2018

Vdauphin May 25, 2018

Dystopian May 25, 2018

Dystopian May 25, 2018

Vdauphin May 25, 2018

Vdauphin May 25, 2018

Vdauphin May 25, 2018

Vdauphin commented May 26, 2018

PabstMirror commented Jun 1, 2018

Cargo - Support of object without ace_cargo_size defined in config or -1 config value #6364

Cargo - Support of object without ace_cargo_size defined in config or -1 config value #6364

Conversation

Vdauphin commented May 23, 2018 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Vdauphin May 24, 2018 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

PabstMirror commented May 23, 2018

Choose a reason for hiding this comment

Vdauphin May 25, 2018 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Vdauphin commented May 26, 2018

PabstMirror commented Jun 1, 2018

Cargo - Support of object without `ace_cargo_size` defined in config or `-1` config value #6364

Cargo - Support of object without `ace_cargo_size` defined in config or `-1` config value #6364

Vdauphin commented May 23, 2018 •

edited

Loading

Vdauphin May 24, 2018 •

edited

Loading

Vdauphin May 25, 2018 •

edited

Loading