Skip to content

Fortify - Add token items to allow per-unit budgets#11071

Merged
PabstMirror merged 2 commits intomasterfrom
fortifyTokens
Nov 4, 2025
Merged

Fortify - Add token items to allow per-unit budgets#11071
PabstMirror merged 2 commits intomasterfrom
fortifyTokens

Conversation

@PabstMirror
Copy link
Copy Markdown
Contributor

Adds "currency" item token for fortify
Allowing fine grain control of spending

*/

params ["_side"];
params ["_side", ["_type", "", [""]]];
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why not just have the default as "side"?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

there are 2 calls using the new "side"
are 6 calls that need "", so they can remain unchanged

@PabstMirror PabstMirror added this to the 3.20.2 milestone Oct 15, 2025
@PabstMirror PabstMirror added the kind/enhancement Release Notes: **IMPROVED:** label Oct 15, 2025
@PabstMirror PabstMirror modified the milestones: 3.20.2, 3.20.1 Oct 30, 2025
@PabstMirror PabstMirror added the status/added-to-RC Added after RC, need to manually add to changelog label Oct 30, 2025

private _budget = 0;
if (_type in ["", "side"]) then {
if (_type != "player") then {
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
if (_type != "player") then {
if (_type isNotEqualTo "player") then {

_budget = (missionNamespace getVariable [format [QGVAR(Budget_%1), _side], -1]);
};
if (_budget != -1 && {_type in ["", "player"]}) then {
if (_budget != -1 && {_type != "side"} && {"ACE_FortifyToken" in ([ACE_player] call EFUNC(common,uniqueItems))}) then {
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
if (_budget != -1 && {_type != "side"} && {"ACE_FortifyToken" in ([ACE_player] call EFUNC(common,uniqueItems))}) then {
if (_budget != -1 && {_type isNotEqualTo "side"} && {"ACE_FortifyToken" in ([ACE_player] call EFUNC(common,uniqueItems))}) then {

@PabstMirror PabstMirror merged commit 1ddc52c into master Nov 4, 2025
3 checks passed
@PabstMirror PabstMirror deleted the fortifyTokens branch November 4, 2025 23:12
@PabstMirror PabstMirror removed the status/added-to-RC Added after RC, need to manually add to changelog label Nov 8, 2025
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