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

Merge remote-tracking branch 'refs/remotes/origin/master' into Template-the-Statemachines

Browse Source 
# Conflicts:
#	Moose Mission Setup/Moose Mission Update/l10n/DEFAULT/Moose.lua
#	Moose Mission Setup/Moose.lua
This commit is contained in:
FlightControl
2016-12-06 08:37:32 +01:00
parent 3319843888 8c85f9319d
commit 931464dfec
3 changed files with 45 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
Moose Development/Moose/Wrapper/Controllable.lua
View File

@@ -224,6 +224,7 @@ function CONTROLLABLE:SetTask( DCSTask, WaitTime )
if DCSControllable then
local Controller = self:_GetController()
self:E(Controller)
-- When a controllable SPAWNs, it takes about a second to get the controllable in the simulator. Setting tasks to unspawned controllables provides unexpected results.
-- Therefore we schedule the functions to set the mission and options for the Controllable.
@@ -419,7 +420,7 @@ function CONTROLLABLE:TaskAttackGroup( AttackGroup, WeaponType, WeaponExpend, At
-- AttackControllable = {
-- id = 'AttackControllable',
-- params = {
-- controllableId = Controllable.ID,
-- groupId = Group.ID,
-- weaponType = number,
-- expend = enum AI.Task.WeaponExpend,
-- attackQty = number,
@@ -444,7 +445,7 @@ function CONTROLLABLE:TaskAttackGroup( AttackGroup, WeaponType, WeaponExpend, At
local DCSTask
DCSTask = { id = 'AttackControllable',
params = {
controllableId = AttackGroup:GetID(),
groupId = AttackGroup:GetID(),
weaponType = WeaponType,
expend = WeaponExpend,
attackQty = AttackQty,
@@ -803,27 +804,28 @@ function CONTROLLABLE:TaskFollow( FollowControllable, Vec3, LastWaypointIndex )
-- Follow = {
-- id = 'Follow',
-- params = {
-- controllableId = Controllable.ID,
-- groupId = Group.ID,
-- pos = Vec3,
-- lastWptIndexFlag = boolean,
-- lastWptIndex = number
-- }
-- }
local LastWaypointIndexFlag = nil
local LastWaypointIndexFlag = false
if LastWaypointIndex then
LastWaypointIndexFlag = true
end
local DCSTask
DCSTask = { id = 'Follow',
DCSTask = {
id = 'Follow',
params = {
controllableId = FollowControllable:GetID(),
groupId = FollowControllable:GetID(),
pos = Vec3,
lastWptIndexFlag = LastWaypointIndexFlag,
lastWptIndex = LastWaypointIndex,
},
},
lastWptIndex = LastWaypointIndex
}
}
self:T3( { DCSTask } )
return DCSTask
@@ -846,7 +848,7 @@ function CONTROLLABLE:TaskEscort( FollowControllable, Vec3, LastWaypointIndex, E
-- Escort = {
-- id = 'Escort',
-- params = {
-- controllableId = Controllable.ID,
-- groupId = Group.ID,
-- pos = Vec3,
-- lastWptIndexFlag = boolean,
-- lastWptIndex = number,
@@ -855,15 +857,15 @@ function CONTROLLABLE:TaskEscort( FollowControllable, Vec3, LastWaypointIndex, E
-- }
-- }
local LastWaypointIndexFlag = nil
local LastWaypointIndexFlag = false
if LastWaypointIndex then
LastWaypointIndexFlag = true
end
local DCSTask
DCSTask = { id = 'Follow',
DCSTask = { id = 'Escort',
params = {
controllableId = FollowControllable:GetID(),
groupId = FollowControllable:GetID(),
pos = Vec3,
lastWptIndexFlag = LastWaypointIndexFlag,
lastWptIndex = LastWaypointIndex,
@@ -947,7 +949,7 @@ function CONTROLLABLE:TaskFAC_AttackGroup( AttackGroup, WeaponType, Designation,
-- FAC_AttackControllable = {
-- id = 'FAC_AttackControllable',
-- params = {
-- controllableId = Controllable.ID,
-- groupId = Group.ID,
-- weaponType = number,
-- designation = enum AI.Task.Designation,
-- datalink = boolean
@@ -957,7 +959,7 @@ function CONTROLLABLE:TaskFAC_AttackGroup( AttackGroup, WeaponType, Designation,
local DCSTask
DCSTask = { id = 'FAC_AttackControllable',
params = {
controllableId = AttackGroup:GetID(),
groupId = AttackGroup:GetID(),
weaponType = WeaponType,
designation = Designation,
datalink = Datalink,
@@ -1055,7 +1057,7 @@ function CONTROLLABLE:EnRouteTaskEngageGroup( AttackGroup, Priority, WeaponType,
-- EngageControllable = {
-- id = 'EngageControllable ',
-- params = {
-- controllableId = Controllable.ID,
-- groupId = Group.ID,
-- weaponType = number,
-- expend = enum AI.Task.WeaponExpend,
-- attackQty = number,
@@ -1081,7 +1083,7 @@ function CONTROLLABLE:EnRouteTaskEngageGroup( AttackGroup, Priority, WeaponType,
local DCSTask
DCSTask = { id = 'EngageControllable',
params = {
controllableId = AttackGroup:GetID(),
groupId = AttackGroup:GetID(),
weaponType = WeaponType,
expend = WeaponExpend,
attackQty = AttackQty,
@@ -1236,7 +1238,7 @@ function CONTROLLABLE:EnRouteTaskFAC_EngageGroup( AttackGroup, Priority, WeaponT
-- FAC_EngageControllable = {
-- id = 'FAC_EngageControllable',
-- params = {
-- controllableId = Controllable.ID,
-- groupId = Group.ID,
-- weaponType = number,
-- designation = enum AI.Task.Designation,
-- datalink = boolean,
@@ -1247,7 +1249,7 @@ function CONTROLLABLE:EnRouteTaskFAC_EngageGroup( AttackGroup, Priority, WeaponT
local DCSTask
DCSTask = { id = 'FAC_EngageControllable',
params = {
controllableId = AttackGroup:GetID(),
groupId = AttackGroup:GetID(),
weaponType = WeaponType,
designation = Designation,
datalink = Datalink,