Further AI tweaks and fixes, maybe I'm starting to understand

Author: Causeless

Data/Base.rte/AI/HumanBehaviors.lua

@@ -670,7 +670,7 @@ function HumanBehaviors.WeaponSearch(AI, Owner, Abort)
 				prevSceneWaypoint = SceneMan:MovePointToGround(Owner:GetLastAIWaypoint(), Owner.Height/5, 4); -- last wpt or current pos
 			end
 
-			Owner:ClearMovePath();
+			Owner:ClearAIWaypoints();
 			Owner:AddAIMOWaypoint(AI.PickupHD);
 
 			if prevMoveTarget then
@@ -786,7 +786,7 @@ function HumanBehaviors.ToolSearch(AI, Owner, Abort)
 				prevSceneWaypoint = SceneMan:MovePointToGround(Owner:GetLastAIWaypoint(), Owner.Height/5, 4); -- last wpt or current pos
 			end
 
-			Owner:ClearMovePath();
+			Owner:ClearAIWaypoints();
 			Owner:AddAIMOWaypoint(AI.PickupHD);
 
 			if Owner.AIMode ~= Actor.AIMODE_GOLDDIG then

Data/Base.rte/AI/SharedBehaviors.lua

@@ -612,6 +612,7 @@ function SharedBehaviors.GoToWpt(AI, Owner, Abort)
 					if Owner.MOMoveTarget and MovableMan:ValidMO(Owner.MOMoveTarget) then
 						local Trace = SceneMan:ShortestDistance(Owner.Pos, Owner.MOMoveTarget.Pos, false);
 
+						-- WTF is the following code for? It causes us to idle and do nothing forever??
 						if Owner.MOMoveTarget.Team == Owner.Team then
 							if Trace.Largest > Owner.Height * 0.3 + (Owner.MOMoveTarget.Height or 100) * 0.3 then
 								Waypoint.Pos = Owner.MOMoveTarget.Pos;
@@ -1008,7 +1009,7 @@ function SharedBehaviors.GoToWpt(AI, Owner, Abort)
 		end
 
 		-- movement commands
-		if (AI.Target and AI.BehaviorName ~= "AttackTarget") or (Owner.AIMode ~= Actor.AIMODE_SQUAD and (AI.BehaviorName == "ShootArea" or AI.BehaviorName == "FaceAlarm")) then
+		if (AI.Target and AI.BehaviorName ~= "AttackTarget" and not AI.PickupHD) or (Owner.AIMode ~= Actor.AIMODE_SQUAD and (AI.BehaviorName == "ShootArea" or AI.BehaviorName == "FaceAlarm")) then
 			if Owner.aggressive then	-- the aggressive behavior setting makes the AI pursue waypoint at all times
 				AI.lateralMoveState = nextLatMove;
 			else

Source/System/PathFinder.cpp

@@ -174,7 +174,7 @@ int PathFinder::CalculatePath(Vector start, Vector end, std::list<Vector>& pathR
 
 	// How high up we can jump from this node
 	s_JumpHeightVertical = std::max(1, static_cast<int>(jumpHeight / (m_NodeDimension * c_MPP))); // min of 1 so automovers work a bit better
-	s_JumpHeightDiagonal = static_cast<int>((jumpHeight * 0.7F) / (m_NodeDimension * c_MPP));
+	s_JumpHeightDiagonal = std::max(1, static_cast<int>((jumpHeight * 0.7F) / (m_NodeDimension * c_MPP)));
 
 	// Actors capable of digging can use s_DigStrength to modify the node adjacency cost.
 	s_DigStrength = digStrength;
@@ -206,10 +206,8 @@ int PathFinder::CalculatePath(Vector start, Vector end, std::list<Vector>& pathR
 		}
 
 		// Adjust the last point to be exactly where the end is supposed to be (really?).
-		if (pathResult.size() > 2) {
-			pathResult.pop_back();
-			pathResult.push_back(end);
-		}
+		pathResult.pop_back();
+		pathResult.push_back(end);
 	} else {
 		// Empty path, give exact start and end.
 		pathResult.push_back(start);