From c2db84d6d1a93606fa0881f7563d8a8235a843c2 Mon Sep 17 00:00:00 2001
From: Bitl <bitlblox@gmail.com>
Date: Sun, 12 Jul 2020 13:52:06 -0700
Subject: [PATCH] fixes

---
 .../Forms/ClientScriptTestForm.cs             |  1 -
 .../StorageAndFunctions/GlobalFuncs.cs        | 57 ++++++++++---------
 .../StorageAndFunctions/ScriptFuncs.cs        |  4 +-
 batch/dev_menu.bat                            |  1 +
 4 files changed, 33 insertions(+), 30 deletions(-)

diff --git a/Novetus/Novetus.ClientScriptTester/Forms/ClientScriptTestForm.cs b/Novetus/Novetus.ClientScriptTester/Forms/ClientScriptTestForm.cs
index 62900f2..40356e9 100644
--- a/Novetus/Novetus.ClientScriptTester/Forms/ClientScriptTestForm.cs
+++ b/Novetus/Novetus.ClientScriptTester/Forms/ClientScriptTestForm.cs
@@ -23,7 +23,6 @@ namespace Novetus.ClientScriptTester
                 OutputBox.AppendText(str + LocalVars.DoubleSpacedNewLine);
             }
 
-            OutputBox.Text.TrimEnd();
             OutputBox.SelectionStart = 0;
             OutputBox.ScrollToCaret();
         }
diff --git a/Novetus/NovetusCore/StorageAndFunctions/GlobalFuncs.cs b/Novetus/NovetusCore/StorageAndFunctions/GlobalFuncs.cs
index f265cc9..1d03058 100644
--- a/Novetus/NovetusCore/StorageAndFunctions/GlobalFuncs.cs
+++ b/Novetus/NovetusCore/StorageAndFunctions/GlobalFuncs.cs
@@ -469,22 +469,21 @@ public class GlobalFuncs
         }
     }
 
-    public static bool CopyMapToRBXAsset()
+    public static void FixedFileCopy(string src, string dest, bool overwrite)
+    {
+        if (File.Exists(dest))
+        {
+            File.SetAttributes(dest, FileAttributes.Normal);
+        }
+
+        File.Copy(src, dest, overwrite);
+    }
+
+    public static string CopyMapToRBXAsset()
     {
-        bool success;
         string clientcontentpath = GlobalPaths.ClientDir + @"\\" + GlobalVars.UserConfiguration.SelectedClient + @"\\content\\temp.rbxl";
-
-        try
-        {
-            File.Copy(GlobalVars.UserConfiguration.MapPath, clientcontentpath, true);
-            success = true;
-        }
-        catch (Exception)
-        {
-            success = false;
-        }
-
-        return success;
+        FixedFileCopy(GlobalVars.UserConfiguration.MapPath, clientcontentpath, true);
+        return GlobalPaths.AltBaseGameDir + "temp.rbxl";
     }
 
     public static void LoadClientValues(string clientpath)
@@ -541,7 +540,7 @@ public class GlobalFuncs
 
         if (!File.Exists(fullpath))
         {
-            File.Copy(GlobalPaths.ConfigDir + "\\ReShade_default.ini", fullpath, true);
+            File.Copy(GlobalPaths.ConfigDir + "\\ReShade_default.ini", fullpath);
             ReShadeValues(fullpath, write, true);
         }
         else
@@ -555,28 +554,32 @@ public class GlobalFuncs
         foreach (DirectoryInfo dir in Dirs)
         {
             string fulldirpath = dir.FullName + @"\" + cfgname;
-
-            if (!File.Exists(fulldirpath))
-            {
-                File.Copy(fullpath, fulldirpath, true);
-                ReShadeValues(fulldirpath, write, false);
-            }
-            else
-            {
-                ReShadeValues(fulldirpath, write, false);
-            }
-
             string fulldllpath = dir.FullName + @"\opengl32.dll";
 
             if (GlobalVars.UserConfiguration.ReShade)
             {
+                if (!File.Exists(fulldirpath))
+                {
+                    File.Copy(fullpath, fulldirpath);
+                    ReShadeValues(fulldirpath, write, false);
+                }
+                else
+                {
+                    ReShadeValues(fulldirpath, write, false);
+                }
+
                 if (!File.Exists(fulldllpath))
                 {
-                    File.Copy(GlobalPaths.ConfigDirData + "\\opengl32.dll", fulldllpath, true);
+                    File.Copy(GlobalPaths.ConfigDirData + "\\opengl32.dll", fulldllpath);
                 }
             }
             else
             {
+                if (File.Exists(fulldirpath))
+                {
+                    File.Delete(fulldirpath);
+                }
+
                 if (File.Exists(fulldllpath))
                 {
                     File.Delete(fulldllpath);
diff --git a/Novetus/NovetusCore/StorageAndFunctions/ScriptFuncs.cs b/Novetus/NovetusCore/StorageAndFunctions/ScriptFuncs.cs
index 3670486..e6af110 100644
--- a/Novetus/NovetusCore/StorageAndFunctions/ScriptFuncs.cs
+++ b/Novetus/NovetusCore/StorageAndFunctions/ScriptFuncs.cs
@@ -341,8 +341,8 @@ public class ScriptFuncs
 					.Replace("%hat3ws%", GlobalPaths.WebServer_HatDir + GlobalVars.UserCustomization.Hat3)
 					.Replace("%extraws%", GlobalPaths.WebServer_ExtraDir + GlobalVars.UserCustomization.Extra)
 					.Replace("%hat4ws%", GlobalPaths.WebServer_HatDir + GlobalVars.UserCustomization.Extra)
-					.Replace("%mapfiled%", GlobalPaths.BaseGameDir + GlobalVars.UserConfiguration.MapPathSnip.Replace(@"\\", @"\"))
-					.Replace("%mapfilec%", GlobalFuncs.CopyMapToRBXAsset() ? GlobalPaths.AltBaseGameDir + "temp.rbxl" : "")
+					.Replace("%mapfiled%", GlobalPaths.BaseGameDir + GlobalVars.UserConfiguration.MapPathSnip.Replace(@"\\", @"\").Replace(@"/", @"\"))
+					.Replace("%mapfilec%", GlobalFuncs.CopyMapToRBXAsset())
 					.Replace("%tripcode%", GlobalVars.UserConfiguration.PlayerTripcode)
 					.Replace("%scripttype%", Generator.GetNameForType(type))
 					.Replace("%addonscriptpath%", GlobalPaths.AddonScriptPath);
diff --git a/batch/dev_menu.bat b/batch/dev_menu.bat
index 8d52f37..7469aaa 100644
--- a/batch/dev_menu.bat
+++ b/batch/dev_menu.bat
@@ -110,6 +110,7 @@ del /s /q Novetus\clients\ClientScriptTester\ReShade.ini
 del /s /q Novetus\clients\ClientScriptTester\OPENGL32.log
 del /s /q Novetus\clients\ClientScriptTester\opengl32.dll
 del /s /q Novetus\clients\ClientScriptTester\DefaultPreset.ini
+del /s /q Novetus\clients\ClientScriptTester\content\temp.rbxl
 
 del /s /q Novetus\config\servers.txt
 del /s /q Novetus\config\ports.txt