2.4.9

Touhma · Mar 10, 2022 · 9ad8361 · 9ad8361
1 parent 3adc37f
commit 9ad8361
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 8 deletions.
diff --git a/Bootstrap.cs b/Bootstrap.cs
@@ -15,7 +15,7 @@ public partial class GS2
     }
 
 
-    [BepInPlugin("dsp.galactic-scale.2", "Galactic Scale 2 Plug-In", "2.4.8")]
+    [BepInPlugin("dsp.galactic-scale.2", "Galactic Scale 2 Plug-In", "2.4.9")]
     [BepInDependency("space.customizing.console", BepInDependency.DependencyFlags.SoftDependency)]
     [BepInDependency("dsp.nebula-multiplayer-api", BepInDependency.DependencyFlags.SoftDependency)]
     public class Bootstrap : BaseUnityPlugin

diff --git a/GalacticScale3.csproj b/GalacticScale3.csproj
@@ -8,7 +8,7 @@
 	<PropertyGroup>
 		<AssemblyName>GalacticScale</AssemblyName>
 		<Description>Galaxy Customization for Dyson Sphere Program</Description>
-		<Version>2.4.8</Version>
+		<Version>2.4.9</Version>
 		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
 		<LangVersion>9.0</LangVersion>
 		<OutDir>bin/$(Configuration)</OutDir>

diff --git a/Package/README.md b/Package/README.md
@@ -1,4 +1,6 @@
 # DSP Galactic Scale 2.0 Mod
+- Version 2.4.9 - Fixed blueprints using extra space
+
 - Version 2.4.8 - Fixed Lava & Hurricane Themes missing rocks. Added hint text to galaxy select. Clamped solar power to 1-500%. Fixed GS2 Star Overrides not loading correctly. Fixed bug where planetdetail wouldnt close on game start.
 
 - Version 2.4.7 - Fixed Error when saving games with short names. Added configurable mouse tolerance for systemdisplay. Fixed Planet name text flickering in center of screen when clicked.

diff --git a/Scripts/Patches/BlueprintUtils/GetExtendedGratBox.cs b/Scripts/Patches/BlueprintUtils/GetExtendedGratBox.cs
@@ -9,7 +9,7 @@ public partial class PatchOnBlueprintUtils
         [HarmonyPatch(typeof(BlueprintUtils), "GetExtendedGratBox", typeof(BPGratBox), typeof(float))]
         public static bool GetExtendedGratBoxA(ref BPGratBox __result, BPGratBox gratbox, float extend_grid = 0.5f)
         {
-            var segments = GameMain.localPlanet.segment;
+            var segments = 4* Mathf.RoundToInt (GameMain.localPlanet.realRadius/4f);
             float longitudeRadPerGrid;
             if (gratbox.y * gratbox.w > 0f && gratbox.y > 0f)
             {
@@ -23,7 +23,15 @@ public static bool GetExtendedGratBoxA(ref BPGratBox __result, BPGratBox gratbox
             {
                 longitudeRadPerGrid = BlueprintUtils.GetLongitudeRadPerGrid(0f, segments);
             }
-            gratbox.Extend(longitudeRadPerGrid * extend_grid, BlueprintUtils.GetLatitudeRadPerGrid(200) * extend_grid);
+            GS2.Warn($"Gratbox Start : {gratbox.y} {gratbox.w} {gratbox.endLatitudeRad} {gratbox.endLongitudeRad} {gratbox.startLatitudeRad} {gratbox.startLongitudeRad}");
+            GS2.Warn($"Extending Gratbox {segments} {extend_grid} {BlueprintUtils.GetLatitudeRadPerGrid(segments) * extend_grid} {longitudeRadPerGrid}");
+            gratbox.Extend(longitudeRadPerGrid * extend_grid, BlueprintUtils.GetLatitudeRadPerGrid(segments) * extend_grid);
+            GS2.Warn($"Gratbox End: {gratbox.y} {gratbox.w} {gratbox.endLatitudeRad} {gratbox.endLongitudeRad} {gratbox.startLatitudeRad} {gratbox.startLongitudeRad}");
+       //     [Warning: GS2]   26:PatchOnBlueprintUtils | GetExtendedGratBoxA | Gratbox Start: -0.2777829 - 0.2777829 - 0.2777829 - 0.5456451 - 0.2777829 - 0.5456451
+       //  [Warning: GS2]   27:PatchOnBlueprintUtils | GetExtendedGratBoxA | Extending Gratbox 380 0.5 0.00165347 0.00330694
+       //[Warning: GS2]   29:PatchOnBlueprintUtils | GetExtendedGratBoxA | Gratbox End: -0.2794364 - 0.2761295 - 0.2761295 - 0.5439916 - 0.2794364 - 0.5472986
+
+
             __result = gratbox;
             return false;
         }
@@ -32,7 +40,8 @@ public static bool GetExtendedGratBoxA(ref BPGratBox __result, BPGratBox gratbox
         [HarmonyPatch(typeof(BlueprintUtils), "GetExtendedGratBox", typeof(BPGratBox), typeof(float), typeof(float))]
         public static bool GetExtendedGratBoxB(ref BPGratBox __result, BPGratBox gratbox, float extend_lng_grid = 0.5f, float extend_lat_grid = 0.5f)
         {
-            var segments = GameMain.localPlanet.segment;
+            //var segments = GameMain.localPlanet.segment;
+            var segments = 4 * Mathf.RoundToInt(GameMain.localPlanet.realRadius / 4f);
             float longitudeRadPerGrid;
             if (gratbox.y * gratbox.w > 0f && gratbox.y > 0f)
             {
@@ -46,7 +55,11 @@ public static bool GetExtendedGratBoxB(ref BPGratBox __result, BPGratBox gratbox
             {
                 longitudeRadPerGrid = BlueprintUtils.GetLongitudeRadPerGrid(0f, segments);
             }
-            gratbox.Extend(longitudeRadPerGrid * extend_lng_grid, BlueprintUtils.GetLatitudeRadPerGrid(200) * extend_lat_grid);
+            GS2.Warn($"BGratbox Start : {gratbox.y} {gratbox.w} {gratbox.endLatitudeRad} {gratbox.endLongitudeRad} {gratbox.startLatitudeRad} {gratbox.startLongitudeRad}");
+            GS2.Warn($"BExtending Gratbox {segments} {extend_lat_grid} {BlueprintUtils.GetLatitudeRadPerGrid(segments) * extend_lat_grid} {longitudeRadPerGrid}");
+            gratbox.Extend(longitudeRadPerGrid * extend_lng_grid, BlueprintUtils.GetLatitudeRadPerGrid(segments) * extend_lat_grid);
+            GS2.Warn($"BGratbox End: {gratbox.y} {gratbox.w} {gratbox.endLatitudeRad} {gratbox.endLongitudeRad} {gratbox.startLatitudeRad} {gratbox.startLongitudeRad}");
+
             __result = gratbox;
             return false;
         }

diff --git a/tcli.exe b/tcli.exe
diff --git a/thunderstore.toml b/thunderstore.toml
@@ -4,8 +4,8 @@ schemaVersion = "0.0.1"
 [package]
 namespace = "Galactic_Scale"
 name = "GalacticScale"
-versionNumber = "2.4.8"
-description = "v2.4.8. Bugfixes see readme"
+versionNumber = "2.4.9"
+description = "v2.4.9. Blueprint extra space bugfix"
 websiteUrl = "https://github.com/innominata/GalacticScale3"
 containsNsfwContent = false