Merge branch 'master' into fix/bbox_right-repeated

Author: ithinkandicode

ExportToGMS1Project.csx

@@ -17,6 +17,7 @@ string projFolder = GetFolder(FilePath) + GameName + ".gmx" + Path.DirectorySepa
 TextureWorker worker = new TextureWorker();
 ThreadLocal<DecompileContext> DECOMPILE_CONTEXT = new ThreadLocal<DecompileContext>(() => new DecompileContext(Data, false));
 string gmxDeclaration = "This Document is generated by GameMaker, if you edit it by hand then you do so at your own risk!";
+string eol = "\n"; // Linux: "\n", Windows: "\r\n"
 
 if (Directory.Exists(projFolder))
 {
@@ -134,7 +135,7 @@ void ExportSprite(UndertaleSprite sprite)
         }
     }
 
-    File.WriteAllText(projFolder + "/sprites/" + sprite.Name.Content + ".sprite.gmx", gmx.ToString());
+    File.WriteAllText(projFolder + "/sprites/" + sprite.Name.Content + ".sprite.gmx", gmx.ToString() + eol);
 
     // Save sprite images
     for (int i = 0; i < sprite.Textures.Count; i++)
@@ -179,7 +180,7 @@ void ExportBackground(UndertaleBackground background)
         )
     );
 
-    File.WriteAllText(projFolder + "/background/" + background.Name.Content + ".background.gmx", gmx.ToString());
+    File.WriteAllText(projFolder + "/background/" + background.Name.Content + ".background.gmx", gmx.ToString() + eol);
 
     // Save background images
     if (background.Texture != null)
@@ -296,7 +297,7 @@ void ExportGameObject(UndertaleGameObject gameObject)
         }
     }
 
-    File.WriteAllText(projFolder + "/objects/" + gameObject.Name.Content + ".object.gmx", gmx.ToString() + "\n");
+    File.WriteAllText(projFolder + "/objects/" + gameObject.Name.Content + ".object.gmx", gmx.ToString() + eol);
 }
 
 // --------------- Export Room ---------------
@@ -322,6 +323,7 @@ void ExportRoom(UndertaleRoom room)
             new XElement("speed", room.Speed.ToString()),
             new XElement("persistent", BoolToString(room.Persistent)),
             new XElement("colour", room.BackgroundColor.ToString()),
+			new XElement("showcolour", BoolToString(room.DrawBackgroundColor)),
             new XElement("code", room.CreationCodeId != null ? Decompiler.Decompile(room.CreationCodeId, DECOMPILE_CONTEXT.Value) : ""),
             new XElement("enableViews", BoolToString(room.Flags.HasFlag(UndertaleRoom.RoomEntryFlags.EnableViews))),
             new XElement("clearViewBackground", BoolToString(room.Flags.HasFlag(UndertaleRoom.RoomEntryFlags.ShowColor))),
@@ -374,7 +376,8 @@ void ExportRoom(UndertaleRoom room)
             new XAttribute("objName", i.ObjectId is null ? "<undefined>" : i.ObjectId.Name.Content),
             new XAttribute("xview", i.ViewX.ToString()),
             new XAttribute("yview", i.ViewY.ToString()),
-            new XAttribute("wview", i.ViewHeight.ToString()),
+            new XAttribute("wview", i.ViewWidth.ToString()),
+			new XAttribute("hview", i.ViewHeight.ToString()),
             new XAttribute("xport", i.PortX.ToString()),
             new XAttribute("yport", i.PortY.ToString()),
             new XAttribute("wport", i.PortWidth.ToString()),
@@ -445,7 +448,7 @@ void ExportRoom(UndertaleRoom room)
 		new XElement("PhysicsWorldPixToMeters", room.MetersPerPixel)
 	);
 
-    File.WriteAllText(projFolder + "/rooms/" + room.Name.Content + ".room.gmx", gmx.ToString() + "\n");
+    File.WriteAllText(projFolder + "/rooms/" + room.Name.Content + ".room.gmx", gmx.ToString() + eol);
 }
 
 // --------------- Export Sound ---------------
@@ -491,7 +494,7 @@ void ExportSound(UndertaleSound sound)
         )
     );
 
-    File.WriteAllText(projFolder + "/sound/" + sound.Name.Content + ".sound.gmx", gmx.ToString() + "\n");
+    File.WriteAllText(projFolder + "/sound/" + sound.Name.Content + ".sound.gmx", gmx.ToString() + eol);
 
     // Save sound files
     if (sound.AudioFile != null)
@@ -561,7 +564,7 @@ void ExportFont(UndertaleFont font)
         glyphsNode.Add(glyphNode);
     }
 
-    File.WriteAllText(projFolder + "/fonts/" + font.Name.Content + ".font.gmx", gmx.ToString());
+    File.WriteAllText(projFolder + "/fonts/" + font.Name.Content + ".font.gmx", gmx.ToString() + eol);
 
     // Save font textures
     worker.ExportAsPNG(font.Texture, projFolder + "/fonts/" + font.Name.Content + ".png");
@@ -598,7 +601,7 @@ void ExportPath(UndertalePath path)
         );
     }
 
-    File.WriteAllText(projFolder + "/paths/" + path.Name.Content + ".path.gmx", gmx.ToString());
+    File.WriteAllText(projFolder + "/paths/" + path.Name.Content + ".path.gmx", gmx.ToString() + eol);
 }
 
 // --------------- Export Timelines ---------------
@@ -649,7 +652,7 @@ void ExportTimeline(UndertaleTimeline timeline)
         gmx.Element("timeline").Add(entryNode);
     }
 
-    File.WriteAllText(projFolder + "/timelines/" + timeline.Name.Content + ".timeline.gmx", gmx.ToString());
+    File.WriteAllText(projFolder + "/timelines/" + timeline.Name.Content + ".timeline.gmx", gmx.ToString() + eol);
 }
 
 
@@ -674,7 +677,7 @@ void GenerateProjectFile()
     WriteIndexes<UndertalePath>(gmx.Element("assets"), "paths", "paths", Data.Paths, "path", "paths\\");
     WriteIndexes<UndertaleTimeline>(gmx.Element("assets"), "timelines", "timelines", Data.Timelines, "timeline", "timelines\\");
 
-    File.WriteAllText(projFolder + GameName + ".project.gmx", gmx.ToString());
+    File.WriteAllText(projFolder + GameName + ".project.gmx", gmx.ToString() + eol);
 }
 
 void WriteIndexes<T>(XElement rootNode, string elementName, string attributeName, IList<T> dataList, string oneName, string resourcePath, string fileExtension = "")