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

Bugfix

Browse Source
This commit is contained in:
FlightControl 2016-04-01 21:14:15 +02:00
parent 7709f21842
commit 1f1494e36f
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Embedded/Moose_Embedded.lua
View File

@ -2585,7 +2585,7 @@ local _TraceClass = {
--SPAWN = true, --SPAWN = true,
--STAGE = true, --STAGE = true,
--ZONE = true, --ZONE = true,
--GROUP = true, GROUP = true,
--UNIT = true, --UNIT = true,
--CLIENT = true, --CLIENT = true,
--CARGO = true, --CARGO = true,
@ -4006,7 +4006,7 @@ end
--- No evasion on enemy threats. --- No evasion on enemy threats.
-- @param #GROUP self -- @param #GROUP self
-- @return #GROUP self -- @return #GROUP self
function GROUP:OptionEvasionNoReaction() function GROUP:OptionROTNoReaction()
self:F( { self.GroupName } ) self:F( { self.GroupName } )
local Controller = self:_GetController() local Controller = self:_GetController()
@ -4023,7 +4023,7 @@ function GROUP:OptionROTPassiveDefense()
local Controller = self:_GetController() local Controller = self:_GetController()
Controller:setOption( AI.Option.Air.id.REACTION_ON_THREAT, AI.Option.Air.val.REACTION_ON_THREAT.PASSIVE_DEFENSE ) Controller:setOption( AI.Option.Air.id.REACTION_ON_THREAT, AI.Option.Air.val.REACTION_ON_THREAT.PASSIVE_DEFENCE )
return self return self
end end
@ -11353,7 +11353,7 @@ function ESCORT:New( EscortClient, EscortGroup, EscortName )
self.EscortGroup = EscortGroup -- Group#GROUP self.EscortGroup = EscortGroup -- Group#GROUP
self.EscortName = EscortName self.EscortName = EscortName
self.EscortMenu = MENU_CLIENT:New( self.EscortClient, "Escort" .. self.EscortName ) self.EscortMenu = MENU_CLIENT:New( self.EscortClient, self.EscortName )
-- Escort Navigation -- Escort Navigation
self.EscortMenuReportNavigation = MENU_CLIENT:New( self.EscortClient, "Navigation", self.EscortMenu ) self.EscortMenuReportNavigation = MENU_CLIENT:New( self.EscortClient, "Navigation", self.EscortMenu )
@ -11554,7 +11554,7 @@ function ESCORT._AttackTarget( MenuParam )
self:T( AttackUnit ) self:T( AttackUnit )
EscortGroup:SetTask( EscortGroup:TaskAttackUnit( AttackUnit ) ) EscortGroup:PushTask( EscortGroup:TaskAttackUnit( AttackUnit ) )
EscortGroup:MessageToClient( "Engaging Designated Unit!", 10, EscortClient ) EscortGroup:MessageToClient( "Engaging Designated Unit!", 10, EscortClient )
end end
@ -11609,7 +11609,7 @@ function ESCORT._OptionROTNoReaction( MenuParam )
local EscortGroup = self.EscortGroup local EscortGroup = self.EscortGroup
local EscortClient = self.EscortClient local EscortClient = self.EscortClient
EscortGroup:OptionEvasionNoReaction() EscortGroup:OptionROTNoReaction()
EscortGroup:MessageToClient( "We'll fight until death.", 10, EscortClient ) EscortGroup:MessageToClient( "We'll fight until death.", 10, EscortClient )
end end

2
Moose/Base.lua
View File

@ -14,7 +14,7 @@ local _TraceClass = {
--SPAWN = true, --SPAWN = true,
--STAGE = true, --STAGE = true,
--ZONE = true, --ZONE = true,
--GROUP = true, GROUP = true,
--UNIT = true, --UNIT = true,
--CLIENT = true, --CLIENT = true,
--CARGO = true, --CARGO = true,

6
Moose/Escort.lua
View File

@ -58,7 +58,7 @@ function ESCORT:New( EscortClient, EscortGroup, EscortName )
self.EscortGroup = EscortGroup -- Group#GROUP self.EscortGroup = EscortGroup -- Group#GROUP
self.EscortName = EscortName self.EscortName = EscortName
self.EscortMenu = MENU_CLIENT:New( self.EscortClient, "Escort" .. self.EscortName ) self.EscortMenu = MENU_CLIENT:New( self.EscortClient, self.EscortName )
-- Escort Navigation -- Escort Navigation
self.EscortMenuReportNavigation = MENU_CLIENT:New( self.EscortClient, "Navigation", self.EscortMenu ) self.EscortMenuReportNavigation = MENU_CLIENT:New( self.EscortClient, "Navigation", self.EscortMenu )
@ -259,7 +259,7 @@ function ESCORT._AttackTarget( MenuParam )
self:T( AttackUnit ) self:T( AttackUnit )
EscortGroup:SetTask( EscortGroup:TaskAttackUnit( AttackUnit ) ) EscortGroup:PushTask( EscortGroup:TaskAttackUnit( AttackUnit ) )
EscortGroup:MessageToClient( "Engaging Designated Unit!", 10, EscortClient ) EscortGroup:MessageToClient( "Engaging Designated Unit!", 10, EscortClient )
end end
@ -314,7 +314,7 @@ function ESCORT._OptionROTNoReaction( MenuParam )
local EscortGroup = self.EscortGroup local EscortGroup = self.EscortGroup
local EscortClient = self.EscortClient local EscortClient = self.EscortClient
EscortGroup:OptionEvasionNoReaction() EscortGroup:OptionROTNoReaction()
EscortGroup:MessageToClient( "We'll fight until death.", 10, EscortClient ) EscortGroup:MessageToClient( "We'll fight until death.", 10, EscortClient )
end end

4
Moose/Group.lua
View File

@ -885,7 +885,7 @@ end
--- No evasion on enemy threats. --- No evasion on enemy threats.
-- @param #GROUP self -- @param #GROUP self
-- @return #GROUP self -- @return #GROUP self
function GROUP:OptionEvasionNoReaction() function GROUP:OptionROTNoReaction()
self:F( { self.GroupName } ) self:F( { self.GroupName } )
local Controller = self:_GetController() local Controller = self:_GetController()
@ -902,7 +902,7 @@ function GROUP:OptionROTPassiveDefense()
local Controller = self:_GetController() local Controller = self:_GetController()
Controller:setOption( AI.Option.Air.id.REACTION_ON_THREAT, AI.Option.Air.val.REACTION_ON_THREAT.PASSIVE_DEFENSE ) Controller:setOption( AI.Option.Air.id.REACTION_ON_THREAT, AI.Option.Air.val.REACTION_ON_THREAT.PASSIVE_DEFENCE )
return self return self
end end