Skip to content

Pr #2583

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Applevangelist merged 5 commits into from
Apr 27, 2026
+284 −17
Merged

Pr #2583

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a72f729
Update CTLD.lua
leka1986 Apr 26, 2026
13b7e43
Update CTLD_Localization.lua
leka1986 Apr 26, 2026
6db5441
Modify parking spot handling in Spawn.lua
leka1986 Apr 26, 2026
5e2218d
Expand locale options in CTLD.lua
leka1986 Apr 26, 2026
0347f18
Merge pull request #2582 from FlightControl-Master/leka1986-patch-1
Applevangelist Apr 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions Moose Development/Moose/Core/Spawn.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2149,6 +2149,7 @@ function SPAWN:SpawnAtAirbase( SpawnAirbase, Takeoff, TakeoffAltitude, TerminalT
local parkingspots = {}
local parkingindex = {}
local spots
local useexplicitspots = false

-- Spawn happens on ground, i.e. at an airbase, a FARP or a ship.
if spawnonground and not SpawnTemplate.parked then
Expand Down Expand Up @@ -2180,8 +2181,6 @@ function SPAWN:SpawnAtAirbase( SpawnAirbase, Takeoff, TakeoffAltitude, TerminalT

-- Use exact parking data when provided, otherwise let helicopters on ships/FARPs
-- use the smarter parking search before falling back to the procedural queue path.
local useexplicitspots = false

-- Number of free parking spots at the airbase.
if Parkingdata~=nil then
-- Parking data explicitly set by user as input parameter.
Expand Down Expand Up @@ -2299,6 +2298,10 @@ function SPAWN:SpawnAtAirbase( SpawnAirbase, Takeoff, TakeoffAltitude, TerminalT
end
end

if useexplicitspots and parkingspots[1] then
PointVec3 = parkingspots[1]
end

-- Not enough spots ==> Prepare airstart.
if _notenough then

Expand Down Expand Up @@ -2367,7 +2370,7 @@ function SPAWN:SpawnAtAirbase( SpawnAirbase, Takeoff, TakeoffAltitude, TerminalT
if spawnonground then

-- Ships and FARPS seem to have a build in queue.
if autoparking then
if autoparking and not useexplicitspots then

-- Spawn on ship. We take only the position of the ship.
SpawnTemplate.units[UnitID].x = PointVec3.x -- TX
Expand Down
36 changes: 23 additions & 13 deletions Moose Development/Moose/Ops/CTLD.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ do
-- my_ctld.UseC130LoadAndUnload = false -- When set to true, forces the C-130 player to use the C-130J built system to load the cargo onboard and to unload. (Default is false)
-- my_ctld.UseC130DynamicCargoAutoBuild = false -- When true (and UseC130LoadAndUnload is true), C-130 DynamicCargo unload completion is bridged to CTLD engineer-path auto-build.
-- my_ctld.C130DynamicCargoAutoBuildMergeSeconds = 0 -- Merge window in seconds for C-130 auto-build handoff; set to 0 to disable batching (default).
-- my_ctld.locale = "en" -- Language locale to use, available are "en" (default), "de" and "fr"
-- my_ctld.locale = "en" -- Language locale to use, available are "en" (default), "de", "fr", "es" and "ru"
--
-- ## 2.1 CH-47 Chinook support
--
Expand Down Expand Up @@ -1483,6 +1483,7 @@ end
-- @return #CTLD self
function CTLD:_InitLocalization()
self:T(self.lid.."_InitLocalization")
self.locale = string.lower(tostring(self.locale or "en"))
self.gettext = TEXTANDSOUND:New("CTLD","en") -- Core.TextAndSound#TEXTANDSOUND
for locale,table in pairs(self.Messages) do
local Locale = string.lower(tostring(locale))
Expand All @@ -1495,6 +1496,20 @@ function CTLD:_InitLocalization()
return self
end

function CTLD:_GetMenuPluralSuffix(Count, Kind)
local count = tonumber(Count) or 0
if self.locale == "ru" then
local n = math.abs(count) % 100
local d = n % 10
if n >= 11 and n <= 14 then return "ов" end
if d == 1 then return "" end
if d >= 2 and d <= 4 then return "а" end
return "ов"
end
if self.locale == "de" and Kind == "crate" then return count > 1 and "n" or "" end
return count > 1 and "s" or ""
end

--- [User] Set SRS TTS details - see @{Sound.SRS} for details.`SetSRS()` will try to use as many attributes configured with @{Sound.SRS#MSRS.LoadConfigFile}() as possible.
-- @param #CTLD self
-- @param #number Frequency Frequency to be used. Can also be given as a table of multiple frequencies, e.g. 30 or {30,124.5}. Defaults to {30,124.5}. There needs to be exactly the same number of modulations!
Expand Down Expand Up @@ -6808,8 +6823,7 @@ function CTLD:_RefreshF10Menus()
local txt
local cargoLabel = self:_GetCargoDisplayName(cargoObj)
if needed > 1 then
local plural = "s"
if self.locale == "de" then plural = "n" end
local plural = self:_GetMenuPluralSuffix(needed, "crate")
txt = string.format(self.gettext:GetEntry("MENU_CRATES_NEEDED",self.locale),needed,plural,cargoLabel,cargoObj.PerCrateMass or 0)
else
txt = string.format("%s (%dkg)",cargoLabel,cargoObj.PerCrateMass or 0)
Expand Down Expand Up @@ -6859,8 +6873,7 @@ function CTLD:_RefreshF10Menus()
local txt
local cargoLabel = self:_GetCargoDisplayName(cargoObj)
if needed > 1 then
local plural = "s"
if self.locale == "de" then plural = "n" end
local plural = self:_GetMenuPluralSuffix(needed, "crate")
txt = string.format(self.gettext:GetEntry("MENU_CRATES_NEEDED",self.locale),needed,plural,cargoLabel,cargoObj.PerCrateMass or 0)
else
txt = string.format("%s (%dkg)",cargoLabel,cargoObj.PerCrateMass or 0)
Expand All @@ -6877,8 +6890,7 @@ function CTLD:_RefreshF10Menus()
local txt
local cargoLabel = self:_GetCargoDisplayName(cargoObj)
if needed > 1 then
local plural = "s"
if self.locale == "de" then plural = "n" end
local plural = self:_GetMenuPluralSuffix(needed, "crate")
txt = string.format(self.gettext:GetEntry("MENU_CRATES_NEEDED",self.locale),needed,plural,cargoLabel,cargoObj.PerCrateMass or 0)
else
txt = string.format("%s (%dkg)",cargoLabel,cargoObj.PerCrateMass or 0)
Expand All @@ -6896,8 +6908,7 @@ function CTLD:_RefreshF10Menus()
local txt
local cargoLabel = self:_GetCargoDisplayName(cargoObj)
if needed > 1 then
local plural = "s"
if self.locale == "de" then plural = "n" end
local plural = self:_GetMenuPluralSuffix(needed, "crate")
txt = string.format(self.gettext:GetEntry("MENU_CRATES_NEEDED",self.locale),needed,plural,cargoLabel,cargoObj.PerCrateMass or 0)
else
txt = string.format("%s (%dkg)",cargoLabel,cargoObj.PerCrateMass or 0)
Expand All @@ -6914,8 +6925,7 @@ function CTLD:_RefreshF10Menus()
local txt
local cargoLabel = self:_GetCargoDisplayName(cargoObj)
if needed > 1 then
local plural = "s"
if self.locale == "de" then plural = "n" end
local plural = self:_GetMenuPluralSuffix(needed, "crate")
txt = string.format(self.gettext:GetEntry("MENU_CRATES_NEEDED",self.locale),needed,plural,cargoLabel,cargoObj.PerCrateMass or 0)
else
txt = string.format("%s (%dkg)",cargoLabel,cargoObj.PerCrateMass or 0)
Expand Down Expand Up @@ -7564,7 +7574,7 @@ function CTLD:_RefreshDropCratesMenu(Group, Unit)
end,self,Group,Unit,cName,needed,1)
else
for q=1,sets do
local qm=MENU_GROUP:New(Group,string.format(self.gettext:GetEntry("MENU_DROP_N_SETS",self.locale),q,q>1 and "s" or ""),parentMenu)
local qm=MENU_GROUP:New(Group,string.format(self.gettext:GetEntry("MENU_DROP_N_SETS",self.locale),q,self:_GetMenuPluralSuffix(q, "set")),parentMenu)
--local qm=MENU_GROUP:New(Group,string.format("Drop %d Set%s",q,q>1 and "s" or ""),parentMenu)
MENU_GROUP_COMMAND:New(Group,self.gettext:GetEntry("MENU_DROP",self.locale),qm,function(selfArg,GroupArg,UnitArg,cNameArg,neededArg,qty)
local uName=UnitArg:GetName()
Expand Down Expand Up @@ -7661,7 +7671,7 @@ function CTLD:_RefreshDropCratesMenu(Group, Unit)
end
else
for q=1,sets do
local qm=MENU_GROUP:New(Group,string.format(self.gettext:GetEntry("MENU_DROP_N_SETS",self.locale),q,q>1 and "s" or ""),parentMenu)
local qm=MENU_GROUP:New(Group,string.format(self.gettext:GetEntry("MENU_DROP_N_SETS",self.locale),q,self:_GetMenuPluralSuffix(q, "set")),parentMenu)
--local qm=MENU_GROUP:New(Group,string.format("Drop %d Set%s",q,q>1 and "s" or ""),parentMenu)
MENU_GROUP_COMMAND:New(Group,self.gettext:GetEntry("MENU_DROP",self.locale),qm,function(selfArg,GroupArg,UnitArg,cNameArg,neededArg,qty)
local uName=UnitArg:GetName()
Expand Down
Loading
Loading