From 98eb66719254285a71897c5b2445029263e364b7 Mon Sep 17 00:00:00 2001 From: LokiVKlokeNaAndoke Date: Sun, 23 Oct 2022 13:36:24 +0300 Subject: [PATCH] Fix thing --- 1.4/Assemblies/AutoPriorities.dll | Bin 62976 -> 63488 bytes .../1.4/FluffyWorktabPatch.dll | Bin 5120 -> 5120 bytes .../AutoPriorities/Core/Controller.cs | 20 +++++++++--------- .../DirtyPawnsNotifyRebuildPawnsTable.cs | 16 +++++++++++++- .../AutoPriorities/Ui/PrioritiesTabArtisan.cs | 6 +++++- 5 files changed, 30 insertions(+), 12 deletions(-) diff --git a/1.4/Assemblies/AutoPriorities.dll b/1.4/Assemblies/AutoPriorities.dll index 3f57c3862864029d9bfc898617422aff299670a1..b3662f07a0af5c40067712c64b9eff9f736c7e53 100644 GIT binary patch delta 26111 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 LiEq`KD%<}9xZm+v delta 25858 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 m.PackageId == packageId)) return; - _logger?.Info($"Patching for: {packageId}"); + logger?.Info($"Patching for: {packageId}"); var asm = Assembly.LoadFile( Path.Combine(ModContentPack.RootDir, Path.Combine("ConditionalAssemblies/1.4/", patchName))); @@ -68,16 +68,16 @@ private static AutoPrioritiesDialog CreateDialog() var savePath = GetSaveLocation(); var worldInfo = new WorldInfoRetriever.WorldInfoRetriever(); - var logger = _logger!; - var worldFacade = new WorldInfoFacade(worldInfo, logger); - var stringSerializer = new PawnDataStringSerializer(logger, worldFacade); + var log = Controller.logger!; + var worldFacade = new WorldInfoFacade(worldInfo, log); + var stringSerializer = new PawnDataStringSerializer(log, worldFacade); var mapSpecificSerializer = new MapSpecificDataPawnsDataSerializer(worldInfo, stringSerializer); - pawnData = new PawnsDataBuilder(mapSpecificSerializer, worldInfo, logger).Build(); + pawnData = new PawnsDataBuilder(mapSpecificSerializer, worldInfo, log).Build(); var importantWorkTypes = new ImportantJobsProvider(worldFacade); - var priorityAssigner = new PrioritiesAssigner(pawnData, logger, importantWorkTypes); - var pawnDataExporter = new PawnDataExporter(logger, savePath, pawnData, stringSerializer); + var priorityAssigner = new PrioritiesAssigner(pawnData, log, importantWorkTypes); + var pawnDataExporter = new PawnDataExporter(log, savePath, pawnData, stringSerializer); - return new AutoPrioritiesDialog(pawnData, priorityAssigner, logger, importantWorkTypes, pawnDataExporter); + return new AutoPrioritiesDialog(pawnData, priorityAssigner, log, importantWorkTypes, pawnDataExporter); } } } diff --git a/Source/AutoPriorities/AutoPriorities/HarmonyPatches/DirtyPawnsNotifyRebuildPawnsTable.cs b/Source/AutoPriorities/AutoPriorities/HarmonyPatches/DirtyPawnsNotifyRebuildPawnsTable.cs index 5bcfa50..32a7430 100644 --- a/Source/AutoPriorities/AutoPriorities/HarmonyPatches/DirtyPawnsNotifyRebuildPawnsTable.cs +++ b/Source/AutoPriorities/AutoPriorities/HarmonyPatches/DirtyPawnsNotifyRebuildPawnsTable.cs @@ -1,4 +1,5 @@ using AutoPriorities.Core; +using AutoPriorities.Ui; using HarmonyLib; using RimWorld; using Verse; @@ -14,7 +15,20 @@ public static class DirtyPawnsNotifyRebuildPawnsTable // ReSharper disable once UnusedMember.Local private static void Postfix() { - Controller.pawnData?.Rebuild(); + var windowStack = Find.WindowStack; + if (windowStack.WindowOfType() is not null) + { +#if DEBUG + Controller.logger?.Info("Rebuild by notification"); +#endif + Controller.pawnData?.Rebuild(); + } + else + { +#if DEBUG + Controller.logger?.Info("Rebuild by notification: auto priority window not found"); +#endif + } } } } diff --git a/Source/AutoPriorities/AutoPriorities/Ui/PrioritiesTabArtisan.cs b/Source/AutoPriorities/AutoPriorities/Ui/PrioritiesTabArtisan.cs index e309b8b..fbefd89 100644 --- a/Source/AutoPriorities/AutoPriorities/Ui/PrioritiesTabArtisan.cs +++ b/Source/AutoPriorities/AutoPriorities/Ui/PrioritiesTabArtisan.cs @@ -201,8 +201,12 @@ private void DrawWorkListForPriority(WorkTableEntry pr, Rect slidersRect) try { var currentPercent = pr.WorkTypes[workType]; - var numberColonists = _pawnsData.NumberColonists(workType); + if (currentPercent.Variant == PercentVariant.Number) + { + currentPercent = TablePercent.Number(numberColonists, currentPercent.NumberCount); + } + float elementXPos; Rect labelRect; double available;