FlightControl-Master/MOOSE
1
0
Fork 0
mirror of https://github.com/FlightControl-Master/MOOSE.git synced 2025-10-29 16:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge from. Master (#1892)

Browse Source 
* #CSAR - Add Persistence (#1889)

* Adds a modified version of ops.CTLD's Persistence to ops.CSAR

* Update Marker.lua

* Changed documentation for Marker.lua and MarkerOps_Base.lua (#1891)

---------

Co-authored-by: Jason du Plessis <33880363+TheChosenOn3@users.noreply.github.com>
Co-authored-by: grandpaSam <wouldyukindly@gmail.com>
This commit is contained in:
Thomas 2023-01-28 09:05:23 +01:00 committed by GitHub
parent 5ec18d45a2
commit 016643e494
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Moose Development/Moose/Core/MarkerOps_Base.lua
View File

@ -5,6 +5,12 @@
-- * Create an easy way to tap into markers added to the F10 map by users. -- * Create an easy way to tap into markers added to the F10 map by users.
-- * Recognize own tag and list of keywords. -- * Recognize own tag and list of keywords.
-- * Matched keywords are handed down to functions. -- * Matched keywords are handed down to functions.
-- ##Listen for your tag
-- myMarker = MARKEROPS_BASE:New("tag", {}, false)
-- function myMarker:OnAfterMarkChanged(From, Event, To, Text, Keywords, Coord, idx)
--
-- end
-- Make sure to use the "MarkChanged" event as "MarkAdded" comes in right after the user places a blank marker and your callback will never be called.
-- --
-- === -- ===
-- --

12
Moose Development/Moose/Wrapper/Marker.lua
View File

@ -59,17 +59,15 @@
-- --
-- mymarker = MARKER:New( Coordinate , "I am Batumi Airfield" ):ToCoalition( coalition.side.BLUE ) -- mymarker = MARKER:New( Coordinate , "I am Batumi Airfield" ):ToCoalition( coalition.side.BLUE )
-- --
-- ### To Blue Coalition
--
-- ### To Red Coalition
--
-- This would show the marker only to the Blue coalition. -- This would show the marker only to the Blue coalition.
-- --
-- ## For a Group -- ## For a Group
-- --
-- mymarker = MARKER:New( Coordinate , "Target Location" ):ToGroup( tankGroup )
-- --
-- # Removing a Marker -- # Removing a Marker
-- -- mymarker:Remove(60)
-- This removes the marker after 60 seconds
-- --
-- # Updating a Marker -- # Updating a Marker
-- --
@ -305,7 +303,7 @@ end
-- User API Functions -- User API Functions
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--- Marker is readonly. Text cannot be changed and marker cannot be removed. --- Marker is readonly. Text cannot be changed and marker cannot be removed. The will not update the marker in the game, Call MARKER:Refresh to update state.
-- @param #MARKER self -- @param #MARKER self
-- @return #MARKER self -- @return #MARKER self
function MARKER:ReadOnly() function MARKER:ReadOnly()
@ -315,7 +313,7 @@ function MARKER:ReadOnly()
return self return self
end end
--- Marker is readonly. Text cannot be changed and marker cannot be removed. --- Marker is read and write. Text cannot be changed and marker cannot be removed. The will not update the marker in the game, Call MARKER:Refresh to update state.
-- @param #MARKER self -- @param #MARKER self
-- @return #MARKER self -- @return #MARKER self
function MARKER:ReadWrite() function MARKER:ReadWrite()