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

Merge pull request #961 from FlightControl-Master/FF/Develop

Browse Source 
Fixes for ARTY and DESIGNATE classes
This commit is contained in:
Frank 2018-07-21 00:33:40 +02:00 committed by GitHub
commit c22d598b8f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Moose Development/Moose/Core/Set.lua
View File

@ -859,15 +859,15 @@ end
function SET_GROUP:FindNearestGroupFromPointVec2( PointVec2 ) function SET_GROUP:FindNearestGroupFromPointVec2( PointVec2 )
self:F2( PointVec2 ) self:F2( PointVec2 )
local NearestGroup = nil local NearestGroup = nil --Wrapper.Group#GROUP
local ClosestDistance = nil local ClosestDistance = nil
for ObjectID, ObjectData in pairs( self.Set ) do for ObjectID, ObjectData in pairs( self.Set ) do
if NearestGroup == nil then if NearestGroup == nil then
NearestGroup = ObjectData NearestGroup = ObjectData
ClosestDistance = PointVec2:DistanceFromVec2( ObjectData:GetVec2() ) ClosestDistance = PointVec2:DistanceFromPointVec2( ObjectData:GetCoordinate() )
else else
local Distance = PointVec2:DistanceFromVec2( ObjectData:GetVec2() ) local Distance = PointVec2:DistanceFromPointVec2( ObjectData:GetCoordinate() )
if Distance < ClosestDistance then if Distance < ClosestDistance then
NearestGroup = ObjectData NearestGroup = ObjectData
ClosestDistance = Distance ClosestDistance = Distance

2
Moose Development/Moose/Functional/Artillery.lua
View File

@ -1632,7 +1632,7 @@ function ARTY:onafterStart(Controllable, From, Event, To)
self.RearmingPlaceCoord=nil self.RearmingPlaceCoord=nil
self.relocateafterfire=false self.relocateafterfire=false
self.autorelocate=false self.autorelocate=false
self.RearmingGroupSpeed=20 --self.RearmingGroupSpeed=20
end end
-- Check that default speed is below max speed. -- Check that default speed is below max speed.