Merge pull request #58 from RimNauts/main

Decrease minimum altitude
RimNauts · Mar 28, 2023 · c04bd23 · c04bd23
2 parents bf4c167 + 19fe430
commit c04bd23
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 2 deletions.
diff --git a/Assemblies/RimNauts2.dll b/Assemblies/RimNauts2.dll
diff --git a/Changelog.md b/Changelog.md
@@ -1 +1,2 @@
 # Changelog
+- Decrease minimum altitude allowing users to zoom in as much as possible
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.2";
+        public static readonly string version = "4.14.3";
     }
 
     public static class Style {

diff --git a/Source/RimNauts2/RimNauts2/Defs/Of.cs b/Source/RimNauts2/RimNauts2/Defs/Of.cs
@@ -11,6 +11,7 @@ public static class Of {
 
     public class General : Def {
         public float max_altitude = 1600.0f;
+        public float min_altitude = 80.0f;
         public float field_of_view = 40.0f;
         public float drag_sensitivity_multiplier = 0.50f;
         public float drag_velocity_multiplier = 0.50f;

diff --git a/Source/RimNauts2/RimNauts2/World/Patch/CameraDriver.cs b/Source/RimNauts2/RimNauts2/World/Patch/CameraDriver.cs
@@ -133,4 +133,12 @@ public static bool Prefix(ref RimWorld.Planet.WorldCameraDriver __instance) {
             return false;
         }
     }
+
+    [HarmonyPatch(typeof(RimWorld.Planet.WorldCameraDriver), "MinAltitude", MethodType.Getter)]
+    class WorldCameraDriver_MinAltitude {
+        public static bool Prefix(ref float __result) {
+            __result = (float) ((double) Defs.Of.general.min_altitude + (SteamDeck.IsSteamDeck ? 17.0 : 25.0));
+            return false;
+        }
+    }
 }
diff --git a/Source/RimNauts2/RimNauts2/World/Patch/HideIcons.cs b/Source/RimNauts2/RimNauts2/World/Patch/HideIcons.cs
@@ -37,7 +37,7 @@ public static bool check(Vector3 pos) {
             }
             Vector3 normalized = pos.normalized;
             float mag = pos.magnitude;
-            float min_alt = 125;
+            float min_alt = RimWorld.Planet.WorldCameraDriver.MinAltitude;
             float max_alt = Defs.Of.general.max_altitude;
             float alt = RenderingManager.altitude_percent * (max_alt - min_alt) + max_alt;
             bool hide = Vector3.Angle(normalized, RenderingManager.center) > (Math.Acos(115 / alt) + Math.Acos(115 / mag)) * (degree / 3.14d);