Ticket #1537: rangedFix-example.patch

source/simulation2/components/CCmpUnitMotion.cpp

@@ -1356 +1356 @@
         {
             // Too close to the square - need to move away
 
-            // TODO: maybe we should do the ShouldTreatTargetAsCircle thing here?
-
+            // TODO: maybe we should do the ShouldTreatTargetAsCircle thing here?           
             entity_pos_t goalDistance = minRange + g_GoalDelta;
 
+            // Add the walking speed of the target, and also divide by (my speed - his speed)/6 if that would be < 1.
+            // should be consistent.
+            CmpPtr<ICmpUnitMotion> cmpTargetUnitMotion(GetSimContext(), target);
+            if (cmpTargetUnitMotion)
+            {
+                CmpPtr<ICmpUnitMotion> cmpUnitMotion(GetSimContext(), GetEntityId());
+                if (cmpUnitMotion && cmpUnitMotion->GetWalkSpeed() > cmpTargetUnitMotion->GetWalkSpeed() + entity_pos_t::FromInt(2))
+                {
+                    goalDistance += cmpTargetUnitMotion->GetWalkSpeed();
+                    fixed speedDifference = (cmpUnitMotion->GetWalkSpeed() - cmpTargetUnitMotion->GetWalkSpeed())/6;
+                    if (speedDifference < entity_pos_t::FromInt(1) )
+                        goalDistance = goalDistance/speedDifference;
+                    if (goalDistance > maxRange)
+                        goalDistance = maxRange;
+                }
+            }
+
+            
             goal.type = ICmpPathfinder::Goal::SQUARE;
             goal.u = obstruction.u;
             goal.v = obstruction.v;