Ticket #1200: limit_pathing.diff

binaries/data/mods/public/art/actors/fauna/boar.xml

@@ -11 +11 @@
         <animation file="quadraped/boar_run.dae" name="Run" speed="8"/>
         <animation file="quadraped/boar_death.dae" name="Death" speed="75"/>
       </animations>
-      <mesh>skeletal/boar.dae</mesh>
+      <mesh>justshutupskeletal/boar.dae</mesh>
     </variant>
   </group>
   <group>

source/simulation2/components/CCmpUnitMotion.cpp

@@ -107 +107 @@
 static const CColor OVERLAY_COLOUR_LONG_PATH(1, 1, 1, 1);
 static const CColor OVERLAY_COLOUR_SHORT_PATH(1, 0, 0, 1);
 
+/**
+ * Define how many paths you can query in how many seconds for one unit
+ */
+static const int MAX_NUMBER_OF_PATHS = 15;
+static const fixed MIN_TIME_BETWEEN_PATHS = fixed::FromInt(20);
+
 static const entity_pos_t g_GoalDelta = entity_pos_t::FromInt(TERRAIN_TILE_SIZE)/4; // for extending the goal outwards/inwards a little bit
 
 class CCmpUnitMotion : public ICmpUnitMotion
@@ -123 +129 @@
 
     DEFAULT_COMPONENT_ALLOCATOR(UnitMotion)
 
+    fixed m_Time;
+    fixed m_PathRequestTimes [MAX_NUMBER_OF_PATHS];
+
     bool m_DebugOverlayEnabled;
     std::vector<SOverlayLine> m_DebugOverlayLongPathLines;
     std::vector<SOverlayLine> m_DebugOverlayShortPathLines;
@@ -289 +298 @@
 
     virtual void Init(const CParamNode& paramNode)
     {
+        m_Time = fixed::Zero();
+        for (int i = 0; i < MAX_NUMBER_OF_PATHS; i++)
+            m_PathRequestTimes[i] = -MIN_TIME_BETWEEN_PATHS;
+
         m_FormationController = paramNode.GetChild("FormationController").ToBool();
 
         m_Moving = false;
@@ -644 +657 @@
 
     if (m_PathState == PATHSTATE_WAITING_REQUESTING_LONG)
     {
+        for (int i = MAX_NUMBER_OF_PATHS - 1; i > 0; --i)
+            m_PathRequestTimes[i] = m_PathRequestTimes[i-1];
+        m_PathRequestTimes[0] = m_Time;
+        LOGWARNING(L"Time of oldest path: %f, Current time: %f", m_PathRequestTimes[MAX_NUMBER_OF_PATHS - 1].ToFloat(), m_Time.ToFloat());
+
         m_LongPath = path;
         m_ShortPath.m_Waypoints.clear();
 
@@ -793 +811 @@
 void CCmpUnitMotion::Move(fixed dt)
 {
     PROFILE("Move");
+    m_Time += dt;
 
     if (m_State == STATE_STOPPING)
     {
@@ -819 +838 @@
         return;
     }
 
-    case PATHSTATE_FOLLOWING:
     case PATHSTATE_FOLLOWING_REQUESTING_SHORT:
     case PATHSTATE_FOLLOWING_REQUESTING_SHORT_APPEND:
     case PATHSTATE_FOLLOWING_REQUESTING_LONG:
+    case PATHSTATE_FOLLOWING:
     {
         // TODO: there's some asymmetry here when units look at other
         // units' positions - the result will depend on the order of execution.
@@ -1315 +1334 @@
 bool CCmpUnitMotion::MoveToPointRange(entity_pos_t x, entity_pos_t z, entity_pos_t minRange, entity_pos_t maxRange, entity_id_t target)
 {
     PROFILE("MoveToPointRange");
+    if (m_PathRequestTimes[MAX_NUMBER_OF_PATHS - 1] > m_Time - MIN_TIME_BETWEEN_PATHS)
+        return false;
 
     CmpPtr<ICmpPosition> cmpPosition(GetEntityHandle());
     if (!cmpPosition || !cmpPosition->IsInWorld())
@@ -1466 +1487 @@
 bool CCmpUnitMotion::MoveToTargetRange(entity_id_t target, entity_pos_t minRange, entity_pos_t maxRange)
 {
     PROFILE("MoveToTargetRange");
+    if (m_PathRequestTimes[MAX_NUMBER_OF_PATHS - 1] > m_Time - MIN_TIME_BETWEEN_PATHS)
+    {
+        LOGWARNING(L"Pathing denied");
+        return false;
+    }
 
     CmpPtr<ICmpPosition> cmpPosition(GetEntityHandle());
     if (!cmpPosition || !cmpPosition->IsInWorld())