weyne/MOOSE
1
0
Fork 0
mirror of https://github.com/FlightControl-Master/MOOSE.git synced 2025-08-15 10:47:21 +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 2024-03-25 18:26:45 +01:00
commit 00dc9969b6
2 changed files with 61 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Moose Development/Moose/Core/Spawn.lua
View File

@ -3538,6 +3538,8 @@ function SPAWN:_Prepare( SpawnTemplatePrefix, SpawnIndex ) -- R2.2
if tonumber(SpawnTemplate.units[UnitID].AddPropAircraft.SADL_TN) ~= nil then if tonumber(SpawnTemplate.units[UnitID].AddPropAircraft.SADL_TN) ~= nil then
local octal = SpawnTemplate.units[UnitID].AddPropAircraft.SADL_TN local octal = SpawnTemplate.units[UnitID].AddPropAircraft.SADL_TN
local num = UTILS.OctalToDecimal(octal) local num = UTILS.OctalToDecimal(octal)
self.SpawnInitSADL = num -- we arrived here seeing that self.SpawnInitSADL == nil, but now that we have a SADL (num), we also need to set it to self.SpawnInitSADL in case
-- we need to get the next SADL from _DATABASE, or else UTILS.OctalToDecimal() will fail in GetNextSADL
if _DATABASE.SADL[num] ~= nil or UnitID > 1 then -- SADL taken or next unit if _DATABASE.SADL[num] ~= nil or UnitID > 1 then -- SADL taken or next unit
octal = _DATABASE:GetNextSADL(self.SpawnInitSADL,SpawnTemplate.units[UnitID].name) octal = _DATABASE:GetNextSADL(self.SpawnInitSADL,SpawnTemplate.units[UnitID].name)
end end

118
Moose Development/Moose/Wrapper/Airbase.lua
View File

@ -592,36 +592,36 @@ AIRBASE.MarianaIslands = {
--- Airbases of the South Atlantic map: --- Airbases of the South Atlantic map:
-- --
-- * AIRBASE.Falklands.Almirante_Schroeders -- * AIRBASE.SouthAtlantic.Almirante_Schroeders
-- * AIRBASE.Falklands.Caleta_Tortel -- * AIRBASE.SouthAtlantic.Caleta_Tortel
-- * AIRBASE.Falklands.Comandante_Luis_Piedrabuena -- * AIRBASE.SouthAtlantic.Comandante_Luis_Piedrabuena
-- * AIRBASE.Falklands.Cullen -- * AIRBASE.SouthAtlantic.Cullen
-- * AIRBASE.Falklands.El_Calafate -- * AIRBASE.SouthAtlantic.El_Calafate
-- * AIRBASE.Falklands.Franco_Bianco -- * AIRBASE.SouthAtlantic.Franco_Bianco
-- * AIRBASE.Falklands.Gobernador_Gregores -- * AIRBASE.SouthAtlantic.Gobernador_Gregores
-- * AIRBASE.Falklands.Goose_Green -- * AIRBASE.SouthAtlantic.Goose_Green
-- * AIRBASE.Falklands.Gull_Point -- * AIRBASE.SouthAtlantic.Gull_Point
-- * AIRBASE.Falklands.Hipico_Flying_Club -- * AIRBASE.SouthAtlantic.Hipico_Flying_Club
-- * AIRBASE.Falklands.Mount_Pleasant -- * AIRBASE.SouthAtlantic.Mount_Pleasant
-- * AIRBASE.Falklands.O_Higgins -- * AIRBASE.SouthAtlantic.O_Higgins
-- * AIRBASE.Falklands.Pampa_Guanaco -- * AIRBASE.SouthAtlantic.Pampa_Guanaco
-- * AIRBASE.Falklands.Port_Stanley -- * AIRBASE.SouthAtlantic.Port_Stanley
-- * AIRBASE.Falklands.Porvenir -- * AIRBASE.SouthAtlantic.Porvenir
-- * AIRBASE.Falklands.Puerto_Natales -- * AIRBASE.SouthAtlantic.Puerto_Natales
-- * AIRBASE.Falklands.Puerto_Santa_Cruz -- * AIRBASE.SouthAtlantic.Puerto_Santa_Cruz
-- * AIRBASE.Falklands.Puerto_Williams -- * AIRBASE.SouthAtlantic.Puerto_Williams
-- * AIRBASE.Falklands.Punta_Arenas -- * AIRBASE.SouthAtlantic.Punta_Arenas
-- * AIRBASE.Falklands.Rio_Chico -- * AIRBASE.SouthAtlantic.Rio_Chico
-- * AIRBASE.Falklands.Rio_Gallegos -- * AIRBASE.SouthAtlantic.Rio_Gallegos
-- * AIRBASE.Falklands.Rio_Grande -- * AIRBASE.SouthAtlantic.Rio_Grande
-- * AIRBASE.Falklands.Rio_Turbio -- * AIRBASE.SouthAtlantic.Rio_Turbio
-- * AIRBASE.Falklands.San_Carlos_FOB -- * AIRBASE.SouthAtlantic.San_Carlos_FOB
-- * AIRBASE.Falklands.San_Julian -- * AIRBASE.SouthAtlantic.San_Julian
-- * AIRBASE.Falklands.Tolhuin -- * AIRBASE.SouthAtlantic.Tolhuin
-- * AIRBASE.Falklands.Ushuaia -- * AIRBASE.SouthAtlantic.Ushuaia
-- * AIRBASE.Falklands.Ushuaia_Helo_Port -- * AIRBASE.SouthAtlantic.Ushuaia_Helo_Port
-- --
--@field MarianaIslands --@field SouthAtlantic
AIRBASE.SouthAtlantic={ AIRBASE.SouthAtlantic={
["Almirante_Schroeders"] = "Almirante Schroeders", ["Almirante_Schroeders"] = "Almirante Schroeders",
["Caleta_Tortel"] = "Caleta Tortel", ["Caleta_Tortel"] = "Caleta Tortel",
@ -655,36 +655,36 @@ AIRBASE.SouthAtlantic={
--- Airbases of the Sinai map: --- Airbases of the Sinai map:
-- --
-- * AIRBASE.SinaiMap.Abu_Rudeis -- * AIRBASE.Sinai.Abu_Rudeis
-- * AIRBASE.SinaiMap.Abu_Suwayr -- * AIRBASE.Sinai.Abu_Suwayr
-- * AIRBASE.SinaiMap.Al_Ismailiyah -- * AIRBASE.Sinai.Al_Ismailiyah
-- * AIRBASE.SinaiMap.Al_Mansurah -- * AIRBASE.Sinai.Al_Mansurah
-- * AIRBASE.SinaiMap.As_Salihiyah -- * AIRBASE.Sinai.As_Salihiyah
-- * AIRBASE.SinaiMap.AzZaqaziq -- * AIRBASE.Sinai.AzZaqaziq
-- * AIRBASE.SinaiMap.Baluza -- * AIRBASE.Sinai.Baluza
-- * AIRBASE.SinaiMap.Ben_Gurion -- * AIRBASE.Sinai.Ben_Gurion
-- * AIRBASE.SinaiMap.Bilbeis_Air_Base -- * AIRBASE.Sinai.Bilbeis_Air_Base
-- * AIRBASE.SinaiMap.Bir_Hasanah -- * AIRBASE.Sinai.Bir_Hasanah
-- * AIRBASE.SinaiMap.Cairo_International_Airport -- * AIRBASE.Sinai.Cairo_International_Airport
-- * AIRBASE.SinaiMap.Cairo_West -- * AIRBASE.Sinai.Cairo_West
-- * AIRBASE.SinaiMap.Difarsuwar_Airfield -- * AIRBASE.Sinai.Difarsuwar_Airfield
-- * AIRBASE.SinaiMap.El_Arish -- * AIRBASE.Sinai.El_Arish
-- * AIRBASE.SinaiMap.El_Gora -- * AIRBASE.Sinai.El_Gora
-- * AIRBASE.SinaiMap.Fayed -- * AIRBASE.Sinai.Fayed
-- * AIRBASE.SinaiMap.Hatzerim -- * AIRBASE.Sinai.Hatzerim
-- * AIRBASE.SinaiMap.Hatzor -- * AIRBASE.Sinai.Hatzor
-- * AIRBASE.SinaiMap.Inshas_Airbase -- * AIRBASE.Sinai.Inshas_Airbase
-- * AIRBASE.SinaiMap.Kedem -- * AIRBASE.Sinai.Kedem
-- * AIRBASE.SinaiMap.Kibrit_Air_Base -- * AIRBASE.Sinai.Kibrit_Air_Base
-- * AIRBASE.SinaiMap.Melez -- * AIRBASE.Sinai.Melez
-- * AIRBASE.SinaiMap.Nevatim -- * AIRBASE.Sinai.Nevatim
-- * AIRBASE.SinaiMap.Ovda -- * AIRBASE.Sinai.Ovda
-- * AIRBASE.SinaiMap.Palmahim -- * AIRBASE.Sinai.Palmahim
-- * AIRBASE.SinaiMap.Ramon_Airbase -- * AIRBASE.Sinai.Ramon_Airbase
-- * AIRBASE.SinaiMap.Sde_Dov -- * AIRBASE.Sinai.Sde_Dov
-- * AIRBASE.SinaiMap.St_Catherine -- * AIRBASE.Sinai.St_Catherine
-- * AIRBASE.SinaiMap.Tel_Nof -- * AIRBASE.Sinai.Tel_Nof
-- * AIRBASE.SinaiMap.Wadi_al_Jandali -- * AIRBASE.Sinai.Wadi_al_Jandali
-- --
-- @field Sinai -- @field Sinai
AIRBASE.Sinai = { AIRBASE.Sinai = {