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

Removed some old code

Browse Source
This commit is contained in:
FlightControl 2017-05-26 08:35:49 +02:00
parent c10b4fb129
commit a1a8f90cc5
3 changed files with 2 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -175,8 +175,6 @@ do -- COORDINATE
self.y = y self.y = y
self.z = z self.z = z
self:SetModeA2G()
return self return self
end end
@ -688,35 +686,6 @@ do -- COORDINATE
end end
--- Set the mode to A2G
-- @param #COORDINATE self
-- @return #COORDINATE
function COORDINATE:SetModeA2G()
self.Mode = "A2G"
end
--- Is the mode to A2G
-- @param #COORDINATE self
-- @return #boolean
function COORDINATE:IsModeA2G()
return self.Mode == "A2G"
end
--- Set the mode to A2A
-- @param #COORDINATE self
-- @return #COORDINATE
function COORDINATE:SetModeA2A()
self.Mode = "A2A"
end
--- Is the mode to A2A
-- @param #COORDINATE self
-- @return #boolean
function COORDINATE:IsModeA2A()
return self.Mode == "A2A"
end
--- Return a BR string from a COORDINATE to the COORDINATE. --- Return a BR string from a COORDINATE to the COORDINATE.
-- @param #COORDINATE self -- @param #COORDINATE self
-- @param #COORDINATE TargetCoordinate The target COORDINATE. -- @param #COORDINATE TargetCoordinate The target COORDINATE.
@ -822,19 +791,16 @@ do -- COORDINATE
if IsAir then if IsAir then
if Settings:IsA2A_BRA() then if Settings:IsA2A_BRA() then
local Coordinate = Controllable:GetCoordinate() local Coordinate = Controllable:GetCoordinate()
Coordinate:SetModeA2A()
return self:ToStringBRA( Coordinate, Settings ) return self:ToStringBRA( Coordinate, Settings )
end end
if Settings:IsA2A_BULLS() then if Settings:IsA2A_BULLS() then
local Coordinate = Controllable:GetCoordinate() local Coordinate = Controllable:GetCoordinate()
Coordinate:SetModeA2A()
return self:ToStringBULLS( Coordinate, Settings ) return self:ToStringBULLS( Coordinate, Settings )
end end
else else
if Settings:IsA2G_BRA() then if Settings:IsA2G_BRA() then
local Coordinate = Controllable:GetCoordinate() local Coordinate = Controllable:GetCoordinate()
Coordinate:SetModeA2A()
return Controllable and self:ToStringBR( Coordinate, Settings ) or self:ToStringMGRS( Settings ) return Controllable and self:ToStringBR( Coordinate, Settings ) or self:ToStringMGRS( Settings )
end end
if Settings:IsA2G_LL() then if Settings:IsA2G_LL() then
@ -1141,7 +1107,7 @@ do -- POINT_VEC2
LandHeightAdd = LandHeightAdd or 0 LandHeightAdd = LandHeightAdd or 0
LandHeight = LandHeight + LandHeightAdd LandHeight = LandHeight + LandHeightAdd
local self = BASE:Inherit( self, COORDINATE:New( Vec2.x, LandHeight, Vec2.y ) ) -- Core.Point#POINT_VEC2 local self = BASE:Inherit( self, COORDINATE:NewFromVec2( Vec2, LandHeightAdd ) ) -- Core.Point#POINT_VEC2
self:F2( self ) self:F2( self )
return self return self

4
Moose Development/Moose/Tasking/Task_A2A.lua
View File

@ -243,8 +243,6 @@ do -- TASK_A2A
-- @param Wrapper.Unit#UNIT TaskUnit -- @param Wrapper.Unit#UNIT TaskUnit
function TASK_A2A:SetTargetCoordinate( TargetCoordinate, TaskUnit ) function TASK_A2A:SetTargetCoordinate( TargetCoordinate, TaskUnit )
TargetCoordinate:SetModeA2A()
local ProcessUnit = self:GetUnitProcess( TaskUnit ) local ProcessUnit = self:GetUnitProcess( TaskUnit )
local ActRouteTarget = ProcessUnit:GetProcess( "Engaging", "RouteToTargetPoint" ) -- Actions.Act_Route#ACT_ROUTE_POINT local ActRouteTarget = ProcessUnit:GetProcess( "Engaging", "RouteToTargetPoint" ) -- Actions.Act_Route#ACT_ROUTE_POINT
@ -373,7 +371,6 @@ do -- TASK_A2A_INTERCEPT
) )
local TargetCoordinate = TargetSetUnit:GetFirst():GetCoordinate() local TargetCoordinate = TargetSetUnit:GetFirst():GetCoordinate()
TargetCoordinate:SetModeA2A()
self:SetInfo( "Coordinates", TargetCoordinate ) self:SetInfo( "Coordinates", TargetCoordinate )
self:SetInfo( "ThreatLevel", "[" .. string.rep( "■", TargetSetUnit:CalculateThreatLevelA2G() ) .. "]" ) self:SetInfo( "ThreatLevel", "[" .. string.rep( "■", TargetSetUnit:CalculateThreatLevelA2G() ) .. "]" )
@ -421,7 +418,6 @@ do -- TASK_A2A_ENGAGE
) )
local TargetCoordinate = TargetSetUnit:GetFirst():GetCoordinate() local TargetCoordinate = TargetSetUnit:GetFirst():GetCoordinate()
TargetCoordinate:SetModeA2A()
self:SetInfo( "Coordinates", TargetCoordinate ) self:SetInfo( "Coordinates", TargetCoordinate )
self:SetInfo( "ThreatLevel", "[" .. string.rep( "■", TargetSetUnit:CalculateThreatLevelA2G() ) .. "]" ) self:SetInfo( "ThreatLevel", "[" .. string.rep( "■", TargetSetUnit:CalculateThreatLevelA2G() ) .. "]" )

3
Moose Development/Moose/Tasking/Task_A2G.lua
View File

@ -381,7 +381,6 @@ do -- TASK_SEAD
) )
local TargetCoordinate = TargetSetUnit:GetFirst():GetCoordinate() local TargetCoordinate = TargetSetUnit:GetFirst():GetCoordinate()
TargetCoordinate:SetModeA2G()
self:SetInfo( "Coordinates", TargetCoordinate ) self:SetInfo( "Coordinates", TargetCoordinate )
self:SetInfo( "ThreatLevel", "[" .. string.rep( "■", TargetSetUnit:CalculateThreatLevelA2G() ) .. "]" ) self:SetInfo( "ThreatLevel", "[" .. string.rep( "■", TargetSetUnit:CalculateThreatLevelA2G() ) .. "]" )
@ -424,7 +423,6 @@ do -- TASK_BAI
) )
local TargetCoordinate = TargetSetUnit:GetFirst():GetCoordinate() local TargetCoordinate = TargetSetUnit:GetFirst():GetCoordinate()
TargetCoordinate:SetModeA2G()
self:SetInfo( "Coordinates", TargetCoordinate ) self:SetInfo( "Coordinates", TargetCoordinate )
self:SetInfo( "ThreatLevel", "[" .. string.rep( "■", TargetSetUnit:CalculateThreatLevelA2G() ) .. "]" ) self:SetInfo( "ThreatLevel", "[" .. string.rep( "■", TargetSetUnit:CalculateThreatLevelA2G() ) .. "]" )
@ -468,7 +466,6 @@ do -- TASK_CAS
) )
local TargetCoordinate = TargetSetUnit:GetFirst():GetCoordinate() local TargetCoordinate = TargetSetUnit:GetFirst():GetCoordinate()
TargetCoordinate:SetModeA2G()
self:SetInfo( "Coordinates", TargetCoordinate ) self:SetInfo( "Coordinates", TargetCoordinate )
self:SetInfo( "ThreatLevel", "[" .. string.rep( "■", TargetSetUnit:CalculateThreatLevelA2G() ) .. "]" ) self:SetInfo( "ThreatLevel", "[" .. string.rep( "■", TargetSetUnit:CalculateThreatLevelA2G() ) .. "]" )