Update to 6/16/20 - Build 1

Tran-Foxxo · Jun 16, 2020 · d40d863 · d40d863
1 parent 884d4f8
commit d40d863
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 5 deletions.
diff --git a/Changelogs/6-16-20 - Build 1.md b/Changelogs/6-16-20 - Build 1.md
@@ -0,0 +1,3 @@
+# Changelog for 6/16/20 - Build 1
+
+* Fixed a issue where the Gravity Well size was not being set when loading a new track.
diff --git a/src/Editor.cs b/src/Editor.cs
@@ -162,7 +162,7 @@ public double GravityWellSize
                     _track.GravityWellSize = value;
                     Stop();
                     Reset();
-                    StandardLine.Zone = value;
+                    StandardLine.Zone = _track.GravityWellSize;
                     _renderer.RefreshTrack(_track);
                 }
             }

diff --git a/src/Game/Timeline.cs b/src/Game/Timeline.cs
@@ -109,6 +109,8 @@ public void Restart(Rider state, float zoom)
                 Constants.StaticTriggerLineColorChange = Color.FromArgb(255, _track.LineColorR, _track.LineColorG, _track.LineColorB);
                 //Set Gravity
                 RiderConstants.Gravity = new Vector2d(0.175 * _track.XGravity, 0.175 * _track.YGravity); //gravity
+                //Set Gravity well size
+                StandardLine.Zone = _track.GravityWellSize;
 
                 using (changesync.AcquireWrite())
                 {

diff --git a/src/IO/TRKLoader.cs b/src/IO/TRKLoader.cs
@@ -38,6 +38,17 @@ private static float ParseFloat(string f)
                     "Unable to parse string into float");
             return ret;
         }
+        private static double ParseDouble(string f)
+        {
+            if (!double.TryParse(
+                f,
+                NumberStyles.Float,
+                Program.Culture,
+                out double ret))
+                throw new TrackIO.TrackLoadException(
+                    "Unable to parse string into double");
+            return ret;
+        }
         private static int ParseInt(string f)
         {
             if (!int.TryParse(
@@ -66,6 +77,9 @@ private static void ParseMetadata(Track ret, BinaryReader br)
                     case TrackMetadata.xgravity:
                         ret.XGravity = ParseFloat(metadata[1]);
                         break;
+                    case TrackMetadata.gravitywellsize:
+                        ret.GravityWellSize = ParseDouble(metadata[1]);
+                        break;
                     case TrackMetadata.bgcolorR:
                         ret.BGColorR = ParseInt(metadata[1]);
                         break;

diff --git a/src/Program.cs b/src/Program.cs
@@ -36,7 +36,7 @@ public static class Program
 #endif
         public static string BinariesFolder = "bin";
         public readonly static CultureInfo Culture = new CultureInfo("en-US");
-        public static string Version = "6/15/20 - Build 1";
+        public static string Version = "6/16/20 - Build 1";
         public static string TestVersion = "";
         public static string NewVersion = null;
         public static readonly string WindowTitle = "Line Rider: Advanced (Tran\'s fork) " + Version + TestVersion;

diff --git a/src/UI/Dialogs/ChangelogWindow.cs b/src/UI/Dialogs/ChangelogWindow.cs
@@ -16,8 +16,11 @@ public ChangelogWindow(GameCanvas parent, Editor editor) : base(parent, editor)
         {
             Title = "Changelog for " + Program.Version;
             AutoSizeToContents = false;
+            SetSize(1100, 380);
 
-            var changelogText = "* Crashes due to invalid settings files are now resolved (again because I did it wrong last update).\n" +
+            var changelogText = "" +
+                    "6/15/20 - Build 1\n" +
+                    "* Crashes due to invalid settings files are now resolved (again because I did it wrong last update).\n" +
                     "* Default save format settings are now available for crash backups `Settings -> Other`.\n" +
                     "* Crash Backups now save in the format `## Crash Backup month.day.year_hours.minutes.filetype`.\n" +
                     "* Fixed a issue where autosaves and quicksaves were saved as `## XXXXsave_day.month.year_hours.minutes.filetype`, not `## XXXXsave_month.day.year_hours.minutes.filetype`.\n" +
@@ -32,6 +35,11 @@ public ChangelogWindow(GameCanvas parent, Editor editor) : base(parent, editor)
                     "--* Also custom Gravity Well sizes will modify the box Bosh uses to check for collisions, use the Debug Grid to see this change. \n" +
                     "----* The grid is not accurate on the first frame, this is a bug.\n" +
                     "\n" +
+                    "================================================================================================================================\n" +
+                    "\n" +
+                    "6/16/20 - Build 1\n"+
+                    "* Fixed a issue where the Gravity Well size was not being set when loading a new track.\n" +
+                    "\n" +
                     "NOTE: Discord is *still* auto disabled on startup for now until I reimplement it in a more stable way.";
 
             ControlBase bottomcontainer = new ControlBase(this)
@@ -109,7 +117,6 @@ public ChangelogWindow(GameCanvas parent, Editor editor) : base(parent, editor)
             l.AddText(changelogText, Skin.Colors.Text.Foreground);
             MakeModal(true);
             DisableResizing();
-            SetSize(1100, 300);
         }
 
         private void CreateLabeledControl(ControlBase parent, string label, ControlBase control)

diff --git a/version b/version
@@ -1 +1 @@
-6/15/20 - Build 1
+6/16/20 - Build 1
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		# Changelog for 6/16/20 - Build 1

		* Fixed a issue where the Gravity Well size was not being set when loading a new track.