v2.2.3 minor improvements

pardeike · Feb 24, 2022 · a0f8187 · a0f8187
1 parent 8c142ce
commit a0f8187
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 14 deletions.
diff --git a/1.3/Assemblies/CameraPlus.dll b/1.3/Assemblies/CameraPlus.dll
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>2.2.2.0</version>
+  <version>2.2.3.0</version>
   <targetVersions>
     <li>1.0.0</li>
     <li>1.1.0</li>

diff --git a/Source/CameraPlus.csproj b/Source/CameraPlus.csproj
@@ -10,7 +10,7 @@
 		<OutputPath>..\1.3\Assemblies\</OutputPath>
 		<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
 		<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-		<Version>2.2.2.0</Version>
+		<Version>2.2.3.0</Version>
 		<Copyright>Copyright Andreas Pardeike</Copyright>
 	</PropertyGroup>
 

diff --git a/Source/Main.cs b/Source/Main.cs
@@ -282,21 +282,25 @@ static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> inst
 	[HarmonyPatch(typeof(CameraDriver), nameof(CameraDriver.CurrentZoom), MethodType.Getter)]
 	static class CameraDriver_CurrentZoom_Patch
 	{
-		public static bool Prefix(ref CameraZoomRange __result, float ___rootSize)
-		{
-			// these values are from vanilla
-			// we remap them to the range 30 - 60
-			var sizes = new[] { 12f, 13.8f, 42f, 57f }
+		// these values are from vanilla
+		// we remap them to the range 30 - 60
+		static readonly float[] sizes = new[] { 12f, 13.8f, 42f, 57f }
 				.Select(f => Tools.LerpDoubleSafe(12, 57, 30, 60, f))
 				.ToArray();
 
-			__result = CameraZoomRange.Furthest;
-			for (var i = 0; i < 4; i++)
-				if (Tools.LerpRootSize(___rootSize) < sizes[i])
-				{
-					__result = (CameraZoomRange)i;
-					break;
-				}
+		public static bool Prefix(ref CameraZoomRange __result, float ___rootSize)
+		{
+			var lerped = Tools.LerpRootSize(___rootSize);
+			if (lerped < sizes[0])
+				__result = CameraZoomRange.Closest;
+			else if (lerped < sizes[1])
+				__result = CameraZoomRange.Close;
+			else if (lerped < sizes[2])
+				__result = CameraZoomRange.Middle;
+			else if (lerped < sizes[3])
+				__result = CameraZoomRange.Far;
+			else
+				__result = CameraZoomRange.Furthest;
 			return false;
 		}
 	}