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

#SET

Browse Source 
* improve GetRandom() a bit
This commit is contained in:
Applevangelist 2022-12-11 15:51:22 +01:00
commit 4892a58084
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Moose Development/Moose/Core/Set.lua
View File

@ -179,7 +179,7 @@ do -- SET_BASE
return Names return Names
end end
--- Return a table of the Objects in the Set. --- Returns a table of the Objects in the Set.
-- @param #SET_BASE self -- @param #SET_BASE self
-- @return #SET_BASE self -- @return #SET_BASE self
function SET_BASE:GetSetObjects() -- R2.3 function SET_BASE:GetSetObjects() -- R2.3
@ -376,7 +376,6 @@ do -- SET_BASE
-- @param #SET_BASE self -- @param #SET_BASE self
-- @return Core.Base#BASE -- @return Core.Base#BASE
function SET_BASE:GetFirst() function SET_BASE:GetFirst()
local ObjectName = self.Index[1] local ObjectName = self.Index[1]
local FirstObject = self.Set[ObjectName] local FirstObject = self.Set[ObjectName]
self:T3( { FirstObject } ) self:T3( { FirstObject } )
@ -387,8 +386,8 @@ do -- SET_BASE
-- @param #SET_BASE self -- @param #SET_BASE self
-- @return Core.Base#BASE -- @return Core.Base#BASE
function SET_BASE:GetLast() function SET_BASE:GetLast()
local tablemax = table.maxn(self.Index)
local ObjectName = self.Index[#self.Index] local ObjectName = self.Index[tablemax]
local LastObject = self.Set[ObjectName] local LastObject = self.Set[ObjectName]
self:T3( { LastObject } ) self:T3( { LastObject } )
return LastObject return LastObject
@ -398,8 +397,8 @@ do -- SET_BASE
-- @param #SET_BASE self -- @param #SET_BASE self
-- @return Core.Base#BASE -- @return Core.Base#BASE
function SET_BASE:GetRandom() function SET_BASE:GetRandom()
local tablemax = table.maxn(self.Index)
local RandomItem = self.Set[self.Index[math.random( #self.Index )]] local RandomItem = self.Set[self.Index[math.random(1,tablemax)]]
self:T3( { RandomItem } ) self:T3( { RandomItem } )
return RandomItem return RandomItem
end end
@ -408,8 +407,7 @@ do -- SET_BASE
-- @param #SET_BASE self -- @param #SET_BASE self
-- @return #number Count -- @return #number Count
function SET_BASE:Count() function SET_BASE:Count()
return self.Index and table.maxn(self.Index) or 0
return self.Index and #self.Index or 0
end end
--- Copies the Filter criteria from a given Set (for rebuilding a new Set based on an existing Set). --- Copies the Filter criteria from a given Set (for rebuilding a new Set based on an existing Set).
@ -6800,7 +6798,7 @@ do -- SET_SCENERY
if ZoneSet then if ZoneSet then
for _,_zone in pairs(ZoneSet.Set) do for _,_zone in pairs(ZoneSet.Set) do
--self:I("Zone type handed: "..tostring(_zone.ClassName)) self:T("Zone type handed: "..tostring(_zone.ClassName))
table.insert(zonenames,_zone:GetName()) table.insert(zonenames,_zone:GetName())
end end
self:AddSceneryByName(zonenames) self:AddSceneryByName(zonenames)
@ -6814,7 +6812,7 @@ do -- SET_SCENERY
-- @param Core.Zone#ZONE Zone The zone to be scanned. Can be a ZONE_RADIUS (round) or a ZONE_POLYGON (e.g. Quad-Point) -- @param Core.Zone#ZONE Zone The zone to be scanned. Can be a ZONE_RADIUS (round) or a ZONE_POLYGON (e.g. Quad-Point)
-- @return #SET_SCENERY -- @return #SET_SCENERY
function SET_SCENERY:NewFromZone(Zone) function SET_SCENERY:NewFromZone(Zone)
local zone = Zone -- Core.Zone#ZONE_POLYGON local zone = Zone -- Core.Zone#ZONE_RADIUS
if type(Zone) == "string" then if type(Zone) == "string" then
zone = ZONE:FindByName(Zone) zone = ZONE:FindByName(Zone)
end end