weyne/MOOSE
1
0
Fork 0
mirror of https://github.com/FlightControl-Master/MOOSE.git synced 2026-08-25 04:25:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Frank
2021-05-07 21:49:24 +02:00
parent 9eba6d607c 3b0949de72
commit cdd22444b9
4 changed files with 69 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Moose Development/Moose/AI/AI_Cargo_Helicopter.lua
+2 -2
View File
@@ -277,7 +277,7 @@ function AI_CARGO_HELICOPTER:onafterLanded( Helicopter, From, Event, To )
self:F( { Helicopter:GetName(), Height = Helicopter:GetHeight( true ), Velocity = Helicopter:GetVelocityKMH() } )
if self.RoutePickup == true then
if Helicopter:GetHeight( true ) <= 5.5 and Helicopter:GetVelocityKMH() < 10 then
if Helicopter:GetHeight( true ) <= 5.5 and Helicopter:GetVelocityKMH() < 15 then
--self:Load( Helicopter:GetPointVec2() )
self:Load( self.PickupZone )
self.RoutePickup = false
@@ -285,7 +285,7 @@ function AI_CARGO_HELICOPTER:onafterLanded( Helicopter, From, Event, To )
end
if self.RouteDeploy == true then
if Helicopter:GetHeight( true ) <= 5.5 and Helicopter:GetVelocityKMH() < 10 then
if Helicopter:GetHeight( true ) <= 5.5 and Helicopter:GetVelocityKMH() < 15 then
self:Unload( self.DeployZone )
self.RouteDeploy = false
end
Moose Development/Moose/Core/Point.lua
+3 -3
View File
@@ -1239,7 +1239,7 @@ do -- COORDINATE
-- ETA.
RoutePoint.ETA=0
RoutePoint.ETA_locked=true
RoutePoint.ETA_locked=false
-- Waypoint description.
RoutePoint.name=description
@@ -1388,7 +1388,7 @@ do -- COORDINATE
RoutePoint.formation_template=""
RoutePoint.ETA=0
RoutePoint.ETA_locked=true
RoutePoint.ETA_locked=false
RoutePoint.speed = ( Speed or 20 ) / 3.6
RoutePoint.speed_locked = true
@@ -1423,7 +1423,7 @@ do -- COORDINATE
RoutePoint.formation_template = ""
RoutePoint.ETA=0
RoutePoint.ETA_locked=true
RoutePoint.ETA_locked=false
RoutePoint.speed = ( Speed or 20 ) / 3.6
RoutePoint.speed_locked = true
Moose Development/Moose/Functional/Sead.lua
+1 -1
View File
@@ -17,7 +17,7 @@
--
-- ### Authors: **FlightControl**, **applevangelist**
--
-- Last Update: Feb 2021
-- Last Update: April 2021
--
-- ===
--
Moose Development/Moose/Functional/Shorad.lua
+1 -1
View File
@@ -352,7 +352,7 @@ do
local groupname = _groups:GetName()
if string.find(groupname, tgtgrp, 1) then
returnname = true
_groups:RelocateGroundRandomInRadius(7,125,false,false) -- be a bit evasive
_groups:RelocateGroundRandomInRadius(7,100,false,false) -- be a bit evasive
end
end
return returnname