Merge branch 'development' into dpi-fix

Author: Causeless

.clang-format

@@ -2,7 +2,7 @@
 Language:        Cpp
 # BasedOnStyle:  LLVM
 AccessModifierOffset: -4
-AlignAfterOpenBracket: Align
+AlignAfterOpenBracket: DontAlign
 AlignConsecutiveMacros: false
 AlignConsecutiveAssignments: false
 AlignConsecutiveDeclarations: false

.github/actions/bundle_release/action.yaml

@@ -19,6 +19,7 @@ runs:
       run: |
         zip --must-match -j CortexCommand.windows.zip \
           release/Cortex\ Command*.exe/Cortex\ Command*.exe \
+          release/Cortex\ Command*.exe/Cortex\ Command*.pdb \
           external/lib/win/{fmod,SDL2}.dll
 
     - name: Compress Linux Release

CHANGELOG.md

@@ -18,6 +18,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 <details><summary><b>Fixed</b></summary>
 
+- Fixed initial Decision Day dropships never exploding and sticking around.
+
 - Reverted a change to pathfinding, that although was technically accurate, caused issues with the AI being too eager to path up-and-over obstacles instead of through them. In the future this will likely be revisited when we get jump-aware pathfinding.
 
 </details>

Data/Missions.rte/Activities/DecisionDay.lua

@@ -1243,6 +1243,9 @@ function DecisionDay:SpawnAndUpdateInitialDropShips()
 			end
 		else
 			initialDropShipAndVelocity.dropShip.Vel.X = initialDropShipAndVelocity.velX;
+			if initialDropShipAndVelocity.dropShip.TravelImpulse.Magnitude > 10 or initialDropShipAndVelocity.dropShip.Age > 100000 then
+				initialDropShipAndVelocity.dropShip:GibThis();
+			end
 		end
 	end
 end
@@ -2520,4 +2523,4 @@ function DecisionDay:CreateCrab(team, createTurret)
 	actor.Team = team;
 	actor.PlayerControllable = createTurret or self.humansAreControllingAlliedActors;
 	return actor;
-end
+end

Source/System/PathFinder.cpp

@@ -211,23 +211,23 @@ std::shared_ptr<volatile PathRequest> PathFinder::CalculatePathAsync(Vector star
 	const_cast<Vector&>(pathRequest->targetPos) = end;
 
 	g_ThreadMan.GetBackgroundThreadPool().push_task(
-		[this, start, end, digStrength, callback](std::shared_ptr<volatile PathRequest> volRequest) {
-			// Cast away the volatile-ness - only matters outside (and complicates the API otherwise)
-			PathRequest& request = const_cast<PathRequest&>(*volRequest);
+	    [this, start, end, digStrength, callback](std::shared_ptr<volatile PathRequest> volRequest) {
+		    // Cast away the volatile-ness - only matters outside (and complicates the API otherwise)
+		    PathRequest& request = const_cast<PathRequest&>(*volRequest);
 
-			int status = this->CalculatePath(start, end, request.path, request.totalCost, digStrength);
+		    int status = this->CalculatePath(start, end, request.path, request.totalCost, digStrength);
 
-			request.status = status;
-			request.pathLength = request.path.size();
+		    request.status = status;
+		    request.pathLength = request.path.size();
 
-			if (callback) {
-				callback(volRequest);
-			}
+		    if (callback) {
+			    callback(volRequest);
+		    }
 
-			// Have to set to complete after the callback, so anything that blocks on it knows that the callback will have been called by now
-			// This has the awkward side-effect that the complete flag is actually false during the callback - but that's fine, if it's called we know it's complete anyways
-			request.complete = true;
-		},
+		    // Have to set to complete after the callback, so anything that blocks on it knows that the callback will have been called by now
+		    // This has the awkward side-effect that the complete flag is actually false during the callback - but that's fine, if it's called we know it's complete anyways
+		    request.complete = true;
+	    },
 	    pathRequest);
 
 	return pathRequest;