Merge pull request #150 from InvalidArgument3/initialversion

more respawn ships
StarCoreSE · Oct 19, 2024 · 9f33cb7 · 9f33cb7
2 parents 756b192 + cd433f0
commit 9f33cb7
Show file tree

Hide file tree

Showing 5 changed files with 523 additions and 452 deletions.
diff --git a/Slipspace Engine/Data/Scripts/WarpDrive/WarpDrive.cs b/Slipspace Engine/Data/Scripts/WarpDrive/WarpDrive.cs
@@ -13,6 +13,7 @@
 using VRage.Game.Components;
 using VRage.Game.Entity;
 using VRage.Game.ModAPI;
+using VRage.Game.ModAPI.Interfaces;
 using VRage.ModAPI;
 using VRage.ObjectBuilders;
 using VRage.Utils;
@@ -312,7 +313,7 @@ public bool ProxymityDangerInWarp(MatrixD gridMatrix, MyCubeGrid MainGrid, doubl
                 if (ent is MySafeZone)
                     return true;
 
-                if (!(ent is MyCubeGrid || ent is MyVoxelMap))
+                if (!(ent is MyCubeGrid || ent is MyVoxelMap || ent is IMyDestroyableObject ))
                     continue;
 
                 // dont stop if grid speed is 20 or above.
@@ -418,7 +419,7 @@ public bool ProxymityDangerCharge(MatrixD gridMatrix, IMyCubeGrid WarpGrid)
                     return true;
                 }
 
-                if (!(ent is MyCubeGrid || ent is MyVoxelMap))
+                if (!(ent is MyCubeGrid || ent is MyVoxelMap ))
                     continue;
 
                 // Checking proximity to entities

diff --git a/TSTSSESTweaks/Data/DisableRespawn.sbc → ...weaks/Data/DisableVanillaRespawnShips.sbc b/TSTSSESTweaks/Data/DisableRespawn.sbc → ...weaks/Data/DisableVanillaRespawnShips.sbc