2.0

AnimationEditor/AnimationEditor.csproj

@@ -23,6 +23,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -44,6 +45,7 @@
     <Reference Include="PresentationFramework.Aero2" />
     <Reference Include="System" />
     <Reference Include="System.Data" />
+    <Reference Include="System.Deployment" />
     <Reference Include="System.Drawing" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml" />

AnimationEditor/MainWindow.xaml.cs

@@ -34,6 +34,22 @@ public partial class MainWindow : Window
         public static int ForcePlaybackDuration = 256;
         public static int ForcePlaybackSpeed = 128;
 
+        public string WindowName
+        {
+            set
+            {
+                this.Title = value;
+            }
+        }
+
+        public string DefaultWindowName
+        {
+            get
+            {
+                return $"RSDK Animation Editor v{System.Reflection.Assembly.GetExecutingAssembly().GetName().Version}";
+            }
+        }
+
         public MainWindow()
         {
             DefaultBorderBrush = (Brush)FindResource("ComboBoxBorder");
@@ -48,6 +64,7 @@ public MainWindow()
             HitboxColorPicker.SelectedColorChanged += ColorPicker_SelectedColorChanged;
             AxisColorPicker.SelectedColorChanged += ColorPicker_SelectedColorChanged;
             BGColorPicker.SelectedColorChanged += ColorPicker_SelectedColorChanged;
+            WindowName = DefaultWindowName;
         }
 
         private void PlaybackService_OnFrameChanged(PlaybackService obj)

AnimationEditor/Properties/AssemblyInfo.cs

@@ -10,9 +10,9 @@
 [assembly: AssemblyTitle("RSDK Animation Editor")]
 [assembly: AssemblyDescription("An animation editor for the animation files supported by the RSDK")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Xeeynamo/Rubberduckycooly/SuperSonic16")]
+[assembly: AssemblyCompany("Xeeynamo/Rubberduckycooly/SuperSonic16/Carjem")]
 [assembly: AssemblyProduct("RSDK Animation Editor")]
-[assembly: AssemblyCopyright("Copyright ©  2017-2019")]
+[assembly: AssemblyCopyright("Copyright © 2017-2019")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 

AnimationEditor/Services/FileHandler.cs

@@ -54,12 +54,25 @@ public void OpenFile(string file, EngineType type = EngineType.Invalid)
         #endregion
 
         #region Load File Methods
+
+        private static string GetFilenameAndFolder(string path)
+        {
+            string dir = "";
+            string pth = Path.GetFileName(path);
+            string tmp = path.Replace(pth, "");
+            DirectoryInfo di = new DirectoryInfo(tmp);
+            dir = di.Name;
+            string displayPath = dir + "/" + pth;
+            return displayPath;
+        }
+
         public void LoadFile(string filepath, EngineType type = EngineType.Invalid)
         {
             try
             {
                 Instance.ViewModel.LoadedAnimationFile = new Animation(Instance.AnimationType);
                 Instance.ViewModel.AnimationFilepath = filepath;
+                Instance.WindowName = Instance.DefaultWindowName + " - " + GetFilenameAndFolder(filepath);
                 Instance.ViewModel.LoadedAnimationFile.ImportFrom((type != EngineType.Invalid ? type : Instance.AnimationType), filepath);
                 LoadAnimationTextures(filepath);
             }
@@ -89,9 +102,11 @@ public void LoadFile(OpenFileDialog fd)
                     Instance.AnimationType = EngineType.RSDKv5;
                     break;
                 case 1:
-                    MessageBoxResult result = RSDKrU.MessageBox.ShowYesNo("Which version is this animation file for?", "Help Me!", "RSDKv2 (Sonic CD)", "RSDKvB (Sonic 1/2 2013)");
-                    if (result == MessageBoxResult.Yes) Instance.AnimationType = EngineType.RSDKv2;
-                    else Instance.AnimationType = EngineType.RSDKvB;
+                    //vB and v2 are identical, no need to check, just pretend we know
+                    //MessageBoxResult result = RSDKrU.MessageBox.ShowYesNo("Which version is this animation file for?", "Help Me!", "RSDKv2 (Sonic CD)", "RSDKvB (Sonic 1/2 2013)");
+                    //if (result == MessageBoxResult.Yes)
+                        Instance.AnimationType = EngineType.RSDKv2;
+                    //else Instance.AnimationType = EngineType.RSDKvB;
                     break;
                 case 2:
                     Instance.AnimationType = EngineType.RSDKv1;
@@ -127,9 +142,11 @@ public void SaveFileAs()
                         Instance.AnimationType = EngineType.RSDKv5;
                         break;
                     case 1:
-                        MessageBoxResult result = RSDKrU.MessageBox.ShowYesNo("Which version is this animation file for?", "Help Me!", "RSDKv2 (Sonic CD)", "RSDKvB (Sonic 1/2 2013)");
-                        if (result == MessageBoxResult.Yes) Instance.AnimationType = EngineType.RSDKv2;
-                        else Instance.AnimationType = EngineType.RSDKvB;
+                        //v2 and vB are identical
+                        //MessageBoxResult result = RSDKrU.MessageBox.ShowYesNo("Which version is this animation file for?", "Help Me!", "RSDKv2 (Sonic CD)", "RSDKvB (Sonic 1/2 2013)");
+                        //if (result == MessageBoxResult.Yes)
+                            Instance.AnimationType = EngineType.RSDKv2;
+                        //else Instance.AnimationType = EngineType.RSDKvB;
                         break;
                     case 2:
                         Instance.AnimationType = EngineType.RSDKv1;
@@ -154,6 +171,7 @@ public void UnloadAnimationData()
             InitlizeSpriteSheets();
             Instance.ViewModel.NullSpriteSheetList.Clear();
             Instance.IntilizePlayback(true);
+            Instance.WindowName = Instance.DefaultWindowName;
         }
 
         public string GetImagePath(string path, string parentDirectory)
@@ -443,13 +461,13 @@ private EngineType GetInputGestureTextEngineType(string gesture)
 
             EngineType DetermineVersionManually()
             {
-                MessageBoxResult result = RSDKrU.MessageBox.ShowYesNoCancel("Which version is this animation file for?", "Help Me!", "RSDKv2 (CD)", "RSDKvB (Sonic 1/2)", "RSDKvRS (Retro Sonic)");
+                MessageBoxResult result = RSDKrU.MessageBox.ShowYesNoCancel("Which version is this animation file for?", "Help Me!", "RSDKv2/RSDKvB (CD/1/1)", "RSDKv1 (Sonic Nexus)", "RSDKvRS (Retro Sonic)");
                 switch (result)
                 {
                     case MessageBoxResult.Yes:
                         return EngineType.RSDKv2;
                     case MessageBoxResult.No:
-                        return EngineType.RSDKvB;
+                        return EngineType.RSDKv1;
                     case MessageBoxResult.Cancel:
                         return EngineType.RSDKvRS;
                     default:

AnimationEditor/ViewModels/MainViewModel.cs

@@ -446,8 +446,23 @@ public short GetY()
         }
         public ushort GetID()
         {
-            if (LoadedAnimationFile != null && SelectedAnimationIndex != -1 && SelectedFrameIndex != -1) return LoadedAnimationFile.Animations[SelectedAnimationIndex].Frames[SelectedFrameIndex].ID;
-            else return 0;
+            if (LoadedAnimationFile != null && SelectedAnimationIndex != -1 && SelectedFrameIndex != -1)
+            {
+                if (LoadedAnimationFile.engineType != EngineType.RSDKvRS)
+                {
+                    return LoadedAnimationFile.Animations[SelectedAnimationIndex].Frames[SelectedFrameIndex].ID;
+
+                }
+                else
+                {
+                    return LoadedAnimationFile.PlayerType;
+                }
+
+            }
+            else
+            {
+                return 0;
+            }
         }
         public short GetDelay()
         {
@@ -493,8 +508,21 @@ public void SetY(short? value)
         }
         public void SetID(ushort? value)
         {
-            if (LoadedAnimationFile != null && SelectedAnimationIndex != -1 && SelectedFrameIndex != -1 && value.HasValue) LoadedAnimationFile.Animations[SelectedAnimationIndex].Frames[SelectedFrameIndex].ID = value.Value;
-            else return;
+            if (LoadedAnimationFile != null && SelectedAnimationIndex != -1 && SelectedFrameIndex != -1 && value.HasValue)
+            {
+                if (LoadedAnimationFile.engineType == EngineType.RSDKvRS)
+                {
+                    LoadedAnimationFile.PlayerType = (byte)value.Value;
+                }
+                else
+                {
+                    LoadedAnimationFile.Animations[SelectedAnimationIndex].Frames[SelectedFrameIndex].ID = value.Value;
+                }
+            }
+            else
+            {
+                return;
+            }
         }
         public void SetDelay(short? value)
         {