Release 25.

Epicguru · Aug 17, 2024 · fe6051e · fe6051e
2 parents 831b9fb + 08871eb
commit fe6051e
Show file tree

Hide file tree

Showing 93 changed files with 1,331 additions and 160 deletions.
diff --git 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/[email protected].4
+      uses: actions/[email protected].6
       with:
         name: build-${{ matrix.rimworld-version }}
         retention-days: 1
@@ -99,7 +99,7 @@ jobs:
         zip -r ./${{ env.MOD_NAME }}.zip ./${{ env.MOD_NAME }}/*
 
     - name: Upload Mod Zip Artifact
-      uses: actions/[email protected].4
+      uses: actions/[email protected].6
       with:
         name: ${{ env.MOD_NAME }}
         path: ${{ env.MOD_PATH }}.zip

diff --git a/Languages/English/Keyed/Keys.xml b/Languages/English/Keyed/Keys.xml
@@ -66,6 +66,8 @@
   <AM.Error.Exec.Downed>{Exec} is downed</AM.Error.Exec.Downed>
   <AM.Error.Exec.DownedTarget>{Target} is downed. Downed pawns cannot be executed.</AM.Error.Exec.DownedTarget>
   <AM.Error.Exec.DownedTarget.Short>{Target} is downed</AM.Error.Exec.DownedTarget.Short>
+  <AM.Error.Exec.BadRace>{Target} is not a valid target.</AM.Error.Exec.BadRace>
+  <AM.Error.Exec.BadRace.Short>{Target} is not a valid target</AM.Error.Exec.BadRace.Short>
 
   <AM.Error.Grapple.AlreadyTarget>{Target} is already being lassoed</AM.Error.Grapple.AlreadyTarget>
   <AM.Error.Grapple.AlreadyTarget.Short>Already being lassoed</AM.Error.Grapple.AlreadyTarget.Short>

diff --git a/Source/1.5/AnimationMod.sln b/Source/1.5/AnimationMod.sln
@@ -32,6 +32,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TacticowlPatch", "Tacticowl
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FacialAnimationPatch", "FacialAnimationPatch\FacialAnimationPatch.csproj", "{B5AC984E-8B51-426B-9F54-CC85006449F1}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VehiclesPatch", "VehiclesPatch\VehiclesPatch.csproj", "{676653C3-236E-4A81-9979-1541A2349D70}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -90,6 +92,10 @@ Global
 		{B5AC984E-8B51-426B-9F54-CC85006449F1}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B5AC984E-8B51-426B-9F54-CC85006449F1}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B5AC984E-8B51-426B-9F54-CC85006449F1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{676653C3-236E-4A81-9979-1541A2349D70}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{676653C3-236E-4A81-9979-1541A2349D70}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{676653C3-236E-4A81-9979-1541A2349D70}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{676653C3-236E-4A81-9979-1541A2349D70}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -105,6 +111,7 @@ Global
 		{7B881968-1527-40FC-9FB3-85A5A01BEE88} = {7C1CE274-810E-467E-B8EF-4AB2A83E17F9}
 		{DEC2223C-6DD4-48EF-9438-8F4E97B6C542} = {7C1CE274-810E-467E-B8EF-4AB2A83E17F9}
 		{B5AC984E-8B51-426B-9F54-CC85006449F1} = {7C1CE274-810E-467E-B8EF-4AB2A83E17F9}
+		{676653C3-236E-4A81-9979-1541A2349D70} = {7C1CE274-810E-467E-B8EF-4AB2A83E17F9}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {1478B48A-1088-4408-9427-E3B4EADB515C}

diff --git a/Source/1.5/AnimationMod/AnimDef.cs b/Source/1.5/AnimationMod/AnimDef.cs
@@ -120,7 +120,9 @@ public AnimData Data
         get
         {
             if (resolvedData == null)
+            {
                 ResolveData();
+            }
 
             return resolvedData;
         }
@@ -130,7 +132,9 @@ public AnimData DataNonLethal
         get
         {
             if (resolvedData == null)
+            {
                 ResolveData();
+            }
 
             return resolvedNonLethalData ?? resolvedData;
         }