From c7aa79937809d1ad0eb3c3f7d57ad7457de8a078 Mon Sep 17 00:00:00 2001
From: funkyfranky <>
Date: Sat, 21 Jul 2018 00:26:46 +0200
Subject: [PATCH 1/2] Fixes

ARTY:
* Rearming group will not always use 20 km/h = 11 mph.

SET_GROUP(+DESIGNATE):
* Fixed bug in SET_GROUP:FindNearestGroupFromPointVec2( PointVec2 ) function. This caused DESIGNATE class to crash!
---
 Moose Development/Moose/Core/Set.lua             | 9 +++++----
 Moose Development/Moose/Functional/Artillery.lua | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Moose Development/Moose/Core/Set.lua b/Moose Development/Moose/Core/Set.lua
index 78607d83d..0b9052242 100644
--- a/Moose Development/Moose/Core/Set.lua	
+++ b/Moose Development/Moose/Core/Set.lua	
@@ -859,15 +859,16 @@ end
 function SET_GROUP:FindNearestGroupFromPointVec2( PointVec2 )
   self:F2( PointVec2 )
   
-  local NearestGroup = nil
+  local NearestGroup = nil --Wrapper.Group#GROUP
   local ClosestDistance = nil
   
   for ObjectID, ObjectData in pairs( self.Set ) do
     if NearestGroup == nil then
-      NearestGroup = ObjectData
-      ClosestDistance = PointVec2:DistanceFromVec2( ObjectData:GetVec2() )
+      NearestGroup = ObjectData 
+      NearestGroup:GetVec2()
+      ClosestDistance = PointVec2:DistanceFromPointVec2( ObjectData:GetCoordinate() )
     else
-      local Distance = PointVec2:DistanceFromVec2( ObjectData:GetVec2() )
+      local Distance = PointVec2:DistanceFromPointVec2( ObjectData:GetCoordinate() )
       if Distance < ClosestDistance then
         NearestGroup = ObjectData
         ClosestDistance = Distance
diff --git a/Moose Development/Moose/Functional/Artillery.lua b/Moose Development/Moose/Functional/Artillery.lua
index 126ef78b9..880b8d645 100644
--- a/Moose Development/Moose/Functional/Artillery.lua	
+++ b/Moose Development/Moose/Functional/Artillery.lua	
@@ -1632,7 +1632,7 @@ function ARTY:onafterStart(Controllable, From, Event, To)
     self.RearmingPlaceCoord=nil
     self.relocateafterfire=false
     self.autorelocate=false
-    self.RearmingGroupSpeed=20
+    --self.RearmingGroupSpeed=20
   end
   
   -- Check that default speed is below max speed.

From 53c0599075a4a86fa103ad0d51e2281fb86e6b46 Mon Sep 17 00:00:00 2001
From: funkyfranky <>
Date: Sat, 21 Jul 2018 00:30:02 +0200
Subject: [PATCH 2/2] Removed GetVec2

---
 Moose Development/Moose/Core/Set.lua | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Moose Development/Moose/Core/Set.lua b/Moose Development/Moose/Core/Set.lua
index 0b9052242..5453f9844 100644
--- a/Moose Development/Moose/Core/Set.lua	
+++ b/Moose Development/Moose/Core/Set.lua	
@@ -865,7 +865,6 @@ function SET_GROUP:FindNearestGroupFromPointVec2( PointVec2 )
   for ObjectID, ObjectData in pairs( self.Set ) do
     if NearestGroup == nil then
       NearestGroup = ObjectData 
-      NearestGroup:GetVec2()
       ClosestDistance = PointVec2:DistanceFromPointVec2( ObjectData:GetCoordinate() )
     else
       local Distance = PointVec2:DistanceFromPointVec2( ObjectData:GetCoordinate() )