2.5.6 tp fix

Author: innominata

Bootstrap.cs

@@ -15,7 +15,7 @@ public partial class GS2
     }
 
 
-    [BepInPlugin("dsp.galactic-scale.2", "Galactic Scale 2 Plug-In", "2.5.5")]
+    [BepInPlugin("dsp.galactic-scale.2", "Galactic Scale 2 Plug-In", "2.5.6")]
     [BepInDependency("space.customizing.console", BepInDependency.DependencyFlags.SoftDependency)]
     [BepInDependency("dsp.nebula-multiplayer-api", BepInDependency.DependencyFlags.SoftDependency)]
     public class Bootstrap : BaseUnityPlugin

GalacticScale3.csproj

@@ -8,7 +8,7 @@
 	<PropertyGroup>
 		<AssemblyName>GalacticScale</AssemblyName>
 		<Description>Galaxy Customization for Dyson Sphere Program</Description>
-		<Version>2.5.5</Version>
+		<Version>2.5.6</Version>
 		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
 		<LangVersion>9.0</LangVersion>
 		<OutDir>bin/$(Configuration)</OutDir>

Package/README.md

@@ -1,6 +1,7 @@
 # DSP Galactic Scale 2.0 Mod
 
 # BACKUP YOUR SAVES
+- Version 2.5.6 - Improve Teleportation Functionality
 - Version 2.5.5 - Fix Mecha Scaling when teleporting and add debug scale value for funsies.
 - Version 2.5.4 - Fix Vanilla Generator Saves
 - Version 2.5.3 - Added some missing code from recent updates that dpmm99 discovered

Scripts/Functionality/Teleport/TeleportComponent.cs

@@ -8,9 +8,17 @@ public class TeleportComponent : MonoBehaviour
         public PlanetData TargetPlanet;
         public StarData TargetStar;
         public bool TeleportEnabled;
-
+        public int ticker = 0;
         public void FixedUpdate()
         {
+            ticker++;
+            if (ticker > 60)
+            {
+                GS2.Warn(
+                    $"FU: TP:{TargetPlanet != null} TS:{TargetStar != null} TE:{TeleportEnabled} LS:{GameMain.localStar != null} LSL{GameMain.localStar?.loaded}");
+                ticker = 0;
+            }
+            else return;
             if (!GS2.Config.CheatMode) return;
             if (DSPGame.IsMenuDemo) return;
             if (TargetStar == null && TargetPlanet == null || TeleportEnabled == false || !(GameMain.localStar != null && GameMain.localStar.loaded)) return;
@@ -30,32 +38,44 @@ public void FixedUpdate()
         }
         private IEnumerator Teleport(PlanetData planet)
         {
+            GS2.Warn($"Teleporting to {planet.name}");
             yield return new WaitForEndOfFrame();
-            yield return new WaitForSeconds(0.1f);
-            TargetPlanet = null;
-            TargetStar = null;
             GameMain.mainPlayer.uPosition = planet.uPosition + VectorLF3.unit_z * planet.realRadius;
+            yield return new WaitForEndOfFrame();
             GameMain.data.mainPlayer.movementState = EMovementState.Sail;
-            TeleportEnabled = false;
-            GameMain.mainPlayer.transform.localScale = Vector3.one;
-            yield return new WaitForSeconds(1);
+            yield return new WaitForEndOfFrame();
+            GameCamera.instance.FrameLogic();
+            yield return new WaitForEndOfFrame();
             GameMain.mainPlayer.transform.localScale = Vector3.one * GS2.Config.MechaScale;
-
+            if (GameMain.localPlanet == planet)
+            {
+                TargetPlanet = null;
+                TargetStar = null;
+                TeleportEnabled = false;
+            }
         }
 
         private IEnumerator Teleport(StarData star)
         {
+
             yield return new WaitForEndOfFrame();
-            yield return new WaitForSeconds(0.1f);
-            TargetPlanet = null;
-            TargetStar = null;
+            // yield return new WaitForSeconds(0.2f);
+
             GameMain.mainPlayer.uPosition = star.uPosition + VectorLF3.unit_z * 1;
+            yield return new WaitForEndOfFrame();
             GameMain.data.mainPlayer.movementState = EMovementState.Sail;
-            TeleportEnabled = false;
+            yield return new WaitForEndOfFrame();
             GameMain.mainPlayer.transform.localScale = Vector3.one;
+            yield return new WaitForEndOfFrame();
             GameCamera.instance.FrameLogic();
-            yield return new WaitForSeconds(1);
+            yield return new WaitForEndOfFrame();
             GameMain.mainPlayer.transform.localScale = Vector3.one  * GS2.Config.MechaScale;
+            if (GameMain.localStar == star)
+            {
+                TargetPlanet = null;
+                TargetStar = null;
+                TeleportEnabled = false;
+            }
         }
 
         public bool NavArrowClick(UIStarmap starmap)

thunderstore.toml

@@ -4,8 +4,8 @@ schemaVersion = "0.0.1"
 [package]
 namespace = "Galactic_Scale"
 name = "GalacticScale"
-versionNumber = "2.5.5"
-description = "v2.5.5 BACKUP SAVES!!! Fix Vanilla Generator Saves"
+versionNumber = "2.5.6"
+description = "v2.5.6 Better Teleporting"
 websiteUrl = "https://github.com/innominata/GalacticScale3"
 containsNsfwContent = false