From b6865a61bfe06459f0756e3e4de349ff14724676 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 14 Oct 2024 10:16:45 +0100 Subject: [PATCH 1/5] Bump actions/checkout from 4.1.7 to 4.2.1 (#88) Bumps [actions/checkout](https://github.com/actions/checkout) from 4.1.7 to 4.2.1. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v4.1.7...v4.2.1) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/BuildModCheck.yml | 2 +- .github/workflows/GenerateCompatibilityList.yml | 2 +- .github/workflows/GenerateReleaseZip.yml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/BuildModCheck.yml b/.github/workflows/BuildModCheck.yml index 030ab11..4a3506a 100644 --- a/.github/workflows/BuildModCheck.yml +++ b/.github/workflows/BuildModCheck.yml @@ -28,7 +28,7 @@ jobs: rimworld-version: [1.4, 1.5] steps: - name: Checkout Repository - uses: actions/checkout@v4.1.7 + uses: actions/checkout@v4.2.1 - name: Setup Dotnet uses: actions/setup-dotnet@v4.0.1 diff --git a/.github/workflows/GenerateCompatibilityList.yml b/.github/workflows/GenerateCompatibilityList.yml index 65deaa3..ee138d1 100644 --- a/.github/workflows/GenerateCompatibilityList.yml +++ b/.github/workflows/GenerateCompatibilityList.yml @@ -16,7 +16,7 @@ jobs: runs-on: windows-latest steps: - - uses: actions/checkout@v4.1.7 + - uses: actions/checkout@v4.2.1 - name: Setup Dotnet uses: actions/setup-dotnet@v4.0.1 diff --git a/.github/workflows/GenerateReleaseZip.yml b/.github/workflows/GenerateReleaseZip.yml index c402421..6be32ed 100644 --- a/.github/workflows/GenerateReleaseZip.yml +++ b/.github/workflows/GenerateReleaseZip.yml @@ -47,7 +47,7 @@ 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.1 - name: Setup Dotnet uses: actions/setup-dotnet@v4.0.1 @@ -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.1 # Download the build artifact from the package job. - name: Download Mod Artifacts from Build Step From d12cc44d512962cd15dd0ccfa18aadff7072bcf5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 14 Oct 2024 10:16:57 +0100 Subject: [PATCH 2/5] Bump actions/upload-artifact from 4.4.0 to 4.4.3 (#87) Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 4.4.0 to 4.4.3. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](https://github.com/actions/upload-artifact/compare/v4.4.0...v4.4.3) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/GenerateReleaseZip.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/GenerateReleaseZip.yml b/.github/workflows/GenerateReleaseZip.yml index 6be32ed..b3e3709 100644 --- a/.github/workflows/GenerateReleaseZip.yml +++ b/.github/workflows/GenerateReleaseZip.yml @@ -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 From 7c26b842aec72a5a3560d6b1cc1a81ac93c3b6c6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 5 Nov 2024 18:57:12 +0000 Subject: [PATCH 3/5] Bump actions/setup-dotnet from 4.0.1 to 4.1.0 (#90) Bumps [actions/setup-dotnet](https://github.com/actions/setup-dotnet) from 4.0.1 to 4.1.0. - [Release notes](https://github.com/actions/setup-dotnet/releases) - [Commits](https://github.com/actions/setup-dotnet/compare/v4.0.1...v4.1.0) --- updated-dependencies: - dependency-name: actions/setup-dotnet dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/BuildModCheck.yml | 2 +- .github/workflows/GenerateCompatibilityList.yml | 2 +- .github/workflows/GenerateReleaseZip.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/BuildModCheck.yml b/.github/workflows/BuildModCheck.yml index 4a3506a..525b803 100644 --- a/.github/workflows/BuildModCheck.yml +++ b/.github/workflows/BuildModCheck.yml @@ -31,7 +31,7 @@ jobs: uses: actions/checkout@v4.2.1 - 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 ee138d1..acfd565 100644 --- a/.github/workflows/GenerateCompatibilityList.yml +++ b/.github/workflows/GenerateCompatibilityList.yml @@ -19,7 +19,7 @@ jobs: - uses: actions/checkout@v4.2.1 - 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 b3e3709..0e2f040 100644 --- a/.github/workflows/GenerateReleaseZip.yml +++ b/.github/workflows/GenerateReleaseZip.yml @@ -50,7 +50,7 @@ jobs: uses: actions/checkout@v4.2.1 - name: Setup Dotnet - uses: actions/setup-dotnet@v4.0.1 + uses: actions/setup-dotnet@v4.1.0 with: dotnet-version: 8.0.x From ad2096059f7239de790459259c0075f857ca3ec0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 5 Nov 2024 18:57:21 +0000 Subject: [PATCH 4/5] Bump actions/checkout from 4.2.1 to 4.2.2 (#89) Bumps [actions/checkout](https://github.com/actions/checkout) from 4.2.1 to 4.2.2. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v4.2.1...v4.2.2) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/BuildModCheck.yml | 2 +- .github/workflows/GenerateCompatibilityList.yml | 2 +- .github/workflows/GenerateReleaseZip.yml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/BuildModCheck.yml b/.github/workflows/BuildModCheck.yml index 525b803..b568128 100644 --- a/.github/workflows/BuildModCheck.yml +++ b/.github/workflows/BuildModCheck.yml @@ -28,7 +28,7 @@ jobs: rimworld-version: [1.4, 1.5] steps: - name: Checkout Repository - uses: actions/checkout@v4.2.1 + uses: actions/checkout@v4.2.2 - name: Setup Dotnet uses: actions/setup-dotnet@v4.1.0 diff --git a/.github/workflows/GenerateCompatibilityList.yml b/.github/workflows/GenerateCompatibilityList.yml index acfd565..07b427d 100644 --- a/.github/workflows/GenerateCompatibilityList.yml +++ b/.github/workflows/GenerateCompatibilityList.yml @@ -16,7 +16,7 @@ jobs: runs-on: windows-latest steps: - - uses: actions/checkout@v4.2.1 + - uses: actions/checkout@v4.2.2 - name: Setup Dotnet uses: actions/setup-dotnet@v4.1.0 diff --git a/.github/workflows/GenerateReleaseZip.yml b/.github/workflows/GenerateReleaseZip.yml index 0e2f040..16659bc 100644 --- a/.github/workflows/GenerateReleaseZip.yml +++ b/.github/workflows/GenerateReleaseZip.yml @@ -47,7 +47,7 @@ jobs: rimworld-version: [1.4, 1.5] # Add Rimworld version here! steps: - name: Checkout Repository - uses: actions/checkout@v4.2.1 + uses: actions/checkout@v4.2.2 - name: Setup Dotnet uses: actions/setup-dotnet@v4.1.0 @@ -123,7 +123,7 @@ jobs: # The repository needs to be checked out for the next changelog step. - name: Checkout Repository - uses: actions/checkout@v4.2.1 + uses: actions/checkout@v4.2.2 # Download the build artifact from the package job. - name: Download Mod Artifacts from Build Step From 9e214c00c8197405b61b7b89e874af380f93c08c Mon Sep 17 00:00:00 2001 From: James B Date: Tue, 5 Nov 2024 19:01:24 +0000 Subject: [PATCH 5/5] Add better support for different duel types. (#91) --- Source/1.5/AnimationMod/Controller/ActionController.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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;