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

Updates

Browse Source
This commit is contained in:
FlightControl 2019-06-19 18:32:21 +03:00
parent a907369082
commit 6f4d6c3daf
2 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Moose Development/Moose/AI/AI_Escort.lua
View File

@ -1576,9 +1576,9 @@ function AI_ESCORT.___Resume( EscortGroup, self )
EscortGroup:SetState( EscortGroup, "Mode", EscortGroup:GetState( EscortGroup, "PreviousMode" ) )
if EscortGroup:GetState( EscortGroup, "Mode" ) == self.__Enum.Mode.Mission then
EscortGroup:MessageTypeToGroup( "Destroyed all targets. Resuming route.", MESSAGE.Type.Information, PlayerGroup )
EscortGroup:MessageTypeToGroup( "Resuming route.", MESSAGE.Type.Information, PlayerGroup )
else
EscortGroup:MessageTypeToGroup( "Destroyed all targets. Rejoining formation.", MESSAGE.Type.Information, PlayerGroup )
EscortGroup:MessageTypeToGroup( "Rejoining formation.", MESSAGE.Type.Information, PlayerGroup )
end
end
@ -1613,8 +1613,6 @@ function AI_ESCORT:_AttackTarget( EscortGroup, DetectedItem )
self:F( EscortGroup )
local EscortUnit = self.PlayerUnit
self:SetFlightModeAttack( EscortGroup )
if EscortGroup:IsAir() then
@ -1854,7 +1852,6 @@ function AI_ESCORT:_ReportTargetsScheduler( EscortGroup, Report )
if EscortGroup:IsAlive() and self.PlayerUnit:IsAlive() then
local EscortGroupName = EscortGroup:GetCallsign()
local DetectedTargetsReport = REPORT:New( "Reporting targets:\n" ) -- A new report to display the detected targets as a message to the player.
@ -1881,7 +1878,7 @@ function AI_ESCORT:_ReportTargetsScheduler( EscortGroup, Report )
local DetectedItemReportSummary = self.Detection:DetectedItemReportSummary( DetectedItem, EscortGroup, _DATABASE:GetPlayerSettings( self.PlayerUnit:GetPlayerName() ) )
local ReportSummary = DetectedItemReportSummary:Text(", ")
DetectedTargetsReport:AddIndent( ReportSummary, "-" )
if EscortGroup:IsAir() then
MENU_GROUP_COMMAND:New( self.PlayerGroup,

24
Moose Development/Moose/AI/AI_Formation.lua
View File

@ -141,10 +141,10 @@ AI_FORMATION.__Enum.Formation = {
-- @field #number Mission
-- @field #number Formation
AI_FORMATION.__Enum.Mode = {
Mission = 0,
Formation = 1,
Attack = 2,
Reconnaissance = 3,
Mission = "M",
Formation = "F",
Attack = "A",
Reconnaissance = "R",
}
@ -952,6 +952,22 @@ function AI_FORMATION:SetFlightRandomization( FlightRandomization ) --R2.1
end
--- Gets your escorts to flight mode.
-- @param #AI_FORMATION self
-- @param Wrapper.Group#GROUP FollowGroup FollowGroup.
-- @return #AI_FORMATION
function AI_FORMATION:GetFlightMode( FollowGroup )
if FollowGroup then
FollowGroup:SetState( FollowGroup, "PreviousMode", FollowGroup:GetState( FollowGroup, "Mode" ) )
FollowGroup:SetState( FollowGroup, "Mode", self.__Enum.Mode.Mission )
end
return FollowGroup:GetState( FollowGroup, "Mode" )
end
--- This sets your escorts to fly a mission.
-- @param #AI_FORMATION self