From c8f7530cfe7a9e688dc3da8148813ba3d92737b2 Mon Sep 17 00:00:00 2001 From: c0ffee Date: Sun, 7 Aug 2022 13:42:15 -0700 Subject: [PATCH] order by string name --- 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 ff335972a9283e4f0f183176fbeacbcede22a3d9..9ab1ff9452654b9f5dcb0484761f6a9891338387 100644 GIT binary patch delta 6572 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 Wc}Yh9iNy>_`lnx}kfeV*Yx^HmRz}YN delta 6635 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 FzX4L@Q|ABx diff --git a/1.3/Source/MainTabWindows/MainTabWindow_OffsetConfigure.cs b/1.3/Source/MainTabWindows/MainTabWindow_OffsetConfigure.cs index dd84be0..cb5ff46 100644 --- a/1.3/Source/MainTabWindows/MainTabWindow_OffsetConfigure.cs +++ b/1.3/Source/MainTabWindows/MainTabWindow_OffsetConfigure.cs @@ -51,7 +51,7 @@ namespace Rimworld_Animations { AnimationSettings.rotation.Add(def.defName + curPawn.def.defName + bodyTypeDef + ActorIndex, 0); } - List pawnsToAnimateOrdered = curPawn.TryGetComp().actorsInCurrentAnimation.OrderBy(x => x.Name).ToList(); + List pawnsToAnimateOrdered = curPawn.TryGetComp().actorsInCurrentAnimation.OrderBy(x => x.Name.ToStringSafe()).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 dc6786c..5c40a28 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 => x.Name).ToList(); + List pawnsToAnimateOrdered = pawnsToAnimate.OrderBy(x => x.Name.ToStringSafe()).ToList(); string pawnNamesAndSexType = ""; foreach (Pawn p in pawnsToAnimateOrdered)