diff --git a/.github/workflows/BuildModCheck.yml b/.github/workflows/BuildModCheck.yml index 030ab11..b568128 100644 --- a/.github/workflows/BuildModCheck.yml +++ b/.github/workflows/BuildModCheck.yml @@ -28,10 +28,10 @@ jobs: rimworld-version: [1.4, 1.5] steps: - name: Checkout Repository - uses: actions/checkout@v4.1.7 + uses: actions/checkout@v4.2.2 - name: Setup Dotnet - uses: actions/setup-dotnet@v4.0.1 + uses: actions/setup-dotnet@v4.1.0 with: dotnet-version: 8.0.x diff --git a/.github/workflows/GenerateCompatibilityList.yml b/.github/workflows/GenerateCompatibilityList.yml index 65deaa3..07b427d 100644 --- a/.github/workflows/GenerateCompatibilityList.yml +++ b/.github/workflows/GenerateCompatibilityList.yml @@ -16,10 +16,10 @@ jobs: runs-on: windows-latest steps: - - uses: actions/checkout@v4.1.7 + - uses: actions/checkout@v4.2.2 - name: Setup Dotnet - uses: actions/setup-dotnet@v4.0.1 + uses: actions/setup-dotnet@v4.1.0 with: dotnet-version: 8.0.x diff --git a/.github/workflows/GenerateReleaseZip.yml b/.github/workflows/GenerateReleaseZip.yml index c402421..16659bc 100644 --- a/.github/workflows/GenerateReleaseZip.yml +++ b/.github/workflows/GenerateReleaseZip.yml @@ -47,10 +47,10 @@ jobs: rimworld-version: [1.4, 1.5] # Add Rimworld version here! steps: - name: Checkout Repository - uses: actions/checkout@v4.1.7 + uses: actions/checkout@v4.2.2 - name: Setup Dotnet - uses: actions/setup-dotnet@v4.0.1 + uses: actions/setup-dotnet@v4.1.0 with: dotnet-version: 8.0.x @@ -61,7 +61,7 @@ jobs: # whatever you want. It will not upload any empty directories, those with only # hidden files will also be excluded. - name: Upload Mod Artifacts (RW ${{ matrix.rimworld-version }}) - uses: actions/upload-artifact@v4.4.0 + uses: actions/upload-artifact@v4.4.3 with: name: build-${{ matrix.rimworld-version }} retention-days: 1 @@ -100,7 +100,7 @@ jobs: zip -r ./${{ env.MOD_NAME }}.zip ./${{ env.MOD_NAME }}/* - name: Upload Mod Zip Artifact - uses: actions/upload-artifact@v4.4.0 + uses: actions/upload-artifact@v4.4.3 with: name: ${{ env.MOD_NAME }} path: ${{ env.MOD_PATH }}.zip @@ -123,7 +123,7 @@ jobs: # The repository needs to be checked out for the next changelog step. - name: Checkout Repository - uses: actions/checkout@v4.1.7 + uses: actions/checkout@v4.2.2 # Download the build artifact from the package job. - name: Download Mod Artifacts from Build Step diff --git a/Source/1.5/AnimationMod/Controller/ActionController.cs b/Source/1.5/AnimationMod/Controller/ActionController.cs index 6104d30..8b8e18b 100644 --- a/Source/1.5/AnimationMod/Controller/ActionController.cs +++ b/Source/1.5/AnimationMod/Controller/ActionController.cs @@ -706,7 +706,7 @@ public static AnimDef TryGetDuelAnimationFor(Thing a, Thing b, out bool? focusOn var inA = new ReqInput(a.def); var inB = new ReqInput(b.def); - foreach (var anim in AnimDef.GetDefsOfType(AnimType.Duel)) + foreach (var anim in AnimDef.GetDefsOfType(AnimType.Duel).OrderByDescending(def => def.Probability)) { if (anim.weaponFilter == null) continue;