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

Final tests done, publishing

Browse Source
This commit is contained in:
FlightControl
2017-05-22 12:17:18 +02:00
parent 8ab12e5e9a
commit 599f31dfae
7 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Moose Development/Moose/Core/Database.lua
View File

@@ -101,7 +101,7 @@ function DATABASE:New()
self:HandleEvent( EVENTS.DeleteCargo )
-- Follow alive players and clients
-- self:HandleEvent( EVENTS.PlayerEnterUnit, self._EventOnPlayerEnterUnit )
self:HandleEvent( EVENTS.PlayerEnterUnit, self._EventOnPlayerEnterUnit )
self:HandleEvent( EVENTS.PlayerLeaveUnit, self._EventOnPlayerLeaveUnit )
self:_RegisterTemplates()
@@ -118,7 +118,7 @@ function DATABASE:New()
local CoalitionsData = { AlivePlayersRed = coalition.getPlayers( coalition.side.RED ), AlivePlayersBlue = coalition.getPlayers( coalition.side.BLUE ) }
for CoalitionId, CoalitionData in pairs( CoalitionsData ) do
self:T( { "CoalitionData:", CoalitionData } )
self:E( { "CoalitionData:", CoalitionData } )
for UnitId, UnitData in pairs( CoalitionData ) do
if UnitData and UnitData:isExist() then
@@ -715,6 +715,8 @@ function DATABASE:_EventOnPlayerEnterUnit( Event )
if not self.PLAYERS[PlayerName] then
self:AddPlayer( Event.IniUnitName, PlayerName )
end
local Settings = SETTINGS:Set( PlayerName )
Settings:SetPlayerMenu( Event.IniUnit )
end
end
end

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

@@ -458,7 +458,7 @@ do -- COORDINATE
local Settings = Settings or _SETTINGS
if Altitude ~= 0 then
if Settings:IsMetric() then
return " at" .. UTILS.Round( self.y, -3 ) .. " meters"
return " at " .. UTILS.Round( self.y, -3 ) .. " meters"
else
return " at " .. UTILS.Round( UTILS.MetersToFeet( self.y ), -3 ) .. " feet"
end
@@ -759,7 +759,7 @@ do -- COORDINATE
-- @param #COORDINATE TargetCoordinate The target COORDINATE.
-- @return #string The BR text.
function COORDINATE:ToStringBR( FromCoordinate, Settings )
local DirectionVec3 = self:GetDirectionVec3( FromCoordinate )
local DirectionVec3 = FromCoordinate:GetDirectionVec3( self )
local AngleRadians = self:GetAngleRadians( DirectionVec3 )
local Distance = self:Get2DDistance( FromCoordinate )
return "BR, " .. self:GetBRText( AngleRadians, Distance, Settings )
@@ -769,7 +769,7 @@ do -- COORDINATE
-- @param #COORDINATE self
-- @param #COORDINATE TargetCoordinate The target COORDINATE.
-- @return #string The BR text.
function COORDINATE:ToStringBRAA( FromCoordinate, Settings )
function COORDINATE:ToStringBRA( FromCoordinate, Settings )
local DirectionVec3 = FromCoordinate:GetDirectionVec3( self )
local AngleRadians = self:GetAngleRadians( DirectionVec3 )
local Distance = FromCoordinate:Get2DDistance( self )
@@ -860,7 +860,7 @@ do -- COORDINATE
if Settings:IsA2A_BRA() then
local Coordinate = Controllable:GetCoordinate()
Coordinate:SetModeA2A()
return self:ToStringBRAA( Coordinate, Settings )
return self:ToStringBRA( Coordinate, Settings )
end
if Settings:IsA2A_BULLS() then
@@ -872,7 +872,7 @@ do -- COORDINATE
if Settings:IsA2G_BRA() then
local Coordinate = Controllable:GetCoordinate()
Coordinate:SetModeA2A()
return Controllable and self:ToStringBRAA( Coordinate, Settings ) or self:ToStringMGRS( Settings )
return Controllable and self:ToStringBR( Coordinate, Settings ) or self:ToStringMGRS( Settings )
end
if Settings:IsA2G_LL() then
return self:ToStringLL( Settings )