Merge branch 'development' into macos-crosscompile

Author: Causeless

.git-blame-ignore-revs

@@ -13,3 +13,7 @@ b22c5ab241f040a16ef502a8b5f2bca125368060
 f701bc23cfae7c1cafc48070d986ba16a5873416
 5efd90188ede818ed42fee06bb65f29cb892c54f
 b21b546e2dc9062b1918e7e01d517a537437bbc4
+d7fadcc33a4dc18c5bc214f4930011f073f1d8f5
+ed9fe94aca5e514a13e3c551e30af3862a31b0b5
+1578aaf760454156359e295bd8b498f744f3ecd7
+0d9d14f0e7a2a1326dd143652cbb74609966956f

.github/actions/bundle_release/action.yaml

@@ -24,6 +24,7 @@ runs:
     - name: Compress Linux Release
       shell: bash
       run: |
+        chmod +x "release/CortexCommand (Linux)/CortexCommand.AppImage"
         zip --must-match -j CortexCommand.linux.zip \
           "release/CortexCommand (Linux)/CortexCommand.AppImage" \
           external/lib/linux/x86_64/libfmod.so*

.github/actions/get-game-version/action.yaml

@@ -0,0 +1,21 @@
+name: 'Get Game version Version'
+description: 'Fetches the current game version from the source code'
+
+inputs:
+  version-file:
+    description: 'The file containing the version string'
+    required: false
+    default: Source/System/GameVersion.h
+
+outputs:
+  game-version:
+    description: 'The current version string'
+    value: ${{ steps.read-version.outputs.game-version }}
+
+runs:
+  using: "composite"
+  steps:
+    - name: Get the current Game Version from the source code
+      id: read-version
+      run: echo "game-version=$(grep 'c_VersionString = ' ${{ inputs.version-file }} | awk -F'"' '{print $2}')" >> $GITHUB_OUTPUT 
+      shell: bash

.github/workflows/release.yaml

@@ -2,11 +2,6 @@ name: Master Build and Release
 # Controls when the action will run.
 on:
   workflow_dispatch:
-    inputs:
-      new_release_version:
-        description: "New version number to release"
-        type: string
-        required: true
 
 concurrency:
   group: release-${{ github.ref_name }}
@@ -22,15 +17,13 @@ jobs:
     uses: ./.github/workflows/meson.yml
     with:
       upload_artefacts: true
-      new_release_version: ${{ github.event.inputs.new_release_version }}
 
   build-msbuild-releases:
     name: Windows Release Build
 
     uses: ./.github/workflows/msbuild.yml
     with:
       upload_artefacts: true
-      new_release_version: ${{ github.event.inputs.new_release_version }}
 
   release:
     name: Publish Release
@@ -45,38 +38,30 @@ jobs:
       - name: fetch tags
         run: git fetch --tags origin
 
-      - name: Set Version
-        if: ${{ github.event.inputs.new_release_version}}
-        uses: ./.github/actions/set_version
-        with:
-          new_release_version: ${{ github.event.inputs.new_release_version}}
+      - name: Get Release Version
+        id: get-release-version
+        uses: ./.github/actions/get-game-version
 
       - name: Bundle release assets
         uses: ./.github/actions/bundle_release
 
       - name: Create a new Release
         run: |
-          gh release create v${{ github.event.inputs.new_release_version }} \
-            --title "Release ${{ github.event.inputs.new_release_version }}" \
+          gh release create v${{ steps.get-release-version.outputs.game-version }} \
+            --title "Release v${{ steps.get-release-version.outputs.game-version }}" \
             --generate-notes \
             --draft \
             --target ${{ github.ref_name }} \
             ${{format('--notes-start-tag {0}', env.LATEST_TAG) || ''}} \
-            'CortexCommand.windows.zip#Cortex Command [v${{ github.event.inputs.new_release_version }}] (Windows Release)' \
-            'CortexCommand.linux.zip#Cortex Command [v${{ github.event.inputs.new_release_version }}] (Linux Release)' \
-            'CortexCommand.macos.zip#Cortex Command [v${{ github.event.inputs.new_release_version }}] (macOS Release)'
+            'CortexCommand.windows.zip#Cortex Command [v${{ steps.get-release-version.outputs.game-version }}] (Windows Release)' \
+            'CortexCommand.linux.zip#Cortex Command [v${{ steps.get-release-version.outputs.game-version }}] (Linux Release)' \
+            'CortexCommand.macos.zip#Cortex Command [v${{ steps.get-release-version.outputs.game-version }}] (macOS Release)'
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Commit and push Version Changes and Update latest tag
         shell: bash
         run: |
-          git config --global user.email "[email protected]"
-          git config --global user.name "GitHub Action"
-          git add Source/System/GameVersion.h meson.build
-          git commit -m "Release v${{ inputs.new_release_version }}" || echo "No changes to commit"
-          git push
-
           RELEASE_COMMIT=$(git rev-parse HEAD)
           curl -X PATCH \
             -H "Authorization: Bearer ${{ secrets.WORKFLOW_TOKEN }}" \
@@ -86,5 +71,4 @@ jobs:
               "sha": "'"$RELEASE_COMMIT"'",
               "ref": "${{ github.ref }}"
             }'
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN}}
+

CHANGELOG.md

@@ -4,6 +4,30 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [Unreleased]
+
+<details><summary><b>Added</b></summary>
+
+</details>
+
+<details><summary><b>Changed</b></summary>
+
+- Nerfed the Coalition Grenade Launcher and the Devastator a tiny bit. They are still scary and the Devastator can still one-shot most things on a good hit, but they did not need to be that oppressive.
+
+</details>
+
+<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>
+
+<details><summary><b>Removed</b></summary>
+
+</details>
+
 ## [Release v6.0.0] - 2024/02/11
 
 <details><summary><b>Added</b></summary>
@@ -2384,6 +2408,6 @@ Note: For a log of changes made prior to the commencement of the open source com
 [Release v2.0.0]: https://github.com/cortex-command-community/Cortex-Command-Community-Project-Data/releases/tag/v0.1.0-pre2
 [Release v3.0.0]: https://github.com/cortex-command-community/Cortex-Command-Community-Project-Source/releases/tag/v0.1.0-pre3.0
 [Release v4.0.0]: https://github.com/cortex-command-community/Cortex-Command-Community-Project-Source/releases/tag/v0.1.0-pre4.0
-[Release v5.0.0]: https://github.com/cortex-command-community/Cortex-Command-Community-Project-Source/releases/tag/v0.1.0-pre5.0
+[Release v5.0.0]: https://github.com/cortex-command-community/Cortex-Command-Community-Project-Source/releases/tag/v0.1.0-pre5.2
 [Release v6.0.0]: https://github.com/cortex-command-community/Cortex-Command-Community-Project/releases/tag/v6.0.0
 [Unreleased]: https://github.com/cortex-command-community/Cortex-Command-Community-Project-Source/compare/master...cortex-command-community:development

Data/Base.rte/AI/RocketAI.lua

@@ -206,8 +206,12 @@ function ThreadedUpdateAI(self)
 					self.burstUp = nil;
 					self.Ctrl:SetState(Controller.MOVE_UP, true);	-- Don't burst when returning to orbit
 				else
-					if change < -3 and not self.burstUp then
+					if change < -2.2 and not self.burstUp then
 						self.burstUp = math.max(9 - change, 2); -- Wait n frames until next burst (lower -> better control)
+						if change < -6 then
+							self.Ctrl:SetState(Controller.MOVE_UP, true);
+							self.burstUp = nil;
+						end
 					elseif change > 20 then
 						self.burstUp = nil;
 						self.Ctrl:SetState(Controller.MOVE_DOWN, true);
@@ -275,7 +279,7 @@ function ThreadedUpdateAI(self)
 		self.burstUp = self.burstUp - SettingsMan.AIUpdateInterval;
 		if self.burstUp < 0 then
 			self.Ctrl:SetState(Controller.MOVE_UP, true);
-			if self.burstUp < -16 then
+			if self.burstUp < -8 then
 				self.burstUp = nil;
 			end
 		end

Data/Base.rte/Activities/Utility/LandingZoneMap.lua

@@ -496,7 +496,7 @@ function LandingZoneMap.SearchForLZ(self, team, Destination, digStrenght)
 			Vector(LZ.X, LZ.Y), Destination, false, digStrenght, team);
 	end
 
-	while pathRequestsCompleted ~= #GoodLZs do
+	while pathRequestsCompleted < #GoodLZs do
 		coroutine.yield(); -- wait until all paths are complete
 	end
 

Data/Base.rte/GUIs/ScenarioGUI.ini

@@ -128,7 +128,7 @@ Visible = True
 Enabled = True
 Name = ComboBoxActivitySelect
 Anchor = Left, Top
-DropHeight = 306
+DropHeight = 288
 DropDownStyle = DropDownList
 
 ///////////////////////////////////////////////////////////////////////

Data/Browncoats.rte/Devices/Shields/Eruptor/Eruptor.lua

@@ -21,12 +21,10 @@ function Create(self)
 	self.equippedInMainHand = false;
 	self:SetOneHanded(true);
 	local rootParent = self:GetRootParent();
-	if IsAHuman(rootParent) then
-		if ToAHuman(rootParent).EquippedItem.UniqueID == self.UniqueID then
-			ToAHuman(rootParent):UnequipBGArm();
-			self.equippedInMainHand = true;
-			self:SetOneHanded(false);
-		end
+	if IsAHuman(rootParent) and ToAHuman(rootParent).EquippedItem and ToAHuman(rootParent).EquippedItem.UniqueID == self.UniqueID then
+		ToAHuman(rootParent):UnequipBGArm();
+		self.equippedInMainHand = true;
+		self:SetOneHanded(false);
 	end
 end
 
@@ -36,12 +34,10 @@ function OnAttach(self, newParent)
 	self.Bashing = false;
 	self.bashActive = false;
 	self.HitsMOs = false	local rootParent = self:GetRootParent();
-	if IsAHuman(rootParent) then
-		if ToAHuman(rootParent).EquippedItem.UniqueID == self.UniqueID then
-			ToAHuman(rootParent):UnequipBGArm();
-			self.equippedInMainHand = true;
-			self:SetOneHanded(false);
-		end
+	if IsAHuman(rootParent) and ToAHuman(rootParent).EquippedItem and ToAHuman(rootParent).EquippedItem.UniqueID == self.UniqueID then
+		ToAHuman(rootParent):UnequipBGArm();
+		self.equippedInMainHand = true;
+		self:SetOneHanded(false);
 	end
 end
 
@@ -104,6 +100,7 @@ function ThreadedUpdate(self)
 				if not self.bashActive then
 					self.bashActive = true;
 				end
+				
 				self.StanceOffset = self.bashActiveStanceOffset;
 				self.SharpStanceOffset = self.bashActiveStanceOffset;
 			end
@@ -146,6 +143,5 @@ function SyncedUpdate(self)
 				end
 			end
 		end
-		
 	end
 end

Data/Coalition.rte/Devices/Weapons/GrenadeLauncher/GrenadeLauncher.ini

@@ -86,15 +86,15 @@ AddEffect = MOSRotating
 	AddGib = Gib
 		GibParticle = MOSParticle
 			CopyOf = Grenade Smoke 2
-		Count = 18
+		Count = 9
 		MaxVelocity = 50
 		MinVelocity = 25
 		LifeVariation = 0.50
 		InheritsVel = 0
 	AddGib = Gib
 		GibParticle = MOPixel
 			CopyOf = Grenade Fragment Gray
-		Count = 18
+		Count = 9
 		MaxVelocity = 80
 		MinVelocity = 40
 		InheritsVel = 0
@@ -115,7 +115,7 @@ AddEffect = MOSRotating
 	AddGib = Gib
 		GibParticle = MOPixel
 			CopyOf = Particle Very Heavy Digger Damage
-		Count = 25
+		Count = 5
 		MaxVelocity = 50
 		MinVelocity = 25
 		InheritsVel = 0