-Updated game libraries

-Updated API libraries -Added extra check for warp distance to ensure that even on slow servers the ship warps the correct distance even if it takes longer
SEModCommunity · Aug 12, 2014 · ed2a4a5 · ed2a4a5
1 parent a5b6508
commit ed2a4a5
Show file tree

Hide file tree

Showing 10 changed files with 17 additions and 3 deletions.
diff --git a/Libraries/SEModAPI.dll b/Libraries/SEModAPI.dll
diff --git a/Libraries/SEModAPIExtensions.dll b/Libraries/SEModAPIExtensions.dll
diff --git a/Libraries/SEModAPIInternal.dll b/Libraries/SEModAPIInternal.dll
diff --git a/Libraries/Sandbox.Common.XmlSerializers.dll b/Libraries/Sandbox.Common.XmlSerializers.dll
diff --git a/Libraries/Sandbox.Common.dll b/Libraries/Sandbox.Common.dll
diff --git a/Libraries/VRage.Common.dll b/Libraries/VRage.Common.dll
diff --git a/Libraries/VRage.Library.dll b/Libraries/VRage.Library.dll
diff --git a/Libraries/VRage.Math.dll b/Libraries/VRage.Math.dll
diff --git a/WarpDrivePlugin/Properties/AssemblyInfo.cs b/WarpDrivePlugin/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.2.1.4")]
-[assembly: AssemblyFileVersion("0.2.1.4")]
+[assembly: AssemblyVersion("0.2.1.5")]
+[assembly: AssemblyFileVersion("0.2.1.5")]
diff --git a/WarpDrivePlugin/WarpEngine.cs b/WarpDrivePlugin/WarpEngine.cs
@@ -32,6 +32,7 @@ public class WarpEngine : MultiblockStructure, IDisposable
 
 		private float m_energyRequired;
 		private float m_accelerationFactor;
+		private Vector3 m_warpStartPosition;
 
 		private string m_oldBeaconName;
 		private float m_oldBeaconBroadcastRadius;
@@ -131,6 +132,15 @@ public bool IsDisposed
 			get { return m_isDisposed; }
 		}
 
+		public float WarpDistance
+		{
+			get
+			{
+				float distance = Core._SpeedFactor * 100 * Core._Duration;
+				return distance;
+			}
+		}
+
 		protected BeaconEntity Beacon
 		{
 			get
@@ -511,8 +521,10 @@ public void Update()
 					if (m_isAtWarpSpeed)
 					{
 						m_timeSinceWarpStart = DateTime.Now - m_warpStart;
+						float distanceWarped = Vector3.Distance(m_warpStartPosition, Parent.Position);
 
-						if (speed > (0.95 * Core._SpeedFactor * 100) && m_timeSinceWarpStart.TotalMilliseconds > Core._Duration * 1000)
+						//Slow down if at speed, elapsed time is greater than duration, and warp distance is at least met
+						if (speed > (0.95 * Core._SpeedFactor * 100) && m_timeSinceWarpStart.TotalMilliseconds > Core._Duration * 1000 && distanceWarped > WarpDistance)
 						{
 							m_isSpeedingUp = false;
 							m_isAtWarpSpeed = false;
@@ -635,6 +647,8 @@ protected void SpeedUp()
 					m_isSpeedingUp = false;
 					m_isSlowingDown = false;
 					m_warpStart = DateTime.Now;
+
+					m_warpStartPosition = Parent.Position;
 				}
 				else
 				{