Merge pull request #122 from NotCoffee418/dev

Dev

TrinityCreator/DBC/DBCQuery.cs → TrinityCreator.Shared/DBC/DBCQuery.cs

@@ -5,7 +5,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace TrinityCreator.DBC
+namespace TrinityCreator.Shared.DBC
 {
     class DBCQuery
     {
@@ -61,19 +61,19 @@ public static DataTable GetQuestSortNames()
                 new string[] { "id", "name" });
         }
 
-        internal static DataTable GetSpells()
+        public static DataTable GetSpells()
         {
             return DbcHandler.LoadDbc("Spell", 
                 new string[] { "m_ID", "m_name_lang_1", "m_description_lang_1" });
         }
 
-        internal static DataTable GetMap()
+        public static DataTable GetMap()
         {
             return DbcHandler.LoadDbc("Map", 
                 new string[] { "m_ID", "m_MapName_lang1" });
         }
 
-        internal static DataTable GetFaction()
+        public static DataTable GetFaction()
         {
             // basic factions
             var result = DbcHandler.LoadDbc("Faction", new string[] { "m_ID", "m_name_lang_1" });
@@ -84,14 +84,14 @@ internal static DataTable GetFaction()
             return result;
         }
 
-        internal static DataTable GetCharTitles()
+        public static DataTable GetCharTitles()
         {
             return DbcHandler.LoadDbc("CharTitles", 
                 new string[] { "field0", "field2" });
         }
 
 
-        internal static DataTable GetEmotes()
+        public static DataTable GetEmotes()
         {
             return DbcHandler.LoadDbc("Emotes",
                 new string[] { "id", "description" });

TrinityCreator/DBC/DbcHandler.cs → TrinityCreator.Shared/DBC/DbcHandler.cs

@@ -11,10 +11,10 @@
 using DBCViewer;
 using System.Globalization;
 using System.Xml;
-using TrinityCreator.UI;
-using TrinityCreator.Helpers;
+using TrinityCreator.Shared.Helpers;
+using TrinityCreator.Shared.UI;
 
-namespace TrinityCreator.DBC
+namespace TrinityCreator.Shared.DBC
 {
     class DbcHandler
     {

TrinityCreator/Data/CExceptions.cs → TrinityCreator.Shared/Data/CExceptions.cs

@@ -4,7 +4,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace TrinityCreator.Data
+namespace TrinityCreator.Shared.Data
 {
     class CExceptions
     {

TrinityCreator/Data/Coordinate.cs → TrinityCreator.Shared/Data/Coordinate.cs

@@ -4,9 +4,9 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using TrinityCreator.Database;
+using TrinityCreator.Shared.Database;
 
-namespace TrinityCreator.Data
+namespace TrinityCreator.Shared.Data
 {
     public class Coordinate
     {

TrinityCreator/Data/CreatureFamily.cs → TrinityCreator.Shared/Data/CreatureFamily.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace TrinityCreator.Data
+namespace TrinityCreator.Shared.Data
 {
     public class CreatureFamily : IKeyValue
     {
@@ -10,7 +10,7 @@ public CreatureFamily(int id, string description, int petSpellDataId = 0)
             Description = description;
             PetSpellDataId = petSpellDataId;
         }
-        public int PetSpellDataId { get; internal set; }
+        public int PetSpellDataId { get; set; }
         public override string ToString()
         {
             return Description;

TrinityCreator/Data/Currency.cs → TrinityCreator.Shared/Data/Currency.cs

@@ -3,7 +3,7 @@
 using System.Linq;
 using System.Windows;
 
-namespace TrinityCreator.Data
+namespace TrinityCreator.Shared.Data
 {
     public class Currency : INotifyPropertyChanged
     {

TrinityCreator.Shared/Data/CustomDisplayField.cs

@@ -0,0 +1,121 @@
+using System;
+using System.ComponentModel;
+using System.Text.RegularExpressions;
+using TrinityCreator.Shared.Profiles;
+
+namespace TrinityCreator.Shared.Data
+{
+    /// <summary>
+    /// See documentation for more info on how to use this
+    /// </summary>
+    public class CustomDisplayField : INotifyPropertyChanged
+    {
+        // field
+        private string _inputValue = string.Empty;
+
+        /// <summary>
+        /// Table Name
+        /// </summary>
+        public string Table { get; private set; }
+
+        /// <summary>
+        /// Column Name
+        /// </summary>
+        public string Column { get; private set; }
+
+        /// <summary>
+        /// Display Name
+        /// </summary>
+        public string DisplayName { get; private set; }
+
+        /// <summary>
+        /// Full custom field name, used by Exporter
+        /// </summary>
+        public string FullCustomFieldName { get; private set; }
+
+        /// <summary>
+        /// Export type
+        /// </summary>
+        public Export.C ExportType { get; private set; }
+
+        /// <summary>
+        /// Value input by user for export
+        /// </summary>
+        public string InputValue
+        {
+            get 
+            { 
+                return _inputValue;
+            }
+            set 
+            {
+                _inputValue = value;
+                RaisePropertyChanged("InputValue");
+            }
+        }
+
+
+        public event PropertyChangedEventHandler PropertyChanged;
+
+        /// <summary>
+        /// Creates a CustomDisplayField using the information defined in profile
+        /// </summary>
+        /// <param name="databaseTable">database real table name</param>
+        /// <param name="databaseColumn">database real table column</param>
+        /// <param name="fullCustomFieldName">eg. Creature.CustomInt.MyCustomDisplayName</param>
+        /// <returns></returns>
+        public static CustomDisplayField Create(
+            string databaseTable,
+            string databaseColumn,
+            string fullCustomFieldName)
+        {
+            Regex regex = new Regex(
+                @"(Item|Quest|Creature)\.Custom(Int|Float|Text)\.(.+)");
+
+            // return null if not valid or not custom DISPLAY
+            if (!regex.IsMatch(fullCustomFieldName))
+                return null;
+            var result = new CustomDisplayField()
+            {
+                Table = databaseTable,
+                Column = databaseColumn,
+                FullCustomFieldName = fullCustomFieldName
+            };
+
+            var match = regex.Match(fullCustomFieldName);
+
+            // Deternine the creator / export type
+            switch (match.Groups[1].Value)
+            {
+                case "Item":
+                    result.ExportType = Export.C.Item;
+                    break;
+                case "Quest":
+                    result.ExportType = Export.C.Quest;
+                    break;
+                case "Creature":
+                    result.ExportType = Export.C.Creature;
+                    break;
+                default:
+                    throw new ArgumentException(
+                        match.Groups[1].Value + " is not a supported creator for custom display fields.");
+            }
+
+            // Grab DisplayName
+            result.DisplayName = match.Groups[3].Value;
+
+            // Set default value to 0 if type is numeric
+            if (match.Groups[2].Value == "Int" || match.Groups[2].Value == "Float")
+                result.InputValue = "0";
+
+            // Create object and return
+            return result;
+        }
+
+        private void RaisePropertyChanged(string property)
+        {
+            if (PropertyChanged != null)
+                PropertyChanged(this, new PropertyChangedEventArgs(property));
+        }
+    }
+}

TrinityCreator/Data/Damage.cs → TrinityCreator.Shared/Data/Damage.cs

@@ -1,6 +1,6 @@
 using System.ComponentModel;
 
-namespace TrinityCreator.Data
+namespace TrinityCreator.Shared.Data
 {
     public class Damage : INotifyPropertyChanged
     {

TrinityCreator/Data/DamageType.cs → TrinityCreator.Shared/Data/DamageType.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace TrinityCreator.Data
+namespace TrinityCreator.Shared.Data
 {
     public class DamageType : IKeyValue
     {

TrinityCreator/Data/IKeyValue.cs → TrinityCreator.Shared/Data/IKeyValue.cs

@@ -1,4 +1,4 @@
-namespace TrinityCreator.Data
+namespace TrinityCreator.Shared.Data
 {
     public abstract class IKeyValue
     {

TrinityCreator/Data/ItemClass.cs → TrinityCreator.Shared/Data/ItemClass.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace TrinityCreator.Data
+namespace TrinityCreator.Shared.Data
 {
     public class ItemClass : IKeyValue
     {

TrinityCreator/Data/ItemInventoryType.cs → TrinityCreator.Shared/Data/ItemInventoryType.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace TrinityCreator.Data
+namespace TrinityCreator.Shared.Data
 {
     public class ItemInventoryType : IKeyValue
     {
@@ -11,7 +11,7 @@ public ItemInventoryType(int id, string description, int sheath = 0)
 
         public int Sheath { get; set; }
 
-        internal static ItemInventoryType[] GetAllInventoryTypes()
+        public static ItemInventoryType[] GetAllInventoryTypes()
         {
             var result = new List<ItemInventoryType>();
             result.AddRange(GetNonEquipable());

TrinityCreator/Data/ItemMaterial.cs → TrinityCreator.Shared/Data/ItemMaterial.cs

@@ -1,36 +1,36 @@
-namespace TrinityCreator.Data
+namespace TrinityCreator.Shared.Data
 {
     public class ItemMaterial : IKeyValue
     {
         public ItemMaterial(int id, string description)
             : base(id, description) { }
 
-        internal static ItemMaterial GetConsumable()
+        public static ItemMaterial GetConsumable()
         {
             return new ItemMaterial(-1, "Consumable");
         }
 
-        internal static ItemMaterial GetUndefined()
+        public static ItemMaterial GetUndefined()
         {
             return new ItemMaterial(1, "Not Defined");
         }
 
-        internal static ItemMaterial GetPlate()
+        public static ItemMaterial GetPlate()
         {
             return new ItemMaterial(6, "Plate");
         }
 
-        internal static ItemMaterial GetChain()
+        public static ItemMaterial GetChain()
         {
             return new ItemMaterial(5, "Chainmail");
         }
 
-        internal static ItemMaterial GetLeather()
+        public static ItemMaterial GetLeather()
         {
             return new ItemMaterial(8, "Leather");
         }
 
-        internal static ItemMaterial GetCloth()
+        public static ItemMaterial GetCloth()
         {
             return new ItemMaterial(7, "Cloth");
         }

TrinityCreator/Data/ItemQuality.cs → TrinityCreator.Shared/Data/ItemQuality.cs

@@ -2,7 +2,7 @@
 using System.Linq;
 using System.Windows.Media;
 
-namespace TrinityCreator.Data
+namespace TrinityCreator.Shared.Data
 {
     public class ItemQuality : IKeyValue, INotifyPropertyChanged
     {

TrinityCreator/Data/ItemSubClass.cs → TrinityCreator.Shared/Data/ItemSubClass.cs

@@ -1,6 +1,6 @@
 using System.ComponentModel;
 
-namespace TrinityCreator.Data
+namespace TrinityCreator.Shared.Data
 {
     public class ItemSubClass : IKeyValue, INotifyPropertyChanged
     {

TrinityCreator/Data/Socket.cs → TrinityCreator.Shared/Data/Socket.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Windows.Media.Imaging;
 
-namespace TrinityCreator.Data
+namespace TrinityCreator.Shared.Data
 {
     public class Socket : IKeyValue
     {
@@ -24,16 +24,16 @@ public static Socket[] GetSocketList()
             return new[]
             {
                 new Socket(1, "Meta",
-                    new BitmapImage(new Uri("pack://application:,,,/TrinityCreator;component/Resources/metasocket.png",
+                    new BitmapImage(new Uri("pack://application:,,,/TrinityCreator.Shared;component/Resources/metasocket.png",
                         UriKind.Absolute))),
                 new Socket(2, "Red",
-                    new BitmapImage(new Uri("pack://application:,,,/TrinityCreator;component/Resources/redsocket.png",
+                    new BitmapImage(new Uri("pack://application:,,,/TrinityCreator.Shared;component/Resources/redsocket.png",
                         UriKind.Absolute))),
                 new Socket(4, "Yellow",
                     new BitmapImage(new Uri(
-                        "pack://application:,,,/TrinityCreator;component/Resources/yellowsocket.png", UriKind.Absolute))),
+                        "pack://application:,,,/TrinityCreator.Shared;component/Resources/yellowsocket.png", UriKind.Absolute))),
                 new Socket(8, "Blue",
-                    new BitmapImage(new Uri("pack://application:,,,/TrinityCreator;component/Resources/bluesocket.png",
+                    new BitmapImage(new Uri("pack://application:,,,/TrinityCreator.Shared;component/Resources/bluesocket.png",
                         UriKind.Absolute)))
             };
         }

TrinityCreator/Data/TrainerData.cs → TrinityCreator.Shared/Data/TrainerData.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace TrinityCreator.Data
+namespace TrinityCreator.Shared.Data
 {
     public class TrainerData : IKeyValue
     {