v3.0.1 fixes corpses disappear (configurable now) and an index error

pardeike · May 12, 2024 · 7e459ca · 7e459ca
1 parent 943e279
commit 7e459ca
Show file tree

Hide file tree

Showing 16 changed files with 49 additions and 15 deletions.
diff --git a/1.5/Assemblies/CameraPlus.dll b/1.5/Assemblies/CameraPlus.dll
diff --git a/About/About.xml b/About/About.xml
@@ -19,7 +19,7 @@
     </li>
   </modDependencies>
   <packageId>brrainz.cameraplus</packageId>
-  <modVersion>3.0.0.0</modVersion>
+  <modVersion>3.0.1.0</modVersion>
   <steamAppId>867467808</steamAppId>
   <url>https://github.com/pardeike/CameraPlus</url>
   <description>You want more zoom and different paning?

diff --git a/About/Manifest.xml b/About/Manifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <Manifest>
   <identifier>net.pardeike.rimworld.mod.cameraplus</identifier>
-  <version>3.0.0.0</version>
+  <version>3.0.1.0</version>
   <targetVersions>
     <li>1.0.0</li>
     <li>1.1.0</li>

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,9 +1,9 @@
 <Project>
-    <PropertyGroup>
-        <ModName>Camera+</ModName>
-        <ModFileName>CameraPlus</ModFileName>
-        <Repository>https://github.com/pardeike/CameraPlus</Repository>
-        <ModVersion>3.0.0.0</ModVersion>
-        <ProjectGuid>{AC5EE7A1-16EA-498D-B21A-83ACF78F0E5A}</ProjectGuid>
-    </PropertyGroup>
+	<PropertyGroup>
+		<ModName>Camera+</ModName>
+		<ModFileName>CameraPlus</ModFileName>
+		<Repository>https://github.com/pardeike/CameraPlus</Repository>
+		<ModVersion>3.0.1.0</ModVersion>
+		<ProjectGuid>{AC5EE7A1-16EA-498D-B21A-83ACF78F0E5A}</ProjectGuid>
+	</PropertyGroup>
 </Project>
diff --git a/Languages/ChineseSimplified/Keyed/Text.xml b/Languages/ChineseSimplified/Keyed/Text.xml
@@ -19,6 +19,7 @@
 	<Pixel>像素</Pixel>
 	<HidePawnLabelBelow>隐藏的小人标签：</HidePawnLabelBelow>
 	<HideThingLabelBelow>隐藏的堆叠标签：</HideThingLabelBelow>
+	<HideDeadPawnsBelow>隐藏下方的死亡棋子: </HideDeadPawnsBelow>
 	<ShowMarkerBelow>显示的标记：</ShowMarkerBelow>
 	<DotStyle>点样式</DotStyle>
 	<VanillaDefault>原版默认</VanillaDefault>

diff --git a/Languages/ChineseTraditional/Keyed/Text.xml b/Languages/ChineseTraditional/Keyed/Text.xml
@@ -19,6 +19,7 @@
 	<Pixel>像素</Pixel>
 	<HidePawnLabelBelow>隱藏的小人標籤：</HidePawnLabelBelow>
 	<HideThingLabelBelow>隱藏的堆疊標籤：</HideThingLabelBelow>
+	<HideDeadPawnsBelow>隱藏下方的死亡棋子: </HideDeadPawnsBelow>
 	<ShowMarkerBelow>顯示的標記：</ShowMarkerBelow>
 	<DotStyle>點樣式</DotStyle>
 	<VanillaDefault>原版默認</VanillaDefault>

diff --git a/Languages/English/Keyed/Text.xml b/Languages/English/Keyed/Text.xml
@@ -19,6 +19,7 @@
 	<Pixel>Pixel</Pixel>
 	<HidePawnLabelBelow>Hide pawn labels below: </HidePawnLabelBelow>
 	<HideThingLabelBelow>Hide stack labels below: </HideThingLabelBelow>
+	<HideDeadPawnsBelow>Hide dead pawns below: </HideDeadPawnsBelow>
 	<ShowMarkerBelow>Show as marker below: </ShowMarkerBelow>
 	<DotStyle>Dot Style</DotStyle>
 	<VanillaDefault>Vanilla default</VanillaDefault>

diff --git a/Languages/French/Keyed/Text.xml b/Languages/French/Keyed/Text.xml
@@ -20,6 +20,7 @@
 	<Pixel>Pixel</Pixel>
 	<HidePawnLabelBelow>Masquer les étiquettes de personnages ci-dessous: </HidePawnLabelBelow>
 	<HideThingLabelBelow>Masquer les étiquettes de stockage ci-dessous: </HideThingLabelBelow>
+	<HideDeadPawnsBelow>Masquer les pions morts ci-dessous : </HideDeadPawnsBelow>
 	<ShowMarkerBelow>Afficher comme marqueur ci-dessous: </ShowMarkerBelow>
 	<DotStyle>Style de point</DotStyle>
 	<VanillaDefault>Défaut vanille</VanillaDefault>

diff --git a/Languages/German/Keyed/Text.xml b/Languages/German/Keyed/Text.xml
@@ -19,6 +19,7 @@
 	<Pixel>Pixel</Pixel>
 	<HidePawnLabelBelow>Labels von Spielfiguren verstecken, wenn kleiner als: </HidePawnLabelBelow>
 	<HideThingLabelBelow>Labels von Objekten verstecken, wenn kleiner als: </HideThingLabelBelow>
+	<HideDeadPawnsBelow>Verstecke tote Spielfiguren unten: </HideDeadPawnsBelow>
 	<ShowMarkerBelow>Spielfiguren als Marker darstellen, wenn kleiner als: </ShowMarkerBelow>
 	<DotStyle>Punktstil</DotStyle>
 	<VanillaDefault>Vanilla-Standard</VanillaDefault>

diff --git a/Languages/Japanese/Keyed/Text.xml b/Languages/Japanese/Keyed/Text.xml
@@ -19,6 +19,7 @@
 	<Pixel>ピクセル</Pixel>
 	<HidePawnLabelBelow>以下にポーン名を非表示にします： </HidePawnLabelBelow>
 	<HideThingLabelBelow>以下にモノのラベルを非表示にします： </HideThingLabelBelow>
+	<HideDeadPawnsBelow>以下の死んだポーンを隠す: </HideDeadPawnsBelow>
 	<ShowMarkerBelow>マーカーとして表示： </ShowMarkerBelow>
 	<DotStyle>ドットスタイル</DotStyle>
 	<VanillaDefault>バニラデフォルト</VanillaDefault>

diff --git a/Languages/Russian/Keyed/Text.xml b/Languages/Russian/Keyed/Text.xml
@@ -19,6 +19,7 @@
 	<Pixel>Пиксель</Pixel>
 	<HidePawnLabelBelow>Скрыть метки пешек ниже:</HidePawnLabelBelow>
 	<HideThingLabelBelow>Скрыть метки стека ниже:</HideThingLabelBelow>
+	<HideDeadPawnsBelow>Скрыть мертвые пешки ниже: </HideDeadPawnsBelow>
 	<ShowMarkerBelow>Показать как маркер ниже:</ShowMarkerBelow>
 	<DotStyle>Стиль точек</DotStyle>
 	<VanillaDefault>Стандарт Vanilla</VanillaDefault>

diff --git a/Languages/Spanish/Keyed/Text.xml b/Languages/Spanish/Keyed/Text.xml
@@ -20,6 +20,7 @@
 	<Pixel>Píxel</Pixel>
 	<HidePawnLabelBelow>Ocultar las etiquetas de los peones a continuación: </HidePawnLabelBelow>
 	<HideThingLabelBelow>Ocultar cosa etiquetas a continuación: </HideThingLabelBelow>
+	<HideDeadPawnsBelow>Ocultar peones muertos debajo: </HideDeadPawnsBelow>
 	<ShowMarkerBelow>Mostrar como círculo a continuación: </ShowMarkerBelow>
 	<DotStyle>Estilo de punto</DotStyle>
 	<VanillaDefault>Por defecto de vainilla</VanillaDefault>

diff --git a/Languages/SpanishLatin/Keyed/Text.xml b/Languages/SpanishLatin/Keyed/Text.xml
@@ -20,6 +20,7 @@
 	<Pixel>Píxel</Pixel>
 	<HidePawnLabelBelow>Ocultar las etiquetas de los peones a continuación: </HidePawnLabelBelow>
 	<HideThingLabelBelow>Ocultar cosa etiquetas a continuación: </HideThingLabelBelow>
+	<HideDeadPawnsBelow>Ocultar peones muertos debajo: </HideDeadPawnsBelow>
 	<ShowMarkerBelow>Mostrar como círculo a continuación: </ShowMarkerBelow>
 	<DotStyle>Estilo de punto</DotStyle>
 	<VanillaDefault>Por defecto de vainilla</VanillaDefault>

diff --git a/Source/Main.cs b/Source/Main.cs
@@ -129,6 +129,10 @@ public static bool Prefix(Pawn ___pawn)
 		{
 			if (skipCustomRendering)
 				return true;
+
+			if (___pawn.Dead)
+				return FastUI.CurUICellSize > Settings.hideDeadPawnsBelow;
+
 			return Tools.ShouldShowMarker(___pawn, true) == false;
 		}
 	}
@@ -145,6 +149,18 @@ public static bool Prefix(object obj)
 		}
 	}
 
+	[HarmonyPatch(typeof(OverlayDrawer), nameof(OverlayDrawer.RenderForbiddenOverlay))]
+	static class DrawAllOverlaysPatch
+	{
+		[HarmonyPriority(10000)]
+		public static bool Prefix(Thing t)
+		{
+			if (t is not Corpse)
+				return true;
+			return FastUI.CurUICellSize > Settings.hideDeadPawnsBelow;
+		}
+	}
+
 	[HarmonyPatch(typeof(PawnUIOverlay), nameof(PawnUIOverlay.DrawPawnGUIOverlay))]
 	static class PawnUIOverlay_DrawPawnGUIOverlay_Patch
 	{
@@ -154,6 +170,9 @@ public static bool Prefix(Pawn ___pawn)
 			if (skipCustomRendering)
 				return true;
 
+			if (___pawn.Dead)
+				return FastUI.CurUICellSize > Settings.hideDeadPawnsBelow;
+
 			if (Tools.GetMarkerColors(___pawn, out _, out _) == false)
 				return true;
 

diff --git a/Source/Settings.cs b/Source/Settings.cs
@@ -25,6 +25,7 @@ public class CameraPlusSettings : ModSettings
 		public int dotSize = 9;
 		public int hidePawnLabelBelow = 9;
 		public int hideThingLabelBelow = 32;
+		public int hideDeadPawnsBelow = 9;
 		public bool mouseOverShowsLabels = true;
 		public bool edgeIndicators = true;
 		public LabelStyle customNameStyle = LabelStyle.AnimalsDifferent;
@@ -86,6 +87,7 @@ public override void ExposeData()
 			Scribe_Values.Look(ref dotSize, "dotSize", defaults.dotSize);
 			Scribe_Values.Look(ref hidePawnLabelBelow, "hidePawnLabelBelow", defaults.hidePawnLabelBelow);
 			Scribe_Values.Look(ref hideThingLabelBelow, "hideThingLabelBelow", defaults.hideThingLabelBelow);
+			Scribe_Values.Look(ref hideDeadPawnsBelow, "hideDeadPawnsBelow", defaults.hideDeadPawnsBelow);
 			Scribe_Values.Look(ref mouseOverShowsLabels, "mouseOverShowsLabels", defaults.mouseOverShowsLabels);
 			Scribe_Values.Look(ref edgeIndicators, "edgeIndicators", defaults.edgeIndicators);
 			Scribe_Values.Look(ref customNameStyle, "customNameStyle", defaults.customNameStyle);
@@ -225,11 +227,10 @@ public void DoWindowContents(Rect inRect)
 				list.Gap(4f);
 
 				var pixel = "Pixel".Translate();
-				var label1 = "HidePawnLabelBelow".Translate();
-				list.Slider(ref hidePawnLabelBelow, 0, 128, () => label1 + (hidePawnLabelBelow == 0 ? "Never".Translate() : hidePawnLabelBelow + " " + pixel));
-				var label2 = "HideThingLabelBelow".Translate();
-				list.Slider(ref hideThingLabelBelow, 0, 128, () => label2 + (hideThingLabelBelow == 0 ? "Never".Translate() : hideThingLabelBelow + " " + pixel));
-				list.Slider(ref dotSize, 1, 32, () => "ShowMarkerBelow".Translate() + dotSize + " " + "Pixel".Translate());
+				list.Slider(ref hidePawnLabelBelow, 0, 64, () => "HidePawnLabelBelow".Translate() + (hidePawnLabelBelow == 0 ? "Never".Translate() : hidePawnLabelBelow + " " + pixel));
+				list.Slider(ref hideThingLabelBelow, 0, 64, () => "HideThingLabelBelow".Translate() + (hideThingLabelBelow == 0 ? "Never".Translate() : hideThingLabelBelow + " " + pixel));
+				list.Slider(ref hideDeadPawnsBelow, 0, 64, () => "HideDeadPawnsBelow".Translate() + (hideDeadPawnsBelow == 0 ? "Never".Translate() : hideDeadPawnsBelow + " " + pixel));
+				list.Slider(ref dotSize, 1, 64, () => "ShowMarkerBelow".Translate() + dotSize + " " + "Pixel".Translate());
 
 				list.Gap(12f);
 

diff --git a/Source/Tools.cs b/Source/Tools.cs
@@ -154,9 +154,14 @@ public static Color GetMainColor(Pawn pawn)
 					.OrderByDescending(group => group.Count())
 					.Select(group => (color: group.Key, hsl: HSL(group.Key), count: group.Count()))
 					.ToArray();
+				if (combinedColors.Length == 0)
+				{
+					color = Color.clear;
+					goto SET_COLOR;
+				}
 
 				var colorIndex = combinedColors.FirstIndexOf(tuple => tuple.hsl.s > 0.2 && tuple.hsl.l < 0.8 && tuple.hsl.l > 0.2);
-				if (colorIndex == 1 && combinedColors[0].hsl.s < 0.2)
+				if (combinedColors.Length > 0 && colorIndex == 1 && combinedColors[0].hsl.s < 0.2)
 					color = combinedColors[1].color;
 				else
 					color = combinedColors[0].color;