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

Fixes with waypoints in NTTR 2.1.1

Browse Source 
behaves different than 1.5.7!!!
This commit is contained in:
FlightControl_Master
2017-08-12 17:07:10 +02:00
parent 3742f2937c
commit 4f2afa29fa
5 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Moose Development/Moose/AI/AI_A2A.lua
View File

@@ -564,7 +564,7 @@ function AI_A2A:onafterRTB( AIGroup, From, Event, To )
return return
end end
--- Create a route point of type air. --- Create a route point of type air.
local ToPatrolRoutePoint = ToAirbaseCoord:WaypointAir( local ToRTBRoutePoint = ToAirbaseCoord:WaypointAir(
self.PatrolAltType, self.PatrolAltType,
POINT_VEC3.RoutePointType.TurningPoint, POINT_VEC3.RoutePointType.TurningPoint,
POINT_VEC3.RoutePointAction.TurningPoint, POINT_VEC3.RoutePointAction.TurningPoint,
@@ -575,7 +575,8 @@ function AI_A2A:onafterRTB( AIGroup, From, Event, To )
self:F( { Angle = ToAirbaseAngle, ToTargetSpeed = ToTargetSpeed } ) self:F( { Angle = ToAirbaseAngle, ToTargetSpeed = ToTargetSpeed } )
self:T2( { self.MinSpeed, self.MaxSpeed, ToTargetSpeed } ) self:T2( { self.MinSpeed, self.MaxSpeed, ToTargetSpeed } )
EngageRoute[#EngageRoute+1] = ToPatrolRoutePoint EngageRoute[#EngageRoute+1] = ToRTBRoutePoint
EngageRoute[#EngageRoute+1] = ToRTBRoutePoint
AIGroup:OptionROEHoldFire() AIGroup:OptionROEHoldFire()
AIGroup:OptionROTEvadeFire() AIGroup:OptionROTEvadeFire()
@@ -670,6 +671,7 @@ function AI_A2A:onafterRefuel( AIGroup, From, Event, To )
self:F( { ToRefuelSpeed = ToRefuelSpeed } ) self:F( { ToRefuelSpeed = ToRefuelSpeed } )
RefuelRoute[#RefuelRoute+1] = ToRefuelRoutePoint
RefuelRoute[#RefuelRoute+1] = ToRefuelRoutePoint RefuelRoute[#RefuelRoute+1] = ToRefuelRoutePoint
AIGroup:OptionROEHoldFire() AIGroup:OptionROEHoldFire()

1
Moose Development/Moose/AI/AI_A2A_Cap.lua
View File

@@ -417,6 +417,7 @@ function AI_A2A_CAP:onafterEngage( AIGroup, From, Event, To, AttackSetUnit )
self:F( { Angle = ToInterceptAngle, ToTargetSpeed = ToTargetSpeed } ) self:F( { Angle = ToInterceptAngle, ToTargetSpeed = ToTargetSpeed } )
self:T2( { self.MinSpeed, self.MaxSpeed, ToTargetSpeed } ) self:T2( { self.MinSpeed, self.MaxSpeed, ToTargetSpeed } )
EngageRoute[#EngageRoute+1] = ToPatrolRoutePoint
EngageRoute[#EngageRoute+1] = ToPatrolRoutePoint EngageRoute[#EngageRoute+1] = ToPatrolRoutePoint
local AttackTasks = {} local AttackTasks = {}

2
Moose Development/Moose/AI/AI_A2A_Gci.lua
View File

@@ -391,7 +391,7 @@ function AI_A2A_GCI:onafterEngage( AIGroup, From, Event, To, AttackSetUnit )
self:F( { Angle = ToInterceptAngle, ToTargetSpeed = ToTargetSpeed } ) self:F( { Angle = ToInterceptAngle, ToTargetSpeed = ToTargetSpeed } )
self:F( { self.EngageMinSpeed, self.EngageMaxSpeed, ToTargetSpeed } ) self:F( { self.EngageMinSpeed, self.EngageMaxSpeed, ToTargetSpeed } )
--EngageRoute[#EngageRoute+1] = CurrentCoord:WaypointAir() EngageRoute[#EngageRoute+1] = ToPatrolRoutePoint
EngageRoute[#EngageRoute+1] = ToPatrolRoutePoint EngageRoute[#EngageRoute+1] = ToPatrolRoutePoint
local AttackTasks = {} local AttackTasks = {}

1
Moose Development/Moose/AI/AI_A2A_Patrol.lua
View File

@@ -367,6 +367,7 @@ function AI_A2A_PATROL:onafterRoute( AIGroup, From, Event, To )
true true
) )
PatrolRoute[#PatrolRoute+1] = ToPatrolRoutePoint
PatrolRoute[#PatrolRoute+1] = ToPatrolRoutePoint PatrolRoute[#PatrolRoute+1] = ToPatrolRoutePoint
local Tasks = {} local Tasks = {}

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

@@ -652,7 +652,6 @@ function BASE:SetState( Object, Key, Value )
self.States[ClassNameAndID] = self.States[ClassNameAndID] or {} self.States[ClassNameAndID] = self.States[ClassNameAndID] or {}
self.States[ClassNameAndID][Key] = Value self.States[ClassNameAndID][Key] = Value
self:T2( { ClassNameAndID, Key, Value } )
return self.States[ClassNameAndID][Key] return self.States[ClassNameAndID][Key]
end end
@@ -670,7 +669,6 @@ function BASE:GetState( Object, Key )
if self.States[ClassNameAndID] then if self.States[ClassNameAndID] then
local Value = self.States[ClassNameAndID][Key] or false local Value = self.States[ClassNameAndID][Key] or false
self:E( { ClassNameAndID, Key, Value } )
return Value return Value
end end