Merge branch 'development' into radius-affecting-attachables

Author: Causeless

.github/actions/bundle_release/action.yaml

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

.github/workflows/ci.yml

@@ -10,6 +10,9 @@ on:
     types: [checks_requested]
 
   workflow_dispatch:
+  
+  schedule:
+    - cron: '1 0 * * 0'
 
 # Cancel in-progress runs if newer changes to the same branch/PR are pushed.
 concurrency:
@@ -21,4 +24,4 @@ jobs:
     uses: ./.github/workflows/meson.yml
 
   msbuild:
-    uses: ./.github/workflows/msbuild.yml
+    uses: ./.github/workflows/msbuild.yml

.github/workflows/meson.yml

@@ -36,7 +36,7 @@ on:
       macosx-deployment-target:
         type: string
         required: false
-        default: "10.15"
+        default: "11.1"
 
   # Triggers the workflow when called by a top-level workflow
   workflow_call:
@@ -63,7 +63,7 @@ on:
       macosx-deployment-target:
         type: string
         required: false
-        default: "10.15"
+        default: "11.1"
 
 jobs:
   build-linux:
@@ -178,7 +178,7 @@ jobs:
           echo "::group::Installing pkg-config"
           sudo apt install pkg-config
           echo "::group::Installing mac deps"
-          omp install libsdl2 libsdl2_image onetbb lz4 libpng minizip luajit flac
+          omp install SDL3 onetbb lz4 libpng minizip luajit flac
           echo "OSXCROSS_PKG_CONFIG_PATH=${{env.OSXCROSS_TARGET}}/macports/pkgs/opt/local/libexec/onetbb/lib/pkgconfig" >> $GITHUB_ENV
           echo "::endgroup::"
           echo "::group::Installing meson"

.gitignore

@@ -12,6 +12,9 @@
 
 compile_commands.json
 **/.ccls-cache
+**/.cache
+**/.clangd
+
 
 **/build*
 
@@ -101,3 +104,4 @@ LogLoadingWarning.txt
 LogConsole.txt
 Console.dump.log
 Console.input.log
+imgui.ini

CHANGELOG.md

@@ -571,7 +571,7 @@ function HumanBehaviors.WeaponSearch(AI, Owner, Abort)
 
 	local maxSearchDistance;
 	if AI.isPlayerOwned then
-		maxSearchDistance = 100; -- don't move player actors too far
+		maxSearchDistance = 160; -- don't move player actors too far
 	else
 		maxSearchDistance = FrameMan.PlayerScreenWidth * 0.45;
 	end
@@ -615,26 +615,26 @@ function HumanBehaviors.WeaponSearch(AI, Owner, Abort)
 		for _, deviceEntry in pairs(devices) do
 			local device = deviceEntry.device;
 			if MovableMan:ValidMO(device) then
-				local pathMultipler = 1;
+				local pathMultiplier = 1;
 				if device:HasObjectInGroup("Weapons - Primary") or device:HasObjectInGroup("Weapons - Heavy") then
-					pathMultipler = 0.4; -- prioritize primary or heavy weapons
+					pathMultiplier = 0.4; -- prioritize primary or heavy weapons
 				elseif device.ClassName == "TDExplosive" then
-					pathMultipler = 1.4; -- avoid grenades if there are other weapons
+					pathMultiplier = 1.4; -- avoid grenades if there are other weapons
 				elseif device:IsTool() then
 					if pickupDiggers and device:HasObjectInGroup("Tools - Diggers") then
-						pathMultipler = 1.8; -- avoid diggers if there are other weapons
+						pathMultiplier = 1.8; -- avoid diggers if there are other weapons
 					else
-						pathMultipler = -1; -- disregard non-digger tools
+						pathMultiplier = -1; -- disregard non-digger tools
 					end
 				end
 
-				if pathMultipler ~= -1 then
+				if pathMultiplier ~= -1 then
 					local deviceID = device.UniqueID;
 					SceneMan.Scene:CalculatePathAsync(
 						function(pathRequest)
 							local pathLength = pathRequest.PathLength;
 							if pathRequest.Status ~= PathRequest.NoSolution and pathLength < maxPathLength then
-								local score = pathLength * pathMultipler;
+								local score = pathLength * pathMultiplier;
 								table.insert(devicesToPickUp, {deviceId = deviceID, score = score});
 							end
 							searchesRemaining = searchesRemaining - 1;
@@ -665,11 +665,12 @@ function HumanBehaviors.WeaponSearch(AI, Owner, Abort)
 			local prevMoveTarget, prevSceneWaypoint;
 			if Owner.MOMoveTarget and MovableMan:ValidMO(Owner.MOMoveTarget) then
 				prevMoveTarget = Owner.MOMoveTarget;
+				Owner.MOMoveTarget = nil;
 			else
 				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
@@ -704,7 +705,7 @@ function HumanBehaviors.ToolSearch(AI, Owner, Abort)
 	if Owner.AIMode == Actor.AIMODE_GOLDDIG then
 		maxSearchDistance = FrameMan.PlayerScreenWidth * 0.5; -- move up to half a screen when digging
 	elseif AI.isPlayerOwned then
-		maxSearchDistance = 60; -- don't move player actors too far
+		maxSearchDistance = 160; -- don't move player actors too far
 	else
 		maxSearchDistance = FrameMan.PlayerScreenWidth * 0.3;
 	end
@@ -780,11 +781,12 @@ function HumanBehaviors.ToolSearch(AI, Owner, Abort)
 			local prevMoveTarget, prevSceneWaypoint;
 			if Owner.MOMoveTarget and MovableMan:ValidMO(Owner.MOMoveTarget) then
 				prevMoveTarget = Owner.MOMoveTarget;
+				Owner.MOMoveTarget = nil;
 			else
 				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/HumanBehaviors.lua

@@ -723,6 +723,12 @@ function NativeHumanAI:CreateGoldDigBehavior(Owner)
 end
 
 function NativeHumanAI:CreateBrainSearchBehavior(Owner)
+  	if self.PickupHD then
+		-- We're currently trying to pickup a weapon, do that instead
+		self.Target = nil;
+		return;
+	end
+
 	self.NextBehavior = coroutine.create(SharedBehaviors.BrainSearch);
 	self.NextCleanup = nil;
 	self.NextBehaviorName = "BrainSearch";
@@ -760,8 +766,13 @@ function NativeHumanAI:CreateAttackBehavior(Owner)
 	self.ReloadTimer:Reset();
 	self.TargetLostTimer:Reset();
 
+	if self.PickupHD then
+		-- We're currently trying to pickup a weapon, do that instead
+		self.Target = nil;
+		return;
+	end
+		
 	local dist = SceneMan:ShortestDistance(Owner.Pos, self.Target.Pos, false);
-
 	if IsADoor(self.Target) and Owner.AIMode ~= Actor.AIMODE_SQUAD then
 		--TODO: Include other explosive weapons with varying effective ranges!
 		if Owner:EquipDeviceInGroup("Tools - Breaching", true) then

Data/Base.rte/AI/NativeHumanAI.lua

@@ -120,7 +120,7 @@ function SharedBehaviors.FaceAlarm(AI, Owner, Abort)
 end
 
 -- find the closest enemy brain
-function SharedBehaviors.BrainSearch(AI, Owner, Abort)
+function SharedBehaviors.BrainSearch(AI, Owner, Abort) 
 	if AI.PlayerPreferredHD then
 		Owner:EquipNamedDevice(AI.PlayerPreferredHD, true);
 	end
@@ -145,9 +145,6 @@ function SharedBehaviors.BrainSearch(AI, Owner, Abort)
 	end
 
 	if #Brains > 0 then
-		local _ai, _ownr, _abrt = coroutine.yield(); -- wait until next frame
-		if _abrt then return true end
-
 		if #Brains == 1 then
 			if MovableMan:IsActor(Brains[1]) then
 				Owner:ClearAIWaypoints();
@@ -214,9 +211,6 @@ function SharedBehaviors.BrainSearch(AI, Owner, Abort)
 						minDist = score;
 						ClosestBrain = Act;
 					end
-
-					local _ai, _ownr, _abrt = coroutine.yield(); -- wait until next frame
-					if _abrt then return true end
 				end
 			end
 
@@ -468,9 +462,8 @@ function SharedBehaviors.GoToWpt(AI, Owner, Abort)
 						AI.deviceState = AHuman.DIGGING;
 						obstacleState = Actor.DIGPAUSING;
 						nextLatMove = Actor.LAT_STILL;
-						sweepRange = math.min(math.pi*0.2, Owner.AimRange);
+						sweepRange = math.min(math.pi*0.25, Owner.AimRange);
 						StuckTimer:SetSimTimeLimitMS(6000);
-						AI.Ctrl.AnalogAim = SceneMan:ShortestDistance(Owner.Pos, Waypoint.Pos, false).Normalized; -- aim in the direction of the next waypoint
 					else
 						digState = AHuman.NOTDIGGING;
 						obstacleState = Actor.PROCEEDING;
@@ -619,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;
@@ -725,9 +719,12 @@ function SharedBehaviors.GoToWpt(AI, Owner, Abort)
 
 											angDiff = math.asin(AimVec:Cross(DigTarget.Normalized)); -- The angle between DigTarget and AimVec
 											if math.abs(angDiff) < 0.1 then
-												sweepCW = not sweepCW; -- this is close enough, go in the other direction next frame
+												AI.Ctrl.AnalogAim = DigTarget.Normalized; -- aim in the direction of the next waypoint
+												sweepCW = not sweepCW;
 											else
-												AI.Ctrl.AnalogAim = (Vector(AimVec.X, AimVec.Y):RadRotate(-angDiff*0.15)).Normalized;
+												local sweepSpeed = 2.5;
+												local sweepDir = sweepCW and 1 or -1;
+												AI.Ctrl.AnalogAim = (Vector(AimVec.X, AimVec.Y):RadRotate(sweepDir*TimerMan.AIDeltaTimeSecs*sweepSpeed)).Normalized;
 											end
 
 											-- check if we are done when we get close enough to the waypoint
@@ -1012,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

Data/Base.rte/AI/SharedBehaviors.lua

@@ -63,7 +63,7 @@ AddActivity = GAScripted
 
 AddActivity = GAScripted
 	PresetName = Wave Defense
-	Description = Build a bunker and defend it against increasingly longer waves of AI-controlled enemies, with time to repair in between! Adjust the Difficulty to change wave difficulty.
+	Description = Build a bunker and defend it against increasingly stronger waves of AI-controlled enemies, with time to repair in between! Adjust the Difficulty to change wave difficulty.
 	SceneName = Ketanot Hills
 	ScriptPath = Base.rte/Activities/WaveDefense.lua
 	TeamOfPlayer1 = 1
@@ -294,13 +294,16 @@ AddActivity = GAScripted
 
 AddActivity = GAScripted
 	PresetName = Test Activity
-	Description = Test your arsenal in peace and quiet witout any enemies.
+	Description = Test your arsenal in peace and quiet without any enemies.
 	TeamOfPlayer1 = 0
-	TeamOfPlayer2 = 0
-	TeamOfPlayer3 = 0
-	TeamOfPlayer4 = 0
+	TeamOfPlayer2 = 1
+	TeamOfPlayer3 = 2
+	TeamOfPlayer4 = 3
 	MinTeamsRequired = 1
 	Team1Funds = 100000
+	Team2Funds = 100000
+	Team3Funds = 100000
+	Team4Funds = 100000
 	ScriptPath = Base.rte/Activities/Test.lua
 	LuaClassName = Test
 	DefaultRequireClearPathToOrbit = 0

Data/Base.rte/Activities.ini

@@ -625,7 +625,7 @@ function BrainvsBrain:CreateMediumDrop(xPosLZ)
 		if craftMaxMass < 0 then
 			craftMaxMass = math.huge;
 		elseif craftMaxMass < 1 then
-			if Craft.ClassName == "ACDropship" then
+			if Craft.ClassName == "ACDropShip" then
 				Craft = RandomACDropShip("Craft", 0); -- MaxMass not defined
 			else
 				Craft = RandomACRocket("Craft", 0);	-- MaxMass not defined
@@ -685,7 +685,7 @@ function BrainvsBrain:CreateLightDrop(xPosLZ)
 		if craftMaxMass < 0 then
 			craftMaxMass = math.huge;
 		elseif craftMaxMass < 1 then
-			if Craft.ClassName == "ACDropship" then
+			if Craft.ClassName == "ACDropShip" then
 				Craft = RandomACDropShip("Craft", 0); -- MaxMass not defined
 			else
 				Craft = RandomACRocket("Craft", 0);	-- MaxMass not defined
@@ -743,7 +743,7 @@ function BrainvsBrain:CreateScoutDrop(xPosLZ)
 		if craftMaxMass < 0 then
 			craftMaxMass = math.huge;
 		elseif craftMaxMass < 1 then
-			if Craft.ClassName == "ACDropship" then
+			if Craft.ClassName == "ACDropShip" then
 				Craft = RandomACDropShip("Craft", 0); -- MaxMass not defined
 			else
 				Craft = RandomACRocket("Craft", 0); -- MaxMass not defined