diff --git a/Moose Development/Moose/Core/Message.lua b/Moose Development/Moose/Core/Message.lua index 35d63b276..aa703f2fe 100644 --- a/Moose Development/Moose/Core/Message.lua +++ b/Moose Development/Moose/Core/Message.lua @@ -591,4 +591,3 @@ function MESSAGE:ToSRSAll(frequency,modulation,gender,culture,voice,volume,coord self:ToSRS(frequency,modulation,gender,culture,voice,coalition.side.NEUTRAL,volume,coordinate) return self end - diff --git a/Moose Development/Moose/Core/Set.lua b/Moose Development/Moose/Core/Set.lua index a044c2436..3c86e80b2 100644 --- a/Moose Development/Moose/Core/Set.lua +++ b/Moose Development/Moose/Core/Set.lua @@ -6198,30 +6198,21 @@ do -- SET_ZONE -- @param Wrappe.Controllable#CONTROLLABLE Objects Object or Objects to watch, can be of type UNIT, GROUP, CLIENT, or SET\_UNIT, SET\_GROUP, SET\_CLIENT -- @return #SET_ZONE self -- @usage - -- Create a SET_ZONE and have it look after a SET_GROUP of objects: - -- - -- local groupset = SET_GROUP:New():FilterPrefixes("Aerial"):FilterStart( - -- local zoneset = SET_ZONE:New():FilterPrefixes("Target Zone"):FilterOnce():Trigger(groupset) - -- - -- -- Draw on the map - -- zoneset:ForEachZone( - -- function(zone) - -- zone:DrawZone(-1, {0,1,0}, Alpha, FillColor, FillAlpha, 4, ReadOnly) - -- end - -- ) - -- - -- -- function called when a controllable enters - -- function zoneset:OnAfterEnteredZone(From,Event,To,Controllable,Zone) - -- MESSAGE:New("Group "..Controllable:GetName() .. " entered zone "..Zone:GetName(),10,"Set Trigger"):ToAll() - -- end - -- - -- -- function called when a controllable leaves - -- function zoneset:OnAfterLeftZone(From,Event,To,Controllable,Zone) - -- MESSAGE:New("Group "..Controllable:GetName() .. " left zone "..Zone:GetName(),10,"Set Trigger"):ToAll() - -- end - -- - -- -- Stop after 1 hour - -- zoneset:__TriggerStop(3600) + -- -- Create a new zone and start watching it every 5 secs for a certain GROUP entering or leaving + -- local triggerzone = ZONE:New("ZonetoWatch"):Trigger(GROUP:FindByName("Aerial-1")) + -- + -- -- function to handle FSM event "EnteredZone" + -- function triggerzone:OnAfterEnteredZone(From,Event,To,Group) + -- MESSAGE:New("Group has entered zone!",15):ToAll() + -- end + -- + -- -- function to handle FSM event "LeftZone" + -- function triggerzone:OnAfterLeftZone(From,Event,To,Group) + -- MESSAGE:New("Group has left zone!",15):ToAll() + -- end + -- + -- -- Stop watching the zone + -- triggerzone:TriggerStop() function SET_ZONE:Trigger(Objects) --self:I("Added Set_Zone Trigger") self:AddTransition("*","TriggerStart","TriggerRunning") diff --git a/Moose Development/Moose/Core/Zone.lua b/Moose Development/Moose/Core/Zone.lua index 8d6a26622..68fd3fa42 100644 --- a/Moose Development/Moose/Core/Zone.lua +++ b/Moose Development/Moose/Core/Zone.lua @@ -587,7 +587,7 @@ end -- end -- -- -- Stop watching the zone after 1 hour --- triggerzone:__TriggerStop(2600) +-- triggerzone:__TriggerStop(3600) function ZONE_BASE:Trigger(Objects) --self:I("Added Zone Trigger") self:SetStartState("TriggerStopped")