diff --git a/ACSE.Core/ACSE.Core.csproj b/ACSE.Core/ACSE.Core.csproj new file mode 100644 index 0000000..524718d --- /dev/null +++ b/ACSE.Core/ACSE.Core.csproj @@ -0,0 +1,19 @@ + + + + netstandard2.0 + latest + + + + + + all + runtime; build; native; contentfiles; analyzers + + + + + + + diff --git a/Classes/Acre/Acre.cs b/ACSE.Core/Acres/Acre.cs similarity index 86% rename from Classes/Acre/Acre.cs rename to ACSE.Core/Acres/Acre.cs index db451f7..9d0cc49 100644 --- a/Classes/Acre/Acre.cs +++ b/ACSE.Core/Acres/Acre.cs @@ -1,7 +1,11 @@ using System; using System.IO; +using ACSE.Core.Debug; +using ACSE.Core.Items; +using ACSE.Core.Saves; +using ACSE.Core.Utilities; -namespace ACSE +namespace ACSE.Core.Acres { public class Acre { @@ -28,7 +32,9 @@ public class WorldAcre : Acre { public WorldItem[] AcreItems = new WorldItem[16 * 16]; - public WorldAcre(ushort acreId, int position, ushort[] items = null, byte[] buriedItemData = null, SaveType saveType = SaveType.AnimalCrossing, uint[] nlItems = null, int townPosition = -1) : base(acreId, position) + public WorldAcre(ushort acreId, int position, ushort[] items = null, byte[] buriedItemData = null, + SaveType saveType = SaveType.AnimalCrossing, uint[] nlItems = null, int townPosition = -1) : base(acreId, + position) { if (items != null) { @@ -36,7 +42,7 @@ public WorldAcre(ushort acreId, int position, ushort[] items = null, byte[] buri { AcreItems[i] = new WorldItem(items[i], i); if (buriedItemData != null) - SetBuried(AcreItems[i], townPosition == -1 ? position : townPosition, buriedItemData, saveType); //Broken in original save editor lol.. needs a position - 1 to function properly + SetBuried(AcreItems[i], townPosition == -1 ? position : townPosition, buriedItemData, saveType); } } else if (nlItems != null) @@ -54,13 +60,15 @@ public WorldAcre(ushort acreId, int position) : base(acreId, position) { } public WorldAcre(ushort acreId, int position, uint[] items = null, byte[] buriedItemData = null, SaveType saveType = SaveType.AnimalCrossing) : this(acreId, position, null, null, saveType, items) { } - public WorldAcre(ushort acreId, int position, WorldItem[] items, byte[] buriedItemData = null, SaveType saveType = SaveType.AnimalCrossing, int townPosition = -1) : base(acreId, position) + public WorldAcre(ushort acreId, int position, WorldItem[] items, byte[] buriedItemData = null, + SaveType saveType = SaveType.AnimalCrossing, int townPosition = -1) : base(acreId, position) { AcreItems = items; if (buriedItemData == null || townPosition <= -1) return; for (var i = 0; i < 256; i++) SetBuried(AcreItems[i], townPosition, buriedItemData, saveType); } + //TODO: Change BuriedData from byte[] to ushort[] and use updated code private static int GetBuriedDataLocation(WorldItem item, int acre, SaveType saveType) { @@ -68,11 +76,12 @@ private static int GetBuriedDataLocation(WorldItem item, int acre, SaveType save var worldPosition = 0; switch (saveType) { + //15 - item.Location.X because it's stored as a ushort in memory w/ reversed endianess case SaveType.AnimalCrossing: case SaveType.DoubutsuNoMoriEPlus: case SaveType.AnimalForestEPlus: case SaveType.CityFolk: - worldPosition = (acre * 256) + (15 - item.Location.X) + item.Location.Y * 16; //15 - item.Location.X because it's stored as a ushort in memory w/ reversed endianess + worldPosition = (acre * 256) + (15 - item.Location.X) + item.Location.Y * 16; break; case SaveType.WildWorld: worldPosition = (acre * 256) + item.Index; @@ -110,7 +119,7 @@ private static void SetBuried(WorldItem item, int acre, byte[] buriedItemData, S /// bool ItemsWereLoaded public bool LoadDefaultItems(Save saveFile) { - var defaultAcreDataFolder = MainForm.AssemblyLocation + Path.DirectorySeparatorChar + "Resources" + Path.DirectorySeparatorChar + "Default Acre Items"; + var defaultAcreDataFolder = Path.Combine(PathUtility.GetExeDirectory(), "Resources", "Default Acre Items"); switch (saveFile.SaveGeneration) { @@ -140,7 +149,7 @@ public bool LoadDefaultItems(Save saveFile) } catch { - MainForm.DebugManager.WriteLine( + DebugUtility.DebugManagerInstance.WriteLine( $"Unable to open default acre data for Acre Id 0x{BaseAcreId:X4}", DebugLevel.Error); } diff --git a/Classes/Catalog.cs b/ACSE.Core/BitFields/Catalog/Catalog.cs similarity index 97% rename from Classes/Catalog.cs rename to ACSE.Core/BitFields/Catalog/Catalog.cs index 1c7629f..538b65a 100644 --- a/Classes/Catalog.cs +++ b/ACSE.Core/BitFields/Catalog/Catalog.cs @@ -1,6 +1,8 @@ using System.Collections.Generic; +using ACSE.Core.Players; +using ACSE.Core.Saves; -namespace ACSE +namespace ACSE.Core.BitFields.Catalog { public static class Catalog { diff --git a/Classes/Encyclopedia.cs b/ACSE.Core/BitFields/Encyclopedia/Encyclopedia.cs similarity index 98% rename from Classes/Encyclopedia.cs rename to ACSE.Core/BitFields/Encyclopedia/Encyclopedia.cs index fe3ce9d..bcf024b 100644 --- a/Classes/Encyclopedia.cs +++ b/ACSE.Core/BitFields/Encyclopedia/Encyclopedia.cs @@ -1,6 +1,8 @@ using System.Collections.Generic; +using ACSE.Core.Players; +using ACSE.Core.Saves; -namespace ACSE +namespace ACSE.Core.BitFields.Encyclopedia { public static class Encyclopedia { @@ -280,8 +282,6 @@ private static Dictionary GetBitMap(SaveType saveType) case SaveType.WelcomeAmiibo: return WelcomeAmiiboEncyclopediaBitMap; default: - System.Windows.Forms.MessageBox.Show("Encylopedia data for this game has not been implemented yet!", "Unimplemented Notification", - System.Windows.Forms.MessageBoxButtons.OK, System.Windows.Forms.MessageBoxIcon.Information); return null; } } diff --git a/Classes/Museum.cs b/ACSE.Core/BitFields/Museum/Museum.cs similarity index 97% rename from Classes/Museum.cs rename to ACSE.Core/BitFields/Museum/Museum.cs index a64fedf..5cbb7cb 100644 --- a/Classes/Museum.cs +++ b/ACSE.Core/BitFields/Museum/Museum.cs @@ -1,4 +1,7 @@ -namespace ACSE +using ACSE.Core.Players; +using ACSE.Core.Saves; + +namespace ACSE.Core.BitFields.Museum { public static class Museum { diff --git a/Classes/SongLibrary.cs b/ACSE.Core/BitFields/SongLibrary/SongLibrary.cs similarity index 96% rename from Classes/SongLibrary.cs rename to ACSE.Core/BitFields/SongLibrary/SongLibrary.cs index 1c75b5a..7a94441 100644 --- a/Classes/SongLibrary.cs +++ b/ACSE.Core/BitFields/SongLibrary/SongLibrary.cs @@ -1,6 +1,8 @@ using System.Collections.Generic; +using ACSE.Core.Players; +using ACSE.Core.Saves; -namespace ACSE +namespace ACSE.Core.BitFields.SongLibrary { public static class SongLibrary { @@ -110,8 +112,6 @@ private static Dictionary GetBitMap(SaveType saveType) case SaveType.WelcomeAmiibo: return WelcomeAmiiboSongLibraryBitMap; default: - System.Windows.Forms.MessageBox.Show("Songs for this game have not been implemented yet!", "Unimplemented Notification", - System.Windows.Forms.MessageBoxButtons.OK, System.Windows.Forms.MessageBoxIcon.Information); return null; } } diff --git a/Classes/Building.cs b/ACSE.Core/Buildings/Building.cs similarity index 98% rename from Classes/Building.cs rename to ACSE.Core/Buildings/Building.cs index c5b5606..bf09d07 100644 --- a/Classes/Building.cs +++ b/ACSE.Core/Buildings/Building.cs @@ -1,7 +1,8 @@ using System; using System.Collections.Generic; +using ACSE.Core.Saves; -namespace ACSE +namespace ACSE.Core.Buildings { /// /// Building class for editing buildings in City Folk & New Leaf. @@ -496,7 +497,7 @@ public static Building[] GetBuildings(Save save, bool islandBuildings = false) if (islandBuildings == false) for (var i = 0; i < 58; i++) { - var dataOffset = save.SaveDataStartOffset + MainForm.CurrentSaveInfo.SaveOffsets.Buildings + + var dataOffset = save.SaveDataStartOffset + Save.SaveInstance.SaveInfo.SaveOffsets.Buildings + i * 4; buildings.Add(new Building(save.ReadByte(dataOffset), save.ReadByte(dataOffset + 2), save.ReadByte(dataOffset + 3), save.SaveType)); @@ -506,7 +507,7 @@ public static Building[] GetBuildings(Save save, bool islandBuildings = false) for (var i = 0; i < 2; i++) { var dataOffset = save.SaveDataStartOffset + - MainForm.CurrentSaveInfo.SaveOffsets.IslandBuildings + i * 4; + Save.SaveInstance.SaveInfo.SaveOffsets.IslandBuildings + i * 4; buildings.Add(new Building(save.ReadByte(dataOffset), save.ReadByte(dataOffset + 2), save.ReadByte(dataOffset + 3), save.SaveType)); } diff --git a/Classes/DebugManager.cs b/ACSE.Core/Debug/DebugManager.cs similarity index 84% rename from Classes/DebugManager.cs rename to ACSE.Core/Debug/DebugManager.cs index 5012e63..6655fa6 100644 --- a/Classes/DebugManager.cs +++ b/ACSE.Core/Debug/DebugManager.cs @@ -1,7 +1,8 @@ using System; using System.IO; +using ACSE.Core.Saves; -namespace ACSE +namespace ACSE.Core.Debug { public enum DebugLevel { @@ -17,13 +18,18 @@ public class DebugManager private FileStream _logFile; private StreamWriter _logWriter; private const int MaxLogSize = 5000000; // 5MB Max Size - public bool Enabled; + public Save SaveFile; - public DebugManager() + public bool Enabled; + public DebugLevel Level; + + public DebugManager(Save saveFile, DebugLevel level = DebugLevel.Info) { + SaveFile = saveFile; + Level = level; CheckAndDeleteLogFile(); - if (Properties.Settings.Default.DebugLevel > 0) + if (level > 0) { InitializeDebugLogWriter(); Enabled = true; @@ -86,7 +92,7 @@ public static string GetLogFilePath() => public void WriteLine(string contents, DebugLevel level = DebugLevel.Info) { - if (_logWriter == null || level > Properties.Settings.Default.DebugLevel) return; + if (_logWriter == null || level > Level) return; if (!CheckLogSizeOk()) { CloseDebugLogWriter(); @@ -95,7 +101,7 @@ public void WriteLine(string contents, DebugLevel level = DebugLevel.Info) } _logWriter.WriteLine( - $"[{level}] - ({(MainForm.SaveFile != null ? MainForm.SaveFile.SaveType.ToString().Replace("_", " ") : "No Save")}) - {DateTime.Now} => {contents}"); + $"[{level}] - ({(SaveFile != null ? SaveFile.SaveType.ToString().Replace("_", " ") : "No Save")}) - {DateTime.Now} => {contents}"); _logWriter.Flush(); } } diff --git a/Classes/Emotion.cs b/ACSE.Core/Emotions/Emotion.cs similarity index 95% rename from Classes/Emotion.cs rename to ACSE.Core/Emotions/Emotion.cs index 1b6ddf2..71439a1 100644 --- a/Classes/Emotion.cs +++ b/ACSE.Core/Emotions/Emotion.cs @@ -1,4 +1,7 @@ -namespace ACSE +using ACSE.Core.Players; +using ACSE.Core.Saves; + +namespace ACSE.Core.Emotions { public static class Emotion { diff --git a/Classes/NewLeafInt32.cs b/ACSE.Core/Encryption/NewLeafInt32.cs similarity index 92% rename from Classes/NewLeafInt32.cs rename to ACSE.Core/Encryption/NewLeafInt32.cs index 6e047bd..57cd3ba 100644 --- a/Classes/NewLeafInt32.cs +++ b/ACSE.Core/Encryption/NewLeafInt32.cs @@ -1,9 +1,10 @@ using System; +using ACSE.Core.Utilities; -namespace ACSE +namespace ACSE.Core.Encryption { /* - * Animal Crossing: New Leaf (and Welcome Amiibo) Interger Encryption Documentation + * Animal Crossing: New Leaf (and Welcome Amiibo) Integer Encryption Documentation * * Animal Crossing: New Leaf uses a combination of methods to obfuscate their integer values in the save file. * The encryption consists of two integer values. The first integer is the encrypted integer. The second integer contains the checksum of the encryption and @@ -52,7 +53,7 @@ public NewLeafInt32(uint intA, uint intB) if (intChecksum != computedChecksum) { - MainForm.DebugManager.WriteLine( + DebugUtility.DebugManagerInstance.WriteLine( $"Encrypted Int had an invalid Checksum! Checksum: 0x{intChecksum:X2} | Calculated Checksum: 0x{computedChecksum:X2}"); Int1 = 0; Int2 = 0; @@ -71,7 +72,7 @@ public NewLeafInt32(uint intA, uint intB) } else { - MainForm.DebugManager.WriteLine("Invalid Shift Count was detected!", DebugLevel.Info); + DebugUtility.DebugManagerInstance.WriteLine("Invalid Shift Count was detected!"); Value = (intA << rightShiftCount) - (adjustValue + 0x8F187432); Valid = true; // Is this right? } diff --git a/Classes/Enums.cs b/ACSE.Core/Enums/Enums.cs similarity index 87% rename from Classes/Enums.cs rename to ACSE.Core/Enums/Enums.cs index 331ce8c..8ce5044 100644 --- a/Classes/Enums.cs +++ b/ACSE.Core/Enums/Enums.cs @@ -1,6 +1,6 @@ -namespace ACSE +namespace ACSE.Core.Enums { - // TODO: Move all enums to this file + // TODO: Split all enums into their own files. public enum AnimalCrossingGrassType : byte { Triangle = 0, diff --git a/Classes/Extensions/ArrayExtensions.cs b/ACSE.Core/Extensions/ArrayExtensions.cs similarity index 100% rename from Classes/Extensions/ArrayExtensions.cs rename to ACSE.Core/Extensions/ArrayExtensions.cs diff --git a/Classes/Extensions/DataExtensions.cs b/ACSE.Core/Extensions/DataExtensions.cs similarity index 100% rename from Classes/Extensions/DataExtensions.cs rename to ACSE.Core/Extensions/DataExtensions.cs diff --git a/Classes/Extensions/EndianExtensions.cs b/ACSE.Core/Extensions/EndianExtensions.cs similarity index 100% rename from Classes/Extensions/EndianExtensions.cs rename to ACSE.Core/Extensions/EndianExtensions.cs diff --git a/Classes/Extensions/LinqExtensions.cs b/ACSE.Core/Extensions/LinqExtensions.cs similarity index 100% rename from Classes/Extensions/LinqExtensions.cs rename to ACSE.Core/Extensions/LinqExtensions.cs diff --git a/Classes/Extensions/MathExtensions.cs b/ACSE.Core/Extensions/MathExtensions.cs similarity index 100% rename from Classes/Extensions/MathExtensions.cs rename to ACSE.Core/Extensions/MathExtensions.cs diff --git a/Classes/Extensions/PointExtension.cs b/ACSE.Core/Extensions/PointExtension.cs similarity index 100% rename from Classes/Extensions/PointExtension.cs rename to ACSE.Core/Extensions/PointExtension.cs diff --git a/ACSE.Core/FodyWeavers.xml b/ACSE.Core/FodyWeavers.xml new file mode 100644 index 0000000..43fc6a6 --- /dev/null +++ b/ACSE.Core/FodyWeavers.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/Classes/Generators/GCNGenerator.cs b/ACSE.Core/Generators/GCNGenerator.cs similarity index 99% rename from Classes/Generators/GCNGenerator.cs rename to ACSE.Core/Generators/GCNGenerator.cs index 2935afb..d5945c0 100644 --- a/Classes/Generators/GCNGenerator.cs +++ b/ACSE.Core/Generators/GCNGenerator.cs @@ -1,9 +1,9 @@ using System; using System.Collections.Generic; -namespace ACSE.Generators +namespace ACSE.Core.Generators { - public class GCNGenerator : IGenerator + public sealed class GCNGenerator : IGenerator { private int _randomSeed = Environment.TickCount; diff --git a/Classes/Generators/Generator.cs b/ACSE.Core/Generators/Generator.cs similarity index 85% rename from Classes/Generators/Generator.cs rename to ACSE.Core/Generators/Generator.cs index 60f402d..8dac2b5 100644 --- a/Classes/Generators/Generator.cs +++ b/ACSE.Core/Generators/Generator.cs @@ -1,4 +1,6 @@ -namespace ACSE.Generators +using ACSE.Core.Saves; + +namespace ACSE.Core.Generators { public static class Generator { diff --git a/Classes/Generators/IGenerator.cs b/ACSE.Core/Generators/IGenerator.cs similarity index 73% rename from Classes/Generators/IGenerator.cs rename to ACSE.Core/Generators/IGenerator.cs index 4842b99..202e800 100644 --- a/Classes/Generators/IGenerator.cs +++ b/ACSE.Core/Generators/IGenerator.cs @@ -1,4 +1,4 @@ -namespace ACSE.Generators +namespace ACSE.Core.Generators { public interface IGenerator { diff --git a/Classes/House/House.cs b/ACSE.Core/Housing/House.cs similarity index 92% rename from Classes/House/House.cs rename to ACSE.Core/Housing/House.cs index e708ebc..fa81156 100644 --- a/Classes/House/House.cs +++ b/ACSE.Core/Housing/House.cs @@ -1,7 +1,11 @@ -using ACSE.Utilities; -using System.Reflection; +using System.Reflection; +using ACSE.Core.Encryption; +using ACSE.Core.Items; +using ACSE.Core.Players; +using ACSE.Core.Saves; +using ACSE.Core.Utilities; -namespace ACSE +namespace ACSE.Core.Housing { public class House { @@ -17,20 +21,20 @@ public House(int index, int offset, int roomCount = -1, int roomStart = -1) Index = index; Offset = offset; - var houseSize = HouseInfo.GetHouseSize(offset, MainForm.SaveFile.SaveType); + var houseSize = HouseInfo.GetHouseSize(offset, Save.SaveInstance.SaveType); var basement = false; //Console.WriteLine("House Index: " + Index); //Console.WriteLine("House Offset: 0x" + Offset.ToString("X")); //Console.WriteLine("House Size: " + HouseSize.ToString()); - if (MainForm.SaveFile.SaveGeneration == SaveGeneration.N64 || MainForm.SaveFile.SaveGeneration == SaveGeneration.GCN) + if (Save.SaveInstance.SaveGeneration == SaveGeneration.N64 || Save.SaveInstance.SaveGeneration == SaveGeneration.GCN) { - basement = HouseInfo.HasBasement(offset, MainForm.SaveFile.SaveType); + basement = HouseInfo.HasBasement(offset, Save.SaveInstance.SaveType); //Console.WriteLine("Basement: " + Basement.ToString()); } // Load House Data - var offsets = HouseInfo.GetHouseOffsets(MainForm.SaveFile.SaveType); - var saveData = MainForm.SaveFile; + var offsets = HouseInfo.GetHouseOffsets(Save.SaveInstance.SaveType); + var saveData = Save.SaveInstance; var playerDataType = typeof(HouseData); var playerSaveInfoType = typeof(HouseOffsets); object boxedData = new HouseData(); @@ -156,7 +160,7 @@ public House(int index, int offset, int roomCount = -1, int roomStart = -1) public virtual void Write() { - var saveData = MainForm.SaveFile; + var saveData = Save.SaveInstance; var offsets = HouseInfo.GetHouseOffsets(saveData.SaveType); // Set House TownID & Name @@ -165,15 +169,15 @@ public virtual void Write() if (offsets.OwningPlayerName != -1 && offsets.TownId != -1) { Data.TownId = - saveData.ReadUInt16(saveData.SaveDataStartOffset + MainForm.CurrentSaveInfo.SaveOffsets.TownId, + saveData.ReadUInt16(saveData.SaveDataStartOffset + Save.SaveInstance.SaveInfo.SaveOffsets.TownId, saveData.IsBigEndian); // Might not be UInt16 in all games } if (offsets.OwningPlayerName != -1 && offsets.TownName != -1) { Data.TownName = saveData.ReadString( - saveData.SaveDataStartOffset + MainForm.CurrentSaveInfo.SaveOffsets.TownName, - MainForm.CurrentSaveInfo.SaveOffsets.TownNameSize); + saveData.SaveDataStartOffset + Save.SaveInstance.SaveInfo.SaveOffsets.TownName, + Save.SaveInstance.SaveInfo.SaveOffsets.TownNameSize); } if (offsets.OwningPlayerName != -1) diff --git a/Classes/House/HouseData.cs b/ACSE.Core/Housing/HouseData.cs similarity index 91% rename from Classes/House/HouseData.cs rename to ACSE.Core/Housing/HouseData.cs index 11f2d2e..a0046c8 100644 --- a/Classes/House/HouseData.cs +++ b/ACSE.Core/Housing/HouseData.cs @@ -1,8 +1,10 @@ using System; -using System.Reflection; -using ACSE.Utilities; +using ACSE.Core.Items; +using ACSE.Core.Patterns; +using ACSE.Core.Players; +using ACSE.Core.Saves; -namespace ACSE +namespace ACSE.Core.Housing { public struct HouseOffsets { @@ -69,7 +71,7 @@ public class Layer public void Write() { if (Items == null || Index <= -1) return; - var saveFile = MainForm.SaveFile; + var saveFile = Save.SaveInstance; if (saveFile.SaveGeneration == SaveGeneration.N3DS) { for (var i = 0; i < Items.Length; i++) @@ -105,7 +107,7 @@ public class Room public void Write() { - var saveFile = MainForm.SaveFile; + var saveFile = Save.SaveInstance; foreach (var l in Layers) { @@ -473,13 +475,13 @@ public static int GetHouseSize(int offset, SaveType saveType) switch (saveType) { case SaveType.AnimalCrossing: // NOTE: N64 & GameCube titles don't include Basement in the size - return (MainForm.SaveFile.SaveData[offset + 0x2A] >> 5) & 7; + return (Save.SaveInstance.SaveData[offset + 0x2A] >> 5) & 7; case SaveType.DoubutsuNoMoriPlus: case SaveType.DoubutsuNoMoriEPlus: case SaveType.AnimalForestEPlus: - return (MainForm.SaveFile.SaveData[offset + 0x26] >> 5) & 7; + return (Save.SaveInstance.SaveData[offset + 0x26] >> 5) & 7; case SaveType.WildWorld: - return MainForm.SaveFile.ReadByte(MainForm.SaveFile.SaveDataStartOffset + 0xFAF8) & 7; // Not sure about this + return Save.SaveInstance.ReadByte(Save.SaveInstance.SaveDataStartOffset + 0xFAF8) & 7; // Not sure about this default: return 0; } @@ -490,18 +492,18 @@ public static void SetHouseSize(int offset, SaveType saveType, int value) switch (saveType) { case SaveType.AnimalCrossing: // NOTE: N64 & GameCube titles don't include Basement in the size - MainForm.SaveFile.Write(offset + 0x2A, - (byte) (MainForm.SaveFile.ReadByte(offset + 0x2A) & ~(7 << 5) | ((value & 7) << 5))); + Save.SaveInstance.Write(offset + 0x2A, + (byte) (Save.SaveInstance.ReadByte(offset + 0x2A) & ~(7 << 5) | ((value & 7) << 5))); break; case SaveType.DoubutsuNoMoriPlus: case SaveType.DoubutsuNoMoriEPlus: case SaveType.AnimalForestEPlus: - MainForm.SaveFile.Write(offset + 0x26, - (byte) (MainForm.SaveFile.ReadByte(offset + 0x26) & ~(7 << 5) | ((value & 7) << 5))); + Save.SaveInstance.Write(offset + 0x26, + (byte) (Save.SaveInstance.ReadByte(offset + 0x26) & ~(7 << 5) | ((value & 7) << 5))); break; case SaveType.WildWorld: - offset = MainForm.SaveFile.SaveDataStartOffset + 0xFAF8; - MainForm.SaveFile.Write(offset, (byte) ((MainForm.SaveFile.ReadByte(offset) & ~7) | (value & 7))); // Not sure about this + offset = Save.SaveInstance.SaveDataStartOffset + 0xFAF8; + Save.SaveInstance.Write(offset, (byte) ((Save.SaveInstance.ReadByte(offset) & ~7) | (value & 7))); // Not sure about this break; } } @@ -511,12 +513,12 @@ public static bool HasStatue(int offset, SaveType saveType) switch (saveType) { case SaveType.DoubutsuNoMoriPlus: - return ((MainForm.SaveFile.ReadByte(offset + 0x26) >> 2) & 7) == 4; + return ((Save.SaveInstance.ReadByte(offset + 0x26) >> 2) & 7) == 4; case SaveType.AnimalCrossing: - return ((MainForm.SaveFile.ReadByte(offset + 0x2A) >> 2) & 7) == 4; + return ((Save.SaveInstance.ReadByte(offset + 0x2A) >> 2) & 7) == 4; case SaveType.DoubutsuNoMoriEPlus: case SaveType.AnimalForestEPlus: - return ((MainForm.SaveFile.ReadByte(offset + 0x26) >> 2) & 7) == 5; + return ((Save.SaveInstance.ReadByte(offset + 0x26) >> 2) & 7) == 5; default: return false; } @@ -529,16 +531,16 @@ public static void SetStatueEnabled(int offset, SaveType saveType, bool enabled) { case SaveType.DoubutsuNoMoriPlus: writeValue = enabled ? (4 << 2) : (5 << 2); - MainForm.SaveFile.Write(offset + 0x26, (byte)((MainForm.SaveFile.ReadByte(offset + 0x26) & ~(7 << 2) | writeValue))); + Save.SaveInstance.Write(offset + 0x26, (byte)((Save.SaveInstance.ReadByte(offset + 0x26) & ~(7 << 2) | writeValue))); break; case SaveType.AnimalCrossing: writeValue = enabled ? (4 << 2) : (5 << 2); - MainForm.SaveFile.Write(offset + 0x2A, (byte)((MainForm.SaveFile.ReadByte(offset + 0x2A) & ~(7 << 2) | writeValue))); + Save.SaveInstance.Write(offset + 0x2A, (byte)((Save.SaveInstance.ReadByte(offset + 0x2A) & ~(7 << 2) | writeValue))); break; case SaveType.DoubutsuNoMoriEPlus: case SaveType.AnimalForestEPlus: writeValue = enabled ? (5 << 2) : (6 << 2); - MainForm.SaveFile.Write(offset + 0x26, (byte)((MainForm.SaveFile.ReadByte(offset + 0x26) & ~(7 << 2) | writeValue))); + Save.SaveInstance.Write(offset + 0x26, (byte)((Save.SaveInstance.ReadByte(offset + 0x26) & ~(7 << 2) | writeValue))); break; } } @@ -549,7 +551,7 @@ public static int GetHouseUpgradeSize(int offset, SaveType saveType) { case SaveType.DoubutsuNoMoriEPlus: case SaveType.AnimalForestEPlus: - return (MainForm.SaveFile.SaveData[offset + 0x26] >> 2) & 7; + return (Save.SaveInstance.SaveData[offset + 0x26] >> 2) & 7; default: return 0; } @@ -557,7 +559,7 @@ public static int GetHouseUpgradeSize(int offset, SaveType saveType) public static int GetRoomSize(int offset) // NL/WA only { - return Math.Min(8, MainForm.SaveFile.ReadByte(offset - 0x44) * 2); + return Math.Min(8, Save.SaveInstance.ReadByte(offset - 0x44) * 2); } public static bool HasBasement(int offset, SaveType saveType) @@ -565,10 +567,10 @@ public static bool HasBasement(int offset, SaveType saveType) switch (saveType) { case SaveType.AnimalCrossing: - return (MainForm.SaveFile.SaveData[offset + 0x24] & 0x10) == 0x10; + return (Save.SaveInstance.SaveData[offset + 0x24] & 0x10) == 0x10; case SaveType.DoubutsuNoMoriEPlus: case SaveType.AnimalForestEPlus: - return (MainForm.SaveFile.SaveData[offset + 0x20] & 0x10) == 0x10; + return (Save.SaveInstance.SaveData[offset + 0x20] & 0x10) == 0x10; default: return false; } @@ -576,7 +578,7 @@ public static bool HasBasement(int offset, SaveType saveType) public static void SetHasBasement(bool enabled, House selectedHouse) { - var saveFile = MainForm.SaveFile; + var saveFile = Save.SaveInstance; if (saveFile.SaveGeneration != SaveGeneration.N64 && saveFile.SaveGeneration != SaveGeneration.GCN && saveFile.SaveGeneration != SaveGeneration.iQue) return; var basementFlagOffset = selectedHouse.Offset; diff --git a/ACSE.Core/Imaging/ImageGeneration.cs b/ACSE.Core/Imaging/ImageGeneration.cs new file mode 100644 index 0000000..0273adb --- /dev/null +++ b/ACSE.Core/Imaging/ImageGeneration.cs @@ -0,0 +1,65 @@ +using System.Linq; +using System.IO; +using System.Drawing; +using System.Drawing.Drawing2D; +using ACSE.Core.Debug; +using ACSE.Core.Utilities; + +namespace ACSE.Core.Imaging +{ + public static class ImageGeneration + { + public static Bitmap DrawGrid2(Image img, int cellSize, Size imageSize, Pen gridPen = null, bool resize = true, + bool drawVertical = true, bool skipFirstLine = false) + { + if (gridPen == null) + gridPen = Pens.Black; + + var gridBitmap = resize ? new Bitmap(imageSize.Width, imageSize.Height) : new Bitmap(img); + + using (var gridGraphics = Graphics.FromImage(gridBitmap)) + { + gridGraphics.InterpolationMode = InterpolationMode.NearestNeighbor; + if (resize) + gridGraphics.DrawImage(img, new Rectangle(0, 0, imageSize.Width, imageSize.Height), + new RectangleF((float) -0.5, (float) -0.5, 32, 32), GraphicsUnit.Pixel); + + if (drawVertical) + for (var x = 0; x < gridBitmap.Width; x += cellSize) + { + gridGraphics.DrawLine(gridPen, x, 0, x, gridBitmap.Height); + } + + for (var y = skipFirstLine ? cellSize : 0; y < gridBitmap.Height; y += cellSize) + { + gridGraphics.DrawLine(gridPen, 0, y, gridBitmap.Width, y); + } + } + + return gridBitmap; + } + + public static Image GetTpcImage(byte[] tpcBytes) + { + if (tpcBytes.Length != 0x1400) + { + return null; + } + + for (var i = tpcBytes.Length - 1; i > 0; i--) + { + if (i > 0 && tpcBytes[i - 1] == 0xFF && tpcBytes[i] == 0xD9) + { + using (var ms = new MemoryStream(tpcBytes.Take(i).ToArray())) + { + return Image.FromStream(ms); + } + } + } + + DebugUtility.DebugManagerInstance.WriteLine("Unable to find JPEG End-of-File marker. No TPC?", + DebugLevel.Error); + return null; + } + } +} diff --git a/Classes/Island.cs b/ACSE.Core/Island/Island.cs similarity index 97% rename from Classes/Island.cs rename to ACSE.Core/Island/Island.cs index 9430f03..7b51116 100644 --- a/Classes/Island.cs +++ b/ACSE.Core/Island/Island.cs @@ -1,7 +1,13 @@ using System; using System.Collections.Generic; +using ACSE.Core.Housing; +using ACSE.Core.Items; +using ACSE.Core.Patterns; +using ACSE.Core.Players; +using ACSE.Core.Saves; +using ACSE.Core.Villagers; -namespace ACSE +namespace ACSE.Core.Island { /// /// Island class for Doubutsu no Mori e+ diff --git a/Classes/Inventory.cs b/ACSE.Core/Items/Inventory.cs similarity index 95% rename from Classes/Inventory.cs rename to ACSE.Core/Items/Inventory.cs index f3533c4..b6a91ed 100644 --- a/Classes/Inventory.cs +++ b/ACSE.Core/Items/Inventory.cs @@ -2,8 +2,11 @@ using System.Collections.Generic; using System.Drawing; using System.Drawing.Imaging; +using ACSE.Core.Players; +using ACSE.Core.Saves; +using ACSE.Core.Utilities; -namespace ACSE +namespace ACSE.Core.Items { public class Inventory { @@ -60,7 +63,8 @@ public static Image GetItemPic(int itemsize, int itemsPerRow, Item[] items, Save var dataPosition = (y * itemsize + x2 % itemsize) * width * 4 + (x * itemsize + x2 / itemsize) * 4; if (dataPosition >= bmpData.Length) { - System.Windows.Forms.MessageBox.Show("Item Bitmap generation received more items than allocated space. Skipping " + (items.Length - i) + " Item(s)."); + DebugUtility.DebugManagerInstance.WriteLine( + $"Item Bitmap generation received more items than allocated space. Skipping {items.Length - i} item(s)."); break; } Buffer.BlockCopy(BitConverter.GetBytes(itemColor), 0, bmpData, dataPosition, 4); diff --git a/Classes/Item/Item.cs b/ACSE.Core/Items/Item.cs similarity index 86% rename from Classes/Item/Item.cs rename to ACSE.Core/Items/Item.cs index b919fc1..b83614f 100644 --- a/Classes/Item/Item.cs +++ b/ACSE.Core/Items/Item.cs @@ -1,8 +1,8 @@ using System; using System.Drawing; -using System.Runtime.Remoting.Messaging; +using ACSE.Core.Saves; -namespace ACSE +namespace ACSE.Core.Items { public class Item : IEquatable, IEquatable { @@ -16,7 +16,7 @@ public class Item : IEquatable, IEquatable public Item() { - var saveType = MainForm.SaveFile == null ? SaveType.AnimalCrossing : MainForm.SaveFile.SaveType; + var saveType = Save.SaveInstance == null ? SaveType.AnimalCrossing : Save.SaveInstance.SaveType; switch (saveType) { case SaveType.WildWorld: @@ -29,14 +29,14 @@ public Item() break; } Name = ItemData.GetItemName(ItemId); - Type = ItemData.GetItemType(ItemId, MainForm.SaveFile?.SaveType ?? SaveType.AnimalCrossing); + Type = ItemData.GetItemType(ItemId, Save.SaveInstance?.SaveType ?? SaveType.AnimalCrossing); } public Item(ushort itemId) { ItemId = itemId; Name = ItemData.GetItemName(ItemId); - Type = ItemData.GetItemType(ItemId, MainForm.SaveFile?.SaveType ?? SaveType.AnimalCrossing); + Type = ItemData.GetItemType(ItemId, Save.SaveInstance?.SaveType ?? SaveType.AnimalCrossing); } public Item(uint itemId) @@ -45,7 +45,7 @@ public Item(uint itemId) Flag1 = (byte)(itemId >> 24); Flag2 = (byte)(itemId >> 16); Name = ItemData.GetItemName(ItemId); - Type = ItemData.GetItemType(ItemId, MainForm.SaveFile?.SaveType ?? SaveType.AnimalCrossing); + Type = ItemData.GetItemType(ItemId, Save.SaveInstance?.SaveType ?? SaveType.AnimalCrossing); } public Item(Item cloningItem) @@ -63,7 +63,7 @@ public Item(ushort itemId, byte flag1, byte flag2) Flag1 = flag1; Flag2 = flag2; Name = ItemData.GetItemName(ItemId); - Type = ItemData.GetItemType(ItemId, MainForm.SaveFile?.SaveType ?? SaveType.AnimalCrossing); + Type = ItemData.GetItemType(ItemId, Save.SaveInstance?.SaveType ?? SaveType.AnimalCrossing); } public uint ToUInt32() @@ -199,7 +199,7 @@ public class Furniture : Item, IEquatable public Furniture(ushort itemId) : base(itemId) { - if (MainForm.SaveFile.SaveGeneration == SaveGeneration.N3DS) + if (Save.SaveInstance.SaveGeneration == SaveGeneration.N3DS) { BaseItemId = itemId; Rotation = 0; @@ -207,8 +207,8 @@ public Furniture(ushort itemId) : base(itemId) else { BaseItemId = (ushort)(ItemId & 0xFFFC); - if (ItemData.GetItemType(itemId, MainForm.SaveFile.SaveType) == ItemType.Furniture || - ItemData.GetItemType(itemId, MainForm.SaveFile.SaveType) == ItemType.Gyroid) + if (ItemData.GetItemType(itemId, Save.SaveInstance.SaveType) == ItemType.Furniture || + ItemData.GetItemType(itemId, Save.SaveInstance.SaveType) == ItemType.Gyroid) { Rotation = ItemId & 3; } @@ -223,7 +223,7 @@ public Furniture(uint item) : base(item) public Furniture(ushort item, byte flag1, byte flag2) : base(item, flag1, flag2) { - if (MainForm.SaveFile.SaveGeneration == SaveGeneration.N3DS) + if (Save.SaveInstance.SaveGeneration == SaveGeneration.N3DS) { BaseItemId = ItemId; Rotation = (Flag1 >> 4) / 4; @@ -231,8 +231,8 @@ public Furniture(ushort item, byte flag1, byte flag2) : base(item, flag1, flag2) else { BaseItemId = (ushort)(ItemId & 0xFFFC); - if (ItemData.GetItemType(ItemId, MainForm.SaveFile.SaveType) == ItemType.Furniture || - ItemData.GetItemType(ItemId, MainForm.SaveFile.SaveType) == ItemType.Gyroid) + if (ItemData.GetItemType(ItemId, Save.SaveInstance.SaveType) == ItemType.Furniture || + ItemData.GetItemType(ItemId, Save.SaveInstance.SaveType) == ItemType.Gyroid) { Rotation = ItemId & 3; } @@ -241,7 +241,7 @@ public Furniture(ushort item, byte flag1, byte flag2) : base(item, flag1, flag2) public Furniture(Item item) : base (item) { - if (MainForm.SaveFile.SaveGeneration == SaveGeneration.N3DS) + if (Save.SaveInstance.SaveGeneration == SaveGeneration.N3DS) { BaseItemId = ItemId; Rotation = (Flag1 >> 4) / 4; @@ -249,8 +249,8 @@ public Furniture(Item item) : base (item) else { BaseItemId = (ushort)(ItemId & 0xFFFC); - if (ItemData.GetItemType(ItemId, MainForm.SaveFile.SaveType) == ItemType.Furniture || - ItemData.GetItemType(ItemId, MainForm.SaveFile.SaveType) == ItemType.Gyroid) + if (ItemData.GetItemType(ItemId, Save.SaveInstance.SaveType) == ItemType.Furniture || + ItemData.GetItemType(ItemId, Save.SaveInstance.SaveType) == ItemType.Gyroid) { Rotation = ItemId & 3; } diff --git a/Classes/ItemChange.cs b/ACSE.Core/Items/ItemChange.cs similarity index 76% rename from Classes/ItemChange.cs rename to ACSE.Core/Items/ItemChange.cs index c7b2b37..bfc7777 100644 --- a/Classes/ItemChange.cs +++ b/ACSE.Core/Items/ItemChange.cs @@ -1,4 +1,4 @@ -namespace ACSE +namespace ACSE.Core.Items { public class ItemChange { diff --git a/Classes/ItemChangedEventArgs.cs b/ACSE.Core/Items/ItemChangedEventArgs.cs similarity index 88% rename from Classes/ItemChangedEventArgs.cs rename to ACSE.Core/Items/ItemChangedEventArgs.cs index 4bbbe5c..2129f9d 100644 --- a/Classes/ItemChangedEventArgs.cs +++ b/ACSE.Core/Items/ItemChangedEventArgs.cs @@ -1,4 +1,4 @@ -namespace ACSE +namespace ACSE.Core.Items { public class ItemChangedEventArgs { diff --git a/Classes/Item/ItemData.cs b/ACSE.Core/Items/ItemData.cs similarity index 92% rename from Classes/Item/ItemData.cs rename to ACSE.Core/Items/ItemData.cs index 9aa6332..4454a55 100644 --- a/Classes/Item/ItemData.cs +++ b/ACSE.Core/Items/ItemData.cs @@ -1,10 +1,13 @@ using System.Collections.Generic; -using System.Diagnostics; using System.Globalization; using System.IO; using System.Linq; +using ACSE.Core.Buildings; +using ACSE.Core.Debug; +using ACSE.Core.Saves; +using ACSE.Core.Utilities; -namespace ACSE +namespace ACSE.Core.Items { public enum ItemType { @@ -46,9 +49,14 @@ public enum ItemType public class ItemData { + /// + /// A dictionary containing string-uint pairs for item colors. + /// + public static Dictionary ItemColorsSettings; + public static List> ItemDatabase = new List>(); - internal static readonly string[] ItemTypeNames = + public static readonly string[] ItemTypeNames = { "Empty", "Furniture", @@ -441,81 +449,80 @@ public static ItemType GetItemType(ushort id, SaveType saveType) } public static uint GetItemColor(ItemType itemType) { - var settings = ItemColorSettings.Default; switch (itemType) { case ItemType.Furniture: - return settings.FurnitureColor; + return ItemColorsSettings["FurnitureColor"]; case ItemType.Flower: - return settings.FlowerColor; + return ItemColorsSettings["FlowerColor"]; case ItemType.Pattern: - return settings.PatternColor; + return ItemColorsSettings["PatternColor"]; case ItemType.ParchedFlower: - return settings.ParchedFlowerColor; + return ItemColorsSettings["ParchedFlowerColor"]; case ItemType.WiltedFlower: - return settings.WiltedFlowerColor; + return ItemColorsSettings["WiltedFlowerColor"]; case ItemType.WateredFlower: - return settings.WateredFlowerColor; + return ItemColorsSettings["WateredFlowerColor"]; case ItemType.Money: - return settings.MoneyColor; + return ItemColorsSettings["MoneyColor"]; case ItemType.Rock: - return settings.RockColor; + return ItemColorsSettings["RockColor"]; case ItemType.MoneyRock: - return settings.MoneyRockColor; + return ItemColorsSettings["MoneyRockColor"]; case ItemType.Signboard: - return settings.SignboardColor; + return ItemColorsSettings["SignboardColor"]; case ItemType.Song: - return settings.SongColor; + return ItemColorsSettings["SongColor"]; case ItemType.Paper: - return settings.PaperColor; + return ItemColorsSettings["PaperColor"]; case ItemType.Turnip: - return settings.TurnipColor; + return ItemColorsSettings["TurnipColor"]; case ItemType.Catchable: - return settings.CatchableColor; + return ItemColorsSettings["CatchableColor"]; case ItemType.WallpaperCarpet: - return settings.WallpaperCarpetColor; + return ItemColorsSettings["WallpaperCarpetColor"]; case ItemType.Clothes: - return settings.ClothesColor; + return ItemColorsSettings["ClothesColor"]; case ItemType.Gyroid: - return settings.GyroidColor; + return ItemColorsSettings["GyroidColor"]; case ItemType.Fossil: - return settings.FossilColor; + return ItemColorsSettings["FossilColor"]; case ItemType.Tool: - return settings.ToolColor; + return ItemColorsSettings["ToolColor"]; case ItemType.Item: - return settings.ItemColor; + return ItemColorsSettings["ItemColor"]; case ItemType.Fruit: - return settings.FruitColor; + return ItemColorsSettings["FruitColor"]; case ItemType.Trash: - return settings.TrashColor; + return ItemColorsSettings["TrashColor"]; case ItemType.QuestItem: - return settings.QuestItemColor; + return ItemColorsSettings["QuestItemColor"]; case ItemType.RaffleTicket: - return settings.RaffleTicketColor; + return ItemColorsSettings["RaffleTicketColor"]; case ItemType.Tree: - return settings.TreeColor; + return ItemColorsSettings["TreeColor"]; case ItemType.Weed: - return settings.WeedColor; + return ItemColorsSettings["WeedColor"]; case ItemType.Shell: - return settings.ShellColor; + return ItemColorsSettings["ShellColor"]; case ItemType.Empty: return 0x00FFFFFF; // No setting for empty since we always want it transparent case ItemType.Occupied: - return settings.OccupiedColor; + return ItemColorsSettings["OccupiedColor"]; case ItemType.Building: - return settings.BuildingColor; + return ItemColorsSettings["BuildingColor"]; case ItemType.Diary: - return settings.DiaryColor; + return ItemColorsSettings["DiaryColor"]; case ItemType.HouseObject: - return settings.HouseObjectColor; + return ItemColorsSettings["HouseObjectColor"]; default: - return settings.InvalidColor; + return ItemColorsSettings["InvalidColor"]; } } public static string GetItemFlag1Type(Item item, byte itemFlag) { - var itemType = GetItemType(item.ItemId, MainForm.SaveFile.SaveType); + var itemType = GetItemType(item.ItemId, Save.SaveInstance.SaveType); switch (itemType) { case ItemType.Fruit: @@ -641,12 +648,12 @@ public static string GetFurnitureItemFlag2Type(byte itemFlag) //Our Flag 2, but public static string GetItemName(ushort itemId) { - switch (MainForm.SaveFile.SaveGeneration) + switch (Save.SaveInstance.SaveGeneration) { case SaveGeneration.N3DS: return ItemDatabase.FirstOrDefault(o => o.Key == itemId).Value ?? "Unknown"; default: - if (GetItemType(itemId, MainForm.SaveFile.SaveType) == ItemType.Furniture) + if (GetItemType(itemId, Save.SaveInstance.SaveType) == ItemType.Furniture) { return ItemDatabase.FirstOrDefault(o => o.Key == (ushort)(itemId & 0xFFFC)).Value ?? "Unknown"; } @@ -675,7 +682,7 @@ public static Dictionary LoadItemDatabase(StreamReader reader) } catch { - Debug.WriteLine($"Error in loading item: {line}"); + DebugUtility.DebugManagerInstance.WriteLine($"Error in loading item: {line}", DebugLevel.Error); } } diff --git a/Classes/Messages/Mail/AnimalMail.cs b/ACSE.Core/Messages/Mail/AnimalMail.cs similarity index 91% rename from Classes/Messages/Mail/AnimalMail.cs rename to ACSE.Core/Messages/Mail/AnimalMail.cs index ae7815f..ce040d0 100644 --- a/Classes/Messages/Mail/AnimalMail.cs +++ b/ACSE.Core/Messages/Mail/AnimalMail.cs @@ -1,6 +1,7 @@ using System; +using ACSE.Core.Items; -namespace ACSE.Messages.Mail +namespace ACSE.Core.Messages.Mail { public sealed class GCNAnimalMail { diff --git a/Classes/Messages/Mail/GCNPlayerMail.cs b/ACSE.Core/Messages/Mail/GCNPlayerMail.cs similarity index 96% rename from Classes/Messages/Mail/GCNPlayerMail.cs rename to ACSE.Core/Messages/Mail/GCNPlayerMail.cs index b2560cb..64a4b42 100644 --- a/Classes/Messages/Mail/GCNPlayerMail.cs +++ b/ACSE.Core/Messages/Mail/GCNPlayerMail.cs @@ -1,4 +1,8 @@ -namespace ACSE.Messages.Mail +using ACSE.Core.Items; +using ACSE.Core.Players; +using ACSE.Core.Saves; + +namespace ACSE.Core.Messages.Mail { public sealed class GcnPlayerMail : PlayerMailBase { diff --git a/Classes/Messages/Mail/MailBase.cs b/ACSE.Core/Messages/Mail/MailBase.cs similarity index 89% rename from Classes/Messages/Mail/MailBase.cs rename to ACSE.Core/Messages/Mail/MailBase.cs index 5efbd70..ecabf81 100644 --- a/Classes/Messages/Mail/MailBase.cs +++ b/ACSE.Core/Messages/Mail/MailBase.cs @@ -1,10 +1,7 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using ACSE.Core.Items; +using ACSE.Core.Saves; -namespace ACSE.Messages.Mail +namespace ACSE.Core.Messages.Mail { /// /// N64/GameCube/iQue letter type/state diff --git a/Classes/Messages/Mail/PlayerMailBase.cs b/ACSE.Core/Messages/Mail/PlayerMailBase.cs similarity index 94% rename from Classes/Messages/Mail/PlayerMailBase.cs rename to ACSE.Core/Messages/Mail/PlayerMailBase.cs index 1f61440..37f0bdd 100644 --- a/Classes/Messages/Mail/PlayerMailBase.cs +++ b/ACSE.Core/Messages/Mail/PlayerMailBase.cs @@ -1,4 +1,4 @@ -namespace ACSE.Messages.Mail +namespace ACSE.Core.Messages.Mail { public class PlayerMailBase : MailBase { diff --git a/Classes/Messages/MessageBase.cs b/ACSE.Core/Messages/MessageBase.cs similarity index 90% rename from Classes/Messages/MessageBase.cs rename to ACSE.Core/Messages/MessageBase.cs index 7b87e80..e818c56 100644 --- a/Classes/Messages/MessageBase.cs +++ b/ACSE.Core/Messages/MessageBase.cs @@ -1,6 +1,6 @@ -using ACSE.Utilities; +using ACSE.Core.Utilities; -namespace ACSE.Messages +namespace ACSE.Core.Messages { public abstract class MessageBase { diff --git a/Classes/Messages/MessageBoardPost.cs b/ACSE.Core/Messages/MessageBoardPost.cs similarity index 82% rename from Classes/Messages/MessageBoardPost.cs rename to ACSE.Core/Messages/MessageBoardPost.cs index d35c16a..35ce668 100644 --- a/Classes/Messages/MessageBoardPost.cs +++ b/ACSE.Core/Messages/MessageBoardPost.cs @@ -1,4 +1,4 @@ -namespace ACSE.Messages +namespace ACSE.Core.Messages { public class MessageBoardPost : MessageBase { diff --git a/Classes/IModifiable.cs b/ACSE.Core/Modifiable/IModifiable.cs similarity index 76% rename from Classes/IModifiable.cs rename to ACSE.Core/Modifiable/IModifiable.cs index 4d216c2..a24f47f 100644 --- a/Classes/IModifiable.cs +++ b/ACSE.Core/Modifiable/IModifiable.cs @@ -1,9 +1,9 @@ -namespace ACSE +namespace ACSE.Core.Modifiable { /// /// Interface for all modifiable things that implement a modified stack. /// - internal interface IModifiable + public interface IModifiable { void Undo(); void Redo(); diff --git a/Classes/ModifiedHandler.cs b/ACSE.Core/Modifiable/ModifiedHandler.cs similarity index 92% rename from Classes/ModifiedHandler.cs rename to ACSE.Core/Modifiable/ModifiedHandler.cs index 260f346..68888b2 100644 --- a/Classes/ModifiedHandler.cs +++ b/ACSE.Core/Modifiable/ModifiedHandler.cs @@ -1,9 +1,9 @@ using System.Collections.Generic; using System.Linq; -namespace ACSE +namespace ACSE.Core.Modifiable { - internal class ModifiedHandler : IModifiable + public class ModifiedHandler : IModifiable { public readonly Stack UndoStack; public readonly Stack RedoStack; diff --git a/Classes/Pattern.cs b/ACSE.Core/Patterns/Pattern.cs similarity index 98% rename from Classes/Pattern.cs rename to ACSE.Core/Patterns/Pattern.cs index 0dfe0f0..96a14c2 100644 --- a/Classes/Pattern.cs +++ b/ACSE.Core/Patterns/Pattern.cs @@ -1,10 +1,10 @@ using System; using System.Drawing; using System.Drawing.Imaging; -using System.Windows.Forms; -using ACSE.Utilities; +using ACSE.Core.Saves; +using ACSE.Core.Utilities; -namespace ACSE +namespace ACSE.Core.Patterns { /// /// GameCube Pattern Data Write-up @@ -19,7 +19,7 @@ namespace ACSE /// [Byte Array] Alignment Bytes?: 0xF bytes /// [Byte Array] Pattern Data: 0x200 bytes /// - class PatternData + public static class PatternData { #region Palettes @@ -324,7 +324,7 @@ public static byte ClosestColorRgb(uint color, uint[] paletteData, bool gen1 = f } } - public class Pattern + public sealed class Pattern { private readonly Save _saveFile; private readonly int _offset; @@ -351,7 +351,6 @@ public uint[][] GetPaletteArray(SaveGeneration saveGeneration) { switch (saveGeneration) { - case SaveGeneration.GCN: default: return PatternData.AcPaletteData; case SaveGeneration.NDS: @@ -364,15 +363,20 @@ public uint[][] GetPaletteArray(SaveGeneration saveGeneration) // AC / CF public void GeneratePatternBitmap(byte[] importData = null, bool decode = true) { - var patternRawData = importData ?? (_saveFile.SaveType == SaveType.CityFolk ? _saveFile.ReadByteArray(_offset, 0x200) : _saveFile.ReadByteArray(_offset + 0x20, 0x200)); - var paletteData = _saveFile.SaveType == SaveType.CityFolk ? PatternData.CfPaletteData : PatternData.AcPaletteData; + var patternRawData = importData ?? (_saveFile.SaveType == SaveType.CityFolk + ? _saveFile.ReadByteArray(_offset, 0x200) + : _saveFile.ReadByteArray(_offset + 0x20, 0x200)); + + var paletteData = _saveFile.SaveType == SaveType.CityFolk + ? PatternData.CfPaletteData + : PatternData.AcPaletteData; if (decode) { DecodedData = PatternUtility.DecodeC4(patternRawData); } - PatternBitmap = PatternUtility.C4PaletteMapToBitmap(DecodedData, paletteData[Palette], 32, 32); + PatternBitmap = PatternUtility.C4PaletteMapToBitmap(DecodedData, paletteData[Palette]); } public void GenerateWwPatternBitmap(byte[] importData = null, bool decode = true) @@ -482,9 +486,6 @@ public void Read(int index) //No specific palette in NL/WA GenerateNlPatternBitmap(); break; - default: - MessageBox.Show("Patterns: Unknown Save Type"); - break; } } @@ -495,7 +496,7 @@ public void RedrawBitmap() case SaveGeneration.GCN: case SaveGeneration.Wii: GeneratePatternBitmap(DecodedData, false); - Write(PatternUtility.EncodeC4(DecodedData, 32, 32)); + Write(PatternUtility.EncodeC4(DecodedData)); break; case SaveGeneration.NDS: GenerateWwPatternBitmap(DecodedData, false); diff --git a/Classes/Player/Player.cs b/ACSE.Core/Players/Player.cs similarity index 96% rename from Classes/Player/Player.cs rename to ACSE.Core/Players/Player.cs index f17cffc..8e84db5 100644 --- a/Classes/Player/Player.cs +++ b/ACSE.Core/Players/Player.cs @@ -1,9 +1,15 @@ using System; using System.Reflection; -using ACSE.Utilities; -using ACSE.Messages.Mail; +using ACSE.Core.Encryption; +using ACSE.Core.Housing; +using ACSE.Core.Imaging; +using ACSE.Core.Items; +using ACSE.Core.Messages.Mail; +using ACSE.Core.Patterns; +using ACSE.Core.Saves; +using ACSE.Core.Utilities; -namespace ACSE +namespace ACSE.Core.Players { public sealed class Player { @@ -262,9 +268,13 @@ public void Write() _saveData.Write(dataOffset, (byte)playerDataType.GetField(field.Name).GetValue(Data)); } } - else if (fieldType == typeof(ushort) || fieldType == typeof(uint)) + else if (fieldType == typeof(ushort)) { - _saveData.Write(dataOffset, (dynamic)playerDataType.GetField(field.Name).GetValue(Data), _saveData.IsBigEndian); + _saveData.Write(dataOffset, (ushort)playerDataType.GetField(field.Name).GetValue(Data), _saveData.IsBigEndian); + } + else if (fieldType == typeof(uint)) + { + _saveData.Write(dataOffset, (uint)playerDataType.GetField(field.Name).GetValue(Data), _saveData.IsBigEndian); } else if (fieldType == typeof(Inventory)) { diff --git a/Classes/Player/PlayerInfo.cs b/ACSE.Core/Players/PlayerInfo.cs similarity index 99% rename from Classes/Player/PlayerInfo.cs rename to ACSE.Core/Players/PlayerInfo.cs index 5b7349f..e7500df 100644 --- a/Classes/Player/PlayerInfo.cs +++ b/ACSE.Core/Players/PlayerInfo.cs @@ -1,8 +1,12 @@ -using ACSE.Utilities; -using System; +using System; using System.Drawing; +using ACSE.Core.Encryption; +using ACSE.Core.Items; +using ACSE.Core.Patterns; +using ACSE.Core.Saves; +using ACSE.Core.Utilities; -namespace ACSE +namespace ACSE.Core.Players { public struct PlayerSaveInfo { diff --git a/Classes/Checksums/CRC32.cs b/ACSE.Core/Saves/Checksums/CRC32.cs similarity index 98% rename from Classes/Checksums/CRC32.cs rename to ACSE.Core/Saves/Checksums/CRC32.cs index d72e7c9..54ed9d9 100644 --- a/Classes/Checksums/CRC32.cs +++ b/ACSE.Core/Saves/Checksums/CRC32.cs @@ -1,12 +1,12 @@ using System.Collections.Generic; -namespace ACSE.Checksums +namespace ACSE.Core.Saves.Checksums { /// /// /// Generic CRC32 checksum used in Animal Crossing: City Folk. /// - internal class CRC32 : IChecksum + public sealed class CRC32 : IChecksum { private static readonly uint[] Crc32Table = { 0x00000000, 0x77073096, 0xEE0E612C, 0x990951BA, 0x076DC419, diff --git a/Classes/Checksums/IChecksum.cs b/ACSE.Core/Saves/Checksums/IChecksum.cs similarity index 97% rename from Classes/Checksums/IChecksum.cs rename to ACSE.Core/Saves/Checksums/IChecksum.cs index 2b73d1d..c192e30 100644 --- a/Classes/Checksums/IChecksum.cs +++ b/ACSE.Core/Saves/Checksums/IChecksum.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace ACSE.Checksums +namespace ACSE.Core.Saves.Checksums { /// /// Interface for all checksum calculating objects. diff --git a/Classes/Checksums/NewLeafCRC32Type1.cs b/ACSE.Core/Saves/Checksums/NewLeafCRC32Type1.cs similarity index 98% rename from Classes/Checksums/NewLeafCRC32Type1.cs rename to ACSE.Core/Saves/Checksums/NewLeafCRC32Type1.cs index 66b4ed4..3a02c93 100644 --- a/Classes/Checksums/NewLeafCRC32Type1.cs +++ b/ACSE.Core/Saves/Checksums/NewLeafCRC32Type1.cs @@ -1,9 +1,9 @@ using System.Collections.Generic; using System.Linq; -namespace ACSE.Checksums +namespace ACSE.Core.Saves.Checksums { - internal class NewLeafCRC32Type1 : IChecksum + public sealed class NewLeafCRC32Type1 : IChecksum { public static uint[] NewLeafCrcTableType1 = { 0x00000000, 0xF26B8303, 0xE13B70F7, 0x1350F3F4, 0xC79A971F, diff --git a/Classes/Checksums/NewLeafCRC32Type2.cs b/ACSE.Core/Saves/Checksums/NewLeafCRC32Type2.cs similarity index 98% rename from Classes/Checksums/NewLeafCRC32Type2.cs rename to ACSE.Core/Saves/Checksums/NewLeafCRC32Type2.cs index eada68e..4aa0be8 100644 --- a/Classes/Checksums/NewLeafCRC32Type2.cs +++ b/ACSE.Core/Saves/Checksums/NewLeafCRC32Type2.cs @@ -1,9 +1,9 @@ using System.Collections.Generic; using System.Linq; -namespace ACSE.Checksums +namespace ACSE.Core.Saves.Checksums { - internal class NewLeafCRC32Type2 : IChecksum + public sealed class NewLeafCRC32Type2 : IChecksum { private static readonly uint[] NewLeafCrcTableType2 = { 0x00000000, 0x04C11DB7, 0x09823B6E, 0x0D4326D9, 0x130476DC, diff --git a/Classes/Checksums/UInt16BEChecksum.cs b/ACSE.Core/Saves/Checksums/UInt16BEChecksum.cs similarity index 94% rename from Classes/Checksums/UInt16BEChecksum.cs rename to ACSE.Core/Saves/Checksums/UInt16BEChecksum.cs index 5d9697b..eaa20a9 100644 --- a/Classes/Checksums/UInt16BEChecksum.cs +++ b/ACSE.Core/Saves/Checksums/UInt16BEChecksum.cs @@ -1,12 +1,12 @@ using System; using System.Collections.Generic; -namespace ACSE.Checksums +namespace ACSE.Core.Saves.Checksums { /// /// 16-bit big-endian checksum implementation used by N64, GCN, & iQue games. /// - internal class UInt16BEChecksum : IChecksum + public sealed class UInt16BEChecksum : IChecksum { /// /// diff --git a/Classes/Checksums/UInt16LEChecksum.cs b/ACSE.Core/Saves/Checksums/UInt16LEChecksum.cs similarity index 94% rename from Classes/Checksums/UInt16LEChecksum.cs rename to ACSE.Core/Saves/Checksums/UInt16LEChecksum.cs index ed1af5f..39d7f6e 100644 --- a/Classes/Checksums/UInt16LEChecksum.cs +++ b/ACSE.Core/Saves/Checksums/UInt16LEChecksum.cs @@ -1,12 +1,12 @@ using System; using System.Collections.Generic; -namespace ACSE.Checksums +namespace ACSE.Core.Saves.Checksums { /// /// 16-bit little-endian checksum implementation used by Animal Crossing: Wild World. /// - internal class UInt16LEChecksum : IChecksum + public sealed class UInt16LEChecksum : IChecksum { /// /// diff --git a/Classes/Save.cs b/ACSE.Core/Saves/Save.cs similarity index 97% rename from Classes/Save.cs rename to ACSE.Core/Saves/Save.cs index bc94f32..851abc0 100644 --- a/Classes/Save.cs +++ b/ACSE.Core/Saves/Save.cs @@ -1,12 +1,12 @@ using System; using System.Linq; using System.IO; -using System.Windows.Forms; using System.Text; -using ACSE.Checksums; -using ACSE.Utilities; +using ACSE.Core.Debug; +using ACSE.Core.Saves.Checksums; +using ACSE.Core.Utilities; -namespace ACSE +namespace ACSE.Core.Saves { public enum SaveType : byte { @@ -48,6 +48,8 @@ public enum Region : byte public class Save { + public static Save SaveInstance { get; private set; } + public readonly SaveType SaveType; public readonly SaveGeneration SaveGeneration; public readonly SaveInfo SaveInfo; @@ -64,10 +66,9 @@ public class Save private FileStream _saveFile; private readonly BinaryReader _saveReader; private BinaryWriter _saveWriter; - private readonly Backup _backup; private readonly bool _byteswap = false; - public Save(string filePath) + public Save(string filePath, bool createBackup = false) { if (File.Exists(filePath)) { @@ -79,9 +80,9 @@ public Save(string filePath) try { _saveFile = new FileStream(filePath, FileMode.Open); } catch { SuccessfullyLoaded = false; } if (_saveFile == null || !SuccessfullyLoaded || !_saveFile.CanWrite) { - MessageBox.Show( + DebugUtility.DebugManagerInstance.WriteLine( $"Error: File {Path.GetFileName(filePath)} is being used by another process. Please close any process using it before editing!", - "File Opening Error", MessageBoxButtons.OK, MessageBoxIcon.Error); + DebugLevel.Error); try { _saveFile?.Close(); @@ -119,12 +120,12 @@ public Save(string filePath) _saveReader.Dispose(); _saveFile.Dispose(); - // Create a Backup - if (Properties.Settings.Default.BackupFiles) - _backup = new Backup(this); + SaveInstance = this; } else - MessageBox.Show("File doesn't exist!"); + { + DebugUtility.DebugManagerInstance.WriteLine("File doesn't exist!", DebugLevel.Error); + } } public void Flush() diff --git a/Classes/SaveDataManager.cs b/ACSE.Core/Saves/SaveDataManager.cs similarity index 88% rename from Classes/SaveDataManager.cs rename to ACSE.Core/Saves/SaveDataManager.cs index a3eb4fa..349c234 100644 --- a/Classes/SaveDataManager.cs +++ b/ACSE.Core/Saves/SaveDataManager.cs @@ -3,9 +3,11 @@ using System.Globalization; using System.IO; using System.Text; -using System.Windows.Forms; +using ACSE.Core.Debug; +using ACSE.Core.Items; +using ACSE.Core.Utilities; -namespace ACSE +namespace ACSE.Core.Saves { public struct Offsets { @@ -796,34 +798,42 @@ public static SaveInfo GetSaveInfo(SaveType saveType) public static Dictionary GetItemInfo(SaveType saveType, string language = "en") { - var itemDbLocation = MainForm.AssemblyLocation + "\\Resources\\"; + var itemDbLocation = ""; switch (saveType) { case SaveType.DoubutsuNoMori: case SaveType.DongwuSenlin: - itemDbLocation += "DnM_Items_" + language + ".txt"; + itemDbLocation = Path.Combine(PathUtility.GetExeDirectory(), "Resources", + $"DnM_Items_{language}.txt"); break; case SaveType.DoubutsuNoMoriPlus: - itemDbLocation += "DBNM_Plus_Items_" + language + ".txt"; + itemDbLocation = Path.Combine(PathUtility.GetExeDirectory(), "Resources", + $"DBNM_Plus_Items_{language}.txt"); break; case SaveType.AnimalCrossing: - itemDbLocation += "AC_Items_" + language + ".txt"; + itemDbLocation = Path.Combine(PathUtility.GetExeDirectory(), "Resources", + $"AC_Items_{language}.txt"); break; case SaveType.DoubutsuNoMoriEPlus: case SaveType.AnimalForestEPlus: - itemDbLocation += "DBNM_e_Plus_Items_" + language + ".txt"; + itemDbLocation = Path.Combine(PathUtility.GetExeDirectory(), "Resources", + $"DBNM_e_Plus_Items_{language}.txt"); break; case SaveType.WildWorld: - itemDbLocation += "WW_Items_" + language + ".txt"; + itemDbLocation = Path.Combine(PathUtility.GetExeDirectory(), "Resources", + $"WW_Items_{language}.txt"); break; case SaveType.CityFolk: - itemDbLocation += "CF_Items_" + language + ".txt"; + itemDbLocation = Path.Combine(PathUtility.GetExeDirectory(), "Resources", + $"CF_Items_{language}.txt"); break; case SaveType.NewLeaf: - itemDbLocation += "NL_Items_" + language + ".txt"; + itemDbLocation = Path.Combine(PathUtility.GetExeDirectory(), "Resources", + $"NL_Items_{language}.txt"); break; case SaveType.WelcomeAmiibo: - itemDbLocation += "WA_Items_" + language + ".txt"; + itemDbLocation = Path.Combine(PathUtility.GetExeDirectory(), "Resources", + $"WA_Items_{language}.txt"); break; } @@ -836,7 +846,7 @@ public static Dictionary GetItemInfo(SaveType saveType, string l } catch (Exception e) { - MainForm.DebugManager.WriteLine( + DebugUtility.DebugManagerInstance.WriteLine( $"An error occured opening item database file:\n\"{itemDbLocation}\"\nError Info:\n{e.Message}", DebugLevel.Error); return null; } @@ -844,108 +854,86 @@ public static Dictionary GetItemInfo(SaveType saveType, string l public static Dictionary GetAcreInfo(SaveType saveType, string language = "en") { - StreamReader contents; - var acreDbLocation = MainForm.AssemblyLocation + "\\Resources\\"; - if (saveType == SaveType.WildWorld) - acreDbLocation += "WW_Acres_" + language + ".txt"; - try { contents = File.OpenText(acreDbLocation); } - catch (Exception e) + if (saveType != SaveType.WildWorld) return null; + + var (result, database) = + DatabaseUtility.LoadDatabaseByte(Path.Combine(PathUtility.GetExeDirectory(), + $"WW_Acres_{language}.txt")); + + switch (result) { - MainForm.DebugManager.WriteLine( - $"An error occured opening acre database file:\n\"{acreDbLocation}\"\nError Info:\n{e.Message}", DebugLevel.Error); - return null; - } - var acreDictionary = new Dictionary(); - string line; - while ((line = contents.ReadLine()) != null) - { - if (!Properties.Settings.Default.DebuggingEnabled && line.Contains("//")) - MessageBox.Show("Now loading Acre type: " + line.Replace("//", "")); - else if (line.Contains("0x")) - { - string acreIdString = line.Substring(0, 4), acreName = line.Substring(5); - if (byte.TryParse(acreIdString.Replace("0x", ""), NumberStyles.AllowHexSpecifier, null, out var acreId)) - acreDictionary.Add(acreId, acreName); - else - MainForm.DebugManager.WriteLine("Unable to add Acre: " + acreIdString + " | " + acreName, DebugLevel.Error); - } + case DatabaseUtility.DatabaseReturnCode.FailedToOpen: + DebugUtility.DebugManagerInstance.WriteLine( + "Failed to open the Wild World acre database file.", DebugLevel.Error); + break; + + case DatabaseUtility.DatabaseReturnCode.FailedToRead: + DebugUtility.DebugManagerInstance.WriteLine( + "Failed to read the Wild World acre database file.", DebugLevel.Error); + break; } - contents.Close(); - contents.Dispose(); - - return acreDictionary; + return database; } public static Dictionary GetAcreInfoUInt16(SaveType saveType, string language = "en") - { - StreamReader contents; - var acreDbLocation = MainForm.AssemblyLocation + "\\Resources\\"; + {; + var databaseName = ""; switch (saveType) { case SaveType.DoubutsuNoMori: case SaveType.DongwuSenlin: case SaveType.AnimalCrossing: // TODO: DnM needs to have a custom list, since the docks/islands don't exist - acreDbLocation += "AC_Acres_" + language + ".txt"; + databaseName = $"AC_Acres_{language}.txt"; break; case SaveType.DoubutsuNoMoriPlus: - acreDbLocation += "DBNM_Plus_Acres_" + language + ".txt"; + databaseName = $"DBNM_Plus_Acres_{language}.txt"; break; case SaveType.DoubutsuNoMoriEPlus: case SaveType.AnimalForestEPlus: - acreDbLocation += "DBNM_e_Plus_Acres_" + language + ".txt"; + databaseName = $"DBNM_e_Plus_Acres_{language}.txt"; break; case SaveType.CityFolk: - acreDbLocation += "CF_Acres_" + language + ".txt"; + databaseName = $"CF_Acres_{language}.txt"; break; case SaveType.NewLeaf: - acreDbLocation += "NL_Acres_" + language + ".txt"; + databaseName = $"NL_Acres_{language}.txt"; break; case SaveType.WelcomeAmiibo: - acreDbLocation += "WA_Acres_" + language + ".txt"; + databaseName = $"WA_Acres_{language}.txt"; break; } - try { contents = File.OpenText(acreDbLocation); } - catch (Exception e) + var (result, database) = + DatabaseUtility.LoadDatabase(Path.Combine(PathUtility.GetExeDirectory(), databaseName)); + + switch (result) { - MainForm.DebugManager.WriteLine( - $"An error occured opening acre database file:\n\"{acreDbLocation}\"\nError Info:\n{e.Message}", DebugLevel.Error); - return null; - } - var acreDictionary = new Dictionary(); - string line; - while ((line = contents.ReadLine()) != null) - { - if (!Properties.Settings.Default.DebuggingEnabled && line.Contains("//")) - MessageBox.Show("Now loading Acre type: " + line.Replace("//", "")); - else if (line.Contains("0x")) - { - string acreIdString = line.Substring(0, 6), acreName = line.Substring(7); - if (ushort.TryParse(acreIdString.Replace("0x", ""), NumberStyles.AllowHexSpecifier, null, out var acreId)) - acreDictionary.Add(acreId, acreName); - else - MainForm.DebugManager.WriteLine("Unable to add Acre: " + acreIdString + " | " + acreName, DebugLevel.Error); - } + case DatabaseUtility.DatabaseReturnCode.FailedToOpen: + DebugUtility.DebugManagerInstance.WriteLine( + "Failed to open the acre database file.", DebugLevel.Error); + break; + + case DatabaseUtility.DatabaseReturnCode.FailedToRead: + DebugUtility.DebugManagerInstance.WriteLine( + "Failed to read the acre database file.", DebugLevel.Error); + break; } - contents.Close(); - contents.Dispose(); - - return acreDictionary; + return database; } public static Dictionary> GetFiledAcreData(SaveType saveType, string language = "en") { StreamReader contents; - var acreDbLocation = MainForm.AssemblyLocation + "\\Resources\\"; + var acreDbLocation = PathUtility.GetExeDirectory(); if (saveType == SaveType.WildWorld) acreDbLocation += "WW_Acres_" + language + ".txt"; try { contents = File.OpenText(acreDbLocation); } catch (Exception e) { - MainForm.DebugManager.WriteLine( + DebugUtility.DebugManagerInstance.WriteLine( $"An error occured opening acre database file:\n\"{acreDbLocation}\"\nError Info:\n{e.Message}", DebugLevel.Error); return null; } @@ -968,10 +956,12 @@ public static Dictionary> GetFiledAcreData(SaveType saveType, if (!filedList.ContainsKey(currentAcreType)) filedList.Add(currentAcreType, new List()); string acreIdString = line.Substring(0, 4), acreName = line.Substring(5); - if (byte.TryParse(acreIdString.Replace("0x", ""), NumberStyles.AllowHexSpecifier, null, out var acreId)) + if (byte.TryParse(acreIdString.Replace("0x", ""), NumberStyles.AllowHexSpecifier, null, + out var acreId)) filedList[currentAcreType].Add(acreId); else - MainForm.DebugManager.WriteLine("Unable to add Acre: " + acreIdString + " | " + acreName, DebugLevel.Error); + DebugUtility.DebugManagerInstance.WriteLine( + "Unable to add Acre: " + acreIdString + " | " + acreName, DebugLevel.Error); } } @@ -984,7 +974,7 @@ public static Dictionary> GetFiledAcreData(SaveType saveType, public static Dictionary> GetFiledAcreDataUInt16(SaveType saveType, string language = "en") { StreamReader contents; - var acreDbLocation = MainForm.AssemblyLocation + "\\Resources\\"; + var acreDbLocation = PathUtility.GetExeDirectory(); switch (saveType) { case SaveType.DoubutsuNoMori: @@ -1013,7 +1003,7 @@ public static Dictionary> GetFiledAcreDataUIn try { contents = File.OpenText(acreDbLocation); } catch (Exception e) { - MainForm.DebugManager.WriteLine( + DebugUtility.DebugManagerInstance.WriteLine( $"An error occured opening acre database file:\n\"{acreDbLocation}\"\nError Info:\n{e.Message}", DebugLevel.Error); return null; } @@ -1036,10 +1026,12 @@ public static Dictionary> GetFiledAcreDataUIn if (!filedList.ContainsKey(currentAcreType)) filedList.Add(currentAcreType, new Dictionary()); string acreIdString = line.Substring(0, 6), acreName = line.Substring(7); - if (ushort.TryParse(acreIdString.Replace("0x", ""), NumberStyles.AllowHexSpecifier, null, out var acreId)) + if (ushort.TryParse(acreIdString.Replace("0x", ""), NumberStyles.AllowHexSpecifier, null, + out var acreId)) filedList[currentAcreType].Add(acreId, line.Substring(7)); else - MainForm.DebugManager.WriteLine("Unable to add Acre: " + acreIdString + " | " + acreName, DebugLevel.Error); + DebugUtility.DebugManagerInstance.WriteLine( + "Unable to add Acre: " + acreIdString + " | " + acreName, DebugLevel.Error); } } diff --git a/Classes/Shop.cs b/ACSE.Core/Shops/Shop.cs similarity index 96% rename from Classes/Shop.cs rename to ACSE.Core/Shops/Shop.cs index c5b6c48..64794ea 100644 --- a/Classes/Shop.cs +++ b/ACSE.Core/Shops/Shop.cs @@ -1,4 +1,8 @@ -namespace ACSE +using ACSE.Core.Items; +using ACSE.Core.Patterns; +using ACSE.Core.Saves; + +namespace ACSE.Core.Shops { public class ShopOffsets { @@ -139,7 +143,7 @@ public FurnitureShop(Save saveFile, int offset) : base(saveFile, offset) public byte GetSize(SaveGeneration generation) { - var saveFile = MainForm.SaveFile; + var saveFile = Save.SaveInstance; var shopOffsets = ShopInfo.GetShopOffsets(saveFile.SaveType); if (shopOffsets == null) return 0; switch (generation) @@ -156,7 +160,7 @@ public byte GetSize(SaveGeneration generation) public void SetSize(byte size) { - var saveFile = MainForm.SaveFile; + var saveFile = Save.SaveInstance; var shopOffsets = ShopInfo.GetShopOffsets(saveFile.SaveType); if (shopOffsets == null) return; switch (saveFile.SaveGeneration) diff --git a/Classes/TrainStation.cs b/ACSE.Core/TownBuildings/TrainStation.cs similarity index 60% rename from Classes/TrainStation.cs rename to ACSE.Core/TownBuildings/TrainStation.cs index 34ffb58..18f5259 100644 --- a/Classes/TrainStation.cs +++ b/ACSE.Core/TownBuildings/TrainStation.cs @@ -1,7 +1,10 @@ using System.Drawing; using System.IO; +using ACSE.Core.Debug; +using ACSE.Core.Saves; +using ACSE.Core.Utilities; -namespace ACSE +namespace ACSE.Core.TownBuildings { public static class TrainStation { @@ -11,7 +14,9 @@ public static bool HasModifiableTrainStation(SaveGeneration generation) public static Image GetStationImage(int station) { Image stationImg = null; - var stationFile = MainForm.AssemblyLocation + "\\Resources\\Images\\Icons\\Stations\\" + (station + 1).ToString() + ".png"; + var stationFile = Path.Combine(PathUtility.GetResourcesDirectory(), "Images", "Icons", + $"Stations{station + 1}.png"); + if (!File.Exists(stationFile)) return null; try { @@ -19,7 +24,8 @@ public static Image GetStationImage(int station) } catch { - MainForm.DebugManager.WriteLine("Unable to load station image #" + (station + 1), DebugLevel.Error); + DebugUtility.DebugManagerInstance.WriteLine("Unable to load station image #" + (station + 1), + DebugLevel.Error); } return stationImg; } diff --git a/Classes/Updater.cs b/ACSE.Core/Updater/Updater.cs similarity index 94% rename from Classes/Updater.cs rename to ACSE.Core/Updater/Updater.cs index 980fd02..caf0220 100644 --- a/Classes/Updater.cs +++ b/ACSE.Core/Updater/Updater.cs @@ -2,11 +2,12 @@ using System.IO; using System.Net; using System.Reflection; +using ACSE.Core.Utilities; using Newtonsoft.Json.Linq; -namespace ACSE +namespace ACSE.Core.Updater { - internal sealed class Updater + public sealed class Updater { private int _versionMajor; private int _versionMinor; @@ -16,7 +17,7 @@ internal sealed class Updater private void SetCurrentVersionInfo() { - var versionInfo = FileVersionInfo.GetVersionInfo(Assembly.GetExecutingAssembly().Location); + var versionInfo = FileVersionInfo.GetVersionInfo(PathUtility.GetExeLocation()); _versionMajor = versionInfo.FileMajorPart; _versionMinor = versionInfo.FileMinorPart; _versionRevision = versionInfo.ProductBuildPart; diff --git a/ACSE.Core/Utilities/DatabaseUtility.cs b/ACSE.Core/Utilities/DatabaseUtility.cs new file mode 100644 index 0000000..6cbd82c --- /dev/null +++ b/ACSE.Core/Utilities/DatabaseUtility.cs @@ -0,0 +1,98 @@ +using System.Collections.Generic; +using System.Globalization; +using System.IO; + +namespace ACSE.Core.Utilities +{ + public static class DatabaseUtility + { + public enum DatabaseReturnCode + { + FailedToRead = -2, + FailedToOpen = -1, + Success = 0 + } + + /// + /// Loads a specified database with the key type as bytes. + /// + /// The path to the database to load. + /// The result of the method , and the loaded database if execution was successful. + public static (DatabaseReturnCode, Dictionary) LoadDatabaseByte(string databasePath) + { + StreamReader databaseReader; + try + { + databaseReader = File.OpenText(databasePath); + } + catch + { + return (DatabaseReturnCode.FailedToOpen, null); + } + + try + { + using (databaseReader) + { + var database = new Dictionary(); + string line; + + while ((line = databaseReader.ReadLine()) != null) + { + if (line.Contains("//")) continue; + + database.Add(byte.Parse(line.Substring(0, 4).Replace("0x", ""), NumberStyles.HexNumber), + line.Substring(5)); + } + + return (DatabaseReturnCode.Success, database); + } + } + catch + { + return (DatabaseReturnCode.FailedToRead, null); + } + } + + /// + /// Loads a specified database with the key type as ushorts. + /// + /// The path to the database to load. + /// The result of the method , and the loaded database if execution was successful. + public static (DatabaseReturnCode, Dictionary) LoadDatabase(string databasePath) + { + StreamReader databaseReader; + try + { + databaseReader = File.OpenText(databasePath); + } + catch + { + return (DatabaseReturnCode.FailedToOpen, null); + } + + try + { + using (databaseReader) + { + var database = new Dictionary(); + string line; + + while ((line = databaseReader.ReadLine()) != null) + { + if (line.Contains("//")) continue; + + database.Add(ushort.Parse(line.Substring(0, 6).Replace("0x", ""), NumberStyles.HexNumber), + line.Substring(7)); + } + + return (DatabaseReturnCode.Success, database); + } + } + catch + { + return (DatabaseReturnCode.FailedToRead, null); + } + } + } +} diff --git a/Classes/Utilities/DateUtility.cs b/ACSE.Core/Utilities/DateUtility.cs similarity index 96% rename from Classes/Utilities/DateUtility.cs rename to ACSE.Core/Utilities/DateUtility.cs index 5f3f840..89e1131 100644 --- a/Classes/Utilities/DateUtility.cs +++ b/ACSE.Core/Utilities/DateUtility.cs @@ -1,6 +1,7 @@ using System; +using ACSE.Core.Saves; -namespace ACSE.Utilities +namespace ACSE.Core.Utilities { public class AcDate { @@ -38,7 +39,7 @@ public AcDate() public AcDate(byte[] dateData) { - switch (MainForm.SaveFile.SaveType) + switch (Save.SaveInstance.SaveType) { case SaveType.DoubutsuNoMori: case SaveType.DoubutsuNoMoriPlus: @@ -125,7 +126,7 @@ public string Format(string formatString) public byte[] ToFullDateData() { - switch (MainForm.SaveFile.SaveGeneration) + switch (Save.SaveInstance.SaveGeneration) { case SaveGeneration.N64: case SaveGeneration.GCN: @@ -147,7 +148,7 @@ public byte[] ToFullDateData() public byte[] ToYearMonthDayDateData() { - switch (MainForm.SaveFile.SaveGeneration) + switch (Save.SaveInstance.SaveGeneration) { case SaveGeneration.N64: case SaveGeneration.GCN: @@ -173,7 +174,7 @@ public byte[] ToYearMonthDayDateData() public byte[] ToMonthDayDateData() { - switch (MainForm.SaveFile.SaveGeneration) + switch (Save.SaveInstance.SaveGeneration) { case SaveGeneration.N64: case SaveGeneration.GCN: diff --git a/ACSE.Core/Utilities/DebugUtility.cs b/ACSE.Core/Utilities/DebugUtility.cs new file mode 100644 index 0000000..9dca1e5 --- /dev/null +++ b/ACSE.Core/Utilities/DebugUtility.cs @@ -0,0 +1,22 @@ +using ACSE.Core.Debug; +using ACSE.Core.Saves; + +namespace ACSE.Core.Utilities +{ + public static class DebugUtility + { + /// + /// The current DebugManager instance. + /// + public static DebugManager DebugManagerInstance { get; private set; } + + /// + /// Initializes the DebugManager and returns the instance. If it is already initialized, it will return that instance. + /// + /// The current save file to initialize the debug manager with. + /// The debug level to initialize the manager with. + /// The object that is now initialized. + public static DebugManager InitializeDebugManager(Save saveFile, DebugLevel debugLevel = DebugLevel.Info) => + DebugManagerInstance ?? (DebugManagerInstance = new DebugManager(saveFile, debugLevel)); + } +} diff --git a/ACSE.Core/Utilities/PathUtility.cs b/ACSE.Core/Utilities/PathUtility.cs new file mode 100644 index 0000000..82f4e04 --- /dev/null +++ b/ACSE.Core/Utilities/PathUtility.cs @@ -0,0 +1,26 @@ +using System.IO; +using System.Reflection; + +namespace ACSE.Core.Utilities +{ + public static class PathUtility + { + /// + /// Gets the path to the current executable. + /// + /// The path string of the current executable. + public static string GetExeLocation() => Assembly.GetEntryAssembly().Location; + + /// + /// Gets the directory of the executable folder. + /// + /// The path string of the folder the executable was launched in. + public static string GetExeDirectory() => Path.GetDirectoryName(GetExeLocation()); + + /// + /// Gets the directory of the Resources folder. + /// + /// The path string of the Resources folder. + public static string GetResourcesDirectory() => Path.Combine(GetExeDirectory(), "Resources"); + } +} diff --git a/Classes/Utilities/PatternUtility.cs b/ACSE.Core/Utilities/PatternUtility.cs similarity index 99% rename from Classes/Utilities/PatternUtility.cs rename to ACSE.Core/Utilities/PatternUtility.cs index 27e41ad..2248600 100644 --- a/Classes/Utilities/PatternUtility.cs +++ b/ACSE.Core/Utilities/PatternUtility.cs @@ -2,8 +2,9 @@ using System.Collections.Generic; using System.Drawing; using System.Drawing.Imaging; +using ACSE.Core.Imaging; -namespace ACSE.Utilities +namespace ACSE.Core.Utilities { public static class PatternUtility { diff --git a/Classes/Utilities/StringUtility.cs b/ACSE.Core/Utilities/StringUtility.cs similarity index 99% rename from Classes/Utilities/StringUtility.cs rename to ACSE.Core/Utilities/StringUtility.cs index 4e11b3f..2eac34d 100644 --- a/Classes/Utilities/StringUtility.cs +++ b/ACSE.Core/Utilities/StringUtility.cs @@ -3,8 +3,10 @@ using System.Text; using System.Globalization; using System.Text.RegularExpressions; +using ACSE.Core.Debug; +using ACSE.Core.Saves; -namespace ACSE.Utilities +namespace ACSE.Core.Utilities { internal static class CharacterSets { @@ -472,9 +474,6 @@ public AcString(byte[] stringBuffer, SaveType saveType) if (result >= CharacterSets.DongwuSenlinCharacterSet.Length) { - System.Windows.Forms.MessageBox.Show( - $"Unknown Dongwu Senlin character encountered: {result:X4}"); - String += "?"; } else @@ -617,10 +616,6 @@ public static byte[] GetBytes(string String, int maxSize = 0) Array.Resize(ref stringBuffer, maxSize); return stringBuffer; } - case SaveType.Unknown: - MainForm.DebugManager.WriteLine( - $"StringUtil was passed an unknown SaveType enum. Received Type: {_saveType.ToString()}", DebugLevel.Error); - return null; default: return null; } diff --git a/Classes/Utilities/Utility.cs b/ACSE.Core/Utilities/Utility.cs similarity index 55% rename from Classes/Utilities/Utility.cs rename to ACSE.Core/Utilities/Utility.cs index b268e22..18a8c05 100644 --- a/Classes/Utilities/Utility.cs +++ b/ACSE.Core/Utilities/Utility.cs @@ -4,8 +4,13 @@ using System.Drawing.Imaging; using System.IO; using System.Linq; +using ACSE.Core.Acres; +using ACSE.Core.Encryption; +using ACSE.Core.Items; +using ACSE.Core.Saves; +using ACSE.Core.Villagers; -namespace ACSE.Utilities +namespace ACSE.Core.Utilities { public static class Utility { @@ -57,41 +62,11 @@ public static int[] FindLargestMatch(ref List dictionary, int[] matchesFou return bestMatch; } - public static void Scan_For_NL_Int32() + public static Tuple FindVillagerHouse(ushort villagerId, WorldAcre[] townAcres) // TODO: Apply to WW { - if (MainForm.SaveFile == null || MainForm.SaveFile.SaveGeneration != SaveGeneration.N3DS) return; - using (var int32Stream = File.CreateText(MainForm.AssemblyLocation + "\\" + - (MainForm.SaveFile.SaveType == SaveType.WelcomeAmiibo ? "WA_" : "") + "NL_Int32_Database.txt")) - for (var i = 0; i < MainForm.SaveFile.SaveData.Length - 4; i += 4) - { - var possibleNlInt32 = new NewLeafInt32(MainForm.SaveFile.ReadUInt32(i), MainForm.SaveFile.ReadUInt32(i + 4)); - if (possibleNlInt32.Valid) - int32Stream.WriteLine( - $"Found Valid NewLeafInt32 at offset 0x{i:X} | Value: {possibleNlInt32.Value}"); - } - } - - public static Image Set_Image_Color(Image grayscaleImage, ColorMatrix transformMatrix) - { - using (var attributes = new ImageAttributes()) - { - attributes.SetColorMatrix(transformMatrix, ColorMatrixFlag.Default, ColorAdjustType.Bitmap); - var transformedImage = new Bitmap(grayscaleImage.Width, grayscaleImage.Height); - using (var g = Graphics.FromImage(transformedImage)) - { - g.DrawImage(grayscaleImage, 0, 0); - g.DrawImage(transformedImage, new Rectangle(0, 0, grayscaleImage.Size.Width, grayscaleImage.Size.Height), - 0, 0, grayscaleImage.Size.Width, grayscaleImage.Size.Height, GraphicsUnit.Pixel, attributes); - return transformedImage; - } - } - } - - public static Tuple Find_Villager_House(ushort villagerId) // TODO: Apply to WW - { - if (MainForm.SaveFile == null) return new Tuple(new byte[] {0xFF, 0xFF, 0xFF, 0xFF}, false); + if (Save.SaveInstance == null) return new Tuple(new byte[] {0xFF, 0xFF, 0xFF, 0xFF}, false); var villagerHouseId = (ushort)(0x5000 + (villagerId & 0xFF)); - foreach (var acre in MainForm.TownAcres) + foreach (var acre in townAcres) { var villagerHouse = acre.AcreItems.FirstOrDefault(o => o.ItemId == villagerHouseId); if (villagerHouse != null) @@ -104,12 +79,12 @@ public static Tuple Find_Villager_House(ushort villagerId) // TODO return new Tuple(new byte[] { 0xFF, 0xFF, 0xFF, 0xFF }, false); } - public static (byte[], bool) FindVillagerHouseWildWorld(int villagerIndex) + public static (byte[], bool) FindVillagerHouseWildWorld(int villagerIndex, WorldAcre[] townAcres) { - if (MainForm.SaveFile == null) return (new byte[] {0xFF, 0xFF}, false); + if (Save.SaveInstance == null) return (new byte[] {0xFF, 0xFF}, false); var houseId = 0x5001 + villagerIndex; - foreach (var acre in MainForm.TownAcres) + foreach (var acre in townAcres) { var villagerHouse = acre.AcreItems.FirstOrDefault(o => o.ItemId == houseId); if (villagerHouse != null) @@ -133,14 +108,14 @@ public static Villager GetVillagerFromHouse(ushort houseId, Villager[] villagers } - public static bool[] Check_Perfect_Town_Requirements(WorldAcre[] acres, bool makePerfect = false) + public static bool[] CheckPerfectTownRequirements(WorldAcre[] acres, bool makePerfect = false) { var acreResults = new bool[acres.Length]; var points = 0; for (var i = 0; i < acreResults.Length; i++) { var acre = acres[i]; - switch (MainForm.SaveFile.SaveGeneration) + switch (Save.SaveInstance.SaveGeneration) { case SaveGeneration.N64: case SaveGeneration.GCN: @@ -159,7 +134,7 @@ public static bool[] Check_Perfect_Town_Requirements(WorldAcre[] acres, bool mak acre.AcreItems[o] = new WorldItem(0, o); } } - else if (ItemData.GetItemType(item.ItemId, MainForm.SaveFile.SaveType) == ItemType.Tree) + else if (ItemData.GetItemType(item.ItemId, Save.SaveInstance.SaveType) == ItemType.Tree) { treeCount++; } @@ -173,7 +148,7 @@ public static bool[] Check_Perfect_Town_Requirements(WorldAcre[] acres, bool mak for (var x = 0; x < 256; x++) { if (ItemData.GetItemType(acre.AcreItems[x].ItemId, - MainForm.SaveFile.SaveType) != ItemType.Tree) continue; + Save.SaveInstance.SaveType) != ItemType.Tree) continue; acre.AcreItems[x] = new WorldItem(0, x); break; } @@ -215,10 +190,10 @@ public static bool[] Check_Perfect_Town_Requirements(WorldAcre[] acres, bool mak return acreResults; } - public static void Place_Structure(WorldAcre acre, int startIndex, List structureInfo) + public static void PlaceStructure(WorldAcre acre, int startIndex, List structureInfo) { if (startIndex <= -1 || startIndex >= 256) return; - if (MainForm.SaveFile.SaveGeneration != SaveGeneration.GCN) return; + if (Save.SaveInstance.SaveGeneration != SaveGeneration.GCN) return; for (var y = 0; y < structureInfo.Count; y++) { for (var x = 0; x < structureInfo[y].Length; x++) @@ -269,7 +244,7 @@ public static void FloodFillItemArray(ref Item[] items, int itemsPerRow, int sta var i = items[idx]; if (i.Equals(originalItem)) { - MainForm.SaveFile.ChangesMade = true; + Save.SaveInstance.ChangesMade = true; items[idx] = new Item(newItem); if (p.X - 1 > -1) locationStack.Push(new Point(p.X - 1, p.Y)); @@ -308,7 +283,7 @@ public static void FloodFillWorldItemArray(ref WorldItem[] items, int itemsPerRo var i = items[idx]; if (i.Equals(originalItem)) { - MainForm.SaveFile.ChangesMade = true; + Save.SaveInstance.ChangesMade = true; items[idx] = new WorldItem(newItem.ItemId, newItem.Flag1, newItem.Flag2, i.Index); if (p.X - 1 > -1) locationStack.Push(new Point(p.X - 1, p.Y)); @@ -347,7 +322,7 @@ public static void FloodFillFurnitureArray(ref Furniture[] items, int itemsPerRo var i = items[idx]; if (i.Equals(originalItem)) { - MainForm.SaveFile.ChangesMade = true; + Save.SaveInstance.ChangesMade = true; items[idx] = new Furniture(newItem); if (p.X - 1 > -1) locationStack.Push(new Point(p.X - 1, p.Y)); @@ -362,176 +337,5 @@ public static void FloodFillFurnitureArray(ref Furniture[] items, int itemsPerRo previousPoints[idx] = 1; } } - - // Export/Import Methods - public static void ExportAcres(WorldAcre[] acres, SaveGeneration saveGeneration, string saveFileName) - { - using (var saveDialog = new System.Windows.Forms.SaveFileDialog()) - { - saveDialog.Filter = "ACSE Acre Save (*.aas)|*.aas"; - saveDialog.FileName = saveFileName + " Acre Data.aas"; - - if (saveDialog.ShowDialog() != System.Windows.Forms.DialogResult.OK) return; - try - { - using (var stream = new FileStream(saveDialog.FileName, FileMode.Create)) - { - using (var writer = new BinaryWriter(stream)) - { - writer.Write(new byte[] { 0x41, 0x41, 0x53 }); // "AAS" Identifier - writer.Write((byte)acres.Length); // Total Acre Count - writer.Write((byte)saveGeneration); // Save Generation - writer.Write(new byte[] { 0, 0, 0 }); // Padding - foreach (var t in acres) - { - writer.Write(BitConverter.GetBytes(t.AcreId)); - } - - writer.Flush(); - } - } - } - catch - { - System.Windows.Forms.MessageBox.Show("Acre exportation failed!", "Acre Export Error", System.Windows.Forms.MessageBoxButtons.OK, - System.Windows.Forms.MessageBoxIcon.Error); - } - } - } - - public static void ImportAcres(ref WorldAcre[] acres, SaveGeneration saveGeneration) - { - using (var openDialog = new System.Windows.Forms.OpenFileDialog()) - { - openDialog.Filter = "ACSE Acre Save (*.aas)|*.aas"; - openDialog.FileName = ""; - - if (openDialog.ShowDialog() != System.Windows.Forms.DialogResult.OK) return; - try - { - using (var stream = new FileStream(openDialog.FileName, FileMode.Open)) - { - using (var reader = new BinaryReader(stream)) - { - if (!System.Text.Encoding.ASCII.GetString(reader.ReadBytes(3)).Equals("AAS") || - reader.ReadByte() != acres.Length || - (SaveGeneration) reader.ReadByte() != saveGeneration) return; - reader.BaseStream.Seek(8, SeekOrigin.Begin); - foreach (var t in acres) - { - t.AcreId = reader.ReadUInt16(); - t.BaseAcreId = (ushort)(t.AcreId & 0xFFFC); - } - } - } - } - catch - { - System.Windows.Forms.MessageBox.Show("Acre importation failed!", "Acre Import Error", System.Windows.Forms.MessageBoxButtons.OK, - System.Windows.Forms.MessageBoxIcon.Error); - } - } - } - - public static void ExportTown(WorldAcre[] acres, SaveGeneration saveGeneration, string saveFileName) - { - using (var saveDialog = new System.Windows.Forms.SaveFileDialog()) - { - saveDialog.Filter = "ACSE Town Save (*.ats)|*.ats"; - saveDialog.FileName = saveFileName + " Town Data.ats"; - - if (saveDialog.ShowDialog() != System.Windows.Forms.DialogResult.OK) return; - try - { - using (var stream = new FileStream(saveDialog.FileName, FileMode.Create)) - { - using (var writer = new BinaryWriter(stream)) - { - writer.Write(new byte[] { 0x41, 0x54, 0x53 }); // "ATS" Identifier - writer.Write((byte)acres.Length); // Total Acre Count - writer.Write((byte)saveGeneration); // Save Generation - writer.Write(new byte[] { 0, 0, 0 }); // Padding - - if (saveGeneration == SaveGeneration.N3DS) - { - foreach (var acre in acres) - { - foreach (var item in acre.AcreItems) - { - writer.Write(BitConverter.GetBytes(item.ToUInt32())); - } - } - } - else - { - foreach (var acre in acres) - { - foreach (var item in acre.AcreItems) - { - writer.Write(BitConverter.GetBytes(item.ItemId)); - } - } - } - - writer.Flush(); - } - } - } - catch - { - System.Windows.Forms.MessageBox.Show("Town exportation failed!", "Town Export Error", System.Windows.Forms.MessageBoxButtons.OK, - System.Windows.Forms.MessageBoxIcon.Error); - } - } - } - - public static void ImportTown(ref WorldAcre[] acres, SaveGeneration saveGeneration) - { - using (var openDialog = new System.Windows.Forms.OpenFileDialog()) - { - openDialog.Filter = "ACSE Town Save (*.ats)|*.ats"; - openDialog.FileName = ""; - - if (openDialog.ShowDialog() != System.Windows.Forms.DialogResult.OK) return; - try - { - using (var stream = new FileStream(openDialog.FileName, FileMode.Open)) - { - using (var reader = new BinaryReader(stream)) - { - if (!System.Text.Encoding.ASCII.GetString(reader.ReadBytes(3)).Equals("ATS") || - reader.ReadByte() != acres.Length || - (SaveGeneration) reader.ReadByte() != saveGeneration) return; - reader.BaseStream.Seek(8, SeekOrigin.Begin); - if (saveGeneration == SaveGeneration.N3DS) - { - foreach (var acre in acres) - { - for (var x = 0; x < acre.AcreItems.Length; x++) - { - acre.AcreItems[x] = new WorldItem(reader.ReadUInt32(), acre.AcreItems[x].Index); - } - } - } - else - { - foreach (var acre in acres) - { - for (var x = 0; x < acre.AcreItems.Length; x++) - { - acre.AcreItems[x] = new WorldItem(reader.ReadUInt16(), acre.AcreItems[x].Index); - } - } - } - } - } - } - catch - { - System.Windows.Forms.MessageBox.Show("Acre importation failed!", "Acre Import Error", System.Windows.Forms.MessageBoxButtons.OK, - System.Windows.Forms.MessageBoxIcon.Error); - } - } - } } } diff --git a/Classes/Villagers/PlayerRelation.cs b/ACSE.Core/Villagers/AnimalMemories/AnimalMemory.cs similarity index 87% rename from Classes/Villagers/PlayerRelation.cs rename to ACSE.Core/Villagers/AnimalMemories/AnimalMemory.cs index e7c9e7f..91fb839 100644 --- a/Classes/Villagers/PlayerRelation.cs +++ b/ACSE.Core/Villagers/AnimalMemories/AnimalMemory.cs @@ -1,9 +1,11 @@ -using ACSE.Utilities; -using ACSE.Messages.Mail; +using ACSE.Core.Messages.Mail; +using ACSE.Core.Players; +using ACSE.Core.Saves; +using ACSE.Core.Utilities; -namespace ACSE +namespace ACSE.Core.Villagers.AnimalMemories { - public abstract class PlayerRelation + public abstract class AnimalMemory { public bool Exists; @@ -28,13 +30,13 @@ public abstract class PlayerRelation public abstract void Write(); } - public class AcPlayerRelation : PlayerRelation + public class AnimalCrossingAnimalMemory : AnimalMemory { public byte[] Unknown1; public byte[] Unknown2; public byte[] Unknown3; - public AcPlayerRelation(Save saveFile, Villager villager, int dataOffset) + public AnimalCrossingAnimalMemory(Save saveFile, Villager villager, int dataOffset) { SaveFile = saveFile; Villager = villager; diff --git a/Classes/Villagers/Quests/GCNQuests.cs b/ACSE.Core/Villagers/Quests/GCNQuests.cs similarity index 97% rename from Classes/Villagers/Quests/GCNQuests.cs rename to ACSE.Core/Villagers/Quests/GCNQuests.cs index efe1ff3..449df68 100644 --- a/Classes/Villagers/Quests/GCNQuests.cs +++ b/ACSE.Core/Villagers/Quests/GCNQuests.cs @@ -1,6 +1,7 @@ using System; +using ACSE.Core.Saves; -namespace ACSE.Quests +namespace ACSE.Core.Villagers.Quests { public enum QuestCategory { diff --git a/Classes/Villagers/SimpleVillager.cs b/ACSE.Core/Villagers/SimpleVillager.cs similarity index 87% rename from Classes/Villagers/SimpleVillager.cs rename to ACSE.Core/Villagers/SimpleVillager.cs index b615edb..55bbf80 100644 --- a/Classes/Villagers/SimpleVillager.cs +++ b/ACSE.Core/Villagers/SimpleVillager.cs @@ -1,4 +1,6 @@ -namespace ACSE +using ACSE.Core.Items; + +namespace ACSE.Core.Villagers { public class SimpleVillager { diff --git a/Classes/Villagers/Villager.cs b/ACSE.Core/Villagers/Villager.cs similarity index 91% rename from Classes/Villagers/Villager.cs rename to ACSE.Core/Villagers/Villager.cs index ee8d25f..8067352 100644 --- a/Classes/Villagers/Villager.cs +++ b/ACSE.Core/Villagers/Villager.cs @@ -2,15 +2,19 @@ using System.Linq; using System.Reflection; using System.Text; -using ACSE.Utilities; +using ACSE.Core.Items; +using ACSE.Core.Players; +using ACSE.Core.Saves; +using ACSE.Core.Utilities; +using ACSE.Core.Villagers.AnimalMemories; -namespace ACSE +namespace ACSE.Core.Villagers { public class Villager { public VillagerOffsets Offsets; public VillagerDataStruct Data; - public PlayerRelation[] PlayerRelations; + public AnimalMemory[] AnimalMemories; public readonly int Index; public readonly int Offset; public string Name; @@ -107,10 +111,10 @@ public Villager(int offset, int idx, Save save) // Create Player Relations; if (save.SaveType != SaveType.AnimalCrossing) return; { - PlayerRelations = new PlayerRelation[7]; + AnimalMemories = new AnimalMemory[7]; for (var i = 0; i < 7; i++) { - PlayerRelations[i] = new AcPlayerRelation(save, this, Offset + 0x10 + i * 0x138); + AnimalMemories[i] = new AnimalCrossingAnimalMemory(save, this, Offset + 0x10 + i * 0x138); } } } @@ -130,9 +134,9 @@ public override string ToString() return Name ?? "Unknown"; } - public PlayerRelation GetPlayerRelation(Player player) + public AnimalMemory GetAnimalMemory(Player player) { - return PlayerRelations?.First(o => o.PlayerId == player.Data.Identifier && o.PlayerName.Equals(player.Data.Name)); + return AnimalMemories?.First(o => o.PlayerId == player.Data.Identifier && o.PlayerName.Equals(player.Data.Name)); } public void SetDlcVillager(int dlcIndex) @@ -165,7 +169,10 @@ public void Write(string townName) { if (Offsets.TownId != -1) { - Data.TownId = _saveData.ReadUInt16(_saveData.SaveDataStartOffset + MainForm.CurrentSaveInfo.SaveOffsets.TownId, _saveData.IsBigEndian); // Might not be UInt16 in all games + Data.TownId = + _saveData.ReadUInt16( + _saveData.SaveDataStartOffset + Save.SaveInstance.SaveInfo.SaveOffsets.TownId, + _saveData.IsBigEndian); // Might not be UInt16 in all games } if (!string.IsNullOrWhiteSpace(townName) && Offsets.TownName != -1) { @@ -200,7 +207,9 @@ public void Write(string townName) default: if (fieldType == typeof(string)) { - _saveData.Write(dataOffset, AcString.GetBytes(dataObject, (int)villagerOffsetData.GetField(field.Name + "Size").GetValue(Offsets))); + _saveData.Write(dataOffset, + AcString.GetBytes(dataObject, + (int) villagerOffsetData.GetField(field.Name + "Size").GetValue(Offsets))); } else if (fieldType == typeof(byte[])) { @@ -244,10 +253,10 @@ public void Write(string townName) } } - // Write PlayerRelations - if (Exists && PlayerRelations != null) + // Write AnimalMemories + if (Exists && AnimalMemories != null) { - foreach (var relation in PlayerRelations) + foreach (var relation in AnimalMemories) { if (relation.Exists) { diff --git a/Classes/Villagers/VillagerData.cs b/ACSE.Core/Villagers/VillagerData.cs similarity index 96% rename from Classes/Villagers/VillagerData.cs rename to ACSE.Core/Villagers/VillagerData.cs index cde482e..6299b84 100644 --- a/Classes/Villagers/VillagerData.cs +++ b/ACSE.Core/Villagers/VillagerData.cs @@ -2,12 +2,15 @@ using System.Collections.Generic; using System.IO; using System.Text.RegularExpressions; -using System.Windows.Forms; using System.Globalization; +using ACSE.Core.Debug; +using ACSE.Core.Items; +using ACSE.Core.Saves; +using ACSE.Core.Utilities; -namespace ACSE +namespace ACSE.Core.Villagers { - internal class VillagerData + public static class VillagerData { public static readonly Dictionary WaSpecialVillagers = new Dictionary { @@ -45,10 +48,11 @@ internal class VillagerData {0x2010, "Isabelle (2)"} }; - public static BindingSource GetCaravanBindingSource() + public static Dictionary GetCaravanBindingSource() { var waDatabase = VillagerInfo.GetVillagerDatabase(SaveType.WelcomeAmiibo); - if (waDatabase == null) return new BindingSource(WaSpecialVillagers, null); + if (waDatabase == null) return null; + foreach (var v in WaSpecialVillagers) { var specialVillager = new SimpleVillager @@ -59,7 +63,7 @@ public static BindingSource GetCaravanBindingSource() waDatabase.Add(v.Key, specialVillager); } - return new BindingSource(waDatabase, null); + return waDatabase; } } @@ -325,7 +329,7 @@ public static Dictionary GetVillagerDatabase(SaveType sa { var database = new Dictionary(); StreamReader contents; - var databaseFilename = MainForm.AssemblyLocation + "\\Resources\\{0}_Villagers_" + language + ".txt"; + var databaseFilename = "{0}_Villagers_" + language + ".txt"; switch (saveType) { case SaveType.DoubutsuNoMori: @@ -357,14 +361,17 @@ public static Dictionary GetVillagerDatabase(SaveType sa throw new ArgumentOutOfRangeException(nameof(saveType), saveType, null); } + databaseFilename = Path.Combine(PathUtility.GetResourcesDirectory(), databaseFilename); + try { contents = File.OpenText(databaseFilename); } catch (Exception e) { - MessageBox.Show( - $"An error occured opening villager database file:\n\"{databaseFilename}\"\nError Info:\n{e.Message}"); + DebugUtility.DebugManagerInstance.WriteLine( + $"An error occured opening villager database file:\n\"{databaseFilename}\"\nError Info:\n{e.Message}", + DebugLevel.Error); return null; } diff --git a/Classes/Weather.cs b/ACSE.Core/Weather/Weather.cs similarity index 65% rename from Classes/Weather.cs rename to ACSE.Core/Weather/Weather.cs index 4a6626e..4561958 100644 --- a/Classes/Weather.cs +++ b/ACSE.Core/Weather/Weather.cs @@ -1,4 +1,6 @@ -namespace ACSE +using ACSE.Core.Saves; + +namespace ACSE.Core.Weather { public static class Weather { @@ -36,7 +38,9 @@ public static byte ToWeatherByte(byte index, SaveGeneration generation) { case SaveGeneration.N64: case SaveGeneration.GCN: - return (byte)((MainForm.SaveFile.ReadByte(MainForm.SaveFile.SaveDataStartOffset + MainForm.SaveFile.SaveInfo.SaveOffsets.Weather) & 0x0F) | (index << 4)); + return (byte) ((Save.SaveInstance.ReadByte( + Save.SaveInstance.SaveDataStartOffset + + Save.SaveInstance.SaveInfo.SaveOffsets.Weather) & 0x0F) | (index << 4)); default: return index; } @@ -46,13 +50,6 @@ public static bool UpdateWeather(Save saveFile, byte index) { if (saveFile.SaveGeneration != SaveGeneration.N64 && saveFile.SaveGeneration != SaveGeneration.GCN) return false; - if (saveFile.SaveType != SaveType.DoubutsuNoMoriEPlus && saveFile.SaveType != SaveType.AnimalForestEPlus - && index == 4 && System.Windows.Forms.MessageBox.Show( - "Setting the Weather to Fall Leaves will cause glitches, and will crash your game if you run." - + "Are you sure you want to change the weather to it?", "Weather Warning", - System.Windows.Forms.MessageBoxButtons.YesNo, - System.Windows.Forms.MessageBoxIcon.Question) != - System.Windows.Forms.DialogResult.Yes) return false; saveFile.Write(saveFile.SaveDataStartOffset + saveFile.SaveInfo.SaveOffsets.Weather, ToWeatherByte(index, saveFile.SaveGeneration)); return true; } diff --git a/Classes/Yaz0.cs b/ACSE.Core/Yaz0.cs similarity index 99% rename from Classes/Yaz0.cs rename to ACSE.Core/Yaz0.cs index ee5d06d..18766d3 100644 --- a/Classes/Yaz0.cs +++ b/ACSE.Core/Yaz0.cs @@ -1,9 +1,9 @@ using System; using System.Collections.Generic; using System.Text; -using ACSE.Utilities; +using ACSE.Core.Utilities; -namespace ACSE +namespace ACSE.Core { public static class Yaz0 { diff --git a/ACSE.WinForms/ACSE.WinForms.csproj b/ACSE.WinForms/ACSE.WinForms.csproj new file mode 100644 index 0000000..2d933cb --- /dev/null +++ b/ACSE.WinForms/ACSE.WinForms.csproj @@ -0,0 +1,5647 @@ + + + + + + Debug + AnyCPU + {B4A73545-0177-4159-8602-648AA3058650} + WinExe + ACSE.WinForms + ACSE.WinForms + v4.7 + 512 + true + true + + + + + AnyCPU + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + latest + + + AnyCPU + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + latest + + + ACSE_Logo_2.ico + + + + ..\packages\Costura.Fody.3.1.6\lib\net46\Costura.dll + + + ..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll + + + + + ..\packages\System.Drawing.Common.4.5.1\lib\net461\System.Drawing.Common.dll + + + + + + + + + + + + + + Form + + + AboutBox.cs + + + + Component + + + UserControl + + + Component + + + UserControl + + + Component + + + Component + + + Component + + + Component + + + Component + + + UserControl + + + SingleItemEditor.cs + + + Component + + + Component + + + + + Form + + + ItemColorEditor.cs + + + ItemColorSettings.settings + + + Form + + + SecureValueForm.cs + + + Form + + + SettingsMenuForm.cs + + + + Form + + + ToggleableAlertForm.cs + + + Form + + + MainForm.cs + + + + + + + AboutBox.cs + + + ItemColorEditor.cs + + + SecureValueForm.cs + + + SettingsMenuForm.cs + + + ToggleableAlertForm.cs + + + MainForm.cs + Designer + + + ResXFileCodeGenerator + Resources.Designer.cs + Designer + + + True + Resources.resx + True + + + SettingsSingleFileGenerator + ItemColorSettings.Designer.cs + + + + SettingsSingleFileGenerator + Settings.Designer.cs + + + True + Settings.settings + True + + + + + + + + {c4cc8c38-85d7-44eb-ae3a-14407c3184b5} + ACSE.Core + + + + + PreserveNewest + + + + + PreserveNewest + + + + + PreserveNewest + + + + + PreserveNewest + + + + + PreserveNewest + + + + + PreserveNewest + + + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + + + PreserveNewest + + + + + PreserveNewest + + + + + PreserveNewest + + + + + PreserveNewest + + + + + PreserveNewest + + + + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + + + \ No newline at end of file diff --git a/Resources/Images/ACSE_Logo_2.ico b/ACSE.WinForms/ACSE_Logo_2.ico similarity index 100% rename from Resources/Images/ACSE_Logo_2.ico rename to ACSE.WinForms/ACSE_Logo_2.ico diff --git a/Forms/AboutBox.Designer.cs b/ACSE.WinForms/AboutBox/AboutBox.Designer.cs similarity index 99% rename from Forms/AboutBox.Designer.cs rename to ACSE.WinForms/AboutBox/AboutBox.Designer.cs index e1b6d72..fb157fd 100644 --- a/Forms/AboutBox.Designer.cs +++ b/ACSE.WinForms/AboutBox/AboutBox.Designer.cs @@ -1,4 +1,4 @@ -namespace ACSE +namespace ACSE.WinForms { partial class AboutBox { diff --git a/Forms/AboutBox.cs b/ACSE.WinForms/AboutBox/AboutBox.cs similarity index 97% rename from Forms/AboutBox.cs rename to ACSE.WinForms/AboutBox/AboutBox.cs index abc4fe5..34db5cc 100644 --- a/Forms/AboutBox.cs +++ b/ACSE.WinForms/AboutBox/AboutBox.cs @@ -2,9 +2,9 @@ using System.Reflection; using System.Windows.Forms; -namespace ACSE +namespace ACSE.WinForms { - partial class AboutBox : Form + public partial class AboutBox : Form { public AboutBox() { diff --git a/Forms/AboutBox.resx b/ACSE.WinForms/AboutBox/AboutBox.resx similarity index 100% rename from Forms/AboutBox.resx rename to ACSE.WinForms/AboutBox/AboutBox.resx diff --git a/ACSE.WinForms/App.config b/ACSE.WinForms/App.config new file mode 100644 index 0000000..e24a72a --- /dev/null +++ b/ACSE.WinForms/App.config @@ -0,0 +1,42 @@ + + + + +
+ + + + + + + + + True + + + 5 + + + 2 + + + 256 + + + 96 + + + True + + + True + + + True + + + + + + + \ No newline at end of file diff --git a/Classes/Backup.cs b/ACSE.WinForms/Backups/Backup.cs similarity index 92% rename from Classes/Backup.cs rename to ACSE.WinForms/Backups/Backup.cs index c7410a3..bc3ac5d 100644 --- a/Classes/Backup.cs +++ b/ACSE.WinForms/Backups/Backup.cs @@ -3,10 +3,13 @@ using System.Linq; using System.Security.Cryptography; using System.Text; +using ACSE.Core.Debug; +using ACSE.Core.Saves; +using ACSE.Core.Utilities; -namespace ACSE +namespace ACSE.WinForms.Backups { - public class Backup + public sealed class Backup { private readonly Save _save; @@ -35,7 +38,7 @@ private static string GetBackupLocation() } catch { - MainForm.DebugManager.WriteLine( + DebugUtility.DebugManagerInstance.WriteLine( $"The requested backup path {Properties.Settings.Default.BackupLocation} couldn't be accessed!\n" + "The backup folder was reset to the default in ApplicationData/ACSE/Backups/!"); Properties.Settings.Default.BackupLocation = ""; @@ -97,13 +100,13 @@ public bool CreateBackup() using (var backupFile = File.Create(saveLocation)) { backupFile.Write(_save.SaveData, 0, _save.SaveData.Length); - MainForm.DebugManager.WriteLine( + DebugUtility.DebugManagerInstance.WriteLine( $"Save File {_save.SaveName} was backuped to {backupLocation}"); } } catch { - MainForm.DebugManager.WriteLine( + DebugUtility.DebugManagerInstance.WriteLine( $"Failed to create backup for save {_save.SaveName} at {backupLocation}", DebugLevel.Error); return false; } diff --git a/Controls/BadgeControl.cs b/ACSE.WinForms/Controls/BadgeControl.cs similarity index 97% rename from Controls/BadgeControl.cs rename to ACSE.WinForms/Controls/BadgeControl.cs index a29684b..a22eb1a 100644 --- a/Controls/BadgeControl.cs +++ b/ACSE.WinForms/Controls/BadgeControl.cs @@ -1,10 +1,12 @@ using System; using System.Drawing; using System.Windows.Forms; +using ACSE.Core.Encryption; +using ACSE.Core.Saves; -namespace ACSE +namespace ACSE.WinForms.Controls { - public class BadgeControl : OffsetablePictureBox + public sealed class BadgeControl : OffsetablePictureBox { private static readonly Bitmap BadgeImage = Properties.Resources.Animal_Crossing_NL_Badges_28x28; private static readonly Bitmap NoBadgeImage = Properties.Resources.Animal_Crossing_NL_NoBadge_28x28; diff --git a/Controls/FurnitureItemEditor.cs b/ACSE.WinForms/Controls/FurnitureItemEditor.cs similarity index 96% rename from Controls/FurnitureItemEditor.cs rename to ACSE.WinForms/Controls/FurnitureItemEditor.cs index c552de0..3fb9407 100644 --- a/Controls/FurnitureItemEditor.cs +++ b/ACSE.WinForms/Controls/FurnitureItemEditor.cs @@ -2,8 +2,11 @@ using System.Drawing; using System.Linq; using System.Windows.Forms; +using ACSE.Core.Items; +using ACSE.Core.Utilities; +using ACSE.WinForms.Imaging; -namespace ACSE +namespace ACSE.WinForms.Controls { internal sealed class FurnitureItemEditor : ItemEditor { @@ -70,7 +73,7 @@ protected override void OnEditorMouseDown(object sender, MouseEventArgs e) break; case MouseButtons.Middle: var tempItems = (Furniture[]) Items; - Utilities.Utility.FloodFillFurnitureArray(ref tempItems, ItemsPerRow, index, + Utility.FloodFillFurnitureArray(ref tempItems, ItemsPerRow, index, (Furniture) Items[index], new Furniture(MainFormReference.GetCurrentItem())); Items = tempItems; break; diff --git a/Controls/HouseControl.cs b/ACSE.WinForms/Controls/HouseControl.cs similarity index 96% rename from Controls/HouseControl.cs rename to ACSE.WinForms/Controls/HouseControl.cs index bb2f276..519c414 100644 --- a/Controls/HouseControl.cs +++ b/ACSE.WinForms/Controls/HouseControl.cs @@ -1,12 +1,15 @@ using System.Collections.Generic; using System.Drawing; using System.Windows.Forms; +using ACSE.Core.Housing; +using ACSE.Core.Saves; +using ItemChangedEventArgs = ACSE.Core.Items.ItemChangedEventArgs; -namespace ACSE +namespace ACSE.WinForms.Controls { /// /// - /// An all-in-one Control for editing objects. + /// An all-in-one Control for editing objects. /// internal sealed class HouseControl : FlowLayoutPanel { diff --git a/Controls/ItemEditor.cs b/ACSE.WinForms/Controls/ItemEditor.cs similarity index 97% rename from Controls/ItemEditor.cs rename to ACSE.WinForms/Controls/ItemEditor.cs index d332ae9..473b5d7 100644 --- a/Controls/ItemEditor.cs +++ b/ACSE.WinForms/Controls/ItemEditor.cs @@ -3,8 +3,11 @@ using System.Drawing; using System.Linq; using System.Windows.Forms; +using ACSE.Core.Items; +using ACSE.Core.Modifiable; +using ACSE.Core.Utilities; -namespace ACSE +namespace ACSE.WinForms.Controls { /// /// @@ -185,7 +188,7 @@ protected virtual void OnEditorMouseDown(object sender, MouseEventArgs e) MainFormReference.SetCurrentItem(selectedItem); break; case MouseButtons.Middle: - Utilities.Utility.FloodFillItemArray(ref _items, ItemsPerRow, index, _items[index], + Utility.FloodFillItemArray(ref _items, ItemsPerRow, index, _items[index], MainFormReference.GetCurrentItem()); SetItemPicture(); break; diff --git a/Controls/OffsetablePictureBox.cs b/ACSE.WinForms/Controls/OffsetablePictureBox.cs similarity index 97% rename from Controls/OffsetablePictureBox.cs rename to ACSE.WinForms/Controls/OffsetablePictureBox.cs index 690654d..067219d 100644 --- a/Controls/OffsetablePictureBox.cs +++ b/ACSE.WinForms/Controls/OffsetablePictureBox.cs @@ -2,7 +2,7 @@ using System.Drawing.Drawing2D; using System.Windows.Forms; -namespace ACSE +namespace ACSE.WinForms.Controls { public enum MaskingType { diff --git a/Controls/PictureBoxWithInterpolationMode.cs b/ACSE.WinForms/Controls/PictureBoxWithInterpolationMode.cs similarity index 97% rename from Controls/PictureBoxWithInterpolationMode.cs rename to ACSE.WinForms/Controls/PictureBoxWithInterpolationMode.cs index 26a2538..f93ccb7 100644 --- a/Controls/PictureBoxWithInterpolationMode.cs +++ b/ACSE.WinForms/Controls/PictureBoxWithInterpolationMode.cs @@ -1,7 +1,7 @@ using System.Drawing.Drawing2D; using System.Windows.Forms; -namespace ACSE +namespace ACSE.WinForms.Controls { /// /// diff --git a/Controls/PlaceholderTextBox.cs b/ACSE.WinForms/Controls/PlaceholderTextBox.cs similarity index 100% rename from Controls/PlaceholderTextBox.cs rename to ACSE.WinForms/Controls/PlaceholderTextBox.cs diff --git a/Controls/RegexTextBox.cs b/ACSE.WinForms/Controls/RegexTextBox.cs similarity index 100% rename from Controls/RegexTextBox.cs rename to ACSE.WinForms/Controls/RegexTextBox.cs diff --git a/Controls/ShopEditorControl.cs b/ACSE.WinForms/Controls/ShopEditorControl.cs similarity index 90% rename from Controls/ShopEditorControl.cs rename to ACSE.WinForms/Controls/ShopEditorControl.cs index 999d4f6..11a730e 100644 --- a/Controls/ShopEditorControl.cs +++ b/ACSE.WinForms/Controls/ShopEditorControl.cs @@ -1,8 +1,9 @@ using System.Windows.Forms; +using ACSE.Core.Items; -namespace ACSE +namespace ACSE.WinForms.Controls { - class ShopEditorControl : Panel + public class ShopEditorControl : Panel { protected ItemEditor ShopEditor; protected Label ShopLabel; diff --git a/Controls/SingleItemEditor.Designer.cs b/ACSE.WinForms/Controls/SingleItemEditor.Designer.cs similarity index 96% rename from Controls/SingleItemEditor.Designer.cs rename to ACSE.WinForms/Controls/SingleItemEditor.Designer.cs index 8a88bbe..765402f 100644 --- a/Controls/SingleItemEditor.Designer.cs +++ b/ACSE.WinForms/Controls/SingleItemEditor.Designer.cs @@ -1,4 +1,4 @@ -namespace ACSE +namespace ACSE.WinForms.Controls { partial class SingleItemEditor { diff --git a/Controls/SingleItemEditor.cs b/ACSE.WinForms/Controls/SingleItemEditor.cs similarity index 97% rename from Controls/SingleItemEditor.cs rename to ACSE.WinForms/Controls/SingleItemEditor.cs index 16a141f..e2f5171 100644 --- a/Controls/SingleItemEditor.cs +++ b/ACSE.WinForms/Controls/SingleItemEditor.cs @@ -3,8 +3,11 @@ using System.Drawing; using System.Linq; using System.Windows.Forms; +using ACSE.Core.Items; +using ACSE.Core.Modifiable; +using ItemChangedEventArgs = ACSE.Core.Items.ItemChangedEventArgs; -namespace ACSE +namespace ACSE.WinForms.Controls { /// /// diff --git a/Controls/StalkMarketEditor.cs b/ACSE.WinForms/Controls/StalkMarketEditor.cs similarity index 99% rename from Controls/StalkMarketEditor.cs rename to ACSE.WinForms/Controls/StalkMarketEditor.cs index b3de664..c2fb01b 100644 --- a/Controls/StalkMarketEditor.cs +++ b/ACSE.WinForms/Controls/StalkMarketEditor.cs @@ -2,8 +2,10 @@ using System.Collections.Generic; using System.Drawing; using System.Windows.Forms; +using ACSE.Core.Encryption; +using ACSE.Core.Saves; -namespace ACSE +namespace ACSE.WinForms.Controls { internal sealed class StalkMarketEditor : FlowLayoutPanel { diff --git a/Controls/VillagerControl.cs b/ACSE.WinForms/Controls/VillagerControl.cs similarity index 96% rename from Controls/VillagerControl.cs rename to ACSE.WinForms/Controls/VillagerControl.cs index 5f32804..53c1d1e 100644 --- a/Controls/VillagerControl.cs +++ b/ACSE.WinForms/Controls/VillagerControl.cs @@ -3,9 +3,14 @@ using System.Drawing; using System.Linq; using System.Windows.Forms; -using ACSE.Utilities; +using ACSE.Core; +using ACSE.Core.Items; +using ACSE.Core.Saves; +using ACSE.Core.Utilities; +using ACSE.Core.Villagers; +using ItemChangedEventArgs = ACSE.Core.Items.ItemChangedEventArgs; -namespace ACSE.Controls +namespace ACSE.WinForms.Controls { /// /// @@ -261,9 +266,11 @@ private void VillagerSelectionBoxChanged() else { // TODO: Update islander house location. In e+, update all four islander house locations. + // TODO: Remove the static reference to MainForm.TownAcres. if (_saveFile.SaveGeneration != SaveGeneration.GCN || _villager.Index < 15) { - var houseCoordinatesInfo = Utility.Find_Villager_House(_villager.Data.VillagerId); + var houseCoordinatesInfo = + Utility.FindVillagerHouse(_villager.Data.VillagerId, MainForm.TownAcres); _villager.Data.HouseCoordinates = houseCoordinatesInfo.Item1; if (!houseCoordinatesInfo.Item2) { @@ -281,7 +288,8 @@ private void VillagerSelectionBoxChanged() } else { - var (houseCoordinates, found) = Utility.FindVillagerHouseWildWorld(_villager.Index); + var (houseCoordinates, found) = + Utility.FindVillagerHouseWildWorld(_villager.Index, MainForm.TownAcres); _villager.Data.HouseCoordinates = houseCoordinates; if (!found) { diff --git a/Classes/Extensions/ControlExtensions.cs b/ACSE.WinForms/Extensions/ControlExtensions.cs similarity index 100% rename from Classes/Extensions/ControlExtensions.cs rename to ACSE.WinForms/Extensions/ControlExtensions.cs diff --git a/ACSE.WinForms/FodyWeavers.xml b/ACSE.WinForms/FodyWeavers.xml new file mode 100644 index 0000000..43fc6a6 --- /dev/null +++ b/ACSE.WinForms/FodyWeavers.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/Classes/ImageGeneration.cs b/ACSE.WinForms/Imaging/ImageGeneration.cs similarity index 95% rename from Classes/ImageGeneration.cs rename to ACSE.WinForms/Imaging/ImageGeneration.cs index 39a09c3..f6335ff 100644 --- a/Classes/ImageGeneration.cs +++ b/ACSE.WinForms/Imaging/ImageGeneration.cs @@ -6,8 +6,15 @@ using System.Drawing.Imaging; using System.Windows.Forms; using System.Runtime.InteropServices; +using ACSE.Core.Buildings; +using ACSE.Core.Debug; +using ACSE.Core.Items; +using ACSE.Core.Players; +using ACSE.Core.Saves; +using ACSE.Core.Villagers; +using ACSE.WinForms.Controls; -namespace ACSE +namespace ACSE.WinForms.Imaging { public static class ImageGeneration { @@ -51,6 +58,22 @@ private static void ReplaceGrayscaleColor(ref Bitmap editingImage, Color replaci } } + public static Image SetImageColor(Image grayscaleImage, ColorMatrix transformMatrix) + { + using (var attributes = new ImageAttributes()) + { + attributes.SetColorMatrix(transformMatrix, ColorMatrixFlag.Default, ColorAdjustType.Bitmap); + var transformedImage = new Bitmap(grayscaleImage.Width, grayscaleImage.Height); + using (var g = Graphics.FromImage(transformedImage)) + { + g.DrawImage(grayscaleImage, 0, 0); + g.DrawImage(transformedImage, new Rectangle(0, 0, grayscaleImage.Size.Width, grayscaleImage.Size.Height), + 0, 0, grayscaleImage.Size.Width, grayscaleImage.Size.Height, GraphicsUnit.Pixel, attributes); + return transformedImage; + } + } + } + public static void DrawBuriedIcons(Bitmap map, WorldItem[] items, int itemSize) { using (var bitmapGraphics = Graphics.FromImage(map)) diff --git a/Forms/ItemColorEditor.Designer.cs b/ACSE.WinForms/ItemColorEditor/ItemColorEditor.Designer.cs similarity index 98% rename from Forms/ItemColorEditor.Designer.cs rename to ACSE.WinForms/ItemColorEditor/ItemColorEditor.Designer.cs index 8ce6581..de37025 100644 --- a/Forms/ItemColorEditor.Designer.cs +++ b/ACSE.WinForms/ItemColorEditor/ItemColorEditor.Designer.cs @@ -1,4 +1,4 @@ -namespace ACSE +namespace ACSE.WinForms { partial class ItemColorEditor { diff --git a/Forms/ItemColorEditor.cs b/ACSE.WinForms/ItemColorEditor/ItemColorEditor.cs similarity index 85% rename from Forms/ItemColorEditor.cs rename to ACSE.WinForms/ItemColorEditor/ItemColorEditor.cs index cdf6e79..8925842 100644 --- a/Forms/ItemColorEditor.cs +++ b/ACSE.WinForms/ItemColorEditor/ItemColorEditor.cs @@ -1,8 +1,10 @@ using System.Collections.Generic; +using System.Configuration; using System.Drawing; using System.Windows.Forms; +using ACSE.Core.Items; -namespace ACSE +namespace ACSE.WinForms { public partial class ItemColorEditor : Form { @@ -11,6 +13,7 @@ public partial class ItemColorEditor : Form public ItemColorEditor() { InitializeComponent(); + UpdateItemColors(); // Initialize at the start CreateEditorControls(); } @@ -109,9 +112,23 @@ private static void SetColor(Control colorPreview, uint newColor) colorPreview.BackColor = Color.FromArgb((int)newColor); } + // TODO: I don't like this at all. Come up with a better way. Possibly expose the colors from ACSE.Core instead. + public static void UpdateItemColors() + { + var database = new Dictionary(); + + foreach (SettingsProperty prop in ItemColorSettings.Default.Properties) + { + database.Add(prop.Name, (uint) ItemColorSettings.Default[prop.Name]); + } + + ItemData.ItemColorsSettings = database; + } + private void Done() { ItemColorSettings.Default.Save(); + UpdateItemColors(); Close(); Dispose(); } diff --git a/Forms/ItemColorEditor.resx b/ACSE.WinForms/ItemColorEditor/ItemColorEditor.resx similarity index 100% rename from Forms/ItemColorEditor.resx rename to ACSE.WinForms/ItemColorEditor/ItemColorEditor.resx diff --git a/ACSE.WinForms/ItemColorSettings.Designer.cs b/ACSE.WinForms/ItemColorSettings.Designer.cs new file mode 100644 index 0000000..56894c2 --- /dev/null +++ b/ACSE.WinForms/ItemColorSettings.Designer.cs @@ -0,0 +1,410 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:4.0.30319.42000 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace ACSE { + + + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.7.0.0")] + internal sealed partial class ItemColorSettings : global::System.Configuration.ApplicationSettingsBase { + + private static ItemColorSettings defaultInstance = ((ItemColorSettings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new ItemColorSettings()))); + + public static ItemColorSettings Default { + get { + return defaultInstance; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("3359432240")] + public uint FurnitureColor { + get { + return ((uint)(this["FurnitureColor"])); + } + set { + this["FurnitureColor"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("3369370404")] + public uint GyroidColor { + get { + return ((uint)(this["GyroidColor"])); + } + set { + this["GyroidColor"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("3372155007")] + public uint DiaryColor { + get { + return ((uint)(this["DiaryColor"])); + } + set { + this["DiaryColor"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("3358094506")] + public uint ClothesColor { + get { + return ((uint)(this["ClothesColor"])); + } + set { + this["ClothesColor"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("3366251704")] + public uint SongColor { + get { + return ((uint)(this["SongColor"])); + } + set { + this["SongColor"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("3366251752")] + public uint PaperColor { + get { + return ((uint)(this["PaperColor"])); + } + set { + this["PaperColor"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("3361041199")] + public uint TrashColor { + get { + return ((uint)(this["TrashColor"])); + } + set { + this["TrashColor"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("3372204235")] + public uint ShellColor { + get { + return ((uint)(this["ShellColor"])); + } + set { + this["ShellColor"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("3369967837")] + public uint FruitColor { + get { + return ((uint)(this["FruitColor"])); + } + set { + this["FruitColor"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("3367742621")] + public uint TurnipColor { + get { + return ((uint)(this["TurnipColor"])); + } + set { + this["TurnipColor"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("3367691070")] + public uint CatchableColor { + get { + return ((uint)(this["CatchableColor"])); + } + set { + this["CatchableColor"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("3367876459")] + public uint QuestItemColor { + get { + return ((uint)(this["QuestItemColor"])); + } + set { + this["QuestItemColor"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("3372197120")] + public uint ItemColor { + get { + return ((uint)(this["ItemColor"])); + } + set { + this["ItemColor"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("3357446399")] + public uint RaffleTicketColor { + get { + return ((uint)(this["RaffleTicketColor"])); + } + set { + this["RaffleTicketColor"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("3365486656")] + public uint WallpaperCarpetColor { + get { + return ((uint)(this["WallpaperCarpetColor"])); + } + set { + this["WallpaperCarpetColor"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("3360767279")] + public uint FossilColor { + get { + return ((uint)(this["FossilColor"])); + } + set { + this["FossilColor"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("3363930497")] + public uint ToolColor { + get { + return ((uint)(this["ToolColor"])); + } + set { + this["ToolColor"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("3364570387")] + public uint TreeColor { + get { + return ((uint)(this["TreeColor"])); + } + set { + this["TreeColor"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("3355475968")] + public uint WeedColor { + get { + return ((uint)(this["WeedColor"])); + } + set { + this["WeedColor"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("3370936248")] + public uint FlowerColor { + get { + return ((uint)(this["FlowerColor"])); + } + set { + this["FlowerColor"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("3355443200")] + public uint RockColor { + get { + return ((uint)(this["RockColor"])); + } + set { + this["RockColor"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("3366137647")] + public uint MoneyRockColor { + get { + return ((uint)(this["MoneyRockColor"])); + } + set { + this["MoneyRockColor"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("3362140928")] + public uint SignboardColor { + get { + return ((uint)(this["SignboardColor"])); + } + set { + this["SignboardColor"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("3372220160")] + public uint MoneyColor { + get { + return ((uint)(this["MoneyColor"])); + } + set { + this["MoneyColor"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("3366295701")] + public uint HouseObjectColor { + get { + return ((uint)(this["HouseObjectColor"])); + } + set { + this["HouseObjectColor"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("4286019447")] + public uint BuildingColor { + get { + return ((uint)(this["BuildingColor"])); + } + set { + this["BuildingColor"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("3366151936")] + public uint ParchedFlowerColor { + get { + return ((uint)(this["ParchedFlowerColor"])); + } + set { + this["ParchedFlowerColor"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("3355484320")] + public uint WateredFlowerColor { + get { + return ((uint)(this["WateredFlowerColor"])); + } + set { + this["WateredFlowerColor"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("3365509631")] + public uint PatternColor { + get { + return ((uint)(this["PatternColor"])); + } + set { + this["PatternColor"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("3360509235")] + public uint WiltedFlowerColor { + get { + return ((uint)(this["WiltedFlowerColor"])); + } + set { + this["WiltedFlowerColor"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("3717831065")] + public uint OccupiedColor { + get { + return ((uint)(this["OccupiedColor"])); + } + set { + this["OccupiedColor"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("3372154880")] + public uint InvalidColor { + get { + return ((uint)(this["InvalidColor"])); + } + set { + this["InvalidColor"] = value; + } + } + } +} diff --git a/ACSE.WinForms/ItemColorSettings.settings b/ACSE.WinForms/ItemColorSettings.settings new file mode 100644 index 0000000..3e588f3 --- /dev/null +++ b/ACSE.WinForms/ItemColorSettings.settings @@ -0,0 +1,102 @@ + + + + + + 3359432240 + + + 3369370404 + + + 3372155007 + + + 3358094506 + + + 3366251704 + + + 3366251752 + + + 3361041199 + + + 3372204235 + + + 3369967837 + + + 3367742621 + + + 3367691070 + + + 3367876459 + + + 3372197120 + + + 3357446399 + + + 3365486656 + + + 3360767279 + + + 3363930497 + + + 3364570387 + + + 3355475968 + + + 3370936248 + + + 3355443200 + + + 3366137647 + + + 3362140928 + + + 3372220160 + + + 3366295701 + + + 4286019447 + + + 3366151936 + + + 3355484320 + + + 3365509631 + + + 3360509235 + + + 3717831065 + + + 3372154880 + + + \ No newline at end of file diff --git a/Forms/MainForm.Designer.cs b/ACSE.WinForms/MainForm/MainForm.Designer.cs similarity index 99% rename from Forms/MainForm.Designer.cs rename to ACSE.WinForms/MainForm/MainForm.Designer.cs index b5c0965..96b3b07 100644 --- a/Forms/MainForm.Designer.cs +++ b/ACSE.WinForms/MainForm/MainForm.Designer.cs @@ -1,4 +1,6 @@ -namespace ACSE +using ACSE.WinForms.Controls; + +namespace ACSE.WinForms { sealed partial class MainForm { @@ -37,7 +39,7 @@ private void InitializeComponent() this.palettePreviousButton = new System.Windows.Forms.Button(); this.paletteNextButton = new System.Windows.Forms.Button(); this.patternEditorPanel = new System.Windows.Forms.Panel(); - this.patternEditorPictureBox = new ACSE.PictureBoxWithInterpolationMode(); + this.patternEditorPictureBox = new PictureBoxWithInterpolationMode(); this.patternEditorPreviewPanel = new System.Windows.Forms.Panel(); this.patternGroupTabControl = new System.Windows.Forms.TabControl(); this.player1Tab = new System.Windows.Forms.TabPage(); @@ -344,7 +346,7 @@ private void InitializeComponent() // paletteColorSelectedPictureBox // this.paletteColorSelectedPictureBox.Anchor = System.Windows.Forms.AnchorStyles.None; - this.paletteColorSelectedPictureBox.Image = global::ACSE.Properties.Resources.PaletteArrow; + this.paletteColorSelectedPictureBox.Image = global::ACSE.WinForms.Properties.Resources.PaletteArrow; this.paletteColorSelectedPictureBox.Location = new System.Drawing.Point(114, 21); this.paletteColorSelectedPictureBox.Name = "paletteColorSelectedPictureBox"; this.paletteColorSelectedPictureBox.Size = new System.Drawing.Size(16, 32); @@ -975,7 +977,7 @@ private void InitializeComponent() this.clearEncylopediaButton.TabIndex = 5; this.clearEncylopediaButton.Text = "Clear Encyclopedia"; this.clearEncylopediaButton.UseVisualStyleBackColor = true; - this.clearEncylopediaButton.Click += new System.EventHandler(this.ClearEncylopediaButtonClick); + this.clearEncylopediaButton.Click += new System.EventHandler(this.ClearEncyclopediaButtonClick); // // fillEncyclopediaButton // diff --git a/Forms/MainForm.cs b/ACSE.WinForms/MainForm/MainForm.cs similarity index 90% rename from Forms/MainForm.cs rename to ACSE.WinForms/MainForm/MainForm.cs index cadabf8..2de58ba 100644 --- a/Forms/MainForm.cs +++ b/ACSE.WinForms/MainForm/MainForm.cs @@ -10,17 +10,43 @@ using System.Runtime.InteropServices; using System.Threading.Tasks; using System.Windows.Forms; -using ACSE.Utilities; -using ACSE.Controls; -using ACSE.Generators; +using ACSE.Core.Acres; +using ACSE.Core.BitFields.Catalog; +using ACSE.Core.BitFields.Encyclopedia; +using ACSE.Core.BitFields.Museum; +using ACSE.Core.BitFields.SongLibrary; +using ACSE.Core.Buildings; +using ACSE.Core.Debug; +using ACSE.Core.Emotions; +using ACSE.Core.Encryption; +using ACSE.Core.Enums; +using ACSE.Core.Generators; +using ACSE.Core.Housing; +using ACSE.Core.Island; +using ACSE.Core.Items; +using ACSE.Core.Modifiable; +using ACSE.Core.Patterns; +using ACSE.Core.Players; +using ACSE.Core.Saves; +using ACSE.Core.TownBuildings; +using ACSE.Core.Updater; +using ACSE.Core.Utilities; +using ACSE.Core.Villagers; +using ACSE.Core.Weather; +using ACSE.WinForms.Backups; +using ACSE.WinForms.Controls; +using ACSE.WinForms.Imaging; +using ACSE.WinForms.Managers; +using ACSE.WinForms.Utilities; +using ItemChangedEventArgs = ACSE.Core.Items.ItemChangedEventArgs; -namespace ACSE +namespace ACSE.WinForms { public sealed partial class MainForm : Form { #region Variables public static readonly string AssemblyLocation = Path.GetDirectoryName(Assembly.GetEntryAssembly().Location); - public static DebugManager DebugManager = new DebugManager(); + public static DebugManager DebugManager => DebugUtility.DebugManagerInstance; public static Save SaveFile; public static SaveInfo CurrentSaveInfo; public static WorldAcre[] TownAcres; @@ -116,6 +142,9 @@ public MainForm() { InitializeComponent(); + // Initialize Debug Manager + DebugUtility.InitializeDebugManager(null, (DebugLevel) Properties.Settings.Default.DebugLevel); + // Set initial title to include version SetProgramTitle(); @@ -444,7 +473,8 @@ private void Campsite_Villager_Changed() { if (campsiteComboBox.SelectedValue == null) return; var camperId = (ushort)campsiteComboBox.SelectedValue; - SaveFile.Write(SaveFile.SaveDataStartOffset + CurrentSaveInfo.SaveOffsets.CampsiteVisitor, camperId, SaveFile.IsBigEndian); + SaveFile.Write(SaveFile.SaveDataStartOffset + CurrentSaveInfo.SaveOffsets.CampsiteVisitor, camperId, + SaveFile.IsBigEndian); } catch { @@ -462,8 +492,9 @@ private void BindPlayerItemBoxEvents(Control bindee) public void SetCurrentItem(Item newItem) { if (newItem == null) return; - if (newItem is Furniture furniture && (SaveFile.SaveGeneration == SaveGeneration.N64 || SaveFile.SaveGeneration == SaveGeneration.GCN - || SaveFile.SaveGeneration == SaveGeneration.iQue)) + if (newItem is Furniture furniture && + (SaveFile.SaveGeneration == SaveGeneration.N64 || SaveFile.SaveGeneration == SaveGeneration.GCN + || SaveFile.SaveGeneration == SaveGeneration.iQue)) { _currentItem = new Item(furniture); } @@ -494,6 +525,13 @@ private void SelectedItem_Changed(object sender, EventArgs e) private async Task SetupEditor(Save save) { + // Set the debug manager's save reference + DebugUtility.DebugManagerInstance.SaveFile = save; + + // Create a backup if backups are enabled + if (Properties.Settings.Default.BackupFiles) + new Backup(save); + progressBar1.Value = 0; loadingPanel.BringToFront(); loadingPanel.Visible = true; @@ -502,7 +540,8 @@ private async Task SetupEditor(Save save) if (save.SuccessfullyLoaded && save.SaveType == SaveType.Unknown) { MessageBox.Show( - $"The file [{save.SaveName + save.SaveExtension}] could not be identified as a valid Animal Crossing save file.\nPlease ensure you have a valid save file.", + $"The file [{save.SaveName + save.SaveExtension}] could not be identified as a valid Animal Crossing save file.\n" + + "Please ensure you have a valid save file.", "Save File Load Error", MessageBoxButtons.OK, MessageBoxIcon.Error); loadingPanel.SendToBack(); loadingPanel.Visible = false; @@ -526,11 +565,19 @@ private async Task SetupEditor(Save save) selectedItem.DataSource = null; selectedItem.Items.Clear(); + // Initialize item colors + ItemColorEditor.UpdateItemColors(); // TODO: Move this logic to ACSE.Core + SaveFile = null; //Set to null so we can set the checkbox to false without having the method run UndoRedoHandler = new ModifiedHandler(); townMapViewCheckbox.Checked = false; - townMapViewCheckbox.Enabled = save.SaveGeneration == SaveGeneration.N64 || save.SaveGeneration == SaveGeneration.GCN || save.SaveGeneration == SaveGeneration.iQue; - acreHeightTrackBar.Enabled = save.SaveGeneration == SaveGeneration.N64 || save.SaveGeneration == SaveGeneration.GCN || save.SaveGeneration == SaveGeneration.iQue; + townMapViewCheckbox.Enabled = save.SaveGeneration == SaveGeneration.N64 || + save.SaveGeneration == SaveGeneration.GCN || + save.SaveGeneration == SaveGeneration.iQue; + + acreHeightTrackBar.Enabled = save.SaveGeneration == SaveGeneration.N64 || + save.SaveGeneration == SaveGeneration.GCN || + save.SaveGeneration == SaveGeneration.iQue; SaveFile = save; _currentItem = new Item(); DebugManager.WriteLine("Save File Loaded"); @@ -605,15 +652,18 @@ await Task.Run(() => removeAllItemsToolStripMenuItem.Enabled = true; replaceItemsToolStripMenuItem.Enabled = true; generateRandomTownToolStripMenuItem.Enabled = true; - fillMuseumToolStripMenuItem.Enabled = save.SaveGeneration != SaveGeneration.N64 && save.SaveGeneration != SaveGeneration.iQue; - clearMuseumToolStripMenuItem.Enabled = save.SaveGeneration != SaveGeneration.N64 && save.SaveGeneration != SaveGeneration.iQue; + fillMuseumToolStripMenuItem.Enabled = + save.SaveGeneration != SaveGeneration.N64 && save.SaveGeneration != SaveGeneration.iQue; + clearMuseumToolStripMenuItem.Enabled = + save.SaveGeneration != SaveGeneration.N64 && save.SaveGeneration != SaveGeneration.iQue; unlockAllPublicWorkProjectsToolStripMenuItem.Enabled = save.SaveGeneration == SaveGeneration.N3DS; acreCustomIdBox.Enabled = true; selectedItem.Enabled = true; itemIdTextBox.Enabled = true; townNameBox.Enabled = true; buriedCheckbox.Enabled = true; - grassTypeBox.Enabled = save.SaveGeneration != SaveGeneration.N64 && save.SaveGeneration != SaveGeneration.iQue; + grassTypeBox.Enabled = + save.SaveGeneration != SaveGeneration.N64 && save.SaveGeneration != SaveGeneration.iQue; weatherComboBox.Enabled = true; nativeFruitBox.Enabled = true; stationTypeComboBox.Enabled = TrainStation.HasModifiableTrainStation(save.SaveGeneration); @@ -633,7 +683,9 @@ await Task.Run(() => clearEncylopediaButton.Enabled = true; fillSongLibraryButton.Enabled = true; clearSongLibraryButton.Enabled = true; - fillEmotionsButton.Enabled = SaveFile.SaveGeneration != SaveGeneration.N64 && SaveFile.SaveGeneration != SaveGeneration.GCN && save.SaveGeneration != SaveGeneration.iQue; + fillEmotionsButton.Enabled = SaveFile.SaveGeneration != SaveGeneration.N64 && + SaveFile.SaveGeneration != SaveGeneration.GCN && + save.SaveGeneration != SaveGeneration.iQue; clearEmotionsButton.Enabled = fillEmotionsButton.Enabled; SetTrainStationImage(); @@ -712,7 +764,8 @@ await Task.Run(() => campsiteComboBox.SelectedValueChanged -= _campsiteEventHandler; campsiteComboBox.Items.Clear(); campsiteComboBox.Enabled = true; - if (SaveFile.SaveType == SaveType.AnimalCrossing || SaveFile.SaveType == SaveType.NewLeaf || SaveFile.SaveType == SaveType.WelcomeAmiibo) + if (SaveFile.SaveType == SaveType.AnimalCrossing || SaveFile.SaveType == SaveType.NewLeaf || + SaveFile.SaveType == SaveType.WelcomeAmiibo) { campsiteComboBox.DataSource = new BindingSource(_villagerDatabase, null); campsiteComboBox.DisplayMember = "Value"; @@ -720,7 +773,10 @@ await Task.Run(() => //Load Campsite (or Igloo) Visitor try { - var camperId = SaveFile.ReadUInt16(SaveFile.SaveDataStartOffset + CurrentSaveInfo.SaveOffsets.CampsiteVisitor, SaveFile.IsBigEndian); + var camperId = + SaveFile.ReadUInt16( + SaveFile.SaveDataStartOffset + CurrentSaveInfo.SaveOffsets.CampsiteVisitor, + SaveFile.IsBigEndian); campsiteComboBox.SelectedValue = camperId; //Setup Campsite Event @@ -745,13 +801,14 @@ await Task.Run(() => buildingsPanel.Controls[i].Dispose(); //Set building panel visibility - var visibility = (save.SaveType == SaveType.CityFolk || save.SaveType == SaveType.NewLeaf || save.SaveType == SaveType.WelcomeAmiibo); + var visibility = (save.SaveType == SaveType.CityFolk || save.SaveType == SaveType.NewLeaf || + save.SaveType == SaveType.WelcomeAmiibo); buildingsPanel.Visible = visibility; buildingsLabel.Visible = visibility; townPanel.Size = new Size(visibility ? townTab.Size.Width - 213 : townTab.Size.Width - 9, townPanel.Size.Height); //Cleanup old dictionary - AcreData.DisposeLoadedImages(); + AcreImageManager.DisposeLoadedImages(); //Clear Past Villager Panel while (pastVillagersPanel.Controls.Count > 0) @@ -799,13 +856,16 @@ await Task.Run(() => playerShoeColor.Items.Add(shoeColor); foreach (var hairStyle in PlayerInfo.CfHairStyles) playerHairType.Items.Add(hairStyle); - _grassWear = save.ReadByteArray(save.SaveDataStartOffset + CurrentSaveInfo.SaveOffsets.GrassWear, CurrentSaveInfo.SaveOffsets.GrassWearSize); + _grassWear = + save.ReadByteArray(save.SaveDataStartOffset + CurrentSaveInfo.SaveOffsets.GrassWear, + CurrentSaveInfo.SaveOffsets.GrassWearSize); break; } case SaveGeneration.N3DS: - { - _grassWear = save.ReadByteArray(save.SaveDataStartOffset + CurrentSaveInfo.SaveOffsets.GrassWear, CurrentSaveInfo.SaveOffsets.GrassWearSize); + { + _grassWear = save.ReadByteArray(save.SaveDataStartOffset + CurrentSaveInfo.SaveOffsets.GrassWear, + CurrentSaveInfo.SaveOffsets.GrassWearSize); foreach (var hairStyle in PlayerInfo.NlHairStyles) playerHairType.Items.Add(hairStyle); foreach (var hairColor in PlayerInfo.NlHairColors) @@ -1091,7 +1151,10 @@ await Task.Run(() => { if (i < 15) { - _villagers[i] = new Villager(save.SaveDataStartOffset + CurrentSaveInfo.SaveOffsets.VillagerData + CurrentSaveInfo.SaveOffsets.VillagerSize * i, i, save); + _villagers[i] = + new Villager( + save.SaveDataStartOffset + CurrentSaveInfo.SaveOffsets.VillagerData + + CurrentSaveInfo.SaveOffsets.VillagerSize * i, i, save); } else { @@ -1100,7 +1163,10 @@ await Task.Run(() => } else { - _villagers[i] = new Villager(save.SaveDataStartOffset + CurrentSaveInfo.SaveOffsets.VillagerData + CurrentSaveInfo.SaveOffsets.VillagerSize * i, i, save); + _villagers[i] = + new Villager( + save.SaveDataStartOffset + CurrentSaveInfo.SaveOffsets.VillagerData + + CurrentSaveInfo.SaveOffsets.VillagerSize * i, i, save); } } @@ -1108,12 +1174,14 @@ await Task.Run(() => { foreach (var villager in _villagers) { - if (!villager.Exists || villager.PlayerRelations == null) continue; - foreach (var relation in villager.PlayerRelations) + if (!villager.Exists || villager.AnimalMemories == null) continue; + foreach (var memory in villager.AnimalMemories) { - if (relation.Exists) + if (memory.Exists) { - relation.Player = _players.FirstOrNull(p => p.Data.Identifier.Equals(relation.PlayerId) && p.Data.Name.Equals(relation.PlayerName)); + memory.Player = _players.FirstOrNull(p => + p.Data.Identifier.Equals(memory.PlayerId) && + p.Data.Name.Equals(memory.PlayerName)); } } } @@ -1213,9 +1281,6 @@ await Task.Run(() => if (houseSizeComboBox.Enabled && _selectedHouse != null) houseSizeComboBox.SelectedIndex = HouseInfo.GetHouseSize(_selectedHouse.Offset, save.SaveType); - if (Properties.Settings.Default.OutputInt32s && SaveFile.SaveGeneration == SaveGeneration.N3DS) - Utility.Scan_For_NL_Int32(); - // Set TextBox max values playerName.MaxLength = CurrentSaveInfo.SaveOffsets.TownNameSize; // As far as I know, town name and player name are always the same size @@ -1234,7 +1299,9 @@ await Task.Run(() => if (CurrentSaveInfo.SaveOffsets.GrassType != -1) { var grassType = SaveFile.ReadByte(SaveFile.SaveDataStartOffset + CurrentSaveInfo.SaveOffsets.GrassType); - grassTypeBox.SelectedIndex = (SaveFile.SaveGeneration == SaveGeneration.NDS ? Utility.GetWildWorldGrassBaseType(grassType) : (grassType < 3 ? grassType : 0)); + grassTypeBox.SelectedIndex = (SaveFile.SaveGeneration == SaveGeneration.NDS + ? Utility.GetWildWorldGrassBaseType(grassType) + : (grassType < 3 ? grassType : 0)); } // Set Native Fruit Types @@ -1280,7 +1347,8 @@ await Task.Run(() => playersTab.Controls.Add(_shirtEditor); } - _inventoryEditor = new ItemEditor(this, _selectedPlayer?.Data.Pockets.Items, save.SaveGeneration == SaveGeneration.N3DS ? 4 : 5, 16) + _inventoryEditor = new ItemEditor(this, _selectedPlayer?.Data.Pockets.Items, + save.SaveGeneration == SaveGeneration.N3DS ? 4 : 5, 16) { Location = new Point(26, 340), HoverText = "{0} ({2}) - [0x{1}]" @@ -1288,7 +1356,8 @@ await Task.Run(() => playersTab.Controls.Add(_inventoryEditor); - if (SaveFile.SaveGeneration != SaveGeneration.N64 && SaveFile.SaveGeneration != SaveGeneration.GCN && save.SaveGeneration != SaveGeneration.iQue) + if (SaveFile.SaveGeneration != SaveGeneration.N64 && SaveFile.SaveGeneration != SaveGeneration.GCN && + save.SaveGeneration != SaveGeneration.iQue) { var itemsPerRow = 9; switch (SaveFile.SaveGeneration) @@ -1471,8 +1540,10 @@ private void SetEnabledControls(SaveType currentSaveType) SetMainTabEnabled("grassTab", true); SetMainTabEnabled("patternsTab", true); - playerSavings.Enabled = currentSaveType != SaveType.DoubutsuNoMori && currentSaveType != SaveType.DongwuSenlin; - tanTrackbar.Enabled = currentSaveType != SaveType.DoubutsuNoMori && currentSaveType != SaveType.DongwuSenlin; + playerSavings.Enabled = + currentSaveType != SaveType.DoubutsuNoMori && currentSaveType != SaveType.DongwuSenlin; + tanTrackbar.Enabled = + currentSaveType != SaveType.DoubutsuNoMori && currentSaveType != SaveType.DongwuSenlin; switch (currentSaveType) { @@ -1482,8 +1553,10 @@ private void SetEnabledControls(SaveType currentSaveType) case SaveType.DoubutsuNoMoriEPlus: case SaveType.AnimalForestEPlus: case SaveType.DongwuSenlin: - SetMainTabEnabled("islandTab", currentSaveType != SaveType.DoubutsuNoMori && currentSaveType != SaveType.DongwuSenlin); - SetMainTabEnabled("patternsTab", currentSaveType != SaveType.DoubutsuNoMori && currentSaveType != SaveType.DongwuSenlin); + SetMainTabEnabled("islandTab", + currentSaveType != SaveType.DoubutsuNoMori && currentSaveType != SaveType.DongwuSenlin); + SetMainTabEnabled("patternsTab", + currentSaveType != SaveType.DoubutsuNoMori && currentSaveType != SaveType.DongwuSenlin); SetMainTabEnabled("grassTab", false); playerHairType.Enabled = false; playerHairColor.Enabled = false; @@ -1620,7 +1693,8 @@ private void SetEnabledControls(SaveType currentSaveType) } } - private static void RefreshPictureBoxImage(PictureBox box, Image newImage, bool backgroundImage = false, bool dispose = true) + private static void RefreshPictureBoxImage(PictureBox box, Image newImage, bool backgroundImage = false, + bool dispose = true) { if (box == null) return; var oldImage = backgroundImage ? box.BackgroundImage : box.Image; @@ -1749,7 +1823,8 @@ private void ReloadPlayer(Player player) if (facePicturebox.Enabled) UpdatePlayerItemPictureBox(facePicturebox, Inventory.GetItemPic(16, player.Data.FaceItem, SaveFile.SaveType)); if (pocketsBackgroundPicturebox.Enabled) - UpdatePlayerItemPictureBox(pocketsBackgroundPicturebox, Inventory.GetItemPic(16, player.Data.InventoryBackground, SaveFile.SaveType)); + UpdatePlayerItemPictureBox(pocketsBackgroundPicturebox, + Inventory.GetItemPic(16, player.Data.InventoryBackground, SaveFile.SaveType)); //City Folk only if (playerShoeColor.Enabled) playerShoeColor.SelectedIndex = player.Data.ShoeColor; @@ -1782,8 +1857,9 @@ private void ReloadPlayer(Player player) } _selectedPaletteIndex = player.Data.Patterns[0].Palette; patternEditorPictureBox.Image = ImageGeneration.DrawGrid2(_patternBoxes[0].Image, 16, new Size (513, 513)); - paletteSelectionPictureBox.Image = PatternUtility.GeneratePalettePreview(player.Data.Patterns[0].PaletteData, _selectedPaletteIndex, - (uint)paletteSelectionPictureBox.Size.Width, (uint)paletteSelectionPictureBox.Size.Height); + paletteSelectionPictureBox.Image = PatternUtility.GeneratePalettePreview( + player.Data.Patterns[0].PaletteData, _selectedPaletteIndex, + (uint) paletteSelectionPictureBox.Size.Width, (uint) paletteSelectionPictureBox.Size.Height); _selectedPatternObject = player.Data.Patterns[0]; paletteIndexLabel.Text = "Palette: " + (_selectedPatternObject.Palette + 1); patternNameTextBox.Text = _selectedPatternObject.Name; @@ -1864,18 +1940,18 @@ private void TownNameBoxTextChanged(object sender, EventArgs e) var villagerTownName = villager.Data.TownName; villager.Data.TownName = townNameBox.Text; - if (villager.PlayerRelations == null) continue; - foreach (var relation in villager.PlayerRelations) + if (villager.AnimalMemories == null) continue; + foreach (var memory in villager.AnimalMemories) { - if (!relation.Exists) continue; - if (relation.PlayerTownName.Equals(villagerTownName) && relation.PlayerTownId == villager.Data.TownId) + if (!memory.Exists) continue; + if (memory.PlayerTownName.Equals(villagerTownName) && memory.PlayerTownId == villager.Data.TownId) { - relation.PlayerTownName = townNameBox.Text; + memory.PlayerTownName = townNameBox.Text; } - if (relation.MetTownName.Equals(villagerTownName) && relation.MetTownId == villager.Data.TownId) + if (memory.MetTownName.Equals(villagerTownName) && memory.MetTownId == villager.Data.TownId) { - relation.MetTownName = townNameBox.Text; + memory.MetTownName = townNameBox.Text; } } } @@ -1939,17 +2015,29 @@ private void Face_Changed() private void Hair_Changed() { if (SaveFile == null || _selectedPlayer == null || playerHairType.SelectedIndex <= -1) return; + _selectedPlayer.Data.HairType = (byte)playerHairType.SelectedIndex; - if (SaveFile.SaveGeneration == SaveGeneration.NDS || SaveFile.SaveGeneration == SaveGeneration.Wii || SaveFile.SaveGeneration == SaveGeneration.N3DS) - RefreshPictureBoxImage(hairPictureBox, ImageGeneration.GetHairImage(SaveFile.SaveGeneration, _selectedPlayer.Data.HairType, _selectedPlayer.Data.HairColor)); + if (SaveFile.SaveGeneration == SaveGeneration.NDS || SaveFile.SaveGeneration == SaveGeneration.Wii || + SaveFile.SaveGeneration == SaveGeneration.N3DS) + { + RefreshPictureBoxImage(hairPictureBox, + ImageGeneration.GetHairImage(SaveFile.SaveGeneration, _selectedPlayer.Data.HairType, + _selectedPlayer.Data.HairColor)); + } } private void Hair_Color_Changed() { if (SaveFile == null || _selectedPlayer == null || playerHairColor.SelectedIndex <= -1) return; + _selectedPlayer.Data.HairColor = (byte)playerHairColor.SelectedIndex; - if (SaveFile.SaveGeneration == SaveGeneration.NDS || SaveFile.SaveGeneration == SaveGeneration.Wii || SaveFile.SaveGeneration == SaveGeneration.N3DS) - RefreshPictureBoxImage(hairPictureBox, ImageGeneration.GetHairImage(SaveFile.SaveGeneration, _selectedPlayer.Data.HairType, _selectedPlayer.Data.HairColor)); + if (SaveFile.SaveGeneration == SaveGeneration.NDS || SaveFile.SaveGeneration == SaveGeneration.Wii || + SaveFile.SaveGeneration == SaveGeneration.N3DS) + { + RefreshPictureBoxImage(hairPictureBox, + ImageGeneration.GetHairImage(SaveFile.SaveGeneration, _selectedPlayer.Data.HairType, + _selectedPlayer.Data.HairColor)); + } } private void Eye_Color_Changed() @@ -2045,7 +2133,8 @@ private void ItemSelectedIndexChanged(object sender, EventArgs e) if (ushort.TryParse(selectedItem.SelectedValue.ToString(), out var itemId)) { //selectedItemText.Text = string.Format("Selected Item: [0x{0}]", Item_ID.ToString("X4")); - SetCurrentItem(new Item(itemId, byte.Parse(itemFlag1.Text, NumberStyles.HexNumber), byte.Parse(itemFlag2.Text, NumberStyles.HexNumber))); + SetCurrentItem(new Item(itemId, byte.Parse(itemFlag1.Text, NumberStyles.HexNumber), + byte.Parse(itemFlag2.Text, NumberStyles.HexNumber))); } } @@ -2054,7 +2143,8 @@ private void CurrentItemIdTextChanged(object sender, EventArgs e) ReplaceVerifyHex(itemIdTextBox, 4); if (ushort.TryParse(itemIdTextBox.Text, NumberStyles.HexNumber, null, out var itemId)) { - SetCurrentItem(new Item(itemId, byte.Parse(itemFlag1.Text, NumberStyles.HexNumber), byte.Parse(itemFlag2.Text, NumberStyles.HexNumber))); + SetCurrentItem(new Item(itemId, byte.Parse(itemFlag1.Text, NumberStyles.HexNumber), + byte.Parse(itemFlag2.Text, NumberStyles.HexNumber))); } } @@ -2070,16 +2160,20 @@ private void SetSelectedAcre(ushort acreId, bool focusTreeNode = true) { if (acreId <= 0) throw new ArgumentOutOfRangeException(nameof(acreId)); _selectedAcreId = acreId; - if (SaveFile.SaveGeneration == SaveGeneration.N64 || SaveFile.SaveGeneration == SaveGeneration.GCN || SaveFile.SaveGeneration == SaveGeneration.iQue) + + if (SaveFile.SaveGeneration == SaveGeneration.N64 || SaveFile.SaveGeneration == SaveGeneration.GCN || + SaveFile.SaveGeneration == SaveGeneration.iQue) { acreHeightTrackBar.Value = _selectedAcreId & 3; - _acreHeightModifier = (ushort)acreHeightTrackBar.Value; - _selectedAcreId -= (ushort)acreHeightTrackBar.Value; + _acreHeightModifier = (ushort) acreHeightTrackBar.Value; + _selectedAcreId -= (ushort) acreHeightTrackBar.Value; } + var acreIdStr = _selectedAcreId.ToString(SaveFile.SaveType == SaveType.WildWorld ? "X2 " : "X4"); - var image = AcreData.FetchAcreImage(SaveFile.SaveType, _selectedAcreId) - ?? AcreData.FetchAcreImage(SaveFile.SaveType, SaveFile.SaveType == SaveType.WildWorld ? (ushort)0xFF : (ushort)0xFFFF); + var image = AcreImageManager.FetchAcreImage(SaveFile.SaveType, _selectedAcreId) + ?? AcreImageManager.FetchAcreImage(SaveFile.SaveType, + SaveFile.SaveType == SaveType.WildWorld ? (ushort) 0xFF : (ushort) 0xFFFF); _selectedAcrePicturebox.Image = image; if (SaveFile.SaveType == SaveType.WildWorld) @@ -2091,11 +2185,12 @@ private void SetSelectedAcre(ushort acreId, bool focusTreeNode = true) else if (_uInt16AcreInfo != null) acreDesc.Text = _uInt16AcreInfo.ContainsKey(_selectedAcreId) ? _uInt16AcreInfo[_selectedAcreId] : "No Acre Description"; - if (SaveFile.SaveGeneration == SaveGeneration.N64 || SaveFile.SaveGeneration == SaveGeneration.GCN || SaveFile.SaveGeneration == SaveGeneration.iQue) + if (SaveFile.SaveGeneration == SaveGeneration.N64 || SaveFile.SaveGeneration == SaveGeneration.GCN || + SaveFile.SaveGeneration == SaveGeneration.iQue) { if (IsOcean(acreId)) { - _selectedAcrePicturebox.Image = AcreData.FetchAcreImage(SaveFile.SaveType, 0x03DC); + _selectedAcrePicturebox.Image = AcreImageManager.FetchAcreImage(SaveFile.SaveType, 0x03DC); } } @@ -2118,14 +2213,15 @@ private void AcreTreeViewEntryClicked(object sender, TreeViewEventArgs e) if (node?.Tag == null) return; Image image = null; if (ushort.TryParse((string)node.Tag, NumberStyles.HexNumber, null, out var acreId)) - image = AcreData.FetchAcreImage(SaveFile.SaveType, acreId); + image = AcreImageManager.FetchAcreImage(SaveFile.SaveType, acreId); if (image == null) - image = AcreData.FetchAcreImage(SaveFile.SaveType, SaveFile.SaveType == SaveType.WildWorld ? (ushort)0xFF : (ushort)0xFFFF); + image = AcreImageManager.FetchAcreImage(SaveFile.SaveType, + SaveFile.SaveType == SaveType.WildWorld ? (ushort) 0xFF : (ushort) 0xFFFF); var oldImage = _selectedAcrePicturebox.Image; _selectedAcrePicturebox.Image = image; - AcreData.CheckReferencesAndDispose(oldImage, _acreMap, _selectedAcrePicturebox); + AcreImageManager.CheckReferencesAndDispose(oldImage, _acreMap, _selectedAcrePicturebox); if (_acreInfo != null) _selectedAcreId = byte.Parse((string)node.Tag, NumberStyles.AllowHexSpecifier); @@ -2140,22 +2236,26 @@ private void AcreTreeViewEntryClicked(object sender, TreeViewEventArgs e) else if (_uInt16FiledAcreData != null) acreDesc.Text = node.Text; - if (SaveFile.SaveGeneration == SaveGeneration.N64 || SaveFile.SaveGeneration == SaveGeneration.GCN || SaveFile.SaveGeneration == SaveGeneration.iQue) + if (SaveFile.SaveGeneration == SaveGeneration.N64 || SaveFile.SaveGeneration == SaveGeneration.GCN || + SaveFile.SaveGeneration == SaveGeneration.iQue) { if (IsOcean(_selectedAcreId)) { oldImage = _selectedAcrePicturebox.Image; - _selectedAcrePicturebox.Image = AcreData.FetchAcreImage(SaveFile.SaveType, 0x03DC); - AcreData.CheckReferencesAndDispose(oldImage, _acreMap, _selectedAcrePicturebox); + _selectedAcrePicturebox.Image = AcreImageManager.FetchAcreImage(SaveFile.SaveType, 0x03DC); + AcreImageManager.CheckReferencesAndDispose(oldImage, _acreMap, _selectedAcrePicturebox); } } // Warnings for N64/GameCube titles if (SaveFile.SaveGeneration != SaveGeneration.N64 && SaveFile.SaveGeneration != SaveGeneration.GCN && SaveFile.SaveGeneration != SaveGeneration.iQue) return; - if (Properties.Settings.Default.ShowBetaAcreWarning && (node.Parent.Text.Equals("Beta Acres") || node.Parent.Text.Equals("Misc. Acres"))) + + if (Properties.Settings.Default.ShowBetaAcreWarning && + (node.Parent.Text.Equals("Beta Acres") || node.Parent.Text.Equals("Misc. Acres"))) { - var alert = new ToggableAlertForm("Placing beta acres in the Town Region (anywhere your map would show) will cause your game to crash when you open the map!" + + var alert = new ToggleableAlertForm( + "Placing beta acres in the Town Region (anywhere your map would show) will cause your game to crash when you open the map!" + "It's recommended you only place them in border acres or ocean/island acres!", "Beta Acre Warning"); if (alert.ShowDialog() == DialogResult.OK) @@ -2163,13 +2263,16 @@ private void AcreTreeViewEntryClicked(object sender, TreeViewEventArgs e) Properties.Settings.Default.ShowBetaAcreWarning = !alert.AlertDisabled; Properties.Settings.Default.Save(); } + alert.Dispose(); } else if (node.Tag != null && ushort.TryParse((string)node.Tag, NumberStyles.AllowHexSpecifier, null, out acreId)) { if (!Properties.Settings.Default.ShowDumpAcreWarning || (acreId != 0x0118 && acreId != 0x0294 && acreId != 0x0298)) return; - var alert = new ToggableAlertForm("Placing a dump acre without adding a dump item to the acre will cause your game to crash. Please be careful!", "Dump Placement Warning"); + var alert = new ToggleableAlertForm( + "Placing a dump acre without adding a dump item to the acre will cause your game to crash. Please be careful!", + "Dump Placement Warning"); if (alert.ShowDialog() == DialogResult.OK) { Properties.Settings.Default.ShowDumpAcreWarning = !alert.AlertDisabled; @@ -2181,8 +2284,10 @@ private void AcreTreeViewEntryClicked(object sender, TreeViewEventArgs e) private static bool IsOcean(ushort id) { - return ((SaveFile.SaveGeneration == SaveGeneration.GCN || SaveFile.SaveType == SaveType.DoubutsuNoMori || SaveFile.SaveType == SaveType.DongwuSenlin) - && (id >= 0x03DC && id <= 0x03EC) || id == 0x49C || (id >= 0x04A8 && id <= 0x058C) || (id >= 0x05B4 && id <= 0x05B8)); + return ((SaveFile.SaveGeneration == SaveGeneration.GCN || SaveFile.SaveType == SaveType.DoubutsuNoMori || + SaveFile.SaveType == SaveType.DongwuSenlin) + && (id >= 0x03DC && id <= 0x03EC) || id == 0x49C || (id >= 0x04A8 && id <= 0x058C) || + (id >= 0x05B4 && id <= 0x05B8)); } private static Image GetAcreImage(ushort id) @@ -2197,19 +2302,22 @@ private static Image GetAcreImage(ushort id) id = (ushort)(id & 0xFFFC); if (IsOcean(id)) { - acreImage = AcreData.FetchAcreImage(SaveFile.SaveType, 0x03DC); + acreImage = AcreImageManager.FetchAcreImage(SaveFile.SaveType, 0x03DC); } else { - acreImage = AcreData.FetchAcreImage(SaveFile.SaveType, id) ?? AcreData.FetchAcreImage(SaveFile.SaveType, 0xFFFF); + acreImage = AcreImageManager.FetchAcreImage(SaveFile.SaveType, id) ?? + AcreImageManager.FetchAcreImage(SaveFile.SaveType, 0xFFFF); } break; case SaveGeneration.NDS: - acreImage = AcreData.FetchAcreImage(SaveFile.SaveType, id) ?? AcreData.FetchAcreImage(SaveFile.SaveType, 0xFF); + acreImage = AcreImageManager.FetchAcreImage(SaveFile.SaveType, id) ?? + AcreImageManager.FetchAcreImage(SaveFile.SaveType, 0xFF); break; case SaveGeneration.Wii: case SaveGeneration.N3DS: - acreImage = AcreData.FetchAcreImage(SaveFile.SaveType, id) ?? AcreData.FetchAcreImage(SaveFile.SaveType, 0xFFFF); + acreImage = AcreImageManager.FetchAcreImage(SaveFile.SaveType, id) ?? + AcreImageManager.FetchAcreImage(SaveFile.SaveType, 0xFFFF); break; } @@ -2294,11 +2402,12 @@ private void SetupMapPictureBoxes() { var townAcreBitmap = GenerateAcreItemsBitmap(TownAcres[townAcreCount].AcreItems, townAcre); if (townAcre >= CurrentSaveInfo.TownAcreCount) continue; - _townAcreMap[townAcre] = new PictureBoxWithInterpolationMode() + _townAcreMap[townAcre] = new PictureBoxWithInterpolationMode { InterpolationMode = InterpolationMode.HighQualityBicubic, Size = new Size(_townMapTotalSize, _townMapTotalSize), - Location = new Point((x - 1) * (_townMapTotalSize + 1), (townAcre / (CurrentSaveInfo.XAcreCount - 2)) * (_townMapTotalSize + 1)), + Location = new Point((x - 1) * (_townMapTotalSize + 1), + (townAcre / (CurrentSaveInfo.XAcreCount - 2)) * (_townMapTotalSize + 1)), Image = TownAcres[townAcreCount] != null ? townAcreBitmap : null, BackgroundImage = acreImage, BackgroundImageLayout = ImageLayout.Stretch, @@ -2364,15 +2473,29 @@ private void SetupMapPictureBoxes() for (var x = 0; x < CurrentSaveInfo.IslandXAcreCount; x++) { var idx = y * CurrentSaveInfo.IslandXAcreCount + x; - var acreId = SaveFile.ReadUInt16(SaveFile.SaveDataStartOffset + CurrentSaveInfo.SaveOffsets.IslandAcreData + idx * 2, SaveFile.IsBigEndian); + var acreId = + SaveFile.ReadUInt16( + SaveFile.SaveDataStartOffset + CurrentSaveInfo.SaveOffsets.IslandAcreData + idx * 2, + SaveFile.IsBigEndian); + var acreItems = new WorldItem[256]; for (var i = 0; i < 256; i++) if (SaveFile.SaveGeneration == SaveGeneration.GCN) - acreItems[i] = new WorldItem(SaveFile.ReadUInt16(SaveFile.SaveDataStartOffset + CurrentSaveInfo.SaveOffsets.IslandWorldData + idx * 512 + i * 2, true), i); + { + acreItems[i] = + new WorldItem( + SaveFile.ReadUInt16( + SaveFile.SaveDataStartOffset + CurrentSaveInfo.SaveOffsets.IslandWorldData + + idx * 512 + i * 2, true), i); + } else if ((idx > 4 && idx < 7) || (idx > 8 && idx < 11)) //Other acres are water acres { var worldIdx = (y - 1) * 2 + ((x - 1) % 4); - acreItems[i] = new WorldItem(SaveFile.ReadUInt32(SaveFile.SaveDataStartOffset + CurrentSaveInfo.SaveOffsets.IslandWorldData + worldIdx * 1024 + i * 4), i); + acreItems[i] = + new WorldItem( + SaveFile.ReadUInt32(SaveFile.SaveDataStartOffset + + CurrentSaveInfo.SaveOffsets.IslandWorldData + worldIdx * 1024 + + i * 4), i); } IslandAcres[idx] = new WorldAcre(acreId, idx, acreItems, _islandBuriedBuffer); //Add buried item data for Animal Crossing @@ -2394,7 +2517,8 @@ private void SetupMapPictureBoxes() } else { - _islandAcreMap[idx].Image = GenerateAcreItemsBitmap(IslandAcres[idx].AcreItems, IslandAcres[idx].Index, true); + _islandAcreMap[idx].Image = GenerateAcreItemsBitmap(IslandAcres[idx].AcreItems, + IslandAcres[idx].Index, true); _islandAcreMap[idx].BackgroundImage = GetAcreImage(acreId); } _islandAcreMap[idx].MouseMove += (sender, e) => TownMove(sender, e, true); @@ -2403,7 +2527,8 @@ private void SetupMapPictureBoxes() _islandAcreMap[idx].MouseEnter += (sender, e) => TownEnter(sender); _islandAcreMap[idx].MouseUp += TownMouseUp; _islandAcreMap[idx].Location = (SaveFile.SaveGeneration == SaveGeneration.GCN) - ? new Point(x * _townMapTotalSize, y * _townMapTotalSize) : new Point(((x - 1) % 4) * _townMapTotalSize, (y - 1) * _townMapTotalSize); + ? new Point(x * _townMapTotalSize, y * _townMapTotalSize) + : new Point(((x - 1) % 4) * _townMapTotalSize, (y - 1) * _townMapTotalSize); islandPanel.Controls.Add(_islandAcreMap[idx]); } @@ -2594,7 +2719,8 @@ private void GeneratePastVillagersPanel() #endregion - private Bitmap GenerateAcreItemsBitmap(WorldItem[] items, int acre, bool islandAcre = false, int hoveredAcre = -1, int xLoc = -1, int yLoc = -1) + private Bitmap GenerateAcreItemsBitmap(WorldItem[] items, int acre, bool islandAcre = false, + int hoveredAcre = -1, int xLoc = -1, int yLoc = -1) { var itemSize = _townMapCellSize; var acreSize = _townMapTotalSize; @@ -2609,17 +2735,21 @@ private Bitmap GenerateAcreItemsBitmap(WorldItem[] items, int acre, bool islandA // Draw Item Box for (var x = 0; x < itemSize * itemSize; x++) Buffer.BlockCopy(BitConverter.GetBytes(itemColor), 0, bitmapBuffer, - ((item.Location.Y * itemSize + x / itemSize) * acreSize * 4) + ((item.Location.X * itemSize + x % itemSize) * 4), 4); + ((item.Location.Y * itemSize + x / itemSize) * acreSize * 4) + + ((item.Location.X * itemSize + x % itemSize) * 4), 4); } + // Draw Border //ImageGeneration.DrawGrid(acreBitmap, 8); for (var i = 0; i < (width * width); i++) - if ((i / itemSize > 0 && i % (itemSize * 16) > 0 && i % (itemSize) == 0) || (i / (itemSize * 16) > 0 && (i / (itemSize * 16)) % (itemSize) == 0)) + if ((i / itemSize > 0 && i % (itemSize * 16) > 0 && i % (itemSize) == 0) || + (i / (itemSize * 16) > 0 && (i / (itemSize * 16)) % (itemSize) == 0)) Buffer.BlockCopy(GridColor, 0, bitmapBuffer, ((i / (itemSize * 16)) * width * 4) + ((i % (itemSize * 16)) * 4), 4); // Construct Bitmap - var bitmapData = acreBitmap.LockBits(new Rectangle(0, 0, acreSize, acreSize), ImageLockMode.WriteOnly, PixelFormat.Format32bppArgb); + var bitmapData = acreBitmap.LockBits(new Rectangle(0, 0, acreSize, acreSize), ImageLockMode.WriteOnly, + PixelFormat.Format32bppArgb); Marshal.Copy(bitmapBuffer, 0, bitmapData.Scan0, bitmapBuffer.Length); acreBitmap.UnlockBits(bitmapData); // Draw Buried X @@ -2634,8 +2764,10 @@ private Bitmap GenerateAcreItemsBitmap(WorldItem[] items, int acre, bool islandA // Draw Buildings (if needed) if (SaveFile.SaveGeneration == SaveGeneration.Wii || SaveFile.SaveGeneration == SaveGeneration.N3DS) { - return islandAcre ? ((SaveFile.SaveGeneration == SaveGeneration.N3DS) - ? ImageGeneration.DrawBuildings(acreBitmap, _islandBuildings, acre - 5, _townMapCellSize) : acreBitmap) + return islandAcre + ? ((SaveFile.SaveGeneration == SaveGeneration.N3DS) + ? ImageGeneration.DrawBuildings(acreBitmap, _islandBuildings, acre - 5, _townMapCellSize) + : acreBitmap) : ImageGeneration.DrawBuildings(acreBitmap, _buildings, acre, _townMapCellSize); } @@ -2763,7 +2895,7 @@ private void AcreEditorMouseMove(object sender, MouseEventArgs e, bool island = if (_acreInfo != null) acreToolTip.Show( - $"{(_acreInfo.ContainsKey((byte) hoveredAcre.AcreId) ? _acreInfo[(byte) hoveredAcre.AcreId] + " - " : "")}0x{hoveredAcre.AcreId:X2}", + $"{(_acreInfo.ContainsKey((byte) hoveredAcre.AcreId) ? _acreInfo[(byte) hoveredAcre.AcreId] + " - " : "")}0x{hoveredAcre.AcreId:X2}", box, e.X + 15, e.Y + 10); else if (_uInt16AcreInfo != null) if (SaveFile.SaveType == SaveType.DoubutsuNoMori || SaveFile.SaveGeneration == SaveGeneration.GCN || @@ -2773,7 +2905,7 @@ private void AcreEditorMouseMove(object sender, MouseEventArgs e, bool island = _uInt16AcreInfo.ContainsKey(hoveredAcre.BaseAcreId) ? _uInt16AcreInfo[hoveredAcre.BaseAcreId] + " " : (IsOcean(hoveredAcre.AcreId) ? "Ocean " : ""), hoveredAcre.AcreId, - AcreData.AcreHeightIdentifiers[hoveredAcre.AcreId & 3]), + AcreImageManager.AcreHeightIdentifiers[hoveredAcre.AcreId & 3]), box, e.X + 15, e.Y + 10); } else @@ -2853,7 +2985,7 @@ private void AcreClick(object sender, MouseEventArgs e, bool island = false) { var oldImage = acreBox.BackgroundImage; acreBox.BackgroundImage = _selectedAcrePicturebox.Image; - AcreData.CheckReferencesAndDispose(oldImage, _acreMap, _selectedAcrePicturebox); + AcreImageManager.CheckReferencesAndDispose(oldImage, _acreMap, _selectedAcrePicturebox); if (!island && _grassMap != null && _grassMap.Length == _acreMap.Length) _grassMap[acreIndex].BackgroundImage = acreBox.BackgroundImage; @@ -2907,7 +3039,7 @@ private void AcreClick(object sender, MouseEventArgs e, bool island = false) { oldImage = _islandAcreMap[acreIndex].BackgroundImage; _islandAcreMap[acreIndex].BackgroundImage = _selectedAcrePicturebox.Image; - AcreData.CheckReferencesAndDispose(oldImage, _islandAcreMap, _selectedAcrePicturebox); + AcreImageManager.CheckReferencesAndDispose(oldImage, _islandAcreMap, _selectedAcrePicturebox); if (loadDefaultItems) { IslandAcres[acreIndex].LoadDefaultItems(SaveFile); @@ -2929,17 +3061,21 @@ private void AcreClick(object sender, MouseEventArgs e, bool island = false) _selectedAcrePicturebox.Image = acreBox.BackgroundImage; } - if (SaveFile.SaveGeneration == SaveGeneration.N3DS) + if (SaveFile.SaveGeneration == SaveGeneration.N3DS) { - AcreData.CheckReferencesAndDispose(oldImage, island ? _newLeafIslandAcreMap : _acreMap, _selectedAcrePicturebox); + AcreImageManager.CheckReferencesAndDispose(oldImage, island ? _newLeafIslandAcreMap : _acreMap, + _selectedAcrePicturebox); } else { - AcreData.CheckReferencesAndDispose(oldImage, island ? _islandAcreMap : _acreMap, _selectedAcrePicturebox); + AcreImageManager.CheckReferencesAndDispose(oldImage, island ? _islandAcreMap : _acreMap, + _selectedAcrePicturebox); } _selectedAcreId = island ? IslandAcres[acreIndex].AcreId : _acres[acreIndex].AcreId; - var acreStr = SaveFile.SaveGeneration == SaveGeneration.NDS ? _selectedAcreId.ToString("X2") : _selectedAcreId.ToString("X4"); + var acreStr = SaveFile.SaveGeneration == SaveGeneration.NDS + ? _selectedAcreId.ToString("X2") + : _selectedAcreId.ToString("X4"); var baseAcreStr = acreStr; switch (SaveFile.SaveGeneration) @@ -2951,30 +3087,57 @@ private void AcreClick(object sender, MouseEventArgs e, bool island = false) break; } - if (SaveFile.SaveGeneration == SaveGeneration.N64 || SaveFile.SaveGeneration == SaveGeneration.GCN || SaveFile.SaveGeneration == SaveGeneration.iQue) + if (SaveFile.SaveGeneration == SaveGeneration.N64 || + SaveFile.SaveGeneration == SaveGeneration.GCN || SaveFile.SaveGeneration == SaveGeneration.iQue) { acreHeightTrackBar.Value = _selectedAcreId & 3; - _acreHeightModifier = (ushort)acreHeightTrackBar.Value; - _selectedAcreId -= (ushort)acreHeightTrackBar.Value; + _acreHeightModifier = (ushort) acreHeightTrackBar.Value; + _selectedAcreId -= (ushort) acreHeightTrackBar.Value; } + if (SaveFile.SaveType == SaveType.WildWorld) + { acreID.Text = "Acre ID: 0x" + _selectedAcreId.ToString("X2"); - else if (SaveFile.SaveGeneration == SaveGeneration.N64 || SaveFile.SaveGeneration == SaveGeneration.GCN || SaveFile.SaveGeneration == SaveGeneration.iQue) + } + else if (SaveFile.SaveGeneration == SaveGeneration.N64 || + SaveFile.SaveGeneration == SaveGeneration.GCN || + SaveFile.SaveGeneration == SaveGeneration.iQue) + { acreID.Text = "Acre ID: 0x" + (_selectedAcreId + _acreHeightModifier).ToString("X4"); + } else + { acreID.Text = "Acre ID: 0x" + _selectedAcreId.ToString("X4"); + } + if (_acreInfo != null) - acreDesc.Text = _acreInfo.ContainsKey((byte)_selectedAcreId) ? _acreInfo[(byte)_selectedAcreId] : "No Description"; + { + acreDesc.Text = _acreInfo.ContainsKey((byte) _selectedAcreId) + ? _acreInfo[(byte) _selectedAcreId] + : "No Description"; + } else if (_uInt16AcreInfo != null) - if ((SaveFile.SaveGeneration == SaveGeneration.N64 || SaveFile.SaveGeneration == SaveGeneration.GCN || - SaveFile.SaveGeneration == SaveGeneration.iQue) && _uInt16AcreInfo.ContainsKey((ushort)(_selectedAcreId & 0xFFFC))) - acreDesc.Text = _uInt16AcreInfo[(ushort)(_selectedAcreId & 0xFFFC)]; + { + if ((SaveFile.SaveGeneration == SaveGeneration.N64 || + SaveFile.SaveGeneration == SaveGeneration.GCN || + SaveFile.SaveGeneration == SaveGeneration.iQue) && + _uInt16AcreInfo.ContainsKey((ushort) (_selectedAcreId & 0xFFFC))) + { + acreDesc.Text = _uInt16AcreInfo[(ushort) (_selectedAcreId & 0xFFFC)]; + } else if (_uInt16AcreInfo.ContainsKey(_selectedAcreId)) + { acreDesc.Text = _uInt16AcreInfo[_selectedAcreId]; + } else + { acreDesc.Text = "No Acre Description"; + } + } else + { acreDesc.Text = "No Acre Description"; + } foreach (TreeNode node in acreTreeView.Nodes) { @@ -2994,7 +3157,7 @@ private void AcreClick(object sender, MouseEventArgs e, bool island = false) private void ImportAcres(object sender, EventArgs e) { if (SaveFile == null || _loading) return; - Utility.ImportAcres(ref _acres, SaveFile.SaveGeneration); + DataUtility.ImportAcres(ref _acres, SaveFile.SaveGeneration); SetupMapPictureBoxes(); // TODO: Refresh Island PictureBoxes for DnM+/AC } @@ -3003,7 +3166,7 @@ private void ExportAcres(object sender, EventArgs e) { if (SaveFile != null && !_loading) { - Utility.ExportAcres(_acres, SaveFile.SaveGeneration, SaveFile.SaveName); + DataUtility.ExportAcres(_acres, SaveFile.SaveGeneration, SaveFile.SaveName); } } @@ -3063,7 +3226,8 @@ private void PlayersMouseMove(object sender, MouseEventArgs e) else if (box == pocketsBackgroundPicturebox && pocketsBackgroundPicturebox.Enabled) { playersToolTip.Show( - $"{_selectedPlayer.Data.InventoryBackground.Name} - [0x{_selectedPlayer.Data.InventoryBackground.ItemId:X4}]", box, e.X + 15, e.Y + 10); + $"{_selectedPlayer.Data.InventoryBackground.Name} - [0x{_selectedPlayer.Data.InventoryBackground.ItemId:X4}]", + box, e.X + 15, e.Y + 10); } else if (box == bedPicturebox && bedPicturebox.Enabled) { @@ -3467,7 +3631,11 @@ private void BuildingListIndexChanged(object sender, EventArgs e) var editedBuilding = _buildings[buildingIdx]; editedBuilding.Id = _buildingDb[Array.IndexOf(_buildingNames, senderBox.Text)]; editedBuilding.Name = senderBox.Text; - editedBuilding.Exists = SaveFile.SaveType == SaveType.NewLeaf ? editedBuilding.Id != 0xF8 : editedBuilding.Id != 0xFC; + + editedBuilding.Exists = SaveFile.SaveType == SaveType.NewLeaf + ? editedBuilding.Id != 0xF8 + : editedBuilding.Id != 0xFC; + _townAcreMap[editedBuilding.AcreIndex].Image = GenerateAcreItemsBitmap(TownAcres[editedBuilding.AcreIndex].AcreItems, editedBuilding.AcreIndex); } @@ -3613,23 +3781,44 @@ private void HandleTownClick(object sender, WorldItem item, int acre, int index, if (CheckBuildingIsHere(adjustedAcre, index % 16, index / 16, island) != null) return; //Don't place buildings on top of each other b.AcreIndex = (byte)adjustedAcre; - b.AcreX = island ? (byte)((adjustedAcre % 2) + 1) : (byte)(adjustedAcre % (CurrentSaveInfo.XAcreCount - 2) + 1); //Might have to change for NL - b.AcreY = island ? (byte)((adjustedAcre / 2) + 1) : (byte)(adjustedAcre / (CurrentSaveInfo.XAcreCount - 2) + 1); + + b.AcreX = island + ? (byte) ((adjustedAcre % 2) + 1) + : (byte) (adjustedAcre % (CurrentSaveInfo.XAcreCount - 2) + 1); //Might have to change for NL + + b.AcreY = island + ? (byte) ((adjustedAcre / 2) + 1) + : (byte) (adjustedAcre / (CurrentSaveInfo.XAcreCount - 2) + 1); + b.XPos = (byte)(index % 16); b.YPos = (byte)(index / 16); - if (b.Name != "Sign" && b.Name != "Bus Stop") //These two items has "actor" items at their location + + //These two items has "actor" items at their location + if (b.Name != "Sign" && b.Name != "Bus Stop") + { if (island) + { IslandAcres[acre].AcreItems[index] = new WorldItem(index); + } else - TownAcres[acre].AcreItems[index] = new WorldItem(index); //Clear any item at the new building position + { + TownAcres[acre].AcreItems[index] = + new WorldItem(index); //Clear any item at the new building position + } + } else - TownAcres[acre].AcreItems[index] = new WorldItem(b.Name == "Sign" ? (ushort)0xD000 : (ushort)0x7003, index); + { + TownAcres[acre].AcreItems[index] = + new WorldItem(b.Name == "Sign" ? (ushort) 0xD000 : (ushort) 0x7003, index); + } + if ((!island && oldAcre != acre) || (island && oldAcre != adjustedAcre)) { var oldImage = island ? _islandAcreMap[oldAcre + 5].Image : _townAcreMap[oldAcre].Image; if (island) { - _islandAcreMap[oldAcre + 5].Image = GenerateAcreItemsBitmap(IslandAcres[oldAcre + 5].AcreItems, oldAcre + 5, true); + _islandAcreMap[oldAcre + 5].Image = + GenerateAcreItemsBitmap(IslandAcres[oldAcre + 5].AcreItems, oldAcre + 5, true); _islandAcreMap[oldAcre + 5].Refresh(); } else @@ -3639,16 +3828,20 @@ private void HandleTownClick(object sender, WorldItem item, int acre, int index, } oldImage?.Dispose(); } + if (!island) //TODO: Add Island Building Panel + { UpdateBuildingPositionBoxes(b); + } + _selectedBuilding = -1; selectedItem.SelectedValue = _lastSelectedItem; selectedItem.Enabled = true; } else { - if (item.ItemId == _currentItem.ItemId) - return; + if (item.ItemId == _currentItem.ItemId) return; + if (itemFlag1.Enabled) { var newItem = new WorldItem(_currentItem.ItemId, index); @@ -3692,13 +3885,15 @@ private void HandleTownClick(object sender, WorldItem item, int acre, int index, villager = Utility.GetVillagerFromHouse(_currentItem.ItemId, _villagers); if (villager != null) { - var houseCoordinatesInfo = Utility.Find_Villager_House(villager.Data.VillagerId); + var houseCoordinatesInfo = + Utility.FindVillagerHouse(villager.Data.VillagerId, TownAcres); villager.Data.HouseCoordinates = houseCoordinatesInfo.Item1; } break; case SaveGeneration.NDS when _currentItem.ItemId >= 0x5001 && _currentItem.ItemId <= 0x5008: villager = _villagers[(_currentItem.ItemId - 1) % 8]; - var (houseCoordinates, found) = Utility.FindVillagerHouseWildWorld(villager.Index); + var (houseCoordinates, found) = + Utility.FindVillagerHouseWildWorld(villager.Index, TownAcres); villager.Data.HouseCoordinates = houseCoordinates; break; } @@ -3732,10 +3927,12 @@ private void HandleTownClick(object sender, WorldItem item, int acre, int index, // TODO: Island buried items } else - IslandAcres[acre].SetBuriedInMemory(IslandAcres[acre].AcreItems[index], acre, _islandBuriedBuffer, true, SaveFile.SaveType); + IslandAcres[acre].SetBuriedInMemory(IslandAcres[acre].AcreItems[index], + acre, _islandBuriedBuffer, true, SaveFile.SaveType); } else - TownAcres[acre].SetBuriedInMemory(TownAcres[acre].AcreItems[index], acre, _buriedBuffer, true, SaveFile.SaveType); + TownAcres[acre].SetBuriedInMemory(TownAcres[acre].AcreItems[index], acre, + _buriedBuffer, true, SaveFile.SaveType); break; } @@ -3843,8 +4040,8 @@ private void TownMove(object sender, MouseEventArgs e, bool island = false, bool items = _selectedIsland == null ? IslandAcres[acre].AcreItems : _selectedIsland.Items[acre]; item = _selectedIsland == null ? IslandAcres[acre].AcreItems[index] : _selectedIsland.Items[acre][index]; - // Set the - if (SaveFile.SaveGeneration == SaveGeneration.N3DS && _lastTownAcre < 5 || _lastTownAcre > 10) // TODO: This doesn't handle the ocean acres to the left & right. + // TODO: This doesn't handle the ocean acres to the left & right. + if (SaveFile.SaveGeneration == SaveGeneration.N3DS && _lastTownAcre < 5 || _lastTownAcre > 10) { _lastTownAcre = 5; } @@ -3980,13 +4177,15 @@ private void SaveToolStripMenuItemClick(object sender, EventArgs e) // TODO: Update islander house location. In e+, update all four islander house locations. if (SaveFile.SaveGeneration != SaveGeneration.GCN || villager.Index < 15) { - var houseCoordinatesInfo = Utility.Find_Villager_House(villager.Data.VillagerId); + var houseCoordinatesInfo = + Utility.FindVillagerHouse(villager.Data.VillagerId, TownAcres); villager.Data.HouseCoordinates = houseCoordinatesInfo.Item1; } break; case SaveGeneration.NDS: - var (houseCoordinates, found) = Utility.FindVillagerHouseWildWorld(villager.Index); + var (houseCoordinates, found) = + Utility.FindVillagerHouseWildWorld(villager.Index, TownAcres); villager.Data.HouseCoordinates = houseCoordinates; break; } @@ -4018,7 +4217,8 @@ private void SaveToolStripMenuItemClick(object sender, EventArgs e) } else if (SaveFile.SaveType == SaveType.WildWorld) { - SaveFile.Write(SaveFile.SaveDataStartOffset + CurrentSaveInfo.SaveOffsets.AcreData + i, Convert.ToByte(_acres[i].AcreId), SaveFile.IsBigEndian); + SaveFile.Write(SaveFile.SaveDataStartOffset + CurrentSaveInfo.SaveOffsets.AcreData + i, + Convert.ToByte(_acres[i].AcreId), SaveFile.IsBigEndian); } else if (SaveFile.SaveGeneration == SaveGeneration.N3DS) { @@ -4039,7 +4239,9 @@ private void SaveToolStripMenuItemClick(object sender, EventArgs e) } else { - SaveFile.Write(SaveFile.SaveDataStartOffset + CurrentSaveInfo.SaveOffsets.TownData + i * 512 + x * 2, TownAcres[i].AcreItems[x].ItemId, + SaveFile.Write( + SaveFile.SaveDataStartOffset + CurrentSaveInfo.SaveOffsets.TownData + i * 512 + x * 2, + TownAcres[i].AcreItems[x].ItemId, SaveFile.IsBigEndian); } } @@ -4065,28 +4267,32 @@ private void SaveToolStripMenuItemClick(object sender, EventArgs e) if (i < 33) { var dataOffset = SaveFile.SaveDataStartOffset + CurrentSaveInfo.SaveOffsets.Buildings + i * 2; - byte x = (byte)(((_buildings[i].AcreX << 4) & 0xF0) + (_buildings[i].XPos & 0x0F)), y = (byte)(((_buildings[i].AcreY << 4) & 0xF0) + (_buildings[i].YPos & 0x0F)); + byte x = (byte) (((_buildings[i].AcreX << 4) & 0xF0) + (_buildings[i].XPos & 0x0F)), + y = (byte) (((_buildings[i].AcreY << 4) & 0xF0) + (_buildings[i].YPos & 0x0F)); SaveFile.Write(dataOffset, x); SaveFile.Write(dataOffset + 1, y); } else if (_buildings[i].Id == 33) //Pave's Sign { var dataOffset = SaveFile.SaveDataStartOffset + 0x5EB90; - byte x = (byte)(((_buildings[i].AcreX << 4) & 0xF0) + (_buildings[i].XPos & 0x0F)), y = (byte)(((_buildings[i].AcreY << 4) & 0xF0) + (_buildings[i].YPos & 0x0F)); + byte x = (byte) (((_buildings[i].AcreX << 4) & 0xF0) + (_buildings[i].XPos & 0x0F)), + y = (byte) (((_buildings[i].AcreY << 4) & 0xF0) + (_buildings[i].YPos & 0x0F)); SaveFile.Write(dataOffset, x); SaveFile.Write(dataOffset + 1, y); } else if (_buildings[i].Id == 34) //Bus Stop { var dataOffset = SaveFile.SaveDataStartOffset + 0x5EB8A; - byte x = (byte)(((_buildings[i].AcreX << 4) & 0xF0) + (_buildings[i].XPos & 0x0F)), y = (byte)(((_buildings[i].AcreY << 4) & 0xF0) + (_buildings[i].YPos & 0x0F)); + byte x = (byte) (((_buildings[i].AcreX << 4) & 0xF0) + (_buildings[i].XPos & 0x0F)), + y = (byte) (((_buildings[i].AcreY << 4) & 0xF0) + (_buildings[i].YPos & 0x0F)); SaveFile.Write(dataOffset, x); SaveFile.Write(dataOffset + 1, y); } else if (i >= 35) //Signs { var dataOffset = SaveFile.SaveDataStartOffset + 0x5EB92 + (i - 35) * 2; - byte x = (byte)(((_buildings[i].AcreX << 4) & 0xF0) + (_buildings[i].XPos & 0x0F)), y = (byte)(((_buildings[i].AcreY << 4) & 0xF0) + (_buildings[i].YPos & 0x0F)); + byte x = (byte) (((_buildings[i].AcreX << 4) & 0xF0) + (_buildings[i].XPos & 0x0F)), + y = (byte) (((_buildings[i].AcreY << 4) & 0xF0) + (_buildings[i].YPos & 0x0F)); SaveFile.Write(dataOffset, x); SaveFile.Write(dataOffset + 1, y); } @@ -4097,7 +4303,8 @@ private void SaveToolStripMenuItemClick(object sender, EventArgs e) for (var i = 0; i < _buildings.Length; i++) { var dataOffset = SaveFile.SaveDataStartOffset + CurrentSaveInfo.SaveOffsets.Buildings + i * 4; - byte x = (byte)(((_buildings[i].AcreX << 4) & 0xF0) + (_buildings[i].XPos & 0x0F)), y = (byte)(((_buildings[i].AcreY << 4) & 0xF0) + (_buildings[i].YPos & 0x0F)); + byte x = (byte) (((_buildings[i].AcreX << 4) & 0xF0) + (_buildings[i].XPos & 0x0F)), + y = (byte) (((_buildings[i].AcreY << 4) & 0xF0) + (_buildings[i].YPos & 0x0F)); SaveFile.Write(dataOffset, new byte[] { _buildings[i].Id, 0x00, x, y }); } } @@ -4150,12 +4357,13 @@ private async void OpenSave(string saveFileLocation) { if (ConfirmSave("A save file is already being edited. Would you like to save your changes before opening another file?")) { - await SetupEditor(new Save(saveFileLocation)); + await SetupEditor(new Save(saveFileLocation, Properties.Settings.Default.BackupFiles)); } } else { - MessageBox.Show("The save file doesn't exist! Nothing was changed.", "Save File Loading Error", MessageBoxButtons.OK, MessageBoxIcon.Information); + MessageBox.Show("The save file doesn't exist! Nothing was changed.", "Save File Loading Error", + MessageBoxButtons.OK, MessageBoxIcon.Information); } } @@ -4321,9 +4529,12 @@ private void ImportPictureClick(object sender, EventArgs e) { if (originalImage != null) { - if (originalImage.Width != 64 || originalImage.Height != 104 || new FileInfo(importPatternFile.FileName).Length > 0x1400) - MessageBox.Show("The image you tried to import is incompatible. Please ensure the following:\n\nImage Width is 64 pixels\nImage Hight is 104 pixels\n" + - "Image file size is equal to or less than 5,120 bytes", "TPC Import Error", MessageBoxButtons.OK, MessageBoxIcon.Error); + if (originalImage.Width != 64 || originalImage.Height != 104 || + new FileInfo(importPatternFile.FileName).Length > 0x1400) + MessageBox.Show( + "The image you tried to import is incompatible. Please ensure the following:\n\nImage Width is 64 pixels\nImage Hight is 104 pixels\n" + + "Image file size is equal to or less than 5,120 bytes", "TPC Import Error", + MessageBoxButtons.OK, MessageBoxIcon.Error); else { //Image passed validation checks, so import it @@ -4388,14 +4599,14 @@ private void PlayerNameTextChanged(object sender, EventArgs e) { foreach (var villager in _villagers) { - if (villager.PlayerRelations == null) continue; - foreach (var relation in villager.PlayerRelations) + if (villager.AnimalMemories == null) continue; + foreach (var memory in villager.AnimalMemories) { - if (relation.Exists && (relation.Player == _selectedPlayer || - relation.PlayerId == _selectedPlayer.Data.Identifier && - relation.PlayerName.Equals(_selectedPlayer.Data.Name))) + if (memory.Exists && (memory.Player == _selectedPlayer || + memory.PlayerId == _selectedPlayer.Data.Identifier && + memory.PlayerName.Equals(_selectedPlayer.Data.Name))) { - relation.PlayerName = playerName.Text; + memory.PlayerName = playerName.Text; } } } @@ -4546,7 +4757,7 @@ private void CheckBox1CheckedChanged(object sender, EventArgs e) SaveFile.SaveGeneration != SaveGeneration.iQue)) return; if (_acMapIconIndex == null) { - _acMapIconIndex = AcreData.Load_AC_Map_Index(SaveFile.SaveType); + _acMapIconIndex = AcreImageManager.LoadAcMapIndex(SaveFile.SaveType); } if (townMapViewCheckbox.Checked) @@ -4557,15 +4768,15 @@ private void CheckBox1CheckedChanged(object sender, EventArgs e) Image image; if (_acMapIconIndex.ContainsKey(_acres[i].AcreId)) { - image = AcreData.FetchAcMapIcon(_acMapIconIndex[_acres[i].AcreId]); + image = AcreImageManager.FetchAcMapIcon(_acMapIconIndex[_acres[i].AcreId]); } else if (_acMapIconIndex.ContainsKey(_acres[i].BaseAcreId)) { - image = AcreData.FetchAcMapIcon(_acMapIconIndex[_acres[i].BaseAcreId]); + image = AcreImageManager.FetchAcMapIcon(_acMapIconIndex[_acres[i].BaseAcreId]); } else { - image = AcreData.FetchAcMapIcon(99); + image = AcreImageManager.FetchAcMapIcon(99); } _acreMap[i].BackgroundImage = image; // We don't dispose the previous images here, because they're needed in the town editor } @@ -4577,7 +4788,7 @@ private void CheckBox1CheckedChanged(object sender, EventArgs e) { var oldImage = _acreMap[i].BackgroundImage; _acreMap[i].BackgroundImage = GetAcreImage(_acres[i].BaseAcreId); - AcreData.CheckReferencesAndDispose(oldImage, _acreMap, _selectedAcrePicturebox); + AcreImageManager.CheckReferencesAndDispose(oldImage, _acreMap, _selectedAcrePicturebox); } } } @@ -4590,33 +4801,39 @@ private void ResettiCheckBoxCheckedChanged(object sender, EventArgs e) case SaveType.CityFolk: if (resettiCheckBox.Checked) { - SaveFile.Write(_selectedPlayer.Offset + 0x8670, (byte)(SaveFile.ReadByte(_selectedPlayer.Offset + 0x8670) | 0x02)); + SaveFile.Write(_selectedPlayer.Offset + 0x8670, + (byte) (SaveFile.ReadByte(_selectedPlayer.Offset + 0x8670) | 0x02)); } else { - SaveFile.Write(_selectedPlayer.Offset + 0x8670, (byte)(SaveFile.ReadByte(_selectedPlayer.Offset + 0x8670) & 0xFD)); + SaveFile.Write(_selectedPlayer.Offset + 0x8670, + (byte) (SaveFile.ReadByte(_selectedPlayer.Offset + 0x8670) & 0xFD)); } break; case SaveType.NewLeaf: if (resettiCheckBox.Checked) { - SaveFile.Write(_selectedPlayer.Offset + 0x5702, (byte)(SaveFile.ReadByte(_selectedPlayer.Offset + 0x5702) | 0x02)); + SaveFile.Write(_selectedPlayer.Offset + 0x5702, + (byte) (SaveFile.ReadByte(_selectedPlayer.Offset + 0x5702) | 0x02)); } else { - SaveFile.Write(_selectedPlayer.Offset + 0x5702, (byte)(SaveFile.ReadByte(_selectedPlayer.Offset + 0x5702) & 0xFD)); + SaveFile.Write(_selectedPlayer.Offset + 0x5702, + (byte) (SaveFile.ReadByte(_selectedPlayer.Offset + 0x5702) & 0xFD)); } break; case SaveType.WelcomeAmiibo: if (resettiCheckBox.Checked) { - SaveFile.Write(_selectedPlayer.Offset + 0x570A, (byte)(SaveFile.ReadByte(_selectedPlayer.Offset + 0x570A) | 0x02)); + SaveFile.Write(_selectedPlayer.Offset + 0x570A, + (byte) (SaveFile.ReadByte(_selectedPlayer.Offset + 0x570A) | 0x02)); } else { - SaveFile.Write(_selectedPlayer.Offset + 0x570A, (byte)(SaveFile.ReadByte(_selectedPlayer.Offset + 0x570A) & 0xFD)); + SaveFile.Write(_selectedPlayer.Offset + 0x570A, + (byte) (SaveFile.ReadByte(_selectedPlayer.Offset + 0x570A) & 0xFD)); } break; @@ -4669,7 +4886,7 @@ private void CensusMenuEnabledCheckedChanged(object sender, EventArgs e) private void ImportTownToolStripMenuItemClick(object sender, EventArgs e) { if (SaveFile == null || _loading) return; - Utility.ImportTown(ref TownAcres, SaveFile.SaveGeneration); + DataUtility.ImportTown(ref TownAcres, SaveFile.SaveGeneration); SetupMapPictureBoxes(); } @@ -4677,7 +4894,7 @@ private void ExportTownToolStripMenuItemClick(object sender, EventArgs e) { if (SaveFile != null && !_loading) { - Utility.ExportTown(TownAcres, SaveFile.SaveGeneration, SaveFile.SaveName); + DataUtility.ExportTown(TownAcres, SaveFile.SaveGeneration, SaveFile.SaveName); } } @@ -4742,7 +4959,7 @@ private void FillEncyclopediaButtonClick(object sender, EventArgs e) } } - private void ClearEncylopediaButtonClick(object sender, EventArgs e) + private void ClearEncyclopediaButtonClick(object sender, EventArgs e) { if (SaveFile != null && !_loading && _selectedPlayer != null && _selectedPlayer.Exists) { @@ -4802,52 +5019,48 @@ private void WeatherComboBoxSelectedIndexChanged(object sender, EventArgs e) } } + private readonly string CitraNewLeafSavePath = Path.Combine(Environment.GetEnvironmentVariable("appdata"), + "Citra", "sdmc", "Nintendo 3DS", "00000000000000000000000000000000", "00000000000000000000000000000000", + "title", "00040000"); + private void EurToolStripMenuItem1Click(object sender, EventArgs e) { - OpenSave(Environment.GetEnvironmentVariable("appdata") - + "\\Citra\\sdmc\\Nintendo 3DS\\00000000000000000000000000000000\\00000000000000000000000000000000\\title\\00040000\\00198f00\\data\\00000001\\garden_plus.dat"); + OpenSave(Path.Combine(CitraNewLeafSavePath, "00198f00", "data", "00000001", "garden_plus.dat")); } private void UsaToolStripMenuItem1Click(object sender, EventArgs e) { - OpenSave(Environment.GetEnvironmentVariable("appdata") - + "\\Citra\\sdmc\\Nintendo 3DS\\00000000000000000000000000000000\\00000000000000000000000000000000\\title\\00040000\\00198e00\\data\\00000001\\garden_plus.dat"); + OpenSave(Path.Combine(CitraNewLeafSavePath, "00198e00", "data", "00000001", "garden_plus.dat")); } private void JpnToolStripMenuItem1Click(object sender, EventArgs e) { - OpenSave(Environment.GetEnvironmentVariable("appdata") - + "\\Citra\\sdmc\\Nintendo 3DS\\00000000000000000000000000000000\\00000000000000000000000000000000\\title\\00040000\\00198d00\\data\\00000001\\garden_plus.dat"); + OpenSave(Path.Combine(CitraNewLeafSavePath, "00198d00", "data", "00000001", "garden_plus.dat")); } private void EurToolStripMenuItemClick(object sender, EventArgs e) { - OpenSave(Environment.GetEnvironmentVariable("appdata") - + "\\Citra\\sdmc\\Nintendo 3DS\\00000000000000000000000000000000\\00000000000000000000000000000000\\title\\00040000\\00086400\\data\\00000001\\garden.dat"); + OpenSave(Path.Combine(CitraNewLeafSavePath, "00086400", "data", "00000001", "garden.dat")); } private void UsaToolStripMenuItemClick(object sender, EventArgs e) { - OpenSave(Environment.GetEnvironmentVariable("appdata") - + "\\Citra\\sdmc\\Nintendo 3DS\\00000000000000000000000000000000\\00000000000000000000000000000000\\title\\00040000\\00086300\\data\\00000001\\garden.dat"); + OpenSave(Path.Combine(CitraNewLeafSavePath, "00086300", "data", "00000001", "garden.dat")); } private void JpnToolStripMenuItemClick(object sender, EventArgs e) { - OpenSave(Environment.GetEnvironmentVariable("appdata") - + "\\Citra\\sdmc\\Nintendo 3DS\\00000000000000000000000000000000\\00000000000000000000000000000000\\title\\00040000\\00086200\\data\\00000001\\garden.dat"); + OpenSave(Path.Combine(CitraNewLeafSavePath, "00086200", "data", "00000001", "garden.dat")); } private void KorToolStripMenuItemClick(object sender, EventArgs e) { - OpenSave(Environment.GetEnvironmentVariable("appdata") - + "\\Citra\\sdmc\\Nintendo 3DS\\00000000000000000000000000000000\\00000000000000000000000000000000\\title\\00040000\\00086500\\data\\00000001\\garden.dat"); + OpenSave(Path.Combine(CitraNewLeafSavePath, "00086500", "data", "00000001", "garden.dat")); } private void KorToolStripMenuItem1Click(object sender, EventArgs e) { - OpenSave(Environment.GetEnvironmentVariable("appdata") - + "\\Citra\\sdmc\\Nintendo 3DS\\00000000000000000000000000000000\\00000000000000000000000000000000\\title\\00040000\\00199000\\data\\00000001\\garden_plus.dat"); + OpenSave(Path.Combine(CitraNewLeafSavePath, "00199000", "data", "00000001", "garden_plus.dat")); } private void MainFormFormClosing(object sender, FormClosingEventArgs e) @@ -4930,7 +5143,7 @@ private void GenerateRandomTownToolStripMenuItemClick(object sender, EventArgs e _acres[i].LoadDefaultItems(SaveFile); var oldImage = _acreMap[i].BackgroundImage; _acreMap[i].BackgroundImage = GetAcreImage(_acres[i].BaseAcreId); - AcreData.CheckReferencesAndDispose(oldImage, _acreMap, _selectedAcrePicturebox); + AcreImageManager.CheckReferencesAndDispose(oldImage, _acreMap, _selectedAcrePicturebox); _acreMap[i].Refresh(); var x = i % CurrentSaveInfo.XAcreCount; var y = i / CurrentSaveInfo.XAcreCount; @@ -4940,8 +5153,10 @@ private void GenerateRandomTownToolStripMenuItemClick(object sender, EventArgs e var townAcre = (y - CurrentSaveInfo.TownYAcreStart) * (CurrentSaveInfo.XAcreCount - 2) + (x - 1); if (townAcre >= CurrentSaveInfo.TownAcreCount) continue; - TownAcres[townAcre] = new WorldAcre(_acres[i].AcreId, townAcre, _acres[i].AcreItems, _buriedBuffer, SaveFile.SaveType); - RefreshPictureBoxImage(_townAcreMap[townAcre], GenerateAcreItemsBitmap(TownAcres[townAcre].AcreItems, townAcre)); + TownAcres[townAcre] = new WorldAcre(_acres[i].AcreId, townAcre, _acres[i].AcreItems, + _buriedBuffer, SaveFile.SaveType); + RefreshPictureBoxImage(_townAcreMap[townAcre], + GenerateAcreItemsBitmap(TownAcres[townAcre].AcreItems, townAcre)); _townAcreMap[townAcre].BackgroundImage = _acreMap[i].BackgroundImage; _townAcreMap[townAcre].Refresh(); @@ -4973,11 +5188,13 @@ private void WaterFlowersButtonClick() switch (itemType) { case ItemType.ParchedFlower: - acre.AcreItems[i] = new WorldItem((ushort)(acre.AcreItems[i].ItemId + 0x1C), acre.AcreItems[i].Index); + acre.AcreItems[i] = new WorldItem((ushort) (acre.AcreItems[i].ItemId + 0x1C), + acre.AcreItems[i].Index); flowersWatered++; break; case ItemType.Flower: - acre.AcreItems[i] = new WorldItem((ushort)(acre.AcreItems[i].ItemId + 0x8A), acre.AcreItems[i].Index); + acre.AcreItems[i] = new WorldItem((ushort) (acre.AcreItems[i].ItemId + 0x8A), + acre.AcreItems[i].Index); flowersWatered++; break; } @@ -4989,7 +5206,8 @@ private void WaterFlowersButtonClick() { if (ItemData.GetItemType(acre.AcreItems[i].ItemId, SaveFile.SaveType) != ItemType.ParchedFlower) continue; - acre.AcreItems[i] = new WorldItem((ushort)(acre.AcreItems[i].ItemId - 0x20), acre.AcreItems[i].Index); + acre.AcreItems[i] = new WorldItem((ushort) (acre.AcreItems[i].ItemId - 0x20), + acre.AcreItems[i].Index); flowersWatered++; } @@ -5011,7 +5229,8 @@ private void WaterFlowersButtonClick() oldImage?.Dispose(); } - MessageBox.Show($"Watered {flowersWatered} flowers!", "Flowers Watered", MessageBoxButtons.OK, MessageBoxIcon.Information); + MessageBox.Show($"Watered {flowersWatered} flowers!", "Flowers Watered", MessageBoxButtons.OK, + MessageBoxIcon.Information); } private void itemColorsToolStripMenuItem_Click(object sender, EventArgs e) @@ -5044,8 +5263,9 @@ private void openBackupFolderToolStripMenuItem_Click(object sender, EventArgs e) private void SetOrdinanceCheckBoxes() { if (SaveFile == null || SaveFile.SaveGeneration != SaveGeneration.N3DS) return; - var ordinanceFlags = SaveFile.SaveType == SaveType.NewLeaf ? - SaveFile.ReadByte(SaveFile.SaveDataStartOffset + 0x5C74F) : SaveFile.ReadByte(SaveFile.SaveDataStartOffset + 0x6214F); + var ordinanceFlags = SaveFile.SaveType == SaveType.NewLeaf + ? SaveFile.ReadByte(SaveFile.SaveDataStartOffset + 0x5C74F) + : SaveFile.ReadByte(SaveFile.SaveDataStartOffset + 0x6214F); earlyBirdCheckBox.Checked = (ordinanceFlags & 0x02) == 0x02; nightOwlCheckBox.Checked = (ordinanceFlags & 0x04) == 0x04; @@ -5101,15 +5321,19 @@ private void UpdateNewLeafOrdinances() { SaveFile.Write(SaveFile.SaveDataStartOffset + 0x5C74F, (byte)((SaveFile.ReadByte(SaveFile.SaveDataStartOffset + 0x5C74F) & (~0x1E)) | (ordinancesInEffect & 0x1E))); - SaveFile.Write(SaveFile.SaveDataStartOffset + 0x5C753, (byte)(ordinancesEnabled | - (SaveFile.ReadByte(SaveFile.SaveDataStartOffset + 0x5C753) & 0x0F))); + SaveFile.Write(SaveFile.SaveDataStartOffset + 0x5C753, (byte) (ordinancesEnabled | + (SaveFile.ReadByte( + SaveFile.SaveDataStartOffset + + 0x5C753) & 0x0F))); } else // Welcome Amiibo { SaveFile.Write(SaveFile.SaveDataStartOffset + 0x6214F, (byte)((SaveFile.ReadByte(SaveFile.SaveDataStartOffset + 0x6214F) & (~0x1E)) | (ordinancesInEffect & 0x1E))); - SaveFile.Write(SaveFile.SaveDataStartOffset + 0x62153, (byte)(ordinancesEnabled | - (SaveFile.ReadByte(SaveFile.SaveDataStartOffset + 0x62153) & 0x0F))); + SaveFile.Write(SaveFile.SaveDataStartOffset + 0x62153, (byte) (ordinancesEnabled | + (SaveFile.ReadByte( + SaveFile.SaveDataStartOffset + + 0x62153) & 0x0F))); } } diff --git a/Forms/MainForm.resx b/ACSE.WinForms/MainForm/MainForm.resx similarity index 100% rename from Forms/MainForm.resx rename to ACSE.WinForms/MainForm/MainForm.resx diff --git a/Classes/Acre/AcreData.cs b/ACSE.WinForms/Managers/AcreImageManager.cs similarity index 83% rename from Classes/Acre/AcreData.cs rename to ACSE.WinForms/Managers/AcreImageManager.cs index 63a391a..a6e004c 100644 --- a/Classes/Acre/AcreData.cs +++ b/ACSE.WinForms/Managers/AcreImageManager.cs @@ -1,13 +1,15 @@ using System.Collections.Generic; -using System.Linq; -using System.IO; using System.Drawing; using System.Globalization; +using System.IO; +using System.Linq; +using ACSE.Core.Saves; +using ACSE.Core.Utilities; +using ACSE.WinForms.Controls; -namespace ACSE +namespace ACSE.WinForms.Managers { - // TODO: Check if any references to the Image exist, and if not, dispose of them. - public static class AcreData + public static class AcreImageManager { private static Dictionary _loadedImageDictionary = new Dictionary(); private static Dictionary _loadedAnimalCrossingMapIcons = new Dictionary(); @@ -34,7 +36,7 @@ public static Image FetchAcreImage(SaveType saveType, ushort acreId) Image result = null; - var imageDir = MainForm.AssemblyLocation + "\\Resources\\Images\\"; + var imageDir = Path.Combine(PathUtility.GetResourcesDirectory(), "Images"); switch (saveType) { case SaveType.DoubutsuNoMori: @@ -44,19 +46,19 @@ public static Image FetchAcreImage(SaveType saveType, ushort acreId) case SaveType.AnimalForestEPlus: // TODO: DnM needs its own set? case SaveType.DongwuSenlin: - imageDir += "Acre_Images"; + imageDir = Path.Combine(imageDir, "Acre_Images"); break; case SaveType.WildWorld: - imageDir += "WW_Acre_Images"; + imageDir = Path.Combine(imageDir, "WW_Acre_Images"); break; case SaveType.CityFolk: - imageDir += "CF_Acre_Images"; + imageDir = Path.Combine(imageDir, "CF_Acre_Images"); break; case SaveType.NewLeaf: - imageDir += "NL_Acre_Images"; + imageDir = Path.Combine(imageDir, "NL_Acre_Images"); break; case SaveType.WelcomeAmiibo: - imageDir += "WA_Acre_Images"; + imageDir = Path.Combine(imageDir, "WA_Acre_Images"); break; default: return null; @@ -110,7 +112,7 @@ public static Image FetchAcMapIcon(byte index) Image result = null; - var iconDirectory = MainForm.AssemblyLocation + "\\Resources\\Images\\AC_Map_Icons"; + var iconDirectory = Path.Combine(PathUtility.GetResourcesDirectory(), "Images", "AC_Map_Icons"); if (Directory.Exists(iconDirectory)) { foreach (var iconFile in Directory.GetFiles(iconDirectory)) @@ -134,10 +136,12 @@ public static Image FetchAcMapIcon(byte index) return result; } - public static void CheckReferencesAndDispose(Image referencedImage, PictureBoxWithInterpolationMode[] pictureBoxes, PictureBoxWithInterpolationMode selectedAcreBox) + public static void CheckReferencesAndDispose(Image referencedImage, + PictureBoxWithInterpolationMode[] pictureBoxes, PictureBoxWithInterpolationMode selectedAcreBox) { if (referencedImage == null || selectedAcreBox.Image == referencedImage - || pictureBoxes.Any(box => box != null && box.BackgroundImage == referencedImage)) return; + || pictureBoxes.Any( + box => box != null && box.BackgroundImage == referencedImage)) return; foreach (var pair in _loadedImageDictionary) if (pair.Value == referencedImage) @@ -172,20 +176,20 @@ public static void DisposeLoadedImages() _loadedAnimalCrossingMapIcons = new Dictionary(); } - public static Dictionary Load_AC_Map_Index(SaveType saveType) + public static Dictionary LoadAcMapIndex(SaveType saveType) { - var indexFile = MainForm.AssemblyLocation; + var indexFile = PathUtility.GetResourcesDirectory(); switch (saveType) { case SaveType.DoubutsuNoMori: case SaveType.DoubutsuNoMoriPlus: case SaveType.DongwuSenlin: - indexFile += "\\Resources\\DnM_Map_Icon_Index.txt"; + indexFile = Path.Combine(indexFile, "DnM_Map_Icon_Index.txt"); break; case SaveType.AnimalCrossing: case SaveType.DoubutsuNoMoriEPlus: case SaveType.AnimalForestEPlus: - indexFile += "\\Resources\\AC_Map_Icon_Index.txt"; + indexFile = Path.Combine(indexFile, "AC_Map_Icon_Index.txt"); break; } @@ -200,7 +204,9 @@ public static Dictionary Load_AC_Map_Index(SaveType saveType) { if (!line.Contains("0x")) continue; string acreIdStr = line.Substring(0, 6).Replace("0x", ""), indexStr = line.Substring(7).Trim(); - if (ushort.TryParse(acreIdStr, NumberStyles.AllowHexSpecifier, null, out var acreId) && byte.TryParse(indexStr, out var index)) + + if (ushort.TryParse(acreIdStr, NumberStyles.AllowHexSpecifier, null, out var acreId) && + byte.TryParse(indexStr, out var index)) { iconIndex.Add(acreId, index); } diff --git a/Classes/Program.cs b/ACSE.WinForms/Program.cs similarity index 78% rename from Classes/Program.cs rename to ACSE.WinForms/Program.cs index 801432e..312564b 100644 --- a/Classes/Program.cs +++ b/ACSE.WinForms/Program.cs @@ -1,7 +1,10 @@ using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; using System.Windows.Forms; -namespace ACSE +namespace ACSE.WinForms { static class Program { @@ -13,8 +16,7 @@ static void Main() { Application.EnableVisualStyles(); Application.SetCompatibleTextRenderingDefault(false); - Application.Run(new MainForm()); } } -} \ No newline at end of file +} diff --git a/Properties/AssemblyInfo.cs b/ACSE.WinForms/Properties/AssemblyInfo.cs similarity index 87% rename from Properties/AssemblyInfo.cs rename to ACSE.WinForms/Properties/AssemblyInfo.cs index 8e8365a..f1a721e 100644 --- a/Properties/AssemblyInfo.cs +++ b/ACSE.WinForms/Properties/AssemblyInfo.cs @@ -2,7 +2,7 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -// General Information about an assembly is controlled through the following +// General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. [assembly: AssemblyTitle("ACSE")] @@ -14,25 +14,23 @@ [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from // COM, set the ComVisible attribute to true on that type. [assembly: ComVisible(false)] // The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("52b2adb4-812e-4b42-9955-9e8f1f14dbea")] +[assembly: Guid("b4a73545-0177-4159-8602-648aa3058650")] // Version information for an assembly consists of the following four values: // // Major Version -// Minor Version +// Minor Version // Build Number // Revision // -// You can specify all the values or you can default the Build and Revision Numbers +// You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] [assembly: AssemblyVersion("0.4.1.0")] [assembly: AssemblyFileVersion("0.4.1.0")] - -[assembly: InternalsVisibleTo("ACSE.Tests")] \ No newline at end of file diff --git a/Properties/Resources1.Designer.cs b/ACSE.WinForms/Properties/Resources.Designer.cs similarity index 97% rename from Properties/Resources1.Designer.cs rename to ACSE.WinForms/Properties/Resources.Designer.cs index fe85a4c..73357e6 100644 --- a/Properties/Resources1.Designer.cs +++ b/ACSE.WinForms/Properties/Resources.Designer.cs @@ -8,7 +8,7 @@ // //------------------------------------------------------------------------------ -namespace ACSE.Properties { +namespace ACSE.WinForms.Properties { using System; @@ -39,7 +39,7 @@ internal Resources() { internal static global::System.Resources.ResourceManager ResourceManager { get { if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("ACSE.Properties.Resources", typeof(Resources).Assembly); + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("ACSE.WinForms.Properties.Resources", typeof(Resources).Assembly); resourceMan = temp; } return resourceMan; diff --git a/Properties/Resources.resx b/ACSE.WinForms/Properties/Resources.resx similarity index 88% rename from Properties/Resources.resx rename to ACSE.WinForms/Properties/Resources.resx index b71b75f..af40777 100644 --- a/Properties/Resources.resx +++ b/ACSE.WinForms/Properties/Resources.resx @@ -118,40 +118,40 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - ..\Resources\Images\no_tpc.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Images\X.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Images\Building.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Images\Arrow.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Images\VillagerHouse.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Images\Villagers.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Images\PaletteArrow.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Images\Villager Crop.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\Animal_Crossing_NL_Badges_28x28.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\Animal_Crossing_NL_NoBadge_28x28.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Images\Buried.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Arrow.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\BoxGlow.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Building.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\Buried.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\no_tpc.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\PaletteArrow.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\VillagerHouse.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\Villagers.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\Villager Crop.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\X.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/Properties/Settings1.Designer.cs b/ACSE.WinForms/Properties/Settings.Designer.cs similarity index 89% rename from Properties/Settings1.Designer.cs rename to ACSE.WinForms/Properties/Settings.Designer.cs index 929a0c3..a32d9c8 100644 --- a/Properties/Settings1.Designer.cs +++ b/ACSE.WinForms/Properties/Settings.Designer.cs @@ -8,7 +8,7 @@ // //------------------------------------------------------------------------------ -namespace ACSE.Properties { +namespace ACSE.WinForms.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] @@ -49,28 +49,16 @@ public int ImageResizeMode { [global::System.Configuration.UserScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("Error")] - public global::ACSE.DebugLevel DebugLevel { + [global::System.Configuration.DefaultSettingValueAttribute("2")] + public int DebugLevel { get { - return ((global::ACSE.DebugLevel)(this["DebugLevel"])); + return ((int)(this["DebugLevel"])); } set { this["DebugLevel"] = value; } } - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("False")] - public bool OutputInt32s { - get { - return ((bool)(this["OutputInt32s"])); - } - set { - this["OutputInt32s"] = value; - } - } - [global::System.Configuration.UserScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Configuration.DefaultSettingValueAttribute("256")] diff --git a/Properties/Settings.settings b/ACSE.WinForms/Properties/Settings.settings similarity index 81% rename from Properties/Settings.settings rename to ACSE.WinForms/Properties/Settings.settings index 42648c0..c91b686 100644 --- a/Properties/Settings.settings +++ b/ACSE.WinForms/Properties/Settings.settings @@ -1,5 +1,5 @@  - + @@ -8,11 +8,8 @@ 5 - - Error - - - False + + 2 256 diff --git a/Resources/AC_Acres_en.txt b/ACSE.WinForms/Resources/AC_Acres_en.txt similarity index 100% rename from Resources/AC_Acres_en.txt rename to ACSE.WinForms/Resources/AC_Acres_en.txt diff --git a/Resources/AC_Items_en.txt b/ACSE.WinForms/Resources/AC_Items_en.txt similarity index 100% rename from Resources/AC_Items_en.txt rename to ACSE.WinForms/Resources/AC_Items_en.txt diff --git a/Resources/AC_Map_Icon_Index.txt b/ACSE.WinForms/Resources/AC_Map_Icon_Index.txt similarity index 100% rename from Resources/AC_Map_Icon_Index.txt rename to ACSE.WinForms/Resources/AC_Map_Icon_Index.txt diff --git a/Resources/AC_Villagers_en.txt b/ACSE.WinForms/Resources/AC_Villagers_en.txt similarity index 100% rename from Resources/AC_Villagers_en.txt rename to ACSE.WinForms/Resources/AC_Villagers_en.txt diff --git a/Resources/Animal_Crossing_NL_Badges_28x28.png b/ACSE.WinForms/Resources/Animal_Crossing_NL_Badges_28x28.png similarity index 100% rename from Resources/Animal_Crossing_NL_Badges_28x28.png rename to ACSE.WinForms/Resources/Animal_Crossing_NL_Badges_28x28.png diff --git a/Resources/Animal_Crossing_NL_NoBadge_28x28.png b/ACSE.WinForms/Resources/Animal_Crossing_NL_NoBadge_28x28.png similarity index 100% rename from Resources/Animal_Crossing_NL_NoBadge_28x28.png rename to ACSE.WinForms/Resources/Animal_Crossing_NL_NoBadge_28x28.png diff --git a/Resources/Images/Arrow.png b/ACSE.WinForms/Resources/Arrow.png similarity index 100% rename from Resources/Images/Arrow.png rename to ACSE.WinForms/Resources/Arrow.png diff --git a/Resources/BoxGlow.png b/ACSE.WinForms/Resources/BoxGlow.png similarity index 100% rename from Resources/BoxGlow.png rename to ACSE.WinForms/Resources/BoxGlow.png diff --git a/Resources/Images/Building.png b/ACSE.WinForms/Resources/Building.png similarity index 100% rename from Resources/Images/Building.png rename to ACSE.WinForms/Resources/Building.png diff --git a/Resources/Images/Buried.png b/ACSE.WinForms/Resources/Buried.png similarity index 100% rename from Resources/Images/Buried.png rename to ACSE.WinForms/Resources/Buried.png diff --git a/Resources/CF_Acres_en.txt b/ACSE.WinForms/Resources/CF_Acres_en.txt similarity index 100% rename from Resources/CF_Acres_en.txt rename to ACSE.WinForms/Resources/CF_Acres_en.txt diff --git a/Resources/CF_Items_en.txt b/ACSE.WinForms/Resources/CF_Items_en.txt similarity index 100% rename from Resources/CF_Items_en.txt rename to ACSE.WinForms/Resources/CF_Items_en.txt diff --git a/Resources/DBNM_Plus_Acres_en.txt b/ACSE.WinForms/Resources/DBNM_Plus_Acres_en.txt similarity index 100% rename from Resources/DBNM_Plus_Acres_en.txt rename to ACSE.WinForms/Resources/DBNM_Plus_Acres_en.txt diff --git a/Resources/DBNM_Plus_Items_en.txt b/ACSE.WinForms/Resources/DBNM_Plus_Items_en.txt similarity index 100% rename from Resources/DBNM_Plus_Items_en.txt rename to ACSE.WinForms/Resources/DBNM_Plus_Items_en.txt diff --git a/Resources/DBNM_e_Plus_Acres_en.txt b/ACSE.WinForms/Resources/DBNM_e_Plus_Acres_en.txt similarity index 100% rename from Resources/DBNM_e_Plus_Acres_en.txt rename to ACSE.WinForms/Resources/DBNM_e_Plus_Acres_en.txt diff --git a/Resources/DBNM_e_Plus_Items_en.txt b/ACSE.WinForms/Resources/DBNM_e_Plus_Items_en.txt similarity index 100% rename from Resources/DBNM_e_Plus_Items_en.txt rename to ACSE.WinForms/Resources/DBNM_e_Plus_Items_en.txt diff --git a/Resources/DBNM_e_Plus_Villagers_en.txt b/ACSE.WinForms/Resources/DBNM_e_Plus_Villagers_en.txt similarity index 100% rename from Resources/DBNM_e_Plus_Villagers_en.txt rename to ACSE.WinForms/Resources/DBNM_e_Plus_Villagers_en.txt diff --git a/Resources/Default Acre Items/GCN/0000.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0000.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0000.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0000.bin diff --git a/Resources/Default Acre Items/GCN/0004.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0004.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0004.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0004.bin diff --git a/Resources/Default Acre Items/GCN/0008.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0008.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0008.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0008.bin diff --git a/Resources/Default Acre Items/GCN/000C.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/000C.bin similarity index 100% rename from Resources/Default Acre Items/GCN/000C.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/000C.bin diff --git a/Resources/Default Acre Items/GCN/0010.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0010.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0010.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0010.bin diff --git a/Resources/Default Acre Items/GCN/0014.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0014.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0014.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0014.bin diff --git a/Resources/Default Acre Items/GCN/0018.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0018.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0018.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0018.bin diff --git a/Resources/Default Acre Items/GCN/001C.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/001C.bin similarity index 100% rename from Resources/Default Acre Items/GCN/001C.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/001C.bin diff --git a/Resources/Default Acre Items/GCN/0020.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0020.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0020.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0020.bin diff --git a/Resources/Default Acre Items/GCN/0024.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0024.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0024.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0024.bin diff --git a/Resources/Default Acre Items/GCN/0028.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0028.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0028.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0028.bin diff --git a/Resources/Default Acre Items/GCN/002C.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/002C.bin similarity index 100% rename from Resources/Default Acre Items/GCN/002C.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/002C.bin diff --git a/Resources/Default Acre Items/GCN/0030.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0030.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0030.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0030.bin diff --git a/Resources/Default Acre Items/GCN/0034.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0034.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0034.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0034.bin diff --git a/Resources/Default Acre Items/GCN/0038.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0038.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0038.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0038.bin diff --git a/Resources/Default Acre Items/GCN/003C.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/003C.bin similarity index 100% rename from Resources/Default Acre Items/GCN/003C.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/003C.bin diff --git a/Resources/Default Acre Items/GCN/0040.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0040.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0040.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0040.bin diff --git a/Resources/Default Acre Items/GCN/0044.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0044.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0044.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0044.bin diff --git a/Resources/Default Acre Items/GCN/0048.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0048.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0048.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0048.bin diff --git a/Resources/Default Acre Items/GCN/004C.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/004C.bin similarity index 100% rename from Resources/Default Acre Items/GCN/004C.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/004C.bin diff --git a/Resources/Default Acre Items/GCN/0050.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0050.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0050.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0050.bin diff --git a/Resources/Default Acre Items/GCN/0054.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0054.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0054.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0054.bin diff --git a/Resources/Default Acre Items/GCN/0058.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0058.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0058.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0058.bin diff --git a/Resources/Default Acre Items/GCN/005C.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/005C.bin similarity index 100% rename from Resources/Default Acre Items/GCN/005C.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/005C.bin diff --git a/Resources/Default Acre Items/GCN/0060.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0060.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0060.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0060.bin diff --git a/Resources/Default Acre Items/GCN/0064.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0064.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0064.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0064.bin diff --git a/Resources/Default Acre Items/GCN/0068.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0068.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0068.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0068.bin diff --git a/Resources/Default Acre Items/GCN/006C.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/006C.bin similarity index 100% rename from Resources/Default Acre Items/GCN/006C.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/006C.bin diff --git a/Resources/Default Acre Items/GCN/0070.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0070.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0070.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0070.bin diff --git a/Resources/Default Acre Items/GCN/0074.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0074.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0074.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0074.bin diff --git a/Resources/Default Acre Items/GCN/0078.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0078.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0078.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0078.bin diff --git a/Resources/Default Acre Items/GCN/007C.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/007C.bin similarity index 100% rename from Resources/Default Acre Items/GCN/007C.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/007C.bin diff --git a/Resources/Default Acre Items/GCN/0080.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0080.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0080.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0080.bin diff --git a/Resources/Default Acre Items/GCN/0084.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0084.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0084.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0084.bin diff --git a/Resources/Default Acre Items/GCN/0088.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0088.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0088.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0088.bin diff --git a/Resources/Default Acre Items/GCN/008C.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/008C.bin similarity index 100% rename from Resources/Default Acre Items/GCN/008C.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/008C.bin diff --git a/Resources/Default Acre Items/GCN/0090.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0090.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0090.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0090.bin diff --git a/Resources/Default Acre Items/GCN/0094.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0094.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0094.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0094.bin diff --git a/Resources/Default Acre Items/GCN/0098.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0098.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0098.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0098.bin diff --git a/Resources/Default Acre Items/GCN/009C.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/009C.bin similarity index 100% rename from Resources/Default Acre Items/GCN/009C.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/009C.bin diff --git a/Resources/Default Acre Items/GCN/00A0.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/00A0.bin similarity index 100% rename from Resources/Default Acre Items/GCN/00A0.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/00A0.bin diff --git a/Resources/Default Acre Items/GCN/00A4.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/00A4.bin similarity index 100% rename from Resources/Default Acre Items/GCN/00A4.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/00A4.bin diff --git a/Resources/Default Acre Items/GCN/00A8.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/00A8.bin similarity index 100% rename from Resources/Default Acre Items/GCN/00A8.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/00A8.bin diff --git a/Resources/Default Acre Items/GCN/00AC.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/00AC.bin similarity index 100% rename from Resources/Default Acre Items/GCN/00AC.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/00AC.bin diff --git a/Resources/Default Acre Items/GCN/00B0.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/00B0.bin similarity index 100% rename from Resources/Default Acre Items/GCN/00B0.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/00B0.bin diff --git a/Resources/Default Acre Items/GCN/00B4.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/00B4.bin similarity index 100% rename from Resources/Default Acre Items/GCN/00B4.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/00B4.bin diff --git a/Resources/Default Acre Items/GCN/00B8.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/00B8.bin similarity index 100% rename from Resources/Default Acre Items/GCN/00B8.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/00B8.bin diff --git a/Resources/Default Acre Items/GCN/00BC.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/00BC.bin similarity index 100% rename from Resources/Default Acre Items/GCN/00BC.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/00BC.bin diff --git a/Resources/Default Acre Items/GCN/00C0.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/00C0.bin similarity index 100% rename from Resources/Default Acre Items/GCN/00C0.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/00C0.bin diff --git a/Resources/Default Acre Items/GCN/00C4.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/00C4.bin similarity index 100% rename from Resources/Default Acre Items/GCN/00C4.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/00C4.bin diff --git a/Resources/Default Acre Items/GCN/00C8.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/00C8.bin similarity index 100% rename from Resources/Default Acre Items/GCN/00C8.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/00C8.bin diff --git a/Resources/Default Acre Items/GCN/00CC.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/00CC.bin similarity index 100% rename from Resources/Default Acre Items/GCN/00CC.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/00CC.bin diff --git a/Resources/Default Acre Items/GCN/00D0.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/00D0.bin similarity index 100% rename from Resources/Default Acre Items/GCN/00D0.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/00D0.bin diff --git a/Resources/Default Acre Items/GCN/00D4.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/00D4.bin similarity index 100% rename from Resources/Default Acre Items/GCN/00D4.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/00D4.bin diff --git a/Resources/Default Acre Items/GCN/00D8.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/00D8.bin similarity index 100% rename from Resources/Default Acre Items/GCN/00D8.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/00D8.bin diff --git a/Resources/Default Acre Items/GCN/00DC.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/00DC.bin similarity index 100% rename from Resources/Default Acre Items/GCN/00DC.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/00DC.bin diff --git a/Resources/Default Acre Items/GCN/00E0.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/00E0.bin similarity index 100% rename from Resources/Default Acre Items/GCN/00E0.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/00E0.bin diff --git a/Resources/Default Acre Items/GCN/00E4.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/00E4.bin similarity index 100% rename from Resources/Default Acre Items/GCN/00E4.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/00E4.bin diff --git a/Resources/Default Acre Items/GCN/00E8.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/00E8.bin similarity index 100% rename from Resources/Default Acre Items/GCN/00E8.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/00E8.bin diff --git a/Resources/Default Acre Items/GCN/00EC.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/00EC.bin similarity index 100% rename from Resources/Default Acre Items/GCN/00EC.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/00EC.bin diff --git a/Resources/Default Acre Items/GCN/00F0.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/00F0.bin similarity index 100% rename from Resources/Default Acre Items/GCN/00F0.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/00F0.bin diff --git a/Resources/Default Acre Items/GCN/00F4.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/00F4.bin similarity index 100% rename from Resources/Default Acre Items/GCN/00F4.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/00F4.bin diff --git a/Resources/Default Acre Items/GCN/00F8.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/00F8.bin similarity index 100% rename from Resources/Default Acre Items/GCN/00F8.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/00F8.bin diff --git a/Resources/Default Acre Items/GCN/00FC.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/00FC.bin similarity index 100% rename from Resources/Default Acre Items/GCN/00FC.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/00FC.bin diff --git a/Resources/Default Acre Items/GCN/0100.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0100.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0100.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0100.bin diff --git a/Resources/Default Acre Items/GCN/0104.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0104.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0104.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0104.bin diff --git a/Resources/Default Acre Items/GCN/0108.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0108.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0108.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0108.bin diff --git a/Resources/Default Acre Items/GCN/010C.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/010C.bin similarity index 100% rename from Resources/Default Acre Items/GCN/010C.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/010C.bin diff --git a/Resources/Default Acre Items/GCN/0110.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0110.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0110.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0110.bin diff --git a/Resources/Default Acre Items/GCN/0114.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0114.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0114.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0114.bin diff --git a/Resources/Default Acre Items/GCN/0118.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0118.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0118.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0118.bin diff --git a/Resources/Default Acre Items/GCN/011C.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/011C.bin similarity index 100% rename from Resources/Default Acre Items/GCN/011C.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/011C.bin diff --git a/Resources/Default Acre Items/GCN/0120.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0120.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0120.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0120.bin diff --git a/Resources/Default Acre Items/GCN/0124.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0124.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0124.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0124.bin diff --git a/Resources/Default Acre Items/GCN/0128.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0128.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0128.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0128.bin diff --git a/Resources/Default Acre Items/GCN/012C.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/012C.bin similarity index 100% rename from Resources/Default Acre Items/GCN/012C.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/012C.bin diff --git a/Resources/Default Acre Items/GCN/0130.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0130.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0130.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0130.bin diff --git a/Resources/Default Acre Items/GCN/0134.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0134.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0134.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0134.bin diff --git a/Resources/Default Acre Items/GCN/0138.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0138.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0138.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0138.bin diff --git a/Resources/Default Acre Items/GCN/013C.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/013C.bin similarity index 100% rename from Resources/Default Acre Items/GCN/013C.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/013C.bin diff --git a/Resources/Default Acre Items/GCN/0140.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0140.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0140.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0140.bin diff --git a/Resources/Default Acre Items/GCN/0144.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0144.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0144.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0144.bin diff --git a/Resources/Default Acre Items/GCN/0148.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0148.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0148.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0148.bin diff --git a/Resources/Default Acre Items/GCN/014C.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/014C.bin similarity index 100% rename from Resources/Default Acre Items/GCN/014C.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/014C.bin diff --git a/Resources/Default Acre Items/GCN/0150.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0150.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0150.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0150.bin diff --git a/Resources/Default Acre Items/GCN/0154.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0154.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0154.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0154.bin diff --git a/Resources/Default Acre Items/GCN/0158.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0158.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0158.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0158.bin diff --git a/Resources/Default Acre Items/GCN/015C.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/015C.bin similarity index 100% rename from Resources/Default Acre Items/GCN/015C.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/015C.bin diff --git a/Resources/Default Acre Items/GCN/0160.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0160.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0160.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0160.bin diff --git a/Resources/Default Acre Items/GCN/0164.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0164.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0164.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0164.bin diff --git a/Resources/Default Acre Items/GCN/0168.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0168.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0168.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0168.bin diff --git a/Resources/Default Acre Items/GCN/016C.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/016C.bin similarity index 100% rename from Resources/Default Acre Items/GCN/016C.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/016C.bin diff --git a/Resources/Default Acre Items/GCN/0170.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0170.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0170.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0170.bin diff --git a/Resources/Default Acre Items/GCN/0174.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0174.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0174.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0174.bin diff --git a/Resources/Default Acre Items/GCN/0178.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0178.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0178.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0178.bin diff --git a/Resources/Default Acre Items/GCN/017C.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/017C.bin similarity index 100% rename from Resources/Default Acre Items/GCN/017C.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/017C.bin diff --git a/Resources/Default Acre Items/GCN/0180.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0180.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0180.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0180.bin diff --git a/Resources/Default Acre Items/GCN/0184.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0184.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0184.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0184.bin diff --git a/Resources/Default Acre Items/GCN/0188.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0188.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0188.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0188.bin diff --git a/Resources/Default Acre Items/GCN/018C.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/018C.bin similarity index 100% rename from Resources/Default Acre Items/GCN/018C.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/018C.bin diff --git a/Resources/Default Acre Items/GCN/0190.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0190.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0190.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0190.bin diff --git a/Resources/Default Acre Items/GCN/0194.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0194.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0194.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0194.bin diff --git a/Resources/Default Acre Items/GCN/0198.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0198.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0198.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0198.bin diff --git a/Resources/Default Acre Items/GCN/019C.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/019C.bin similarity index 100% rename from Resources/Default Acre Items/GCN/019C.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/019C.bin diff --git a/Resources/Default Acre Items/GCN/01A0.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/01A0.bin similarity index 100% rename from Resources/Default Acre Items/GCN/01A0.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/01A0.bin diff --git a/Resources/Default Acre Items/GCN/01A4.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/01A4.bin similarity index 100% rename from Resources/Default Acre Items/GCN/01A4.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/01A4.bin diff --git a/Resources/Default Acre Items/GCN/01A8.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/01A8.bin similarity index 100% rename from Resources/Default Acre Items/GCN/01A8.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/01A8.bin diff --git a/Resources/Default Acre Items/GCN/01AC.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/01AC.bin similarity index 100% rename from Resources/Default Acre Items/GCN/01AC.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/01AC.bin diff --git a/Resources/Default Acre Items/GCN/01B0.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/01B0.bin similarity index 100% rename from Resources/Default Acre Items/GCN/01B0.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/01B0.bin diff --git a/Resources/Default Acre Items/GCN/01B4.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/01B4.bin similarity index 100% rename from Resources/Default Acre Items/GCN/01B4.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/01B4.bin diff --git a/Resources/Default Acre Items/GCN/01B8.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/01B8.bin similarity index 100% rename from Resources/Default Acre Items/GCN/01B8.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/01B8.bin diff --git a/Resources/Default Acre Items/GCN/01BC.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/01BC.bin similarity index 100% rename from Resources/Default Acre Items/GCN/01BC.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/01BC.bin diff --git a/Resources/Default Acre Items/GCN/01C0.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/01C0.bin similarity index 100% rename from Resources/Default Acre Items/GCN/01C0.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/01C0.bin diff --git a/Resources/Default Acre Items/GCN/01C4.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/01C4.bin similarity index 100% rename from Resources/Default Acre Items/GCN/01C4.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/01C4.bin diff --git a/Resources/Default Acre Items/GCN/01C8.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/01C8.bin similarity index 100% rename from Resources/Default Acre Items/GCN/01C8.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/01C8.bin diff --git a/Resources/Default Acre Items/GCN/01CC.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/01CC.bin similarity index 100% rename from Resources/Default Acre Items/GCN/01CC.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/01CC.bin diff --git a/Resources/Default Acre Items/GCN/01D0.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/01D0.bin similarity index 100% rename from Resources/Default Acre Items/GCN/01D0.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/01D0.bin diff --git a/Resources/Default Acre Items/GCN/01D4.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/01D4.bin similarity index 100% rename from Resources/Default Acre Items/GCN/01D4.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/01D4.bin diff --git a/Resources/Default Acre Items/GCN/01D8.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/01D8.bin similarity index 100% rename from Resources/Default Acre Items/GCN/01D8.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/01D8.bin diff --git a/Resources/Default Acre Items/GCN/01DC.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/01DC.bin similarity index 100% rename from Resources/Default Acre Items/GCN/01DC.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/01DC.bin diff --git a/Resources/Default Acre Items/GCN/01E0.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/01E0.bin similarity index 100% rename from Resources/Default Acre Items/GCN/01E0.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/01E0.bin diff --git a/Resources/Default Acre Items/GCN/01E4.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/01E4.bin similarity index 100% rename from Resources/Default Acre Items/GCN/01E4.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/01E4.bin diff --git a/Resources/Default Acre Items/GCN/01E8.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/01E8.bin similarity index 100% rename from Resources/Default Acre Items/GCN/01E8.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/01E8.bin diff --git a/Resources/Default Acre Items/GCN/01EC.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/01EC.bin similarity index 100% rename from Resources/Default Acre Items/GCN/01EC.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/01EC.bin diff --git a/Resources/Default Acre Items/GCN/01F0.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/01F0.bin similarity index 100% rename from Resources/Default Acre Items/GCN/01F0.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/01F0.bin diff --git a/Resources/Default Acre Items/GCN/01F4.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/01F4.bin similarity index 100% rename from Resources/Default Acre Items/GCN/01F4.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/01F4.bin diff --git a/Resources/Default Acre Items/GCN/01F8.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/01F8.bin similarity index 100% rename from Resources/Default Acre Items/GCN/01F8.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/01F8.bin diff --git a/Resources/Default Acre Items/GCN/01FC.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/01FC.bin similarity index 100% rename from Resources/Default Acre Items/GCN/01FC.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/01FC.bin diff --git a/Resources/Default Acre Items/GCN/0200.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0200.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0200.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0200.bin diff --git a/Resources/Default Acre Items/GCN/0204.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0204.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0204.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0204.bin diff --git a/Resources/Default Acre Items/GCN/0208.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0208.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0208.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0208.bin diff --git a/Resources/Default Acre Items/GCN/020C.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/020C.bin similarity index 100% rename from Resources/Default Acre Items/GCN/020C.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/020C.bin diff --git a/Resources/Default Acre Items/GCN/0210.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0210.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0210.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0210.bin diff --git a/Resources/Default Acre Items/GCN/0214.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0214.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0214.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0214.bin diff --git a/Resources/Default Acre Items/GCN/0218.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0218.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0218.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0218.bin diff --git a/Resources/Default Acre Items/GCN/021C.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/021C.bin similarity index 100% rename from Resources/Default Acre Items/GCN/021C.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/021C.bin diff --git a/Resources/Default Acre Items/GCN/0220.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0220.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0220.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0220.bin diff --git a/Resources/Default Acre Items/GCN/0224.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0224.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0224.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0224.bin diff --git a/Resources/Default Acre Items/GCN/0228.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0228.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0228.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0228.bin diff --git a/Resources/Default Acre Items/GCN/022C.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/022C.bin similarity index 100% rename from Resources/Default Acre Items/GCN/022C.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/022C.bin diff --git a/Resources/Default Acre Items/GCN/0230.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0230.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0230.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0230.bin diff --git a/Resources/Default Acre Items/GCN/0234.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0234.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0234.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0234.bin diff --git a/Resources/Default Acre Items/GCN/0238.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0238.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0238.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0238.bin diff --git a/Resources/Default Acre Items/GCN/023C.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/023C.bin similarity index 100% rename from Resources/Default Acre Items/GCN/023C.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/023C.bin diff --git a/Resources/Default Acre Items/GCN/0240.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0240.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0240.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0240.bin diff --git a/Resources/Default Acre Items/GCN/0244.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0244.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0244.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0244.bin diff --git a/Resources/Default Acre Items/GCN/0248.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0248.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0248.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0248.bin diff --git a/Resources/Default Acre Items/GCN/024C.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/024C.bin similarity index 100% rename from Resources/Default Acre Items/GCN/024C.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/024C.bin diff --git a/Resources/Default Acre Items/GCN/0250.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0250.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0250.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0250.bin diff --git a/Resources/Default Acre Items/GCN/0254.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0254.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0254.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0254.bin diff --git a/Resources/Default Acre Items/GCN/0258.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0258.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0258.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0258.bin diff --git a/Resources/Default Acre Items/GCN/025C.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/025C.bin similarity index 100% rename from Resources/Default Acre Items/GCN/025C.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/025C.bin diff --git a/Resources/Default Acre Items/GCN/0260.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0260.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0260.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0260.bin diff --git a/Resources/Default Acre Items/GCN/0264.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0264.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0264.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0264.bin diff --git a/Resources/Default Acre Items/GCN/0268.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0268.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0268.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0268.bin diff --git a/Resources/Default Acre Items/GCN/026C.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/026C.bin similarity index 100% rename from Resources/Default Acre Items/GCN/026C.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/026C.bin diff --git a/Resources/Default Acre Items/GCN/0270.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0270.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0270.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0270.bin diff --git a/Resources/Default Acre Items/GCN/0274.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0274.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0274.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0274.bin diff --git a/Resources/Default Acre Items/GCN/0278.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0278.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0278.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0278.bin diff --git a/Resources/Default Acre Items/GCN/027C.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/027C.bin similarity index 100% rename from Resources/Default Acre Items/GCN/027C.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/027C.bin diff --git a/Resources/Default Acre Items/GCN/0280.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0280.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0280.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0280.bin diff --git a/Resources/Default Acre Items/GCN/0284.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0284.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0284.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0284.bin diff --git a/Resources/Default Acre Items/GCN/0288.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0288.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0288.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0288.bin diff --git a/Resources/Default Acre Items/GCN/028C.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/028C.bin similarity index 100% rename from Resources/Default Acre Items/GCN/028C.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/028C.bin diff --git a/Resources/Default Acre Items/GCN/0290.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0290.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0290.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0290.bin diff --git a/Resources/Default Acre Items/GCN/0294.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0294.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0294.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0294.bin diff --git a/Resources/Default Acre Items/GCN/0298.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0298.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0298.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0298.bin diff --git a/Resources/Default Acre Items/GCN/029C.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/029C.bin similarity index 100% rename from Resources/Default Acre Items/GCN/029C.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/029C.bin diff --git a/Resources/Default Acre Items/GCN/02A0.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/02A0.bin similarity index 100% rename from Resources/Default Acre Items/GCN/02A0.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/02A0.bin diff --git a/Resources/Default Acre Items/GCN/02A4.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/02A4.bin similarity index 100% rename from Resources/Default Acre Items/GCN/02A4.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/02A4.bin diff --git a/Resources/Default Acre Items/GCN/02A8.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/02A8.bin similarity index 100% rename from Resources/Default Acre Items/GCN/02A8.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/02A8.bin diff --git a/Resources/Default Acre Items/GCN/02AC.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/02AC.bin similarity index 100% rename from Resources/Default Acre Items/GCN/02AC.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/02AC.bin diff --git a/Resources/Default Acre Items/GCN/02B0.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/02B0.bin similarity index 100% rename from Resources/Default Acre Items/GCN/02B0.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/02B0.bin diff --git a/Resources/Default Acre Items/GCN/02B4.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/02B4.bin similarity index 100% rename from Resources/Default Acre Items/GCN/02B4.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/02B4.bin diff --git a/Resources/Default Acre Items/GCN/02B8.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/02B8.bin similarity index 100% rename from Resources/Default Acre Items/GCN/02B8.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/02B8.bin diff --git a/Resources/Default Acre Items/GCN/02BC.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/02BC.bin similarity index 100% rename from Resources/Default Acre Items/GCN/02BC.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/02BC.bin diff --git a/Resources/Default Acre Items/GCN/02C0.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/02C0.bin similarity index 100% rename from Resources/Default Acre Items/GCN/02C0.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/02C0.bin diff --git a/Resources/Default Acre Items/GCN/02C4.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/02C4.bin similarity index 100% rename from Resources/Default Acre Items/GCN/02C4.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/02C4.bin diff --git a/Resources/Default Acre Items/GCN/02C8.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/02C8.bin similarity index 100% rename from Resources/Default Acre Items/GCN/02C8.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/02C8.bin diff --git a/Resources/Default Acre Items/GCN/02CC.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/02CC.bin similarity index 100% rename from Resources/Default Acre Items/GCN/02CC.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/02CC.bin diff --git a/Resources/Default Acre Items/GCN/02D0.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/02D0.bin similarity index 100% rename from Resources/Default Acre Items/GCN/02D0.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/02D0.bin diff --git a/Resources/Default Acre Items/GCN/02D4.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/02D4.bin similarity index 100% rename from Resources/Default Acre Items/GCN/02D4.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/02D4.bin diff --git a/Resources/Default Acre Items/GCN/02D8.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/02D8.bin similarity index 100% rename from Resources/Default Acre Items/GCN/02D8.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/02D8.bin diff --git a/Resources/Default Acre Items/GCN/02DC.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/02DC.bin similarity index 100% rename from Resources/Default Acre Items/GCN/02DC.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/02DC.bin diff --git a/Resources/Default Acre Items/GCN/02E0.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/02E0.bin similarity index 100% rename from Resources/Default Acre Items/GCN/02E0.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/02E0.bin diff --git a/Resources/Default Acre Items/GCN/02E4.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/02E4.bin similarity index 100% rename from Resources/Default Acre Items/GCN/02E4.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/02E4.bin diff --git a/Resources/Default Acre Items/GCN/02E8.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/02E8.bin similarity index 100% rename from Resources/Default Acre Items/GCN/02E8.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/02E8.bin diff --git a/Resources/Default Acre Items/GCN/02EC.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/02EC.bin similarity index 100% rename from Resources/Default Acre Items/GCN/02EC.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/02EC.bin diff --git a/Resources/Default Acre Items/GCN/02F0.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/02F0.bin similarity index 100% rename from Resources/Default Acre Items/GCN/02F0.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/02F0.bin diff --git a/Resources/Default Acre Items/GCN/02F4.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/02F4.bin similarity index 100% rename from Resources/Default Acre Items/GCN/02F4.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/02F4.bin diff --git a/Resources/Default Acre Items/GCN/02F8.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/02F8.bin similarity index 100% rename from Resources/Default Acre Items/GCN/02F8.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/02F8.bin diff --git a/Resources/Default Acre Items/GCN/02FC.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/02FC.bin similarity index 100% rename from Resources/Default Acre Items/GCN/02FC.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/02FC.bin diff --git a/Resources/Default Acre Items/GCN/0300.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0300.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0300.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0300.bin diff --git a/Resources/Default Acre Items/GCN/0304.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0304.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0304.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0304.bin diff --git a/Resources/Default Acre Items/GCN/0308.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0308.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0308.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0308.bin diff --git a/Resources/Default Acre Items/GCN/030C.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/030C.bin similarity index 100% rename from Resources/Default Acre Items/GCN/030C.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/030C.bin diff --git a/Resources/Default Acre Items/GCN/0310.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0310.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0310.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0310.bin diff --git a/Resources/Default Acre Items/GCN/0314.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0314.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0314.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0314.bin diff --git a/Resources/Default Acre Items/GCN/0318.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0318.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0318.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0318.bin diff --git a/Resources/Default Acre Items/GCN/031C.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/031C.bin similarity index 100% rename from Resources/Default Acre Items/GCN/031C.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/031C.bin diff --git a/Resources/Default Acre Items/GCN/0320.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0320.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0320.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0320.bin diff --git a/Resources/Default Acre Items/GCN/0324.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0324.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0324.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0324.bin diff --git a/Resources/Default Acre Items/GCN/0328.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0328.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0328.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0328.bin diff --git a/Resources/Default Acre Items/GCN/032C.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/032C.bin similarity index 100% rename from Resources/Default Acre Items/GCN/032C.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/032C.bin diff --git a/Resources/Default Acre Items/GCN/0330.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0330.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0330.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0330.bin diff --git a/Resources/Default Acre Items/GCN/0334.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0334.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0334.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0334.bin diff --git a/Resources/Default Acre Items/GCN/0338.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0338.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0338.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0338.bin diff --git a/Resources/Default Acre Items/GCN/033C.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/033C.bin similarity index 100% rename from Resources/Default Acre Items/GCN/033C.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/033C.bin diff --git a/Resources/Default Acre Items/GCN/0340.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0340.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0340.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0340.bin diff --git a/Resources/Default Acre Items/GCN/0344.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0344.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0344.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0344.bin diff --git a/Resources/Default Acre Items/GCN/0348.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0348.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0348.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0348.bin diff --git a/Resources/Default Acre Items/GCN/034C.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/034C.bin similarity index 100% rename from Resources/Default Acre Items/GCN/034C.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/034C.bin diff --git a/Resources/Default Acre Items/GCN/0350.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0350.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0350.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0350.bin diff --git a/Resources/Default Acre Items/GCN/0354.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0354.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0354.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0354.bin diff --git a/Resources/Default Acre Items/GCN/0358.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0358.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0358.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0358.bin diff --git a/Resources/Default Acre Items/GCN/035C.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/035C.bin similarity index 100% rename from Resources/Default Acre Items/GCN/035C.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/035C.bin diff --git a/Resources/Default Acre Items/GCN/0360.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0360.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0360.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0360.bin diff --git a/Resources/Default Acre Items/GCN/0364.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0364.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0364.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0364.bin diff --git a/Resources/Default Acre Items/GCN/0368.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0368.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0368.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0368.bin diff --git a/Resources/Default Acre Items/GCN/036C.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/036C.bin similarity index 100% rename from Resources/Default Acre Items/GCN/036C.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/036C.bin diff --git a/Resources/Default Acre Items/GCN/0370.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0370.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0370.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0370.bin diff --git a/Resources/Default Acre Items/GCN/0374.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0374.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0374.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0374.bin diff --git a/Resources/Default Acre Items/GCN/0378.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0378.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0378.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0378.bin diff --git a/Resources/Default Acre Items/GCN/037C.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/037C.bin similarity index 100% rename from Resources/Default Acre Items/GCN/037C.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/037C.bin diff --git a/Resources/Default Acre Items/GCN/0380.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0380.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0380.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0380.bin diff --git a/Resources/Default Acre Items/GCN/0384.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0384.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0384.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0384.bin diff --git a/Resources/Default Acre Items/GCN/0388.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0388.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0388.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0388.bin diff --git a/Resources/Default Acre Items/GCN/038C.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/038C.bin similarity index 100% rename from Resources/Default Acre Items/GCN/038C.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/038C.bin diff --git a/Resources/Default Acre Items/GCN/0390.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0390.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0390.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0390.bin diff --git a/Resources/Default Acre Items/GCN/0394.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0394.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0394.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0394.bin diff --git a/Resources/Default Acre Items/GCN/0398.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0398.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0398.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0398.bin diff --git a/Resources/Default Acre Items/GCN/039C.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/039C.bin similarity index 100% rename from Resources/Default Acre Items/GCN/039C.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/039C.bin diff --git a/Resources/Default Acre Items/GCN/03A0.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/03A0.bin similarity index 100% rename from Resources/Default Acre Items/GCN/03A0.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/03A0.bin diff --git a/Resources/Default Acre Items/GCN/03A4.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/03A4.bin similarity index 100% rename from Resources/Default Acre Items/GCN/03A4.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/03A4.bin diff --git a/Resources/Default Acre Items/GCN/03A8.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/03A8.bin similarity index 100% rename from Resources/Default Acre Items/GCN/03A8.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/03A8.bin diff --git a/Resources/Default Acre Items/GCN/03AC.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/03AC.bin similarity index 100% rename from Resources/Default Acre Items/GCN/03AC.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/03AC.bin diff --git a/Resources/Default Acre Items/GCN/03B0.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/03B0.bin similarity index 100% rename from Resources/Default Acre Items/GCN/03B0.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/03B0.bin diff --git a/Resources/Default Acre Items/GCN/03B4.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/03B4.bin similarity index 100% rename from Resources/Default Acre Items/GCN/03B4.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/03B4.bin diff --git a/Resources/Default Acre Items/GCN/03B8.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/03B8.bin similarity index 100% rename from Resources/Default Acre Items/GCN/03B8.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/03B8.bin diff --git a/Resources/Default Acre Items/GCN/03BC.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/03BC.bin similarity index 100% rename from Resources/Default Acre Items/GCN/03BC.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/03BC.bin diff --git a/Resources/Default Acre Items/GCN/03C0.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/03C0.bin similarity index 100% rename from Resources/Default Acre Items/GCN/03C0.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/03C0.bin diff --git a/Resources/Default Acre Items/GCN/03C4.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/03C4.bin similarity index 100% rename from Resources/Default Acre Items/GCN/03C4.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/03C4.bin diff --git a/Resources/Default Acre Items/GCN/03C8.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/03C8.bin similarity index 100% rename from Resources/Default Acre Items/GCN/03C8.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/03C8.bin diff --git a/Resources/Default Acre Items/GCN/03CC.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/03CC.bin similarity index 100% rename from Resources/Default Acre Items/GCN/03CC.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/03CC.bin diff --git a/Resources/Default Acre Items/GCN/03D0.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/03D0.bin similarity index 100% rename from Resources/Default Acre Items/GCN/03D0.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/03D0.bin diff --git a/Resources/Default Acre Items/GCN/03D4.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/03D4.bin similarity index 100% rename from Resources/Default Acre Items/GCN/03D4.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/03D4.bin diff --git a/Resources/Default Acre Items/GCN/03D8.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/03D8.bin similarity index 100% rename from Resources/Default Acre Items/GCN/03D8.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/03D8.bin diff --git a/Resources/Default Acre Items/GCN/03DC.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/03DC.bin similarity index 100% rename from Resources/Default Acre Items/GCN/03DC.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/03DC.bin diff --git a/Resources/Default Acre Items/GCN/03E0.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/03E0.bin similarity index 100% rename from Resources/Default Acre Items/GCN/03E0.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/03E0.bin diff --git a/Resources/Default Acre Items/GCN/03E4.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/03E4.bin similarity index 100% rename from Resources/Default Acre Items/GCN/03E4.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/03E4.bin diff --git a/Resources/Default Acre Items/GCN/03E8.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/03E8.bin similarity index 100% rename from Resources/Default Acre Items/GCN/03E8.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/03E8.bin diff --git a/Resources/Default Acre Items/GCN/03EC.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/03EC.bin similarity index 100% rename from Resources/Default Acre Items/GCN/03EC.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/03EC.bin diff --git a/Resources/Default Acre Items/GCN/03F0.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/03F0.bin similarity index 100% rename from Resources/Default Acre Items/GCN/03F0.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/03F0.bin diff --git a/Resources/Default Acre Items/GCN/03F4.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/03F4.bin similarity index 100% rename from Resources/Default Acre Items/GCN/03F4.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/03F4.bin diff --git a/Resources/Default Acre Items/GCN/03F8.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/03F8.bin similarity index 100% rename from Resources/Default Acre Items/GCN/03F8.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/03F8.bin diff --git a/Resources/Default Acre Items/GCN/03FC.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/03FC.bin similarity index 100% rename from Resources/Default Acre Items/GCN/03FC.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/03FC.bin diff --git a/Resources/Default Acre Items/GCN/0400.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0400.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0400.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0400.bin diff --git a/Resources/Default Acre Items/GCN/0404.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0404.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0404.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0404.bin diff --git a/Resources/Default Acre Items/GCN/0408.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0408.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0408.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0408.bin diff --git a/Resources/Default Acre Items/GCN/040C.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/040C.bin similarity index 100% rename from Resources/Default Acre Items/GCN/040C.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/040C.bin diff --git a/Resources/Default Acre Items/GCN/0410.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0410.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0410.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0410.bin diff --git a/Resources/Default Acre Items/GCN/0414.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0414.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0414.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0414.bin diff --git a/Resources/Default Acre Items/GCN/0418.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0418.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0418.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0418.bin diff --git a/Resources/Default Acre Items/GCN/041C.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/041C.bin similarity index 100% rename from Resources/Default Acre Items/GCN/041C.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/041C.bin diff --git a/Resources/Default Acre Items/GCN/0420.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0420.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0420.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0420.bin diff --git a/Resources/Default Acre Items/GCN/0424.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0424.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0424.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0424.bin diff --git a/Resources/Default Acre Items/GCN/0428.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0428.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0428.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0428.bin diff --git a/Resources/Default Acre Items/GCN/042C.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/042C.bin similarity index 100% rename from Resources/Default Acre Items/GCN/042C.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/042C.bin diff --git a/Resources/Default Acre Items/GCN/0430.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0430.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0430.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0430.bin diff --git a/Resources/Default Acre Items/GCN/0434.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0434.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0434.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0434.bin diff --git a/Resources/Default Acre Items/GCN/0438.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0438.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0438.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0438.bin diff --git a/Resources/Default Acre Items/GCN/043C.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/043C.bin similarity index 100% rename from Resources/Default Acre Items/GCN/043C.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/043C.bin diff --git a/Resources/Default Acre Items/GCN/0440.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0440.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0440.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0440.bin diff --git a/Resources/Default Acre Items/GCN/0444.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0444.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0444.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0444.bin diff --git a/Resources/Default Acre Items/GCN/0448.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0448.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0448.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0448.bin diff --git a/Resources/Default Acre Items/GCN/044C.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/044C.bin similarity index 100% rename from Resources/Default Acre Items/GCN/044C.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/044C.bin diff --git a/Resources/Default Acre Items/GCN/0450.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0450.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0450.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0450.bin diff --git a/Resources/Default Acre Items/GCN/0454.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0454.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0454.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0454.bin diff --git a/Resources/Default Acre Items/GCN/0458.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0458.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0458.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0458.bin diff --git a/Resources/Default Acre Items/GCN/045C.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/045C.bin similarity index 100% rename from Resources/Default Acre Items/GCN/045C.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/045C.bin diff --git a/Resources/Default Acre Items/GCN/0460.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0460.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0460.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0460.bin diff --git a/Resources/Default Acre Items/GCN/0464.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0464.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0464.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0464.bin diff --git a/Resources/Default Acre Items/GCN/0468.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0468.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0468.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0468.bin diff --git a/Resources/Default Acre Items/GCN/046C.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/046C.bin similarity index 100% rename from Resources/Default Acre Items/GCN/046C.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/046C.bin diff --git a/Resources/Default Acre Items/GCN/0470.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0470.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0470.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0470.bin diff --git a/Resources/Default Acre Items/GCN/0474.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0474.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0474.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0474.bin diff --git a/Resources/Default Acre Items/GCN/0478.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0478.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0478.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0478.bin diff --git a/Resources/Default Acre Items/GCN/047C.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/047C.bin similarity index 100% rename from Resources/Default Acre Items/GCN/047C.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/047C.bin diff --git a/Resources/Default Acre Items/GCN/0480.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0480.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0480.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0480.bin diff --git a/Resources/Default Acre Items/GCN/0484.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0484.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0484.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0484.bin diff --git a/Resources/Default Acre Items/GCN/0488.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0488.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0488.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0488.bin diff --git a/Resources/Default Acre Items/GCN/048C.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/048C.bin similarity index 100% rename from Resources/Default Acre Items/GCN/048C.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/048C.bin diff --git a/Resources/Default Acre Items/GCN/0490.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0490.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0490.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0490.bin diff --git a/Resources/Default Acre Items/GCN/0494.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0494.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0494.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0494.bin diff --git a/Resources/Default Acre Items/GCN/0498.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0498.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0498.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0498.bin diff --git a/Resources/Default Acre Items/GCN/049C.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/049C.bin similarity index 100% rename from Resources/Default Acre Items/GCN/049C.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/049C.bin diff --git a/Resources/Default Acre Items/GCN/04A0.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/04A0.bin similarity index 100% rename from Resources/Default Acre Items/GCN/04A0.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/04A0.bin diff --git a/Resources/Default Acre Items/GCN/04A4.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/04A4.bin similarity index 100% rename from Resources/Default Acre Items/GCN/04A4.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/04A4.bin diff --git a/Resources/Default Acre Items/GCN/04A8.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/04A8.bin similarity index 100% rename from Resources/Default Acre Items/GCN/04A8.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/04A8.bin diff --git a/Resources/Default Acre Items/GCN/04AC.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/04AC.bin similarity index 100% rename from Resources/Default Acre Items/GCN/04AC.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/04AC.bin diff --git a/Resources/Default Acre Items/GCN/04B0.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/04B0.bin similarity index 100% rename from Resources/Default Acre Items/GCN/04B0.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/04B0.bin diff --git a/Resources/Default Acre Items/GCN/04B4.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/04B4.bin similarity index 100% rename from Resources/Default Acre Items/GCN/04B4.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/04B4.bin diff --git a/Resources/Default Acre Items/GCN/04B8.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/04B8.bin similarity index 100% rename from Resources/Default Acre Items/GCN/04B8.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/04B8.bin diff --git a/Resources/Default Acre Items/GCN/04BC.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/04BC.bin similarity index 100% rename from Resources/Default Acre Items/GCN/04BC.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/04BC.bin diff --git a/Resources/Default Acre Items/GCN/04C0.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/04C0.bin similarity index 100% rename from Resources/Default Acre Items/GCN/04C0.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/04C0.bin diff --git a/Resources/Default Acre Items/GCN/04C4.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/04C4.bin similarity index 100% rename from Resources/Default Acre Items/GCN/04C4.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/04C4.bin diff --git a/Resources/Default Acre Items/GCN/04C8.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/04C8.bin similarity index 100% rename from Resources/Default Acre Items/GCN/04C8.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/04C8.bin diff --git a/Resources/Default Acre Items/GCN/04CC.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/04CC.bin similarity index 100% rename from Resources/Default Acre Items/GCN/04CC.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/04CC.bin diff --git a/Resources/Default Acre Items/GCN/04D0.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/04D0.bin similarity index 100% rename from Resources/Default Acre Items/GCN/04D0.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/04D0.bin diff --git a/Resources/Default Acre Items/GCN/04D4.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/04D4.bin similarity index 100% rename from Resources/Default Acre Items/GCN/04D4.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/04D4.bin diff --git a/Resources/Default Acre Items/GCN/04D8.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/04D8.bin similarity index 100% rename from Resources/Default Acre Items/GCN/04D8.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/04D8.bin diff --git a/Resources/Default Acre Items/GCN/04DC.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/04DC.bin similarity index 100% rename from Resources/Default Acre Items/GCN/04DC.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/04DC.bin diff --git a/Resources/Default Acre Items/GCN/04E0.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/04E0.bin similarity index 100% rename from Resources/Default Acre Items/GCN/04E0.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/04E0.bin diff --git a/Resources/Default Acre Items/GCN/04E4.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/04E4.bin similarity index 100% rename from Resources/Default Acre Items/GCN/04E4.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/04E4.bin diff --git a/Resources/Default Acre Items/GCN/04E8.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/04E8.bin similarity index 100% rename from Resources/Default Acre Items/GCN/04E8.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/04E8.bin diff --git a/Resources/Default Acre Items/GCN/04EC.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/04EC.bin similarity index 100% rename from Resources/Default Acre Items/GCN/04EC.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/04EC.bin diff --git a/Resources/Default Acre Items/GCN/04F0.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/04F0.bin similarity index 100% rename from Resources/Default Acre Items/GCN/04F0.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/04F0.bin diff --git a/Resources/Default Acre Items/GCN/04F4.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/04F4.bin similarity index 100% rename from Resources/Default Acre Items/GCN/04F4.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/04F4.bin diff --git a/Resources/Default Acre Items/GCN/04F8.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/04F8.bin similarity index 100% rename from Resources/Default Acre Items/GCN/04F8.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/04F8.bin diff --git a/Resources/Default Acre Items/GCN/04FC.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/04FC.bin similarity index 100% rename from Resources/Default Acre Items/GCN/04FC.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/04FC.bin diff --git a/Resources/Default Acre Items/GCN/0500.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0500.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0500.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0500.bin diff --git a/Resources/Default Acre Items/GCN/0504.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0504.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0504.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0504.bin diff --git a/Resources/Default Acre Items/GCN/0508.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0508.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0508.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0508.bin diff --git a/Resources/Default Acre Items/GCN/050C.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/050C.bin similarity index 100% rename from Resources/Default Acre Items/GCN/050C.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/050C.bin diff --git a/Resources/Default Acre Items/GCN/0510.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0510.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0510.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0510.bin diff --git a/Resources/Default Acre Items/GCN/0514.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0514.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0514.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0514.bin diff --git a/Resources/Default Acre Items/GCN/0518.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0518.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0518.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0518.bin diff --git a/Resources/Default Acre Items/GCN/051C.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/051C.bin similarity index 100% rename from Resources/Default Acre Items/GCN/051C.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/051C.bin diff --git a/Resources/Default Acre Items/GCN/0520.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0520.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0520.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0520.bin diff --git a/Resources/Default Acre Items/GCN/0524.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0524.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0524.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0524.bin diff --git a/Resources/Default Acre Items/GCN/0528.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0528.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0528.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0528.bin diff --git a/Resources/Default Acre Items/GCN/052C.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/052C.bin similarity index 100% rename from Resources/Default Acre Items/GCN/052C.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/052C.bin diff --git a/Resources/Default Acre Items/GCN/0530.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0530.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0530.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0530.bin diff --git a/Resources/Default Acre Items/GCN/0534.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0534.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0534.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0534.bin diff --git a/Resources/Default Acre Items/GCN/0538.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0538.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0538.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0538.bin diff --git a/Resources/Default Acre Items/GCN/053C.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/053C.bin similarity index 100% rename from Resources/Default Acre Items/GCN/053C.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/053C.bin diff --git a/Resources/Default Acre Items/GCN/0540.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0540.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0540.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0540.bin diff --git a/Resources/Default Acre Items/GCN/0544.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0544.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0544.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0544.bin diff --git a/Resources/Default Acre Items/GCN/0548.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0548.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0548.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0548.bin diff --git a/Resources/Default Acre Items/GCN/054C.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/054C.bin similarity index 100% rename from Resources/Default Acre Items/GCN/054C.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/054C.bin diff --git a/Resources/Default Acre Items/GCN/0550.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0550.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0550.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0550.bin diff --git a/Resources/Default Acre Items/GCN/0554.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0554.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0554.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0554.bin diff --git a/Resources/Default Acre Items/GCN/0558.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0558.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0558.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0558.bin diff --git a/Resources/Default Acre Items/GCN/055C.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/055C.bin similarity index 100% rename from Resources/Default Acre Items/GCN/055C.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/055C.bin diff --git a/Resources/Default Acre Items/GCN/0560.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0560.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0560.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0560.bin diff --git a/Resources/Default Acre Items/GCN/0564.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0564.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0564.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0564.bin diff --git a/Resources/Default Acre Items/GCN/0568.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0568.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0568.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0568.bin diff --git a/Resources/Default Acre Items/GCN/056C.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/056C.bin similarity index 100% rename from Resources/Default Acre Items/GCN/056C.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/056C.bin diff --git a/Resources/Default Acre Items/GCN/0570.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0570.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0570.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0570.bin diff --git a/Resources/Default Acre Items/GCN/0574.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0574.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0574.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0574.bin diff --git a/Resources/Default Acre Items/GCN/0578.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0578.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0578.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0578.bin diff --git a/Resources/Default Acre Items/GCN/057C.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/057C.bin similarity index 100% rename from Resources/Default Acre Items/GCN/057C.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/057C.bin diff --git a/Resources/Default Acre Items/GCN/0580.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0580.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0580.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0580.bin diff --git a/Resources/Default Acre Items/GCN/0584.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0584.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0584.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0584.bin diff --git a/Resources/Default Acre Items/GCN/0588.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0588.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0588.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0588.bin diff --git a/Resources/Default Acre Items/GCN/058C.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/058C.bin similarity index 100% rename from Resources/Default Acre Items/GCN/058C.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/058C.bin diff --git a/Resources/Default Acre Items/GCN/0590.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0590.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0590.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0590.bin diff --git a/Resources/Default Acre Items/GCN/0594.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0594.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0594.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0594.bin diff --git a/Resources/Default Acre Items/GCN/0598.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/0598.bin similarity index 100% rename from Resources/Default Acre Items/GCN/0598.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/0598.bin diff --git a/Resources/Default Acre Items/GCN/059C.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/059C.bin similarity index 100% rename from Resources/Default Acre Items/GCN/059C.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/059C.bin diff --git a/Resources/Default Acre Items/GCN/05A0.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/05A0.bin similarity index 100% rename from Resources/Default Acre Items/GCN/05A0.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/05A0.bin diff --git a/Resources/Default Acre Items/GCN/05A4.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/05A4.bin similarity index 100% rename from Resources/Default Acre Items/GCN/05A4.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/05A4.bin diff --git a/Resources/Default Acre Items/GCN/05A8.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/05A8.bin similarity index 100% rename from Resources/Default Acre Items/GCN/05A8.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/05A8.bin diff --git a/Resources/Default Acre Items/GCN/05AC.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/05AC.bin similarity index 100% rename from Resources/Default Acre Items/GCN/05AC.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/05AC.bin diff --git a/Resources/Default Acre Items/GCN/05B0.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/05B0.bin similarity index 100% rename from Resources/Default Acre Items/GCN/05B0.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/05B0.bin diff --git a/Resources/Default Acre Items/GCN/05B4.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/05B4.bin similarity index 100% rename from Resources/Default Acre Items/GCN/05B4.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/05B4.bin diff --git a/Resources/Default Acre Items/GCN/05B8.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/05B8.bin similarity index 100% rename from Resources/Default Acre Items/GCN/05B8.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/05B8.bin diff --git a/Resources/Default Acre Items/GCN/05BC.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/05BC.bin similarity index 100% rename from Resources/Default Acre Items/GCN/05BC.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/05BC.bin diff --git a/Resources/Default Acre Items/GCN/05C0.bin b/ACSE.WinForms/Resources/Default Acre Items/GCN/05C0.bin similarity index 100% rename from Resources/Default Acre Items/GCN/05C0.bin rename to ACSE.WinForms/Resources/Default Acre Items/GCN/05C0.bin diff --git a/Resources/DnM_Items_en.txt b/ACSE.WinForms/Resources/DnM_Items_en.txt similarity index 100% rename from Resources/DnM_Items_en.txt rename to ACSE.WinForms/Resources/DnM_Items_en.txt diff --git a/Resources/DnM_Map_Icon_Index.txt b/ACSE.WinForms/Resources/DnM_Map_Icon_Index.txt similarity index 100% rename from Resources/DnM_Map_Icon_Index.txt rename to ACSE.WinForms/Resources/DnM_Map_Icon_Index.txt diff --git a/Resources/DnM_Villagers_en.txt b/ACSE.WinForms/Resources/DnM_Villagers_en.txt similarity index 100% rename from Resources/DnM_Villagers_en.txt rename to ACSE.WinForms/Resources/DnM_Villagers_en.txt diff --git a/ACSE.WinForms/Resources/Images/ACSE_Logo_2.ico b/ACSE.WinForms/Resources/Images/ACSE_Logo_2.ico new file mode 100644 index 0000000..23b22d1 Binary files /dev/null and b/ACSE.WinForms/Resources/Images/ACSE_Logo_2.ico differ diff --git a/Resources/Images/AC_Map_Icons/1.jpg b/ACSE.WinForms/Resources/Images/AC_Map_Icons/1.jpg similarity index 100% rename from Resources/Images/AC_Map_Icons/1.jpg rename to ACSE.WinForms/Resources/Images/AC_Map_Icons/1.jpg diff --git a/Resources/Images/AC_Map_Icons/10.jpg b/ACSE.WinForms/Resources/Images/AC_Map_Icons/10.jpg similarity index 100% rename from Resources/Images/AC_Map_Icons/10.jpg rename to ACSE.WinForms/Resources/Images/AC_Map_Icons/10.jpg diff --git a/Resources/Images/AC_Map_Icons/100.jpg b/ACSE.WinForms/Resources/Images/AC_Map_Icons/100.jpg similarity index 100% rename from Resources/Images/AC_Map_Icons/100.jpg rename to ACSE.WinForms/Resources/Images/AC_Map_Icons/100.jpg diff --git a/Resources/Images/AC_Map_Icons/11.jpg b/ACSE.WinForms/Resources/Images/AC_Map_Icons/11.jpg similarity index 100% rename from Resources/Images/AC_Map_Icons/11.jpg rename to ACSE.WinForms/Resources/Images/AC_Map_Icons/11.jpg diff --git a/Resources/Images/AC_Map_Icons/12.jpg b/ACSE.WinForms/Resources/Images/AC_Map_Icons/12.jpg similarity index 100% rename from Resources/Images/AC_Map_Icons/12.jpg rename to ACSE.WinForms/Resources/Images/AC_Map_Icons/12.jpg diff --git a/Resources/Images/AC_Map_Icons/13.jpg b/ACSE.WinForms/Resources/Images/AC_Map_Icons/13.jpg similarity index 100% rename from Resources/Images/AC_Map_Icons/13.jpg rename to ACSE.WinForms/Resources/Images/AC_Map_Icons/13.jpg diff --git a/Resources/Images/AC_Map_Icons/14.jpg b/ACSE.WinForms/Resources/Images/AC_Map_Icons/14.jpg similarity index 100% rename from Resources/Images/AC_Map_Icons/14.jpg rename to ACSE.WinForms/Resources/Images/AC_Map_Icons/14.jpg diff --git a/Resources/Images/AC_Map_Icons/15.jpg b/ACSE.WinForms/Resources/Images/AC_Map_Icons/15.jpg similarity index 100% rename from Resources/Images/AC_Map_Icons/15.jpg rename to ACSE.WinForms/Resources/Images/AC_Map_Icons/15.jpg diff --git a/Resources/Images/AC_Map_Icons/16.jpg b/ACSE.WinForms/Resources/Images/AC_Map_Icons/16.jpg similarity index 100% rename from Resources/Images/AC_Map_Icons/16.jpg rename to ACSE.WinForms/Resources/Images/AC_Map_Icons/16.jpg diff --git a/Resources/Images/AC_Map_Icons/17.jpg b/ACSE.WinForms/Resources/Images/AC_Map_Icons/17.jpg similarity index 100% rename from Resources/Images/AC_Map_Icons/17.jpg rename to ACSE.WinForms/Resources/Images/AC_Map_Icons/17.jpg diff --git a/Resources/Images/AC_Map_Icons/18.jpg b/ACSE.WinForms/Resources/Images/AC_Map_Icons/18.jpg similarity index 100% rename from Resources/Images/AC_Map_Icons/18.jpg rename to ACSE.WinForms/Resources/Images/AC_Map_Icons/18.jpg diff --git a/Resources/Images/AC_Map_Icons/19.jpg b/ACSE.WinForms/Resources/Images/AC_Map_Icons/19.jpg similarity index 100% rename from Resources/Images/AC_Map_Icons/19.jpg rename to ACSE.WinForms/Resources/Images/AC_Map_Icons/19.jpg diff --git a/Resources/Images/AC_Map_Icons/2.jpg b/ACSE.WinForms/Resources/Images/AC_Map_Icons/2.jpg similarity index 100% rename from Resources/Images/AC_Map_Icons/2.jpg rename to ACSE.WinForms/Resources/Images/AC_Map_Icons/2.jpg diff --git a/Resources/Images/AC_Map_Icons/20.jpg b/ACSE.WinForms/Resources/Images/AC_Map_Icons/20.jpg similarity index 100% rename from Resources/Images/AC_Map_Icons/20.jpg rename to ACSE.WinForms/Resources/Images/AC_Map_Icons/20.jpg diff --git a/Resources/Images/AC_Map_Icons/21.jpg b/ACSE.WinForms/Resources/Images/AC_Map_Icons/21.jpg similarity index 100% rename from Resources/Images/AC_Map_Icons/21.jpg rename to ACSE.WinForms/Resources/Images/AC_Map_Icons/21.jpg diff --git a/Resources/Images/AC_Map_Icons/22.jpg b/ACSE.WinForms/Resources/Images/AC_Map_Icons/22.jpg similarity index 100% rename from Resources/Images/AC_Map_Icons/22.jpg rename to ACSE.WinForms/Resources/Images/AC_Map_Icons/22.jpg diff --git a/Resources/Images/AC_Map_Icons/23.jpg b/ACSE.WinForms/Resources/Images/AC_Map_Icons/23.jpg similarity index 100% rename from Resources/Images/AC_Map_Icons/23.jpg rename to ACSE.WinForms/Resources/Images/AC_Map_Icons/23.jpg diff --git a/Resources/Images/AC_Map_Icons/24.jpg b/ACSE.WinForms/Resources/Images/AC_Map_Icons/24.jpg similarity index 100% rename from Resources/Images/AC_Map_Icons/24.jpg rename to ACSE.WinForms/Resources/Images/AC_Map_Icons/24.jpg diff --git a/Resources/Images/AC_Map_Icons/25.jpg b/ACSE.WinForms/Resources/Images/AC_Map_Icons/25.jpg similarity index 100% rename from Resources/Images/AC_Map_Icons/25.jpg rename to ACSE.WinForms/Resources/Images/AC_Map_Icons/25.jpg diff --git a/Resources/Images/AC_Map_Icons/26.jpg b/ACSE.WinForms/Resources/Images/AC_Map_Icons/26.jpg similarity index 100% rename from Resources/Images/AC_Map_Icons/26.jpg rename to ACSE.WinForms/Resources/Images/AC_Map_Icons/26.jpg diff --git a/Resources/Images/AC_Map_Icons/27.jpg b/ACSE.WinForms/Resources/Images/AC_Map_Icons/27.jpg similarity index 100% rename from Resources/Images/AC_Map_Icons/27.jpg rename to ACSE.WinForms/Resources/Images/AC_Map_Icons/27.jpg diff --git a/Resources/Images/AC_Map_Icons/28.jpg b/ACSE.WinForms/Resources/Images/AC_Map_Icons/28.jpg similarity index 100% rename from Resources/Images/AC_Map_Icons/28.jpg rename to ACSE.WinForms/Resources/Images/AC_Map_Icons/28.jpg diff --git a/Resources/Images/AC_Map_Icons/29.jpg b/ACSE.WinForms/Resources/Images/AC_Map_Icons/29.jpg similarity index 100% rename from Resources/Images/AC_Map_Icons/29.jpg rename to ACSE.WinForms/Resources/Images/AC_Map_Icons/29.jpg diff --git a/Resources/Images/AC_Map_Icons/3.jpg b/ACSE.WinForms/Resources/Images/AC_Map_Icons/3.jpg similarity index 100% rename from Resources/Images/AC_Map_Icons/3.jpg rename to ACSE.WinForms/Resources/Images/AC_Map_Icons/3.jpg diff --git a/Resources/Images/AC_Map_Icons/30.jpg b/ACSE.WinForms/Resources/Images/AC_Map_Icons/30.jpg similarity index 100% rename from Resources/Images/AC_Map_Icons/30.jpg rename to ACSE.WinForms/Resources/Images/AC_Map_Icons/30.jpg diff --git a/Resources/Images/AC_Map_Icons/31.jpg b/ACSE.WinForms/Resources/Images/AC_Map_Icons/31.jpg similarity index 100% rename from Resources/Images/AC_Map_Icons/31.jpg rename to ACSE.WinForms/Resources/Images/AC_Map_Icons/31.jpg diff --git a/Resources/Images/AC_Map_Icons/32.jpg b/ACSE.WinForms/Resources/Images/AC_Map_Icons/32.jpg similarity index 100% rename from Resources/Images/AC_Map_Icons/32.jpg rename to ACSE.WinForms/Resources/Images/AC_Map_Icons/32.jpg diff --git a/Resources/Images/AC_Map_Icons/33.jpg b/ACSE.WinForms/Resources/Images/AC_Map_Icons/33.jpg similarity index 100% rename from Resources/Images/AC_Map_Icons/33.jpg rename to ACSE.WinForms/Resources/Images/AC_Map_Icons/33.jpg diff --git a/Resources/Images/AC_Map_Icons/34.jpg b/ACSE.WinForms/Resources/Images/AC_Map_Icons/34.jpg similarity index 100% rename from Resources/Images/AC_Map_Icons/34.jpg rename to ACSE.WinForms/Resources/Images/AC_Map_Icons/34.jpg diff --git a/Resources/Images/AC_Map_Icons/35.jpg b/ACSE.WinForms/Resources/Images/AC_Map_Icons/35.jpg similarity index 100% rename from Resources/Images/AC_Map_Icons/35.jpg rename to ACSE.WinForms/Resources/Images/AC_Map_Icons/35.jpg diff --git a/Resources/Images/AC_Map_Icons/36.jpg b/ACSE.WinForms/Resources/Images/AC_Map_Icons/36.jpg similarity index 100% rename from Resources/Images/AC_Map_Icons/36.jpg rename to ACSE.WinForms/Resources/Images/AC_Map_Icons/36.jpg diff --git a/Resources/Images/AC_Map_Icons/37.jpg b/ACSE.WinForms/Resources/Images/AC_Map_Icons/37.jpg similarity index 100% rename from Resources/Images/AC_Map_Icons/37.jpg rename to ACSE.WinForms/Resources/Images/AC_Map_Icons/37.jpg diff --git a/Resources/Images/AC_Map_Icons/38.jpg b/ACSE.WinForms/Resources/Images/AC_Map_Icons/38.jpg similarity index 100% rename from Resources/Images/AC_Map_Icons/38.jpg rename to ACSE.WinForms/Resources/Images/AC_Map_Icons/38.jpg diff --git a/Resources/Images/AC_Map_Icons/39.jpg b/ACSE.WinForms/Resources/Images/AC_Map_Icons/39.jpg similarity index 100% rename from Resources/Images/AC_Map_Icons/39.jpg rename to ACSE.WinForms/Resources/Images/AC_Map_Icons/39.jpg diff --git a/Resources/Images/AC_Map_Icons/4.jpg b/ACSE.WinForms/Resources/Images/AC_Map_Icons/4.jpg similarity index 100% rename from Resources/Images/AC_Map_Icons/4.jpg rename to ACSE.WinForms/Resources/Images/AC_Map_Icons/4.jpg diff --git a/Resources/Images/AC_Map_Icons/40.jpg b/ACSE.WinForms/Resources/Images/AC_Map_Icons/40.jpg similarity index 100% rename from Resources/Images/AC_Map_Icons/40.jpg rename to ACSE.WinForms/Resources/Images/AC_Map_Icons/40.jpg diff --git a/Resources/Images/AC_Map_Icons/41.jpg b/ACSE.WinForms/Resources/Images/AC_Map_Icons/41.jpg similarity index 100% rename from Resources/Images/AC_Map_Icons/41.jpg rename to ACSE.WinForms/Resources/Images/AC_Map_Icons/41.jpg diff --git a/Resources/Images/AC_Map_Icons/42.jpg b/ACSE.WinForms/Resources/Images/AC_Map_Icons/42.jpg similarity index 100% rename from Resources/Images/AC_Map_Icons/42.jpg rename to ACSE.WinForms/Resources/Images/AC_Map_Icons/42.jpg diff --git a/Resources/Images/AC_Map_Icons/43.jpg b/ACSE.WinForms/Resources/Images/AC_Map_Icons/43.jpg similarity index 100% rename from Resources/Images/AC_Map_Icons/43.jpg rename to ACSE.WinForms/Resources/Images/AC_Map_Icons/43.jpg diff --git a/Resources/Images/AC_Map_Icons/44.jpg b/ACSE.WinForms/Resources/Images/AC_Map_Icons/44.jpg similarity index 100% rename from Resources/Images/AC_Map_Icons/44.jpg rename to ACSE.WinForms/Resources/Images/AC_Map_Icons/44.jpg diff --git a/Resources/Images/AC_Map_Icons/45.jpg b/ACSE.WinForms/Resources/Images/AC_Map_Icons/45.jpg similarity index 100% rename from Resources/Images/AC_Map_Icons/45.jpg rename to ACSE.WinForms/Resources/Images/AC_Map_Icons/45.jpg diff --git a/Resources/Images/AC_Map_Icons/46.jpg b/ACSE.WinForms/Resources/Images/AC_Map_Icons/46.jpg similarity index 100% rename from Resources/Images/AC_Map_Icons/46.jpg rename to ACSE.WinForms/Resources/Images/AC_Map_Icons/46.jpg diff --git a/Resources/Images/AC_Map_Icons/47.jpg b/ACSE.WinForms/Resources/Images/AC_Map_Icons/47.jpg similarity index 100% rename from Resources/Images/AC_Map_Icons/47.jpg rename to ACSE.WinForms/Resources/Images/AC_Map_Icons/47.jpg diff --git a/Resources/Images/AC_Map_Icons/48.jpg b/ACSE.WinForms/Resources/Images/AC_Map_Icons/48.jpg similarity index 100% rename from Resources/Images/AC_Map_Icons/48.jpg rename to ACSE.WinForms/Resources/Images/AC_Map_Icons/48.jpg diff --git a/Resources/Images/AC_Map_Icons/49.jpg b/ACSE.WinForms/Resources/Images/AC_Map_Icons/49.jpg similarity index 100% rename from Resources/Images/AC_Map_Icons/49.jpg rename to ACSE.WinForms/Resources/Images/AC_Map_Icons/49.jpg diff --git a/Resources/Images/AC_Map_Icons/5.jpg b/ACSE.WinForms/Resources/Images/AC_Map_Icons/5.jpg similarity index 100% rename from Resources/Images/AC_Map_Icons/5.jpg rename to ACSE.WinForms/Resources/Images/AC_Map_Icons/5.jpg diff --git a/Resources/Images/AC_Map_Icons/50.jpg b/ACSE.WinForms/Resources/Images/AC_Map_Icons/50.jpg similarity index 100% rename from Resources/Images/AC_Map_Icons/50.jpg rename to ACSE.WinForms/Resources/Images/AC_Map_Icons/50.jpg diff --git a/Resources/Images/AC_Map_Icons/51.jpg b/ACSE.WinForms/Resources/Images/AC_Map_Icons/51.jpg similarity index 100% rename from Resources/Images/AC_Map_Icons/51.jpg rename to ACSE.WinForms/Resources/Images/AC_Map_Icons/51.jpg diff --git a/Resources/Images/AC_Map_Icons/52.jpg b/ACSE.WinForms/Resources/Images/AC_Map_Icons/52.jpg similarity index 100% rename from Resources/Images/AC_Map_Icons/52.jpg rename to ACSE.WinForms/Resources/Images/AC_Map_Icons/52.jpg diff --git a/Resources/Images/AC_Map_Icons/53.jpg b/ACSE.WinForms/Resources/Images/AC_Map_Icons/53.jpg similarity index 100% rename from Resources/Images/AC_Map_Icons/53.jpg rename to ACSE.WinForms/Resources/Images/AC_Map_Icons/53.jpg diff --git a/Resources/Images/AC_Map_Icons/54.jpg b/ACSE.WinForms/Resources/Images/AC_Map_Icons/54.jpg similarity index 100% rename from Resources/Images/AC_Map_Icons/54.jpg rename to ACSE.WinForms/Resources/Images/AC_Map_Icons/54.jpg diff --git a/Resources/Images/AC_Map_Icons/55.jpg b/ACSE.WinForms/Resources/Images/AC_Map_Icons/55.jpg similarity index 100% rename from Resources/Images/AC_Map_Icons/55.jpg rename to ACSE.WinForms/Resources/Images/AC_Map_Icons/55.jpg diff --git a/Resources/Images/AC_Map_Icons/56.jpg b/ACSE.WinForms/Resources/Images/AC_Map_Icons/56.jpg similarity index 100% rename from Resources/Images/AC_Map_Icons/56.jpg rename to ACSE.WinForms/Resources/Images/AC_Map_Icons/56.jpg diff --git a/Resources/Images/AC_Map_Icons/57.jpg b/ACSE.WinForms/Resources/Images/AC_Map_Icons/57.jpg similarity index 100% rename from Resources/Images/AC_Map_Icons/57.jpg rename to ACSE.WinForms/Resources/Images/AC_Map_Icons/57.jpg diff --git a/Resources/Images/AC_Map_Icons/58.jpg b/ACSE.WinForms/Resources/Images/AC_Map_Icons/58.jpg similarity index 100% rename from Resources/Images/AC_Map_Icons/58.jpg rename to ACSE.WinForms/Resources/Images/AC_Map_Icons/58.jpg diff --git a/Resources/Images/AC_Map_Icons/59.jpg b/ACSE.WinForms/Resources/Images/AC_Map_Icons/59.jpg similarity index 100% rename from Resources/Images/AC_Map_Icons/59.jpg rename to ACSE.WinForms/Resources/Images/AC_Map_Icons/59.jpg diff --git a/Resources/Images/AC_Map_Icons/6.jpg b/ACSE.WinForms/Resources/Images/AC_Map_Icons/6.jpg similarity index 100% rename from Resources/Images/AC_Map_Icons/6.jpg rename to ACSE.WinForms/Resources/Images/AC_Map_Icons/6.jpg diff --git a/Resources/Images/AC_Map_Icons/60.jpg b/ACSE.WinForms/Resources/Images/AC_Map_Icons/60.jpg similarity index 100% rename from Resources/Images/AC_Map_Icons/60.jpg rename to ACSE.WinForms/Resources/Images/AC_Map_Icons/60.jpg diff --git a/Resources/Images/AC_Map_Icons/61.jpg b/ACSE.WinForms/Resources/Images/AC_Map_Icons/61.jpg similarity index 100% rename from Resources/Images/AC_Map_Icons/61.jpg rename to ACSE.WinForms/Resources/Images/AC_Map_Icons/61.jpg diff --git a/Resources/Images/AC_Map_Icons/62.jpg b/ACSE.WinForms/Resources/Images/AC_Map_Icons/62.jpg similarity index 100% rename from Resources/Images/AC_Map_Icons/62.jpg rename to ACSE.WinForms/Resources/Images/AC_Map_Icons/62.jpg diff --git a/Resources/Images/AC_Map_Icons/63.jpg b/ACSE.WinForms/Resources/Images/AC_Map_Icons/63.jpg similarity index 100% rename from Resources/Images/AC_Map_Icons/63.jpg rename to ACSE.WinForms/Resources/Images/AC_Map_Icons/63.jpg diff --git a/Resources/Images/AC_Map_Icons/64.jpg b/ACSE.WinForms/Resources/Images/AC_Map_Icons/64.jpg similarity index 100% rename from Resources/Images/AC_Map_Icons/64.jpg rename to ACSE.WinForms/Resources/Images/AC_Map_Icons/64.jpg diff --git a/Resources/Images/AC_Map_Icons/65.jpg b/ACSE.WinForms/Resources/Images/AC_Map_Icons/65.jpg similarity index 100% rename from Resources/Images/AC_Map_Icons/65.jpg rename to ACSE.WinForms/Resources/Images/AC_Map_Icons/65.jpg diff --git a/Resources/Images/AC_Map_Icons/66.jpg b/ACSE.WinForms/Resources/Images/AC_Map_Icons/66.jpg similarity index 100% rename from Resources/Images/AC_Map_Icons/66.jpg rename to ACSE.WinForms/Resources/Images/AC_Map_Icons/66.jpg diff --git a/Resources/Images/AC_Map_Icons/67.jpg b/ACSE.WinForms/Resources/Images/AC_Map_Icons/67.jpg similarity index 100% rename from Resources/Images/AC_Map_Icons/67.jpg rename to ACSE.WinForms/Resources/Images/AC_Map_Icons/67.jpg diff --git a/Resources/Images/AC_Map_Icons/7.jpg b/ACSE.WinForms/Resources/Images/AC_Map_Icons/7.jpg similarity index 100% rename from Resources/Images/AC_Map_Icons/7.jpg rename to ACSE.WinForms/Resources/Images/AC_Map_Icons/7.jpg diff --git a/Resources/Images/AC_Map_Icons/70.jpg b/ACSE.WinForms/Resources/Images/AC_Map_Icons/70.jpg similarity index 100% rename from Resources/Images/AC_Map_Icons/70.jpg rename to ACSE.WinForms/Resources/Images/AC_Map_Icons/70.jpg diff --git a/Resources/Images/AC_Map_Icons/71.jpg b/ACSE.WinForms/Resources/Images/AC_Map_Icons/71.jpg similarity index 100% rename from Resources/Images/AC_Map_Icons/71.jpg rename to ACSE.WinForms/Resources/Images/AC_Map_Icons/71.jpg diff --git a/Resources/Images/AC_Map_Icons/72.jpg b/ACSE.WinForms/Resources/Images/AC_Map_Icons/72.jpg similarity index 100% rename from Resources/Images/AC_Map_Icons/72.jpg rename to ACSE.WinForms/Resources/Images/AC_Map_Icons/72.jpg diff --git a/Resources/Images/AC_Map_Icons/73.jpg b/ACSE.WinForms/Resources/Images/AC_Map_Icons/73.jpg similarity index 100% rename from Resources/Images/AC_Map_Icons/73.jpg rename to ACSE.WinForms/Resources/Images/AC_Map_Icons/73.jpg diff --git a/Resources/Images/AC_Map_Icons/74.jpg b/ACSE.WinForms/Resources/Images/AC_Map_Icons/74.jpg similarity index 100% rename from Resources/Images/AC_Map_Icons/74.jpg rename to ACSE.WinForms/Resources/Images/AC_Map_Icons/74.jpg diff --git a/Resources/Images/AC_Map_Icons/75.jpg b/ACSE.WinForms/Resources/Images/AC_Map_Icons/75.jpg similarity index 100% rename from Resources/Images/AC_Map_Icons/75.jpg rename to ACSE.WinForms/Resources/Images/AC_Map_Icons/75.jpg diff --git a/Resources/Images/AC_Map_Icons/76.jpg b/ACSE.WinForms/Resources/Images/AC_Map_Icons/76.jpg similarity index 100% rename from Resources/Images/AC_Map_Icons/76.jpg rename to ACSE.WinForms/Resources/Images/AC_Map_Icons/76.jpg diff --git a/Resources/Images/AC_Map_Icons/77.jpg b/ACSE.WinForms/Resources/Images/AC_Map_Icons/77.jpg similarity index 100% rename from Resources/Images/AC_Map_Icons/77.jpg rename to ACSE.WinForms/Resources/Images/AC_Map_Icons/77.jpg diff --git a/Resources/Images/AC_Map_Icons/78.jpg b/ACSE.WinForms/Resources/Images/AC_Map_Icons/78.jpg similarity index 100% rename from Resources/Images/AC_Map_Icons/78.jpg rename to ACSE.WinForms/Resources/Images/AC_Map_Icons/78.jpg diff --git a/Resources/Images/AC_Map_Icons/79.jpg b/ACSE.WinForms/Resources/Images/AC_Map_Icons/79.jpg similarity index 100% rename from Resources/Images/AC_Map_Icons/79.jpg rename to ACSE.WinForms/Resources/Images/AC_Map_Icons/79.jpg diff --git a/Resources/Images/AC_Map_Icons/8.jpg b/ACSE.WinForms/Resources/Images/AC_Map_Icons/8.jpg similarity index 100% rename from Resources/Images/AC_Map_Icons/8.jpg rename to ACSE.WinForms/Resources/Images/AC_Map_Icons/8.jpg diff --git a/Resources/Images/AC_Map_Icons/80.jpg b/ACSE.WinForms/Resources/Images/AC_Map_Icons/80.jpg similarity index 100% rename from Resources/Images/AC_Map_Icons/80.jpg rename to ACSE.WinForms/Resources/Images/AC_Map_Icons/80.jpg diff --git a/Resources/Images/AC_Map_Icons/81.jpg b/ACSE.WinForms/Resources/Images/AC_Map_Icons/81.jpg similarity index 100% rename from Resources/Images/AC_Map_Icons/81.jpg rename to ACSE.WinForms/Resources/Images/AC_Map_Icons/81.jpg diff --git a/Resources/Images/AC_Map_Icons/82.jpg b/ACSE.WinForms/Resources/Images/AC_Map_Icons/82.jpg similarity index 100% rename from Resources/Images/AC_Map_Icons/82.jpg rename to ACSE.WinForms/Resources/Images/AC_Map_Icons/82.jpg diff --git a/Resources/Images/AC_Map_Icons/83.jpg b/ACSE.WinForms/Resources/Images/AC_Map_Icons/83.jpg similarity index 100% rename from Resources/Images/AC_Map_Icons/83.jpg rename to ACSE.WinForms/Resources/Images/AC_Map_Icons/83.jpg diff --git a/Resources/Images/AC_Map_Icons/84.jpg b/ACSE.WinForms/Resources/Images/AC_Map_Icons/84.jpg similarity index 100% rename from Resources/Images/AC_Map_Icons/84.jpg rename to ACSE.WinForms/Resources/Images/AC_Map_Icons/84.jpg diff --git a/Resources/Images/AC_Map_Icons/85.jpg b/ACSE.WinForms/Resources/Images/AC_Map_Icons/85.jpg similarity index 100% rename from Resources/Images/AC_Map_Icons/85.jpg rename to ACSE.WinForms/Resources/Images/AC_Map_Icons/85.jpg diff --git a/Resources/Images/AC_Map_Icons/86.jpg b/ACSE.WinForms/Resources/Images/AC_Map_Icons/86.jpg similarity index 100% rename from Resources/Images/AC_Map_Icons/86.jpg rename to ACSE.WinForms/Resources/Images/AC_Map_Icons/86.jpg diff --git a/Resources/Images/AC_Map_Icons/87.jpg b/ACSE.WinForms/Resources/Images/AC_Map_Icons/87.jpg similarity index 100% rename from Resources/Images/AC_Map_Icons/87.jpg rename to ACSE.WinForms/Resources/Images/AC_Map_Icons/87.jpg diff --git a/Resources/Images/AC_Map_Icons/88.jpg b/ACSE.WinForms/Resources/Images/AC_Map_Icons/88.jpg similarity index 100% rename from Resources/Images/AC_Map_Icons/88.jpg rename to ACSE.WinForms/Resources/Images/AC_Map_Icons/88.jpg diff --git a/Resources/Images/AC_Map_Icons/89.jpg b/ACSE.WinForms/Resources/Images/AC_Map_Icons/89.jpg similarity index 100% rename from Resources/Images/AC_Map_Icons/89.jpg rename to ACSE.WinForms/Resources/Images/AC_Map_Icons/89.jpg diff --git a/Resources/Images/AC_Map_Icons/9.jpg b/ACSE.WinForms/Resources/Images/AC_Map_Icons/9.jpg similarity index 100% rename from Resources/Images/AC_Map_Icons/9.jpg rename to ACSE.WinForms/Resources/Images/AC_Map_Icons/9.jpg diff --git a/Resources/Images/AC_Map_Icons/90.jpg b/ACSE.WinForms/Resources/Images/AC_Map_Icons/90.jpg similarity index 100% rename from Resources/Images/AC_Map_Icons/90.jpg rename to ACSE.WinForms/Resources/Images/AC_Map_Icons/90.jpg diff --git a/Resources/Images/AC_Map_Icons/91.jpg b/ACSE.WinForms/Resources/Images/AC_Map_Icons/91.jpg similarity index 100% rename from Resources/Images/AC_Map_Icons/91.jpg rename to ACSE.WinForms/Resources/Images/AC_Map_Icons/91.jpg diff --git a/Resources/Images/AC_Map_Icons/92.jpg b/ACSE.WinForms/Resources/Images/AC_Map_Icons/92.jpg similarity index 100% rename from Resources/Images/AC_Map_Icons/92.jpg rename to ACSE.WinForms/Resources/Images/AC_Map_Icons/92.jpg diff --git a/Resources/Images/AC_Map_Icons/93.jpg b/ACSE.WinForms/Resources/Images/AC_Map_Icons/93.jpg similarity index 100% rename from Resources/Images/AC_Map_Icons/93.jpg rename to ACSE.WinForms/Resources/Images/AC_Map_Icons/93.jpg diff --git a/Resources/Images/AC_Map_Icons/94.jpg b/ACSE.WinForms/Resources/Images/AC_Map_Icons/94.jpg similarity index 100% rename from Resources/Images/AC_Map_Icons/94.jpg rename to ACSE.WinForms/Resources/Images/AC_Map_Icons/94.jpg diff --git a/Resources/Images/AC_Map_Icons/95.jpg b/ACSE.WinForms/Resources/Images/AC_Map_Icons/95.jpg similarity index 100% rename from Resources/Images/AC_Map_Icons/95.jpg rename to ACSE.WinForms/Resources/Images/AC_Map_Icons/95.jpg diff --git a/Resources/Images/AC_Map_Icons/96.jpg b/ACSE.WinForms/Resources/Images/AC_Map_Icons/96.jpg similarity index 100% rename from Resources/Images/AC_Map_Icons/96.jpg rename to ACSE.WinForms/Resources/Images/AC_Map_Icons/96.jpg diff --git a/Resources/Images/AC_Map_Icons/99.jpg b/ACSE.WinForms/Resources/Images/AC_Map_Icons/99.jpg similarity index 100% rename from Resources/Images/AC_Map_Icons/99.jpg rename to ACSE.WinForms/Resources/Images/AC_Map_Icons/99.jpg diff --git a/Resources/Images/AC_Map_Icons/FFFF.png b/ACSE.WinForms/Resources/Images/AC_Map_Icons/FFFF.png similarity index 100% rename from Resources/Images/AC_Map_Icons/FFFF.png rename to ACSE.WinForms/Resources/Images/AC_Map_Icons/FFFF.png diff --git a/Resources/Images/Acre_Images/0000.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/0000.jpg similarity index 100% rename from Resources/Images/Acre_Images/0000.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/0000.jpg diff --git a/Resources/Images/Acre_Images/0020.png b/ACSE.WinForms/Resources/Images/Acre_Images/0020.png similarity index 100% rename from Resources/Images/Acre_Images/0020.png rename to ACSE.WinForms/Resources/Images/Acre_Images/0020.png diff --git a/Resources/Images/Acre_Images/0060.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/0060.jpg similarity index 100% rename from Resources/Images/Acre_Images/0060.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/0060.jpg diff --git a/Resources/Images/Acre_Images/006C.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/006C.jpg similarity index 100% rename from Resources/Images/Acre_Images/006C.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/006C.jpg diff --git a/Resources/Images/Acre_Images/0070.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/0070.jpg similarity index 100% rename from Resources/Images/Acre_Images/0070.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/0070.jpg diff --git a/Resources/Images/Acre_Images/0074.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/0074.jpg similarity index 100% rename from Resources/Images/Acre_Images/0074.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/0074.jpg diff --git a/Resources/Images/Acre_Images/0078.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/0078.jpg similarity index 100% rename from Resources/Images/Acre_Images/0078.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/0078.jpg diff --git a/Resources/Images/Acre_Images/007C.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/007C.jpg similarity index 100% rename from Resources/Images/Acre_Images/007C.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/007C.jpg diff --git a/Resources/Images/Acre_Images/0080.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/0080.jpg similarity index 100% rename from Resources/Images/Acre_Images/0080.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/0080.jpg diff --git a/Resources/Images/Acre_Images/0084.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/0084.jpg similarity index 100% rename from Resources/Images/Acre_Images/0084.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/0084.jpg diff --git a/Resources/Images/Acre_Images/0088.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/0088.jpg similarity index 100% rename from Resources/Images/Acre_Images/0088.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/0088.jpg diff --git a/Resources/Images/Acre_Images/008C.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/008C.jpg similarity index 100% rename from Resources/Images/Acre_Images/008C.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/008C.jpg diff --git a/Resources/Images/Acre_Images/0090.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/0090.jpg similarity index 100% rename from Resources/Images/Acre_Images/0090.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/0090.jpg diff --git a/Resources/Images/Acre_Images/0094.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/0094.jpg similarity index 100% rename from Resources/Images/Acre_Images/0094.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/0094.jpg diff --git a/Resources/Images/Acre_Images/0098.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/0098.jpg similarity index 100% rename from Resources/Images/Acre_Images/0098.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/0098.jpg diff --git a/Resources/Images/Acre_Images/009C.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/009C.jpg similarity index 100% rename from Resources/Images/Acre_Images/009C.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/009C.jpg diff --git a/Resources/Images/Acre_Images/00A0.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/00A0.jpg similarity index 100% rename from Resources/Images/Acre_Images/00A0.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/00A0.jpg diff --git a/Resources/Images/Acre_Images/00A4.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/00A4.jpg similarity index 100% rename from Resources/Images/Acre_Images/00A4.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/00A4.jpg diff --git a/Resources/Images/Acre_Images/00A8.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/00A8.jpg similarity index 100% rename from Resources/Images/Acre_Images/00A8.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/00A8.jpg diff --git a/Resources/Images/Acre_Images/00AC.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/00AC.jpg similarity index 100% rename from Resources/Images/Acre_Images/00AC.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/00AC.jpg diff --git a/Resources/Images/Acre_Images/00B0.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/00B0.jpg similarity index 100% rename from Resources/Images/Acre_Images/00B0.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/00B0.jpg diff --git a/Resources/Images/Acre_Images/00B4.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/00B4.jpg similarity index 100% rename from Resources/Images/Acre_Images/00B4.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/00B4.jpg diff --git a/Resources/Images/Acre_Images/00B8.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/00B8.jpg similarity index 100% rename from Resources/Images/Acre_Images/00B8.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/00B8.jpg diff --git a/Resources/Images/Acre_Images/00BC.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/00BC.jpg similarity index 100% rename from Resources/Images/Acre_Images/00BC.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/00BC.jpg diff --git a/Resources/Images/Acre_Images/00C0.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/00C0.jpg similarity index 100% rename from Resources/Images/Acre_Images/00C0.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/00C0.jpg diff --git a/Resources/Images/Acre_Images/00C4.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/00C4.jpg similarity index 100% rename from Resources/Images/Acre_Images/00C4.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/00C4.jpg diff --git a/Resources/Images/Acre_Images/00C8.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/00C8.jpg similarity index 100% rename from Resources/Images/Acre_Images/00C8.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/00C8.jpg diff --git a/Resources/Images/Acre_Images/00CC.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/00CC.jpg similarity index 100% rename from Resources/Images/Acre_Images/00CC.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/00CC.jpg diff --git a/Resources/Images/Acre_Images/00D0.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/00D0.jpg similarity index 100% rename from Resources/Images/Acre_Images/00D0.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/00D0.jpg diff --git a/Resources/Images/Acre_Images/00D4.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/00D4.jpg similarity index 100% rename from Resources/Images/Acre_Images/00D4.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/00D4.jpg diff --git a/Resources/Images/Acre_Images/00D8.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/00D8.jpg similarity index 100% rename from Resources/Images/Acre_Images/00D8.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/00D8.jpg diff --git a/Resources/Images/Acre_Images/00DC.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/00DC.jpg similarity index 100% rename from Resources/Images/Acre_Images/00DC.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/00DC.jpg diff --git a/Resources/Images/Acre_Images/00E0.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/00E0.jpg similarity index 100% rename from Resources/Images/Acre_Images/00E0.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/00E0.jpg diff --git a/Resources/Images/Acre_Images/00E4.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/00E4.jpg similarity index 100% rename from Resources/Images/Acre_Images/00E4.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/00E4.jpg diff --git a/Resources/Images/Acre_Images/00E8.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/00E8.jpg similarity index 100% rename from Resources/Images/Acre_Images/00E8.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/00E8.jpg diff --git a/Resources/Images/Acre_Images/00EC.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/00EC.jpg similarity index 100% rename from Resources/Images/Acre_Images/00EC.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/00EC.jpg diff --git a/Resources/Images/Acre_Images/00F0.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/00F0.jpg similarity index 100% rename from Resources/Images/Acre_Images/00F0.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/00F0.jpg diff --git a/Resources/Images/Acre_Images/00F4.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/00F4.jpg similarity index 100% rename from Resources/Images/Acre_Images/00F4.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/00F4.jpg diff --git a/Resources/Images/Acre_Images/00F8.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/00F8.jpg similarity index 100% rename from Resources/Images/Acre_Images/00F8.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/00F8.jpg diff --git a/Resources/Images/Acre_Images/00FC.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/00FC.jpg similarity index 100% rename from Resources/Images/Acre_Images/00FC.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/00FC.jpg diff --git a/Resources/Images/Acre_Images/0100.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/0100.jpg similarity index 100% rename from Resources/Images/Acre_Images/0100.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/0100.jpg diff --git a/Resources/Images/Acre_Images/0104.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/0104.jpg similarity index 100% rename from Resources/Images/Acre_Images/0104.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/0104.jpg diff --git a/Resources/Images/Acre_Images/0108.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/0108.jpg similarity index 100% rename from Resources/Images/Acre_Images/0108.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/0108.jpg diff --git a/Resources/Images/Acre_Images/010C.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/010C.jpg similarity index 100% rename from Resources/Images/Acre_Images/010C.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/010C.jpg diff --git a/Resources/Images/Acre_Images/0110.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/0110.jpg similarity index 100% rename from Resources/Images/Acre_Images/0110.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/0110.jpg diff --git a/Resources/Images/Acre_Images/0114.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/0114.jpg similarity index 100% rename from Resources/Images/Acre_Images/0114.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/0114.jpg diff --git a/Resources/Images/Acre_Images/0118.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/0118.jpg similarity index 100% rename from Resources/Images/Acre_Images/0118.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/0118.jpg diff --git a/Resources/Images/Acre_Images/011C.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/011C.jpg similarity index 100% rename from Resources/Images/Acre_Images/011C.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/011C.jpg diff --git a/Resources/Images/Acre_Images/0120.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/0120.jpg similarity index 100% rename from Resources/Images/Acre_Images/0120.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/0120.jpg diff --git a/Resources/Images/Acre_Images/0124.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/0124.jpg similarity index 100% rename from Resources/Images/Acre_Images/0124.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/0124.jpg diff --git a/Resources/Images/Acre_Images/0128.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/0128.jpg similarity index 100% rename from Resources/Images/Acre_Images/0128.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/0128.jpg diff --git a/Resources/Images/Acre_Images/012C.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/012C.jpg similarity index 100% rename from Resources/Images/Acre_Images/012C.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/012C.jpg diff --git a/Resources/Images/Acre_Images/0130.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/0130.jpg similarity index 100% rename from Resources/Images/Acre_Images/0130.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/0130.jpg diff --git a/Resources/Images/Acre_Images/0134.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/0134.jpg similarity index 100% rename from Resources/Images/Acre_Images/0134.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/0134.jpg diff --git a/Resources/Images/Acre_Images/0138.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/0138.jpg similarity index 100% rename from Resources/Images/Acre_Images/0138.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/0138.jpg diff --git a/Resources/Images/Acre_Images/013C.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/013C.jpg similarity index 100% rename from Resources/Images/Acre_Images/013C.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/013C.jpg diff --git a/Resources/Images/Acre_Images/0140.png b/ACSE.WinForms/Resources/Images/Acre_Images/0140.png similarity index 100% rename from Resources/Images/Acre_Images/0140.png rename to ACSE.WinForms/Resources/Images/Acre_Images/0140.png diff --git a/Resources/Images/Acre_Images/0144.png b/ACSE.WinForms/Resources/Images/Acre_Images/0144.png similarity index 100% rename from Resources/Images/Acre_Images/0144.png rename to ACSE.WinForms/Resources/Images/Acre_Images/0144.png diff --git a/Resources/Images/Acre_Images/0148.png b/ACSE.WinForms/Resources/Images/Acre_Images/0148.png similarity index 100% rename from Resources/Images/Acre_Images/0148.png rename to ACSE.WinForms/Resources/Images/Acre_Images/0148.png diff --git a/Resources/Images/Acre_Images/014C.png b/ACSE.WinForms/Resources/Images/Acre_Images/014C.png similarity index 100% rename from Resources/Images/Acre_Images/014C.png rename to ACSE.WinForms/Resources/Images/Acre_Images/014C.png diff --git a/Resources/Images/Acre_Images/0154.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/0154.jpg similarity index 100% rename from Resources/Images/Acre_Images/0154.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/0154.jpg diff --git a/Resources/Images/Acre_Images/015C.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/015C.jpg similarity index 100% rename from Resources/Images/Acre_Images/015C.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/015C.jpg diff --git a/Resources/Images/Acre_Images/0160.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/0160.jpg similarity index 100% rename from Resources/Images/Acre_Images/0160.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/0160.jpg diff --git a/Resources/Images/Acre_Images/0164.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/0164.jpg similarity index 100% rename from Resources/Images/Acre_Images/0164.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/0164.jpg diff --git a/Resources/Images/Acre_Images/0168.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/0168.jpg similarity index 100% rename from Resources/Images/Acre_Images/0168.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/0168.jpg diff --git a/Resources/Images/Acre_Images/016C.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/016C.jpg similarity index 100% rename from Resources/Images/Acre_Images/016C.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/016C.jpg diff --git a/Resources/Images/Acre_Images/0170.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/0170.jpg similarity index 100% rename from Resources/Images/Acre_Images/0170.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/0170.jpg diff --git a/Resources/Images/Acre_Images/0174.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/0174.jpg similarity index 100% rename from Resources/Images/Acre_Images/0174.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/0174.jpg diff --git a/Resources/Images/Acre_Images/0178.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/0178.jpg similarity index 100% rename from Resources/Images/Acre_Images/0178.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/0178.jpg diff --git a/Resources/Images/Acre_Images/017C.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/017C.jpg similarity index 100% rename from Resources/Images/Acre_Images/017C.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/017C.jpg diff --git a/Resources/Images/Acre_Images/0180.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/0180.jpg similarity index 100% rename from Resources/Images/Acre_Images/0180.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/0180.jpg diff --git a/Resources/Images/Acre_Images/0184.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/0184.jpg similarity index 100% rename from Resources/Images/Acre_Images/0184.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/0184.jpg diff --git a/Resources/Images/Acre_Images/0188.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/0188.jpg similarity index 100% rename from Resources/Images/Acre_Images/0188.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/0188.jpg diff --git a/Resources/Images/Acre_Images/018C.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/018C.jpg similarity index 100% rename from Resources/Images/Acre_Images/018C.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/018C.jpg diff --git a/Resources/Images/Acre_Images/0190.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/0190.jpg similarity index 100% rename from Resources/Images/Acre_Images/0190.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/0190.jpg diff --git a/Resources/Images/Acre_Images/0194.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/0194.jpg similarity index 100% rename from Resources/Images/Acre_Images/0194.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/0194.jpg diff --git a/Resources/Images/Acre_Images/0198.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/0198.jpg similarity index 100% rename from Resources/Images/Acre_Images/0198.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/0198.jpg diff --git a/Resources/Images/Acre_Images/019C.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/019C.jpg similarity index 100% rename from Resources/Images/Acre_Images/019C.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/019C.jpg diff --git a/Resources/Images/Acre_Images/01A0.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/01A0.jpg similarity index 100% rename from Resources/Images/Acre_Images/01A0.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/01A0.jpg diff --git a/Resources/Images/Acre_Images/01A4.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/01A4.jpg similarity index 100% rename from Resources/Images/Acre_Images/01A4.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/01A4.jpg diff --git a/Resources/Images/Acre_Images/01A8.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/01A8.jpg similarity index 100% rename from Resources/Images/Acre_Images/01A8.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/01A8.jpg diff --git a/Resources/Images/Acre_Images/01AC.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/01AC.jpg similarity index 100% rename from Resources/Images/Acre_Images/01AC.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/01AC.jpg diff --git a/Resources/Images/Acre_Images/01B0.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/01B0.jpg similarity index 100% rename from Resources/Images/Acre_Images/01B0.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/01B0.jpg diff --git a/Resources/Images/Acre_Images/01B4.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/01B4.jpg similarity index 100% rename from Resources/Images/Acre_Images/01B4.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/01B4.jpg diff --git a/Resources/Images/Acre_Images/01B8.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/01B8.jpg similarity index 100% rename from Resources/Images/Acre_Images/01B8.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/01B8.jpg diff --git a/Resources/Images/Acre_Images/01BC.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/01BC.jpg similarity index 100% rename from Resources/Images/Acre_Images/01BC.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/01BC.jpg diff --git a/Resources/Images/Acre_Images/01C0.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/01C0.jpg similarity index 100% rename from Resources/Images/Acre_Images/01C0.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/01C0.jpg diff --git a/Resources/Images/Acre_Images/01C4.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/01C4.jpg similarity index 100% rename from Resources/Images/Acre_Images/01C4.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/01C4.jpg diff --git a/Resources/Images/Acre_Images/01C8.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/01C8.jpg similarity index 100% rename from Resources/Images/Acre_Images/01C8.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/01C8.jpg diff --git a/Resources/Images/Acre_Images/01CC.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/01CC.jpg similarity index 100% rename from Resources/Images/Acre_Images/01CC.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/01CC.jpg diff --git a/Resources/Images/Acre_Images/01D0.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/01D0.jpg similarity index 100% rename from Resources/Images/Acre_Images/01D0.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/01D0.jpg diff --git a/Resources/Images/Acre_Images/01D4.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/01D4.jpg similarity index 100% rename from Resources/Images/Acre_Images/01D4.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/01D4.jpg diff --git a/Resources/Images/Acre_Images/01D8.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/01D8.jpg similarity index 100% rename from Resources/Images/Acre_Images/01D8.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/01D8.jpg diff --git a/Resources/Images/Acre_Images/01DC.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/01DC.jpg similarity index 100% rename from Resources/Images/Acre_Images/01DC.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/01DC.jpg diff --git a/Resources/Images/Acre_Images/01E0.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/01E0.jpg similarity index 100% rename from Resources/Images/Acre_Images/01E0.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/01E0.jpg diff --git a/Resources/Images/Acre_Images/01E4.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/01E4.jpg similarity index 100% rename from Resources/Images/Acre_Images/01E4.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/01E4.jpg diff --git a/Resources/Images/Acre_Images/01E8.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/01E8.jpg similarity index 100% rename from Resources/Images/Acre_Images/01E8.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/01E8.jpg diff --git a/Resources/Images/Acre_Images/01EC.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/01EC.jpg similarity index 100% rename from Resources/Images/Acre_Images/01EC.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/01EC.jpg diff --git a/Resources/Images/Acre_Images/01F0.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/01F0.jpg similarity index 100% rename from Resources/Images/Acre_Images/01F0.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/01F0.jpg diff --git a/Resources/Images/Acre_Images/01F4.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/01F4.jpg similarity index 100% rename from Resources/Images/Acre_Images/01F4.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/01F4.jpg diff --git a/Resources/Images/Acre_Images/01F8.png b/ACSE.WinForms/Resources/Images/Acre_Images/01F8.png similarity index 100% rename from Resources/Images/Acre_Images/01F8.png rename to ACSE.WinForms/Resources/Images/Acre_Images/01F8.png diff --git a/Resources/Images/Acre_Images/01FC.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/01FC.jpg similarity index 100% rename from Resources/Images/Acre_Images/01FC.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/01FC.jpg diff --git a/Resources/Images/Acre_Images/0200.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/0200.jpg similarity index 100% rename from Resources/Images/Acre_Images/0200.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/0200.jpg diff --git a/Resources/Images/Acre_Images/0204.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/0204.jpg similarity index 100% rename from Resources/Images/Acre_Images/0204.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/0204.jpg diff --git a/Resources/Images/Acre_Images/0208.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/0208.jpg similarity index 100% rename from Resources/Images/Acre_Images/0208.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/0208.jpg diff --git a/Resources/Images/Acre_Images/020C.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/020C.jpg similarity index 100% rename from Resources/Images/Acre_Images/020C.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/020C.jpg diff --git a/Resources/Images/Acre_Images/0210.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/0210.jpg similarity index 100% rename from Resources/Images/Acre_Images/0210.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/0210.jpg diff --git a/Resources/Images/Acre_Images/0214.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/0214.jpg similarity index 100% rename from Resources/Images/Acre_Images/0214.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/0214.jpg diff --git a/Resources/Images/Acre_Images/0218.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/0218.jpg similarity index 100% rename from Resources/Images/Acre_Images/0218.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/0218.jpg diff --git a/Resources/Images/Acre_Images/021C.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/021C.jpg similarity index 100% rename from Resources/Images/Acre_Images/021C.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/021C.jpg diff --git a/Resources/Images/Acre_Images/0220.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/0220.jpg similarity index 100% rename from Resources/Images/Acre_Images/0220.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/0220.jpg diff --git a/Resources/Images/Acre_Images/0224.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/0224.jpg similarity index 100% rename from Resources/Images/Acre_Images/0224.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/0224.jpg diff --git a/Resources/Images/Acre_Images/0228.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/0228.jpg similarity index 100% rename from Resources/Images/Acre_Images/0228.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/0228.jpg diff --git a/Resources/Images/Acre_Images/022C.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/022C.jpg similarity index 100% rename from Resources/Images/Acre_Images/022C.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/022C.jpg diff --git a/Resources/Images/Acre_Images/0230.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/0230.jpg similarity index 100% rename from Resources/Images/Acre_Images/0230.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/0230.jpg diff --git a/Resources/Images/Acre_Images/0234.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/0234.jpg similarity index 100% rename from Resources/Images/Acre_Images/0234.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/0234.jpg diff --git a/Resources/Images/Acre_Images/0244.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/0244.jpg similarity index 100% rename from Resources/Images/Acre_Images/0244.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/0244.jpg diff --git a/Resources/Images/Acre_Images/0248.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/0248.jpg similarity index 100% rename from Resources/Images/Acre_Images/0248.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/0248.jpg diff --git a/Resources/Images/Acre_Images/024C.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/024C.jpg similarity index 100% rename from Resources/Images/Acre_Images/024C.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/024C.jpg diff --git a/Resources/Images/Acre_Images/0250.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/0250.jpg similarity index 100% rename from Resources/Images/Acre_Images/0250.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/0250.jpg diff --git a/Resources/Images/Acre_Images/0254.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/0254.jpg similarity index 100% rename from Resources/Images/Acre_Images/0254.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/0254.jpg diff --git a/Resources/Images/Acre_Images/0258.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/0258.jpg similarity index 100% rename from Resources/Images/Acre_Images/0258.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/0258.jpg diff --git a/Resources/Images/Acre_Images/025C.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/025C.jpg similarity index 100% rename from Resources/Images/Acre_Images/025C.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/025C.jpg diff --git a/Resources/Images/Acre_Images/0260.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/0260.jpg similarity index 100% rename from Resources/Images/Acre_Images/0260.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/0260.jpg diff --git a/Resources/Images/Acre_Images/0264.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/0264.jpg similarity index 100% rename from Resources/Images/Acre_Images/0264.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/0264.jpg diff --git a/Resources/Images/Acre_Images/0268.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/0268.jpg similarity index 100% rename from Resources/Images/Acre_Images/0268.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/0268.jpg diff --git a/Resources/Images/Acre_Images/026C.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/026C.jpg similarity index 100% rename from Resources/Images/Acre_Images/026C.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/026C.jpg diff --git a/Resources/Images/Acre_Images/0270.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/0270.jpg similarity index 100% rename from Resources/Images/Acre_Images/0270.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/0270.jpg diff --git a/Resources/Images/Acre_Images/0274.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/0274.jpg similarity index 100% rename from Resources/Images/Acre_Images/0274.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/0274.jpg diff --git a/Resources/Images/Acre_Images/0278.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/0278.jpg similarity index 100% rename from Resources/Images/Acre_Images/0278.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/0278.jpg diff --git a/Resources/Images/Acre_Images/027C.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/027C.jpg similarity index 100% rename from Resources/Images/Acre_Images/027C.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/027C.jpg diff --git a/Resources/Images/Acre_Images/0280.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/0280.jpg similarity index 100% rename from Resources/Images/Acre_Images/0280.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/0280.jpg diff --git a/Resources/Images/Acre_Images/0284.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/0284.jpg similarity index 100% rename from Resources/Images/Acre_Images/0284.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/0284.jpg diff --git a/Resources/Images/Acre_Images/0288.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/0288.jpg similarity index 100% rename from Resources/Images/Acre_Images/0288.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/0288.jpg diff --git a/Resources/Images/Acre_Images/028C.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/028C.jpg similarity index 100% rename from Resources/Images/Acre_Images/028C.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/028C.jpg diff --git a/Resources/Images/Acre_Images/0290.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/0290.jpg similarity index 100% rename from Resources/Images/Acre_Images/0290.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/0290.jpg diff --git a/Resources/Images/Acre_Images/0294.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/0294.jpg similarity index 100% rename from Resources/Images/Acre_Images/0294.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/0294.jpg diff --git a/Resources/Images/Acre_Images/0298.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/0298.jpg similarity index 100% rename from Resources/Images/Acre_Images/0298.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/0298.jpg diff --git a/Resources/Images/Acre_Images/029C.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/029C.jpg similarity index 100% rename from Resources/Images/Acre_Images/029C.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/029C.jpg diff --git a/Resources/Images/Acre_Images/02A0.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/02A0.jpg similarity index 100% rename from Resources/Images/Acre_Images/02A0.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/02A0.jpg diff --git a/Resources/Images/Acre_Images/02A4.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/02A4.jpg similarity index 100% rename from Resources/Images/Acre_Images/02A4.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/02A4.jpg diff --git a/Resources/Images/Acre_Images/02A8.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/02A8.jpg similarity index 100% rename from Resources/Images/Acre_Images/02A8.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/02A8.jpg diff --git a/Resources/Images/Acre_Images/02AC.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/02AC.jpg similarity index 100% rename from Resources/Images/Acre_Images/02AC.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/02AC.jpg diff --git a/Resources/Images/Acre_Images/02B0.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/02B0.jpg similarity index 100% rename from Resources/Images/Acre_Images/02B0.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/02B0.jpg diff --git a/Resources/Images/Acre_Images/02B4.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/02B4.jpg similarity index 100% rename from Resources/Images/Acre_Images/02B4.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/02B4.jpg diff --git a/Resources/Images/Acre_Images/02B8.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/02B8.jpg similarity index 100% rename from Resources/Images/Acre_Images/02B8.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/02B8.jpg diff --git a/Resources/Images/Acre_Images/02BC.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/02BC.jpg similarity index 100% rename from Resources/Images/Acre_Images/02BC.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/02BC.jpg diff --git a/Resources/Images/Acre_Images/02C0.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/02C0.jpg similarity index 100% rename from Resources/Images/Acre_Images/02C0.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/02C0.jpg diff --git a/Resources/Images/Acre_Images/02C4.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/02C4.jpg similarity index 100% rename from Resources/Images/Acre_Images/02C4.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/02C4.jpg diff --git a/Resources/Images/Acre_Images/02C8.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/02C8.jpg similarity index 100% rename from Resources/Images/Acre_Images/02C8.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/02C8.jpg diff --git a/Resources/Images/Acre_Images/02CC.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/02CC.jpg similarity index 100% rename from Resources/Images/Acre_Images/02CC.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/02CC.jpg diff --git a/Resources/Images/Acre_Images/02E8.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/02E8.jpg similarity index 100% rename from Resources/Images/Acre_Images/02E8.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/02E8.jpg diff --git a/Resources/Images/Acre_Images/02EC.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/02EC.jpg similarity index 100% rename from Resources/Images/Acre_Images/02EC.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/02EC.jpg diff --git a/Resources/Images/Acre_Images/02F0.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/02F0.jpg similarity index 100% rename from Resources/Images/Acre_Images/02F0.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/02F0.jpg diff --git a/Resources/Images/Acre_Images/02F4.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/02F4.jpg similarity index 100% rename from Resources/Images/Acre_Images/02F4.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/02F4.jpg diff --git a/Resources/Images/Acre_Images/02F8.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/02F8.jpg similarity index 100% rename from Resources/Images/Acre_Images/02F8.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/02F8.jpg diff --git a/Resources/Images/Acre_Images/02FC.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/02FC.jpg similarity index 100% rename from Resources/Images/Acre_Images/02FC.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/02FC.jpg diff --git a/Resources/Images/Acre_Images/0300.png b/ACSE.WinForms/Resources/Images/Acre_Images/0300.png similarity index 100% rename from Resources/Images/Acre_Images/0300.png rename to ACSE.WinForms/Resources/Images/Acre_Images/0300.png diff --git a/Resources/Images/Acre_Images/0304.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/0304.jpg similarity index 100% rename from Resources/Images/Acre_Images/0304.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/0304.jpg diff --git a/Resources/Images/Acre_Images/0320.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/0320.jpg similarity index 100% rename from Resources/Images/Acre_Images/0320.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/0320.jpg diff --git a/Resources/Images/Acre_Images/0324.png b/ACSE.WinForms/Resources/Images/Acre_Images/0324.png similarity index 100% rename from Resources/Images/Acre_Images/0324.png rename to ACSE.WinForms/Resources/Images/Acre_Images/0324.png diff --git a/Resources/Images/Acre_Images/0328.png b/ACSE.WinForms/Resources/Images/Acre_Images/0328.png similarity index 100% rename from Resources/Images/Acre_Images/0328.png rename to ACSE.WinForms/Resources/Images/Acre_Images/0328.png diff --git a/Resources/Images/Acre_Images/032C.png b/ACSE.WinForms/Resources/Images/Acre_Images/032C.png similarity index 100% rename from Resources/Images/Acre_Images/032C.png rename to ACSE.WinForms/Resources/Images/Acre_Images/032C.png diff --git a/Resources/Images/Acre_Images/0330.png b/ACSE.WinForms/Resources/Images/Acre_Images/0330.png similarity index 100% rename from Resources/Images/Acre_Images/0330.png rename to ACSE.WinForms/Resources/Images/Acre_Images/0330.png diff --git a/Resources/Images/Acre_Images/0334.png b/ACSE.WinForms/Resources/Images/Acre_Images/0334.png similarity index 100% rename from Resources/Images/Acre_Images/0334.png rename to ACSE.WinForms/Resources/Images/Acre_Images/0334.png diff --git a/Resources/Images/Acre_Images/0338.png b/ACSE.WinForms/Resources/Images/Acre_Images/0338.png similarity index 100% rename from Resources/Images/Acre_Images/0338.png rename to ACSE.WinForms/Resources/Images/Acre_Images/0338.png diff --git a/Resources/Images/Acre_Images/033C.png b/ACSE.WinForms/Resources/Images/Acre_Images/033C.png similarity index 100% rename from Resources/Images/Acre_Images/033C.png rename to ACSE.WinForms/Resources/Images/Acre_Images/033C.png diff --git a/Resources/Images/Acre_Images/0340.png b/ACSE.WinForms/Resources/Images/Acre_Images/0340.png similarity index 100% rename from Resources/Images/Acre_Images/0340.png rename to ACSE.WinForms/Resources/Images/Acre_Images/0340.png diff --git a/Resources/Images/Acre_Images/0344.png b/ACSE.WinForms/Resources/Images/Acre_Images/0344.png similarity index 100% rename from Resources/Images/Acre_Images/0344.png rename to ACSE.WinForms/Resources/Images/Acre_Images/0344.png diff --git a/Resources/Images/Acre_Images/0348.png b/ACSE.WinForms/Resources/Images/Acre_Images/0348.png similarity index 100% rename from Resources/Images/Acre_Images/0348.png rename to ACSE.WinForms/Resources/Images/Acre_Images/0348.png diff --git a/Resources/Images/Acre_Images/034C.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/034C.jpg similarity index 100% rename from Resources/Images/Acre_Images/034C.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/034C.jpg diff --git a/Resources/Images/Acre_Images/0350.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/0350.jpg similarity index 100% rename from Resources/Images/Acre_Images/0350.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/0350.jpg diff --git a/Resources/Images/Acre_Images/0354.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/0354.jpg similarity index 100% rename from Resources/Images/Acre_Images/0354.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/0354.jpg diff --git a/Resources/Images/Acre_Images/0358.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/0358.jpg similarity index 100% rename from Resources/Images/Acre_Images/0358.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/0358.jpg diff --git a/Resources/Images/Acre_Images/035C.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/035C.jpg similarity index 100% rename from Resources/Images/Acre_Images/035C.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/035C.jpg diff --git a/Resources/Images/Acre_Images/0360.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/0360.jpg similarity index 100% rename from Resources/Images/Acre_Images/0360.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/0360.jpg diff --git a/Resources/Images/Acre_Images/0364.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/0364.jpg similarity index 100% rename from Resources/Images/Acre_Images/0364.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/0364.jpg diff --git a/Resources/Images/Acre_Images/0368.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/0368.jpg similarity index 100% rename from Resources/Images/Acre_Images/0368.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/0368.jpg diff --git a/Resources/Images/Acre_Images/036C.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/036C.jpg similarity index 100% rename from Resources/Images/Acre_Images/036C.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/036C.jpg diff --git a/Resources/Images/Acre_Images/0370.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/0370.jpg similarity index 100% rename from Resources/Images/Acre_Images/0370.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/0370.jpg diff --git a/Resources/Images/Acre_Images/0374.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/0374.jpg similarity index 100% rename from Resources/Images/Acre_Images/0374.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/0374.jpg diff --git a/Resources/Images/Acre_Images/0378.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/0378.jpg similarity index 100% rename from Resources/Images/Acre_Images/0378.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/0378.jpg diff --git a/Resources/Images/Acre_Images/037C.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/037C.jpg similarity index 100% rename from Resources/Images/Acre_Images/037C.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/037C.jpg diff --git a/Resources/Images/Acre_Images/0380.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/0380.jpg similarity index 100% rename from Resources/Images/Acre_Images/0380.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/0380.jpg diff --git a/Resources/Images/Acre_Images/0384.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/0384.jpg similarity index 100% rename from Resources/Images/Acre_Images/0384.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/0384.jpg diff --git a/Resources/Images/Acre_Images/0390.png b/ACSE.WinForms/Resources/Images/Acre_Images/0390.png similarity index 100% rename from Resources/Images/Acre_Images/0390.png rename to ACSE.WinForms/Resources/Images/Acre_Images/0390.png diff --git a/Resources/Images/Acre_Images/039C.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/039C.jpg similarity index 100% rename from Resources/Images/Acre_Images/039C.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/039C.jpg diff --git a/Resources/Images/Acre_Images/03A0.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/03A0.jpg similarity index 100% rename from Resources/Images/Acre_Images/03A0.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/03A0.jpg diff --git a/Resources/Images/Acre_Images/03A4.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/03A4.jpg similarity index 100% rename from Resources/Images/Acre_Images/03A4.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/03A4.jpg diff --git a/Resources/Images/Acre_Images/03B0.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/03B0.jpg similarity index 100% rename from Resources/Images/Acre_Images/03B0.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/03B0.jpg diff --git a/Resources/Images/Acre_Images/03B4.png b/ACSE.WinForms/Resources/Images/Acre_Images/03B4.png similarity index 100% rename from Resources/Images/Acre_Images/03B4.png rename to ACSE.WinForms/Resources/Images/Acre_Images/03B4.png diff --git a/Resources/Images/Acre_Images/03B8.png b/ACSE.WinForms/Resources/Images/Acre_Images/03B8.png similarity index 100% rename from Resources/Images/Acre_Images/03B8.png rename to ACSE.WinForms/Resources/Images/Acre_Images/03B8.png diff --git a/Resources/Images/Acre_Images/03C0.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/03C0.jpg similarity index 100% rename from Resources/Images/Acre_Images/03C0.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/03C0.jpg diff --git a/Resources/Images/Acre_Images/03C4.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/03C4.jpg similarity index 100% rename from Resources/Images/Acre_Images/03C4.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/03C4.jpg diff --git a/Resources/Images/Acre_Images/03C8.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/03C8.jpg similarity index 100% rename from Resources/Images/Acre_Images/03C8.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/03C8.jpg diff --git a/Resources/Images/Acre_Images/03CC.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/03CC.jpg similarity index 100% rename from Resources/Images/Acre_Images/03CC.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/03CC.jpg diff --git a/Resources/Images/Acre_Images/03D0.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/03D0.jpg similarity index 100% rename from Resources/Images/Acre_Images/03D0.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/03D0.jpg diff --git a/Resources/Images/Acre_Images/03D4.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/03D4.jpg similarity index 100% rename from Resources/Images/Acre_Images/03D4.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/03D4.jpg diff --git a/Resources/Images/Acre_Images/03D8.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/03D8.jpg similarity index 100% rename from Resources/Images/Acre_Images/03D8.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/03D8.jpg diff --git a/Resources/Images/Acre_Images/03DC.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/03DC.jpg similarity index 100% rename from Resources/Images/Acre_Images/03DC.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/03DC.jpg diff --git a/Resources/Images/Acre_Images/03F0.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/03F0.jpg similarity index 100% rename from Resources/Images/Acre_Images/03F0.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/03F0.jpg diff --git a/Resources/Images/Acre_Images/03F4.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/03F4.jpg similarity index 100% rename from Resources/Images/Acre_Images/03F4.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/03F4.jpg diff --git a/Resources/Images/Acre_Images/03F8.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/03F8.jpg similarity index 100% rename from Resources/Images/Acre_Images/03F8.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/03F8.jpg diff --git a/Resources/Images/Acre_Images/03FC.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/03FC.jpg similarity index 100% rename from Resources/Images/Acre_Images/03FC.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/03FC.jpg diff --git a/Resources/Images/Acre_Images/0400.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/0400.jpg similarity index 100% rename from Resources/Images/Acre_Images/0400.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/0400.jpg diff --git a/Resources/Images/Acre_Images/0404.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/0404.jpg similarity index 100% rename from Resources/Images/Acre_Images/0404.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/0404.jpg diff --git a/Resources/Images/Acre_Images/0408.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/0408.jpg similarity index 100% rename from Resources/Images/Acre_Images/0408.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/0408.jpg diff --git a/Resources/Images/Acre_Images/040C.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/040C.jpg similarity index 100% rename from Resources/Images/Acre_Images/040C.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/040C.jpg diff --git a/Resources/Images/Acre_Images/0410.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/0410.jpg similarity index 100% rename from Resources/Images/Acre_Images/0410.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/0410.jpg diff --git a/Resources/Images/Acre_Images/0414.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/0414.jpg similarity index 100% rename from Resources/Images/Acre_Images/0414.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/0414.jpg diff --git a/Resources/Images/Acre_Images/0418.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/0418.jpg similarity index 100% rename from Resources/Images/Acre_Images/0418.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/0418.jpg diff --git a/Resources/Images/Acre_Images/041C.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/041C.jpg similarity index 100% rename from Resources/Images/Acre_Images/041C.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/041C.jpg diff --git a/Resources/Images/Acre_Images/0458.png b/ACSE.WinForms/Resources/Images/Acre_Images/0458.png similarity index 100% rename from Resources/Images/Acre_Images/0458.png rename to ACSE.WinForms/Resources/Images/Acre_Images/0458.png diff --git a/Resources/Images/Acre_Images/045C.png b/ACSE.WinForms/Resources/Images/Acre_Images/045C.png similarity index 100% rename from Resources/Images/Acre_Images/045C.png rename to ACSE.WinForms/Resources/Images/Acre_Images/045C.png diff --git a/Resources/Images/Acre_Images/0460.png b/ACSE.WinForms/Resources/Images/Acre_Images/0460.png similarity index 100% rename from Resources/Images/Acre_Images/0460.png rename to ACSE.WinForms/Resources/Images/Acre_Images/0460.png diff --git a/Resources/Images/Acre_Images/0468.png b/ACSE.WinForms/Resources/Images/Acre_Images/0468.png similarity index 100% rename from Resources/Images/Acre_Images/0468.png rename to ACSE.WinForms/Resources/Images/Acre_Images/0468.png diff --git a/Resources/Images/Acre_Images/047C.png b/ACSE.WinForms/Resources/Images/Acre_Images/047C.png similarity index 100% rename from Resources/Images/Acre_Images/047C.png rename to ACSE.WinForms/Resources/Images/Acre_Images/047C.png diff --git a/Resources/Images/Acre_Images/0480.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/0480.jpg similarity index 100% rename from Resources/Images/Acre_Images/0480.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/0480.jpg diff --git a/Resources/Images/Acre_Images/0484.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/0484.jpg similarity index 100% rename from Resources/Images/Acre_Images/0484.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/0484.jpg diff --git a/Resources/Images/Acre_Images/0488.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/0488.jpg similarity index 100% rename from Resources/Images/Acre_Images/0488.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/0488.jpg diff --git a/Resources/Images/Acre_Images/048C.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/048C.jpg similarity index 100% rename from Resources/Images/Acre_Images/048C.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/048C.jpg diff --git a/Resources/Images/Acre_Images/0490.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/0490.jpg similarity index 100% rename from Resources/Images/Acre_Images/0490.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/0490.jpg diff --git a/Resources/Images/Acre_Images/0494.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/0494.jpg similarity index 100% rename from Resources/Images/Acre_Images/0494.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/0494.jpg diff --git a/Resources/Images/Acre_Images/0498.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/0498.jpg similarity index 100% rename from Resources/Images/Acre_Images/0498.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/0498.jpg diff --git a/Resources/Images/Acre_Images/04A0.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/04A0.jpg similarity index 100% rename from Resources/Images/Acre_Images/04A0.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/04A0.jpg diff --git a/Resources/Images/Acre_Images/04A4.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/04A4.jpg similarity index 100% rename from Resources/Images/Acre_Images/04A4.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/04A4.jpg diff --git a/Resources/Images/Acre_Images/0590.png b/ACSE.WinForms/Resources/Images/Acre_Images/0590.png similarity index 100% rename from Resources/Images/Acre_Images/0590.png rename to ACSE.WinForms/Resources/Images/Acre_Images/0590.png diff --git a/Resources/Images/Acre_Images/0594.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/0594.jpg similarity index 100% rename from Resources/Images/Acre_Images/0594.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/0594.jpg diff --git a/Resources/Images/Acre_Images/0598.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/0598.jpg similarity index 100% rename from Resources/Images/Acre_Images/0598.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/0598.jpg diff --git a/Resources/Images/Acre_Images/059C.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/059C.jpg similarity index 100% rename from Resources/Images/Acre_Images/059C.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/059C.jpg diff --git a/Resources/Images/Acre_Images/05A0.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/05A0.jpg similarity index 100% rename from Resources/Images/Acre_Images/05A0.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/05A0.jpg diff --git a/Resources/Images/Acre_Images/05A4.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/05A4.jpg similarity index 100% rename from Resources/Images/Acre_Images/05A4.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/05A4.jpg diff --git a/Resources/Images/Acre_Images/05A8.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/05A8.jpg similarity index 100% rename from Resources/Images/Acre_Images/05A8.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/05A8.jpg diff --git a/Resources/Images/Acre_Images/05AC.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/05AC.jpg similarity index 100% rename from Resources/Images/Acre_Images/05AC.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/05AC.jpg diff --git a/Resources/Images/Acre_Images/05B0.jpg b/ACSE.WinForms/Resources/Images/Acre_Images/05B0.jpg similarity index 100% rename from Resources/Images/Acre_Images/05B0.jpg rename to ACSE.WinForms/Resources/Images/Acre_Images/05B0.jpg diff --git a/Resources/Images/Acre_Images/05BC.png b/ACSE.WinForms/Resources/Images/Acre_Images/05BC.png similarity index 100% rename from Resources/Images/Acre_Images/05BC.png rename to ACSE.WinForms/Resources/Images/Acre_Images/05BC.png diff --git a/Resources/Images/Acre_Images/FFFF.png b/ACSE.WinForms/Resources/Images/Acre_Images/FFFF.png similarity index 100% rename from Resources/Images/Acre_Images/FFFF.png rename to ACSE.WinForms/Resources/Images/Acre_Images/FFFF.png diff --git a/ACSE.WinForms/Resources/Images/Arrow.png b/ACSE.WinForms/Resources/Images/Arrow.png new file mode 100644 index 0000000..85c7622 Binary files /dev/null and b/ACSE.WinForms/Resources/Images/Arrow.png differ diff --git a/Resources/Images/X.png b/ACSE.WinForms/Resources/Images/Building.png similarity index 100% rename from Resources/Images/X.png rename to ACSE.WinForms/Resources/Images/Building.png diff --git a/ACSE.WinForms/Resources/Images/Buried.png b/ACSE.WinForms/Resources/Images/Buried.png new file mode 100644 index 0000000..7e8ed7f Binary files /dev/null and b/ACSE.WinForms/Resources/Images/Buried.png differ diff --git a/Resources/Images/CF_Acre_Images/0000.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0000.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0000.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0000.png diff --git a/Resources/Images/CF_Acre_Images/0001.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0001.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0001.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0001.png diff --git a/Resources/Images/CF_Acre_Images/0002.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0002.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0002.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0002.png diff --git a/Resources/Images/CF_Acre_Images/0003.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0003.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0003.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0003.png diff --git a/Resources/Images/CF_Acre_Images/0004.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0004.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0004.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0004.png diff --git a/Resources/Images/CF_Acre_Images/0005.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0005.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0005.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0005.png diff --git a/Resources/Images/CF_Acre_Images/0006.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0006.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0006.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0006.png diff --git a/Resources/Images/CF_Acre_Images/0007.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0007.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0007.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0007.png diff --git a/Resources/Images/CF_Acre_Images/0008.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0008.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0008.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0008.png diff --git a/Resources/Images/CF_Acre_Images/0009.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0009.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0009.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0009.png diff --git a/Resources/Images/CF_Acre_Images/000A.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/000A.png similarity index 100% rename from Resources/Images/CF_Acre_Images/000A.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/000A.png diff --git a/Resources/Images/CF_Acre_Images/000B.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/000B.png similarity index 100% rename from Resources/Images/CF_Acre_Images/000B.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/000B.png diff --git a/Resources/Images/CF_Acre_Images/000C.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/000C.png similarity index 100% rename from Resources/Images/CF_Acre_Images/000C.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/000C.png diff --git a/Resources/Images/CF_Acre_Images/000D.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/000D.png similarity index 100% rename from Resources/Images/CF_Acre_Images/000D.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/000D.png diff --git a/Resources/Images/CF_Acre_Images/000E.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/000E.png similarity index 100% rename from Resources/Images/CF_Acre_Images/000E.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/000E.png diff --git a/Resources/Images/CF_Acre_Images/000F.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/000F.png similarity index 100% rename from Resources/Images/CF_Acre_Images/000F.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/000F.png diff --git a/Resources/Images/CF_Acre_Images/0010.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0010.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0010.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0010.png diff --git a/Resources/Images/CF_Acre_Images/0011.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0011.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0011.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0011.png diff --git a/Resources/Images/CF_Acre_Images/0012.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0012.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0012.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0012.png diff --git a/Resources/Images/CF_Acre_Images/0013.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0013.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0013.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0013.png diff --git a/Resources/Images/CF_Acre_Images/0014.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0014.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0014.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0014.png diff --git a/Resources/Images/CF_Acre_Images/0015.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0015.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0015.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0015.png diff --git a/Resources/Images/CF_Acre_Images/0016.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0016.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0016.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0016.png diff --git a/Resources/Images/CF_Acre_Images/0017.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0017.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0017.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0017.png diff --git a/Resources/Images/CF_Acre_Images/0018.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0018.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0018.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0018.png diff --git a/Resources/Images/CF_Acre_Images/0019.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0019.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0019.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0019.png diff --git a/Resources/Images/CF_Acre_Images/001A.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/001A.png similarity index 100% rename from Resources/Images/CF_Acre_Images/001A.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/001A.png diff --git a/Resources/Images/CF_Acre_Images/001B.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/001B.png similarity index 100% rename from Resources/Images/CF_Acre_Images/001B.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/001B.png diff --git a/Resources/Images/CF_Acre_Images/001C.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/001C.png similarity index 100% rename from Resources/Images/CF_Acre_Images/001C.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/001C.png diff --git a/Resources/Images/CF_Acre_Images/001D.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/001D.png similarity index 100% rename from Resources/Images/CF_Acre_Images/001D.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/001D.png diff --git a/Resources/Images/CF_Acre_Images/001E.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/001E.png similarity index 100% rename from Resources/Images/CF_Acre_Images/001E.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/001E.png diff --git a/Resources/Images/CF_Acre_Images/001F.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/001F.png similarity index 100% rename from Resources/Images/CF_Acre_Images/001F.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/001F.png diff --git a/Resources/Images/CF_Acre_Images/0020.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0020.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0020.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0020.png diff --git a/Resources/Images/CF_Acre_Images/0021.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0021.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0021.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0021.png diff --git a/Resources/Images/CF_Acre_Images/0022.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0022.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0022.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0022.png diff --git a/Resources/Images/CF_Acre_Images/0023.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0023.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0023.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0023.png diff --git a/Resources/Images/CF_Acre_Images/0024.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0024.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0024.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0024.png diff --git a/Resources/Images/CF_Acre_Images/0025.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0025.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0025.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0025.png diff --git a/Resources/Images/CF_Acre_Images/0026.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0026.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0026.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0026.png diff --git a/Resources/Images/CF_Acre_Images/0027.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0027.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0027.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0027.png diff --git a/Resources/Images/CF_Acre_Images/0028.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0028.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0028.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0028.png diff --git a/Resources/Images/CF_Acre_Images/0029.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0029.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0029.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0029.png diff --git a/Resources/Images/CF_Acre_Images/002A.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/002A.png similarity index 100% rename from Resources/Images/CF_Acre_Images/002A.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/002A.png diff --git a/Resources/Images/CF_Acre_Images/002B.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/002B.png similarity index 100% rename from Resources/Images/CF_Acre_Images/002B.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/002B.png diff --git a/Resources/Images/CF_Acre_Images/002C.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/002C.png similarity index 100% rename from Resources/Images/CF_Acre_Images/002C.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/002C.png diff --git a/Resources/Images/CF_Acre_Images/002D.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/002D.png similarity index 100% rename from Resources/Images/CF_Acre_Images/002D.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/002D.png diff --git a/Resources/Images/CF_Acre_Images/002E.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/002E.png similarity index 100% rename from Resources/Images/CF_Acre_Images/002E.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/002E.png diff --git a/Resources/Images/CF_Acre_Images/002F.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/002F.png similarity index 100% rename from Resources/Images/CF_Acre_Images/002F.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/002F.png diff --git a/Resources/Images/CF_Acre_Images/0030.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0030.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0030.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0030.png diff --git a/Resources/Images/CF_Acre_Images/0031.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0031.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0031.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0031.png diff --git a/Resources/Images/CF_Acre_Images/0032.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0032.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0032.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0032.png diff --git a/Resources/Images/CF_Acre_Images/0033.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0033.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0033.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0033.png diff --git a/Resources/Images/CF_Acre_Images/0034.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0034.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0034.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0034.png diff --git a/Resources/Images/CF_Acre_Images/0035.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0035.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0035.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0035.png diff --git a/Resources/Images/CF_Acre_Images/0036.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0036.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0036.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0036.png diff --git a/Resources/Images/CF_Acre_Images/0037.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0037.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0037.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0037.png diff --git a/Resources/Images/CF_Acre_Images/0038.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0038.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0038.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0038.png diff --git a/Resources/Images/CF_Acre_Images/0039.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0039.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0039.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0039.png diff --git a/Resources/Images/CF_Acre_Images/003A.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/003A.png similarity index 100% rename from Resources/Images/CF_Acre_Images/003A.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/003A.png diff --git a/Resources/Images/CF_Acre_Images/003B.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/003B.png similarity index 100% rename from Resources/Images/CF_Acre_Images/003B.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/003B.png diff --git a/Resources/Images/CF_Acre_Images/003C.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/003C.png similarity index 100% rename from Resources/Images/CF_Acre_Images/003C.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/003C.png diff --git a/Resources/Images/CF_Acre_Images/003D.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/003D.png similarity index 100% rename from Resources/Images/CF_Acre_Images/003D.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/003D.png diff --git a/Resources/Images/CF_Acre_Images/003E.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/003E.png similarity index 100% rename from Resources/Images/CF_Acre_Images/003E.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/003E.png diff --git a/Resources/Images/CF_Acre_Images/003F.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/003F.png similarity index 100% rename from Resources/Images/CF_Acre_Images/003F.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/003F.png diff --git a/Resources/Images/CF_Acre_Images/0040.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0040.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0040.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0040.png diff --git a/Resources/Images/CF_Acre_Images/0041.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0041.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0041.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0041.png diff --git a/Resources/Images/CF_Acre_Images/0042.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0042.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0042.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0042.png diff --git a/Resources/Images/CF_Acre_Images/0043.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0043.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0043.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0043.png diff --git a/Resources/Images/CF_Acre_Images/0044.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0044.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0044.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0044.png diff --git a/Resources/Images/CF_Acre_Images/0045.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0045.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0045.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0045.png diff --git a/Resources/Images/CF_Acre_Images/0046.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0046.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0046.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0046.png diff --git a/Resources/Images/CF_Acre_Images/0047.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0047.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0047.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0047.png diff --git a/Resources/Images/CF_Acre_Images/0048.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0048.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0048.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0048.png diff --git a/Resources/Images/CF_Acre_Images/0049.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0049.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0049.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0049.png diff --git a/Resources/Images/CF_Acre_Images/004A.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/004A.png similarity index 100% rename from Resources/Images/CF_Acre_Images/004A.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/004A.png diff --git a/Resources/Images/CF_Acre_Images/004B.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/004B.png similarity index 100% rename from Resources/Images/CF_Acre_Images/004B.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/004B.png diff --git a/Resources/Images/CF_Acre_Images/004C.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/004C.png similarity index 100% rename from Resources/Images/CF_Acre_Images/004C.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/004C.png diff --git a/Resources/Images/CF_Acre_Images/004D.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/004D.png similarity index 100% rename from Resources/Images/CF_Acre_Images/004D.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/004D.png diff --git a/Resources/Images/CF_Acre_Images/004E.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/004E.png similarity index 100% rename from Resources/Images/CF_Acre_Images/004E.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/004E.png diff --git a/Resources/Images/CF_Acre_Images/004F.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/004F.png similarity index 100% rename from Resources/Images/CF_Acre_Images/004F.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/004F.png diff --git a/Resources/Images/CF_Acre_Images/0050.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0050.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0050.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0050.png diff --git a/Resources/Images/CF_Acre_Images/0051.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0051.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0051.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0051.png diff --git a/Resources/Images/CF_Acre_Images/0052.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0052.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0052.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0052.png diff --git a/Resources/Images/CF_Acre_Images/0053.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0053.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0053.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0053.png diff --git a/Resources/Images/CF_Acre_Images/0054.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0054.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0054.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0054.png diff --git a/Resources/Images/CF_Acre_Images/0055.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0055.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0055.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0055.png diff --git a/Resources/Images/CF_Acre_Images/0056.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0056.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0056.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0056.png diff --git a/Resources/Images/CF_Acre_Images/0057.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0057.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0057.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0057.png diff --git a/Resources/Images/CF_Acre_Images/0058.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0058.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0058.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0058.png diff --git a/Resources/Images/CF_Acre_Images/0059.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0059.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0059.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0059.png diff --git a/Resources/Images/CF_Acre_Images/005A.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/005A.png similarity index 100% rename from Resources/Images/CF_Acre_Images/005A.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/005A.png diff --git a/Resources/Images/CF_Acre_Images/005B.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/005B.png similarity index 100% rename from Resources/Images/CF_Acre_Images/005B.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/005B.png diff --git a/Resources/Images/CF_Acre_Images/005C.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/005C.png similarity index 100% rename from Resources/Images/CF_Acre_Images/005C.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/005C.png diff --git a/Resources/Images/CF_Acre_Images/005D.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/005D.png similarity index 100% rename from Resources/Images/CF_Acre_Images/005D.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/005D.png diff --git a/Resources/Images/CF_Acre_Images/005E.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/005E.png similarity index 100% rename from Resources/Images/CF_Acre_Images/005E.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/005E.png diff --git a/Resources/Images/CF_Acre_Images/005F.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/005F.png similarity index 100% rename from Resources/Images/CF_Acre_Images/005F.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/005F.png diff --git a/Resources/Images/CF_Acre_Images/0060.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0060.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0060.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0060.png diff --git a/Resources/Images/CF_Acre_Images/0061.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0061.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0061.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0061.png diff --git a/Resources/Images/CF_Acre_Images/0062.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0062.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0062.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0062.png diff --git a/Resources/Images/CF_Acre_Images/0063.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0063.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0063.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0063.png diff --git a/Resources/Images/CF_Acre_Images/0064.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0064.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0064.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0064.png diff --git a/Resources/Images/CF_Acre_Images/0065.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0065.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0065.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0065.png diff --git a/Resources/Images/CF_Acre_Images/0066.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0066.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0066.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0066.png diff --git a/Resources/Images/CF_Acre_Images/0067.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0067.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0067.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0067.png diff --git a/Resources/Images/CF_Acre_Images/0068.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0068.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0068.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0068.png diff --git a/Resources/Images/CF_Acre_Images/0069.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0069.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0069.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0069.png diff --git a/Resources/Images/CF_Acre_Images/006A.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/006A.png similarity index 100% rename from Resources/Images/CF_Acre_Images/006A.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/006A.png diff --git a/Resources/Images/CF_Acre_Images/006B.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/006B.png similarity index 100% rename from Resources/Images/CF_Acre_Images/006B.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/006B.png diff --git a/Resources/Images/CF_Acre_Images/006C.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/006C.png similarity index 100% rename from Resources/Images/CF_Acre_Images/006C.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/006C.png diff --git a/Resources/Images/CF_Acre_Images/006D.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/006D.png similarity index 100% rename from Resources/Images/CF_Acre_Images/006D.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/006D.png diff --git a/Resources/Images/CF_Acre_Images/006E.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/006E.png similarity index 100% rename from Resources/Images/CF_Acre_Images/006E.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/006E.png diff --git a/Resources/Images/CF_Acre_Images/006F.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/006F.png similarity index 100% rename from Resources/Images/CF_Acre_Images/006F.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/006F.png diff --git a/Resources/Images/CF_Acre_Images/0070.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0070.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0070.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0070.png diff --git a/Resources/Images/CF_Acre_Images/0071.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0071.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0071.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0071.png diff --git a/Resources/Images/CF_Acre_Images/0072.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0072.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0072.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0072.png diff --git a/Resources/Images/CF_Acre_Images/0073.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0073.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0073.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0073.png diff --git a/Resources/Images/CF_Acre_Images/0074.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0074.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0074.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0074.png diff --git a/Resources/Images/CF_Acre_Images/0075.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0075.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0075.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0075.png diff --git a/Resources/Images/CF_Acre_Images/0076.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0076.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0076.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0076.png diff --git a/Resources/Images/CF_Acre_Images/0077.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0077.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0077.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0077.png diff --git a/Resources/Images/CF_Acre_Images/0078.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0078.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0078.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0078.png diff --git a/Resources/Images/CF_Acre_Images/0079.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0079.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0079.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0079.png diff --git a/Resources/Images/CF_Acre_Images/007A.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/007A.png similarity index 100% rename from Resources/Images/CF_Acre_Images/007A.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/007A.png diff --git a/Resources/Images/CF_Acre_Images/007B.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/007B.png similarity index 100% rename from Resources/Images/CF_Acre_Images/007B.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/007B.png diff --git a/Resources/Images/CF_Acre_Images/007C.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/007C.png similarity index 100% rename from Resources/Images/CF_Acre_Images/007C.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/007C.png diff --git a/Resources/Images/CF_Acre_Images/007D.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/007D.png similarity index 100% rename from Resources/Images/CF_Acre_Images/007D.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/007D.png diff --git a/Resources/Images/CF_Acre_Images/007E.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/007E.png similarity index 100% rename from Resources/Images/CF_Acre_Images/007E.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/007E.png diff --git a/Resources/Images/CF_Acre_Images/007F.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/007F.png similarity index 100% rename from Resources/Images/CF_Acre_Images/007F.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/007F.png diff --git a/Resources/Images/CF_Acre_Images/0080.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0080.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0080.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0080.png diff --git a/Resources/Images/CF_Acre_Images/0081.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0081.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0081.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0081.png diff --git a/Resources/Images/CF_Acre_Images/0082.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0082.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0082.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0082.png diff --git a/Resources/Images/CF_Acre_Images/0083.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0083.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0083.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0083.png diff --git a/Resources/Images/CF_Acre_Images/0084.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0084.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0084.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0084.png diff --git a/Resources/Images/CF_Acre_Images/0085.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0085.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0085.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0085.png diff --git a/Resources/Images/CF_Acre_Images/0086.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0086.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0086.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0086.png diff --git a/Resources/Images/CF_Acre_Images/0087.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0087.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0087.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0087.png diff --git a/Resources/Images/CF_Acre_Images/0088.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0088.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0088.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0088.png diff --git a/Resources/Images/CF_Acre_Images/0089.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0089.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0089.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0089.png diff --git a/Resources/Images/CF_Acre_Images/008A.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/008A.png similarity index 100% rename from Resources/Images/CF_Acre_Images/008A.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/008A.png diff --git a/Resources/Images/CF_Acre_Images/008B.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/008B.png similarity index 100% rename from Resources/Images/CF_Acre_Images/008B.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/008B.png diff --git a/Resources/Images/CF_Acre_Images/008C.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/008C.png similarity index 100% rename from Resources/Images/CF_Acre_Images/008C.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/008C.png diff --git a/Resources/Images/CF_Acre_Images/008D.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/008D.png similarity index 100% rename from Resources/Images/CF_Acre_Images/008D.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/008D.png diff --git a/Resources/Images/CF_Acre_Images/008E.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/008E.png similarity index 100% rename from Resources/Images/CF_Acre_Images/008E.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/008E.png diff --git a/Resources/Images/CF_Acre_Images/008F.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/008F.png similarity index 100% rename from Resources/Images/CF_Acre_Images/008F.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/008F.png diff --git a/Resources/Images/CF_Acre_Images/0090.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0090.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0090.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0090.png diff --git a/Resources/Images/CF_Acre_Images/0091.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0091.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0091.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0091.png diff --git a/Resources/Images/CF_Acre_Images/0092.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0092.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0092.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0092.png diff --git a/Resources/Images/CF_Acre_Images/0093.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0093.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0093.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0093.png diff --git a/Resources/Images/CF_Acre_Images/0094.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0094.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0094.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0094.png diff --git a/Resources/Images/CF_Acre_Images/0095.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0095.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0095.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0095.png diff --git a/Resources/Images/CF_Acre_Images/0096.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0096.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0096.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0096.png diff --git a/Resources/Images/CF_Acre_Images/0097.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0097.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0097.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0097.png diff --git a/Resources/Images/CF_Acre_Images/0098.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0098.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0098.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0098.png diff --git a/Resources/Images/CF_Acre_Images/0099.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0099.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0099.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0099.png diff --git a/Resources/Images/CF_Acre_Images/009A.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/009A.png similarity index 100% rename from Resources/Images/CF_Acre_Images/009A.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/009A.png diff --git a/Resources/Images/CF_Acre_Images/009B.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/009B.png similarity index 100% rename from Resources/Images/CF_Acre_Images/009B.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/009B.png diff --git a/Resources/Images/CF_Acre_Images/009C.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/009C.png similarity index 100% rename from Resources/Images/CF_Acre_Images/009C.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/009C.png diff --git a/Resources/Images/CF_Acre_Images/009D.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/009D.png similarity index 100% rename from Resources/Images/CF_Acre_Images/009D.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/009D.png diff --git a/Resources/Images/CF_Acre_Images/009E.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/009E.png similarity index 100% rename from Resources/Images/CF_Acre_Images/009E.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/009E.png diff --git a/Resources/Images/CF_Acre_Images/009F.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/009F.png similarity index 100% rename from Resources/Images/CF_Acre_Images/009F.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/009F.png diff --git a/Resources/Images/CF_Acre_Images/00A0.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/00A0.png similarity index 100% rename from Resources/Images/CF_Acre_Images/00A0.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/00A0.png diff --git a/Resources/Images/CF_Acre_Images/00A1.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/00A1.png similarity index 100% rename from Resources/Images/CF_Acre_Images/00A1.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/00A1.png diff --git a/Resources/Images/CF_Acre_Images/00A2.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/00A2.png similarity index 100% rename from Resources/Images/CF_Acre_Images/00A2.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/00A2.png diff --git a/Resources/Images/CF_Acre_Images/00A3.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/00A3.png similarity index 100% rename from Resources/Images/CF_Acre_Images/00A3.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/00A3.png diff --git a/Resources/Images/CF_Acre_Images/00A4.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/00A4.png similarity index 100% rename from Resources/Images/CF_Acre_Images/00A4.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/00A4.png diff --git a/Resources/Images/CF_Acre_Images/00A5.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/00A5.png similarity index 100% rename from Resources/Images/CF_Acre_Images/00A5.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/00A5.png diff --git a/Resources/Images/CF_Acre_Images/00A6.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/00A6.png similarity index 100% rename from Resources/Images/CF_Acre_Images/00A6.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/00A6.png diff --git a/Resources/Images/CF_Acre_Images/00A7.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/00A7.png similarity index 100% rename from Resources/Images/CF_Acre_Images/00A7.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/00A7.png diff --git a/Resources/Images/CF_Acre_Images/00A8.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/00A8.png similarity index 100% rename from Resources/Images/CF_Acre_Images/00A8.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/00A8.png diff --git a/Resources/Images/CF_Acre_Images/00A9.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/00A9.png similarity index 100% rename from Resources/Images/CF_Acre_Images/00A9.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/00A9.png diff --git a/Resources/Images/CF_Acre_Images/00AA.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/00AA.png similarity index 100% rename from Resources/Images/CF_Acre_Images/00AA.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/00AA.png diff --git a/Resources/Images/CF_Acre_Images/00AB.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/00AB.png similarity index 100% rename from Resources/Images/CF_Acre_Images/00AB.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/00AB.png diff --git a/Resources/Images/CF_Acre_Images/00AC.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/00AC.png similarity index 100% rename from Resources/Images/CF_Acre_Images/00AC.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/00AC.png diff --git a/Resources/Images/CF_Acre_Images/00AD.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/00AD.png similarity index 100% rename from Resources/Images/CF_Acre_Images/00AD.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/00AD.png diff --git a/Resources/Images/CF_Acre_Images/00AE.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/00AE.png similarity index 100% rename from Resources/Images/CF_Acre_Images/00AE.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/00AE.png diff --git a/Resources/Images/CF_Acre_Images/00AF.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/00AF.png similarity index 100% rename from Resources/Images/CF_Acre_Images/00AF.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/00AF.png diff --git a/Resources/Images/CF_Acre_Images/00B0.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/00B0.png similarity index 100% rename from Resources/Images/CF_Acre_Images/00B0.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/00B0.png diff --git a/Resources/Images/CF_Acre_Images/00B1.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/00B1.png similarity index 100% rename from Resources/Images/CF_Acre_Images/00B1.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/00B1.png diff --git a/Resources/Images/CF_Acre_Images/00B2.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/00B2.png similarity index 100% rename from Resources/Images/CF_Acre_Images/00B2.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/00B2.png diff --git a/Resources/Images/CF_Acre_Images/00B3.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/00B3.png similarity index 100% rename from Resources/Images/CF_Acre_Images/00B3.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/00B3.png diff --git a/Resources/Images/CF_Acre_Images/00B4.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/00B4.png similarity index 100% rename from Resources/Images/CF_Acre_Images/00B4.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/00B4.png diff --git a/Resources/Images/CF_Acre_Images/00B5.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/00B5.png similarity index 100% rename from Resources/Images/CF_Acre_Images/00B5.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/00B5.png diff --git a/Resources/Images/CF_Acre_Images/00B6.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/00B6.png similarity index 100% rename from Resources/Images/CF_Acre_Images/00B6.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/00B6.png diff --git a/Resources/Images/CF_Acre_Images/00B7.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/00B7.png similarity index 100% rename from Resources/Images/CF_Acre_Images/00B7.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/00B7.png diff --git a/Resources/Images/CF_Acre_Images/00B8.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/00B8.png similarity index 100% rename from Resources/Images/CF_Acre_Images/00B8.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/00B8.png diff --git a/Resources/Images/CF_Acre_Images/00B9.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/00B9.png similarity index 100% rename from Resources/Images/CF_Acre_Images/00B9.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/00B9.png diff --git a/Resources/Images/CF_Acre_Images/00BA.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/00BA.png similarity index 100% rename from Resources/Images/CF_Acre_Images/00BA.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/00BA.png diff --git a/Resources/Images/CF_Acre_Images/00BB.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/00BB.png similarity index 100% rename from Resources/Images/CF_Acre_Images/00BB.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/00BB.png diff --git a/Resources/Images/CF_Acre_Images/00BC.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/00BC.png similarity index 100% rename from Resources/Images/CF_Acre_Images/00BC.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/00BC.png diff --git a/Resources/Images/CF_Acre_Images/00BD.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/00BD.png similarity index 100% rename from Resources/Images/CF_Acre_Images/00BD.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/00BD.png diff --git a/Resources/Images/CF_Acre_Images/00BE.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/00BE.png similarity index 100% rename from Resources/Images/CF_Acre_Images/00BE.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/00BE.png diff --git a/Resources/Images/CF_Acre_Images/00BF.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/00BF.png similarity index 100% rename from Resources/Images/CF_Acre_Images/00BF.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/00BF.png diff --git a/Resources/Images/CF_Acre_Images/00C0.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/00C0.png similarity index 100% rename from Resources/Images/CF_Acre_Images/00C0.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/00C0.png diff --git a/Resources/Images/CF_Acre_Images/00C1.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/00C1.png similarity index 100% rename from Resources/Images/CF_Acre_Images/00C1.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/00C1.png diff --git a/Resources/Images/CF_Acre_Images/00C2.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/00C2.png similarity index 100% rename from Resources/Images/CF_Acre_Images/00C2.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/00C2.png diff --git a/Resources/Images/CF_Acre_Images/00C3.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/00C3.png similarity index 100% rename from Resources/Images/CF_Acre_Images/00C3.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/00C3.png diff --git a/Resources/Images/CF_Acre_Images/00C4.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/00C4.png similarity index 100% rename from Resources/Images/CF_Acre_Images/00C4.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/00C4.png diff --git a/Resources/Images/CF_Acre_Images/00C5.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/00C5.png similarity index 100% rename from Resources/Images/CF_Acre_Images/00C5.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/00C5.png diff --git a/Resources/Images/CF_Acre_Images/00C6.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/00C6.png similarity index 100% rename from Resources/Images/CF_Acre_Images/00C6.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/00C6.png diff --git a/Resources/Images/CF_Acre_Images/00C7.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/00C7.png similarity index 100% rename from Resources/Images/CF_Acre_Images/00C7.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/00C7.png diff --git a/Resources/Images/CF_Acre_Images/00C8.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/00C8.png similarity index 100% rename from Resources/Images/CF_Acre_Images/00C8.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/00C8.png diff --git a/Resources/Images/CF_Acre_Images/00C9.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/00C9.png similarity index 100% rename from Resources/Images/CF_Acre_Images/00C9.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/00C9.png diff --git a/Resources/Images/CF_Acre_Images/00CA.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/00CA.png similarity index 100% rename from Resources/Images/CF_Acre_Images/00CA.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/00CA.png diff --git a/Resources/Images/CF_Acre_Images/00CB.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/00CB.png similarity index 100% rename from Resources/Images/CF_Acre_Images/00CB.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/00CB.png diff --git a/Resources/Images/CF_Acre_Images/00CC.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/00CC.png similarity index 100% rename from Resources/Images/CF_Acre_Images/00CC.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/00CC.png diff --git a/Resources/Images/CF_Acre_Images/00CD.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/00CD.png similarity index 100% rename from Resources/Images/CF_Acre_Images/00CD.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/00CD.png diff --git a/Resources/Images/CF_Acre_Images/00CE.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/00CE.png similarity index 100% rename from Resources/Images/CF_Acre_Images/00CE.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/00CE.png diff --git a/Resources/Images/CF_Acre_Images/00CF.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/00CF.png similarity index 100% rename from Resources/Images/CF_Acre_Images/00CF.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/00CF.png diff --git a/Resources/Images/CF_Acre_Images/00D0.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/00D0.png similarity index 100% rename from Resources/Images/CF_Acre_Images/00D0.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/00D0.png diff --git a/Resources/Images/CF_Acre_Images/00D1.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/00D1.png similarity index 100% rename from Resources/Images/CF_Acre_Images/00D1.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/00D1.png diff --git a/Resources/Images/CF_Acre_Images/00D2.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/00D2.png similarity index 100% rename from Resources/Images/CF_Acre_Images/00D2.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/00D2.png diff --git a/Resources/Images/CF_Acre_Images/00D3.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/00D3.png similarity index 100% rename from Resources/Images/CF_Acre_Images/00D3.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/00D3.png diff --git a/Resources/Images/CF_Acre_Images/00D4.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/00D4.png similarity index 100% rename from Resources/Images/CF_Acre_Images/00D4.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/00D4.png diff --git a/Resources/Images/CF_Acre_Images/00D5.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/00D5.png similarity index 100% rename from Resources/Images/CF_Acre_Images/00D5.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/00D5.png diff --git a/Resources/Images/CF_Acre_Images/00D6.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/00D6.png similarity index 100% rename from Resources/Images/CF_Acre_Images/00D6.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/00D6.png diff --git a/Resources/Images/CF_Acre_Images/00D7.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/00D7.png similarity index 100% rename from Resources/Images/CF_Acre_Images/00D7.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/00D7.png diff --git a/Resources/Images/CF_Acre_Images/00D8.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/00D8.png similarity index 100% rename from Resources/Images/CF_Acre_Images/00D8.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/00D8.png diff --git a/Resources/Images/CF_Acre_Images/00D9.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/00D9.png similarity index 100% rename from Resources/Images/CF_Acre_Images/00D9.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/00D9.png diff --git a/Resources/Images/CF_Acre_Images/00DA.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/00DA.png similarity index 100% rename from Resources/Images/CF_Acre_Images/00DA.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/00DA.png diff --git a/Resources/Images/CF_Acre_Images/00DB.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/00DB.png similarity index 100% rename from Resources/Images/CF_Acre_Images/00DB.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/00DB.png diff --git a/Resources/Images/CF_Acre_Images/00DC.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/00DC.png similarity index 100% rename from Resources/Images/CF_Acre_Images/00DC.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/00DC.png diff --git a/Resources/Images/CF_Acre_Images/00DD.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/00DD.png similarity index 100% rename from Resources/Images/CF_Acre_Images/00DD.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/00DD.png diff --git a/Resources/Images/CF_Acre_Images/00DE.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/00DE.png similarity index 100% rename from Resources/Images/CF_Acre_Images/00DE.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/00DE.png diff --git a/Resources/Images/CF_Acre_Images/00DF.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/00DF.png similarity index 100% rename from Resources/Images/CF_Acre_Images/00DF.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/00DF.png diff --git a/Resources/Images/CF_Acre_Images/00E0.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/00E0.png similarity index 100% rename from Resources/Images/CF_Acre_Images/00E0.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/00E0.png diff --git a/Resources/Images/CF_Acre_Images/00E1.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/00E1.png similarity index 100% rename from Resources/Images/CF_Acre_Images/00E1.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/00E1.png diff --git a/Resources/Images/CF_Acre_Images/00E2.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/00E2.png similarity index 100% rename from Resources/Images/CF_Acre_Images/00E2.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/00E2.png diff --git a/Resources/Images/CF_Acre_Images/00E3.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/00E3.png similarity index 100% rename from Resources/Images/CF_Acre_Images/00E3.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/00E3.png diff --git a/Resources/Images/CF_Acre_Images/00E4.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/00E4.png similarity index 100% rename from Resources/Images/CF_Acre_Images/00E4.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/00E4.png diff --git a/Resources/Images/CF_Acre_Images/00E5.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/00E5.png similarity index 100% rename from Resources/Images/CF_Acre_Images/00E5.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/00E5.png diff --git a/Resources/Images/CF_Acre_Images/00E6.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/00E6.png similarity index 100% rename from Resources/Images/CF_Acre_Images/00E6.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/00E6.png diff --git a/Resources/Images/CF_Acre_Images/00E7.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/00E7.png similarity index 100% rename from Resources/Images/CF_Acre_Images/00E7.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/00E7.png diff --git a/Resources/Images/CF_Acre_Images/00E8.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/00E8.png similarity index 100% rename from Resources/Images/CF_Acre_Images/00E8.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/00E8.png diff --git a/Resources/Images/CF_Acre_Images/00E9.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/00E9.png similarity index 100% rename from Resources/Images/CF_Acre_Images/00E9.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/00E9.png diff --git a/Resources/Images/CF_Acre_Images/00EA.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/00EA.png similarity index 100% rename from Resources/Images/CF_Acre_Images/00EA.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/00EA.png diff --git a/Resources/Images/CF_Acre_Images/00EB.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/00EB.png similarity index 100% rename from Resources/Images/CF_Acre_Images/00EB.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/00EB.png diff --git a/Resources/Images/CF_Acre_Images/00EC.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/00EC.png similarity index 100% rename from Resources/Images/CF_Acre_Images/00EC.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/00EC.png diff --git a/Resources/Images/CF_Acre_Images/00ED.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/00ED.png similarity index 100% rename from Resources/Images/CF_Acre_Images/00ED.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/00ED.png diff --git a/Resources/Images/CF_Acre_Images/00EE.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/00EE.png similarity index 100% rename from Resources/Images/CF_Acre_Images/00EE.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/00EE.png diff --git a/Resources/Images/CF_Acre_Images/00EF.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/00EF.png similarity index 100% rename from Resources/Images/CF_Acre_Images/00EF.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/00EF.png diff --git a/Resources/Images/CF_Acre_Images/00F0.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/00F0.png similarity index 100% rename from Resources/Images/CF_Acre_Images/00F0.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/00F0.png diff --git a/Resources/Images/CF_Acre_Images/00F1.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/00F1.png similarity index 100% rename from Resources/Images/CF_Acre_Images/00F1.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/00F1.png diff --git a/Resources/Images/CF_Acre_Images/00F2.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/00F2.png similarity index 100% rename from Resources/Images/CF_Acre_Images/00F2.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/00F2.png diff --git a/Resources/Images/CF_Acre_Images/00F3.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/00F3.png similarity index 100% rename from Resources/Images/CF_Acre_Images/00F3.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/00F3.png diff --git a/Resources/Images/CF_Acre_Images/00F4.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/00F4.png similarity index 100% rename from Resources/Images/CF_Acre_Images/00F4.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/00F4.png diff --git a/Resources/Images/CF_Acre_Images/00F5.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/00F5.png similarity index 100% rename from Resources/Images/CF_Acre_Images/00F5.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/00F5.png diff --git a/Resources/Images/CF_Acre_Images/00F6.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/00F6.png similarity index 100% rename from Resources/Images/CF_Acre_Images/00F6.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/00F6.png diff --git a/Resources/Images/CF_Acre_Images/00F7.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/00F7.png similarity index 100% rename from Resources/Images/CF_Acre_Images/00F7.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/00F7.png diff --git a/Resources/Images/CF_Acre_Images/00F8.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/00F8.png similarity index 100% rename from Resources/Images/CF_Acre_Images/00F8.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/00F8.png diff --git a/Resources/Images/CF_Acre_Images/00F9.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/00F9.png similarity index 100% rename from Resources/Images/CF_Acre_Images/00F9.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/00F9.png diff --git a/Resources/Images/CF_Acre_Images/00FA.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/00FA.png similarity index 100% rename from Resources/Images/CF_Acre_Images/00FA.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/00FA.png diff --git a/Resources/Images/CF_Acre_Images/00FB.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/00FB.png similarity index 100% rename from Resources/Images/CF_Acre_Images/00FB.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/00FB.png diff --git a/Resources/Images/CF_Acre_Images/00FC.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/00FC.png similarity index 100% rename from Resources/Images/CF_Acre_Images/00FC.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/00FC.png diff --git a/Resources/Images/CF_Acre_Images/00FD.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/00FD.png similarity index 100% rename from Resources/Images/CF_Acre_Images/00FD.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/00FD.png diff --git a/Resources/Images/CF_Acre_Images/00FE.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/00FE.png similarity index 100% rename from Resources/Images/CF_Acre_Images/00FE.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/00FE.png diff --git a/Resources/Images/CF_Acre_Images/00FF.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/00FF.png similarity index 100% rename from Resources/Images/CF_Acre_Images/00FF.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/00FF.png diff --git a/Resources/Images/CF_Acre_Images/0100.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0100.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0100.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0100.png diff --git a/Resources/Images/CF_Acre_Images/0101.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0101.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0101.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0101.png diff --git a/Resources/Images/CF_Acre_Images/0102.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0102.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0102.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0102.png diff --git a/Resources/Images/CF_Acre_Images/0103.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0103.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0103.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0103.png diff --git a/Resources/Images/CF_Acre_Images/0104.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0104.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0104.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0104.png diff --git a/Resources/Images/CF_Acre_Images/0105.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0105.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0105.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0105.png diff --git a/Resources/Images/CF_Acre_Images/0106.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0106.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0106.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0106.png diff --git a/Resources/Images/CF_Acre_Images/0107.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0107.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0107.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0107.png diff --git a/Resources/Images/CF_Acre_Images/0108.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0108.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0108.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0108.png diff --git a/Resources/Images/CF_Acre_Images/0109.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0109.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0109.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0109.png diff --git a/Resources/Images/CF_Acre_Images/010A.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/010A.png similarity index 100% rename from Resources/Images/CF_Acre_Images/010A.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/010A.png diff --git a/Resources/Images/CF_Acre_Images/010B.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/010B.png similarity index 100% rename from Resources/Images/CF_Acre_Images/010B.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/010B.png diff --git a/Resources/Images/CF_Acre_Images/010C.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/010C.png similarity index 100% rename from Resources/Images/CF_Acre_Images/010C.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/010C.png diff --git a/Resources/Images/CF_Acre_Images/010D.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/010D.png similarity index 100% rename from Resources/Images/CF_Acre_Images/010D.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/010D.png diff --git a/Resources/Images/CF_Acre_Images/010E.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/010E.png similarity index 100% rename from Resources/Images/CF_Acre_Images/010E.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/010E.png diff --git a/Resources/Images/CF_Acre_Images/010F.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/010F.png similarity index 100% rename from Resources/Images/CF_Acre_Images/010F.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/010F.png diff --git a/Resources/Images/CF_Acre_Images/0110.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0110.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0110.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0110.png diff --git a/Resources/Images/CF_Acre_Images/0111.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0111.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0111.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0111.png diff --git a/Resources/Images/CF_Acre_Images/0112.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0112.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0112.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0112.png diff --git a/Resources/Images/CF_Acre_Images/0113.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0113.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0113.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0113.png diff --git a/Resources/Images/CF_Acre_Images/0114.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0114.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0114.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0114.png diff --git a/Resources/Images/CF_Acre_Images/0115.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0115.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0115.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0115.png diff --git a/Resources/Images/CF_Acre_Images/0116.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0116.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0116.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0116.png diff --git a/Resources/Images/CF_Acre_Images/0117.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0117.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0117.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0117.png diff --git a/Resources/Images/CF_Acre_Images/0118.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0118.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0118.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0118.png diff --git a/Resources/Images/CF_Acre_Images/0119.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0119.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0119.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0119.png diff --git a/Resources/Images/CF_Acre_Images/011A.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/011A.png similarity index 100% rename from Resources/Images/CF_Acre_Images/011A.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/011A.png diff --git a/Resources/Images/CF_Acre_Images/011B.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/011B.png similarity index 100% rename from Resources/Images/CF_Acre_Images/011B.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/011B.png diff --git a/Resources/Images/CF_Acre_Images/011C.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/011C.png similarity index 100% rename from Resources/Images/CF_Acre_Images/011C.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/011C.png diff --git a/Resources/Images/CF_Acre_Images/011D.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/011D.png similarity index 100% rename from Resources/Images/CF_Acre_Images/011D.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/011D.png diff --git a/Resources/Images/CF_Acre_Images/011E.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/011E.png similarity index 100% rename from Resources/Images/CF_Acre_Images/011E.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/011E.png diff --git a/Resources/Images/CF_Acre_Images/011F.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/011F.png similarity index 100% rename from Resources/Images/CF_Acre_Images/011F.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/011F.png diff --git a/Resources/Images/CF_Acre_Images/0120.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0120.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0120.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0120.png diff --git a/Resources/Images/CF_Acre_Images/0121.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0121.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0121.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0121.png diff --git a/Resources/Images/CF_Acre_Images/0122.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0122.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0122.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0122.png diff --git a/Resources/Images/CF_Acre_Images/0123.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0123.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0123.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0123.png diff --git a/Resources/Images/CF_Acre_Images/0124.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0124.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0124.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0124.png diff --git a/Resources/Images/CF_Acre_Images/0125.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0125.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0125.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0125.png diff --git a/Resources/Images/CF_Acre_Images/0126.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0126.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0126.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0126.png diff --git a/Resources/Images/CF_Acre_Images/0127.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0127.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0127.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0127.png diff --git a/Resources/Images/CF_Acre_Images/0128.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0128.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0128.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0128.png diff --git a/Resources/Images/CF_Acre_Images/0129.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0129.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0129.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0129.png diff --git a/Resources/Images/CF_Acre_Images/012A.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/012A.png similarity index 100% rename from Resources/Images/CF_Acre_Images/012A.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/012A.png diff --git a/Resources/Images/CF_Acre_Images/012B.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/012B.png similarity index 100% rename from Resources/Images/CF_Acre_Images/012B.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/012B.png diff --git a/Resources/Images/CF_Acre_Images/012C.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/012C.png similarity index 100% rename from Resources/Images/CF_Acre_Images/012C.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/012C.png diff --git a/Resources/Images/CF_Acre_Images/012D.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/012D.png similarity index 100% rename from Resources/Images/CF_Acre_Images/012D.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/012D.png diff --git a/Resources/Images/CF_Acre_Images/012E.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/012E.png similarity index 100% rename from Resources/Images/CF_Acre_Images/012E.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/012E.png diff --git a/Resources/Images/CF_Acre_Images/012F.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/012F.png similarity index 100% rename from Resources/Images/CF_Acre_Images/012F.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/012F.png diff --git a/Resources/Images/CF_Acre_Images/0130.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0130.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0130.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0130.png diff --git a/Resources/Images/CF_Acre_Images/0131.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0131.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0131.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0131.png diff --git a/Resources/Images/CF_Acre_Images/0132.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0132.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0132.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0132.png diff --git a/Resources/Images/CF_Acre_Images/0133.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0133.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0133.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0133.png diff --git a/Resources/Images/CF_Acre_Images/0134.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0134.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0134.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0134.png diff --git a/Resources/Images/CF_Acre_Images/0135.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0135.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0135.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0135.png diff --git a/Resources/Images/CF_Acre_Images/0136.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0136.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0136.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0136.png diff --git a/Resources/Images/CF_Acre_Images/0137.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0137.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0137.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0137.png diff --git a/Resources/Images/CF_Acre_Images/0138.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0138.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0138.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0138.png diff --git a/Resources/Images/CF_Acre_Images/0139.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0139.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0139.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0139.png diff --git a/Resources/Images/CF_Acre_Images/013A.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/013A.png similarity index 100% rename from Resources/Images/CF_Acre_Images/013A.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/013A.png diff --git a/Resources/Images/CF_Acre_Images/013B.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/013B.png similarity index 100% rename from Resources/Images/CF_Acre_Images/013B.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/013B.png diff --git a/Resources/Images/CF_Acre_Images/013C.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/013C.png similarity index 100% rename from Resources/Images/CF_Acre_Images/013C.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/013C.png diff --git a/Resources/Images/CF_Acre_Images/013D.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/013D.png similarity index 100% rename from Resources/Images/CF_Acre_Images/013D.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/013D.png diff --git a/Resources/Images/CF_Acre_Images/013E.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/013E.png similarity index 100% rename from Resources/Images/CF_Acre_Images/013E.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/013E.png diff --git a/Resources/Images/CF_Acre_Images/013F.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/013F.png similarity index 100% rename from Resources/Images/CF_Acre_Images/013F.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/013F.png diff --git a/Resources/Images/CF_Acre_Images/0140.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0140.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0140.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0140.png diff --git a/Resources/Images/CF_Acre_Images/0141.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0141.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0141.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0141.png diff --git a/Resources/Images/CF_Acre_Images/0142.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0142.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0142.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0142.png diff --git a/Resources/Images/CF_Acre_Images/0143.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0143.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0143.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0143.png diff --git a/Resources/Images/CF_Acre_Images/0144.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0144.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0144.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0144.png diff --git a/Resources/Images/CF_Acre_Images/0145.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0145.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0145.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0145.png diff --git a/Resources/Images/CF_Acre_Images/0146.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0146.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0146.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0146.png diff --git a/Resources/Images/CF_Acre_Images/0147.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0147.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0147.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0147.png diff --git a/Resources/Images/CF_Acre_Images/0148.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0148.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0148.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0148.png diff --git a/Resources/Images/CF_Acre_Images/0149.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0149.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0149.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0149.png diff --git a/Resources/Images/CF_Acre_Images/014A.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/014A.png similarity index 100% rename from Resources/Images/CF_Acre_Images/014A.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/014A.png diff --git a/Resources/Images/CF_Acre_Images/014B.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/014B.png similarity index 100% rename from Resources/Images/CF_Acre_Images/014B.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/014B.png diff --git a/Resources/Images/CF_Acre_Images/014C.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/014C.png similarity index 100% rename from Resources/Images/CF_Acre_Images/014C.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/014C.png diff --git a/Resources/Images/CF_Acre_Images/014D.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/014D.png similarity index 100% rename from Resources/Images/CF_Acre_Images/014D.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/014D.png diff --git a/Resources/Images/CF_Acre_Images/014E.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/014E.png similarity index 100% rename from Resources/Images/CF_Acre_Images/014E.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/014E.png diff --git a/Resources/Images/CF_Acre_Images/014F.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/014F.png similarity index 100% rename from Resources/Images/CF_Acre_Images/014F.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/014F.png diff --git a/Resources/Images/CF_Acre_Images/0150.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0150.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0150.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0150.png diff --git a/Resources/Images/CF_Acre_Images/0151.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0151.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0151.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0151.png diff --git a/Resources/Images/CF_Acre_Images/0152.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0152.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0152.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0152.png diff --git a/Resources/Images/CF_Acre_Images/0153.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0153.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0153.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0153.png diff --git a/Resources/Images/CF_Acre_Images/0154.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0154.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0154.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0154.png diff --git a/Resources/Images/CF_Acre_Images/0155.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0155.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0155.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0155.png diff --git a/Resources/Images/CF_Acre_Images/0156.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0156.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0156.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0156.png diff --git a/Resources/Images/CF_Acre_Images/0157.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0157.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0157.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0157.png diff --git a/Resources/Images/CF_Acre_Images/0158.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0158.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0158.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0158.png diff --git a/Resources/Images/CF_Acre_Images/0159.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0159.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0159.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0159.png diff --git a/Resources/Images/CF_Acre_Images/015A.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/015A.png similarity index 100% rename from Resources/Images/CF_Acre_Images/015A.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/015A.png diff --git a/Resources/Images/CF_Acre_Images/015B.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/015B.png similarity index 100% rename from Resources/Images/CF_Acre_Images/015B.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/015B.png diff --git a/Resources/Images/CF_Acre_Images/015C.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/015C.png similarity index 100% rename from Resources/Images/CF_Acre_Images/015C.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/015C.png diff --git a/Resources/Images/CF_Acre_Images/015D.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/015D.png similarity index 100% rename from Resources/Images/CF_Acre_Images/015D.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/015D.png diff --git a/Resources/Images/CF_Acre_Images/015E.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/015E.png similarity index 100% rename from Resources/Images/CF_Acre_Images/015E.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/015E.png diff --git a/Resources/Images/CF_Acre_Images/015F.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/015F.png similarity index 100% rename from Resources/Images/CF_Acre_Images/015F.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/015F.png diff --git a/Resources/Images/CF_Acre_Images/0160.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0160.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0160.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0160.png diff --git a/Resources/Images/CF_Acre_Images/0161.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0161.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0161.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0161.png diff --git a/Resources/Images/CF_Acre_Images/0162.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0162.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0162.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0162.png diff --git a/Resources/Images/CF_Acre_Images/0163.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0163.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0163.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0163.png diff --git a/Resources/Images/CF_Acre_Images/0164.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0164.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0164.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0164.png diff --git a/Resources/Images/CF_Acre_Images/0165.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0165.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0165.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0165.png diff --git a/Resources/Images/CF_Acre_Images/0166.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0166.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0166.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0166.png diff --git a/Resources/Images/CF_Acre_Images/0167.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0167.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0167.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0167.png diff --git a/Resources/Images/CF_Acre_Images/0168.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0168.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0168.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0168.png diff --git a/Resources/Images/CF_Acre_Images/0169.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/0169.png similarity index 100% rename from Resources/Images/CF_Acre_Images/0169.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/0169.png diff --git a/Resources/Images/CF_Acre_Images/016A.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/016A.png similarity index 100% rename from Resources/Images/CF_Acre_Images/016A.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/016A.png diff --git a/Resources/Images/CF_Acre_Images/016B.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/016B.png similarity index 100% rename from Resources/Images/CF_Acre_Images/016B.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/016B.png diff --git a/Resources/Images/CF_Acre_Images/016C.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/016C.png similarity index 100% rename from Resources/Images/CF_Acre_Images/016C.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/016C.png diff --git a/Resources/Images/CF_Acre_Images/016D.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/016D.png similarity index 100% rename from Resources/Images/CF_Acre_Images/016D.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/016D.png diff --git a/Resources/Images/CF_Acre_Images/016E.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/016E.png similarity index 100% rename from Resources/Images/CF_Acre_Images/016E.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/016E.png diff --git a/Resources/Images/CF_Acre_Images/016F.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/016F.png similarity index 100% rename from Resources/Images/CF_Acre_Images/016F.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/016F.png diff --git a/Resources/Images/CF_Acre_Images/FFFF.png b/ACSE.WinForms/Resources/Images/CF_Acre_Images/FFFF.png similarity index 100% rename from Resources/Images/CF_Acre_Images/FFFF.png rename to ACSE.WinForms/Resources/Images/CF_Acre_Images/FFFF.png diff --git a/Resources/Images/Faces/Animal Crossing/0.bmp b/ACSE.WinForms/Resources/Images/Faces/Animal Crossing/0.bmp similarity index 100% rename from Resources/Images/Faces/Animal Crossing/0.bmp rename to ACSE.WinForms/Resources/Images/Faces/Animal Crossing/0.bmp diff --git a/Resources/Images/Faces/Animal Crossing/1.bmp b/ACSE.WinForms/Resources/Images/Faces/Animal Crossing/1.bmp similarity index 100% rename from Resources/Images/Faces/Animal Crossing/1.bmp rename to ACSE.WinForms/Resources/Images/Faces/Animal Crossing/1.bmp diff --git a/Resources/Images/Faces/Animal Crossing/10.bmp b/ACSE.WinForms/Resources/Images/Faces/Animal Crossing/10.bmp similarity index 100% rename from Resources/Images/Faces/Animal Crossing/10.bmp rename to ACSE.WinForms/Resources/Images/Faces/Animal Crossing/10.bmp diff --git a/Resources/Images/Faces/Animal Crossing/11.bmp b/ACSE.WinForms/Resources/Images/Faces/Animal Crossing/11.bmp similarity index 100% rename from Resources/Images/Faces/Animal Crossing/11.bmp rename to ACSE.WinForms/Resources/Images/Faces/Animal Crossing/11.bmp diff --git a/Resources/Images/Faces/Animal Crossing/12.bmp b/ACSE.WinForms/Resources/Images/Faces/Animal Crossing/12.bmp similarity index 100% rename from Resources/Images/Faces/Animal Crossing/12.bmp rename to ACSE.WinForms/Resources/Images/Faces/Animal Crossing/12.bmp diff --git a/Resources/Images/Faces/Animal Crossing/13.bmp b/ACSE.WinForms/Resources/Images/Faces/Animal Crossing/13.bmp similarity index 100% rename from Resources/Images/Faces/Animal Crossing/13.bmp rename to ACSE.WinForms/Resources/Images/Faces/Animal Crossing/13.bmp diff --git a/Resources/Images/Faces/Animal Crossing/14.bmp b/ACSE.WinForms/Resources/Images/Faces/Animal Crossing/14.bmp similarity index 100% rename from Resources/Images/Faces/Animal Crossing/14.bmp rename to ACSE.WinForms/Resources/Images/Faces/Animal Crossing/14.bmp diff --git a/Resources/Images/Faces/Animal Crossing/15.bmp b/ACSE.WinForms/Resources/Images/Faces/Animal Crossing/15.bmp similarity index 100% rename from Resources/Images/Faces/Animal Crossing/15.bmp rename to ACSE.WinForms/Resources/Images/Faces/Animal Crossing/15.bmp diff --git a/Resources/Images/Faces/Animal Crossing/16.bmp b/ACSE.WinForms/Resources/Images/Faces/Animal Crossing/16.bmp similarity index 100% rename from Resources/Images/Faces/Animal Crossing/16.bmp rename to ACSE.WinForms/Resources/Images/Faces/Animal Crossing/16.bmp diff --git a/Resources/Images/Faces/Animal Crossing/17.bmp b/ACSE.WinForms/Resources/Images/Faces/Animal Crossing/17.bmp similarity index 100% rename from Resources/Images/Faces/Animal Crossing/17.bmp rename to ACSE.WinForms/Resources/Images/Faces/Animal Crossing/17.bmp diff --git a/Resources/Images/Faces/Animal Crossing/18.bmp b/ACSE.WinForms/Resources/Images/Faces/Animal Crossing/18.bmp similarity index 100% rename from Resources/Images/Faces/Animal Crossing/18.bmp rename to ACSE.WinForms/Resources/Images/Faces/Animal Crossing/18.bmp diff --git a/Resources/Images/Faces/Animal Crossing/19.bmp b/ACSE.WinForms/Resources/Images/Faces/Animal Crossing/19.bmp similarity index 100% rename from Resources/Images/Faces/Animal Crossing/19.bmp rename to ACSE.WinForms/Resources/Images/Faces/Animal Crossing/19.bmp diff --git a/Resources/Images/Faces/Animal Crossing/2.bmp b/ACSE.WinForms/Resources/Images/Faces/Animal Crossing/2.bmp similarity index 100% rename from Resources/Images/Faces/Animal Crossing/2.bmp rename to ACSE.WinForms/Resources/Images/Faces/Animal Crossing/2.bmp diff --git a/Resources/Images/Faces/Animal Crossing/20.bmp b/ACSE.WinForms/Resources/Images/Faces/Animal Crossing/20.bmp similarity index 100% rename from Resources/Images/Faces/Animal Crossing/20.bmp rename to ACSE.WinForms/Resources/Images/Faces/Animal Crossing/20.bmp diff --git a/Resources/Images/Faces/Animal Crossing/21.bmp b/ACSE.WinForms/Resources/Images/Faces/Animal Crossing/21.bmp similarity index 100% rename from Resources/Images/Faces/Animal Crossing/21.bmp rename to ACSE.WinForms/Resources/Images/Faces/Animal Crossing/21.bmp diff --git a/Resources/Images/Faces/Animal Crossing/22.bmp b/ACSE.WinForms/Resources/Images/Faces/Animal Crossing/22.bmp similarity index 100% rename from Resources/Images/Faces/Animal Crossing/22.bmp rename to ACSE.WinForms/Resources/Images/Faces/Animal Crossing/22.bmp diff --git a/Resources/Images/Faces/Animal Crossing/23.bmp b/ACSE.WinForms/Resources/Images/Faces/Animal Crossing/23.bmp similarity index 100% rename from Resources/Images/Faces/Animal Crossing/23.bmp rename to ACSE.WinForms/Resources/Images/Faces/Animal Crossing/23.bmp diff --git a/Resources/Images/Faces/Animal Crossing/24.bmp b/ACSE.WinForms/Resources/Images/Faces/Animal Crossing/24.bmp similarity index 100% rename from Resources/Images/Faces/Animal Crossing/24.bmp rename to ACSE.WinForms/Resources/Images/Faces/Animal Crossing/24.bmp diff --git a/Resources/Images/Faces/Animal Crossing/25.bmp b/ACSE.WinForms/Resources/Images/Faces/Animal Crossing/25.bmp similarity index 100% rename from Resources/Images/Faces/Animal Crossing/25.bmp rename to ACSE.WinForms/Resources/Images/Faces/Animal Crossing/25.bmp diff --git a/Resources/Images/Faces/Animal Crossing/26.bmp b/ACSE.WinForms/Resources/Images/Faces/Animal Crossing/26.bmp similarity index 100% rename from Resources/Images/Faces/Animal Crossing/26.bmp rename to ACSE.WinForms/Resources/Images/Faces/Animal Crossing/26.bmp diff --git a/Resources/Images/Faces/Animal Crossing/27.bmp b/ACSE.WinForms/Resources/Images/Faces/Animal Crossing/27.bmp similarity index 100% rename from Resources/Images/Faces/Animal Crossing/27.bmp rename to ACSE.WinForms/Resources/Images/Faces/Animal Crossing/27.bmp diff --git a/Resources/Images/Faces/Animal Crossing/28.bmp b/ACSE.WinForms/Resources/Images/Faces/Animal Crossing/28.bmp similarity index 100% rename from Resources/Images/Faces/Animal Crossing/28.bmp rename to ACSE.WinForms/Resources/Images/Faces/Animal Crossing/28.bmp diff --git a/Resources/Images/Faces/Animal Crossing/29.bmp b/ACSE.WinForms/Resources/Images/Faces/Animal Crossing/29.bmp similarity index 100% rename from Resources/Images/Faces/Animal Crossing/29.bmp rename to ACSE.WinForms/Resources/Images/Faces/Animal Crossing/29.bmp diff --git a/Resources/Images/Faces/Animal Crossing/3.bmp b/ACSE.WinForms/Resources/Images/Faces/Animal Crossing/3.bmp similarity index 100% rename from Resources/Images/Faces/Animal Crossing/3.bmp rename to ACSE.WinForms/Resources/Images/Faces/Animal Crossing/3.bmp diff --git a/Resources/Images/Faces/Animal Crossing/30.bmp b/ACSE.WinForms/Resources/Images/Faces/Animal Crossing/30.bmp similarity index 100% rename from Resources/Images/Faces/Animal Crossing/30.bmp rename to ACSE.WinForms/Resources/Images/Faces/Animal Crossing/30.bmp diff --git a/Resources/Images/Faces/Animal Crossing/31.bmp b/ACSE.WinForms/Resources/Images/Faces/Animal Crossing/31.bmp similarity index 100% rename from Resources/Images/Faces/Animal Crossing/31.bmp rename to ACSE.WinForms/Resources/Images/Faces/Animal Crossing/31.bmp diff --git a/Resources/Images/Faces/Animal Crossing/32.bmp b/ACSE.WinForms/Resources/Images/Faces/Animal Crossing/32.bmp similarity index 100% rename from Resources/Images/Faces/Animal Crossing/32.bmp rename to ACSE.WinForms/Resources/Images/Faces/Animal Crossing/32.bmp diff --git a/Resources/Images/Faces/Animal Crossing/33.bmp b/ACSE.WinForms/Resources/Images/Faces/Animal Crossing/33.bmp similarity index 100% rename from Resources/Images/Faces/Animal Crossing/33.bmp rename to ACSE.WinForms/Resources/Images/Faces/Animal Crossing/33.bmp diff --git a/Resources/Images/Faces/Animal Crossing/34.bmp b/ACSE.WinForms/Resources/Images/Faces/Animal Crossing/34.bmp similarity index 100% rename from Resources/Images/Faces/Animal Crossing/34.bmp rename to ACSE.WinForms/Resources/Images/Faces/Animal Crossing/34.bmp diff --git a/Resources/Images/Faces/Animal Crossing/35.bmp b/ACSE.WinForms/Resources/Images/Faces/Animal Crossing/35.bmp similarity index 100% rename from Resources/Images/Faces/Animal Crossing/35.bmp rename to ACSE.WinForms/Resources/Images/Faces/Animal Crossing/35.bmp diff --git a/Resources/Images/Faces/Animal Crossing/36.bmp b/ACSE.WinForms/Resources/Images/Faces/Animal Crossing/36.bmp similarity index 100% rename from Resources/Images/Faces/Animal Crossing/36.bmp rename to ACSE.WinForms/Resources/Images/Faces/Animal Crossing/36.bmp diff --git a/Resources/Images/Faces/Animal Crossing/37.bmp b/ACSE.WinForms/Resources/Images/Faces/Animal Crossing/37.bmp similarity index 100% rename from Resources/Images/Faces/Animal Crossing/37.bmp rename to ACSE.WinForms/Resources/Images/Faces/Animal Crossing/37.bmp diff --git a/Resources/Images/Faces/Animal Crossing/38.bmp b/ACSE.WinForms/Resources/Images/Faces/Animal Crossing/38.bmp similarity index 100% rename from Resources/Images/Faces/Animal Crossing/38.bmp rename to ACSE.WinForms/Resources/Images/Faces/Animal Crossing/38.bmp diff --git a/Resources/Images/Faces/Animal Crossing/39.bmp b/ACSE.WinForms/Resources/Images/Faces/Animal Crossing/39.bmp similarity index 100% rename from Resources/Images/Faces/Animal Crossing/39.bmp rename to ACSE.WinForms/Resources/Images/Faces/Animal Crossing/39.bmp diff --git a/Resources/Images/Faces/Animal Crossing/4.bmp b/ACSE.WinForms/Resources/Images/Faces/Animal Crossing/4.bmp similarity index 100% rename from Resources/Images/Faces/Animal Crossing/4.bmp rename to ACSE.WinForms/Resources/Images/Faces/Animal Crossing/4.bmp diff --git a/Resources/Images/Faces/Animal Crossing/40.bmp b/ACSE.WinForms/Resources/Images/Faces/Animal Crossing/40.bmp similarity index 100% rename from Resources/Images/Faces/Animal Crossing/40.bmp rename to ACSE.WinForms/Resources/Images/Faces/Animal Crossing/40.bmp diff --git a/Resources/Images/Faces/Animal Crossing/41.bmp b/ACSE.WinForms/Resources/Images/Faces/Animal Crossing/41.bmp similarity index 100% rename from Resources/Images/Faces/Animal Crossing/41.bmp rename to ACSE.WinForms/Resources/Images/Faces/Animal Crossing/41.bmp diff --git a/Resources/Images/Faces/Animal Crossing/42.bmp b/ACSE.WinForms/Resources/Images/Faces/Animal Crossing/42.bmp similarity index 100% rename from Resources/Images/Faces/Animal Crossing/42.bmp rename to ACSE.WinForms/Resources/Images/Faces/Animal Crossing/42.bmp diff --git a/Resources/Images/Faces/Animal Crossing/43.bmp b/ACSE.WinForms/Resources/Images/Faces/Animal Crossing/43.bmp similarity index 100% rename from Resources/Images/Faces/Animal Crossing/43.bmp rename to ACSE.WinForms/Resources/Images/Faces/Animal Crossing/43.bmp diff --git a/Resources/Images/Faces/Animal Crossing/44.bmp b/ACSE.WinForms/Resources/Images/Faces/Animal Crossing/44.bmp similarity index 100% rename from Resources/Images/Faces/Animal Crossing/44.bmp rename to ACSE.WinForms/Resources/Images/Faces/Animal Crossing/44.bmp diff --git a/Resources/Images/Faces/Animal Crossing/45.bmp b/ACSE.WinForms/Resources/Images/Faces/Animal Crossing/45.bmp similarity index 100% rename from Resources/Images/Faces/Animal Crossing/45.bmp rename to ACSE.WinForms/Resources/Images/Faces/Animal Crossing/45.bmp diff --git a/Resources/Images/Faces/Animal Crossing/46.bmp b/ACSE.WinForms/Resources/Images/Faces/Animal Crossing/46.bmp similarity index 100% rename from Resources/Images/Faces/Animal Crossing/46.bmp rename to ACSE.WinForms/Resources/Images/Faces/Animal Crossing/46.bmp diff --git a/Resources/Images/Faces/Animal Crossing/47.bmp b/ACSE.WinForms/Resources/Images/Faces/Animal Crossing/47.bmp similarity index 100% rename from Resources/Images/Faces/Animal Crossing/47.bmp rename to ACSE.WinForms/Resources/Images/Faces/Animal Crossing/47.bmp diff --git a/Resources/Images/Faces/Animal Crossing/48.bmp b/ACSE.WinForms/Resources/Images/Faces/Animal Crossing/48.bmp similarity index 100% rename from Resources/Images/Faces/Animal Crossing/48.bmp rename to ACSE.WinForms/Resources/Images/Faces/Animal Crossing/48.bmp diff --git a/Resources/Images/Faces/Animal Crossing/49.bmp b/ACSE.WinForms/Resources/Images/Faces/Animal Crossing/49.bmp similarity index 100% rename from Resources/Images/Faces/Animal Crossing/49.bmp rename to ACSE.WinForms/Resources/Images/Faces/Animal Crossing/49.bmp diff --git a/Resources/Images/Faces/Animal Crossing/5.bmp b/ACSE.WinForms/Resources/Images/Faces/Animal Crossing/5.bmp similarity index 100% rename from Resources/Images/Faces/Animal Crossing/5.bmp rename to ACSE.WinForms/Resources/Images/Faces/Animal Crossing/5.bmp diff --git a/Resources/Images/Faces/Animal Crossing/50.bmp b/ACSE.WinForms/Resources/Images/Faces/Animal Crossing/50.bmp similarity index 100% rename from Resources/Images/Faces/Animal Crossing/50.bmp rename to ACSE.WinForms/Resources/Images/Faces/Animal Crossing/50.bmp diff --git a/Resources/Images/Faces/Animal Crossing/51.bmp b/ACSE.WinForms/Resources/Images/Faces/Animal Crossing/51.bmp similarity index 100% rename from Resources/Images/Faces/Animal Crossing/51.bmp rename to ACSE.WinForms/Resources/Images/Faces/Animal Crossing/51.bmp diff --git a/Resources/Images/Faces/Animal Crossing/52.bmp b/ACSE.WinForms/Resources/Images/Faces/Animal Crossing/52.bmp similarity index 100% rename from Resources/Images/Faces/Animal Crossing/52.bmp rename to ACSE.WinForms/Resources/Images/Faces/Animal Crossing/52.bmp diff --git a/Resources/Images/Faces/Animal Crossing/53.bmp b/ACSE.WinForms/Resources/Images/Faces/Animal Crossing/53.bmp similarity index 100% rename from Resources/Images/Faces/Animal Crossing/53.bmp rename to ACSE.WinForms/Resources/Images/Faces/Animal Crossing/53.bmp diff --git a/Resources/Images/Faces/Animal Crossing/54.bmp b/ACSE.WinForms/Resources/Images/Faces/Animal Crossing/54.bmp similarity index 100% rename from Resources/Images/Faces/Animal Crossing/54.bmp rename to ACSE.WinForms/Resources/Images/Faces/Animal Crossing/54.bmp diff --git a/Resources/Images/Faces/Animal Crossing/55.bmp b/ACSE.WinForms/Resources/Images/Faces/Animal Crossing/55.bmp similarity index 100% rename from Resources/Images/Faces/Animal Crossing/55.bmp rename to ACSE.WinForms/Resources/Images/Faces/Animal Crossing/55.bmp diff --git a/Resources/Images/Faces/Animal Crossing/56.bmp b/ACSE.WinForms/Resources/Images/Faces/Animal Crossing/56.bmp similarity index 100% rename from Resources/Images/Faces/Animal Crossing/56.bmp rename to ACSE.WinForms/Resources/Images/Faces/Animal Crossing/56.bmp diff --git a/Resources/Images/Faces/Animal Crossing/57.bmp b/ACSE.WinForms/Resources/Images/Faces/Animal Crossing/57.bmp similarity index 100% rename from Resources/Images/Faces/Animal Crossing/57.bmp rename to ACSE.WinForms/Resources/Images/Faces/Animal Crossing/57.bmp diff --git a/Resources/Images/Faces/Animal Crossing/58.bmp b/ACSE.WinForms/Resources/Images/Faces/Animal Crossing/58.bmp similarity index 100% rename from Resources/Images/Faces/Animal Crossing/58.bmp rename to ACSE.WinForms/Resources/Images/Faces/Animal Crossing/58.bmp diff --git a/Resources/Images/Faces/Animal Crossing/59.bmp b/ACSE.WinForms/Resources/Images/Faces/Animal Crossing/59.bmp similarity index 100% rename from Resources/Images/Faces/Animal Crossing/59.bmp rename to ACSE.WinForms/Resources/Images/Faces/Animal Crossing/59.bmp diff --git a/Resources/Images/Faces/Animal Crossing/6.bmp b/ACSE.WinForms/Resources/Images/Faces/Animal Crossing/6.bmp similarity index 100% rename from Resources/Images/Faces/Animal Crossing/6.bmp rename to ACSE.WinForms/Resources/Images/Faces/Animal Crossing/6.bmp diff --git a/Resources/Images/Faces/Animal Crossing/60.bmp b/ACSE.WinForms/Resources/Images/Faces/Animal Crossing/60.bmp similarity index 100% rename from Resources/Images/Faces/Animal Crossing/60.bmp rename to ACSE.WinForms/Resources/Images/Faces/Animal Crossing/60.bmp diff --git a/Resources/Images/Faces/Animal Crossing/61.bmp b/ACSE.WinForms/Resources/Images/Faces/Animal Crossing/61.bmp similarity index 100% rename from Resources/Images/Faces/Animal Crossing/61.bmp rename to ACSE.WinForms/Resources/Images/Faces/Animal Crossing/61.bmp diff --git a/Resources/Images/Faces/Animal Crossing/62.bmp b/ACSE.WinForms/Resources/Images/Faces/Animal Crossing/62.bmp similarity index 100% rename from Resources/Images/Faces/Animal Crossing/62.bmp rename to ACSE.WinForms/Resources/Images/Faces/Animal Crossing/62.bmp diff --git a/Resources/Images/Faces/Animal Crossing/63.bmp b/ACSE.WinForms/Resources/Images/Faces/Animal Crossing/63.bmp similarity index 100% rename from Resources/Images/Faces/Animal Crossing/63.bmp rename to ACSE.WinForms/Resources/Images/Faces/Animal Crossing/63.bmp diff --git a/Resources/Images/Faces/Animal Crossing/7.bmp b/ACSE.WinForms/Resources/Images/Faces/Animal Crossing/7.bmp similarity index 100% rename from Resources/Images/Faces/Animal Crossing/7.bmp rename to ACSE.WinForms/Resources/Images/Faces/Animal Crossing/7.bmp diff --git a/Resources/Images/Faces/Animal Crossing/8.bmp b/ACSE.WinForms/Resources/Images/Faces/Animal Crossing/8.bmp similarity index 100% rename from Resources/Images/Faces/Animal Crossing/8.bmp rename to ACSE.WinForms/Resources/Images/Faces/Animal Crossing/8.bmp diff --git a/Resources/Images/Faces/Animal Crossing/9.bmp b/ACSE.WinForms/Resources/Images/Faces/Animal Crossing/9.bmp similarity index 100% rename from Resources/Images/Faces/Animal Crossing/9.bmp rename to ACSE.WinForms/Resources/Images/Faces/Animal Crossing/9.bmp diff --git a/Resources/Images/Faces/New Leaf/Female/0.bmp b/ACSE.WinForms/Resources/Images/Faces/New Leaf/Female/0.bmp similarity index 100% rename from Resources/Images/Faces/New Leaf/Female/0.bmp rename to ACSE.WinForms/Resources/Images/Faces/New Leaf/Female/0.bmp diff --git a/Resources/Images/Faces/New Leaf/Female/1.bmp b/ACSE.WinForms/Resources/Images/Faces/New Leaf/Female/1.bmp similarity index 100% rename from Resources/Images/Faces/New Leaf/Female/1.bmp rename to ACSE.WinForms/Resources/Images/Faces/New Leaf/Female/1.bmp diff --git a/Resources/Images/Faces/New Leaf/Female/10.bmp b/ACSE.WinForms/Resources/Images/Faces/New Leaf/Female/10.bmp similarity index 100% rename from Resources/Images/Faces/New Leaf/Female/10.bmp rename to ACSE.WinForms/Resources/Images/Faces/New Leaf/Female/10.bmp diff --git a/Resources/Images/Faces/New Leaf/Female/11.bmp b/ACSE.WinForms/Resources/Images/Faces/New Leaf/Female/11.bmp similarity index 100% rename from Resources/Images/Faces/New Leaf/Female/11.bmp rename to ACSE.WinForms/Resources/Images/Faces/New Leaf/Female/11.bmp diff --git a/Resources/Images/Faces/New Leaf/Female/2.bmp b/ACSE.WinForms/Resources/Images/Faces/New Leaf/Female/2.bmp similarity index 100% rename from Resources/Images/Faces/New Leaf/Female/2.bmp rename to ACSE.WinForms/Resources/Images/Faces/New Leaf/Female/2.bmp diff --git a/Resources/Images/Faces/New Leaf/Female/3.bmp b/ACSE.WinForms/Resources/Images/Faces/New Leaf/Female/3.bmp similarity index 100% rename from Resources/Images/Faces/New Leaf/Female/3.bmp rename to ACSE.WinForms/Resources/Images/Faces/New Leaf/Female/3.bmp diff --git a/Resources/Images/Faces/New Leaf/Female/4.bmp b/ACSE.WinForms/Resources/Images/Faces/New Leaf/Female/4.bmp similarity index 100% rename from Resources/Images/Faces/New Leaf/Female/4.bmp rename to ACSE.WinForms/Resources/Images/Faces/New Leaf/Female/4.bmp diff --git a/Resources/Images/Faces/New Leaf/Female/5.bmp b/ACSE.WinForms/Resources/Images/Faces/New Leaf/Female/5.bmp similarity index 100% rename from Resources/Images/Faces/New Leaf/Female/5.bmp rename to ACSE.WinForms/Resources/Images/Faces/New Leaf/Female/5.bmp diff --git a/Resources/Images/Faces/New Leaf/Female/6.bmp b/ACSE.WinForms/Resources/Images/Faces/New Leaf/Female/6.bmp similarity index 100% rename from Resources/Images/Faces/New Leaf/Female/6.bmp rename to ACSE.WinForms/Resources/Images/Faces/New Leaf/Female/6.bmp diff --git a/Resources/Images/Faces/New Leaf/Female/7.bmp b/ACSE.WinForms/Resources/Images/Faces/New Leaf/Female/7.bmp similarity index 100% rename from Resources/Images/Faces/New Leaf/Female/7.bmp rename to ACSE.WinForms/Resources/Images/Faces/New Leaf/Female/7.bmp diff --git a/Resources/Images/Faces/New Leaf/Female/8.bmp b/ACSE.WinForms/Resources/Images/Faces/New Leaf/Female/8.bmp similarity index 100% rename from Resources/Images/Faces/New Leaf/Female/8.bmp rename to ACSE.WinForms/Resources/Images/Faces/New Leaf/Female/8.bmp diff --git a/Resources/Images/Faces/New Leaf/Female/9.bmp b/ACSE.WinForms/Resources/Images/Faces/New Leaf/Female/9.bmp similarity index 100% rename from Resources/Images/Faces/New Leaf/Female/9.bmp rename to ACSE.WinForms/Resources/Images/Faces/New Leaf/Female/9.bmp diff --git a/Resources/Images/Faces/New Leaf/Male/0.bmp b/ACSE.WinForms/Resources/Images/Faces/New Leaf/Male/0.bmp similarity index 100% rename from Resources/Images/Faces/New Leaf/Male/0.bmp rename to ACSE.WinForms/Resources/Images/Faces/New Leaf/Male/0.bmp diff --git a/Resources/Images/Faces/New Leaf/Male/1.bmp b/ACSE.WinForms/Resources/Images/Faces/New Leaf/Male/1.bmp similarity index 100% rename from Resources/Images/Faces/New Leaf/Male/1.bmp rename to ACSE.WinForms/Resources/Images/Faces/New Leaf/Male/1.bmp diff --git a/Resources/Images/Faces/New Leaf/Male/10.bmp b/ACSE.WinForms/Resources/Images/Faces/New Leaf/Male/10.bmp similarity index 100% rename from Resources/Images/Faces/New Leaf/Male/10.bmp rename to ACSE.WinForms/Resources/Images/Faces/New Leaf/Male/10.bmp diff --git a/Resources/Images/Faces/New Leaf/Male/11.bmp b/ACSE.WinForms/Resources/Images/Faces/New Leaf/Male/11.bmp similarity index 100% rename from Resources/Images/Faces/New Leaf/Male/11.bmp rename to ACSE.WinForms/Resources/Images/Faces/New Leaf/Male/11.bmp diff --git a/Resources/Images/Faces/New Leaf/Male/2.bmp b/ACSE.WinForms/Resources/Images/Faces/New Leaf/Male/2.bmp similarity index 100% rename from Resources/Images/Faces/New Leaf/Male/2.bmp rename to ACSE.WinForms/Resources/Images/Faces/New Leaf/Male/2.bmp diff --git a/Resources/Images/Faces/New Leaf/Male/3.bmp b/ACSE.WinForms/Resources/Images/Faces/New Leaf/Male/3.bmp similarity index 100% rename from Resources/Images/Faces/New Leaf/Male/3.bmp rename to ACSE.WinForms/Resources/Images/Faces/New Leaf/Male/3.bmp diff --git a/Resources/Images/Faces/New Leaf/Male/4.bmp b/ACSE.WinForms/Resources/Images/Faces/New Leaf/Male/4.bmp similarity index 100% rename from Resources/Images/Faces/New Leaf/Male/4.bmp rename to ACSE.WinForms/Resources/Images/Faces/New Leaf/Male/4.bmp diff --git a/Resources/Images/Faces/New Leaf/Male/5.bmp b/ACSE.WinForms/Resources/Images/Faces/New Leaf/Male/5.bmp similarity index 100% rename from Resources/Images/Faces/New Leaf/Male/5.bmp rename to ACSE.WinForms/Resources/Images/Faces/New Leaf/Male/5.bmp diff --git a/Resources/Images/Faces/New Leaf/Male/6.bmp b/ACSE.WinForms/Resources/Images/Faces/New Leaf/Male/6.bmp similarity index 100% rename from Resources/Images/Faces/New Leaf/Male/6.bmp rename to ACSE.WinForms/Resources/Images/Faces/New Leaf/Male/6.bmp diff --git a/Resources/Images/Faces/New Leaf/Male/7.bmp b/ACSE.WinForms/Resources/Images/Faces/New Leaf/Male/7.bmp similarity index 100% rename from Resources/Images/Faces/New Leaf/Male/7.bmp rename to ACSE.WinForms/Resources/Images/Faces/New Leaf/Male/7.bmp diff --git a/Resources/Images/Faces/New Leaf/Male/8.bmp b/ACSE.WinForms/Resources/Images/Faces/New Leaf/Male/8.bmp similarity index 100% rename from Resources/Images/Faces/New Leaf/Male/8.bmp rename to ACSE.WinForms/Resources/Images/Faces/New Leaf/Male/8.bmp diff --git a/Resources/Images/Faces/New Leaf/Male/9.bmp b/ACSE.WinForms/Resources/Images/Faces/New Leaf/Male/9.bmp similarity index 100% rename from Resources/Images/Faces/New Leaf/Male/9.bmp rename to ACSE.WinForms/Resources/Images/Faces/New Leaf/Male/9.bmp diff --git a/Resources/Images/Faces/Wild World/0.bmp b/ACSE.WinForms/Resources/Images/Faces/Wild World/0.bmp similarity index 100% rename from Resources/Images/Faces/Wild World/0.bmp rename to ACSE.WinForms/Resources/Images/Faces/Wild World/0.bmp diff --git a/Resources/Images/Faces/Wild World/1.bmp b/ACSE.WinForms/Resources/Images/Faces/Wild World/1.bmp similarity index 100% rename from Resources/Images/Faces/Wild World/1.bmp rename to ACSE.WinForms/Resources/Images/Faces/Wild World/1.bmp diff --git a/Resources/Images/Faces/Wild World/10.bmp b/ACSE.WinForms/Resources/Images/Faces/Wild World/10.bmp similarity index 100% rename from Resources/Images/Faces/Wild World/10.bmp rename to ACSE.WinForms/Resources/Images/Faces/Wild World/10.bmp diff --git a/Resources/Images/Faces/Wild World/11.bmp b/ACSE.WinForms/Resources/Images/Faces/Wild World/11.bmp similarity index 100% rename from Resources/Images/Faces/Wild World/11.bmp rename to ACSE.WinForms/Resources/Images/Faces/Wild World/11.bmp diff --git a/Resources/Images/Faces/Wild World/12.bmp b/ACSE.WinForms/Resources/Images/Faces/Wild World/12.bmp similarity index 100% rename from Resources/Images/Faces/Wild World/12.bmp rename to ACSE.WinForms/Resources/Images/Faces/Wild World/12.bmp diff --git a/Resources/Images/Faces/Wild World/13.bmp b/ACSE.WinForms/Resources/Images/Faces/Wild World/13.bmp similarity index 100% rename from Resources/Images/Faces/Wild World/13.bmp rename to ACSE.WinForms/Resources/Images/Faces/Wild World/13.bmp diff --git a/Resources/Images/Faces/Wild World/14.bmp b/ACSE.WinForms/Resources/Images/Faces/Wild World/14.bmp similarity index 100% rename from Resources/Images/Faces/Wild World/14.bmp rename to ACSE.WinForms/Resources/Images/Faces/Wild World/14.bmp diff --git a/Resources/Images/Faces/Wild World/15.bmp b/ACSE.WinForms/Resources/Images/Faces/Wild World/15.bmp similarity index 100% rename from Resources/Images/Faces/Wild World/15.bmp rename to ACSE.WinForms/Resources/Images/Faces/Wild World/15.bmp diff --git a/Resources/Images/Faces/Wild World/2.bmp b/ACSE.WinForms/Resources/Images/Faces/Wild World/2.bmp similarity index 100% rename from Resources/Images/Faces/Wild World/2.bmp rename to ACSE.WinForms/Resources/Images/Faces/Wild World/2.bmp diff --git a/Resources/Images/Faces/Wild World/3.bmp b/ACSE.WinForms/Resources/Images/Faces/Wild World/3.bmp similarity index 100% rename from Resources/Images/Faces/Wild World/3.bmp rename to ACSE.WinForms/Resources/Images/Faces/Wild World/3.bmp diff --git a/Resources/Images/Faces/Wild World/4.bmp b/ACSE.WinForms/Resources/Images/Faces/Wild World/4.bmp similarity index 100% rename from Resources/Images/Faces/Wild World/4.bmp rename to ACSE.WinForms/Resources/Images/Faces/Wild World/4.bmp diff --git a/Resources/Images/Faces/Wild World/5.bmp b/ACSE.WinForms/Resources/Images/Faces/Wild World/5.bmp similarity index 100% rename from Resources/Images/Faces/Wild World/5.bmp rename to ACSE.WinForms/Resources/Images/Faces/Wild World/5.bmp diff --git a/Resources/Images/Faces/Wild World/6.bmp b/ACSE.WinForms/Resources/Images/Faces/Wild World/6.bmp similarity index 100% rename from Resources/Images/Faces/Wild World/6.bmp rename to ACSE.WinForms/Resources/Images/Faces/Wild World/6.bmp diff --git a/Resources/Images/Faces/Wild World/7.bmp b/ACSE.WinForms/Resources/Images/Faces/Wild World/7.bmp similarity index 100% rename from Resources/Images/Faces/Wild World/7.bmp rename to ACSE.WinForms/Resources/Images/Faces/Wild World/7.bmp diff --git a/Resources/Images/Faces/Wild World/8.bmp b/ACSE.WinForms/Resources/Images/Faces/Wild World/8.bmp similarity index 100% rename from Resources/Images/Faces/Wild World/8.bmp rename to ACSE.WinForms/Resources/Images/Faces/Wild World/8.bmp diff --git a/Resources/Images/Faces/Wild World/9.bmp b/ACSE.WinForms/Resources/Images/Faces/Wild World/9.bmp similarity index 100% rename from Resources/Images/Faces/Wild World/9.bmp rename to ACSE.WinForms/Resources/Images/Faces/Wild World/9.bmp diff --git a/Resources/Images/Hair Styles/New Leaf/0.png b/ACSE.WinForms/Resources/Images/Hair Styles/New Leaf/0.png similarity index 100% rename from Resources/Images/Hair Styles/New Leaf/0.png rename to ACSE.WinForms/Resources/Images/Hair Styles/New Leaf/0.png diff --git a/Resources/Images/Hair Styles/New Leaf/1.png b/ACSE.WinForms/Resources/Images/Hair Styles/New Leaf/1.png similarity index 100% rename from Resources/Images/Hair Styles/New Leaf/1.png rename to ACSE.WinForms/Resources/Images/Hair Styles/New Leaf/1.png diff --git a/Resources/Images/Hair Styles/New Leaf/10.png b/ACSE.WinForms/Resources/Images/Hair Styles/New Leaf/10.png similarity index 100% rename from Resources/Images/Hair Styles/New Leaf/10.png rename to ACSE.WinForms/Resources/Images/Hair Styles/New Leaf/10.png diff --git a/Resources/Images/Hair Styles/New Leaf/11.png b/ACSE.WinForms/Resources/Images/Hair Styles/New Leaf/11.png similarity index 100% rename from Resources/Images/Hair Styles/New Leaf/11.png rename to ACSE.WinForms/Resources/Images/Hair Styles/New Leaf/11.png diff --git a/Resources/Images/Hair Styles/New Leaf/12.png b/ACSE.WinForms/Resources/Images/Hair Styles/New Leaf/12.png similarity index 100% rename from Resources/Images/Hair Styles/New Leaf/12.png rename to ACSE.WinForms/Resources/Images/Hair Styles/New Leaf/12.png diff --git a/Resources/Images/Hair Styles/New Leaf/13.png b/ACSE.WinForms/Resources/Images/Hair Styles/New Leaf/13.png similarity index 100% rename from Resources/Images/Hair Styles/New Leaf/13.png rename to ACSE.WinForms/Resources/Images/Hair Styles/New Leaf/13.png diff --git a/Resources/Images/Hair Styles/New Leaf/14.png b/ACSE.WinForms/Resources/Images/Hair Styles/New Leaf/14.png similarity index 100% rename from Resources/Images/Hair Styles/New Leaf/14.png rename to ACSE.WinForms/Resources/Images/Hair Styles/New Leaf/14.png diff --git a/Resources/Images/Hair Styles/New Leaf/15.png b/ACSE.WinForms/Resources/Images/Hair Styles/New Leaf/15.png similarity index 100% rename from Resources/Images/Hair Styles/New Leaf/15.png rename to ACSE.WinForms/Resources/Images/Hair Styles/New Leaf/15.png diff --git a/Resources/Images/Hair Styles/New Leaf/17.png b/ACSE.WinForms/Resources/Images/Hair Styles/New Leaf/17.png similarity index 100% rename from Resources/Images/Hair Styles/New Leaf/17.png rename to ACSE.WinForms/Resources/Images/Hair Styles/New Leaf/17.png diff --git a/Resources/Images/Hair Styles/New Leaf/18.png b/ACSE.WinForms/Resources/Images/Hair Styles/New Leaf/18.png similarity index 100% rename from Resources/Images/Hair Styles/New Leaf/18.png rename to ACSE.WinForms/Resources/Images/Hair Styles/New Leaf/18.png diff --git a/Resources/Images/Hair Styles/New Leaf/19.png b/ACSE.WinForms/Resources/Images/Hair Styles/New Leaf/19.png similarity index 100% rename from Resources/Images/Hair Styles/New Leaf/19.png rename to ACSE.WinForms/Resources/Images/Hair Styles/New Leaf/19.png diff --git a/Resources/Images/Hair Styles/New Leaf/2.png b/ACSE.WinForms/Resources/Images/Hair Styles/New Leaf/2.png similarity index 100% rename from Resources/Images/Hair Styles/New Leaf/2.png rename to ACSE.WinForms/Resources/Images/Hair Styles/New Leaf/2.png diff --git a/Resources/Images/Hair Styles/New Leaf/20.png b/ACSE.WinForms/Resources/Images/Hair Styles/New Leaf/20.png similarity index 100% rename from Resources/Images/Hair Styles/New Leaf/20.png rename to ACSE.WinForms/Resources/Images/Hair Styles/New Leaf/20.png diff --git a/Resources/Images/Hair Styles/New Leaf/21.png b/ACSE.WinForms/Resources/Images/Hair Styles/New Leaf/21.png similarity index 100% rename from Resources/Images/Hair Styles/New Leaf/21.png rename to ACSE.WinForms/Resources/Images/Hair Styles/New Leaf/21.png diff --git a/Resources/Images/Hair Styles/New Leaf/22.png b/ACSE.WinForms/Resources/Images/Hair Styles/New Leaf/22.png similarity index 100% rename from Resources/Images/Hair Styles/New Leaf/22.png rename to ACSE.WinForms/Resources/Images/Hair Styles/New Leaf/22.png diff --git a/Resources/Images/Hair Styles/New Leaf/23.png b/ACSE.WinForms/Resources/Images/Hair Styles/New Leaf/23.png similarity index 100% rename from Resources/Images/Hair Styles/New Leaf/23.png rename to ACSE.WinForms/Resources/Images/Hair Styles/New Leaf/23.png diff --git a/Resources/Images/Hair Styles/New Leaf/24.png b/ACSE.WinForms/Resources/Images/Hair Styles/New Leaf/24.png similarity index 100% rename from Resources/Images/Hair Styles/New Leaf/24.png rename to ACSE.WinForms/Resources/Images/Hair Styles/New Leaf/24.png diff --git a/Resources/Images/Hair Styles/New Leaf/25.png b/ACSE.WinForms/Resources/Images/Hair Styles/New Leaf/25.png similarity index 100% rename from Resources/Images/Hair Styles/New Leaf/25.png rename to ACSE.WinForms/Resources/Images/Hair Styles/New Leaf/25.png diff --git a/Resources/Images/Hair Styles/New Leaf/26.png b/ACSE.WinForms/Resources/Images/Hair Styles/New Leaf/26.png similarity index 100% rename from Resources/Images/Hair Styles/New Leaf/26.png rename to ACSE.WinForms/Resources/Images/Hair Styles/New Leaf/26.png diff --git a/Resources/Images/Hair Styles/New Leaf/27.png b/ACSE.WinForms/Resources/Images/Hair Styles/New Leaf/27.png similarity index 100% rename from Resources/Images/Hair Styles/New Leaf/27.png rename to ACSE.WinForms/Resources/Images/Hair Styles/New Leaf/27.png diff --git a/Resources/Images/Hair Styles/New Leaf/28.png b/ACSE.WinForms/Resources/Images/Hair Styles/New Leaf/28.png similarity index 100% rename from Resources/Images/Hair Styles/New Leaf/28.png rename to ACSE.WinForms/Resources/Images/Hair Styles/New Leaf/28.png diff --git a/Resources/Images/Hair Styles/New Leaf/29.png b/ACSE.WinForms/Resources/Images/Hair Styles/New Leaf/29.png similarity index 100% rename from Resources/Images/Hair Styles/New Leaf/29.png rename to ACSE.WinForms/Resources/Images/Hair Styles/New Leaf/29.png diff --git a/Resources/Images/Hair Styles/New Leaf/3.png b/ACSE.WinForms/Resources/Images/Hair Styles/New Leaf/3.png similarity index 100% rename from Resources/Images/Hair Styles/New Leaf/3.png rename to ACSE.WinForms/Resources/Images/Hair Styles/New Leaf/3.png diff --git a/Resources/Images/Hair Styles/New Leaf/30.png b/ACSE.WinForms/Resources/Images/Hair Styles/New Leaf/30.png similarity index 100% rename from Resources/Images/Hair Styles/New Leaf/30.png rename to ACSE.WinForms/Resources/Images/Hair Styles/New Leaf/30.png diff --git a/Resources/Images/Hair Styles/New Leaf/31.png b/ACSE.WinForms/Resources/Images/Hair Styles/New Leaf/31.png similarity index 100% rename from Resources/Images/Hair Styles/New Leaf/31.png rename to ACSE.WinForms/Resources/Images/Hair Styles/New Leaf/31.png diff --git a/Resources/Images/Hair Styles/New Leaf/32.png b/ACSE.WinForms/Resources/Images/Hair Styles/New Leaf/32.png similarity index 100% rename from Resources/Images/Hair Styles/New Leaf/32.png rename to ACSE.WinForms/Resources/Images/Hair Styles/New Leaf/32.png diff --git a/Resources/Images/Hair Styles/New Leaf/4.png b/ACSE.WinForms/Resources/Images/Hair Styles/New Leaf/4.png similarity index 100% rename from Resources/Images/Hair Styles/New Leaf/4.png rename to ACSE.WinForms/Resources/Images/Hair Styles/New Leaf/4.png diff --git a/Resources/Images/Hair Styles/New Leaf/5.png b/ACSE.WinForms/Resources/Images/Hair Styles/New Leaf/5.png similarity index 100% rename from Resources/Images/Hair Styles/New Leaf/5.png rename to ACSE.WinForms/Resources/Images/Hair Styles/New Leaf/5.png diff --git a/Resources/Images/Hair Styles/New Leaf/6.png b/ACSE.WinForms/Resources/Images/Hair Styles/New Leaf/6.png similarity index 100% rename from Resources/Images/Hair Styles/New Leaf/6.png rename to ACSE.WinForms/Resources/Images/Hair Styles/New Leaf/6.png diff --git a/Resources/Images/Hair Styles/New Leaf/7.png b/ACSE.WinForms/Resources/Images/Hair Styles/New Leaf/7.png similarity index 100% rename from Resources/Images/Hair Styles/New Leaf/7.png rename to ACSE.WinForms/Resources/Images/Hair Styles/New Leaf/7.png diff --git a/Resources/Images/Hair Styles/New Leaf/8.png b/ACSE.WinForms/Resources/Images/Hair Styles/New Leaf/8.png similarity index 100% rename from Resources/Images/Hair Styles/New Leaf/8.png rename to ACSE.WinForms/Resources/Images/Hair Styles/New Leaf/8.png diff --git a/Resources/Images/Hair Styles/New Leaf/9.png b/ACSE.WinForms/Resources/Images/Hair Styles/New Leaf/9.png similarity index 100% rename from Resources/Images/Hair Styles/New Leaf/9.png rename to ACSE.WinForms/Resources/Images/Hair Styles/New Leaf/9.png diff --git a/Resources/Images/Icons/Stations/1.png b/ACSE.WinForms/Resources/Images/Icons/Stations/1.png similarity index 100% rename from Resources/Images/Icons/Stations/1.png rename to ACSE.WinForms/Resources/Images/Icons/Stations/1.png diff --git a/Resources/Images/Icons/Stations/10.png b/ACSE.WinForms/Resources/Images/Icons/Stations/10.png similarity index 100% rename from Resources/Images/Icons/Stations/10.png rename to ACSE.WinForms/Resources/Images/Icons/Stations/10.png diff --git a/Resources/Images/Icons/Stations/11.png b/ACSE.WinForms/Resources/Images/Icons/Stations/11.png similarity index 100% rename from Resources/Images/Icons/Stations/11.png rename to ACSE.WinForms/Resources/Images/Icons/Stations/11.png diff --git a/Resources/Images/Icons/Stations/12.png b/ACSE.WinForms/Resources/Images/Icons/Stations/12.png similarity index 100% rename from Resources/Images/Icons/Stations/12.png rename to ACSE.WinForms/Resources/Images/Icons/Stations/12.png diff --git a/Resources/Images/Icons/Stations/13.png b/ACSE.WinForms/Resources/Images/Icons/Stations/13.png similarity index 100% rename from Resources/Images/Icons/Stations/13.png rename to ACSE.WinForms/Resources/Images/Icons/Stations/13.png diff --git a/Resources/Images/Icons/Stations/14.png b/ACSE.WinForms/Resources/Images/Icons/Stations/14.png similarity index 100% rename from Resources/Images/Icons/Stations/14.png rename to ACSE.WinForms/Resources/Images/Icons/Stations/14.png diff --git a/Resources/Images/Icons/Stations/15.png b/ACSE.WinForms/Resources/Images/Icons/Stations/15.png similarity index 100% rename from Resources/Images/Icons/Stations/15.png rename to ACSE.WinForms/Resources/Images/Icons/Stations/15.png diff --git a/Resources/Images/Icons/Stations/2.png b/ACSE.WinForms/Resources/Images/Icons/Stations/2.png similarity index 100% rename from Resources/Images/Icons/Stations/2.png rename to ACSE.WinForms/Resources/Images/Icons/Stations/2.png diff --git a/Resources/Images/Icons/Stations/3.png b/ACSE.WinForms/Resources/Images/Icons/Stations/3.png similarity index 100% rename from Resources/Images/Icons/Stations/3.png rename to ACSE.WinForms/Resources/Images/Icons/Stations/3.png diff --git a/Resources/Images/Icons/Stations/4.png b/ACSE.WinForms/Resources/Images/Icons/Stations/4.png similarity index 100% rename from Resources/Images/Icons/Stations/4.png rename to ACSE.WinForms/Resources/Images/Icons/Stations/4.png diff --git a/Resources/Images/Icons/Stations/5.png b/ACSE.WinForms/Resources/Images/Icons/Stations/5.png similarity index 100% rename from Resources/Images/Icons/Stations/5.png rename to ACSE.WinForms/Resources/Images/Icons/Stations/5.png diff --git a/Resources/Images/Icons/Stations/6.png b/ACSE.WinForms/Resources/Images/Icons/Stations/6.png similarity index 100% rename from Resources/Images/Icons/Stations/6.png rename to ACSE.WinForms/Resources/Images/Icons/Stations/6.png diff --git a/Resources/Images/Icons/Stations/7.png b/ACSE.WinForms/Resources/Images/Icons/Stations/7.png similarity index 100% rename from Resources/Images/Icons/Stations/7.png rename to ACSE.WinForms/Resources/Images/Icons/Stations/7.png diff --git a/Resources/Images/Icons/Stations/8.png b/ACSE.WinForms/Resources/Images/Icons/Stations/8.png similarity index 100% rename from Resources/Images/Icons/Stations/8.png rename to ACSE.WinForms/Resources/Images/Icons/Stations/8.png diff --git a/Resources/Images/Icons/Stations/9.png b/ACSE.WinForms/Resources/Images/Icons/Stations/9.png similarity index 100% rename from Resources/Images/Icons/Stations/9.png rename to ACSE.WinForms/Resources/Images/Icons/Stations/9.png diff --git a/Resources/Images/NL_Acre_Images/acre_0.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_0.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_0.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_0.png diff --git a/Resources/Images/NL_Acre_Images/acre_1.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_1.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_1.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_1.png diff --git a/Resources/Images/NL_Acre_Images/acre_10.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_10.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_10.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_10.png diff --git a/Resources/Images/NL_Acre_Images/acre_100.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_100.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_100.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_100.png diff --git a/Resources/Images/NL_Acre_Images/acre_101.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_101.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_101.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_101.png diff --git a/Resources/Images/NL_Acre_Images/acre_102.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_102.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_102.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_102.png diff --git a/Resources/Images/NL_Acre_Images/acre_103.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_103.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_103.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_103.png diff --git a/Resources/Images/NL_Acre_Images/acre_104.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_104.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_104.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_104.png diff --git a/Resources/Images/NL_Acre_Images/acre_105.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_105.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_105.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_105.png diff --git a/Resources/Images/NL_Acre_Images/acre_106.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_106.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_106.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_106.png diff --git a/Resources/Images/NL_Acre_Images/acre_107.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_107.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_107.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_107.png diff --git a/Resources/Images/NL_Acre_Images/acre_108.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_108.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_108.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_108.png diff --git a/Resources/Images/NL_Acre_Images/acre_109.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_109.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_109.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_109.png diff --git a/Resources/Images/NL_Acre_Images/acre_11.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_11.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_11.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_11.png diff --git a/Resources/Images/NL_Acre_Images/acre_110.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_110.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_110.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_110.png diff --git a/Resources/Images/NL_Acre_Images/acre_111.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_111.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_111.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_111.png diff --git a/Resources/Images/NL_Acre_Images/acre_112.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_112.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_112.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_112.png diff --git a/Resources/Images/NL_Acre_Images/acre_113.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_113.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_113.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_113.png diff --git a/Resources/Images/NL_Acre_Images/acre_114.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_114.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_114.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_114.png diff --git a/Resources/Images/NL_Acre_Images/acre_115.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_115.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_115.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_115.png diff --git a/Resources/Images/NL_Acre_Images/acre_116.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_116.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_116.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_116.png diff --git a/Resources/Images/NL_Acre_Images/acre_117.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_117.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_117.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_117.png diff --git a/Resources/Images/NL_Acre_Images/acre_118.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_118.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_118.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_118.png diff --git a/Resources/Images/NL_Acre_Images/acre_119.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_119.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_119.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_119.png diff --git a/Resources/Images/NL_Acre_Images/acre_12.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_12.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_12.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_12.png diff --git a/Resources/Images/NL_Acre_Images/acre_120.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_120.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_120.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_120.png diff --git a/Resources/Images/NL_Acre_Images/acre_121.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_121.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_121.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_121.png diff --git a/Resources/Images/NL_Acre_Images/acre_122.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_122.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_122.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_122.png diff --git a/Resources/Images/NL_Acre_Images/acre_123.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_123.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_123.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_123.png diff --git a/Resources/Images/NL_Acre_Images/acre_124.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_124.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_124.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_124.png diff --git a/Resources/Images/NL_Acre_Images/acre_125.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_125.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_125.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_125.png diff --git a/Resources/Images/NL_Acre_Images/acre_126.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_126.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_126.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_126.png diff --git a/Resources/Images/NL_Acre_Images/acre_127.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_127.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_127.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_127.png diff --git a/Resources/Images/NL_Acre_Images/acre_128.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_128.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_128.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_128.png diff --git a/Resources/Images/NL_Acre_Images/acre_129.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_129.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_129.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_129.png diff --git a/Resources/Images/NL_Acre_Images/acre_13.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_13.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_13.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_13.png diff --git a/Resources/Images/NL_Acre_Images/acre_130.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_130.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_130.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_130.png diff --git a/Resources/Images/NL_Acre_Images/acre_131.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_131.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_131.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_131.png diff --git a/Resources/Images/NL_Acre_Images/acre_132.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_132.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_132.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_132.png diff --git a/Resources/Images/NL_Acre_Images/acre_133.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_133.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_133.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_133.png diff --git a/Resources/Images/NL_Acre_Images/acre_134.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_134.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_134.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_134.png diff --git a/Resources/Images/NL_Acre_Images/acre_135.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_135.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_135.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_135.png diff --git a/Resources/Images/NL_Acre_Images/acre_136.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_136.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_136.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_136.png diff --git a/Resources/Images/NL_Acre_Images/acre_137.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_137.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_137.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_137.png diff --git a/Resources/Images/NL_Acre_Images/acre_138.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_138.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_138.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_138.png diff --git a/Resources/Images/NL_Acre_Images/acre_139.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_139.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_139.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_139.png diff --git a/Resources/Images/NL_Acre_Images/acre_14.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_14.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_14.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_14.png diff --git a/Resources/Images/NL_Acre_Images/acre_140.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_140.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_140.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_140.png diff --git a/Resources/Images/NL_Acre_Images/acre_141.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_141.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_141.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_141.png diff --git a/Resources/Images/NL_Acre_Images/acre_142.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_142.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_142.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_142.png diff --git a/Resources/Images/NL_Acre_Images/acre_143.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_143.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_143.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_143.png diff --git a/Resources/Images/NL_Acre_Images/acre_144.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_144.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_144.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_144.png diff --git a/Resources/Images/NL_Acre_Images/acre_145.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_145.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_145.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_145.png diff --git a/Resources/Images/NL_Acre_Images/acre_146.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_146.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_146.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_146.png diff --git a/Resources/Images/NL_Acre_Images/acre_147.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_147.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_147.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_147.png diff --git a/Resources/Images/NL_Acre_Images/acre_148.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_148.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_148.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_148.png diff --git a/Resources/Images/NL_Acre_Images/acre_149.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_149.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_149.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_149.png diff --git a/Resources/Images/NL_Acre_Images/acre_15.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_15.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_15.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_15.png diff --git a/Resources/Images/NL_Acre_Images/acre_150.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_150.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_150.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_150.png diff --git a/Resources/Images/NL_Acre_Images/acre_151.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_151.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_151.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_151.png diff --git a/Resources/Images/NL_Acre_Images/acre_152.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_152.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_152.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_152.png diff --git a/Resources/Images/NL_Acre_Images/acre_153.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_153.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_153.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_153.png diff --git a/Resources/Images/NL_Acre_Images/acre_154.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_154.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_154.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_154.png diff --git a/Resources/Images/NL_Acre_Images/acre_155.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_155.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_155.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_155.png diff --git a/Resources/Images/NL_Acre_Images/acre_156.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_156.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_156.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_156.png diff --git a/Resources/Images/NL_Acre_Images/acre_157.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_157.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_157.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_157.png diff --git a/Resources/Images/NL_Acre_Images/acre_158.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_158.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_158.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_158.png diff --git a/Resources/Images/NL_Acre_Images/acre_159.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_159.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_159.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_159.png diff --git a/Resources/Images/NL_Acre_Images/acre_16.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_16.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_16.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_16.png diff --git a/Resources/Images/NL_Acre_Images/acre_160.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_160.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_160.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_160.png diff --git a/Resources/Images/NL_Acre_Images/acre_161.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_161.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_161.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_161.png diff --git a/Resources/Images/NL_Acre_Images/acre_162.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_162.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_162.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_162.png diff --git a/Resources/Images/NL_Acre_Images/acre_163.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_163.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_163.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_163.png diff --git a/Resources/Images/NL_Acre_Images/acre_164.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_164.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_164.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_164.png diff --git a/Resources/Images/NL_Acre_Images/acre_165.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_165.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_165.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_165.png diff --git a/Resources/Images/NL_Acre_Images/acre_166.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_166.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_166.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_166.png diff --git a/Resources/Images/NL_Acre_Images/acre_167.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_167.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_167.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_167.png diff --git a/Resources/Images/NL_Acre_Images/acre_168.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_168.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_168.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_168.png diff --git a/Resources/Images/NL_Acre_Images/acre_169.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_169.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_169.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_169.png diff --git a/Resources/Images/NL_Acre_Images/acre_17.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_17.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_17.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_17.png diff --git a/Resources/Images/NL_Acre_Images/acre_170.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_170.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_170.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_170.png diff --git a/Resources/Images/NL_Acre_Images/acre_171.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_171.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_171.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_171.png diff --git a/Resources/Images/NL_Acre_Images/acre_172.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_172.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_172.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_172.png diff --git a/Resources/Images/NL_Acre_Images/acre_173.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_173.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_173.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_173.png diff --git a/Resources/Images/NL_Acre_Images/acre_174.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_174.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_174.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_174.png diff --git a/Resources/Images/NL_Acre_Images/acre_18.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_18.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_18.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_18.png diff --git a/Resources/Images/NL_Acre_Images/acre_180.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_180.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_180.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_180.png diff --git a/Resources/Images/NL_Acre_Images/acre_181.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_181.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_181.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_181.png diff --git a/Resources/Images/NL_Acre_Images/acre_182.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_182.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_182.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_182.png diff --git a/Resources/Images/NL_Acre_Images/acre_183.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_183.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_183.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_183.png diff --git a/Resources/Images/NL_Acre_Images/acre_184.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_184.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_184.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_184.png diff --git a/Resources/Images/NL_Acre_Images/acre_185.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_185.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_185.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_185.png diff --git a/Resources/Images/NL_Acre_Images/acre_186.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_186.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_186.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_186.png diff --git a/Resources/Images/NL_Acre_Images/acre_187.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_187.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_187.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_187.png diff --git a/Resources/Images/NL_Acre_Images/acre_188.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_188.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_188.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_188.png diff --git a/Resources/Images/NL_Acre_Images/acre_189.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_189.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_189.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_189.png diff --git a/Resources/Images/NL_Acre_Images/acre_19.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_19.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_19.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_19.png diff --git a/Resources/Images/NL_Acre_Images/acre_190.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_190.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_190.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_190.png diff --git a/Resources/Images/NL_Acre_Images/acre_191.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_191.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_191.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_191.png diff --git a/Resources/Images/NL_Acre_Images/acre_192.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_192.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_192.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_192.png diff --git a/Resources/Images/NL_Acre_Images/acre_193.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_193.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_193.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_193.png diff --git a/Resources/Images/NL_Acre_Images/acre_194.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_194.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_194.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_194.png diff --git a/Resources/Images/NL_Acre_Images/acre_195.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_195.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_195.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_195.png diff --git a/Resources/Images/NL_Acre_Images/acre_196.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_196.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_196.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_196.png diff --git a/Resources/Images/NL_Acre_Images/acre_197.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_197.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_197.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_197.png diff --git a/Resources/Images/NL_Acre_Images/acre_198.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_198.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_198.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_198.png diff --git a/Resources/Images/NL_Acre_Images/acre_199.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_199.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_199.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_199.png diff --git a/Resources/Images/NL_Acre_Images/acre_2.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_2.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_2.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_2.png diff --git a/Resources/Images/NL_Acre_Images/acre_20.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_20.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_20.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_20.png diff --git a/Resources/Images/NL_Acre_Images/acre_200.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_200.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_200.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_200.png diff --git a/Resources/Images/NL_Acre_Images/acre_201.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_201.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_201.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_201.png diff --git a/Resources/Images/NL_Acre_Images/acre_202.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_202.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_202.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_202.png diff --git a/Resources/Images/NL_Acre_Images/acre_203.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_203.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_203.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_203.png diff --git a/Resources/Images/NL_Acre_Images/acre_21.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_21.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_21.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_21.png diff --git a/Resources/Images/NL_Acre_Images/acre_22.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_22.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_22.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_22.png diff --git a/Resources/Images/NL_Acre_Images/acre_23.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_23.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_23.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_23.png diff --git a/Resources/Images/NL_Acre_Images/acre_24.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_24.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_24.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_24.png diff --git a/Resources/Images/NL_Acre_Images/acre_25.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_25.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_25.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_25.png diff --git a/Resources/Images/NL_Acre_Images/acre_26.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_26.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_26.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_26.png diff --git a/Resources/Images/NL_Acre_Images/acre_27.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_27.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_27.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_27.png diff --git a/Resources/Images/NL_Acre_Images/acre_28.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_28.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_28.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_28.png diff --git a/Resources/Images/NL_Acre_Images/acre_29.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_29.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_29.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_29.png diff --git a/Resources/Images/NL_Acre_Images/acre_3.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_3.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_3.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_3.png diff --git a/Resources/Images/NL_Acre_Images/acre_30.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_30.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_30.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_30.png diff --git a/Resources/Images/NL_Acre_Images/acre_31.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_31.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_31.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_31.png diff --git a/Resources/Images/NL_Acre_Images/acre_32.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_32.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_32.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_32.png diff --git a/Resources/Images/NL_Acre_Images/acre_33.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_33.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_33.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_33.png diff --git a/Resources/Images/NL_Acre_Images/acre_34.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_34.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_34.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_34.png diff --git a/Resources/Images/NL_Acre_Images/acre_35.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_35.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_35.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_35.png diff --git a/Resources/Images/NL_Acre_Images/acre_36.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_36.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_36.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_36.png diff --git a/Resources/Images/NL_Acre_Images/acre_37.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_37.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_37.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_37.png diff --git a/Resources/Images/NL_Acre_Images/acre_38.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_38.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_38.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_38.png diff --git a/Resources/Images/NL_Acre_Images/acre_39.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_39.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_39.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_39.png diff --git a/Resources/Images/NL_Acre_Images/acre_4.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_4.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_4.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_4.png diff --git a/Resources/Images/NL_Acre_Images/acre_40.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_40.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_40.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_40.png diff --git a/Resources/Images/NL_Acre_Images/acre_41.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_41.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_41.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_41.png diff --git a/Resources/Images/NL_Acre_Images/acre_42.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_42.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_42.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_42.png diff --git a/Resources/Images/NL_Acre_Images/acre_43.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_43.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_43.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_43.png diff --git a/Resources/Images/NL_Acre_Images/acre_44.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_44.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_44.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_44.png diff --git a/Resources/Images/NL_Acre_Images/acre_45.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_45.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_45.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_45.png diff --git a/Resources/Images/NL_Acre_Images/acre_46.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_46.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_46.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_46.png diff --git a/Resources/Images/NL_Acre_Images/acre_47.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_47.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_47.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_47.png diff --git a/Resources/Images/NL_Acre_Images/acre_48.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_48.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_48.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_48.png diff --git a/Resources/Images/NL_Acre_Images/acre_49.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_49.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_49.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_49.png diff --git a/Resources/Images/NL_Acre_Images/acre_5.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_5.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_5.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_5.png diff --git a/Resources/Images/NL_Acre_Images/acre_50.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_50.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_50.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_50.png diff --git a/Resources/Images/NL_Acre_Images/acre_51.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_51.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_51.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_51.png diff --git a/Resources/Images/NL_Acre_Images/acre_52.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_52.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_52.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_52.png diff --git a/Resources/Images/NL_Acre_Images/acre_53.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_53.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_53.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_53.png diff --git a/Resources/Images/NL_Acre_Images/acre_54.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_54.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_54.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_54.png diff --git a/Resources/Images/NL_Acre_Images/acre_55.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_55.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_55.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_55.png diff --git a/Resources/Images/NL_Acre_Images/acre_56.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_56.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_56.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_56.png diff --git a/Resources/Images/NL_Acre_Images/acre_57.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_57.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_57.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_57.png diff --git a/Resources/Images/NL_Acre_Images/acre_58.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_58.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_58.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_58.png diff --git a/Resources/Images/NL_Acre_Images/acre_59.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_59.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_59.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_59.png diff --git a/Resources/Images/NL_Acre_Images/acre_6.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_6.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_6.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_6.png diff --git a/Resources/Images/NL_Acre_Images/acre_60.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_60.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_60.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_60.png diff --git a/Resources/Images/NL_Acre_Images/acre_61.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_61.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_61.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_61.png diff --git a/Resources/Images/NL_Acre_Images/acre_62.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_62.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_62.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_62.png diff --git a/Resources/Images/NL_Acre_Images/acre_63.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_63.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_63.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_63.png diff --git a/Resources/Images/NL_Acre_Images/acre_64.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_64.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_64.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_64.png diff --git a/Resources/Images/NL_Acre_Images/acre_65.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_65.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_65.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_65.png diff --git a/Resources/Images/NL_Acre_Images/acre_65535.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_65535.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_65535.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_65535.png diff --git a/Resources/Images/NL_Acre_Images/acre_66.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_66.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_66.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_66.png diff --git a/Resources/Images/NL_Acre_Images/acre_67.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_67.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_67.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_67.png diff --git a/Resources/Images/NL_Acre_Images/acre_68.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_68.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_68.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_68.png diff --git a/Resources/Images/NL_Acre_Images/acre_69.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_69.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_69.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_69.png diff --git a/Resources/Images/NL_Acre_Images/acre_7.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_7.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_7.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_7.png diff --git a/Resources/Images/NL_Acre_Images/acre_70.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_70.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_70.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_70.png diff --git a/Resources/Images/NL_Acre_Images/acre_71.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_71.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_71.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_71.png diff --git a/Resources/Images/NL_Acre_Images/acre_72.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_72.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_72.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_72.png diff --git a/Resources/Images/NL_Acre_Images/acre_73.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_73.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_73.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_73.png diff --git a/Resources/Images/NL_Acre_Images/acre_74.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_74.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_74.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_74.png diff --git a/Resources/Images/NL_Acre_Images/acre_75.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_75.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_75.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_75.png diff --git a/Resources/Images/NL_Acre_Images/acre_76.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_76.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_76.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_76.png diff --git a/Resources/Images/NL_Acre_Images/acre_77.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_77.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_77.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_77.png diff --git a/Resources/Images/NL_Acre_Images/acre_78.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_78.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_78.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_78.png diff --git a/Resources/Images/NL_Acre_Images/acre_79.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_79.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_79.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_79.png diff --git a/Resources/Images/NL_Acre_Images/acre_8.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_8.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_8.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_8.png diff --git a/Resources/Images/NL_Acre_Images/acre_80.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_80.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_80.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_80.png diff --git a/Resources/Images/NL_Acre_Images/acre_81.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_81.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_81.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_81.png diff --git a/Resources/Images/NL_Acre_Images/acre_82.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_82.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_82.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_82.png diff --git a/Resources/Images/NL_Acre_Images/acre_83.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_83.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_83.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_83.png diff --git a/Resources/Images/NL_Acre_Images/acre_84.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_84.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_84.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_84.png diff --git a/Resources/Images/NL_Acre_Images/acre_85.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_85.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_85.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_85.png diff --git a/Resources/Images/NL_Acre_Images/acre_86.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_86.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_86.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_86.png diff --git a/Resources/Images/NL_Acre_Images/acre_87.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_87.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_87.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_87.png diff --git a/Resources/Images/NL_Acre_Images/acre_88.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_88.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_88.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_88.png diff --git a/Resources/Images/NL_Acre_Images/acre_89.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_89.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_89.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_89.png diff --git a/Resources/Images/NL_Acre_Images/acre_9.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_9.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_9.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_9.png diff --git a/Resources/Images/NL_Acre_Images/acre_90.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_90.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_90.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_90.png diff --git a/Resources/Images/NL_Acre_Images/acre_91.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_91.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_91.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_91.png diff --git a/Resources/Images/NL_Acre_Images/acre_92.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_92.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_92.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_92.png diff --git a/Resources/Images/NL_Acre_Images/acre_93.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_93.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_93.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_93.png diff --git a/Resources/Images/NL_Acre_Images/acre_94.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_94.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_94.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_94.png diff --git a/Resources/Images/NL_Acre_Images/acre_95.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_95.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_95.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_95.png diff --git a/Resources/Images/NL_Acre_Images/acre_96.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_96.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_96.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_96.png diff --git a/Resources/Images/NL_Acre_Images/acre_97.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_97.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_97.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_97.png diff --git a/Resources/Images/NL_Acre_Images/acre_98.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_98.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_98.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_98.png diff --git a/Resources/Images/NL_Acre_Images/acre_99.png b/ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_99.png similarity index 100% rename from Resources/Images/NL_Acre_Images/acre_99.png rename to ACSE.WinForms/Resources/Images/NL_Acre_Images/acre_99.png diff --git a/Resources/Images/PaletteArrow.png b/ACSE.WinForms/Resources/Images/PaletteArrow.png similarity index 100% rename from Resources/Images/PaletteArrow.png rename to ACSE.WinForms/Resources/Images/PaletteArrow.png diff --git a/Resources/Images/Villager Crop.png b/ACSE.WinForms/Resources/Images/Villager Crop.png similarity index 100% rename from Resources/Images/Villager Crop.png rename to ACSE.WinForms/Resources/Images/Villager Crop.png diff --git a/Resources/Images/VillagerHouse.png b/ACSE.WinForms/Resources/Images/VillagerHouse.png similarity index 100% rename from Resources/Images/VillagerHouse.png rename to ACSE.WinForms/Resources/Images/VillagerHouse.png diff --git a/Resources/Images/Villagers.jpg b/ACSE.WinForms/Resources/Images/Villagers.jpg similarity index 100% rename from Resources/Images/Villagers.jpg rename to ACSE.WinForms/Resources/Images/Villagers.jpg diff --git a/Resources/Images/WA_Acre_Images/acre_0.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_0.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_0.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_0.png diff --git a/Resources/Images/WA_Acre_Images/acre_1.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_1.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_1.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_1.png diff --git a/Resources/Images/WA_Acre_Images/acre_10.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_10.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_10.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_10.png diff --git a/Resources/Images/WA_Acre_Images/acre_100.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_100.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_100.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_100.png diff --git a/Resources/Images/WA_Acre_Images/acre_101.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_101.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_101.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_101.png diff --git a/Resources/Images/WA_Acre_Images/acre_102.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_102.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_102.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_102.png diff --git a/Resources/Images/WA_Acre_Images/acre_103.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_103.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_103.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_103.png diff --git a/Resources/Images/WA_Acre_Images/acre_104.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_104.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_104.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_104.png diff --git a/Resources/Images/WA_Acre_Images/acre_105.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_105.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_105.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_105.png diff --git a/Resources/Images/WA_Acre_Images/acre_106.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_106.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_106.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_106.png diff --git a/Resources/Images/WA_Acre_Images/acre_107.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_107.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_107.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_107.png diff --git a/Resources/Images/WA_Acre_Images/acre_108.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_108.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_108.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_108.png diff --git a/Resources/Images/WA_Acre_Images/acre_109.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_109.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_109.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_109.png diff --git a/Resources/Images/WA_Acre_Images/acre_11.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_11.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_11.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_11.png diff --git a/Resources/Images/WA_Acre_Images/acre_110.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_110.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_110.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_110.png diff --git a/Resources/Images/WA_Acre_Images/acre_111.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_111.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_111.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_111.png diff --git a/Resources/Images/WA_Acre_Images/acre_112.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_112.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_112.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_112.png diff --git a/Resources/Images/WA_Acre_Images/acre_113.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_113.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_113.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_113.png diff --git a/Resources/Images/WA_Acre_Images/acre_114.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_114.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_114.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_114.png diff --git a/Resources/Images/WA_Acre_Images/acre_115.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_115.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_115.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_115.png diff --git a/Resources/Images/WA_Acre_Images/acre_116.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_116.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_116.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_116.png diff --git a/Resources/Images/WA_Acre_Images/acre_117.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_117.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_117.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_117.png diff --git a/Resources/Images/WA_Acre_Images/acre_118.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_118.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_118.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_118.png diff --git a/Resources/Images/WA_Acre_Images/acre_119.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_119.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_119.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_119.png diff --git a/Resources/Images/WA_Acre_Images/acre_12.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_12.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_12.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_12.png diff --git a/Resources/Images/WA_Acre_Images/acre_120.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_120.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_120.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_120.png diff --git a/Resources/Images/WA_Acre_Images/acre_121.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_121.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_121.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_121.png diff --git a/Resources/Images/WA_Acre_Images/acre_122.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_122.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_122.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_122.png diff --git a/Resources/Images/WA_Acre_Images/acre_123.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_123.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_123.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_123.png diff --git a/Resources/Images/WA_Acre_Images/acre_124.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_124.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_124.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_124.png diff --git a/Resources/Images/WA_Acre_Images/acre_125.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_125.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_125.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_125.png diff --git a/Resources/Images/WA_Acre_Images/acre_126.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_126.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_126.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_126.png diff --git a/Resources/Images/WA_Acre_Images/acre_127.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_127.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_127.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_127.png diff --git a/Resources/Images/WA_Acre_Images/acre_128.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_128.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_128.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_128.png diff --git a/Resources/Images/WA_Acre_Images/acre_129.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_129.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_129.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_129.png diff --git a/Resources/Images/WA_Acre_Images/acre_13.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_13.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_13.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_13.png diff --git a/Resources/Images/WA_Acre_Images/acre_130.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_130.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_130.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_130.png diff --git a/Resources/Images/WA_Acre_Images/acre_131.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_131.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_131.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_131.png diff --git a/Resources/Images/WA_Acre_Images/acre_132.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_132.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_132.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_132.png diff --git a/Resources/Images/WA_Acre_Images/acre_133.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_133.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_133.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_133.png diff --git a/Resources/Images/WA_Acre_Images/acre_134.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_134.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_134.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_134.png diff --git a/Resources/Images/WA_Acre_Images/acre_135.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_135.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_135.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_135.png diff --git a/Resources/Images/WA_Acre_Images/acre_136.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_136.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_136.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_136.png diff --git a/Resources/Images/WA_Acre_Images/acre_137.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_137.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_137.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_137.png diff --git a/Resources/Images/WA_Acre_Images/acre_138.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_138.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_138.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_138.png diff --git a/Resources/Images/WA_Acre_Images/acre_139.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_139.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_139.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_139.png diff --git a/Resources/Images/WA_Acre_Images/acre_14.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_14.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_14.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_14.png diff --git a/Resources/Images/WA_Acre_Images/acre_140.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_140.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_140.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_140.png diff --git a/Resources/Images/WA_Acre_Images/acre_141.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_141.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_141.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_141.png diff --git a/Resources/Images/WA_Acre_Images/acre_142.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_142.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_142.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_142.png diff --git a/Resources/Images/WA_Acre_Images/acre_143.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_143.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_143.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_143.png diff --git a/Resources/Images/WA_Acre_Images/acre_144.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_144.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_144.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_144.png diff --git a/Resources/Images/WA_Acre_Images/acre_145.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_145.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_145.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_145.png diff --git a/Resources/Images/WA_Acre_Images/acre_146.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_146.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_146.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_146.png diff --git a/Resources/Images/WA_Acre_Images/acre_147.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_147.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_147.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_147.png diff --git a/Resources/Images/WA_Acre_Images/acre_148.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_148.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_148.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_148.png diff --git a/Resources/Images/WA_Acre_Images/acre_149.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_149.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_149.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_149.png diff --git a/Resources/Images/WA_Acre_Images/acre_15.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_15.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_15.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_15.png diff --git a/Resources/Images/WA_Acre_Images/acre_150.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_150.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_150.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_150.png diff --git a/Resources/Images/WA_Acre_Images/acre_151.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_151.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_151.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_151.png diff --git a/Resources/Images/WA_Acre_Images/acre_152.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_152.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_152.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_152.png diff --git a/Resources/Images/WA_Acre_Images/acre_153.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_153.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_153.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_153.png diff --git a/Resources/Images/WA_Acre_Images/acre_154.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_154.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_154.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_154.png diff --git a/Resources/Images/WA_Acre_Images/acre_155.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_155.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_155.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_155.png diff --git a/Resources/Images/WA_Acre_Images/acre_156.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_156.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_156.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_156.png diff --git a/Resources/Images/WA_Acre_Images/acre_157.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_157.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_157.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_157.png diff --git a/Resources/Images/WA_Acre_Images/acre_158.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_158.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_158.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_158.png diff --git a/Resources/Images/WA_Acre_Images/acre_159.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_159.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_159.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_159.png diff --git a/Resources/Images/WA_Acre_Images/acre_16.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_16.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_16.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_16.png diff --git a/Resources/Images/WA_Acre_Images/acre_160.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_160.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_160.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_160.png diff --git a/Resources/Images/WA_Acre_Images/acre_161.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_161.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_161.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_161.png diff --git a/Resources/Images/WA_Acre_Images/acre_162.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_162.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_162.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_162.png diff --git a/Resources/Images/WA_Acre_Images/acre_163.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_163.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_163.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_163.png diff --git a/Resources/Images/WA_Acre_Images/acre_164.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_164.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_164.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_164.png diff --git a/Resources/Images/WA_Acre_Images/acre_165.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_165.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_165.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_165.png diff --git a/Resources/Images/WA_Acre_Images/acre_166.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_166.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_166.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_166.png diff --git a/Resources/Images/WA_Acre_Images/acre_167.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_167.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_167.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_167.png diff --git a/Resources/Images/WA_Acre_Images/acre_168.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_168.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_168.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_168.png diff --git a/Resources/Images/WA_Acre_Images/acre_169.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_169.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_169.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_169.png diff --git a/Resources/Images/WA_Acre_Images/acre_17.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_17.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_17.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_17.png diff --git a/Resources/Images/WA_Acre_Images/acre_170.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_170.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_170.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_170.png diff --git a/Resources/Images/WA_Acre_Images/acre_171.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_171.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_171.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_171.png diff --git a/Resources/Images/WA_Acre_Images/acre_172.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_172.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_172.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_172.png diff --git a/Resources/Images/WA_Acre_Images/acre_173.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_173.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_173.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_173.png diff --git a/Resources/Images/WA_Acre_Images/acre_174.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_174.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_174.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_174.png diff --git a/Resources/Images/WA_Acre_Images/acre_175.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_175.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_175.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_175.png diff --git a/Resources/Images/WA_Acre_Images/acre_176.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_176.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_176.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_176.png diff --git a/Resources/Images/WA_Acre_Images/acre_18.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_18.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_18.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_18.png diff --git a/Resources/Images/WA_Acre_Images/acre_182.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_182.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_182.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_182.png diff --git a/Resources/Images/WA_Acre_Images/acre_183.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_183.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_183.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_183.png diff --git a/Resources/Images/WA_Acre_Images/acre_184.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_184.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_184.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_184.png diff --git a/Resources/Images/WA_Acre_Images/acre_185.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_185.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_185.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_185.png diff --git a/Resources/Images/WA_Acre_Images/acre_186.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_186.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_186.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_186.png diff --git a/Resources/Images/WA_Acre_Images/acre_187.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_187.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_187.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_187.png diff --git a/Resources/Images/WA_Acre_Images/acre_188.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_188.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_188.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_188.png diff --git a/Resources/Images/WA_Acre_Images/acre_189.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_189.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_189.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_189.png diff --git a/Resources/Images/WA_Acre_Images/acre_19.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_19.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_19.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_19.png diff --git a/Resources/Images/WA_Acre_Images/acre_190.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_190.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_190.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_190.png diff --git a/Resources/Images/WA_Acre_Images/acre_191.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_191.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_191.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_191.png diff --git a/Resources/Images/WA_Acre_Images/acre_192.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_192.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_192.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_192.png diff --git a/Resources/Images/WA_Acre_Images/acre_193.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_193.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_193.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_193.png diff --git a/Resources/Images/WA_Acre_Images/acre_194.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_194.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_194.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_194.png diff --git a/Resources/Images/WA_Acre_Images/acre_195.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_195.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_195.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_195.png diff --git a/Resources/Images/WA_Acre_Images/acre_196.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_196.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_196.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_196.png diff --git a/Resources/Images/WA_Acre_Images/acre_197.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_197.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_197.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_197.png diff --git a/Resources/Images/WA_Acre_Images/acre_198.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_198.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_198.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_198.png diff --git a/Resources/Images/WA_Acre_Images/acre_199.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_199.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_199.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_199.png diff --git a/Resources/Images/WA_Acre_Images/acre_2.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_2.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_2.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_2.png diff --git a/Resources/Images/WA_Acre_Images/acre_20.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_20.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_20.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_20.png diff --git a/Resources/Images/WA_Acre_Images/acre_200.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_200.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_200.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_200.png diff --git a/Resources/Images/WA_Acre_Images/acre_201.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_201.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_201.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_201.png diff --git a/Resources/Images/WA_Acre_Images/acre_202.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_202.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_202.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_202.png diff --git a/Resources/Images/WA_Acre_Images/acre_203.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_203.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_203.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_203.png diff --git a/Resources/Images/WA_Acre_Images/acre_204.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_204.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_204.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_204.png diff --git a/Resources/Images/WA_Acre_Images/acre_205.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_205.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_205.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_205.png diff --git a/Resources/Images/WA_Acre_Images/acre_21.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_21.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_21.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_21.png diff --git a/Resources/Images/WA_Acre_Images/acre_22.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_22.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_22.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_22.png diff --git a/Resources/Images/WA_Acre_Images/acre_23.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_23.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_23.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_23.png diff --git a/Resources/Images/WA_Acre_Images/acre_24.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_24.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_24.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_24.png diff --git a/Resources/Images/WA_Acre_Images/acre_25.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_25.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_25.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_25.png diff --git a/Resources/Images/WA_Acre_Images/acre_26.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_26.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_26.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_26.png diff --git a/Resources/Images/WA_Acre_Images/acre_27.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_27.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_27.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_27.png diff --git a/Resources/Images/WA_Acre_Images/acre_28.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_28.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_28.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_28.png diff --git a/Resources/Images/WA_Acre_Images/acre_29.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_29.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_29.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_29.png diff --git a/Resources/Images/WA_Acre_Images/acre_3.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_3.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_3.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_3.png diff --git a/Resources/Images/WA_Acre_Images/acre_30.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_30.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_30.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_30.png diff --git a/Resources/Images/WA_Acre_Images/acre_31.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_31.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_31.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_31.png diff --git a/Resources/Images/WA_Acre_Images/acre_32.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_32.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_32.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_32.png diff --git a/Resources/Images/WA_Acre_Images/acre_33.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_33.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_33.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_33.png diff --git a/Resources/Images/WA_Acre_Images/acre_34.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_34.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_34.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_34.png diff --git a/Resources/Images/WA_Acre_Images/acre_35.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_35.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_35.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_35.png diff --git a/Resources/Images/WA_Acre_Images/acre_36.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_36.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_36.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_36.png diff --git a/Resources/Images/WA_Acre_Images/acre_37.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_37.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_37.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_37.png diff --git a/Resources/Images/WA_Acre_Images/acre_38.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_38.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_38.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_38.png diff --git a/Resources/Images/WA_Acre_Images/acre_39.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_39.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_39.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_39.png diff --git a/Resources/Images/WA_Acre_Images/acre_4.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_4.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_4.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_4.png diff --git a/Resources/Images/WA_Acre_Images/acre_40.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_40.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_40.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_40.png diff --git a/Resources/Images/WA_Acre_Images/acre_41.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_41.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_41.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_41.png diff --git a/Resources/Images/WA_Acre_Images/acre_42.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_42.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_42.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_42.png diff --git a/Resources/Images/WA_Acre_Images/acre_43.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_43.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_43.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_43.png diff --git a/Resources/Images/WA_Acre_Images/acre_44.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_44.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_44.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_44.png diff --git a/Resources/Images/WA_Acre_Images/acre_45.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_45.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_45.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_45.png diff --git a/Resources/Images/WA_Acre_Images/acre_46.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_46.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_46.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_46.png diff --git a/Resources/Images/WA_Acre_Images/acre_47.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_47.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_47.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_47.png diff --git a/Resources/Images/WA_Acre_Images/acre_48.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_48.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_48.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_48.png diff --git a/Resources/Images/WA_Acre_Images/acre_49.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_49.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_49.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_49.png diff --git a/Resources/Images/WA_Acre_Images/acre_5.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_5.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_5.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_5.png diff --git a/Resources/Images/WA_Acre_Images/acre_50.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_50.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_50.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_50.png diff --git a/Resources/Images/WA_Acre_Images/acre_51.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_51.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_51.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_51.png diff --git a/Resources/Images/WA_Acre_Images/acre_52.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_52.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_52.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_52.png diff --git a/Resources/Images/WA_Acre_Images/acre_53.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_53.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_53.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_53.png diff --git a/Resources/Images/WA_Acre_Images/acre_54.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_54.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_54.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_54.png diff --git a/Resources/Images/WA_Acre_Images/acre_55.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_55.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_55.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_55.png diff --git a/Resources/Images/WA_Acre_Images/acre_56.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_56.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_56.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_56.png diff --git a/Resources/Images/WA_Acre_Images/acre_57.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_57.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_57.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_57.png diff --git a/Resources/Images/WA_Acre_Images/acre_58.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_58.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_58.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_58.png diff --git a/Resources/Images/WA_Acre_Images/acre_59.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_59.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_59.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_59.png diff --git a/Resources/Images/WA_Acre_Images/acre_6.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_6.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_6.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_6.png diff --git a/Resources/Images/WA_Acre_Images/acre_60.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_60.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_60.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_60.png diff --git a/Resources/Images/WA_Acre_Images/acre_61.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_61.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_61.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_61.png diff --git a/Resources/Images/WA_Acre_Images/acre_62.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_62.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_62.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_62.png diff --git a/Resources/Images/WA_Acre_Images/acre_63.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_63.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_63.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_63.png diff --git a/Resources/Images/WA_Acre_Images/acre_64.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_64.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_64.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_64.png diff --git a/Resources/Images/WA_Acre_Images/acre_65.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_65.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_65.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_65.png diff --git a/Resources/Images/WA_Acre_Images/acre_65535.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_65535.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_65535.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_65535.png diff --git a/Resources/Images/WA_Acre_Images/acre_66.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_66.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_66.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_66.png diff --git a/Resources/Images/WA_Acre_Images/acre_67.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_67.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_67.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_67.png diff --git a/Resources/Images/WA_Acre_Images/acre_68.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_68.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_68.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_68.png diff --git a/Resources/Images/WA_Acre_Images/acre_69.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_69.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_69.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_69.png diff --git a/Resources/Images/WA_Acre_Images/acre_7.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_7.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_7.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_7.png diff --git a/Resources/Images/WA_Acre_Images/acre_70.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_70.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_70.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_70.png diff --git a/Resources/Images/WA_Acre_Images/acre_71.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_71.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_71.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_71.png diff --git a/Resources/Images/WA_Acre_Images/acre_72.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_72.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_72.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_72.png diff --git a/Resources/Images/WA_Acre_Images/acre_73.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_73.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_73.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_73.png diff --git a/Resources/Images/WA_Acre_Images/acre_74.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_74.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_74.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_74.png diff --git a/Resources/Images/WA_Acre_Images/acre_75.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_75.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_75.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_75.png diff --git a/Resources/Images/WA_Acre_Images/acre_76.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_76.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_76.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_76.png diff --git a/Resources/Images/WA_Acre_Images/acre_77.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_77.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_77.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_77.png diff --git a/Resources/Images/WA_Acre_Images/acre_78.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_78.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_78.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_78.png diff --git a/Resources/Images/WA_Acre_Images/acre_79.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_79.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_79.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_79.png diff --git a/Resources/Images/WA_Acre_Images/acre_8.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_8.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_8.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_8.png diff --git a/Resources/Images/WA_Acre_Images/acre_80.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_80.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_80.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_80.png diff --git a/Resources/Images/WA_Acre_Images/acre_81.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_81.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_81.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_81.png diff --git a/Resources/Images/WA_Acre_Images/acre_82.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_82.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_82.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_82.png diff --git a/Resources/Images/WA_Acre_Images/acre_83.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_83.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_83.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_83.png diff --git a/Resources/Images/WA_Acre_Images/acre_84.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_84.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_84.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_84.png diff --git a/Resources/Images/WA_Acre_Images/acre_85.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_85.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_85.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_85.png diff --git a/Resources/Images/WA_Acre_Images/acre_86.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_86.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_86.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_86.png diff --git a/Resources/Images/WA_Acre_Images/acre_87.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_87.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_87.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_87.png diff --git a/Resources/Images/WA_Acre_Images/acre_88.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_88.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_88.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_88.png diff --git a/Resources/Images/WA_Acre_Images/acre_89.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_89.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_89.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_89.png diff --git a/Resources/Images/WA_Acre_Images/acre_9.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_9.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_9.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_9.png diff --git a/Resources/Images/WA_Acre_Images/acre_90.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_90.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_90.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_90.png diff --git a/Resources/Images/WA_Acre_Images/acre_91.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_91.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_91.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_91.png diff --git a/Resources/Images/WA_Acre_Images/acre_92.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_92.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_92.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_92.png diff --git a/Resources/Images/WA_Acre_Images/acre_93.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_93.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_93.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_93.png diff --git a/Resources/Images/WA_Acre_Images/acre_94.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_94.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_94.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_94.png diff --git a/Resources/Images/WA_Acre_Images/acre_95.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_95.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_95.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_95.png diff --git a/Resources/Images/WA_Acre_Images/acre_96.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_96.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_96.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_96.png diff --git a/Resources/Images/WA_Acre_Images/acre_97.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_97.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_97.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_97.png diff --git a/Resources/Images/WA_Acre_Images/acre_98.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_98.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_98.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_98.png diff --git a/Resources/Images/WA_Acre_Images/acre_99.png b/ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_99.png similarity index 100% rename from Resources/Images/WA_Acre_Images/acre_99.png rename to ACSE.WinForms/Resources/Images/WA_Acre_Images/acre_99.png diff --git a/Resources/Images/WW_Acre_Images/00.png b/ACSE.WinForms/Resources/Images/WW_Acre_Images/00.png similarity index 100% rename from Resources/Images/WW_Acre_Images/00.png rename to ACSE.WinForms/Resources/Images/WW_Acre_Images/00.png diff --git a/Resources/Images/WW_Acre_Images/01.png b/ACSE.WinForms/Resources/Images/WW_Acre_Images/01.png similarity index 100% rename from Resources/Images/WW_Acre_Images/01.png rename to ACSE.WinForms/Resources/Images/WW_Acre_Images/01.png diff --git a/Resources/Images/WW_Acre_Images/02.png b/ACSE.WinForms/Resources/Images/WW_Acre_Images/02.png similarity index 100% rename from Resources/Images/WW_Acre_Images/02.png rename to ACSE.WinForms/Resources/Images/WW_Acre_Images/02.png diff --git a/Resources/Images/WW_Acre_Images/03.png b/ACSE.WinForms/Resources/Images/WW_Acre_Images/03.png similarity index 100% rename from Resources/Images/WW_Acre_Images/03.png rename to ACSE.WinForms/Resources/Images/WW_Acre_Images/03.png diff --git a/Resources/Images/WW_Acre_Images/04.png b/ACSE.WinForms/Resources/Images/WW_Acre_Images/04.png similarity index 100% rename from Resources/Images/WW_Acre_Images/04.png rename to ACSE.WinForms/Resources/Images/WW_Acre_Images/04.png diff --git a/Resources/Images/WW_Acre_Images/05.png b/ACSE.WinForms/Resources/Images/WW_Acre_Images/05.png similarity index 100% rename from Resources/Images/WW_Acre_Images/05.png rename to ACSE.WinForms/Resources/Images/WW_Acre_Images/05.png diff --git a/Resources/Images/WW_Acre_Images/06.png b/ACSE.WinForms/Resources/Images/WW_Acre_Images/06.png similarity index 100% rename from Resources/Images/WW_Acre_Images/06.png rename to ACSE.WinForms/Resources/Images/WW_Acre_Images/06.png diff --git a/Resources/Images/WW_Acre_Images/07.png b/ACSE.WinForms/Resources/Images/WW_Acre_Images/07.png similarity index 100% rename from Resources/Images/WW_Acre_Images/07.png rename to ACSE.WinForms/Resources/Images/WW_Acre_Images/07.png diff --git a/Resources/Images/WW_Acre_Images/08.png b/ACSE.WinForms/Resources/Images/WW_Acre_Images/08.png similarity index 100% rename from Resources/Images/WW_Acre_Images/08.png rename to ACSE.WinForms/Resources/Images/WW_Acre_Images/08.png diff --git a/Resources/Images/WW_Acre_Images/09.png b/ACSE.WinForms/Resources/Images/WW_Acre_Images/09.png similarity index 100% rename from Resources/Images/WW_Acre_Images/09.png rename to ACSE.WinForms/Resources/Images/WW_Acre_Images/09.png diff --git a/Resources/Images/WW_Acre_Images/0A.jpg b/ACSE.WinForms/Resources/Images/WW_Acre_Images/0A.jpg similarity index 100% rename from Resources/Images/WW_Acre_Images/0A.jpg rename to ACSE.WinForms/Resources/Images/WW_Acre_Images/0A.jpg diff --git a/Resources/Images/WW_Acre_Images/0B.jpg b/ACSE.WinForms/Resources/Images/WW_Acre_Images/0B.jpg similarity index 100% rename from Resources/Images/WW_Acre_Images/0B.jpg rename to ACSE.WinForms/Resources/Images/WW_Acre_Images/0B.jpg diff --git a/Resources/Images/WW_Acre_Images/0C.jpg b/ACSE.WinForms/Resources/Images/WW_Acre_Images/0C.jpg similarity index 100% rename from Resources/Images/WW_Acre_Images/0C.jpg rename to ACSE.WinForms/Resources/Images/WW_Acre_Images/0C.jpg diff --git a/Resources/Images/WW_Acre_Images/0D.png b/ACSE.WinForms/Resources/Images/WW_Acre_Images/0D.png similarity index 100% rename from Resources/Images/WW_Acre_Images/0D.png rename to ACSE.WinForms/Resources/Images/WW_Acre_Images/0D.png diff --git a/Resources/Images/WW_Acre_Images/0E.jpg b/ACSE.WinForms/Resources/Images/WW_Acre_Images/0E.jpg similarity index 100% rename from Resources/Images/WW_Acre_Images/0E.jpg rename to ACSE.WinForms/Resources/Images/WW_Acre_Images/0E.jpg diff --git a/Resources/Images/WW_Acre_Images/0F.png b/ACSE.WinForms/Resources/Images/WW_Acre_Images/0F.png similarity index 100% rename from Resources/Images/WW_Acre_Images/0F.png rename to ACSE.WinForms/Resources/Images/WW_Acre_Images/0F.png diff --git a/Resources/Images/WW_Acre_Images/10.jpg b/ACSE.WinForms/Resources/Images/WW_Acre_Images/10.jpg similarity index 100% rename from Resources/Images/WW_Acre_Images/10.jpg rename to ACSE.WinForms/Resources/Images/WW_Acre_Images/10.jpg diff --git a/Resources/Images/WW_Acre_Images/11.png b/ACSE.WinForms/Resources/Images/WW_Acre_Images/11.png similarity index 100% rename from Resources/Images/WW_Acre_Images/11.png rename to ACSE.WinForms/Resources/Images/WW_Acre_Images/11.png diff --git a/Resources/Images/WW_Acre_Images/12.jpg b/ACSE.WinForms/Resources/Images/WW_Acre_Images/12.jpg similarity index 100% rename from Resources/Images/WW_Acre_Images/12.jpg rename to ACSE.WinForms/Resources/Images/WW_Acre_Images/12.jpg diff --git a/Resources/Images/WW_Acre_Images/13.jpg b/ACSE.WinForms/Resources/Images/WW_Acre_Images/13.jpg similarity index 100% rename from Resources/Images/WW_Acre_Images/13.jpg rename to ACSE.WinForms/Resources/Images/WW_Acre_Images/13.jpg diff --git a/Resources/Images/WW_Acre_Images/14.png b/ACSE.WinForms/Resources/Images/WW_Acre_Images/14.png similarity index 100% rename from Resources/Images/WW_Acre_Images/14.png rename to ACSE.WinForms/Resources/Images/WW_Acre_Images/14.png diff --git a/Resources/Images/WW_Acre_Images/15.png b/ACSE.WinForms/Resources/Images/WW_Acre_Images/15.png similarity index 100% rename from Resources/Images/WW_Acre_Images/15.png rename to ACSE.WinForms/Resources/Images/WW_Acre_Images/15.png diff --git a/Resources/Images/WW_Acre_Images/16.png b/ACSE.WinForms/Resources/Images/WW_Acre_Images/16.png similarity index 100% rename from Resources/Images/WW_Acre_Images/16.png rename to ACSE.WinForms/Resources/Images/WW_Acre_Images/16.png diff --git a/Resources/Images/WW_Acre_Images/17.png b/ACSE.WinForms/Resources/Images/WW_Acre_Images/17.png similarity index 100% rename from Resources/Images/WW_Acre_Images/17.png rename to ACSE.WinForms/Resources/Images/WW_Acre_Images/17.png diff --git a/Resources/Images/WW_Acre_Images/18.png b/ACSE.WinForms/Resources/Images/WW_Acre_Images/18.png similarity index 100% rename from Resources/Images/WW_Acre_Images/18.png rename to ACSE.WinForms/Resources/Images/WW_Acre_Images/18.png diff --git a/Resources/Images/WW_Acre_Images/19.png b/ACSE.WinForms/Resources/Images/WW_Acre_Images/19.png similarity index 100% rename from Resources/Images/WW_Acre_Images/19.png rename to ACSE.WinForms/Resources/Images/WW_Acre_Images/19.png diff --git a/Resources/Images/WW_Acre_Images/1A.png b/ACSE.WinForms/Resources/Images/WW_Acre_Images/1A.png similarity index 100% rename from Resources/Images/WW_Acre_Images/1A.png rename to ACSE.WinForms/Resources/Images/WW_Acre_Images/1A.png diff --git a/Resources/Images/WW_Acre_Images/1B.png b/ACSE.WinForms/Resources/Images/WW_Acre_Images/1B.png similarity index 100% rename from Resources/Images/WW_Acre_Images/1B.png rename to ACSE.WinForms/Resources/Images/WW_Acre_Images/1B.png diff --git a/Resources/Images/WW_Acre_Images/1C.png b/ACSE.WinForms/Resources/Images/WW_Acre_Images/1C.png similarity index 100% rename from Resources/Images/WW_Acre_Images/1C.png rename to ACSE.WinForms/Resources/Images/WW_Acre_Images/1C.png diff --git a/Resources/Images/WW_Acre_Images/1D.png b/ACSE.WinForms/Resources/Images/WW_Acre_Images/1D.png similarity index 100% rename from Resources/Images/WW_Acre_Images/1D.png rename to ACSE.WinForms/Resources/Images/WW_Acre_Images/1D.png diff --git a/Resources/Images/WW_Acre_Images/1E.png b/ACSE.WinForms/Resources/Images/WW_Acre_Images/1E.png similarity index 100% rename from Resources/Images/WW_Acre_Images/1E.png rename to ACSE.WinForms/Resources/Images/WW_Acre_Images/1E.png diff --git a/Resources/Images/WW_Acre_Images/1F.png b/ACSE.WinForms/Resources/Images/WW_Acre_Images/1F.png similarity index 100% rename from Resources/Images/WW_Acre_Images/1F.png rename to ACSE.WinForms/Resources/Images/WW_Acre_Images/1F.png diff --git a/Resources/Images/WW_Acre_Images/20.png b/ACSE.WinForms/Resources/Images/WW_Acre_Images/20.png similarity index 100% rename from Resources/Images/WW_Acre_Images/20.png rename to ACSE.WinForms/Resources/Images/WW_Acre_Images/20.png diff --git a/Resources/Images/WW_Acre_Images/21.png b/ACSE.WinForms/Resources/Images/WW_Acre_Images/21.png similarity index 100% rename from Resources/Images/WW_Acre_Images/21.png rename to ACSE.WinForms/Resources/Images/WW_Acre_Images/21.png diff --git a/Resources/Images/WW_Acre_Images/22.png b/ACSE.WinForms/Resources/Images/WW_Acre_Images/22.png similarity index 100% rename from Resources/Images/WW_Acre_Images/22.png rename to ACSE.WinForms/Resources/Images/WW_Acre_Images/22.png diff --git a/Resources/Images/WW_Acre_Images/23.png b/ACSE.WinForms/Resources/Images/WW_Acre_Images/23.png similarity index 100% rename from Resources/Images/WW_Acre_Images/23.png rename to ACSE.WinForms/Resources/Images/WW_Acre_Images/23.png diff --git a/Resources/Images/WW_Acre_Images/24.png b/ACSE.WinForms/Resources/Images/WW_Acre_Images/24.png similarity index 100% rename from Resources/Images/WW_Acre_Images/24.png rename to ACSE.WinForms/Resources/Images/WW_Acre_Images/24.png diff --git a/Resources/Images/WW_Acre_Images/25.png b/ACSE.WinForms/Resources/Images/WW_Acre_Images/25.png similarity index 100% rename from Resources/Images/WW_Acre_Images/25.png rename to ACSE.WinForms/Resources/Images/WW_Acre_Images/25.png diff --git a/Resources/Images/WW_Acre_Images/26.png b/ACSE.WinForms/Resources/Images/WW_Acre_Images/26.png similarity index 100% rename from Resources/Images/WW_Acre_Images/26.png rename to ACSE.WinForms/Resources/Images/WW_Acre_Images/26.png diff --git a/Resources/Images/WW_Acre_Images/27.png b/ACSE.WinForms/Resources/Images/WW_Acre_Images/27.png similarity index 100% rename from Resources/Images/WW_Acre_Images/27.png rename to ACSE.WinForms/Resources/Images/WW_Acre_Images/27.png diff --git a/Resources/Images/WW_Acre_Images/28.png b/ACSE.WinForms/Resources/Images/WW_Acre_Images/28.png similarity index 100% rename from Resources/Images/WW_Acre_Images/28.png rename to ACSE.WinForms/Resources/Images/WW_Acre_Images/28.png diff --git a/Resources/Images/WW_Acre_Images/29.png b/ACSE.WinForms/Resources/Images/WW_Acre_Images/29.png similarity index 100% rename from Resources/Images/WW_Acre_Images/29.png rename to ACSE.WinForms/Resources/Images/WW_Acre_Images/29.png diff --git a/Resources/Images/WW_Acre_Images/2A.png b/ACSE.WinForms/Resources/Images/WW_Acre_Images/2A.png similarity index 100% rename from Resources/Images/WW_Acre_Images/2A.png rename to ACSE.WinForms/Resources/Images/WW_Acre_Images/2A.png diff --git a/Resources/Images/WW_Acre_Images/2B.png b/ACSE.WinForms/Resources/Images/WW_Acre_Images/2B.png similarity index 100% rename from Resources/Images/WW_Acre_Images/2B.png rename to ACSE.WinForms/Resources/Images/WW_Acre_Images/2B.png diff --git a/Resources/Images/WW_Acre_Images/2C.png b/ACSE.WinForms/Resources/Images/WW_Acre_Images/2C.png similarity index 100% rename from Resources/Images/WW_Acre_Images/2C.png rename to ACSE.WinForms/Resources/Images/WW_Acre_Images/2C.png diff --git a/Resources/Images/WW_Acre_Images/2D.png b/ACSE.WinForms/Resources/Images/WW_Acre_Images/2D.png similarity index 100% rename from Resources/Images/WW_Acre_Images/2D.png rename to ACSE.WinForms/Resources/Images/WW_Acre_Images/2D.png diff --git a/Resources/Images/WW_Acre_Images/2E.png b/ACSE.WinForms/Resources/Images/WW_Acre_Images/2E.png similarity index 100% rename from Resources/Images/WW_Acre_Images/2E.png rename to ACSE.WinForms/Resources/Images/WW_Acre_Images/2E.png diff --git a/Resources/Images/WW_Acre_Images/2F.png b/ACSE.WinForms/Resources/Images/WW_Acre_Images/2F.png similarity index 100% rename from Resources/Images/WW_Acre_Images/2F.png rename to ACSE.WinForms/Resources/Images/WW_Acre_Images/2F.png diff --git a/Resources/Images/WW_Acre_Images/30.png b/ACSE.WinForms/Resources/Images/WW_Acre_Images/30.png similarity index 100% rename from Resources/Images/WW_Acre_Images/30.png rename to ACSE.WinForms/Resources/Images/WW_Acre_Images/30.png diff --git a/Resources/Images/WW_Acre_Images/31.png b/ACSE.WinForms/Resources/Images/WW_Acre_Images/31.png similarity index 100% rename from Resources/Images/WW_Acre_Images/31.png rename to ACSE.WinForms/Resources/Images/WW_Acre_Images/31.png diff --git a/Resources/Images/WW_Acre_Images/32.png b/ACSE.WinForms/Resources/Images/WW_Acre_Images/32.png similarity index 100% rename from Resources/Images/WW_Acre_Images/32.png rename to ACSE.WinForms/Resources/Images/WW_Acre_Images/32.png diff --git a/Resources/Images/WW_Acre_Images/33.png b/ACSE.WinForms/Resources/Images/WW_Acre_Images/33.png similarity index 100% rename from Resources/Images/WW_Acre_Images/33.png rename to ACSE.WinForms/Resources/Images/WW_Acre_Images/33.png diff --git a/Resources/Images/WW_Acre_Images/34.png b/ACSE.WinForms/Resources/Images/WW_Acre_Images/34.png similarity index 100% rename from Resources/Images/WW_Acre_Images/34.png rename to ACSE.WinForms/Resources/Images/WW_Acre_Images/34.png diff --git a/Resources/Images/WW_Acre_Images/35.png b/ACSE.WinForms/Resources/Images/WW_Acre_Images/35.png similarity index 100% rename from Resources/Images/WW_Acre_Images/35.png rename to ACSE.WinForms/Resources/Images/WW_Acre_Images/35.png diff --git a/Resources/Images/WW_Acre_Images/36.png b/ACSE.WinForms/Resources/Images/WW_Acre_Images/36.png similarity index 100% rename from Resources/Images/WW_Acre_Images/36.png rename to ACSE.WinForms/Resources/Images/WW_Acre_Images/36.png diff --git a/Resources/Images/WW_Acre_Images/37.png b/ACSE.WinForms/Resources/Images/WW_Acre_Images/37.png similarity index 100% rename from Resources/Images/WW_Acre_Images/37.png rename to ACSE.WinForms/Resources/Images/WW_Acre_Images/37.png diff --git a/Resources/Images/WW_Acre_Images/38.png b/ACSE.WinForms/Resources/Images/WW_Acre_Images/38.png similarity index 100% rename from Resources/Images/WW_Acre_Images/38.png rename to ACSE.WinForms/Resources/Images/WW_Acre_Images/38.png diff --git a/Resources/Images/WW_Acre_Images/39.png b/ACSE.WinForms/Resources/Images/WW_Acre_Images/39.png similarity index 100% rename from Resources/Images/WW_Acre_Images/39.png rename to ACSE.WinForms/Resources/Images/WW_Acre_Images/39.png diff --git a/Resources/Images/WW_Acre_Images/3A.png b/ACSE.WinForms/Resources/Images/WW_Acre_Images/3A.png similarity index 100% rename from Resources/Images/WW_Acre_Images/3A.png rename to ACSE.WinForms/Resources/Images/WW_Acre_Images/3A.png diff --git a/Resources/Images/WW_Acre_Images/3B.png b/ACSE.WinForms/Resources/Images/WW_Acre_Images/3B.png similarity index 100% rename from Resources/Images/WW_Acre_Images/3B.png rename to ACSE.WinForms/Resources/Images/WW_Acre_Images/3B.png diff --git a/Resources/Images/WW_Acre_Images/3C.png b/ACSE.WinForms/Resources/Images/WW_Acre_Images/3C.png similarity index 100% rename from Resources/Images/WW_Acre_Images/3C.png rename to ACSE.WinForms/Resources/Images/WW_Acre_Images/3C.png diff --git a/Resources/Images/WW_Acre_Images/3D.png b/ACSE.WinForms/Resources/Images/WW_Acre_Images/3D.png similarity index 100% rename from Resources/Images/WW_Acre_Images/3D.png rename to ACSE.WinForms/Resources/Images/WW_Acre_Images/3D.png diff --git a/Resources/Images/WW_Acre_Images/3E.png b/ACSE.WinForms/Resources/Images/WW_Acre_Images/3E.png similarity index 100% rename from Resources/Images/WW_Acre_Images/3E.png rename to ACSE.WinForms/Resources/Images/WW_Acre_Images/3E.png diff --git a/Resources/Images/WW_Acre_Images/3F.png b/ACSE.WinForms/Resources/Images/WW_Acre_Images/3F.png similarity index 100% rename from Resources/Images/WW_Acre_Images/3F.png rename to ACSE.WinForms/Resources/Images/WW_Acre_Images/3F.png diff --git a/Resources/Images/WW_Acre_Images/40.png b/ACSE.WinForms/Resources/Images/WW_Acre_Images/40.png similarity index 100% rename from Resources/Images/WW_Acre_Images/40.png rename to ACSE.WinForms/Resources/Images/WW_Acre_Images/40.png diff --git a/Resources/Images/WW_Acre_Images/41.png b/ACSE.WinForms/Resources/Images/WW_Acre_Images/41.png similarity index 100% rename from Resources/Images/WW_Acre_Images/41.png rename to ACSE.WinForms/Resources/Images/WW_Acre_Images/41.png diff --git a/Resources/Images/WW_Acre_Images/42.png b/ACSE.WinForms/Resources/Images/WW_Acre_Images/42.png similarity index 100% rename from Resources/Images/WW_Acre_Images/42.png rename to ACSE.WinForms/Resources/Images/WW_Acre_Images/42.png diff --git a/Resources/Images/WW_Acre_Images/43.png b/ACSE.WinForms/Resources/Images/WW_Acre_Images/43.png similarity index 100% rename from Resources/Images/WW_Acre_Images/43.png rename to ACSE.WinForms/Resources/Images/WW_Acre_Images/43.png diff --git a/Resources/Images/WW_Acre_Images/44.png b/ACSE.WinForms/Resources/Images/WW_Acre_Images/44.png similarity index 100% rename from Resources/Images/WW_Acre_Images/44.png rename to ACSE.WinForms/Resources/Images/WW_Acre_Images/44.png diff --git a/Resources/Images/WW_Acre_Images/45.png b/ACSE.WinForms/Resources/Images/WW_Acre_Images/45.png similarity index 100% rename from Resources/Images/WW_Acre_Images/45.png rename to ACSE.WinForms/Resources/Images/WW_Acre_Images/45.png diff --git a/Resources/Images/WW_Acre_Images/46.png b/ACSE.WinForms/Resources/Images/WW_Acre_Images/46.png similarity index 100% rename from Resources/Images/WW_Acre_Images/46.png rename to ACSE.WinForms/Resources/Images/WW_Acre_Images/46.png diff --git a/Resources/Images/WW_Acre_Images/47.png b/ACSE.WinForms/Resources/Images/WW_Acre_Images/47.png similarity index 100% rename from Resources/Images/WW_Acre_Images/47.png rename to ACSE.WinForms/Resources/Images/WW_Acre_Images/47.png diff --git a/Resources/Images/WW_Acre_Images/48.png b/ACSE.WinForms/Resources/Images/WW_Acre_Images/48.png similarity index 100% rename from Resources/Images/WW_Acre_Images/48.png rename to ACSE.WinForms/Resources/Images/WW_Acre_Images/48.png diff --git a/Resources/Images/WW_Acre_Images/49.png b/ACSE.WinForms/Resources/Images/WW_Acre_Images/49.png similarity index 100% rename from Resources/Images/WW_Acre_Images/49.png rename to ACSE.WinForms/Resources/Images/WW_Acre_Images/49.png diff --git a/Resources/Images/WW_Acre_Images/4A.png b/ACSE.WinForms/Resources/Images/WW_Acre_Images/4A.png similarity index 100% rename from Resources/Images/WW_Acre_Images/4A.png rename to ACSE.WinForms/Resources/Images/WW_Acre_Images/4A.png diff --git a/Resources/Images/WW_Acre_Images/4B.png b/ACSE.WinForms/Resources/Images/WW_Acre_Images/4B.png similarity index 100% rename from Resources/Images/WW_Acre_Images/4B.png rename to ACSE.WinForms/Resources/Images/WW_Acre_Images/4B.png diff --git a/Resources/Images/WW_Acre_Images/4C.png b/ACSE.WinForms/Resources/Images/WW_Acre_Images/4C.png similarity index 100% rename from Resources/Images/WW_Acre_Images/4C.png rename to ACSE.WinForms/Resources/Images/WW_Acre_Images/4C.png diff --git a/Resources/Images/WW_Acre_Images/4D.png b/ACSE.WinForms/Resources/Images/WW_Acre_Images/4D.png similarity index 100% rename from Resources/Images/WW_Acre_Images/4D.png rename to ACSE.WinForms/Resources/Images/WW_Acre_Images/4D.png diff --git a/Resources/Images/WW_Acre_Images/4E.png b/ACSE.WinForms/Resources/Images/WW_Acre_Images/4E.png similarity index 100% rename from Resources/Images/WW_Acre_Images/4E.png rename to ACSE.WinForms/Resources/Images/WW_Acre_Images/4E.png diff --git a/Resources/Images/WW_Acre_Images/4F.png b/ACSE.WinForms/Resources/Images/WW_Acre_Images/4F.png similarity index 100% rename from Resources/Images/WW_Acre_Images/4F.png rename to ACSE.WinForms/Resources/Images/WW_Acre_Images/4F.png diff --git a/Resources/Images/WW_Acre_Images/50.png b/ACSE.WinForms/Resources/Images/WW_Acre_Images/50.png similarity index 100% rename from Resources/Images/WW_Acre_Images/50.png rename to ACSE.WinForms/Resources/Images/WW_Acre_Images/50.png diff --git a/Resources/Images/WW_Acre_Images/51.png b/ACSE.WinForms/Resources/Images/WW_Acre_Images/51.png similarity index 100% rename from Resources/Images/WW_Acre_Images/51.png rename to ACSE.WinForms/Resources/Images/WW_Acre_Images/51.png diff --git a/Resources/Images/WW_Acre_Images/52.png b/ACSE.WinForms/Resources/Images/WW_Acre_Images/52.png similarity index 100% rename from Resources/Images/WW_Acre_Images/52.png rename to ACSE.WinForms/Resources/Images/WW_Acre_Images/52.png diff --git a/Resources/Images/WW_Acre_Images/53.png b/ACSE.WinForms/Resources/Images/WW_Acre_Images/53.png similarity index 100% rename from Resources/Images/WW_Acre_Images/53.png rename to ACSE.WinForms/Resources/Images/WW_Acre_Images/53.png diff --git a/Resources/Images/WW_Acre_Images/54.png b/ACSE.WinForms/Resources/Images/WW_Acre_Images/54.png similarity index 100% rename from Resources/Images/WW_Acre_Images/54.png rename to ACSE.WinForms/Resources/Images/WW_Acre_Images/54.png diff --git a/Resources/Images/WW_Acre_Images/55.png b/ACSE.WinForms/Resources/Images/WW_Acre_Images/55.png similarity index 100% rename from Resources/Images/WW_Acre_Images/55.png rename to ACSE.WinForms/Resources/Images/WW_Acre_Images/55.png diff --git a/Resources/Images/WW_Acre_Images/56.png b/ACSE.WinForms/Resources/Images/WW_Acre_Images/56.png similarity index 100% rename from Resources/Images/WW_Acre_Images/56.png rename to ACSE.WinForms/Resources/Images/WW_Acre_Images/56.png diff --git a/Resources/Images/WW_Acre_Images/57.png b/ACSE.WinForms/Resources/Images/WW_Acre_Images/57.png similarity index 100% rename from Resources/Images/WW_Acre_Images/57.png rename to ACSE.WinForms/Resources/Images/WW_Acre_Images/57.png diff --git a/Resources/Images/WW_Acre_Images/58.png b/ACSE.WinForms/Resources/Images/WW_Acre_Images/58.png similarity index 100% rename from Resources/Images/WW_Acre_Images/58.png rename to ACSE.WinForms/Resources/Images/WW_Acre_Images/58.png diff --git a/Resources/Images/WW_Acre_Images/59.png b/ACSE.WinForms/Resources/Images/WW_Acre_Images/59.png similarity index 100% rename from Resources/Images/WW_Acre_Images/59.png rename to ACSE.WinForms/Resources/Images/WW_Acre_Images/59.png diff --git a/Resources/Images/WW_Acre_Images/5A.png b/ACSE.WinForms/Resources/Images/WW_Acre_Images/5A.png similarity index 100% rename from Resources/Images/WW_Acre_Images/5A.png rename to ACSE.WinForms/Resources/Images/WW_Acre_Images/5A.png diff --git a/Resources/Images/WW_Acre_Images/5B.png b/ACSE.WinForms/Resources/Images/WW_Acre_Images/5B.png similarity index 100% rename from Resources/Images/WW_Acre_Images/5B.png rename to ACSE.WinForms/Resources/Images/WW_Acre_Images/5B.png diff --git a/Resources/Images/WW_Acre_Images/5C.png b/ACSE.WinForms/Resources/Images/WW_Acre_Images/5C.png similarity index 100% rename from Resources/Images/WW_Acre_Images/5C.png rename to ACSE.WinForms/Resources/Images/WW_Acre_Images/5C.png diff --git a/Resources/Images/WW_Acre_Images/5D.png b/ACSE.WinForms/Resources/Images/WW_Acre_Images/5D.png similarity index 100% rename from Resources/Images/WW_Acre_Images/5D.png rename to ACSE.WinForms/Resources/Images/WW_Acre_Images/5D.png diff --git a/Resources/Images/WW_Acre_Images/5E.png b/ACSE.WinForms/Resources/Images/WW_Acre_Images/5E.png similarity index 100% rename from Resources/Images/WW_Acre_Images/5E.png rename to ACSE.WinForms/Resources/Images/WW_Acre_Images/5E.png diff --git a/Resources/Images/WW_Acre_Images/5F.png b/ACSE.WinForms/Resources/Images/WW_Acre_Images/5F.png similarity index 100% rename from Resources/Images/WW_Acre_Images/5F.png rename to ACSE.WinForms/Resources/Images/WW_Acre_Images/5F.png diff --git a/Resources/Images/WW_Acre_Images/60.png b/ACSE.WinForms/Resources/Images/WW_Acre_Images/60.png similarity index 100% rename from Resources/Images/WW_Acre_Images/60.png rename to ACSE.WinForms/Resources/Images/WW_Acre_Images/60.png diff --git a/Resources/Images/WW_Acre_Images/61.png b/ACSE.WinForms/Resources/Images/WW_Acre_Images/61.png similarity index 100% rename from Resources/Images/WW_Acre_Images/61.png rename to ACSE.WinForms/Resources/Images/WW_Acre_Images/61.png diff --git a/Resources/Images/WW_Acre_Images/62.png b/ACSE.WinForms/Resources/Images/WW_Acre_Images/62.png similarity index 100% rename from Resources/Images/WW_Acre_Images/62.png rename to ACSE.WinForms/Resources/Images/WW_Acre_Images/62.png diff --git a/Resources/Images/WW_Acre_Images/63.png b/ACSE.WinForms/Resources/Images/WW_Acre_Images/63.png similarity index 100% rename from Resources/Images/WW_Acre_Images/63.png rename to ACSE.WinForms/Resources/Images/WW_Acre_Images/63.png diff --git a/Resources/Images/WW_Acre_Images/64.png b/ACSE.WinForms/Resources/Images/WW_Acre_Images/64.png similarity index 100% rename from Resources/Images/WW_Acre_Images/64.png rename to ACSE.WinForms/Resources/Images/WW_Acre_Images/64.png diff --git a/Resources/Images/WW_Acre_Images/65.png b/ACSE.WinForms/Resources/Images/WW_Acre_Images/65.png similarity index 100% rename from Resources/Images/WW_Acre_Images/65.png rename to ACSE.WinForms/Resources/Images/WW_Acre_Images/65.png diff --git a/Resources/Images/WW_Acre_Images/66.png b/ACSE.WinForms/Resources/Images/WW_Acre_Images/66.png similarity index 100% rename from Resources/Images/WW_Acre_Images/66.png rename to ACSE.WinForms/Resources/Images/WW_Acre_Images/66.png diff --git a/Resources/Images/WW_Acre_Images/67.png b/ACSE.WinForms/Resources/Images/WW_Acre_Images/67.png similarity index 100% rename from Resources/Images/WW_Acre_Images/67.png rename to ACSE.WinForms/Resources/Images/WW_Acre_Images/67.png diff --git a/Resources/Images/WW_Acre_Images/68.png b/ACSE.WinForms/Resources/Images/WW_Acre_Images/68.png similarity index 100% rename from Resources/Images/WW_Acre_Images/68.png rename to ACSE.WinForms/Resources/Images/WW_Acre_Images/68.png diff --git a/Resources/Images/WW_Acre_Images/69.png b/ACSE.WinForms/Resources/Images/WW_Acre_Images/69.png similarity index 100% rename from Resources/Images/WW_Acre_Images/69.png rename to ACSE.WinForms/Resources/Images/WW_Acre_Images/69.png diff --git a/Resources/Images/WW_Acre_Images/6A.png b/ACSE.WinForms/Resources/Images/WW_Acre_Images/6A.png similarity index 100% rename from Resources/Images/WW_Acre_Images/6A.png rename to ACSE.WinForms/Resources/Images/WW_Acre_Images/6A.png diff --git a/Resources/Images/WW_Acre_Images/6B.png b/ACSE.WinForms/Resources/Images/WW_Acre_Images/6B.png similarity index 100% rename from Resources/Images/WW_Acre_Images/6B.png rename to ACSE.WinForms/Resources/Images/WW_Acre_Images/6B.png diff --git a/Resources/Images/WW_Acre_Images/6C.png b/ACSE.WinForms/Resources/Images/WW_Acre_Images/6C.png similarity index 100% rename from Resources/Images/WW_Acre_Images/6C.png rename to ACSE.WinForms/Resources/Images/WW_Acre_Images/6C.png diff --git a/Resources/Images/WW_Acre_Images/6D.png b/ACSE.WinForms/Resources/Images/WW_Acre_Images/6D.png similarity index 100% rename from Resources/Images/WW_Acre_Images/6D.png rename to ACSE.WinForms/Resources/Images/WW_Acre_Images/6D.png diff --git a/Resources/Images/WW_Acre_Images/6E.png b/ACSE.WinForms/Resources/Images/WW_Acre_Images/6E.png similarity index 100% rename from Resources/Images/WW_Acre_Images/6E.png rename to ACSE.WinForms/Resources/Images/WW_Acre_Images/6E.png diff --git a/Resources/Images/WW_Acre_Images/6F.png b/ACSE.WinForms/Resources/Images/WW_Acre_Images/6F.png similarity index 100% rename from Resources/Images/WW_Acre_Images/6F.png rename to ACSE.WinForms/Resources/Images/WW_Acre_Images/6F.png diff --git a/Resources/Images/WW_Acre_Images/70.png b/ACSE.WinForms/Resources/Images/WW_Acre_Images/70.png similarity index 100% rename from Resources/Images/WW_Acre_Images/70.png rename to ACSE.WinForms/Resources/Images/WW_Acre_Images/70.png diff --git a/Resources/Images/WW_Acre_Images/71.png b/ACSE.WinForms/Resources/Images/WW_Acre_Images/71.png similarity index 100% rename from Resources/Images/WW_Acre_Images/71.png rename to ACSE.WinForms/Resources/Images/WW_Acre_Images/71.png diff --git a/Resources/Images/WW_Acre_Images/72.png b/ACSE.WinForms/Resources/Images/WW_Acre_Images/72.png similarity index 100% rename from Resources/Images/WW_Acre_Images/72.png rename to ACSE.WinForms/Resources/Images/WW_Acre_Images/72.png diff --git a/Resources/Images/WW_Acre_Images/73.png b/ACSE.WinForms/Resources/Images/WW_Acre_Images/73.png similarity index 100% rename from Resources/Images/WW_Acre_Images/73.png rename to ACSE.WinForms/Resources/Images/WW_Acre_Images/73.png diff --git a/Resources/Images/WW_Acre_Images/74.png b/ACSE.WinForms/Resources/Images/WW_Acre_Images/74.png similarity index 100% rename from Resources/Images/WW_Acre_Images/74.png rename to ACSE.WinForms/Resources/Images/WW_Acre_Images/74.png diff --git a/Resources/Images/WW_Acre_Images/75.png b/ACSE.WinForms/Resources/Images/WW_Acre_Images/75.png similarity index 100% rename from Resources/Images/WW_Acre_Images/75.png rename to ACSE.WinForms/Resources/Images/WW_Acre_Images/75.png diff --git a/Resources/Images/WW_Acre_Images/76.png b/ACSE.WinForms/Resources/Images/WW_Acre_Images/76.png similarity index 100% rename from Resources/Images/WW_Acre_Images/76.png rename to ACSE.WinForms/Resources/Images/WW_Acre_Images/76.png diff --git a/Resources/Images/WW_Acre_Images/77.png b/ACSE.WinForms/Resources/Images/WW_Acre_Images/77.png similarity index 100% rename from Resources/Images/WW_Acre_Images/77.png rename to ACSE.WinForms/Resources/Images/WW_Acre_Images/77.png diff --git a/Resources/Images/WW_Acre_Images/78.png b/ACSE.WinForms/Resources/Images/WW_Acre_Images/78.png similarity index 100% rename from Resources/Images/WW_Acre_Images/78.png rename to ACSE.WinForms/Resources/Images/WW_Acre_Images/78.png diff --git a/Resources/Images/WW_Acre_Images/79.png b/ACSE.WinForms/Resources/Images/WW_Acre_Images/79.png similarity index 100% rename from Resources/Images/WW_Acre_Images/79.png rename to ACSE.WinForms/Resources/Images/WW_Acre_Images/79.png diff --git a/Resources/Images/WW_Acre_Images/7A.png b/ACSE.WinForms/Resources/Images/WW_Acre_Images/7A.png similarity index 100% rename from Resources/Images/WW_Acre_Images/7A.png rename to ACSE.WinForms/Resources/Images/WW_Acre_Images/7A.png diff --git a/Resources/Images/WW_Acre_Images/7B.png b/ACSE.WinForms/Resources/Images/WW_Acre_Images/7B.png similarity index 100% rename from Resources/Images/WW_Acre_Images/7B.png rename to ACSE.WinForms/Resources/Images/WW_Acre_Images/7B.png diff --git a/Resources/Images/WW_Acre_Images/7C.png b/ACSE.WinForms/Resources/Images/WW_Acre_Images/7C.png similarity index 100% rename from Resources/Images/WW_Acre_Images/7C.png rename to ACSE.WinForms/Resources/Images/WW_Acre_Images/7C.png diff --git a/Resources/Images/WW_Acre_Images/7D.png b/ACSE.WinForms/Resources/Images/WW_Acre_Images/7D.png similarity index 100% rename from Resources/Images/WW_Acre_Images/7D.png rename to ACSE.WinForms/Resources/Images/WW_Acre_Images/7D.png diff --git a/Resources/Images/WW_Acre_Images/7E.png b/ACSE.WinForms/Resources/Images/WW_Acre_Images/7E.png similarity index 100% rename from Resources/Images/WW_Acre_Images/7E.png rename to ACSE.WinForms/Resources/Images/WW_Acre_Images/7E.png diff --git a/Resources/Images/WW_Acre_Images/7F.png b/ACSE.WinForms/Resources/Images/WW_Acre_Images/7F.png similarity index 100% rename from Resources/Images/WW_Acre_Images/7F.png rename to ACSE.WinForms/Resources/Images/WW_Acre_Images/7F.png diff --git a/Resources/Images/WW_Acre_Images/80.png b/ACSE.WinForms/Resources/Images/WW_Acre_Images/80.png similarity index 100% rename from Resources/Images/WW_Acre_Images/80.png rename to ACSE.WinForms/Resources/Images/WW_Acre_Images/80.png diff --git a/Resources/Images/WW_Acre_Images/81.png b/ACSE.WinForms/Resources/Images/WW_Acre_Images/81.png similarity index 100% rename from Resources/Images/WW_Acre_Images/81.png rename to ACSE.WinForms/Resources/Images/WW_Acre_Images/81.png diff --git a/Resources/Images/WW_Acre_Images/82.png b/ACSE.WinForms/Resources/Images/WW_Acre_Images/82.png similarity index 100% rename from Resources/Images/WW_Acre_Images/82.png rename to ACSE.WinForms/Resources/Images/WW_Acre_Images/82.png diff --git a/Resources/Images/WW_Acre_Images/FF.jpg b/ACSE.WinForms/Resources/Images/WW_Acre_Images/FF.jpg similarity index 100% rename from Resources/Images/WW_Acre_Images/FF.jpg rename to ACSE.WinForms/Resources/Images/WW_Acre_Images/FF.jpg diff --git a/ACSE.WinForms/Resources/Images/X.png b/ACSE.WinForms/Resources/Images/X.png new file mode 100644 index 0000000..e8b6584 Binary files /dev/null and b/ACSE.WinForms/Resources/Images/X.png differ diff --git a/Resources/Images/no_tpc.png b/ACSE.WinForms/Resources/Images/no_tpc.png similarity index 100% rename from Resources/Images/no_tpc.png rename to ACSE.WinForms/Resources/Images/no_tpc.png diff --git a/Resources/NL_Acres_en.txt b/ACSE.WinForms/Resources/NL_Acres_en.txt similarity index 100% rename from Resources/NL_Acres_en.txt rename to ACSE.WinForms/Resources/NL_Acres_en.txt diff --git a/Resources/NL_Items_en.txt b/ACSE.WinForms/Resources/NL_Items_en.txt similarity index 100% rename from Resources/NL_Items_en.txt rename to ACSE.WinForms/Resources/NL_Items_en.txt diff --git a/Resources/NL_Villagers_en.txt b/ACSE.WinForms/Resources/NL_Villagers_en.txt similarity index 100% rename from Resources/NL_Villagers_en.txt rename to ACSE.WinForms/Resources/NL_Villagers_en.txt diff --git a/ACSE.WinForms/Resources/PaletteArrow.png b/ACSE.WinForms/Resources/PaletteArrow.png new file mode 100644 index 0000000..d75033d Binary files /dev/null and b/ACSE.WinForms/Resources/PaletteArrow.png differ diff --git a/ACSE.WinForms/Resources/Villager Crop.png b/ACSE.WinForms/Resources/Villager Crop.png new file mode 100644 index 0000000..c628f5a Binary files /dev/null and b/ACSE.WinForms/Resources/Villager Crop.png differ diff --git a/ACSE.WinForms/Resources/VillagerHouse.png b/ACSE.WinForms/Resources/VillagerHouse.png new file mode 100644 index 0000000..668af16 Binary files /dev/null and b/ACSE.WinForms/Resources/VillagerHouse.png differ diff --git a/ACSE.WinForms/Resources/Villagers.jpg b/ACSE.WinForms/Resources/Villagers.jpg new file mode 100644 index 0000000..b150d6e Binary files /dev/null and b/ACSE.WinForms/Resources/Villagers.jpg differ diff --git a/Resources/WA_Acres_en.txt b/ACSE.WinForms/Resources/WA_Acres_en.txt similarity index 100% rename from Resources/WA_Acres_en.txt rename to ACSE.WinForms/Resources/WA_Acres_en.txt diff --git a/Resources/WA_Items_en.txt b/ACSE.WinForms/Resources/WA_Items_en.txt similarity index 100% rename from Resources/WA_Items_en.txt rename to ACSE.WinForms/Resources/WA_Items_en.txt diff --git a/Resources/WA_Villagers_en.txt b/ACSE.WinForms/Resources/WA_Villagers_en.txt similarity index 100% rename from Resources/WA_Villagers_en.txt rename to ACSE.WinForms/Resources/WA_Villagers_en.txt diff --git a/Resources/WW_Acres_en.txt b/ACSE.WinForms/Resources/WW_Acres_en.txt similarity index 100% rename from Resources/WW_Acres_en.txt rename to ACSE.WinForms/Resources/WW_Acres_en.txt diff --git a/Resources/WW_Items_en.txt b/ACSE.WinForms/Resources/WW_Items_en.txt similarity index 100% rename from Resources/WW_Items_en.txt rename to ACSE.WinForms/Resources/WW_Items_en.txt diff --git a/Resources/WW_Villagers_en.txt b/ACSE.WinForms/Resources/WW_Villagers_en.txt similarity index 100% rename from Resources/WW_Villagers_en.txt rename to ACSE.WinForms/Resources/WW_Villagers_en.txt diff --git a/ACSE.WinForms/Resources/X.png b/ACSE.WinForms/Resources/X.png new file mode 100644 index 0000000..e8b6584 Binary files /dev/null and b/ACSE.WinForms/Resources/X.png differ diff --git a/ACSE.WinForms/Resources/no_tpc.png b/ACSE.WinForms/Resources/no_tpc.png new file mode 100644 index 0000000..b2bf829 Binary files /dev/null and b/ACSE.WinForms/Resources/no_tpc.png differ diff --git a/Forms/SecureValueForm.Designer.cs b/ACSE.WinForms/SecureValueForm/SecureValueForm.Designer.cs similarity index 99% rename from Forms/SecureValueForm.Designer.cs rename to ACSE.WinForms/SecureValueForm/SecureValueForm.Designer.cs index 65a9d69..222a9ba 100644 --- a/Forms/SecureValueForm.Designer.cs +++ b/ACSE.WinForms/SecureValueForm/SecureValueForm.Designer.cs @@ -1,4 +1,4 @@ -namespace ACSE +namespace ACSE.WinForms { partial class SecureValueForm { diff --git a/Forms/SecureValueForm.cs b/ACSE.WinForms/SecureValueForm/SecureValueForm.cs similarity index 94% rename from Forms/SecureValueForm.cs rename to ACSE.WinForms/SecureValueForm/SecureValueForm.cs index 4fd1d63..b3d4dca 100644 --- a/Forms/SecureValueForm.cs +++ b/ACSE.WinForms/SecureValueForm/SecureValueForm.cs @@ -1,8 +1,9 @@ using System; using System.Globalization; using System.Windows.Forms; +using ACSE.Core.Saves; -namespace ACSE +namespace ACSE.WinForms { public partial class SecureValueForm : Form { diff --git a/Forms/SecureValueForm.resx b/ACSE.WinForms/SecureValueForm/SecureValueForm.resx similarity index 100% rename from Forms/SecureValueForm.resx rename to ACSE.WinForms/SecureValueForm/SecureValueForm.resx diff --git a/Forms/SettingsMenuForm.Designer.cs b/ACSE.WinForms/SettingsMenuForm/SettingsMenuForm.Designer.cs similarity index 90% rename from Forms/SettingsMenuForm.Designer.cs rename to ACSE.WinForms/SettingsMenuForm/SettingsMenuForm.Designer.cs index 2dbd07b..44c7c7c 100644 --- a/Forms/SettingsMenuForm.Designer.cs +++ b/ACSE.WinForms/SettingsMenuForm/SettingsMenuForm.Designer.cs @@ -1,4 +1,4 @@ -namespace ACSE +namespace ACSE.WinForms { partial class SettingsMenuForm { @@ -33,7 +33,6 @@ private void InitializeComponent() this.doneButton = new System.Windows.Forms.Button(); this.debugLevelComboBox = new System.Windows.Forms.ComboBox(); this.label3 = new System.Windows.Forms.Label(); - this.scanForInt32Checkbox = new System.Windows.Forms.CheckBox(); this.townMapSizeTrackBar = new System.Windows.Forms.TrackBar(); this.label4 = new System.Windows.Forms.Label(); this.label5 = new System.Windows.Forms.Label(); @@ -95,19 +94,6 @@ private void InitializeComponent() this.label3.TabIndex = 5; this.label3.Text = "Debug Message Level:"; // - // scanForInt32Checkbox - // - this.scanForInt32Checkbox.AutoSize = true; - this.scanForInt32Checkbox.Cursor = System.Windows.Forms.Cursors.Default; - this.scanForInt32Checkbox.Location = new System.Drawing.Point(10, 168); - this.scanForInt32Checkbox.Name = "scanForInt32Checkbox"; - this.scanForInt32Checkbox.RightToLeft = System.Windows.Forms.RightToLeft.Yes; - this.scanForInt32Checkbox.Size = new System.Drawing.Size(190, 17); - this.scanForInt32Checkbox.TabIndex = 7; - this.scanForInt32Checkbox.Text = ":Scan and Output NL Int32 Offsets"; - this.scanForInt32Checkbox.UseVisualStyleBackColor = true; - this.scanForInt32Checkbox.CheckedChanged += new System.EventHandler(this.scanForInt32Checkbox_CheckedChanged); - // // townMapSizeTrackBar // this.townMapSizeTrackBar.AutoSize = false; @@ -203,7 +189,6 @@ private void InitializeComponent() this.Controls.Add(this.acreMapSizeTrackBar); this.Controls.Add(this.label4); this.Controls.Add(this.townMapSizeTrackBar); - this.Controls.Add(this.scanForInt32Checkbox); this.Controls.Add(this.label3); this.Controls.Add(this.debugLevelComboBox); this.Controls.Add(this.doneButton); @@ -226,7 +211,6 @@ private void InitializeComponent() private System.Windows.Forms.Button doneButton; private System.Windows.Forms.ComboBox debugLevelComboBox; private System.Windows.Forms.Label label3; - private System.Windows.Forms.CheckBox scanForInt32Checkbox; private System.Windows.Forms.TrackBar townMapSizeTrackBar; private System.Windows.Forms.Label label4; private System.Windows.Forms.Label label5; diff --git a/Forms/SettingsMenuForm.cs b/ACSE.WinForms/SettingsMenuForm/SettingsMenuForm.cs similarity index 88% rename from Forms/SettingsMenuForm.cs rename to ACSE.WinForms/SettingsMenuForm/SettingsMenuForm.cs index 84f254e..6474978 100644 --- a/Forms/SettingsMenuForm.cs +++ b/ACSE.WinForms/SettingsMenuForm/SettingsMenuForm.cs @@ -2,8 +2,9 @@ using System.Windows.Forms; using System.Drawing.Drawing2D; using System.IO; +using ACSE.Core.Debug; -namespace ACSE +namespace ACSE.WinForms { public partial class SettingsMenuForm : Form { @@ -20,8 +21,7 @@ public SettingsMenuForm(MainForm reference) if ((InterpolationMode)Enum != InterpolationMode.Invalid) imageSizeModeComboBox.Items.Add(Enum.ToString()); imageSizeModeComboBox.SelectedIndex = Properties.Settings.Default.ImageResizeMode; - debugLevelComboBox.SelectedIndex = (int)Properties.Settings.Default.DebugLevel; - scanForInt32Checkbox.Checked = Properties.Settings.Default.OutputInt32s; + debugLevelComboBox.SelectedIndex = Properties.Settings.Default.DebugLevel; BackupCheckBox.Checked = Properties.Settings.Default.BackupFiles; backupFolderTextBox.Text = Properties.Settings.Default.BackupLocation; townMapSizeTrackBar.Value = Math.Max(0, (Properties.Settings.Default.TownMapSize - 128) / 16); @@ -44,8 +44,8 @@ private void ImageResizeMode_Changed() private void DebugLevel_Changed() { if (!_loaded) return; - Properties.Settings.Default.DebugLevel = (DebugLevel)Math.Max(0, debugLevelComboBox.SelectedIndex); - if (Properties.Settings.Default.DebugLevel == DebugLevel.None) + Properties.Settings.Default.DebugLevel = Math.Max(0, debugLevelComboBox.SelectedIndex); + if ((DebugLevel) Properties.Settings.Default.DebugLevel == DebugLevel.None) { MainForm.DebugManager.CloseDebugLogWriter(); MainForm.DebugManager.DeleteLogFile(DebugManager.GetLogFilePath()); @@ -56,11 +56,6 @@ private void DebugLevel_Changed() } } - private void scanForInt32Checkbox_CheckedChanged(object sender, EventArgs e) - { - Properties.Settings.Default.OutputInt32s = scanForInt32Checkbox.Checked; - } - private void doneButton_Click(object sender, EventArgs e) { Properties.Settings.Default.Save(); diff --git a/Forms/SettingsMenuForm.resx b/ACSE.WinForms/SettingsMenuForm/SettingsMenuForm.resx similarity index 100% rename from Forms/SettingsMenuForm.resx rename to ACSE.WinForms/SettingsMenuForm/SettingsMenuForm.resx diff --git a/Classes/AlertToggledEventArgs.cs b/ACSE.WinForms/ToggleableAlertForm/AlertToggledEventArgs.cs similarity index 90% rename from Classes/AlertToggledEventArgs.cs rename to ACSE.WinForms/ToggleableAlertForm/AlertToggledEventArgs.cs index 3aa7833..6d9b315 100644 --- a/Classes/AlertToggledEventArgs.cs +++ b/ACSE.WinForms/ToggleableAlertForm/AlertToggledEventArgs.cs @@ -1,6 +1,6 @@ using System; -namespace ACSE +namespace ACSE.WinForms { public class AlertToggledEventArgs : EventArgs { diff --git a/Forms/ToggableAlertForm.Designer.cs b/ACSE.WinForms/ToggleableAlertForm/ToggleableAlertForm.Designer.cs similarity index 95% rename from Forms/ToggableAlertForm.Designer.cs rename to ACSE.WinForms/ToggleableAlertForm/ToggleableAlertForm.Designer.cs index 58ebeda..a4e2021 100644 --- a/Forms/ToggableAlertForm.Designer.cs +++ b/ACSE.WinForms/ToggleableAlertForm/ToggleableAlertForm.Designer.cs @@ -1,6 +1,6 @@ -namespace ACSE +namespace ACSE.WinForms { - sealed partial class ToggableAlertForm + sealed partial class ToggleableAlertForm { /// /// Required designer variable. @@ -60,7 +60,7 @@ private void InitializeComponent() this.okayButton.Text = "OK"; this.okayButton.UseVisualStyleBackColor = true; // - // ToggableAlertForm + // ToggleableAlertForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; @@ -71,7 +71,7 @@ private void InitializeComponent() this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; this.MaximizeBox = false; this.MinimizeBox = false; - this.Name = "ToggableAlertForm"; + this.Name = "ToggleableAlertForm"; this.ShowInTaskbar = false; this.Text = "Alert Message"; this.ResumeLayout(false); diff --git a/Forms/ToggableAlertForm.cs b/ACSE.WinForms/ToggleableAlertForm/ToggleableAlertForm.cs similarity index 87% rename from Forms/ToggableAlertForm.cs rename to ACSE.WinForms/ToggleableAlertForm/ToggleableAlertForm.cs index c3f1f22..4f17c60 100644 --- a/Forms/ToggableAlertForm.cs +++ b/ACSE.WinForms/ToggleableAlertForm/ToggleableAlertForm.cs @@ -1,9 +1,9 @@ using System; using System.Windows.Forms; -namespace ACSE +namespace ACSE.WinForms { - public sealed partial class ToggableAlertForm : Form + public sealed partial class ToggleableAlertForm : Form { public event EventHandler AlertToggled; public bool AlertDisabled { @@ -20,7 +20,7 @@ public string Message set => infoLabel.Text = value; } - public ToggableAlertForm(string message, string title = null) + public ToggleableAlertForm(string message, string title = null) { InitializeComponent(); okayButton.Click += OkayButton_Click; diff --git a/Forms/ToggableAlertForm.resx b/ACSE.WinForms/ToggleableAlertForm/ToggleableAlertForm.resx similarity index 100% rename from Forms/ToggableAlertForm.resx rename to ACSE.WinForms/ToggleableAlertForm/ToggleableAlertForm.resx diff --git a/ACSE.WinForms/Utilities/DataUtility.cs b/ACSE.WinForms/Utilities/DataUtility.cs new file mode 100644 index 0000000..46c4b8d --- /dev/null +++ b/ACSE.WinForms/Utilities/DataUtility.cs @@ -0,0 +1,182 @@ +using System; +using System.IO; +using ACSE.Core.Acres; +using ACSE.Core.Items; +using ACSE.Core.Saves; + +namespace ACSE.WinForms.Utilities +{ + public static class DataUtility + { + // Export/Import Methods + public static void ExportAcres(WorldAcre[] acres, SaveGeneration saveGeneration, string saveFileName) + { + using (var saveDialog = new System.Windows.Forms.SaveFileDialog()) + { + saveDialog.Filter = "ACSE Acre Save (*.aas)|*.aas"; + saveDialog.FileName = saveFileName + " Acre Data.aas"; + + if (saveDialog.ShowDialog() != System.Windows.Forms.DialogResult.OK) return; + try + { + using (var stream = new FileStream(saveDialog.FileName, FileMode.Create)) + { + using (var writer = new BinaryWriter(stream)) + { + writer.Write(new byte[] { 0x41, 0x41, 0x53 }); // "AAS" Identifier + writer.Write((byte)acres.Length); // Total Acre Count + writer.Write((byte)saveGeneration); // Save Generation + writer.Write(new byte[] { 0, 0, 0 }); // Padding + foreach (var t in acres) + { + writer.Write(BitConverter.GetBytes(t.AcreId)); + } + + writer.Flush(); + } + } + } + catch + { + System.Windows.Forms.MessageBox.Show("Acre exportation failed!", "Acre Export Error", System.Windows.Forms.MessageBoxButtons.OK, + System.Windows.Forms.MessageBoxIcon.Error); + } + } + } + + public static void ImportAcres(ref WorldAcre[] acres, SaveGeneration saveGeneration) + { + using (var openDialog = new System.Windows.Forms.OpenFileDialog()) + { + openDialog.Filter = "ACSE Acre Save (*.aas)|*.aas"; + openDialog.FileName = ""; + + if (openDialog.ShowDialog() != System.Windows.Forms.DialogResult.OK) return; + try + { + using (var stream = new FileStream(openDialog.FileName, FileMode.Open)) + { + using (var reader = new BinaryReader(stream)) + { + if (!System.Text.Encoding.ASCII.GetString(reader.ReadBytes(3)).Equals("AAS") || + reader.ReadByte() != acres.Length || + (SaveGeneration)reader.ReadByte() != saveGeneration) return; + reader.BaseStream.Seek(8, SeekOrigin.Begin); + foreach (var t in acres) + { + t.AcreId = reader.ReadUInt16(); + t.BaseAcreId = (ushort)(t.AcreId & 0xFFFC); + } + } + } + } + catch + { + System.Windows.Forms.MessageBox.Show("Acre importation failed!", "Acre Import Error", System.Windows.Forms.MessageBoxButtons.OK, + System.Windows.Forms.MessageBoxIcon.Error); + } + } + } + + public static void ExportTown(WorldAcre[] acres, SaveGeneration saveGeneration, string saveFileName) + { + using (var saveDialog = new System.Windows.Forms.SaveFileDialog()) + { + saveDialog.Filter = "ACSE Town Save (*.ats)|*.ats"; + saveDialog.FileName = saveFileName + " Town Data.ats"; + + if (saveDialog.ShowDialog() != System.Windows.Forms.DialogResult.OK) return; + try + { + using (var stream = new FileStream(saveDialog.FileName, FileMode.Create)) + { + using (var writer = new BinaryWriter(stream)) + { + writer.Write(new byte[] { 0x41, 0x54, 0x53 }); // "ATS" Identifier + writer.Write((byte)acres.Length); // Total Acre Count + writer.Write((byte)saveGeneration); // Save Generation + writer.Write(new byte[] { 0, 0, 0 }); // Padding + + if (saveGeneration == SaveGeneration.N3DS) + { + foreach (var acre in acres) + { + foreach (var item in acre.AcreItems) + { + writer.Write(BitConverter.GetBytes(item.ToUInt32())); + } + } + } + else + { + foreach (var acre in acres) + { + foreach (var item in acre.AcreItems) + { + writer.Write(BitConverter.GetBytes(item.ItemId)); + } + } + } + + writer.Flush(); + } + } + } + catch + { + System.Windows.Forms.MessageBox.Show("Town exportation failed!", "Town Export Error", System.Windows.Forms.MessageBoxButtons.OK, + System.Windows.Forms.MessageBoxIcon.Error); + } + } + } + + public static void ImportTown(ref WorldAcre[] acres, SaveGeneration saveGeneration) + { + using (var openDialog = new System.Windows.Forms.OpenFileDialog()) + { + openDialog.Filter = "ACSE Town Save (*.ats)|*.ats"; + openDialog.FileName = ""; + + if (openDialog.ShowDialog() != System.Windows.Forms.DialogResult.OK) return; + try + { + using (var stream = new FileStream(openDialog.FileName, FileMode.Open)) + { + using (var reader = new BinaryReader(stream)) + { + if (!System.Text.Encoding.ASCII.GetString(reader.ReadBytes(3)).Equals("ATS") || + reader.ReadByte() != acres.Length || + (SaveGeneration)reader.ReadByte() != saveGeneration) return; + reader.BaseStream.Seek(8, SeekOrigin.Begin); + if (saveGeneration == SaveGeneration.N3DS) + { + foreach (var acre in acres) + { + for (var x = 0; x < acre.AcreItems.Length; x++) + { + acre.AcreItems[x] = new WorldItem(reader.ReadUInt32(), acre.AcreItems[x].Index); + } + } + } + else + { + foreach (var acre in acres) + { + for (var x = 0; x < acre.AcreItems.Length; x++) + { + acre.AcreItems[x] = new WorldItem(reader.ReadUInt16(), acre.AcreItems[x].Index); + } + } + } + } + } + } + catch + { + System.Windows.Forms.MessageBox.Show("Acre importation failed!", "Acre Import Error", System.Windows.Forms.MessageBoxButtons.OK, + System.Windows.Forms.MessageBoxIcon.Error); + } + } + } + } +} diff --git a/ACSE.WinForms/packages.config b/ACSE.WinForms/packages.config new file mode 100644 index 0000000..223c03e --- /dev/null +++ b/ACSE.WinForms/packages.config @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/ACSE.sln b/ACSE.sln index 650a36a..7e5e240 100644 --- a/ACSE.sln +++ b/ACSE.sln @@ -3,10 +3,12 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 VisualStudioVersion = 15.0.27703.2026 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ACSE", "ACSE.csproj", "{078BA400-42DD-432A-9844-32213157A29D}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ACSE.Tests", "Tests\ACSE.Tests\ACSE.Tests.csproj", "{A230992E-9ECB-4A07-9438-2551854A6578}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ACSE.Core", "ACSE.Core\ACSE.Core.csproj", "{C4CC8C38-85D7-44EB-AE3A-14407C3184B5}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ACSE.WinForms", "ACSE.WinForms\ACSE.WinForms.csproj", "{B4A73545-0177-4159-8602-648AA3058650}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -15,14 +17,6 @@ Global Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {078BA400-42DD-432A-9844-32213157A29D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {078BA400-42DD-432A-9844-32213157A29D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {078BA400-42DD-432A-9844-32213157A29D}.Debug|x86.ActiveCfg = Debug|x86 - {078BA400-42DD-432A-9844-32213157A29D}.Debug|x86.Build.0 = Debug|x86 - {078BA400-42DD-432A-9844-32213157A29D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {078BA400-42DD-432A-9844-32213157A29D}.Release|Any CPU.Build.0 = Release|Any CPU - {078BA400-42DD-432A-9844-32213157A29D}.Release|x86.ActiveCfg = Release|x86 - {078BA400-42DD-432A-9844-32213157A29D}.Release|x86.Build.0 = Release|x86 {A230992E-9ECB-4A07-9438-2551854A6578}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {A230992E-9ECB-4A07-9438-2551854A6578}.Debug|Any CPU.Build.0 = Debug|Any CPU {A230992E-9ECB-4A07-9438-2551854A6578}.Debug|x86.ActiveCfg = Debug|Any CPU @@ -31,6 +25,22 @@ Global {A230992E-9ECB-4A07-9438-2551854A6578}.Release|Any CPU.Build.0 = Release|Any CPU {A230992E-9ECB-4A07-9438-2551854A6578}.Release|x86.ActiveCfg = Release|Any CPU {A230992E-9ECB-4A07-9438-2551854A6578}.Release|x86.Build.0 = Release|Any CPU + {C4CC8C38-85D7-44EB-AE3A-14407C3184B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C4CC8C38-85D7-44EB-AE3A-14407C3184B5}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C4CC8C38-85D7-44EB-AE3A-14407C3184B5}.Debug|x86.ActiveCfg = Debug|Any CPU + {C4CC8C38-85D7-44EB-AE3A-14407C3184B5}.Debug|x86.Build.0 = Debug|Any CPU + {C4CC8C38-85D7-44EB-AE3A-14407C3184B5}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C4CC8C38-85D7-44EB-AE3A-14407C3184B5}.Release|Any CPU.Build.0 = Release|Any CPU + {C4CC8C38-85D7-44EB-AE3A-14407C3184B5}.Release|x86.ActiveCfg = Release|Any CPU + {C4CC8C38-85D7-44EB-AE3A-14407C3184B5}.Release|x86.Build.0 = Release|Any CPU + {B4A73545-0177-4159-8602-648AA3058650}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B4A73545-0177-4159-8602-648AA3058650}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B4A73545-0177-4159-8602-648AA3058650}.Debug|x86.ActiveCfg = Debug|Any CPU + {B4A73545-0177-4159-8602-648AA3058650}.Debug|x86.Build.0 = Debug|Any CPU + {B4A73545-0177-4159-8602-648AA3058650}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B4A73545-0177-4159-8602-648AA3058650}.Release|Any CPU.Build.0 = Release|Any CPU + {B4A73545-0177-4159-8602-648AA3058650}.Release|x86.ActiveCfg = Release|Any CPU + {B4A73545-0177-4159-8602-648AA3058650}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Classes/Saves/GCNSave.cs b/Classes/Saves/GCNSave.cs deleted file mode 100644 index dbe8f73..0000000 --- a/Classes/Saves/GCNSave.cs +++ /dev/null @@ -1,24 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace ACSE.Saves -{ - /// - /// Nintendo GameCube Save File - /// - class GCNSave : SaveBase - { - public GCNSave(string path) : base(path, true) - { - Generation = SaveGeneration.GCN; - } - - protected override bool Load() - { - throw new NotImplementedException(); - } - } -} diff --git a/Classes/Saves/N3DSSave.cs b/Classes/Saves/N3DSSave.cs deleted file mode 100644 index f22788d..0000000 --- a/Classes/Saves/N3DSSave.cs +++ /dev/null @@ -1,24 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace ACSE.Saves -{ - /// - /// Nintendo 3DS Save File - /// - class N3DSSave : SaveBase - { - public N3DSSave(string path) : base(path, false) - { - Generation = SaveGeneration.N3DS; - } - - protected override bool Load() - { - throw new NotImplementedException(); - } - } -} diff --git a/Classes/Saves/N64Save.cs b/Classes/Saves/N64Save.cs deleted file mode 100644 index 32d3dbe..0000000 --- a/Classes/Saves/N64Save.cs +++ /dev/null @@ -1,25 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace ACSE.Saves -{ - /// - /// Nintendo 64 Save File - /// - class N64Save : SaveBase - { - public N64Save(string path) : base(path, true) - { - Generation = SaveGeneration.N64; - SaveType = SaveType.DoubutsuNoMori; - } - - protected override bool Load() - { - throw new NotImplementedException(); - } - } -} diff --git a/Classes/Saves/NDSSave.cs b/Classes/Saves/NDSSave.cs deleted file mode 100644 index 5cacb81..0000000 --- a/Classes/Saves/NDSSave.cs +++ /dev/null @@ -1,25 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace ACSE.Saves -{ - /// - /// Nintendo DS Save File - /// - class NDSSave : SaveBase - { - public NDSSave(string path) : base(path, false) - { - Generation = SaveGeneration.NDS; - SaveType = SaveType.WildWorld; - } - - protected override bool Load() - { - throw new NotImplementedException(); - } - } -} diff --git a/Classes/Saves/SaveBase.cs b/Classes/Saves/SaveBase.cs deleted file mode 100644 index da00f04..0000000 --- a/Classes/Saves/SaveBase.cs +++ /dev/null @@ -1,296 +0,0 @@ -using System; -using System.IO; -using System.Windows.Forms; - -namespace ACSE.Saves -{ - /// - /// The base class for all Save generations' Save Files. - /// - abstract class SaveBase - { - private readonly int SaveDataStartOffset; - private readonly bool IsBigEndian; - - public SaveType SaveType; - public SaveGeneration Generation; - public Region Region; - - public Player[] Players; - public WorldAcre[] Acres; - public WorldAcre[] TownAcres; - public Villager[] Villagers; - - public string FileName; - public string FileExtension; - public string FilePath; - - protected byte[] OriginalData; - protected byte[] Data; - - public bool Modified { get; protected set; } = false; - public bool Loaded { get; protected set; } = false; - public bool ChangesMade { get; protected set; } = false; - - public SaveBase(string savePath, bool bigEndian) - { - FileName = Path.GetFileNameWithoutExtension(savePath); - FileExtension = Path.GetExtension(savePath); - FilePath = Path.GetDirectoryName(savePath); - - IsBigEndian = bigEndian; - - bool SuccessfullyLoadedFile = false; - - try - { - OriginalData = File.ReadAllBytes(savePath); - SuccessfullyLoadedFile = true; - - // Backup the file if backups are enabled - if (Properties.Settings.Default.BackupFiles) - { - //new Backup(this); // Uncomment this once we switch over to using SaveBase & the new save classes. - } - } - catch - { - MessageBox.Show("Unable to load the file [{0}]!\nIt may be in use by another program.", "File Load Error", - MessageBoxButtons.OK, MessageBoxIcon.Error); - } - finally - { - if (SuccessfullyLoadedFile) - { - Data = OriginalData.Clone() as byte[]; - } - } - } - - /// - /// Parses and loads the save file's data - /// - /// bool: Loaded successfully - protected abstract bool Load(); - - #region Read Methods - - /// - /// Reads a byte at the requested offset - /// - /// The offset to read the byte from - /// The byte at the specified offset - public virtual byte ReadByte(int offset) - { - return Data[SaveDataStartOffset + offset]; - } - - /// - /// Reads an array of bytes from an offset - /// - /// The offset to read from - /// The amount of bytes to read - /// The array of bytes at the specified offset - public virtual byte[] ReadByteArray(int offset, int count) - { - byte[] Buffer = new byte[count]; - for (int i = 0; i < count; i++) - Buffer[i] = ReadByte(offset + i); - - return Buffer; - } - - /// - /// Reads an ushort from an offset - /// - /// The offset to read from - /// Read as big endian - /// The ushort at the specified offset - public virtual ushort ReadUInt16(int offset, bool? bigEndian = null) - { - offset += SaveDataStartOffset; - if (!bigEndian.HasValue) - { - return IsBigEndian ? (ushort)((Data[offset] << 8) | Data[offset + 1]) : (ushort)((Data[offset + 1] << 8) | Data[offset]); - } - else - { - return bigEndian.Value ? (ushort)((Data[offset] << 8) | Data[offset + 1]) : (ushort)((Data[offset + 1] << 8) | Data[offset]); - } - } - - /// - /// Reads an array of ushorts from an offset - /// - /// The offset to read from - /// The amount of ushorts to read - /// Read as big endian - /// - public virtual ushort[] ReadUInt16Array(int offset, int count, bool? bigEndian = null) - { - ushort[] Buffer = new ushort[count]; - for (int i = 0; i < count; i++) - Buffer[i] = ReadUInt16(offset + i * 2, bigEndian); - - return Buffer; - } - - /// - /// Reads an uint from an offset - /// - /// The offset to read from - /// Read as big endian - /// - public virtual uint ReadUInt32(int offset, bool? bigEndian = null) - { - offset += SaveDataStartOffset; - uint Value = (uint)((Data[offset + 3] << 24) | (Data[offset + 2] << 16) | (Data[offset + 1] << 8) | Data[offset]); - - if ((!bigEndian.HasValue && IsBigEndian) || (bigEndian.HasValue && bigEndian.Value)) - Value = Value.Reverse(); - - return Value; - } - - /// - /// Reads an array of uints from an offset - /// - /// The offset to read from - /// The amount of uints to read - /// Read as big endian - /// - public virtual uint[] ReadUInt32Array(int offset, int count, bool? bigEndian = null) - { - uint[] Buffer = new uint[count]; - for (int i = 0; i < count; i++) - Buffer[i] = ReadUInt16(offset + i * 4, bigEndian); - - return Buffer; - } - - /// - /// Reads an ulong from an offset - /// - /// The offset to read from - /// Read as big endian - /// - public virtual ulong ReadUInt64(int offset, bool? bigEndian = null) - { - offset += SaveDataStartOffset; - ulong Value = ((ulong)Data[offset + 7] << 56) | ((ulong)Data[offset + 6] << 48) | ((ulong)Data[offset + 5] << 40) - | ((ulong)Data[offset + 4] << 32) | ((ulong)Data[offset + 3] << 24) | ((ulong)Data[offset + 2] << 16) | ((ulong)Data[offset + 1] << 8) - | (Data[offset]); - - if ((!bigEndian.HasValue && IsBigEndian) || (bigEndian.HasValue && bigEndian.Value)) - Value = Value.Reverse(); - - return Value; - } - - /// - /// Reads an array of ulongs from an offset - /// - /// The offset to read from - /// The amount of ulongs to read - /// Read as big endian - /// - public virtual ulong[] ReadUInt64Array(int offset, int count, bool? bigEndian = null) - { - ulong[] Buffer = new ulong[count]; - for (int i = 0; i < count; i++) - Buffer[i] = ReadUInt64(offset + i * 8, bigEndian); - - return Buffer; - } - - /// - /// Reads a char from an offset - /// - /// The offset to read from - /// - public virtual char ReadChar(int offset) - { - return (char)Data[SaveDataStartOffset + offset]; - } - - /// - /// Reads an array of chars from an offset - /// - /// The offset to read from - /// The amount of chars to read - /// - public virtual char[] ReadCharArray(int offset, int count) - { - char[] Buffer = new char[count]; - for (int i = 0; i < count; i++) - Buffer[i] = ReadChar(offset + i); - - return Buffer; - } - - /// - /// Reads a string from an offset - /// - /// The offset to read from - /// The length of the string - /// - public virtual string ReadString(int offset, int length) - { - return new Utilities.AcString(ReadByteArray(offset, length), SaveType).Trim(); - } - - #endregion - - /// - /// Writes any data type to an offset - /// - /// The offset to write to - /// The data to be written - /// Write as big endian if the save file is big endian format - /// The length of the string to be written, only used if data is a string - public virtual void Write(int offset, dynamic data, bool? useEndianness = null, int stringLength = 0) - { - bool reversed = false; - if (useEndianness.HasValue && useEndianness.Value) - reversed = IsBigEndian; - - ChangesMade = true; - Type Data_Type = data.GetType(); - - if (!Data_Type.IsArray) - { - if (Data_Type == typeof(byte)) - Data[offset] = (byte)data; - else if (Data_Type == typeof(string)) - { - byte[] String_Byte_Buff = Utilities.AcString.GetBytes((string)data, stringLength); - Buffer.BlockCopy(String_Byte_Buff, 0, Data, offset, String_Byte_Buff.Length); - } - else - { - byte[] Byte_Array = BitConverter.GetBytes(data); - if (reversed) - Array.Reverse(Byte_Array); - Buffer.BlockCopy(Byte_Array, 0, Data, offset, Byte_Array.Length); - } - } - else - { - if (Data_Type == typeof(byte[])) - for (int i = 0; i < data.Length; i++) - Data[offset + i] = data[i]; - else - { - int Data_Size = System.Runtime.InteropServices.Marshal.SizeOf(data[0]); - for (int i = 0; i < data.Length; i++) - { - byte[] Byte_Array = BitConverter.GetBytes(data[i]); - if (reversed) - Array.Reverse(Byte_Array); - Byte_Array.CopyTo(Data, offset + i * Data_Size); - } - } - } - } - } -} diff --git a/Classes/Saves/SwitchSave.cs b/Classes/Saves/SwitchSave.cs deleted file mode 100644 index 9b0bd6e..0000000 --- a/Classes/Saves/SwitchSave.cs +++ /dev/null @@ -1,20 +0,0 @@ -using System; - -namespace ACSE.Saves -{ - /// - /// Nintendo Switch Save File - /// - class SwitchSave : SaveBase - { - public SwitchSave(string path) : base(path, false) - { - Generation = SaveGeneration.Switch; - } - - protected override bool Load() - { - throw new NotImplementedException(); - } - } -} diff --git a/Classes/Saves/WiiSave.cs b/Classes/Saves/WiiSave.cs deleted file mode 100644 index 057d00b..0000000 --- a/Classes/Saves/WiiSave.cs +++ /dev/null @@ -1,25 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace ACSE.Saves -{ - /// - /// Wii Save File - /// - class WiiSave : SaveBase - { - public WiiSave(string path) : base(path, true) - { - Generation = SaveGeneration.Wii; - SaveType = SaveType.CityFolk; - } - - protected override bool Load() - { - throw new NotImplementedException(); - } - } -} diff --git a/Classes/Utilities/ImageUtility.cs b/Classes/Utilities/ImageUtility.cs deleted file mode 100644 index 94a211b..0000000 --- a/Classes/Utilities/ImageUtility.cs +++ /dev/null @@ -1,158 +0,0 @@ -using System; -using System.Drawing; -using System.Drawing.Imaging; -using System.Runtime.InteropServices; - -namespace ACSE.Utilities -{ - public static class ImageUtility - { - /// - /// Changes an image's opacity. - /// - /// The image whose transparency will be modified. - /// The transparency change amount. Clamped between 0 and 1. - public static Bitmap ChangeOpacity(Image image, double transparency) - { - if (image == null || image.PixelFormat.HasFlag(PixelFormat.Indexed)) return null; - - // Clamp transparency between 0 and 1, since it's a percentage. - transparency = transparency.Clamp(0, 1); - - var bitmap = (Bitmap) image.Clone(); - - // Modify image data - var (bitmapData, scanPtr, pixelData) = GetBitmapInfo(bitmap); - for (var i = 0; i < pixelData.Length; i += 4) - { - pixelData[i + 3] = (byte) (pixelData[i + 3] * transparency); - } - - // Copy data & unlock bitmap data - Marshal.Copy(scanPtr, pixelData, 0, pixelData.Length); - bitmap.UnlockBits(bitmapData); - - return bitmap; - } - - public static Bitmap LayerImage(in Image baseImage, in Image overlayImage, int x, int y) - { - if (baseImage == null) return null; - if (overlayImage == null) return baseImage as Bitmap; - - var layeredBitmap = new Bitmap(baseImage.Width, baseImage.Height); - using (var graphics = Graphics.FromImage(layeredBitmap)) - { - graphics.DrawImage(baseImage, 0, 0); - graphics.DrawImage(overlayImage, x, y); - } - - return layeredBitmap; - } - - public static Bitmap LayerImage(in Image baseImage, in Image overlayImage, int x, int y, double overlayTransparency) - { - if (baseImage == null) return null; - if (overlayImage == null) return baseImage as Bitmap; - - return LayerImage(baseImage, ChangeOpacity(overlayImage, overlayTransparency), x, y); - } - - public static Bitmap OverlayColor(in Image image, Color color) - { - if (image == null || image.PixelFormat.HasFlag(PixelFormat.Indexed)) return null; - - var bitmap = (Bitmap) image.Clone(); - - // Modify image data - var (bitmapData, scanPtr, pixelData) = GetBitmapInfo(bitmap); - for (var i = 0; i < pixelData.Length; i += 4) - { - // Skip transparent pixels - if (pixelData[i + 3] == 0) continue; - pixelData[i + 0] = color.R; - pixelData[i + 1] = color.G; - pixelData[i + 2] = color.B; - } - - // Copy data & unlock bitmap data - Marshal.Copy(scanPtr, pixelData, 0, pixelData.Length); - bitmap.UnlockBits(bitmapData); - - return bitmap; - } - - public static Bitmap OverlayColor(in Image image, byte r, byte g, byte b) => - OverlayColor(image, Color.FromArgb(0xFF, r, g, b)); - - public static Bitmap MakeGrayscale(in Image image) - { - if (image == null || image.PixelFormat.HasFlag(PixelFormat.Indexed)) return null; - - var bitmap = (Bitmap) image.Clone(); - - // Modify image data - var (bitmapData, scanPtr, pixelData) = GetBitmapInfo(bitmap); - - for (var i = 0; i < pixelData.Length; i += 4) - { - // Skip transparent pixels - if (pixelData[i + 3] == 0) continue; - var grayValue = - (byte) ((pixelData[i + 2] * 0.3 + pixelData[i + 1] * 0.59 + pixelData[i + 0] * 0.11) / 3); - pixelData[i + 0] = grayValue; - pixelData[i + 1] = grayValue; - pixelData[i + 2] = grayValue; - } - - // Copy data & unlock bitmap data - Marshal.Copy(scanPtr, pixelData, 0, pixelData.Length); - bitmap.UnlockBits(bitmapData); - - return bitmap; - } - - public static Bitmap ColorizeGrayscale(in Image image, Color replacingColor) - { - if (image == null || image.PixelFormat.HasFlag(PixelFormat.Indexed)) return null; - - var bitmap = (Bitmap) image.Clone(); - - // Modify image data - var (bitmapData, scanPtr, pixelData) = GetBitmapInfo(bitmap); - - for (var i = 0; i < pixelData.Length; i += 4) - { - // Skip transparent pixels & pixels that aren't gray - if (pixelData[i + 3] == 0 || pixelData[i + 0] != pixelData[i + 1] || pixelData[i + 1] != pixelData[i + 2]) continue; - - var intensity = pixelData[i + 0] / 255.0d; - pixelData[i + 0] = (byte) (replacingColor.R * intensity); - pixelData[i + 1] = (byte) (replacingColor.G * intensity); - pixelData[i + 2] = (byte) (replacingColor.B * intensity); - } - - // Copy data & unlock bitmap data - Marshal.Copy(scanPtr, pixelData, 0, pixelData.Length); - bitmap.UnlockBits(bitmapData); - - return bitmap; - } - - public static Bitmap ColorizeGrayscale(in Image image, byte r, byte g, byte b) => - ColorizeGrayscale(image, Color.FromArgb(0xFF, r, g, b)); - - private static (BitmapData data, IntPtr pointer, byte[] output) GetBitmapInfo(in Bitmap bitmap) - { - // Allocate pixel data buffer and lock bitmap for reading - var pixelData = new byte[bitmap.Width * bitmap.Height * 4]; - var bitmapData = bitmap.LockBits(new Rectangle(0, 0, bitmap.Width, bitmap.Height), ImageLockMode.ReadOnly, - bitmap.PixelFormat); - - // Copy pixel data from Scan0 to allocated byte array - Marshal.Copy(bitmapData.Scan0, pixelData, 0, pixelData.Length); - - return (bitmapData, bitmapData.Scan0, pixelData); - } - } -} diff --git a/Tests/ACSE.Tests/ACSE.Tests.csproj b/Tests/ACSE.Tests/ACSE.Tests.csproj index 45805ed..eddd277 100644 --- a/Tests/ACSE.Tests/ACSE.Tests.csproj +++ b/Tests/ACSE.Tests/ACSE.Tests.csproj @@ -58,9 +58,13 @@ - - {078ba400-42dd-432a-9844-32213157a29d} - ACSE + + {c4cc8c38-85d7-44eb-ae3a-14407c3184b5} + ACSE.Core + + + {b4a73545-0177-4159-8602-648aa3058650} + ACSE.WinForms diff --git a/Tests/ACSE.Tests/ChecksumTests.cs b/Tests/ACSE.Tests/ChecksumTests.cs index 0f440b3..22503b2 100644 --- a/Tests/ACSE.Tests/ChecksumTests.cs +++ b/Tests/ACSE.Tests/ChecksumTests.cs @@ -1,4 +1,4 @@ -using ACSE.Checksums; +using ACSE.Core.Saves.Checksums; using Microsoft.VisualStudio.TestTools.UnitTesting; namespace ACSE.Tests