Merge pull request #64 from lastbattle/staging

Staging
lastbattle · Jul 12, 2020 · 549de0d · 549de0d
2 parents 986cbd8 + 6093ec6
commit 549de0d
Show file tree

Hide file tree

Showing 38 changed files with 448 additions and 413 deletions.
diff --git a/EmptyKeys.UIEngine/EmptyKeys.UserInterface.Core/EmptyKeys.UserInterface.Core.Standard.csproj b/EmptyKeys.UIEngine/EmptyKeys.UserInterface.Core/EmptyKeys.UserInterface.Core.Standard.csproj
@@ -22,8 +22,12 @@
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
-    <OutputPath>..\..\!Release\EmptyKeysUI\Common\AnyCPU</OutputPath>
-    <DocumentationFile>..\..\!Release\EmptyKeysUI\Common\AnyCPU\netstandard2.0\EmptyKeys.UserInterface.Core.xml</DocumentationFile>
+    <OutputPath>..\Compiled\Release\</OutputPath>
+    <DocumentationFile>..\Compiled\Release\EmptyKeysUI\Common\AnyCPU\netstandard2.0\EmptyKeys.UserInterface.Core.xml</DocumentationFile>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+    <OutputPath>..\Compiled\Debug\</OutputPath>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/...IEngine/EmptyKeys.UserInterface.MonoGame/EmptyKeys.UserInterface.MonoGame.Standard.csproj b/...IEngine/EmptyKeys.UserInterface.MonoGame/EmptyKeys.UserInterface.MonoGame.Standard.csproj
@@ -21,6 +21,14 @@
     <RootNamespace>EmptyKeys.UserInterface.MonoGame</RootNamespace>
   </PropertyGroup>
 
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+    <OutputPath>..\Compiled\Debug\</OutputPath>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+    <OutputPath>..\Compiled\Release\</OutputPath>
+  </PropertyGroup>
+
   <ItemGroup>
     <Compile Remove="UserInterface\**" />
     <EmbeddedResource Remove="UserInterface\**" />

diff --git a/HaCreator/GUI/EditorPanels/BackgroundPanel.cs b/HaCreator/GUI/EditorPanels/BackgroundPanel.cs
@@ -142,17 +142,11 @@ private void bgItem_Click(object sender, MouseEventArgs e)
                             WzStringProperty stringObj = (WzStringProperty)spineAtlasProp;
                             Thread thread = new Thread(() =>
                             {
-                                try
-                                {
-                                    WzSpineAnimationItem item = new WzSpineAnimationItem(stringObj);
-
-                                    // Create xna window
-                                    SpineAnimationWindow Window = new SpineAnimationWindow(item);
-                                    Window.Run();
-                                }
-                                catch (Exception ex)
-                                {
-                                }
+                                WzSpineAnimationItem item = new WzSpineAnimationItem(stringObj);
+
+                                // Create xna window
+                                SpineAnimationWindow Window = new SpineAnimationWindow(item);
+                                Window.Run();
                             });
                             thread.Start();
                             thread.Join();

diff --git a/HaCreator/GUI/EditorPanels/ObjPanel.cs b/HaCreator/GUI/EditorPanels/ObjPanel.cs
@@ -108,7 +108,11 @@ private void objL1ListBox_SelectedIndexChanged(object sender, EventArgs e)
                         item.MaxHeight = UserSettings.ImageViewerHeight;
                         item.MaxWidth = UserSettings.ImageViewerWidth;
                     }
-                }catch(InvalidCastException ex) { return; }
+                }
+                catch(InvalidCastException) 
+                { 
+                    return; 
+                }
             }
         }
 

diff --git a/HaCreator/GUI/EditorPanels/PortalPanel.cs b/HaCreator/GUI/EditorPanels/PortalPanel.cs
@@ -44,7 +44,9 @@ public void Initialize(HaCreatorStateManager hcsm)
                     item.MouseDown += new MouseEventHandler(portal_MouseDown);
                     item.MouseUp += new MouseEventHandler(ImageViewer.item_MouseUp);
                 }
-                catch (KeyNotFoundException e) { }
+                catch (KeyNotFoundException) 
+                { 
+                }
             }
         }
 

diff --git a/HaCreator/GUI/InstanceEditor/PortalInstanceEditor.cs b/HaCreator/GUI/InstanceEditor/PortalInstanceEditor.cs
@@ -36,7 +36,11 @@ public PortalInstanceEditor(PortalInstance item)
                 try
                 {
                     portals.Add(Tables.PortalTypeNames[Program.InfoManager.PortalTypeById[i]]);
-                }catch(KeyNotFoundException e) { continue; }
+                }
+                catch(KeyNotFoundException) 
+                { 
+                    continue; 
+                }
             }
 
             ptComboBox.Items.AddRange(portals.ToArray());

diff --git a/HaCreator/GUI/Load.cs b/HaCreator/GUI/Load.cs
@@ -27,7 +27,7 @@ public partial class Load : System.Windows.Forms.Form
         private System.Windows.Controls.TabControl Tabs;
         private System.Windows.RoutedEventHandler[] rightClickHandler;
 
-        private string defaultMapNameFilter;
+        private readonly string defaultMapNameFilter;
 
         /// <summary>
         /// 
@@ -78,7 +78,7 @@ private void Load_Load(object sender, EventArgs e)
             }
         }
 
-        private void selectionChanged(object sender, EventArgs e)
+        private void SelectionChanged(object sender, EventArgs e)
         {
             if (HAMSelect.Checked)
             {
@@ -109,7 +109,7 @@ private void selectionChanged(object sender, EventArgs e)
             }
         }
 
-        private void browseXML_Click(object sender, EventArgs e)
+        private void BrowseXML_Click(object sender, EventArgs e)
         {
             OpenFileDialog dialog = new OpenFileDialog();
             dialog.Title = "Select XML to load...";
@@ -122,7 +122,7 @@ private void browseXML_Click(object sender, EventArgs e)
             loadButton.Enabled = true;
         }
 
-        private void browseHAM_Click(object sender, EventArgs e)
+        private void BrowseHAM_Click(object sender, EventArgs e)
         {
             OpenFileDialog dialog = new OpenFileDialog();
             dialog.Title = "Select Map to load...";
@@ -135,7 +135,7 @@ private void browseHAM_Click(object sender, EventArgs e)
             loadButton.Enabled = true;
         }
 
-        private void loadButton_Click(object sender, EventArgs e)
+        private void LoadButton_Click(object sender, EventArgs e)
         {
             //Hide();
             WaitWindow ww = new WaitWindow("Loading...");
@@ -207,7 +207,7 @@ private void loadButton_Click(object sender, EventArgs e)
             Close();
         }
 
-        private void mapBrowser_SelectionChanged()
+        private void MapBrowser_SelectionChanged()
         {
             loadButton.Enabled = mapBrowser.LoadAvailable;
         }
@@ -220,7 +220,7 @@ private void Load_KeyDown(object sender, KeyEventArgs e)
             }
             else if (e.KeyCode == Keys.Enter)
             {
-                loadButton_Click(null, null);
+                LoadButton_Click(null, null);
             }
         }
 

diff --git a/HaCreator/GUI/Load.designer.cs b/HaCreator/GUI/Load.designer.cs
diff --git a/HaCreator/GUI/Repack.cs b/HaCreator/GUI/Repack.cs
@@ -22,7 +22,7 @@ namespace HaCreator.GUI
 {
     public partial class Repack : Form
     {
-        List<WzFile> toRepack = new List<WzFile>();
+        private readonly List<WzFile> toRepack = new List<WzFile>();
 
         public Repack()
         {
@@ -103,7 +103,7 @@ private void ChangeRepackState(string state)
         /// <param name="bSaveFileInHaCreatorDirectory"></param>
         private void FinishSuccess(bool bSaveFileInHaCreatorDirectory)
         {
-            MessageBox.Show("Repacked successfully. " + (!bSaveFileInHaCreatorDirectory ? "press OK to restart." : "Please replace the files in HaCreator\\Output."));
+            MessageBox.Show("Repacked successfully. " + (!bSaveFileInHaCreatorDirectory ? "Please replace the files under the MapleStory directory." : "Please replace the files in HaCreator\\Output."));
 
             if (!bSaveFileInHaCreatorDirectory)
             {
@@ -247,14 +247,7 @@ private void RepackerThread()
 
                     if (!bSaveFileInHaCreatorDirectory) // only replace the original file if its saving in the maplestory folder
                     {
-                        string buPath = Path.Combine(orgBackupDir, Path.GetFileName(orgFile));
-                        // Try to backup to /Originals/ First, if there is already a file there, we are not original, so just backup to /Backup/
-                        if (File.Exists(buPath))
-                        {
-                            buPath = Path.Combine(backupDir, Path.GetFileName(orgFile));
-                        }
-                        File.Move(orgFile, buPath);
-                        File.Move(tmpFile, orgFile);
+                        File.Move(tmpFile, orgFile + "_NewCreated.wz");
                     }
                 }
                 catch (Exception e)

diff --git a/HaCreator/HaCreator.csproj b/HaCreator/HaCreator.csproj
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>HaCreator</RootNamespace>
     <AssemblyName>HaCreator</AssemblyName>
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <FileUpgradeFlags>
     </FileUpgradeFlags>

diff --git a/HaCreator/MapEditor/Board.cs b/HaCreator/MapEditor/Board.cs
@@ -218,7 +218,7 @@ public void RenderBoard(SpriteBatch sprite)
 
         public void CreateLayers()
         {
-            for (int i = 0; i < MapConstants.MaxMapLayers; i++)
+            for (int i = 0; i <= MapConstants.MaxMapLayers; i++)
             {
                 new Layer(this);
             }