Merge pull request #59 from RimNauts/main

Fix expanded icons hiding too early
RimNauts · Mar 28, 2023 · 2581e60 · 2581e60
2 parents a21805b + 0b7050a
commit 2581e60
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 1 deletion.
diff --git a/Assemblies/RimNauts2.dll b/Assemblies/RimNauts2.dll
diff --git a/README.md b/README.md
@@ -1 +1,2 @@
 # RimNauts2
+- Fix expanded icons hiding too early
diff --git a/Source/RimNauts2/RimNauts2/Constants.cs b/Source/RimNauts2/RimNauts2/Constants.cs
@@ -1,7 +1,7 @@
 namespace RimNauts2 {
     public static class Info {
         public static readonly string name = "RimNauts 2";
-        public static readonly string version = "4.14.3";
+        public static readonly string version = "4.14.4";
     }
 
     public static class Style {

diff --git a/Source/RimNauts2/RimNauts2/Defs/Of.cs b/Source/RimNauts2/RimNauts2/Defs/Of.cs
@@ -17,6 +17,7 @@ public class General : Def {
         public float drag_velocity_multiplier = 0.50f;
         public float zoom_sensitivity_multiplier = 0.75f;
         public float altitude_hide_labels_multiplier = 0.50f;
+        public float zoom_enum_multiplier = 0.20f;
         public List<string> allowed_incidents;
         public string space_station_wall;
         public string space_station_floor;

diff --git a/Source/RimNauts2/RimNauts2/World/Patch/CameraDriver.cs b/Source/RimNauts2/RimNauts2/World/Patch/CameraDriver.cs
@@ -141,4 +141,21 @@ public static bool Prefix(ref float __result) {
             return false;
         }
     }
+
+    [HarmonyPatch(typeof(RimWorld.Planet.WorldCameraDriver), "CurrentZoom", MethodType.Getter)]
+    class WorldCameraDriver_CurrentZoom {
+        public static bool Prefix(ref RimWorld.Planet.WorldCameraDriver __instance, ref RimWorld.Planet.WorldCameraZoomRange __result) {
+            float altitudePercent = __instance.AltitudePercent;
+            if ((double) altitudePercent < 0.025 * Defs.Of.general.zoom_enum_multiplier) {
+                __result = RimWorld.Planet.WorldCameraZoomRange.VeryClose;
+                return false;
+            }
+            if ((double) altitudePercent < 0.042 * Defs.Of.general.zoom_enum_multiplier) {
+                __result = RimWorld.Planet.WorldCameraZoomRange.Close;
+                return false;
+            }
+            __result = (double) altitudePercent < (0.125 * Defs.Of.general.zoom_enum_multiplier) ? RimWorld.Planet.WorldCameraZoomRange.Far : RimWorld.Planet.WorldCameraZoomRange.VeryFar;
+            return false;
+        }
+    }
 }