Skip to content
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

Map Tools - Show GPS on Map when equipped with UAV Terminal #9885

Merged
merged 8 commits into from
Apr 4, 2024
Merged

Map Tools - Show GPS on Map when equipped with UAV Terminal #9885

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ab31e9b
Show Map GPS when equipped with UAV Terminal
mrschick Mar 28, 2024
d2a0160
Update Maptools Documentation
mrschick Mar 28, 2024
3f35723
Reword documentation
mrschick Mar 28, 2024
5ecff81
Reword docs, remove dash
mrschick Mar 28, 2024
00419ae
Allow GPS when terminal slot is not empty
mrschick Mar 28, 2024
fabc1fd
Allow GPS on map when GPS sidepanel is available
mrschick Mar 29, 2024
f1fde75
Reword docs
mrschick Mar 30, 2024
15c81f6
Return statement - remove ; and add comment
mrschick Mar 30, 2024
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
14 changes: 11 additions & 3 deletions addons/maptools/functions/fnc_canUseMapGPS.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,14 @@
* Public: No
*/

visibleMap &&
{alive ACE_player} &&
{"ItemGPS" in (assignedItems ACE_player)}
if (!visibleMap || {!alive ACE_player}) exitWith {false};

private _playerTerminal = ACE_player getSlotItemName 612;
[
"ItemGPS",
"B_UavTerminal",
"O_UavTerminal",
"I_UavTerminal",
"C_UavTerminal",
"I_E_UavTerminal"
mrschick marked this conversation as resolved.
Show resolved Hide resolved
] findIf { _x == _playerTerminal } != -1;
2 changes: 1 addition & 1 deletion docs/wiki/feature/maptools.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ This adds map tools that can be used to measure distances between two points or
This adds a plotting board that can be used to aid in the rapid usage and adjustment of short-ranged indirect fires, as well as quick measurements of directions and distances between points, and general land-navigation.

### 1.4 GPS on map
If you are equipped with a vanilla GPS it will be shown on the map. (You don't need the `Map Tools` item in your inventory for this.)
If you are equipped with a vanilla GPS or UAV Terminal, a GPS-display will be shown on the map, indicating current grid position. (You don't need the `Map Tools` item in your inventory for this.)
mrschick marked this conversation as resolved.
Show resolved Hide resolved

## 2. Usage

Expand Down