Merge pull request #92 from altairwei/Dev

Did some workaround for RtR

Author: remyCases

DataLoader.cs

@@ -152,7 +152,7 @@ private static bool LoadUmt(string filename)
                 );
             }
 
-            UndertaleEmbeddedTexture.TexData.ClearSharedStream();
+            //UndertaleEmbeddedTexture.TexData.ClearSharedStream();
             Log.Information(string.Format("Successfully load: {0}.", filename));
 
             return hadWarnings;
@@ -220,7 +220,7 @@ private static void SaveTempWithUmt(string filename)
                 });
             }
 
-            UndertaleEmbeddedTexture.TexData.ClearSharedStream();
+            //UndertaleEmbeddedTexture.TexData.ClearSharedStream();
             QoiConverter.ClearSharedBuffer();
         }
         private static void HandleFailedSave(Exception exception)

Main.xaml

@@ -38,6 +38,12 @@ public partial class Main : Window
         public static IntPtr handle;
         public string mslVersion;
         public string utmtlibVersion;
+        //
+        private const double DefaultWidth = 960;                  // Исходная ширина
+        private const double DefaultHeight = 800;                 // Исходная высота
+        private const double AspectRatio = DefaultWidth / DefaultHeight; // Соотношение сторон
+        private const double ScreenSizePercentage = 0.85;          // Процент от размера экрана
+
         public Main()
         {
             handle = GetConsoleWindow();
@@ -63,7 +69,7 @@ public Main()
                 );
 
             Log.Logger = logger.CreateLogger();
-            
+
             // work around to find the FileVersion of ModShardLauncher.dll for single file publishing
             // see: https://github.com/dotnet/runtime/issues/13051
             try
@@ -73,7 +79,7 @@ public Main()
                 mslVersion = "v" + FileVersionInfo.GetVersionInfo(mainProcessName).FileVersion;
                 utmtlibVersion = "v" + FileVersionInfo.GetVersionInfo(typeof(UndertaleCode).Assembly.Location).FileVersion;
             }
-            catch(FileNotFoundException ex)
+            catch (FileNotFoundException ex)
             {
                 Log.Error(ex, "Cannot find the dll of ModShardLauncher");
                 throw;
@@ -84,43 +90,74 @@ public Main()
             {
                 ModLoader.LoadFiles();
             }
-            catch(Exception ex)
+            catch (Exception ex)
             {
                 Log.Error(ex, "Something went wrong");
             }
-            
+
             SettingsPage = new Settings();
             InitializeComponent();
 
+            // Начальный размер окна
+            SetInitialSize();
+
             Viewer.Content = MainPage;
+
+
+        }
+
+        private void SetInitialSize()
+        {
+            var screenWidth = SystemParameters.PrimaryScreenWidth;
+            var screenHeight = SystemParameters.PrimaryScreenHeight;
+
+            if (screenWidth < DefaultWidth || screenHeight < DefaultHeight)
+            {
+                if (screenWidth < screenHeight)
+                {
+                    Width = screenWidth * ScreenSizePercentage;
+                    Height = Width / AspectRatio; // Поддержка соотношения сторон
+                }
+                else
+                {
+                    Height = screenHeight * ScreenSizePercentage;
+                    Width = Height * AspectRatio; // Поддержка соотношения сторон
+                }
+            }
+            else
+            {
+                Width = DefaultWidth;
+                Height = DefaultHeight;
+            }
         }
+
         public void LogModList()
         {
             foreach (ModFile modFile in ModPage.Mods.Where(x => x.isEnabled))
             {
                 string statusMessage = "";
-                switch(modFile.PatchStatus)
+                switch (modFile.PatchStatus)
                 {
                     case PatchStatus.Patching:
                         statusMessage = "Patching failed";
-                    break;
-                    
+                        break;
+
                     case PatchStatus.Success:
                         statusMessage = "Patching succeeded";
-                    break;
+                        break;
 
                     case PatchStatus.None:
                         statusMessage = "Waiting to be patched";
-                    break;
+                        break;
                 }
                 Log.Warning("Patching {{{2}}} for {{{0}}} {{{1}}}", modFile.Name, modFile.Version, statusMessage);
             }
         }
         private void MyToggleButton_Checked(object sender, EventArgs e)
         {
-            foreach(var i in stackPanel.Children)
+            foreach (var i in stackPanel.Children)
             {
-                if(i != sender && i is MyToggleButton button)
+                if (i != sender && i is MyToggleButton button)
                 {
                     button.MyButton.IsChecked = false;
                 }
@@ -137,7 +174,7 @@ public void Refresh()
             {
                 ModLoader.LoadFiles();
             }
-            catch(Exception ex)
+            catch (Exception ex)
             {
                 Log.Error(ex, "Something went wrong");
             }
@@ -219,7 +256,7 @@ public static void CheckLog(bool isLogConsole)
             else
             {
                 Main.ShowWindow(Main.handle, Main.SW_HIDE);
-                Main.lls.MinimumLevel = (LogEventLevel) 1 + (int) LogEventLevel.Fatal;
+                Main.lls.MinimumLevel = (LogEventLevel)1 + (int)LogEventLevel.Fatal;
             }
         }
         public static void ChangeLanguage(int index)

Main.xaml.cs

@@ -36,7 +36,7 @@ public static void ShowMessage(string msg)
         public static void Initalize()
         {
             Weapons = Msl.ThrowIfNull(GetTable("gml_GlobalScript_table_weapons"));
-            WeaponDescriptions = Msl.ThrowIfNull(GetTable("gml_GlobalScript_table_weapons_text"));
+            WeaponDescriptions = Msl.ThrowIfNull(GetTable("gml_GlobalScript_table_equipment"));
         }
         internal static void AddCredit(string modNameShort, string[] authors)
         {
@@ -232,8 +232,8 @@ public static void PatchFile()
         }
         internal static void PatchInnerFile()
         {
-            if (Data.Code.All(x => x.Name.Content != "print"))
-                Msl.AddInnerFunction("print");
+            if (Data.Code.All(x => x.Name.Content != "msl_print"))
+                Msl.AddInnerFunction("msl_print");
             if (Data.Code.All(x => x.Name.Content != "give"))
                 Msl.AddInnerFunction("give");
             if (Data.Code.All(x => x.Name.Content != "SendMsg"))

ModLoader.cs

@@ -9,7 +9,7 @@
     <ApplicationIcon>ico.ico</ApplicationIcon>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
 	  <SatelliteResourceLanguages>zh-Hans</SatelliteResourceLanguages>
-    <FileVersion>0.11.3.0-dev</FileVersion>
+    <FileVersion>0.12.1.0</FileVersion>
   </PropertyGroup>
 
   <ItemGroup> <!-- Include the specific files to exclude the ones in the test folder -->
@@ -211,4 +211,11 @@
     <Copy SourceFiles="ModReference\netstandard.dll;ModReference\System.Collections.dll;ModReference\System.Runtime.dll;ModReference\System.Linq.dll;ModReference\System.ObjectModel.dll" DestinationFolder="$(OutDir)" />
   </Target>
 
+  <Target Name="CopyDevFiles" AfterTargets="Publish">
+    <Copy SourceFiles="Resources\ExportRoom.csx" DestinationFolder="$(PublishDir)" />
+    <Copy SourceFiles="Reference\UndertaleModLib.dll" DestinationFolder="$(PublishDir)" />
+    <Copy SourceFiles="Reference\UndertaleModTool.dll" DestinationFolder="$(PublishDir)" />
+    <Copy SourceFiles="$(OutputPath)ModShardLauncher.dll" DestinationFolder="$(PublishDir)" />
+  </Target>
+
 </Project>