Merge branch 'development' into dpi-fix

Author: Causeless

.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

@@ -12,10 +12,14 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 <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>
 
+- 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>

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

Data/Imperatus.rte/Devices/Weapons/Devastator/Devastator.ini

@@ -47,23 +47,23 @@ AddEffect = MOSRotating
 	AddGib = Gib
 		GibParticle = MOPixel
 			CopyOf = Grenade Fragment Gray
-		Count = 20
+		Count = 10
 		MinVelocity = 75
 		MaxVelocity = 100
 		InheritsVel = 0.3
 		LifeVariation = 0.20
 	AddGib = Gib
 		GibParticle = MOPixel
 			CopyOf = Grenade Fragment Yellow
-		Count = 20
+		Count = 10
 		MinVelocity = 90
 		MaxVelocity = 120
 		InheritsVel = 0.3
 		LifeVariation = 0.20
 	AddGib = Gib
 		GibParticle = MOPixel
 			CopyOf = Grenade Fragment Scripted
-		Count = 20
+		Count = 10
 		MinVelocity = 80
 		MaxVelocity = 110
 		InheritsVel = 0.5
@@ -121,7 +121,7 @@ AddEffect = MOSRotating
 	AddGib = Gib
 		GibParticle = MOPixel
 			CopyOf = Particle Very Heavy Digger Damage
-		Count = 25
+		Count = 3
 		MaxVelocity = 50
 		MinVelocity = 25
 		InheritsVel = 0.3