Merge branch 'development' into 4zk-content

Author: fourZK

Data/Base.rte/Scenes/Objects/Bunkers/BunkerSystems/Automovers/Controller/Controller.lua

@@ -1081,7 +1081,7 @@ automoverActorFunctions.setupActorWaypointData = function(self, actorData)
 	waypointData.actorReachedTargetInsideAutomoverArea = false;
 	waypointData.actorReachedEndNodeForTargetOutsideAutomoverArea = false;
 	waypointData.teleporterVisualsTimer = Timer(1000);
-	waypointData.delayTimer = Timer(50);
+	waypointData.delayTimer = Timer(30);
 
 	waypointData.endNode = self:findClosestNode(waypointData.targetPosition, waypointData.previousNode, false, waypointData.targetIsInsideAutomoverArea, true, actor.Team);
 	if not waypointData.endNode then
@@ -1317,7 +1317,7 @@ automoverActorFunctions.handleActorThatHasReachedItsEndNode = function(self, act
 				end
 			end
 			waypointData.delayTimer:Reset();
-		elseif waypointData.exitPath ~= nil and #waypointData.exitPath > 0 then
+		elseif waypointData.exitPath ~= nil and #waypointData.exitPath > 0 and waypointData.delayTimer:IsPastSimTimeLimit() then
 			local distanceFromActorToFirstExitPathPosition = SceneMan:ShortestDistance(waypointData.exitPath[1], actor.Pos, self.checkWrapping);
 			if distanceFromActorToFirstExitPathPosition:MagnitudeIsLessThan(20) then
 				table.remove(waypointData.exitPath, 1);
@@ -1329,7 +1329,12 @@ automoverActorFunctions.handleActorThatHasReachedItsEndNode = function(self, act
 
 			local endNodeData = teamNodeTable[waypointData.endNode];
 			if not endNodeData.zoneBox:IsWithinBox(waypointData.exitPath[1]) and (endNodeData.connectedNodeData[actorData.direction] == nil or not endNodeData.connectingAreas[actorData.direction]:IsInside(waypointData.exitPath[1])) then
-				actor.Vel = actor.Vel + (distanceFromActorToFirstExitPathPosition.Normalized:FlipX(true):FlipY(true) * self.movementAcceleration * 10);
+				local velocityToAddToActor = distanceFromActorToFirstExitPathPosition.Normalized:FlipX(true):FlipY(true) * self.movementAcceleration * 10;
+				if math.abs(velocityToAddToActor.X) < 1 and velocityToAddToActor.Y < 0 and SceneMan.GlobalAcc.Y > 0 then
+					velocityToAddToActor.Y = velocityToAddToActor.Y * 2;
+				end
+				actor.Vel = actor.Vel + velocityToAddToActor;
+				
 			end
 			waypointData.delayTimer:Reset();
 		end

Data/Missions.rte/Activities/DecisionDay.lua

@@ -1611,6 +1611,8 @@ function DecisionDay:UpdateAIDecisions()
 					bunkerRegionData.aiRegionDefenseTimer:Reset();
 				end
 			elseif bunkerRegionData.ownerTeam == self.humanTeam then
+				bunkerRegionData.aiRegionDefenseTimer:Reset();
+				
 				humanOwnedBunkerRegions[#humanOwnedBunkerRegions + 1] = bunkerRegionData;
 				if bunkerRegionData.aiRecaptureWeight > 0 and (bunkerRegionForAIToRecapture == nil or bunkerRegionData.aiRecaptureWeight > bunkerRegionForAIToRecapture.aiRecaptureWeight) and bunkerRegionData.aiRegionAttackTimer:IsPastSimTimeLimit() then
 					bunkerRegionForAIToRecapture = bunkerRegionData;