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 remote-tracking branch 'origin/master' into develop

Browse Source
This commit is contained in:
Applevangelist
2025-01-12 17:10:27 +01:00
parent 5f57c71c62 def622a02c
commit 852c18cef8
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Moose Development/Moose/Ops/CTLD.lua
View File

@@ -1352,7 +1352,7 @@ CTLD.UnitTypeCapabilities = {
--- CTLD class version. --- CTLD class version.
-- @field #string version -- @field #string version
CTLD.version="1.1.22" CTLD.version="1.1.23"
--- Instantiate a new CTLD. --- Instantiate a new CTLD.
-- @param #CTLD self -- @param #CTLD self
@@ -5583,11 +5583,12 @@ end
if PreciseLocation then if PreciseLocation then
randomcoord = zone:GetCoordinate():GetVec2() randomcoord = zone:GetCoordinate():GetVec2()
end end
local randompositions = not PreciseLocation
for _,_template in pairs(temptable) do for _,_template in pairs(temptable) do
self.TroopCounter = self.TroopCounter + 1 self.TroopCounter = self.TroopCounter + 1
local alias = string.format("%s-%d", _template, math.random(1,100000)) local alias = string.format("%s-%d", _template, math.random(1,100000))
self.DroppedTroops[self.TroopCounter] = SPAWN:NewWithAlias(_template,alias) self.DroppedTroops[self.TroopCounter] = SPAWN:NewWithAlias(_template,alias)
:InitRandomizeUnits(true,20,2) :InitRandomizeUnits(randompositions,20,2)
:InitDelayOff() :InitDelayOff()
:SpawnFromVec2(randomcoord) :SpawnFromVec2(randomcoord)
if self.movetroopstowpzone and type ~= CTLD_CARGO.Enum.ENGINEERS then if self.movetroopstowpzone and type ~= CTLD_CARGO.Enum.ENGINEERS then

5
Moose Development/Moose/Wrapper/Unit.lua
View File

@@ -1777,7 +1777,8 @@ function UNIT:GetSTN()
local VCN = nil -- VoiceCallsignNumber local VCN = nil -- VoiceCallsignNumber
local FGL = false -- FlightGroupLeader local FGL = false -- FlightGroupLeader
local template = self:GetTemplate() local template = self:GetTemplate()
if template.AddPropAircraft then if template then
if template.AddPropAircraft then
if template.AddPropAircraft.STN_L16 then if template.AddPropAircraft.STN_L16 then
STN = template.AddPropAircraft.STN_L16 STN = template.AddPropAircraft.STN_L16
elseif template.AddPropAircraft.SADL_TN then elseif template.AddPropAircraft.SADL_TN then
@@ -1793,6 +1794,6 @@ function UNIT:GetSTN()
if template.datalinks and template.datalinks.SADL and template.datalinks.SADL.settings then if template.datalinks and template.datalinks.SADL and template.datalinks.SADL.settings then
FGL = template.datalinks.SADL.settings.flightLead FGL = template.datalinks.SADL.settings.flightLead
end end
end
return STN, VCL, VCN, FGL return STN, VCL, VCN, FGL
end end