Fixed a crash on creating new fighters

digiholic · Feb 9, 2020 · 5e61808 · 5e61808
1 parent d09d1a2
commit 5e61808
Show file tree

Hide file tree

Showing 5 changed files with 58 additions and 32 deletions.
diff --git a/Assets/Editor/PostBuild.cs b/Assets/Editor/PostBuild.cs
@@ -3,13 +3,18 @@
 using UnityEditor.Build;
 using UnityEngine;
 using UnityEditor.Build.Reporting;
+using System;
 
 class PostBuild : IPostprocessBuildWithReport
 {
     public int callbackOrder { get { return 0; } }
     public void OnPostprocessBuild(BuildReport report)
     {
         Debug.Log(report.summary.outputPath);
+        CopyModuleDirectory(report);
+    }
+
+    private void CopyModuleDirectory(BuildReport report){
         FileInfo info = new FileInfo(report.summary.outputPath);
         DirectoryInfo buildTargetDirectory = info.Directory;
         DirectoryInfo buildAssetsDirectory = buildTargetDirectory.CreateSubdirectory("Assets");
@@ -23,4 +28,5 @@ public void OnPostprocessBuild(BuildReport report)
 
         Debug.Log("Copied Modules Directory");
     }
+
 }
diff --git a/Assets/Engine/CommandLineParser.cs.meta b/Assets/Engine/CommandLineParser.cs.meta
diff --git a/Assets/Engine/SerializedClasses/FighterInfo.cs b/Assets/Engine/SerializedClasses/FighterInfo.cs
@@ -234,7 +234,7 @@ public void GenerateDefaultAttributes()
         variables = new List<VarData>();
         variables.Add(new VarData(TussleConstants.FighterAttributes.WEIGHT, "10", VarType.FLOAT));
         variables.Add(new VarData(TussleConstants.FighterAttributes.GRAVITY, "-20", VarType.FLOAT));
-        variables.Add(new VarData(TussleConstants.FighterAttributes.MAX_FALL_SPEED, "7", VarType.FLOAT));
+        variables.Add(new VarData(TussleConstants.FighterAttributes.MAX_FALL_SPEED, "-7", VarType.FLOAT));
         variables.Add(new VarData(TussleConstants.FighterAttributes.MAX_GROUND_SPEED, "5.5", VarType.FLOAT));
         variables.Add(new VarData(TussleConstants.FighterAttributes.RUN_SPEED, "2.5", VarType.FLOAT));
         variables.Add(new VarData(TussleConstants.FighterAttributes.MAX_AIR_SPEED, "8.5", VarType.FLOAT));

diff --git a/Assets/Menu/LegacyEditor/LegacyEditor.unity b/Assets/Menu/LegacyEditor/LegacyEditor.unity
diff --git a/Assets/Menu/LegacyEditor/NewFighterPopup.cs b/Assets/Menu/LegacyEditor/NewFighterPopup.cs
@@ -19,22 +19,7 @@ public void CreateFighter(DirectoryInfo createdDir, FighterInfo templateFighter)
         FighterInfo newInfo;
         if (templateFighter != null)
         {
-            newInfo = templateFighter.Clone();
-            DirectoryInfo oldDir = FileLoader.GetFighterDir(templateFighter.directory_name);
-            try {
-                FileLoader.CopyDirectory(oldDir.FullName,createdDir.FullName,true);
-            } catch {
-                DisplayError("Could not find an existing Fighter named " + templateFighter + ", are you sure you used the Directory name?");
-            }
-
-            newInfo.displayName = directoryName;
-            newInfo.directory_name = directoryName;
-            newInfo.actionFilePath = "fighter_actions.json";
-            newInfo.GenerateDefaultAttributes();
-
-            //Copy over relevant files
-            // FileInfo action_file_info = new FileInfo(FileLoader.PathCombine(FileLoader.ProgramDirectoryInfo.FullName,templateFighter.actionFilePath));
-            // action_file_info.CopyTo(FileLoader.PathCombine(createdDir.FullName,newInfo.actionFilePath));
+            newInfo = CloneTemplateFighter(createdDir, templateFighter);
         }
         else
         {
@@ -49,26 +34,50 @@ public void CreateFighter(DirectoryInfo createdDir, FighterInfo templateFighter)
             {
                 //TODO Clone default actions here
             }
-        }
 
-        if (useSprite)
-        {
-            DirectoryInfo spriteDir = Directory.CreateDirectory(Path.Combine(createdDir.FullName, "sprites"));
-            SpriteInfo spriteInfo = new SpriteInfo();
-            spriteInfo.Save(Path.Combine(createdDir.FullName,"sprite_info.json"));
-
-            spriteInfo.spriteDirectory = "sprites";
-            spriteInfo.default_sprite = "idle";
-            spriteInfo.costumeName = "default";
-            newInfo.sprite_info = spriteInfo;
-        }
+            if (useSprite)
+            {
+                DirectoryInfo spriteDir = Directory.CreateDirectory(Path.Combine(createdDir.FullName, "sprites"));
+                SpriteInfo spriteInfo = new SpriteInfo();
 
-        if (useModel)
-        {
-            //TODO create model directory and stuff
+                spriteInfo.spriteDirectory = "sprites";
+                spriteInfo.default_sprite = "idle";
+                spriteInfo.costumeName = "default";
+
+                spriteInfo.Save(Path.Combine(createdDir.FullName,"sprite_info.json"));
+                newInfo.sprite_info = spriteInfo;
+            }
+
+            if (useModel)
+            {
+                //TODO create model directory and stuff
+            }
         }
+
         newInfo.Save(Path.Combine(FileLoader.GetFighterDir(directoryName).FullName, "fighter_info.json"));
+        newInfo.sprite_info.Save(Path.Combine(createdDir.FullName,"sprite_info.json"));
+
         LegacyEditorData.instance.LoadNewFighter(newInfo);
+        Dispose();
+    }
+
+    private FighterInfo CloneTemplateFighter(DirectoryInfo createdDir, FighterInfo templateFighter){
+        Debug.Log("Cloning Template Fighter");
+        FighterInfo newInfo = templateFighter.Clone();
+        DirectoryInfo oldDir = FileLoader.GetFighterDir(templateFighter.directory_name);
+        try {
+            FileLoader.CopyDirectory(oldDir.FullName,createdDir.FullName,true);
+        } catch {
+            DisplayError("Could not find an existing Fighter named " + templateFighter + ", are you sure you used the Directory name?");
+        }
+
+        newInfo.displayName = directoryName;
+        newInfo.directory_name = directoryName;
+        newInfo.actionFilePath = "fighter_actions.json";
+
+        newInfo.sprite_info = templateFighter.sprite_info;
+
+        return newInfo;
     }
 
     public void OnConfirm()