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-10-26 16:19:44 +01:00
commit b28e66fe6d
3 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Moose Development/Moose/Core/Point.lua
View File

@ -1637,6 +1637,7 @@ do -- COORDINATE
if AirbaseCategory == Airbase.Category.SHIP or AirbaseCategory == Airbase.Category.HELIPAD then if AirbaseCategory == Airbase.Category.SHIP or AirbaseCategory == Airbase.Category.HELIPAD then
RoutePoint.linkUnit = AirbaseID RoutePoint.linkUnit = AirbaseID
RoutePoint.helipadId = AirbaseID RoutePoint.helipadId = AirbaseID
RoutePoint.airdromeId = airbase:IsAirdrome() and AirbaseID or nil
elseif AirbaseCategory == Airbase.Category.AIRDROME then elseif AirbaseCategory == Airbase.Category.AIRDROME then
RoutePoint.airdromeId = AirbaseID RoutePoint.airdromeId = AirbaseID
else else

4
Moose Development/Moose/Functional/Scoring.lua
View File

@ -320,8 +320,8 @@ function SCORING:New( GameName, SavePath, AutoSave )
-- Create the CSV file. -- Create the CSV file.
self.AutoSavePath = SavePath self.AutoSavePath = SavePath
self.AutoSave = AutoSave or true self.AutoSave = (AutoSave == nil or AutoSave == true) and true or false
if self.AutoSave == true then if self.AutoSavePath and self.AutoSave == true then
self:OpenCSV( GameName ) self:OpenCSV( GameName )
end end

12
Moose Development/Moose/Utilities/Utils.lua
View File

@ -4281,20 +4281,10 @@ function UTILS.SpawnFARPAndFunctionalStatics(Name,Coordinate,FARPType,Coalition,
} }
for id,gridpoint in ipairs(Grid) do for id,gridpoint in ipairs(Grid) do
-- Spawn FARP -- Spawn FARP
--[[
local location = COORDINATE:NewFromVec2(gridpoint)
local newfarp = SPAWNSTATIC:NewFromType(STypeName,"Heliports",Country) -- "Invisible FARP" "FARP"
newfarp:InitShape(SShapeName) -- "invisiblefarp" "FARPS"
newfarp:InitFARP(callsign,freq,mod,DynamicSpawns,HotStart)
local spawnedfarp = newfarp:SpawnFromCoordinate(location,0,Name.."-"..id)
table.insert(ReturnObjects,spawnedfarp)
PopulateStorage(Name.."-"..id,liquids,equip,airframes)
--]]
local UnitTemplate = UTILS.DeepCopy(unitData) local UnitTemplate = UTILS.DeepCopy(unitData)
UnitTemplate.x = gridpoint.x UnitTemplate.x = gridpoint.x
UnitTemplate.y = gridpoint.y UnitTemplate.y = gridpoint.y
UnitTemplate.name = Name.."-"..id if id > 1 then UnitTemplate.name = Name.."-"..id end
table.insert(groupData.units,UnitTemplate) table.insert(groupData.units,UnitTemplate)
if id==1 then if id==1 then
groupData.x = gridpoint.x groupData.x = gridpoint.x