Use nearest path before nodes when trying to get close to enemy. Make Gargantua affected by npc_get_to_enemy_nearest

Author: FreeSlave

dlls/gargantua.cpp

@@ -423,6 +423,9 @@ class CGargantua : public CFollowingMonster
 	bool CheckMeleeAttack1( float flDot, float flDist ) override;		// Swipe
 	bool CheckMeleeAttack2( float flDot, float flDist ) override;		// Flames
 	bool CheckRangeAttack1( float flDot, float flDist ) override;		// Stomp attack
+	bool WantsToGetCloseToEnemy() override {
+		return true;
+	}
 	void SetObjectCollisionBox( void )
 	{
 		SetMyObjectCollisionBox(Vector( -80, -80, 0 ), Vector( 80, 80, 214 ));

dlls/monsters.cpp

@@ -1791,53 +1791,74 @@ bool CBaseMonster::BuildRoute( const Vector &vecGoal, int iMoveFlag, CBaseEntity
 		}
 	}
 
-	// last ditch, try nodes
-	if( !FBitSet(buildRouteFlags, BUILDROUTE_NO_NODEROUTE) && FGetNodeRoute( vecGoal ) )
+	auto nearestBuildRoute = [&]()
 	{
-		//ALERT( at_console, "Can get there on nodes\n" );
-		m_vecMoveGoal = vecGoal;
-		RouteSimplify( pTarget );
-		return true;
-	}
-
-	if (nearest && !FBitSet(buildRouteFlags, BUILDROUTE_NODEROUTE_ONLY))
-	{
-		SetBits(iMoveFlag, bits_MF_NEAREST_PATH);
+		if (nearest && !FBitSet(buildRouteFlags, BUILDROUTE_NODEROUTE_ONLY))
+		{
+			SetBits(iMoveFlag, bits_MF_NEAREST_PATH);
 
-		const Vector localMoveNearest = pev->origin + (vecGoal - pev->origin).Normalize() * flDist;
+			const Vector localMoveNearest = pev->origin + (vecGoal - pev->origin).Normalize() * flDist;
 
-		m_Route[0].vecLocation = localMoveNearest;
-		m_Route[0].iType = iMoveFlag | bits_MF_IS_GOAL;
+			m_Route[0].vecLocation = localMoveNearest;
+			m_Route[0].iType = iMoveFlag | bits_MF_IS_GOAL;
 
-		m_vecMoveGoal = localMoveNearest;
+			m_vecMoveGoal = localMoveNearest;
 
-		// Prevent playing walk/run animation while standing in place
-		const float distToMoveStraight = (localMoveNearest - pev->origin).Length2D();
+			// Prevent playing walk/run animation while standing in place
+			const float distToMoveStraight = (localMoveNearest - pev->origin).Length2D();
 
-		Vector apex;
-		const Vector triangulatedNearest = FTriangulateToNearest(pev->origin, vecGoal, flDist, pTarget, apex);
+			Vector apex;
+			const Vector triangulatedNearest = FTriangulateToNearest(pev->origin, vecGoal, flDist, pTarget, apex);
 
-		if ((vecGoal - triangulatedNearest).Length2D() < (vecGoal - localMoveNearest).Length2D())
-		{
-			if ((apex - triangulatedNearest).Length2D() < 1)
+			if ((vecGoal - triangulatedNearest).Length2D() < (vecGoal - localMoveNearest).Length2D())
 			{
-				m_Route[0].vecLocation = triangulatedNearest;
-				m_Route[0].iType = iMoveFlag | bits_MF_IS_GOAL;
-			}
-			else
-			{
-				m_Route[0].vecLocation = apex;
-				m_Route[0].iType = (iMoveFlag | bits_MF_TO_DETOUR);
+				if ((apex - triangulatedNearest).Length2D() < 1)
+				{
+					m_Route[0].vecLocation = triangulatedNearest;
+					m_Route[0].iType = iMoveFlag | bits_MF_IS_GOAL;
+				}
+				else
+				{
+					m_Route[0].vecLocation = apex;
+					m_Route[0].iType = (iMoveFlag | bits_MF_TO_DETOUR);
 
-				m_Route[1].vecLocation = triangulatedNearest;
-				m_Route[1].iType = iMoveFlag | bits_MF_IS_GOAL;
+					m_Route[1].vecLocation = triangulatedNearest;
+					m_Route[1].iType = iMoveFlag | bits_MF_IS_GOAL;
 
-				RouteSimplify( pTarget );
+					RouteSimplify( pTarget );
+				}
+				m_vecMoveGoal = triangulatedNearest;
+				return true;
 			}
-			m_vecMoveGoal = triangulatedNearest;
+			return distToMoveStraight >= 1.0f;
+		}
+		return false;
+	};
+
+	// If monster want to nearest route to enemy, it means he wants to get closer, so do this check before nodes
+	if (FBitSet(iMoveFlag, bits_MF_TO_ENEMY))
+	{
+		if (nearestBuildRoute())
+		{
+			return true;
+		}
+	}
+
+	// last ditch, try nodes
+	if( !FBitSet(buildRouteFlags, BUILDROUTE_NO_NODEROUTE) && FGetNodeRoute( vecGoal ) )
+	{
+		//ALERT( at_console, "Can get there on nodes\n" );
+		m_vecMoveGoal = vecGoal;
+		RouteSimplify( pTarget );
+		return true;
+	}
+
+	if (!FBitSet(iMoveFlag, bits_MF_TO_ENEMY))
+	{
+		if (nearestBuildRoute())
+		{
 			return true;
 		}
-		return distToMoveStraight >= 1.0f;
 	}
 
 	// b0rk