Made actors generate less jump-heavy paths that they can follow more accurately

Author: Causeless

Source/Entities/Actor.cpp

@@ -1082,32 +1082,11 @@ void Actor::OnNewMovePath() {
 		m_MoveTarget = m_PrevPathTarget = m_Pos;
 	}
 
-	if (!m_MovePath.empty()) {
-		// Smash all non-airborne waypoints down to just above the ground, so they more accurately represent the ground path
-		std::list<Vector>::iterator finalItr = m_MovePath.end();
-		finalItr--;
-		Vector smashedPoint;
-		Vector previousPoint = *(m_MovePath.begin());
-		std::list<Vector>::iterator nextItr = m_MovePath.begin();
-		for (std::list<Vector>::iterator lItr = m_MovePath.begin(); lItr != finalItr; ++lItr) {
-			nextItr++;
-			smashedPoint = g_SceneMan.MovePointToGround((*lItr), m_CharHeight * 0.2, 0, g_SettingsMan.GetPathFinderGridNodeSize() * 2.0f);
-
-			// Only smash if the new location doesn't cause the path to intersect hard terrain ahead or behind of it
-			// Try three times to halve the height to see if that won't intersect
-			for (int i = 0; i < 3; i++) {
-				Vector notUsed;
-				if (!g_SceneMan.CastStrengthRay(previousPoint, smashedPoint - previousPoint, 5, notUsed, 3, g_MaterialDoor) &&
-				    nextItr != m_MovePath.end() && !g_SceneMan.CastStrengthRay(smashedPoint, (*nextItr) - smashedPoint, 5, notUsed, 3, g_MaterialDoor)) {
-					(*lItr) = smashedPoint;
-					break;
-				} else {
-					smashedPoint.m_Y -= ((smashedPoint.m_Y - (*lItr).m_Y) / 2);
-				}
-			}
-
-			previousPoint = (*lItr);
-		}
+	// Smash all non-airborne waypoints down to just above the ground, so they more accurately represent the ground path
+	std::list<Vector>::iterator finalItr = m_MovePath.end();
+	--finalItr;
+	for (std::list<Vector>::iterator lItr = m_MovePath.begin(); lItr != finalItr; ++lItr) {
+		(*lItr) = g_SceneMan.MovePointToGround((*lItr), m_CharHeight * 0.2, 0, g_SettingsMan.GetPathFinderGridNodeSize() * 2.5f);
 	}
 }
 

Source/Managers/SceneMan.cpp

@@ -2242,7 +2242,7 @@ bool SceneMan::IsPointInNoGravArea(const Vector& point) const {
 	return false;
 }
 
-Vector SceneMan::MovePointToGround(const Vector& from, int maxAltitude, int accuracy, int maxDistance) {
+Vector SceneMan::MovePointToGround(const Vector& from, int heightAboveGround, int accuracy, int maxDistance) {
 	if (IsPointInNoGravArea(from)) {
 		return from;
 	}
@@ -2257,8 +2257,7 @@ Vector SceneMan::MovePointToGround(const Vector& from, int maxAltitude, int accu
 		return temp;
 	}
 
-	// Only move down if we're above the maxAltitude over the ground
-	Vector groundPoint(temp.m_X, temp.m_Y + (altitude > maxAltitude ? altitude - maxAltitude : 0));
+	Vector groundPoint(temp.m_X, temp.m_Y + (altitude - heightAboveGround));
 	return groundPoint;
 }
 

Source/Managers/SceneMan.h

@@ -787,16 +787,16 @@ namespace RTE {
 		/// down at a certain maximum distance from the ground.
 		/// @param from The point to start from. Should be in the air, or the same point will
 		/// be returned (null operation)
-		/// @param maxAltitude The max altitude in px you want the point to be above the ground. (default: 0)
+		/// @param heightAboveGround The altitude in px you want the point to be above the ground. (default: 0)
 		/// @param accuracy The accuracy within screen measurement is acceptable. Higher number (default: 0) here means less calculation.
 		/// @param maxDistance The maximum distance downwards the point will be moved. Points higher than this will not be moved down.
 		/// @return The new point screen is no higher than accuracy + max altitude over
 		/// the terrain.
-		Vector MovePointToGround(const Vector& from, int maxAltitude, int accuracy, int maxDistance);
+		Vector MovePointToGround(const Vector& from, int heightAboveGround, int accuracy, int maxDistance);
 
 		// Luabind makes this such a pain
-		Vector MovePointToGround(const Vector& from, int maxAltitude = 0, int accuracy = 0) {
-			return MovePointToGround(from, maxAltitude, accuracy, 0);
+		Vector MovePointToGround(const Vector& from, int heightAboveGround = 0, int accuracy = 0) {
+			return MovePointToGround(from, heightAboveGround, accuracy, 0);
 		}
 
 		/// Returns whether the integer coordinates passed in are within the

Source/System/PathFinder.cpp

@@ -361,7 +361,9 @@ void PathFinder::AdjacentCost(void* state, std::vector<micropather::StateCost>*
 					break;
 				}
 
-				float extraJumpCost = i * i * 0.5F; // Exponential cost increase for jumping higher
+				float f = i + 2; // Exponential cost increase for jumping higher
+				float extraJumpCost = f * f * 0.5F; // Exponential cost increase for jumping higher
+
 				totalMaterialCost += 1.0F + extraUpCost + extraJumpCost + (GetMaterialTransitionCost(*currentNode->UpMaterial) * 3.0F) + radiatedCost;
 
 				adjCost.cost = totalMaterialCost;
@@ -386,7 +388,9 @@ void PathFinder::AdjacentCost(void* state, std::vector<micropather::StateCost>*
 					break;
 				}
 
-				float extraJumpCost = i * i * 0.5F; // Exponential cost increase for jumping higher
+				float f = i + 2; // Exponential cost increase for jumping higher
+				float extraJumpCost = f * f * 0.5F; // Exponential cost increase for jumping higher
+
 				totalMaterialCost += 1.4F + (extraUpCost * 1.4F) + (extraJumpCost * 1.4f) + (GetMaterialTransitionCost(*currentNode->UpRightMaterial) * 1.4F * 3.0F) + radiatedCost;
 
 				adjCost.cost = totalMaterialCost;
@@ -406,7 +410,9 @@ void PathFinder::AdjacentCost(void* state, std::vector<micropather::StateCost>*
 					break;
 				}
 
-				float extraJumpCost = i * i * 0.5F; // Exponential cost increase for jumping higher
+				float f = i + 2; // Exponential cost increase for jumping higher
+				float extraJumpCost = f * f * 0.5F; // Exponential cost increase for jumping higher
+
 				totalMaterialCost += 1.4F + (extraUpCost * 1.4F) + (extraJumpCost * 1.4f) + (GetMaterialTransitionCost(*currentNode->LeftUpMaterial) * 1.4F * 3.0F) + radiatedCost;
 
 				adjCost.cost = totalMaterialCost;