Skip to content

Flags - Fix losing mass when carrying flag #10704

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.

Sign up for GitHub

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

Merged
LinkIsGrim merged 3 commits into from
Feb 3, 2025
Merged

Flags - Fix losing mass when carrying flag #10704

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e395820
Add virtual mass when carrying flag
Timi007 Jan 29, 2025
850e2af
Fix getting mass
Timi007 Jan 31, 2025
fa25798
Remove hard dependency of ace_movement
Timi007 Jan 31, 2025
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
2 changes: 1 addition & 1 deletion addons/flags/config.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ class CfgPatches {
QGVAR(black)
};
requiredVersion = REQUIRED_VERSION;
requiredAddons[] = {"ace_common", "ace_interact_menu", "ace_interaction"};
requiredAddons[] = {"ace_common", "ace_interact_menu", "ace_interaction", "ace_movement"};
author = ECSTRING(common,ACETeam);
authors[] = {"Timi007"};
url = ECSTRING(main,URL);
Expand Down
4 changes: 3 additions & 1 deletion addons/flags/functions/fnc_carryFlag.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,10 @@
params ["_unit", "_item"];
TRACE_2("Carry flag",_unit,_item);

(GVAR(flagItemCache) get _item) params ["", "_texture"];
(GVAR(flagItemCache) get _item) params ["", "_texture", "", "", "", "_mass"];
_unit forceFlagTexture _texture;

_unit setVariable [QGVAR(carryingFlag), _item, true];
_unit removeItem _item;

[_unit, _unit, _mass] call EFUNC(movement,addLoadToUnitContainer);
3 changes: 3 additions & 0 deletions addons/flags/functions/fnc_furlFlag.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,6 @@ _unit setVariable [QGVAR(carryingFlag), nil, true];
_unit forceFlagTexture ""; // Remove flag

[_unit, _item] call EFUNC(common,addToInventory);

private _mass = (GVAR(flagItemCache) get _item) select 5;
[_unit, _unit, -_mass] call EFUNC(movement,addLoadToUnitContainer);
3 changes: 2 additions & 1 deletion addons/flags/functions/fnc_scanConfig.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,9 @@ private _carrierItemMapping = createHashMap;
private _carrier = getText (_x >> QGVAR(carrier));
private _actionIconPlace = getText (_x >> QGVAR(actionIconPlace));
private _actionIconCarry = getText (_x >> QGVAR(actionIconCarry));
private _mass = getNumber (_x >> "ItemInfo" >> "mass");

_flagItemCache set [_name, [_displayName, _texture, _carrier, _actionIconPlace, _actionIconCarry]];
_flagItemCache set [_name, [_displayName, _texture, _carrier, _actionIconPlace, _actionIconCarry, _mass]];
_carrierItemMapping set [_carrier, _name];
} forEach _flagItems;

Expand Down