From 732a3034a3c460b77cfc0f5fe7ae0012b7e85f64 Mon Sep 17 00:00:00 2001 From: c0ffee Date: Sat, 6 Aug 2022 23:10:08 -0700 Subject: [PATCH] fixed pawn ordering bug --- 1.3/Assemblies/Rimworld-Animations.dll | Bin 60928 -> 60928 bytes .../MainTabWindow_OffsetConfigure.cs | 2 +- ...HarmonyPatch_JobDriver_SexBaseInitiator.cs | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/1.3/Assemblies/Rimworld-Animations.dll b/1.3/Assemblies/Rimworld-Animations.dll index f07cd8af19dfccdf12bb107793dfebcb3568e14f..ff335972a9283e4f0f183176fbeacbcede22a3d9 100644 GIT binary patch delta 7632 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 pawnsToAnimateOrdered = curPawn.TryGetComp().actorsInCurrentAnimation.OrderBy(x => Int32.Parse(x.Name.ToStringSafe())).ToList(); + List pawnsToAnimateOrdered = curPawn.TryGetComp().actorsInCurrentAnimation.OrderBy(x => x.Name).ToList(); string pawnNamesAndSexType = ""; foreach (Pawn p in pawnsToAnimateOrdered) diff --git a/1.3/Source/Patches/RJWPatches/JobDrivers/HarmonyPatch_JobDriver_SexBaseInitiator.cs b/1.3/Source/Patches/RJWPatches/JobDrivers/HarmonyPatch_JobDriver_SexBaseInitiator.cs index 33c6277..dc6786c 100644 --- a/1.3/Source/Patches/RJWPatches/JobDrivers/HarmonyPatch_JobDriver_SexBaseInitiator.cs +++ b/1.3/Source/Patches/RJWPatches/JobDrivers/HarmonyPatch_JobDriver_SexBaseInitiator.cs @@ -94,7 +94,7 @@ namespace Rimworld_Animations { pawnsToAnimate[i].TryGetComp().isAnimating = false; } - List pawnsToAnimateOrdered = pawnsToAnimate.OrderBy(x => Int32.Parse(x.Name.ToStringSafe())).ToList(); + List pawnsToAnimateOrdered = pawnsToAnimate.OrderBy(x => x.Name).ToList(); string pawnNamesAndSexType = ""; foreach (Pawn p in pawnsToAnimateOrdered)