feat(Documents) Notes/Docs page improvements and warning cleanup

Model/Entity/Data/EntityType.cs

@@ -1,15 +1,14 @@
-using System;
+namespace Model.Entity.Data;
 
-namespace Model.Immortal.Entity.Data;
-
-public static class EntityType {
+public static class EntityType
+{
     public static string None = "None";
     public static string Any = "Any";
     public static string Teapot = "Teapot";
     public static string Family = "Family";
     public static string Faction = "Faction";
     public static string Command = "Command";
-    
+
     public static string Worker = "Worker";
     public static string Army = "Army";
     public static string Building = "Building";

Model/Entity/Data/Ids_Entity.cs

@@ -1,6 +1,7 @@
-namespace Model.Immortal.Entity.Data;
+namespace Model.Entity.Data;
 
-public static class DataType {
+public static class DataType
+{
     public static string PYREEVENT_TowerKilled = "9a923928-b016-49f2-8c7d-950abf09e287";
     public static string PYREEVENT_CampTaken = "cc27a9b2-69e2-4322-8102-7a9f8bea7871";
     public static string PYREEVENT_MinerTaken = "5b158cf2-2810-4a2a-8131-c4fe4b392ce9";
@@ -75,10 +76,10 @@ public static class DataType {
     public static string BUILDING_DeepNest = "3076ae6e-89bf-4ea1-a66c-ea45ffcb4046";
     public static string BUILDING_Neurocyte = "90c6e53f-0430-4992-a1eb-4f91699292cb";
     public static string DEFENSE_FireSinger = "c7a90286-6977-4d92-91e0-2a0a46eb13ea";
-    
+
     public static string BUILDING_KeeperOfTheHardenedFlames = "db784823-5199-4bae-bc5e-96174490cd00";
 
-    
+
     public static string DEFENSE_Aerovore = "b68307b7-4759-43a3-8679-d844ac3aa73f";
     public static string UPGRADE_FaithCastBlades = "32087a66-900e-4f25-95f7-de56d5b424c7";
     public static string UPGRADE_RelicOfTheWrathfulGaze = "e6fa5ded-53f5-4914-85bb-1fdff5f32b64";
@@ -98,11 +99,11 @@ public static class DataType {
     public static string UPGRADE_BehemothCapacity = "d0390dd2-d9a5-4b20-9d8b-f554f4c52143";
     public static string UPGRADE_BloodPlague = "9c207e21-f595-49d0-967d-f30ca8cc3745";
     public static string UPGRADE_BirthingStorm = "0cb2f1a4-03b3-491b-9db3-d2d4590ede3a";
-    
+
 
     public static string PASSIVE_Respite = "607c39f4-a957-4a7a-8fc6-a239f9e570ec";
 
-    
+
     public static string PASSIVE_OssifyingSwarm = "b8897247-8393-416e-b246-409a6b3263c2";
 
     public static string PASSIVE_QuenchingScythes = "dbf07db4-e7b6-4f81-9f8e-e5391850eead";
@@ -112,14 +113,14 @@ public static class DataType {
     public static string PASSIVE_GuidingAmber = "9eab6701-0f0d-4858-b8a4-14e3a5dab822";
     public static string PASSIVE_GodstoneBulwark = "482189ac-713d-4870-a960-d2930961c486";
     public static string PASSIVE_Invervention = "3a70d237-1530-455a-b4f8-a626d708334c";
-    
+
     public static string PASSIVE_ThrumAttackSpeed = "356b6c33-a857-489c-8218-68c53d03db90";
-    
+
     public static string PASSIVE_MendingCommand = "25d94c3d-dba9-4f02-abf4-904269b539c6";
     public static string PASSIVE_StabilizeHallowedGround = "0bbbaf06-fd22-4f48-a888-cc1ab6af046e";
     public static string PASSIVE_SpawnQuitl = "80f6b382-da1c-49a1-8235-1ea37983ea54";
     public static string PASSIVE_XacalDamage = "69928f20-5332-418f-ada3-694da3f7b199";
-    
+
     public static string ABILITY_BladesOfTheGodhead = "000154ac-faf5-483d-b0bd-e84335891a27";
     public static string ABILITY_Windstep = "a410b296-39f7-42e0-87c8-6cef11eb967c";
     public static string ABILITY_Leap = "aa155b88-125a-4d25-b63f-77987ea6e519";

Model/Entity/EntityModel.cs

@@ -1,40 +1,37 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using Model.Immortal.Entity.Data;
-using Model.Immortal.Entity.Parts;
-using Model.Immortal.Types;
+using Model.Entity.Data;
+using Model.Entity.Parts;
+using Model.Types;
 using YamlDotNet.Serialization;
 
-namespace Model.Immortal.Entity;
+namespace Model.Entity;
 
-public class EntityModel {
+public class EntityModel
+{
     public static readonly string GameVersion = "0.0.6.8900a";
 
-     private static Dictionary<string, EntityModel> _database;
+    private static Dictionary<string, EntityModel> _database;
 
-     private static List<EntityModel> entityModels;
+    private static List<EntityModel> entityModels;
 
-     private static List<EntityModel> entityModelsOnlyHotkey;
+    private static List<EntityModel> entityModelsOnlyHotkey;
 
-     private static Dictionary<string, List<EntityModel>> entityModelsByHotkey;
+    private static Dictionary<string, List<EntityModel>> entityModelsByHotkey;
 
 
-    public EntityModel() { }
+    public EntityModel()
+    {
+    }
 
-    public EntityModel(string data, string entity, bool isSpeculative = false) {
+    public EntityModel(string data, string entity, bool isSpeculative = false)
+    {
         DataType = data;
         EntityType = entity;
         IsSpeculative = isSpeculative;
     }
 
-    public string AsYaml() {
-        var stringBuilder = new StringBuilder();
-        var serializer = new Serializer();
-        stringBuilder.AppendLine(serializer.Serialize(this));
-        return stringBuilder.ToString();
-    }
-    
     public string DataType { get; set; }
 
     // TODO Serilization currently being used for build orders
@@ -45,50 +42,64 @@ public class EntityModel {
     public bool IsSpeculative { get; set; }
 
     public string Descriptive { get; set; } = DescriptiveType.None;
-    
-    public EntityModel Clone() {
+
+    public string AsYaml()
+    {
+        var stringBuilder = new StringBuilder();
+        var serializer = new Serializer();
+        stringBuilder.AppendLine(serializer.Serialize(this));
+        return stringBuilder.ToString();
+    }
+
+    public EntityModel Clone()
+    {
         return (EntityModel)MemberwiseClone();
     }
 
-    
-    public void Copy(EntityModel entity) {
+
+    public void Copy(EntityModel entity)
+    {
         DataType = entity.DataType;
         EntityType = entity.EntityType;
         EntityParts = entity.EntityParts.ToList();
     }
 
-    
-    public EntityModel AddPart(IEntityPartInterface unitPart) {
+
+    public EntityModel AddPart(IEntityPartInterface unitPart)
+    {
         EntityParts.Add(unitPart);
         return this;
     }
 
-    
-    public static Dictionary<string, EntityModel> GetDictionary() {
+
+    public static Dictionary<string, EntityModel> GetDictionary()
+    {
         if (_database == null) _database = DATA.Get();
 
         return _database;
     }
 
-    
-    public static EntityModel Get(string entity) {
+
+    public static EntityModel Get(string entity)
+    {
         if (_database == null) _database = DATA.Get();
 
         return _database[entity];
     }
 
-    
-    
-    
-    public static List<EntityModel> GetList() {
+
+    public static List<EntityModel> GetList()
+    {
         if (entityModels == null) entityModels = DATA.Get().Values.ToList();
 
         return entityModels;
     }
 
-    
-    public static List<EntityModel> GetListOnlyHotkey() {
-        if (entityModelsOnlyHotkey == null) {
+
+    public static List<EntityModel> GetListOnlyHotkey()
+    {
+        if (entityModelsOnlyHotkey == null)
+        {
             entityModelsOnlyHotkey = new List<EntityModel>();
 
             foreach (var entity in DATA.Get().Values)
@@ -99,14 +110,18 @@ public class EntityModel {
         return entityModelsOnlyHotkey;
     }
 
-    
-    public static Dictionary<string, List<EntityModel>> GetEntitiesByHotkey() {
-        if (entityModelsByHotkey == null) {
+
+    public static Dictionary<string, List<EntityModel>> GetEntitiesByHotkey()
+    {
+        if (entityModelsByHotkey == null)
+        {
             entityModelsByHotkey = new Dictionary<string, List<EntityModel>>();
 
-            foreach (var entity in GetList()) {
+            foreach (var entity in GetList())
+            {
                 var entityHotkey = entity.Hotkey();
-                if (entityHotkey != null) {
+                if (entityHotkey != null)
+                {
                     if (!entityModelsByHotkey.ContainsKey(entityHotkey.Hotkey))
                         entityModelsByHotkey[entityHotkey.Hotkey] = new List<EntityModel>();
 
@@ -119,9 +134,10 @@ public class EntityModel {
         return entityModelsByHotkey;
     }
 
-    
+
     public static EntityModel GetFrom(string hotkey, string hotkeyGroup, bool holdSpace, string faction,
-        string immortal) {
+        string immortal)
+    {
         if (hotkey == null || hotkey == "") return null;
 
         //TODO
@@ -142,121 +158,143 @@ public class EntityModel {
         return found;
     }
 
-    
-    public EntityInfoModel Info() {
+
+    public EntityInfoModel Info()
+    {
         return (EntityInfoModel)EntityParts.Find(x => x.GetType() == typeof(EntityInfoModel));
     }
 
-    
-    public EntitySupplyModel Supply() {
+
+    public EntitySupplyModel Supply()
+    {
         return (EntitySupplyModel)EntityParts.Find(x => x.GetType() == typeof(EntitySupplyModel));
     }
 
-    
-    public EntityTierModel Tier() {
+
+    public EntityTierModel Tier()
+    {
         return (EntityTierModel)EntityParts.Find(x => x.GetType() == typeof(EntityTierModel));
     }
 
-    
-    public EntityProductionModel Production() {
+
+    public EntityProductionModel Production()
+    {
         return (EntityProductionModel)EntityParts.Find(x => x.GetType() == typeof(EntityProductionModel));
     }
 
-    
-    public EntityMovementModel Movement() {
+
+    public EntityMovementModel Movement()
+    {
         return (EntityMovementModel)EntityParts.Find(x => x.GetType() == typeof(EntityMovementModel));
     }
 
-    
-    public EntityVitalityModel Vitality() {
+
+    public EntityVitalityModel Vitality()
+    {
         return (EntityVitalityModel)EntityParts.Find(x => x.GetType() == typeof(EntityVitalityModel));
     }
 
-    
-    public List<EntityRequirementModel> Requirements() {
+
+    public List<EntityRequirementModel> Requirements()
+    {
         return EntityParts.FindAll(x => x.GetType() == typeof(EntityRequirementModel))
             .Cast<EntityRequirementModel>().ToList();
     }
 
-    
-    public List<EntityWeaponModel> Weapons() {
+
+    public List<EntityWeaponModel> Weapons()
+    {
         return EntityParts.FindAll(x => x.GetType() == typeof(EntityWeaponModel))
             .Cast<EntityWeaponModel>().ToList();
     }
 
-    
-    public List<EntityVanguardReplacedModel> Replaceds() {
+
+    public List<EntityVanguardReplacedModel> Replaceds()
+    {
         return EntityParts.FindAll(x => x.GetType() == typeof(EntityVanguardReplacedModel))
             .Cast<EntityVanguardReplacedModel>().ToList();
     }
 
-    
-    public EntityVanguardAddedModel VanguardAdded() {
+
+    public EntityVanguardAddedModel VanguardAdded()
+    {
         return (EntityVanguardAddedModel)EntityParts.Find(x => x.GetType() == typeof(EntityVanguardAddedModel));
     }
 
-    
-    public EntityHotkeyModel Hotkey() {
+
+    public EntityHotkeyModel Hotkey()
+    {
         return (EntityHotkeyModel)EntityParts.Find(x => x.GetType() == typeof(EntityHotkeyModel));
     }
 
-    
-    public EntityFactionModel Faction() {
+
+    public EntityFactionModel Faction()
+    {
         return (EntityFactionModel)EntityParts.Find(x => x.GetType() == typeof(EntityFactionModel));
     }
 
-    
-    public EntityHarvestModel Harvest() {
+
+    public EntityHarvestModel Harvest()
+    {
         return (EntityHarvestModel)EntityParts.Find(x => x.GetType() == typeof(EntityHarvestModel));
     }
 
-    
-    public List<EntityIdAbilityModel> IdAbilities() {
+
+    public List<EntityIdAbilityModel> IdAbilities()
+    {
         return EntityParts.FindAll(x => x.GetType() == typeof(EntityIdAbilityModel))
             .Cast<EntityIdAbilityModel>().ToList();
     }
 
-    
-    public List<EntityIdArmyModel> IdArmies() {
+
+    public List<EntityIdArmyModel> IdArmies()
+    {
         return EntityParts.FindAll(x => x.GetType() == typeof(EntityIdArmyModel))
             .Cast<EntityIdArmyModel>().ToList();
     }
 
-    
-    public List<EntityIdPassiveModel> IdPassives() {
+
+    public List<EntityIdPassiveModel> IdPassives()
+    {
         return EntityParts.FindAll(x => x.GetType() == typeof(EntityIdPassiveModel))
             .Cast<EntityIdPassiveModel>().ToList();
     }
 
-    
-    public List<EntityIdUpgradeModel> IdUpgrades() {
+
+    public List<EntityIdUpgradeModel> IdUpgrades()
+    {
         return EntityParts.FindAll(x => x.GetType() == typeof(EntityIdUpgradeModel))
             .Cast<EntityIdUpgradeModel>().ToList();
     }
 
-    
-    public List<EntityIdVanguardModel> IdVanguards() {
+
+    public List<EntityIdVanguardModel> IdVanguards()
+    {
         return EntityParts.FindAll(x => x.GetType() == typeof(EntityIdVanguardModel))
             .Cast<EntityIdVanguardModel>().ToList();
     }
 
-    
-    public List<EntityIdPyreSpellModel> IdPyreSpells() {
+
+    public List<EntityIdPyreSpellModel> IdPyreSpells()
+    {
         return EntityParts.FindAll(x => x.GetType() == typeof(EntityIdPyreSpellModel))
             .Cast<EntityIdPyreSpellModel>().ToList();
     }
 
-    public List<EntityMechanicModel> Mechanics() {
+    public List<EntityMechanicModel> Mechanics()
+    {
         return EntityParts.FindAll(x => x.GetType() == typeof(EntityMechanicModel))
             .Cast<EntityMechanicModel>().ToList();
     }
 
-    public List<EntityPassiveModel> Passives() {
+    public List<EntityPassiveModel> Passives()
+    {
         return EntityParts.FindAll(x => x.GetType() == typeof(EntityPassiveModel))
             .Cast<EntityPassiveModel>().ToList();
     }
 
-    public List<EntityStrategyModel> Strategies() {
+    public List<EntityStrategyModel> Strategies()
+    {
         return EntityParts.FindAll(x => x.GetType() == typeof(EntityStrategyModel))
             .Cast<EntityStrategyModel>().ToList();
     }

Model/Entity/Parts/EntityFactionModel.cs

@@ -1,8 +1,9 @@
-using Model.Immortal.Types;
+using Model.Types;
 
-namespace Model.Immortal.Entity.Parts;
+namespace Model.Entity.Parts;
 
-public class EntityFactionModel : IEntityPartInterface {
+public class EntityFactionModel : IEntityPartInterface
+{
     public string Type { get; set; } = "EntityFactionModel";
     public string Faction { get; set; } = FactionType.QRath;
 }

Model/Entity/Parts/EntityHarvestModel.cs

@@ -1,8 +1,9 @@
-using Model.Immortal.Types;
+using Model.Types;
 
-namespace Model.Immortal.Entity.Parts;
+namespace Model.Entity.Parts;
 
-public class EntityHarvestModel : IEntityPartInterface {
+public class EntityHarvestModel : IEntityPartInterface
+{
     public string Type { get; set; } = "EntityHarvestModel";
     public ResourceType Resource { get; set; } = ResourceType.Alloy;
     public float Slots { get; set; }

Model/Entity/Parts/EntityHotkeyModel.cs

@@ -1,32 +1,38 @@
 using System.Collections.Generic;
 
-namespace Model.Immortal.Entity.Parts;
+namespace Model.Entity.Parts;
 
-public class EntityHotkeyModel : IEntityPartInterface {
+public class EntityHotkeyModel : IEntityPartInterface
+{
     public string Type { get; set; } = "EntityHotkeyModel";
     public string Hotkey { get; set; }
     public bool HoldSpace { get; set; } = false;
     public string HotkeyGroup { get; set; }
 
 
-    public bool IsSelectedHotkey(List<string> keys) {
+    public bool IsSelectedHotkey(List<string> keys)
+    {
         return keys.Contains(Hotkey.ToUpper());
     }
 
-    public bool IsSelectedHotkeyGroup(List<string> keys) {
+    public bool IsSelectedHotkeyGroup(List<string> keys)
+    {
         return keys.Contains(HotkeyGroup.ToUpper());
     }
 
 
-    public bool IsSelectedHoldSpace(List<string> keys) {
+    public bool IsSelectedHoldSpace(List<string> keys)
+    {
         return (keys.Contains("SPACE") || keys.Contains(" ")) == HoldSpace;
     }
 
 
-    public bool IsSelectedHotkeyGroupWithSpace(List<string> keys) {
+    public bool IsSelectedHotkeyGroupWithSpace(List<string> keys)
+    {
         var foundKey = false;
         var foundHold = false;
-        foreach (var key in keys) {
+        foreach (var key in keys)
+        {
             if (key.ToUpper().Equals(HotkeyGroup.ToUpper())) foundKey = true;
             if (key.ToUpper().Equals("SPACE") || key.ToUpper().Equals(" ")) foundHold = true;
         }

Model/Entity/Parts/EntityIdAbilityModel.cs

@@ -1,6 +1,7 @@
-namespace Model.Immortal.Entity.Parts;
+namespace Model.Entity.Parts;
 
-public class EntityIdAbilityModel : IEntityPartInterface {
+public class EntityIdAbilityModel : IEntityPartInterface
+{
     public string Type { get; set; } = "EntityIdAbilityModel";
     public string Id { get; set; }
 }

Model/Entity/Parts/EntityIdArmyModel.cs

@@ -1,6 +1,7 @@
-namespace Model.Immortal.Entity.Parts;
+namespace Model.Entity.Parts;
 
-public class EntityIdArmyModel : IEntityPartInterface {
+public class EntityIdArmyModel : IEntityPartInterface
+{
     public string Type { get; set; } = "EntityIdArmyModel";
     public string Id { get; set; }
 }

Model/Entity/Parts/EntityIdPassiveModel.cs

@@ -1,6 +1,7 @@
-namespace Model.Immortal.Entity.Parts;
+namespace Model.Entity.Parts;
 
-public class EntityIdPassiveModel : IEntityPartInterface {
+public class EntityIdPassiveModel : IEntityPartInterface
+{
     public string Type { get; set; } = "EntityIdPassiveModel";
     public string Id { get; set; }
 }

Model/Entity/Parts/EntityIdPyreSpellModel.cs

@@ -1,6 +1,7 @@
-namespace Model.Immortal.Entity.Parts;
+namespace Model.Entity.Parts;
 
-public class EntityIdPyreSpellModel : IEntityPartInterface {
+public class EntityIdPyreSpellModel : IEntityPartInterface
+{
     public string Type { get; set; } = "EntityIdPyreSpellModel";
     public string Id { get; set; }
 }

Model/Entity/Parts/EntityIdUpgradeModel.cs

@@ -1,6 +1,7 @@
-namespace Model.Immortal.Entity.Parts;
+namespace Model.Entity.Parts;
 
-public class EntityIdUpgradeModel : IEntityPartInterface {
+public class EntityIdUpgradeModel : IEntityPartInterface
+{
     public string Type { get; set; } = "EntityIdUpgradeModel";
 
     public string Id { get; set; }

Model/Entity/Parts/EntityIdVanguardModel.cs

@@ -1,6 +1,7 @@
-namespace Model.Immortal.Entity.Parts;
+namespace Model.Entity.Parts;
 
-public class EntityIdVanguardModel : IEntityPartInterface {
+public class EntityIdVanguardModel : IEntityPartInterface
+{
     public string Type { get; set; } = "EntityIdVanguardModel";
     public string Id { get; set; }
 }

Model/Entity/Parts/EntityInfoModel.cs

@@ -1,8 +1,9 @@
-using Model.Immortal.Types;
+using Model.Types;
 
-namespace Model.Immortal.Entity.Parts;
+namespace Model.Entity.Parts;
 
-public class EntityInfoModel : IEntityPartInterface {
+public class EntityInfoModel : IEntityPartInterface
+{
     public string Type { get; set; } = "EntityInfoModel";
     public string Name { get; set; } = "";
     public string Descriptive { get; set; } = DescriptiveType.None;

Model/Entity/Parts/EntityMechanicModel.cs

@@ -1,6 +1,7 @@
-namespace Model.Immortal.Entity.Parts;
+namespace Model.Entity.Parts;
 
-public class EntityMechanicModel : IEntityPartInterface {
+public class EntityMechanicModel : IEntityPartInterface
+{
     public string Type { get; set; } = "EntityMechanicModel";
     public string Name { get; set; } = "";
     public string Description { get; set; }

Model/Entity/Parts/EntityMovementModel.cs

@@ -1,8 +1,9 @@
-using Model.Immortal.Types;
+using Model.Types;
 
-namespace Model.Immortal.Entity.Parts;
+namespace Model.Entity.Parts;
 
-public class EntityMovementModel : IEntityPartInterface {
+public class EntityMovementModel : IEntityPartInterface
+{
     public string Type { get; set; } = "EntityMovementModel";
     public float Speed { get; set; } = 0;
     public string Movement { get; set; } = MovementType.Ground;

Model/Entity/Parts/EntityPassiveModel.cs

@@ -1,6 +1,7 @@
-namespace Model.Immortal.Entity.Parts;
+namespace Model.Entity.Parts;
 
-public class EntityPassiveModel : IEntityPartInterface {
+public class EntityPassiveModel : IEntityPartInterface
+{
     public string Type { get; set; } = "EntityPassiveModel";
     public string Name { get; set; } = "";
     public string Description { get; set; }

Model/Entity/Parts/EntityProductionModel.cs

@@ -1,6 +1,7 @@
-namespace Model.Immortal.Entity.Parts;
+namespace Model.Entity.Parts;
 
-public class EntityProductionModel : IEntityPartInterface {
+public class EntityProductionModel : IEntityPartInterface
+{
     public string Type { get; set; } = "EntityProductionModel";
     public int Alloy { get; set; } = 0;
 

Model/Entity/Parts/EntityPyreRewardModel.cs

@@ -1,6 +1,7 @@
-namespace Model.Immortal.Entity.Parts;
+namespace Model.Entity.Parts;
 
-public class EntityPyreRewardModel : IEntityPartInterface {
+public class EntityPyreRewardModel : IEntityPartInterface
+{
     public string Type { get; set; } = "EntityPyreRewardModel";
 
     public int BaseReward { get; set; } = 0;

Model/Entity/Parts/EntityRequirementModel.cs

@@ -1,8 +1,9 @@
-using Model.Immortal.Types;
+using Model.Types;
 
-namespace Model.Immortal.Entity.Parts;
+namespace Model.Entity.Parts;
 
-public class EntityRequirementModel : IEntityPartInterface {
+public class EntityRequirementModel : IEntityPartInterface
+{
     public string Type { get; set; } = "EntityRequirementModel";
     public string DataType { get; set; }
     public string Requirement { get; set; } = RequirementType.Production_Building;

Model/Entity/Parts/EntityStrategyModel.cs

@@ -1,6 +1,7 @@
-namespace Model.Immortal.Entity.Parts;
+namespace Model.Entity.Parts;
 
-public class EntityStrategyModel : IEntityPartInterface {
+public class EntityStrategyModel : IEntityPartInterface
+{
     public string Type { get; set; } = "EntityStrategyModel";
     public string Notes { get; set; } = "";
 }

Model/Entity/Parts/EntitySupplyModel.cs

@@ -1,6 +1,7 @@
-namespace Model.Immortal.Entity.Parts;
+namespace Model.Entity.Parts;
 
-public class EntitySupplyModel : IEntityPartInterface {
+public class EntitySupplyModel : IEntityPartInterface
+{
     public string Type { get; set; } = "EntitySupplyModel";
     public int Takes { get; set; } = 0;
     public int Grants { get; set; } = 0;

Model/Entity/Parts/EntityTierModel.cs

@@ -1,6 +1,7 @@
-namespace Model.Immortal.Entity.Parts;
+namespace Model.Entity.Parts;
 
-public class EntityTierModel : IEntityPartInterface {
+public class EntityTierModel : IEntityPartInterface
+{
     public string Type { get; set; } = "EntityTierModel";
     public float Tier { get; set; }
 }

Model/Entity/Parts/EntityVanguardAddedModel.cs

@@ -1,13 +1,12 @@
-using System;
-using Model.Immortal.Entity.Data;
-using Model.Immortal.Types;
+using Model.Entity.Data;
 
-namespace Model.Immortal.Entity.Parts;
+namespace Model.Entity.Parts;
 
-public class EntityVanguardAddedModel : IEntityPartInterface {
+public class EntityVanguardAddedModel : IEntityPartInterface
+{
     public string Type { get; set; } = "EntityVanguardAddedModel";
-    
+
     public string ImmortalId { get; set; } = DataType.IMMORTAL_Ajari;
-    
+
     public string ReplaceId { get; set; } = "";
 }

Model/Entity/Parts/EntityVanguardReplacedModel.cs

@@ -1,9 +1,9 @@
-using Model.Immortal.Entity.Data;
-using Model.Immortal.Types;
+using Model.Entity.Data;
 
-namespace Model.Immortal.Entity.Parts;
+namespace Model.Entity.Parts;
 
-public class EntityVanguardReplacedModel : IEntityPartInterface {
+public class EntityVanguardReplacedModel : IEntityPartInterface
+{
     public string Type { get; set; } = "EntityVanguardReplacedModel";
     public string ImmortalId { get; set; } = DataType.IMMORTAL_Xol;
     public string ReplacedById { get; set; } = "";

Model/Entity/Parts/EntityVitalityModel.cs

@@ -1,8 +1,9 @@
-using Model.Immortal.Types;
+using Model.Types;
 
-namespace Model.Immortal.Entity.Parts;
+namespace Model.Entity.Parts;
 
-public class EntityVitalityModel : IEntityPartInterface {
+public class EntityVitalityModel : IEntityPartInterface
+{
     public string Type { get; set; } = "EntityVitalityModel";
     public int Health { get; set; } = 0;
     public int DefenseLayer { get; set; } = 0;

Model/Entity/Parts/EntityWeaponModel.cs

@@ -1,9 +1,9 @@
-using System;
-using Model.Immortal.Types;
+using Model.Types;
 
-namespace Model.Immortal.Entity.Parts;
+namespace Model.Entity.Parts;
 
-public class EntityWeaponModel : IEntityPartInterface {
+public class EntityWeaponModel : IEntityPartInterface
+{
     public int Id { get; set; } = 1;
     public int EntityModelId { get; set; }
     public virtual EntityModel EntityModel { get; set; }

Model/Entity/Parts/IEntityPartInterface.cs

@@ -1,3 +1,5 @@
-namespace Model.Immortal.Entity.Parts;
+namespace Model.Entity.Parts;
 
-public interface IEntityPartInterface { }
+public interface IEntityPartInterface
+{
+}

Model/Entity/Types/ArmourType.cs

@@ -1,6 +1,7 @@
-namespace Model.Immortal.Types;
+namespace Model.Types;
 
-public static class ArmorType {
+public static class ArmorType
+{
     public static string Light = "Light";
     public static string Medium = "Medium";
     public static string Heavy = "Heavy";

Model/Entity/Types/BuildType.cs

@@ -1,6 +1,7 @@
-namespace Model.Immortal.Types;
+namespace Model.Types;
 
-public static class BuildType {
+public static class BuildType
+{
     public static string Eco = "Eco";
     public static string Harass = "Harass";
     public static string Pyre_Hunting = "Pyre_Hunting";

Model/Entity/Types/DefenseType.cs

@@ -1,6 +1,7 @@
-namespace Model.Immortal.Types;
+namespace Model.Types;
 
-public static class DefenseType {
+public static class DefenseType
+{
     public static string None = "None";
     public static string Shield = "Shield";
     public static string Overgrowth = "Overgrowth";

Model/Entity/Types/DescriptiveType.cs

@@ -1,6 +1,7 @@
-namespace Model.Immortal.Types;
+namespace Model.Types;
 
-public static class DescriptiveType {
+public static class DescriptiveType
+{
     public static string None = "None";
     public static string Frontliner = "Frontliner";
     public static string Force_Multiplier = "Force_Multiplier";

Model/Entity/Types/FactionType.cs

@@ -1,6 +1,7 @@
-namespace Model.Immortal.Types;
+namespace Model.Types;
 
-public static class FactionType {
+public static class FactionType
+{
     public static string None = "None";
     public static string Any = "Any";
     public static string Neutral = "Neutral";

Model/Entity/Types/ImmortalType.cs

@@ -1,6 +1,7 @@
-namespace Model.Immortal.Types;
+namespace Model.Types;
 
-public static class ImmortalType {
+public static class ImmortalType
+{
     public static string None = "None";
 
     public static string Any = "Any";

Model/Entity/Types/MovementType.cs

@@ -1,6 +1,7 @@
-namespace Model.Immortal.Types;
+namespace Model.Types;
 
-public static class MovementType {
+public static class MovementType
+{
     public static string Ground = "Ground";
     public static string Air = "Air";
 }

Model/Entity/Types/RequirementType.cs

@@ -1,6 +1,7 @@
-namespace Model.Immortal.Types;
+namespace Model.Types;
 
-public static class RequirementType {
+public static class RequirementType
+{
     public static string Production_Building = "Production_Building";
     public static string Research_Building = "Research_Building";
     public static string Research_Upgrade = "Research_Upgrade";

Model/Entity/Types/ResourceType.cs

@@ -1,6 +1,7 @@
-namespace Model.Immortal.Types;
+namespace Model.Types;
 
-public enum ResourceType {
+public enum ResourceType
+{
     Alloy,
     Ether,
     Pyre

Model/Entity/Types/TargetType.cs

@@ -1,6 +1,7 @@
-namespace Model.Immortal.Types;
+namespace Model.Types;
 
-public static class TargetType {
+public static class TargetType
+{
     public static string Ground = "Ground";
     public static string Air = "Air";
     public static string All = "All";