Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release 32 #92

Merged
merged 5 commits into from
Nov 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/BuildModCheck.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/GenerateCompatibilityList.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/GenerateReleaseZip.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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/[email protected].0
uses: actions/[email protected].3
with:
name: build-${{ matrix.rimworld-version }}
retention-days: 1
Expand Down Expand Up @@ -100,7 +100,7 @@ jobs:
zip -r ./${{ env.MOD_NAME }}.zip ./${{ env.MOD_NAME }}/*

- name: Upload Mod Zip Artifact
uses: actions/[email protected].0
uses: actions/[email protected].3
with:
name: ${{ env.MOD_NAME }}
path: ${{ env.MOD_PATH }}.zip
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Source/1.5/AnimationMod/Controller/ActionController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Loading