Release 23

Epicguru · Jun 22, 2024 · 043ab0f · 043ab0f
2 parents f563155 + ea5fdf7
commit 043ab0f
Show file tree

Hide file tree

Showing 17 changed files with 82 additions and 55 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -0,0 +1,18 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
+
+version: 2
+updates:
+  - package-ecosystem: "github-actions" # See documentation for possible values
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "weekly"
+    target-branch: "develop"
+
+  - package-ecosystem: "nuget" # See documentation for possible values
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "daily"
+    target-branch: "develop"
diff --git a/Source/1.5/AMRetextureSupport/AMRetextureSupport.csproj b/Source/1.5/AMRetextureSupport/AMRetextureSupport.csproj
@@ -18,7 +18,7 @@
 	    <PrivateAssets>all</PrivateAssets>
 	    <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 	  </PackageReference>
-    <PackageReference Include="Krafs.Rimworld.Ref" Version="1.5.4085" />
+    <PackageReference Include="Krafs.Rimworld.Ref" Version="1.5.4104" />
   </ItemGroup>
 
 	<ItemGroup>

diff --git a/Source/1.5/AlienRacesPatch/AlienRacesPatch.csproj b/Source/1.5/AlienRacesPatch/AlienRacesPatch.csproj
@@ -12,7 +12,7 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-	  <PackageReference Include="Krafs.Rimworld.Ref" Version="1.5.4085" />
+	  <PackageReference Include="Krafs.Rimworld.Ref" Version="1.5.4104" />
 	</ItemGroup>
 
 	<ItemGroup>

diff --git a/Source/1.5/AnimationMod/AnimationMod.csproj b/Source/1.5/AnimationMod/AnimationMod.csproj
@@ -32,7 +32,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Krafs.Rimworld.Ref" Version="1.5.4085" />
+    <PackageReference Include="Krafs.Rimworld.Ref" Version="1.5.4104" />
     <PackageReference Include="Portable.Meta.Numerics" Version="3.1.0.73149" />
 	  <ProjectReference Include="..\AMRetextureSupport\AMRetextureSupport.csproj" />
 	  <ProjectReference Include="..\ModRequestAPI\ModRequestAPI.csproj" />

diff --git a/Source/1.5/AnimationMod/Idle/IdleControllerComp.cs b/Source/1.5/AnimationMod/Idle/IdleControllerComp.cs
@@ -437,6 +437,13 @@ public virtual void NotifyPawnDidMeleeAttack(Thing target, Verb_MeleeAttack verb
         // Check valid state.
         var pawn = parent as Pawn;
         var weapon = GetMeleeWeapon();
+
+        // If there is no weapon, and Fists of Fury is not active, then don't play an attack animation.
+        if (weapon == null && !Core.IsFistsOfFuryActive)
+        {
+            return;
+        }
+
         var rot = pawn.Rotation;
         var anims = GetAttackAnimationsFor(pawn, weapon, out bool allowPauseEver);
         if (anims == null || anims.Count == 0)

diff --git a/Source/1.5/AnimationMod/Outcome/OutcomeUtility.cs b/Source/1.5/AnimationMod/Outcome/OutcomeUtility.cs
@@ -418,7 +418,7 @@ private static bool Failure(Pawn attacker, Pawn target, in AdditionalArgs _)
 
     private static bool IsDeathless(Pawn pawn)
     {
-        return pawn.genes?.HasGene(GeneDefOf.Deathless) ?? false;
+        return pawn.genes?.HasActiveGene(GeneDefOf.Deathless) ?? false;
     }
 
     private static bool Kill(Pawn killer, Pawn pawn, in AdditionalArgs args)

diff --git a/Source/1.5/AnimationMod/Patches/Patch_PawnRenderTree_ParallelPreDraw.cs b/Source/1.5/AnimationMod/Patches/Patch_PawnRenderTree_ParallelPreDraw.cs
@@ -0,0 +1,41 @@
+using HarmonyLib;
+using Verse;
+
+namespace AM.Patches;
+
+/// <summary>
+/// This patch is only used to prevent pawns from rendering as invisible when they are in the portrait.
+/// </summary>
+[HarmonyPatch(typeof(PawnRenderTree), nameof(PawnRenderTree.ParallelPreDraw))]
+public class Patch_PawnRenderTree_ParallelPreDraw
+{
+    [HarmonyPriority(Priority.First)]
+    public static void Prefix(PawnDrawParms parms, ref State __state)
+    {
+        if (!parms.flags.HasFlag(PawnRenderFlags.Portrait))
+        {
+            __state = default;
+            return;
+        }
+
+        if (!Patch_InvisibilityUtility_IsPsychologicallyInvisible.IsRendering)
+        {
+            __state.DidChangeIsRenderingToTrue = true;
+            Patch_InvisibilityUtility_IsPsychologicallyInvisible.IsRendering = true;
+        }
+    }
+
+    [HarmonyPriority(Priority.First)]
+    public static void Postfix(ref State __state)
+    {
+        if (__state.DidChangeIsRenderingToTrue)
+        {
+            Patch_InvisibilityUtility_IsPsychologicallyInvisible.IsRendering = false;
+        }
+    }
+
+    public struct State
+    {
+        public bool DidChangeIsRenderingToTrue;
+    }
+}
diff --git a/Source/1.5/CAI5000Patch/CAI5000Patch.csproj b/Source/1.5/CAI5000Patch/CAI5000Patch.csproj
@@ -29,7 +29,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Krafs.Rimworld.Ref" Version="1.5.4085" />
+    <PackageReference Include="Krafs.Rimworld.Ref" Version="1.5.4104" />
     <Publicize Include="CombatAI" />
   </ItemGroup>
 

diff --git a/Source/1.5/CombatExtendedPatch/CombatExtendedPatch.csproj b/Source/1.5/CombatExtendedPatch/CombatExtendedPatch.csproj
@@ -30,7 +30,7 @@
       <Private>False</Private>
       <ExcludeAssets>all</ExcludeAssets>
     </ProjectReference>
-    <PackageReference Include="Krafs.Rimworld.Ref" Version="1.5.4085" />
+    <PackageReference Include="Krafs.Rimworld.Ref" Version="1.5.4104" />
     <Publicize Include="CombatExtended" />
   </ItemGroup>
 

diff --git a/Source/1.5/FacialAnimationPatch/FacialAnimationPatch.csproj b/Source/1.5/FacialAnimationPatch/FacialAnimationPatch.csproj
@@ -12,7 +12,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Krafs.Rimworld.Ref" Version="1.5.4085" />
+    <PackageReference Include="Krafs.Rimworld.Ref" Version="1.5.4104" />
     <PackageReference Include="Lib.Harmony" Version="2.3.3">
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>

diff --git a/Source/1.5/FacialAnimationPatch/PatchCore.cs b/Source/1.5/FacialAnimationPatch/PatchCore.cs
@@ -4,6 +4,11 @@
 
 namespace AM.FacialAnimationPatch;
 
+/// <summary>
+/// Note to future maintainers: This patch assembly currently does nothing, it
+/// used to have some Harmony patches, now they are no longer required.
+/// Removing the patch csproj, and doing the build pipeline changes required would be annoying, so I'm keeping it.
+/// </summary>
 [UsedImplicitly]
 [HotSwapAll]
 public sealed class PatchCore : Mod

diff --git a/Source/1.5/FacialAnimationPatch/Patch_DrawFaceGraphicsComp_CompRenderNodes.cs b/Source/1.5/FacialAnimationPatch/Patch_DrawFaceGraphicsComp_CompRenderNodes.cs
diff --git a/Source/1.5/FacialAnimationPatch/refs/FacialAnimation.dll b/Source/1.5/FacialAnimationPatch/refs/FacialAnimation.dll
diff --git a/Source/1.5/LightsaberPatch/LightsaberPatch.csproj b/Source/1.5/LightsaberPatch/LightsaberPatch.csproj
@@ -20,7 +20,7 @@
       <Private>False</Private>
       <ExcludeAssets>all</ExcludeAssets>
     </ProjectReference>
-    <PackageReference Include="Krafs.Rimworld.Ref" Version="1.5.4085" />
+    <PackageReference Include="Krafs.Rimworld.Ref" Version="1.5.4104" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Source/1.5/ModRequestAPI/ModRequestAPI.csproj b/Source/1.5/ModRequestAPI/ModRequestAPI.csproj
@@ -11,7 +11,7 @@
   </PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Krafs.Rimworld.Ref" Version="1.5.4085" />
+		<PackageReference Include="Krafs.Rimworld.Ref" Version="1.5.4104" />
 		<PackageReference Include="Unity.Newtonsoft.Json" Version="7.0.0" />
 	</ItemGroup>
 

diff --git a/Source/1.5/PerformanceOptimizerPatch/PerformanceOptimizerPatch.csproj b/Source/1.5/PerformanceOptimizerPatch/PerformanceOptimizerPatch.csproj
@@ -31,7 +31,7 @@
       <ExcludeAssets>all</ExcludeAssets>
     </ProjectReference>
     <Publicize Include="PerformanceOptimizer" />
-    <PackageReference Include="Krafs.Rimworld.Ref" Version="1.5.4085" />
+    <PackageReference Include="Krafs.Rimworld.Ref" Version="1.5.4104" />
   </ItemGroup>
 
   	<ItemGroup>

diff --git a/Source/1.5/TacticowlPatch/TacticowlPatch.csproj b/Source/1.5/TacticowlPatch/TacticowlPatch.csproj
@@ -20,7 +20,7 @@
       <Private>False</Private>
       <ExcludeAssets>all</ExcludeAssets>
     </ProjectReference>
-    <PackageReference Include="Krafs.Rimworld.Ref" Version="1.5.4085" />
+    <PackageReference Include="Krafs.Rimworld.Ref" Version="1.5.4104" />
   </ItemGroup>
 
   <ItemGroup>