-
Notifications
You must be signed in to change notification settings - Fork 740
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
Interaction - Add remote squad management #10258
Merged
Merged
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,51 @@ | ||
| #include "..\script_component.hpp" | ||
| /* | ||
| * Author: PabstMirror | ||
| * Gets the squad child actions | ||
| * | ||
| * Arguments: | ||
| * 1: Player <OBJECT> | ||
| * | ||
| * Return Value: | ||
| * Children actions <ARRAY> | ||
| * | ||
| * Example: | ||
| * [player, player] call ace_interaction_fnc_addSquadChildren | ||
| * | ||
| * Public: No | ||
| */ | ||
|
|
||
| params ["", "_player"]; | ||
|
|
||
| private _fnc_color = { | ||
| (switch (toUpper _this) do { | ||
| case "RED": {missionNamespace getVariable [QEGVAR(nametags,nametagColorRed), [221, 0, 0]]}; | ||
| case "GREEN": {missionNamespace getVariable [QEGVAR(nametags,nametagColorGreen), [0, 221, 0]]}; | ||
| case "BLUE": {missionNamespace getVariable [QEGVAR(nametags,nametagColorBlue), [0, 0, 221]]}; | ||
| case "YELLOW": {missionNamespace getVariable [QEGVAR(nametags,nametagColorYellow), [221, 221, 0]]}; | ||
| default {missionNamespace getVariable [QEGVAR(nametags,nametagColorMain), [255, 255, 255]]}; | ||
| }) call BIS_fnc_colorRGBtoHTML | ||
| }; | ||
|
|
||
| private _units = (units group _player) - [_player]; | ||
|
|
||
| private _subActions = []; | ||
| _subActions pushBack (["drop", localize "str_a3_endgame_notifications_title_drop", "\a3\ui_f\data\igui\cfg\actions\ico_off_ca.paa", | ||
| {[_target] joinSilent grpNull}, {true}] call EFUNC(interact_menu,createAction)); | ||
|
|
||
| { | ||
| private _icon = [QPATHTOF(UI\team\team_white_ca.paa), _x call _fnc_color]; | ||
| private _name = localize format ["str_assign_%1", _x]; | ||
| _subActions pushBack ([_x, _name, _icon, | ||
| {[_target, _this#2] call FUNC(joinTeam)}, {assignedTeam _target != _this#2}, {}, _x] call EFUNC(interact_menu,createAction)); | ||
| } forEach ["RED", "GREEN", "BLUE", "YELLOW", "MAIN"]; | ||
|
|
||
| private _actions = _units apply { | ||
| private _unit = _x; | ||
| private _icon = [QPATHTOF(UI\team\team_white_ca.paa), (assignedTeam _unit) call _fnc_color]; | ||
| private _actionUnit = [hashValue _x, [_x, true] call EFUNC(common,getName), _icon, {}, {true}] call EFUNC(interact_menu,createAction); | ||
|
|
||
| [_actionUnit, _subActions apply { [_x, [], _unit] }, _unit] | ||
| }; | ||
|
|
||
| _actions |
20 changes: 0 additions & 20 deletions
20
addons/interaction/functions/fnc_canGroupDropDistantUnits.sqf
This file was deleted.
Oops, something went wrong.
25 changes: 0 additions & 25 deletions
25
addons/interaction/functions/fnc_groupDropDistantUnits.sqf
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
should this have
(_unit == leader _unit)?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It probably should.