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 2024-02-20 12:08:27 +01:00
commit a48e09b434
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -724,7 +724,7 @@ end
-- @param #number Country Country id as number or enumerator: -- @param #number Country Country id as number or enumerator:
-- --
-- * @{DCS#country.id.RUSSIA} -- * @{DCS#country.id.RUSSIA}
-- * @{DCS#county.id.USA} -- * @{DCS#country.id.USA}
-- --
-- @return #SPAWN self -- @return #SPAWN self
function SPAWN:InitCountry( Country ) function SPAWN:InitCountry( Country )

5
Moose Development/Moose/Core/Zone.lua
View File

@ -899,6 +899,7 @@ function ZONE_RADIUS:BoundZone( Points, CountryID, UnBound )
local Point = {} local Point = {}
local Vec2 = self:GetVec2() local Vec2 = self:GetVec2()
local countryID = CountryID or country.id.USA
Points = Points and Points or 360 Points = Points and Points or 360
@ -910,7 +911,7 @@ function ZONE_RADIUS:BoundZone( Points, CountryID, UnBound )
Point.x = Vec2.x + math.cos( Radial ) * self:GetRadius() Point.x = Vec2.x + math.cos( Radial ) * self:GetRadius()
Point.y = Vec2.y + math.sin( Radial ) * self:GetRadius() Point.y = Vec2.y + math.sin( Radial ) * self:GetRadius()
local CountryName = _DATABASE.COUNTRY_NAME[CountryID] local CountryName = _DATABASE.COUNTRY_NAME[countryID]
local Tire = { local Tire = {
["country"] = CountryName, ["country"] = CountryName,
@ -925,7 +926,7 @@ function ZONE_RADIUS:BoundZone( Points, CountryID, UnBound )
["heading"] = 0, ["heading"] = 0,
} -- end of ["group"] } -- end of ["group"]
local Group = coalition.addStaticObject( CountryID, Tire ) local Group = coalition.addStaticObject( countryID, Tire )
if UnBound and UnBound == true then if UnBound and UnBound == true then
Group:destroy() Group:destroy()
end end

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

@ -302,7 +302,7 @@ AIRBASE.Normandy = {
["Fecamp_Benouville"] = "Fecamp-Benouville", ["Fecamp_Benouville"] = "Fecamp-Benouville",
["Farnborough"] = "Farnborough", ["Farnborough"] = "Farnborough",
["Friston"] = "Friston", ["Friston"] = "Friston",
["Deanland "] = "Deanland ", ["Deanland"] = "Deanland",
["Triqueville"] = "Triqueville", ["Triqueville"] = "Triqueville",
["Poix"] = "Poix", ["Poix"] = "Poix",
["Orly"] = "Orly", ["Orly"] = "Orly",