Merge branch 'dev'

# Conflicts: # TerrLauncherPackCreator/Properties/AssemblyInfo.cs
And42 · Aug 19, 2020 · c23753d · c23753d
2 parents 893b293 + 494c699
commit c23753d
Show file tree

Hide file tree

Showing 22 changed files with 432 additions and 49 deletions.
diff --git a/TerrLauncherPackCreator/Code/Converters/TextureModelToAnimateInGuiVisibility.cs b/TerrLauncherPackCreator/Code/Converters/TextureModelToAnimateInGuiVisibility.cs
@@ -9,6 +9,9 @@ namespace TerrLauncherPackCreator.Code.Converters
 {
     public class TextureModelToAnimateInGuiVisibility : IMultiValueConverter
     {
+        private static readonly object VisibleObject = Visibility.Visible;
+        private static readonly object CollapsedObject = Visibility.Collapsed;
+
         public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture)
         {
             Debug.Assert(targetType == typeof(Visibility));
@@ -17,8 +20,8 @@ public object Convert(object[] values, Type targetType, object parameter, Cultur
             TextureFileInfo.TextureType currentTextureType = (TextureFileInfo.TextureType) values[1];
 
             return animated && currentTextureType == TextureFileInfo.TextureType.Item
-                ? Visibility.Visible
-                : Visibility.Collapsed;
+                ? VisibleObject
+                : CollapsedObject;
         }
 
         public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture)

diff --git a/TerrLauncherPackCreator/Code/Converters/TextureModelToFrameTimeVisibility.cs b/TerrLauncherPackCreator/Code/Converters/TextureModelToFrameTimeVisibility.cs
@@ -1,26 +1,32 @@
 using System;
+using System.Collections.Generic;
 using System.Diagnostics;
 using System.Globalization;
 using System.Windows;
 using System.Windows.Data;
-using TerrLauncherPackCreator.Code.Json;
+using static TerrLauncherPackCreator.Code.Json.TextureFileInfo;
 
 namespace TerrLauncherPackCreator.Code.Converters
 {
     public class TextureModelToFrameTimeVisibility : IMultiValueConverter
     {
+        private static readonly IList<TextureType> FrameVisibleTypes = new List<TextureType> {
+            TextureType.Item,
+            TextureType.Npc,
+            TextureType.Buff,
+            TextureType.Extra
+        };
+        private static readonly object VisibleObject = Visibility.Visible;
+        private static readonly object CollapsedObject = Visibility.Collapsed;
+
         public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture)
         {
             Debug.Assert(targetType == typeof(Visibility));
 
             bool animated = (bool) values[0];
-            TextureFileInfo.TextureType currentTextureType = (TextureFileInfo.TextureType) values[1];
+            TextureType currentTextureType = (TextureType) values[1];
 
-            return animated && (currentTextureType == TextureFileInfo.TextureType.Item ||
-                                currentTextureType == TextureFileInfo.TextureType.Npc ||
-                                currentTextureType == TextureFileInfo.TextureType.Buff)
-                ? Visibility.Visible
-                : Visibility.Collapsed;
+            return animated && FrameVisibleTypes.Contains(currentTextureType) ? VisibleObject : CollapsedObject;
         }
 
         public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture)

diff --git a/TerrLauncherPackCreator/Code/Converters/TextureModelToVerticalFramesVisibility.cs b/TerrLauncherPackCreator/Code/Converters/TextureModelToVerticalFramesVisibility.cs
@@ -1,25 +1,31 @@
 using System;
+using System.Collections.Generic;
 using System.Diagnostics;
 using System.Globalization;
 using System.Windows;
 using System.Windows.Data;
-using TerrLauncherPackCreator.Code.Json;
+using static TerrLauncherPackCreator.Code.Json.TextureFileInfo;
 
 namespace TerrLauncherPackCreator.Code.Converters
 {
     public class TextureModelToVerticalFramesVisibility : IMultiValueConverter
     {
+        private static readonly IList<TextureType> VerticalFramesVisibleTypes = new List<TextureType> {
+            TextureType.Item,
+            TextureType.Buff,
+            TextureType.Extra
+        };
+        private static readonly object VisibleObject = Visibility.Visible;
+        private static readonly object CollapsedObject = Visibility.Collapsed;
+
         public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture)
         {
             Debug.Assert(targetType == typeof(Visibility));
 
             bool animated = (bool) values[0];
-            TextureFileInfo.TextureType currentTextureType = (TextureFileInfo.TextureType) values[1];
+            TextureType currentTextureType = (TextureType) values[1];
 
-            return animated && (currentTextureType == TextureFileInfo.TextureType.Item ||
-                                currentTextureType == TextureFileInfo.TextureType.Buff)
-                ? Visibility.Visible
-                : Visibility.Collapsed;
+            return animated && VerticalFramesVisibleTypes.Contains(currentTextureType) ? VisibleObject : CollapsedObject;
         }
 
         public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture)

diff --git a/TerrLauncherPackCreator/Code/Converters/TextureTypeToStringConverter.cs b/TerrLauncherPackCreator/Code/Converters/TextureTypeToStringConverter.cs
@@ -19,23 +19,26 @@ public object Convert(object value, Type targetType, object parameter, CultureIn
                 TextureFileInfo.TextureType.Item => StringResources.TextureTypeItem,
                 TextureFileInfo.TextureType.Npc => StringResources.TextureTypeNpc,
                 TextureFileInfo.TextureType.Buff => StringResources.TextureTypeBuff,
+                TextureFileInfo.TextureType.Extra => StringResources.TextureTypeExtra,
                 _ => throw new ArgumentOutOfRangeException(nameof(value), value, null)
             };
         }
 
         public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
         {
-            if (!(value is string casted))
+            if (!(value is string cast))
                 return null;
 
-            if (casted == StringResources.TextureTypeGeneral)
+            if (cast == StringResources.TextureTypeGeneral)
                 return TextureFileInfo.TextureType.General;
-            if (casted == StringResources.TextureTypeItem)
+            if (cast == StringResources.TextureTypeItem)
                 return TextureFileInfo.TextureType.Item;
-            if (casted == StringResources.TextureTypeNpc)
+            if (cast == StringResources.TextureTypeNpc)
                 return TextureFileInfo.TextureType.Npc;
-            if (casted == StringResources.TextureTypeBuff)
+            if (cast == StringResources.TextureTypeBuff)
                 return TextureFileInfo.TextureType.Buff;
+            if (cast == StringResources.TextureTypeExtra)
+                return TextureFileInfo.TextureType.Extra;
             return null;
         }
     }

diff --git a/TerrLauncherPackCreator/Code/Enums/FileType.cs b/TerrLauncherPackCreator/Code/Enums/FileType.cs
@@ -6,17 +6,16 @@ public enum FileType
         Map,
         Character,
         Gui,
-        Translation
-        // todo: add
-//        Audio,
-//        Font,
+        Translation,
+        Font,
+        Audio
     }
 }
 
 namespace TerrLauncherPackCreator.Code.Utils
 {
     public static partial class PackUtils
     {
-        public const int TotalFileTypes = 5;
+        public const int TotalFileTypes = 7;
     }
 }
diff --git a/TerrLauncherPackCreator/Code/Implementations/FileConverter.cs b/TerrLauncherPackCreator/Code/Implementations/FileConverter.cs
@@ -41,7 +41,7 @@ public class FileConverter : IFileConverter
                 throw new FileNotFoundException("File not found", targetFile);
 
             {
-                const int fileTypesHandled = 5;
+                const int fileTypesHandled = 7;
                 const int _ = 1 / (fileTypesHandled / PackUtils.TotalFileTypes) +
                               1 / (PackUtils.TotalFileTypes / fileTypesHandled);
             }
@@ -58,12 +58,14 @@ public class FileConverter : IFileConverter
                     FileType.Character => JsonConvert.DeserializeObject<CharacterFileInfo>(configText),
                     FileType.Gui => JsonConvert.DeserializeObject<GuiFileInfo>(configText),
                     FileType.Translation => JsonConvert.DeserializeObject<TranslationFileInfo>(configText),
+                    FileType.Font => JsonConvert.DeserializeObject<FontFileInfo>(configText),
+                    FileType.Audio => JsonConvert.DeserializeObject<AudioFileInfo>(configText),
                     _ => throw new ArgumentOutOfRangeException()
                 };
             }
 
             {
-                const int fileTypesHandled = 5;
+                const int fileTypesHandled = 7;
                 const int _ = 1 / (fileTypesHandled / PackUtils.TotalFileTypes) +
                               1 / (PackUtils.TotalFileTypes / fileTypesHandled);
             }
@@ -77,6 +79,8 @@ public class FileConverter : IFileConverter
                 case FileType.Character:
                 case FileType.Gui:
                 case FileType.Translation:
+                case FileType.Font:
+                case FileType.Audio:
                     string uniqueFile = ApplicationDataUtils.GenerateNonExistentFilePath();
                     IOUtils.EnsureParentDirExists(uniqueFile);
                     File.Copy(targetFile, uniqueFile, overwrite: false);

diff --git a/TerrLauncherPackCreator/Code/Json/AudioFileInfo.cs b/TerrLauncherPackCreator/Code/Json/AudioFileInfo.cs
@@ -0,0 +1,18 @@
+using Newtonsoft.Json;
+using TerrLauncherPackCreator.Code.Interfaces;
+
+namespace TerrLauncherPackCreator.Code.Json {
+
+    public class AudioFileInfo : IPackFileInfo
+    {
+        [JsonProperty("entry_name")]
+        public string EntryName { get; set; }
+
+        public AudioFileInfo() {}
+
+        public AudioFileInfo(string entryName)
+        {
+            EntryName = entryName;
+        }
+    }
+}
diff --git a/TerrLauncherPackCreator/Code/Json/FontFileInfo.cs b/TerrLauncherPackCreator/Code/Json/FontFileInfo.cs
@@ -0,0 +1,18 @@
+using Newtonsoft.Json;
+using TerrLauncherPackCreator.Code.Interfaces;
+
+namespace TerrLauncherPackCreator.Code.Json {
+
+    public class FontFileInfo : IPackFileInfo
+    {
+        [JsonProperty("entry_name")]
+        public string EntryName { get; set; }
+
+        public FontFileInfo() {}
+
+        public FontFileInfo(string entryName)
+        {
+            EntryName = entryName;
+        }
+    }
+}
diff --git a/TerrLauncherPackCreator/Code/Json/TextureFileInfo.cs b/TerrLauncherPackCreator/Code/Json/TextureFileInfo.cs
@@ -10,7 +10,8 @@ public enum TextureType
             General = 0,
             Item = 1,
             Npc = 2,
-            Buff = 3
+            Buff = 3,
+            Extra = 4
         }
 
         [JsonProperty("type")]
@@ -36,5 +37,8 @@ public enum TextureType
 
         [JsonProperty("milliseconds_per_frame")]
         public int MillisecondsPerFrame { get; set; } = 100;
+
+        [JsonProperty("apply_original_size")]
+        public bool ApplyOriginalSize { get; set; } = true;
     }
 }
diff --git a/TerrLauncherPackCreator/Code/Models/ModifiedAudioModel.cs b/TerrLauncherPackCreator/Code/Models/ModifiedAudioModel.cs
@@ -0,0 +1,39 @@
+using System.Collections.ObjectModel;
+using System.IO;
+using JetBrains.Annotations;
+
+namespace TerrLauncherPackCreator.Code.Models
+{
+    public class ModifiedAudioModel : ModifiedFileModel
+    {
+        [CanBeNull]
+        public string Prefix
+        {
+            get => _prefix;
+            set => SetProperty(ref _prefix, value);
+        }
+        private string _prefix;
+
+        [CanBeNull]
+        public string Name
+        {
+            get => _name;
+            set => SetProperty(ref _name, value);
+        }
+        private string _name;
+
+        [NotNull]
+        public ObservableCollection<string> CommonPrefixes { get; }
+
+        public ModifiedAudioModel([NotNull] string filePath, bool isDragDropTarget) : base(filePath, isDragDropTarget)
+        {
+            _name = Path.GetFileNameWithoutExtension(filePath);
+            CommonPrefixes = new ObservableCollection<string>
+            {
+                "",
+                "Content/Sounds"
+            };
+            Prefix = CommonPrefixes[1];
+        }
+    }
+}
diff --git a/TerrLauncherPackCreator/Code/Models/ModifiedFontModel.cs b/TerrLauncherPackCreator/Code/Models/ModifiedFontModel.cs
@@ -0,0 +1,39 @@
+using System.Collections.ObjectModel;
+using System.IO;
+using JetBrains.Annotations;
+
+namespace TerrLauncherPackCreator.Code.Models
+{
+    public class ModifiedFontModel : ModifiedFileModel
+    {
+        [CanBeNull]
+        public string Prefix
+        {
+            get => _prefix;
+            set => SetProperty(ref _prefix, value);
+        }
+        private string _prefix;
+
+        [CanBeNull]
+        public string Name
+        {
+            get => _name;
+            set => SetProperty(ref _name, value);
+        }
+        private string _name;
+
+        [NotNull]
+        public ObservableCollection<string> CommonPrefixes { get; }
+
+        public ModifiedFontModel([NotNull] string filePath, bool isDragDropTarget) : base(filePath, isDragDropTarget)
+        {
+            _name = Path.GetFileNameWithoutExtension(filePath);
+            CommonPrefixes = new ObservableCollection<string>
+            {
+                "",
+                "Content/Fonts"
+            };
+            _prefix = CommonPrefixes[1];
+        }
+    }
+}
diff --git a/TerrLauncherPackCreator/Code/Models/ModifiedTextureModel.cs b/TerrLauncherPackCreator/Code/Models/ModifiedTextureModel.cs
@@ -72,6 +72,13 @@ public int MillisecondsPerFrame
             set => SetProperty(ref _millisecondsPerFrame, value);
         }
         private int _millisecondsPerFrame;
+
+        public bool ApplyOriginalSize
+        {
+            get => _applyOriginalSize;
+            set => SetProperty(ref _applyOriginalSize, value);
+        }
+        private bool _applyOriginalSize;
 
         [NotNull]
         public ObservableCollection<string> CommonPrefixes { get; }
@@ -87,6 +94,7 @@ public ModifiedTextureModel([NotNull] string filePath, bool isDragDropTarget) :
             _millisecondsPerFrame = 100;
             _numberOfHorizontalFrames = 1;
             _numberOfVerticalFrames = 1;
+            _applyOriginalSize = true;
             CommonPrefixes = new ObservableCollection<string>
             {
                 "",
@@ -97,7 +105,8 @@ public ModifiedTextureModel([NotNull] string filePath, bool isDragDropTarget) :
                 TextureFileInfo.TextureType.General,
                 TextureFileInfo.TextureType.Item,
                 TextureFileInfo.TextureType.Npc,
-                TextureFileInfo.TextureType.Buff
+                TextureFileInfo.TextureType.Buff,
+                TextureFileInfo.TextureType.Extra
             };
             _prefix = CommonPrefixes[1];
         }

diff --git a/TerrLauncherPackCreator/Code/TemplateSelectors/ModifiedFileTemplateSelector.cs b/TerrLauncherPackCreator/Code/TemplateSelectors/ModifiedFileTemplateSelector.cs
@@ -17,7 +17,7 @@ public override DataTemplate SelectTemplate(object item, DependencyObject contai
             var containerUi = (FrameworkElement) container;
 
             {
-                const int fileTypesHandled = 5;
+                const int fileTypesHandled = 7;
                 const int _ = 1 / (fileTypesHandled / PackUtils.TotalFileTypes) +
                               1 / (PackUtils.TotalFileTypes / fileTypesHandled);
             }
@@ -33,6 +33,9 @@ public override DataTemplate SelectTemplate(object item, DependencyObject contai
                 case ModifiedGuiModel _:
                     resourceName = "ModifiedGuiTemplate";
                     break;
+                case ModifiedFontModel _:
+                    resourceName = "ModifiedFontTemplate";
+                    break;
                 case ModifiedMapModel _:
                     resourceName = "ModifiedMapTemplate";
                     break;
@@ -42,6 +45,9 @@ public override DataTemplate SelectTemplate(object item, DependencyObject contai
                 case ModifiedTranslationModel _:
                     resourceName = "ModifiedTranslationTemplate";
                     break;
+                case ModifiedAudioModel _:
+                    resourceName = "ModifiedAudioTemplate";
+                    break;
                 default:
                     resourceName = "ModifiedFileDataTemplate";
                     break;