From 7411cc74164d46d38b9da30979ae2c8388e6e75c Mon Sep 17 00:00:00 2001
From: Jonathan McCaffrey <jonmcc.0723@gmail.com>
Date: Fri, 29 Apr 2022 01:13:44 -0400
Subject: [PATCH] feat(Database) Updating database to latest patch. Updating
 Calc hotkey UI to match

---
 IGP/Database.db                               | Bin 278528 -> 278528 bytes
 .../BuildCalculator/Parts/ArmyComponent.razor |  94 ++++----
 .../Parts/HotkeyViewerComponent.razor         | 228 ++++++++----------
 IGP/wwwroot/generated/GitChangeModels.json    |   2 +-
 IGP/wwwroot/generated/GitPatchModels.json     |   2 +-
 IGP/wwwroot/generated/Variables.json          |   2 +-
 Model/Entity/Data/DATA.cs                     | 144 +++++++----
 Model/Entity/Data/Ids_Entity.cs               |  13 +-
 Model/Entity/Parts/EntityVitalityModel.cs     |   2 +
 Model/Hotkeys/HotkeyModel.cs                  |  92 +++----
 10 files changed, 301 insertions(+), 278 deletions(-)

diff --git a/IGP/Database.db b/IGP/Database.db
index c440a770f753215f18ccc96f09e1944e987e5604..b02cd8a6fd1601a119e8d0beba8d41e3570e0110 100644
GIT binary patch
delta 378
zcmZo@5Nv1=+z{^1n6^2>|E~k1;ATMq8;;GBW>m9jva74Bs;ILv7|M&58R!}4ndw=Y
z8X6}m1SFOuXPD?4S?U`Z7#W2Wm2Nhhe@=lpjd$K;_5;V+cvtZ*;hhIG=M>N65A`g3
zX=$v?jEt$NATlMTdBfT58_qKN6fpzMYX5J~wEe$5Gt&cht~v&3wtUv<911K3Z0v8@
z<Jt0oMi{dB`J}NkFv{nPi>rsE7MCda<fj+I848I-sS0`d<qC<VCHc9DC7H>IIXRUI
z1^LA#sVNF2`3fnS#mV_aDIg8SZizX?snhqWu`D#>vPcCQs%a@LuI^NtnUmt2n3JsF
zomyEOT9A?m(h3&v$S=uGtyBp0bW2SvDJ@E!K1H1+!ja291*limS6WmZIaFK{OA?b3
Zi&GU!p+*30N0x`00Sv9}x*9B(#Q`Khb&vo6

delta 229
zcmZo@5Nv1=+z{^1n7lc{|E~ih-)2Dp8;;GBW>m9jvZ$-GGMLJXd*-DTB^H+yl_r;z
z7Nsf#B$gy+nCcrD0FjZATVhV}X0!R{6qu8FH%w+fa2#mBBc910>RFn%oZY_VETcye
zvyp*e`+s|;?f>nWnI5pS$1zB-?PZ$Ip}=AQRNTroeXknJLNoT)4AzX+y5i#M9*IEf
ziWQs_bCOGQ5=-)n6hcyqONvwTN>YnlQj3#|G7CyF^Yg%h)2FDjM6lN}I5TQ{N>5i*
VXVK?&OHBm16XdY%x*9B(#Q_m^O@sgd

diff --git a/IGP/Pages/BuildCalculator/Parts/ArmyComponent.razor b/IGP/Pages/BuildCalculator/Parts/ArmyComponent.razor
index d21d09e..ff1bd14 100644
--- a/IGP/Pages/BuildCalculator/Parts/ArmyComponent.razor
+++ b/IGP/Pages/BuildCalculator/Parts/ArmyComponent.razor
@@ -5,34 +5,41 @@
 
 @implements IDisposable
 
-<FormLayoutComponent>
-    <div style="display: flex; gap: 24px;">
-        <FormDisplayComponent Label="Army Completed At">
-            <Display>@lastInterval | T @Interval.ToTime(lastInterval)</Display>
-        </FormDisplayComponent>
-        <FormDisplayComponent Label="Army Attacking At">
-            <Display>@(lastInterval + timingService.GetTravelTime()) | T @Interval.ToTime(lastInterval + timingService.GetTravelTime())</Display>
-        </FormDisplayComponent>
-    </div>
-    <FormDisplayComponent Label="Army units built">
-        <Display>
-            <div class="armyCardsContainer">
-                @foreach (var unit in armyCount)
-                {
-                    <div class="armyCard">
-                        <div class="armyCountPosition">
-                            <div class="armyCount">@unit.Value.ToString()x</div>
+<div class="armyView">
+
+    <FormLayoutComponent>
+        <div style="display: flex; gap: 24px;">
+            <FormDisplayComponent Label="Army Completed At">
+                <Display>@lastInterval | T @Interval.ToTime(lastInterval)</Display>
+            </FormDisplayComponent>
+            <FormDisplayComponent Label="Army Attacking At">
+                <Display>@(lastInterval + timingService.GetTravelTime()) | T @Interval.ToTime(lastInterval + timingService.GetTravelTime())</Display>
+            </FormDisplayComponent>
+        </div>
+        <FormDisplayComponent Label="Army units built">
+            <Display>
+                <div class="armyCardsContainer">
+                    @foreach (var unit in armyCount) {
+                        <div class="armyCard">
+                            <div class="armyCountPosition">
+                                <div class="armyCount">@unit.Value.ToString()x</div>
+                            </div>
+                            <div>@unit.Key</div>
                         </div>
-                        <div>@unit.Key</div>
-                    </div>
-                }
-            </div>
-        </Display>
-    </FormDisplayComponent>
+                    }
+                </div>
+            </Display>
+        </FormDisplayComponent>
+    </FormLayoutComponent>
+
 
-</FormLayoutComponent>
+</div>
 
 <style>
+    .armyView {
+        overflow-y: scroll; width: 100%; overflow-x: hidden; height: 350px;
+}
+
 .armyCardsContainer {
     display: flex; 
     width: 100%; 
@@ -65,39 +72,33 @@
 
     List<EntityModel> army = new();
 
-    protected override void OnInitialized()
-    {
+    protected override void OnInitialized() {
         base.OnInitialized();
         buildOrder.Subscribe(OnBuildOrderChanged);
         timingService.Subscribe(StateHasChanged);
     }
 
-    void IDisposable.Dispose()
-    {
+    void IDisposable.Dispose() {
         buildOrder.Unsubscribe(OnBuildOrderChanged);
         timingService.Unsubscribe(StateHasChanged);
     }
 
-    protected override bool ShouldRender()
-    {
+    protected override bool ShouldRender() {
 #if DEBUG
         jsRuntime.InvokeVoidAsync("console.time", "ArmyComponent");
 #endif
         return true;
     }
 
-    protected override void OnAfterRender(bool firstRender)
-    {
+    protected override void OnAfterRender(bool firstRender) {
 #if DEBUG
         jsRuntime.InvokeVoidAsync("console.timeEnd", "ArmyComponent");
 #endif
     }
 
-    void OnBuildOrderChanged()
-    {
+    void OnBuildOrderChanged() {
         var armyCountWas = 0;
-        foreach (var army in armyCount)
-        {
+        foreach (var army in armyCount) {
             armyCountWas += army.Value;
         }
 
@@ -107,19 +108,14 @@
 
         var entitiesOverTime = buildOrder.GetOrders();
 
-        foreach (var entitiesAtTime in entitiesOverTime)
-        {
-            foreach (var entity in entitiesAtTime.Value)
-            {
-                if (entity.EntityType == EntityType.Army)
-                {
-                    if (!armyCount.TryAdd(entity.Info().Name, 1))
-                    {
+        foreach (var entitiesAtTime in entitiesOverTime) {
+            foreach (var entity in entitiesAtTime.Value) {
+                if (entity.EntityType == EntityType.Army) {
+                    if (!armyCount.TryAdd(entity.Info().Name, 1)) {
                         armyCount[entity.Info().Name]++;
                     }
 
-                    if (entity.Production() != null && entity.Production().BuildTime + entitiesAtTime.Key > lastInterval)
-                    {
+                    if (entity.Production() != null && entity.Production().BuildTime + entitiesAtTime.Key > lastInterval) {
                         lastInterval = entity.Production().BuildTime + entitiesAtTime.Key;
                     }
                 }
@@ -128,14 +124,12 @@
 
     //TODO Better
         var armyCountIs = 0;
-        foreach (var army in armyCount)
-        {
+        foreach (var army in armyCount) {
             armyCountIs += army.Value;
         }
 
 
-        if (armyCountWas != armyCountIs)
-        {
+        if (armyCountWas != armyCountIs) {
             StateHasChanged();
         }
     }
diff --git a/IGP/Pages/BuildCalculator/Parts/HotkeyViewerComponent.razor b/IGP/Pages/BuildCalculator/Parts/HotkeyViewerComponent.razor
index bb4654e..510ef7a 100644
--- a/IGP/Pages/BuildCalculator/Parts/HotkeyViewerComponent.razor
+++ b/IGP/Pages/BuildCalculator/Parts/HotkeyViewerComponent.razor
@@ -13,34 +13,61 @@
 
 <InputPanelComponent>
     <div class="keyContainer">
-        @foreach (var hotkey in hotkeys)
-        {
-            if (hotkey.IsHidden)
-            {
+        @foreach (var hotkey in hotkeys) {
+            if (hotkey.IsHidden) {
                 continue;
             }
 
-            var color = hotkey.KeyText.Equals("SPACE") && KeyService.IsHoldingSpace() || KeyService.GetAllPressedKeys().Contains(hotkey.KeyText)
+
+            var color = (hotkey.KeyText.Equals("SPACE") && KeyService.IsHoldingSpace()) || KeyService.GetAllPressedKeys().Contains(hotkey.KeyText)
                 ? "#0a0f12" : hotkey.GetColor();
 
             var x = hotkey.PositionX * Size;
-            var y = hotkey.PositionY * Size;
+            var y = hotkey.PositionY * Size + (hotkey.PositionY == 0 ? 5 : -50);
+
+            var width = Size;
+            var height = hotkey.PositionY == 0 ? 50 : Size;
+
+            var borderRadius = hotkey.PositionY == 0 ? 12 : 0;
 
             var border = "1px solid black";
-            if (hotkey.KeyText.Equals(key))
-            {
+            if (hotkey.KeyText.Equals(key)) {
                 border = "5px solid black";
             }
-            if (hotkey.KeyText.Equals(controlGroup))
-            {
-                border = "5px solid green";
+            if (hotkey.KeyText.Equals(controlGroup)) {
+                color = "#257525";
             }
 
-            if (hotkey.KeyText.Equals("SPACE") && KeyService.IsHoldingSpace())
-            {
+            if (hotkey.KeyText.Equals("SPACE") && KeyService.IsHoldingSpace()) {
                 border = "5px solid green";
             }
 
+            var keyText = hotkey.KeyText.Equals("CAPSLOCK") ? "Caps"
+                : hotkey.KeyText.Equals("CONTROL") ? "Ctrl"
+                    : hotkey.KeyText.Equals("SHIFT") ? "Shift"
+                        : hotkey.KeyText.Equals("TAB") ? "Tab"
+                            : hotkey.KeyText.Equals("SPACE") ? "Space" : hotkey.KeyText;
+
+
+            var controlStyle = $"background-color:{color}; " +
+                               $"width: {width}px; " +
+                               "border-top: 1px solid black; " +
+                               "border-left: 1px solid black; " +
+                               "border-right: 1px solid black; " +
+                               $"border-top-left-radius: {borderRadius}px; " +
+                               $"border-top-right-radius: {borderRadius}px; " +
+                               "overflow: hidden; " +
+                               "text-align: center;";
+
+            var keyStyle = $"background-color:{color}; " +
+                           $"border: {border}; " +
+                           $"width: {width}px; " +
+                           $"height: {height}px;  " +
+                           "overflow: hidden; " +
+                           "padding: 4px;";
+
+            var usedStyle = hotkey.PositionY == 0 ? controlStyle : keyStyle;
+
             <div style="position:relative;
                     cursor:pointer;
 							top:@y.ToString()px;
@@ -48,35 +75,25 @@
 							width: 0px;
 							height: 0px;">
 
-                <div @onclick="((e)=> ButtonClicked(e, hotkey))" style="background-color:@color;
-								border: @border;
-								width: @Size.ToString()px;
-								height: @Size.ToString()px;
-								overflow: hidden;
-								padding: 4px;">
-                    @hotkey.KeyText
-                    @foreach (var entity in data.Values)
-                    {
-                        if (InvalidKey(entity, hotkey) || InvalidKeyGroup(entity, hotkey) || InvalidHoldSpace(entity))
-                        {
+                <div @onclick="e => ButtonClicked(e, hotkey)" style="@usedStyle">
+                    @keyText
+                    @foreach (var entity in data.Values) {
+                        if (InvalidKey(entity, hotkey) || InvalidKeyGroup(entity, hotkey) || InvalidHoldSpace(entity)) {
                             continue;
                         }
 
-                        if (InvalidFaction(entity))
-                        {
+                        if (InvalidFaction(entity)) {
                             continue;
                         }
 
-                        if (InvalidVanguard(entity) || InvalidNonVanguard(entity))
-                        {
+                        if (InvalidVanguard(entity) || InvalidNonVanguard(entity)) {
                             continue;
                         }
 
                         var isVanguard = entity.VanguardAdded() != null;
                         var style = isVanguard ? "font-weight: bold;" : "";
 
-                        if (BuildOrderService.WillMeetRequirements(entity) == null)
-                        {
+                        if (BuildOrderService.WillMeetRequirements(entity) == null) {
                             style += "color:gray; font-style: italic;";
                         }
 
@@ -93,7 +110,7 @@
     .keyContainer {
         width: 400px;
         max-width: 95vw;
-        height: 400px;
+        height: 350px;
         outline: 3px solid black;
         border-radius: 8px;
         background-color: #282A30;
@@ -120,8 +137,7 @@
     private string controlGroup = "C";
     private string key = "";
 
-    protected override void OnInitialized()
-    {
+    protected override void OnInitialized() {
         base.OnInitialized();
 
         KeyService.Subscribe(OnKeyPressed);
@@ -129,8 +145,7 @@
         BuildOrderService.Subscribe(OnBuilderOrderChanged);
     }
 
-    void IDisposable.Dispose()
-    {
+    void IDisposable.Dispose() {
         KeyService.Unsubscribe(OnKeyPressed);
         FilterService.Unsubscribe(StateHasChanged);
         BuildOrderService.Unsubscribe(OnBuilderOrderChanged);
@@ -138,17 +153,14 @@
 
     int completedTimeCount = 0;
 
-    void OnBuilderOrderChanged()
-    {
-        if (BuildOrderService.UniqueCompletedTimes.Count != completedTimeCount)
-        {
+    void OnBuilderOrderChanged() {
+        if (BuildOrderService.UniqueCompletedTimes.Count != completedTimeCount) {
             completedTimeCount = BuildOrderService.UniqueCompletedTimes.Count;
             StateHasChanged();
         }
     }
 
-    protected override bool ShouldRender()
-    {
+    protected override bool ShouldRender() {
 #if DEBUG
         JsRuntime.InvokeVoidAsync("console.time", "HotKeyViewerComponent");
 #endif
@@ -156,18 +168,15 @@
         return true;
     }
 
-    protected override void OnAfterRender(bool firstRender)
-    {
+    protected override void OnAfterRender(bool firstRender) {
 #if DEBUG
         JsRuntime.InvokeVoidAsync("console.timeEnd", "HotKeyViewerComponent");
 #endif
     }
 
     // Move to Filter Service
-    bool InvalidFaction(EntityModel entity)
-    {
-        if (entity.Faction() != null && entity.Faction()?.Faction != FilterService.GetFaction() && FilterService.GetFaction() != DataType.Any)
-        {
+    bool InvalidFaction(EntityModel entity) {
+        if (entity.Faction() != null && entity.Faction()?.Faction != FilterService.GetFaction() && FilterService.GetFaction() != DataType.Any) {
             return true;
         }
 
@@ -175,12 +184,10 @@
     }
 
     // Move to Filter Service
-    bool InvalidVanguard(EntityModel entity)
-    {
+    bool InvalidVanguard(EntityModel entity) {
         if (entity.VanguardAdded() != null
             && entity.VanguardAdded()?.ImmortalId != FilterService.GetImmortal()
-            && FilterService.GetImmortal() != DataType.Any)
-        {
+            && FilterService.GetImmortal() != DataType.Any) {
             return true;
         }
 
@@ -188,14 +195,10 @@
     }
 
     // Move to Filter Service
-    bool InvalidNonVanguard(EntityModel entity)
-    {
-        if (entity.Replaceds().Count > 0)
-        {
-            foreach (var replaced in entity.Replaceds())
-            {
-                if (FilterService.GetImmortal() == replaced.ImmortalId)
-                {
+    bool InvalidNonVanguard(EntityModel entity) {
+        if (entity.Replaceds().Count > 0) {
+            foreach (var replaced in entity.Replaceds()) {
+                if (FilterService.GetImmortal() == replaced.ImmortalId) {
                     return true;
                 }
             }
@@ -204,116 +207,90 @@
         return false;
     }
 
-    bool InvalidKey(EntityModel entity, HotkeyModel key)
-    {
-        if (entity.Hotkey()?.Hotkey == key.KeyText)
-        {
+    bool InvalidKey(EntityModel entity, HotkeyModel key) {
+        if (entity.Hotkey()?.Hotkey == key.KeyText) {
             return false;
         }
         return true;
     }
 
-    bool InvalidKeyGroup(EntityModel entity, HotkeyModel key)
-    {
-        if (entity.Hotkey()?.HotkeyGroup == controlGroup)
-        {
+    bool InvalidKeyGroup(EntityModel entity, HotkeyModel key) {
+        if (entity.Hotkey()?.HotkeyGroup == controlGroup) {
             return false;
         }
 
         return true;
     }
 
-    bool InvalidKey(EntityModel entity)
-    {
-        if (entity.Hotkey()?.Hotkey == key)
-        {
+    bool InvalidKey(EntityModel entity) {
+        if (entity.Hotkey()?.Hotkey == key) {
             return false;
         }
         return true;
     }
 
-    bool InvalidKeyGroup(EntityModel entity)
-    {
-        if (entity.Hotkey()?.HotkeyGroup == controlGroup)
-        {
+    bool InvalidKeyGroup(EntityModel entity) {
+        if (entity.Hotkey()?.HotkeyGroup == controlGroup) {
             return false;
         }
         return true;
     }
 
-    bool InvalidHoldSpace(EntityModel entity)
-    {
-        if (entity.Hotkey()?.HoldSpace == KeyService.IsHoldingSpace())
-        {
+    bool InvalidHoldSpace(EntityModel entity) {
+        if (entity.Hotkey()?.HoldSpace == KeyService.IsHoldingSpace()) {
             return false;
         }
         return true;
     }
 
-    void OnKeyPressed()
-    {
+    void OnKeyPressed() {
         var controlGroupWas = controlGroup;
         var keyWas = key;
 
-
-        if (KeyService.GetAllPressedKeys().Contains("Z"))
-        {
+        if (KeyService.GetAllPressedKeys().Contains("Z")) {
             controlGroup = "Z";
         }
-        if (KeyService.GetAllPressedKeys().Contains("TAB"))
-        {
+        if (KeyService.GetAllPressedKeys().Contains("TAB")) {
             controlGroup = "TAB";
         }
-        if (KeyService.GetAllPressedKeys().Contains("C"))
-        {
+        if (KeyService.GetAllPressedKeys().Contains("C")) {
             controlGroup = "C";
         }
-        if (KeyService.GetAllPressedKeys().Contains("D"))
-        {
+        if (KeyService.GetAllPressedKeys().Contains("D")) {
             controlGroup = "D";
         }
-        if (KeyService.GetAllPressedKeys().Contains("1"))
-        {
-            controlGroup = "1";
+        if (KeyService.GetAllPressedKeys().Contains("V")) {
+            controlGroup = "V";
         }
-    //TODO This could be better. Duplicated code
-        if (KeyService.GetAllPressedKeys().Contains("2"))
-        {
-            controlGroup = "2";
+        if (KeyService.GetAllPressedKeys().Contains("ALT")) {
+            controlGroup = "ALT";
         }
-        if (KeyService.GetAllPressedKeys().Contains("SHIFT"))
-        {
+        if (KeyService.GetAllPressedKeys().Contains("SHIFT")) {
             controlGroup = "SHIFT";
         }
 
-        if (KeyService.GetAllPressedKeys().Contains("CONTROL"))
-        {
+        if (KeyService.GetAllPressedKeys().Contains("CONTROL")) {
             controlGroup = "CONTROL";
         }
 
-        if (KeyService.GetAllPressedKeys().Count > 0)
-        {
+        if (KeyService.GetAllPressedKeys().Count > 0) {
             key = KeyService.GetAllPressedKeys().First();
         }
 
-        if (controlGroupWas != controlGroup || keyWas != key)
-        {
+        if (controlGroupWas != controlGroup || keyWas != key) {
             StateHasChanged();
         }
     }
 
 
-    private void HandleClick()
-    {
+    private void HandleClick() {
         var hotkey = KeyService.GetHotkey();
 
-        if (hotkey == "")
-        {
+        if (hotkey == "") {
             return;
         }
 
-        if (hotkey == "`")
-        {
+        if (hotkey == "`") {
             BuildOrderService.RemoveLast();
             EconomyService.Calculate(BuildOrderService, TimingService, BuildOrderService.GetLastRequestInterval());
             return;
@@ -326,38 +303,31 @@
 
         var entity = EntityModel.GetFrom(hotkey!, hotkeyGroup, isHoldSpace, faction, immortal);
 
-        if (entity == null)
-        {
+        if (entity == null) {
             return;
         }
 
-        if (BuildOrderService.Add(entity, EconomyService))
-        {
+        if (BuildOrderService.Add(entity, EconomyService)) {
             EconomyService.Calculate(BuildOrderService, TimingService, BuildOrderService.GetLastRequestInterval());
         }
     }
 
-    private void ButtonClicked(MouseEventArgs mouseEventArgs, HotkeyModel hotkey)
-    {
+    private void ButtonClicked(MouseEventArgs mouseEventArgs, HotkeyModel hotkey) {
         DataCollectionService.SendEvent(
-            DataCollectionKeys.BuildCalcInput, 
-            new Dictionary<string, string> {{"key", hotkey.KeyText.ToLower()}, {"input-source", "mouse"}}
+            DataCollectionKeys.BuildCalcInput,
+            new Dictionary<string, string> { { "key", hotkey.KeyText.ToLower() }, { "input-source", "mouse" } }
             );
-        
-        
-        if (hotkey.KeyText.Equals(HotKeyType.SPACE.ToString()))
-        {
-            if (KeyService.IsHoldingSpace())
-            {
+
+
+        if (hotkey.KeyText.Equals(HotKeyType.SPACE.ToString())) {
+            if (KeyService.IsHoldingSpace()) {
                 KeyService.RemovePressedKey(hotkey.KeyText);
             }
-            else
-            {
+            else {
                 KeyService.AddPressedKey(hotkey.KeyText);
             }
         }
-        else
-        {
+        else {
             KeyService.AddPressedKey(hotkey.KeyText);
             KeyService.RemovePressedKey(hotkey.KeyText);
         }
diff --git a/IGP/wwwroot/generated/GitChangeModels.json b/IGP/wwwroot/generated/GitChangeModels.json
index c670d7c..cf7fb54 100644
--- a/IGP/wwwroot/generated/GitChangeModels.json
+++ b/IGP/wwwroot/generated/GitChangeModels.json
@@ -1 +1 @@
-[{"Id":1,"GitPatchModelId":1,"Name":"Shrink Header Navigation","Description":"The full header navigation is now only visible on desktop when hovered.","Commit":"Feature","Important":"False"},{"Id":2,"GitPatchModelId":1,"Name":"Database UX Update","Description":"Desktop Database Filter UI has been updated. It\u0027s now always visible.","Commit":"Feature","Important":"False"},{"Id":3,"GitPatchModelId":2,"Name":"Fixing Thrum Stats","Description":"Speed was too low. Health and Shields ratio is slightly different.","Commit":"Fix","Important":"False"},{"Id":4,"GitPatchModelId":3,"Name":"Memory Tester","Description":"Fun quick feature added while I rewrite my database. Tests memory of units ranges and speeds.","Commit":"Feature","Important":"False"},{"Id":5,"GitPatchModelId":3,"Name":"Privacy Policy Removed","Description":"Removed cringe privacy policy. It misses the issue. Will eventually add operational analytics and cookies, and add a more applicable Privacy Policy if needed. Not a priority though.","Commit":"Fix","Important":"False"},{"Id":6,"GitPatchModelId":3,"Name":"Input Tripling","Description":"Fixed a bug where inputs could get tripled on the Build Calculator.","Commit":"Fix","Important":"False"},{"Id":7,"GitPatchModelId":3,"Name":"Agile Changes","Description":"Updated Agile log to indicate the next 2 weeks will be spent on SQL","Commit":"Planning","Important":"False"},{"Id":8,"GitPatchModelId":4,"Name":"Hiding WIP Pyre Feature","Description":"Whoops, WIP Pyre feature accidentally got committed to production. Now hidden.","Commit":"Fix","Important":"False"},{"Id":9,"GitPatchModelId":5,"Name":"Build Calc Optimization","Description":"Improved speeds","Commit":"Fix","Important":"False"},{"Id":10,"GitPatchModelId":5,"Name":"Change Log Filter","Description":"Change log now defaults to showing only important patches","Commit":"Feature","Important":"False"},{"Id":11,"GitPatchModelId":5,"Name":"Motes Consumed","Description":"Motes now consumed in the build calculator when making a townhall.","Commit":"Fix","Important":"False"},{"Id":12,"GitPatchModelId":6,"Name":"Agile UI Tweaks","Description":"Making the agile text look a bit better before stream.","Commit":"Style","Important":"False"},{"Id":13,"GitPatchModelId":7,"Name":"Database Armor","Description":"Added missing armor display to database.","Commit":"Fix","Important":"False"},{"Id":14,"GitPatchModelId":8,"Name":"Home Page","Description":"Added a quick placeholder-ish homepage.","Commit":"Feature","Important":"False"},{"Id":15,"GitPatchModelId":8,"Name":"Database Army Default","Description":"Database UI now defaults to Army selection. Given most people are probably going to want to view the units.","Commit":"Fix","Important":"False"},{"Id":16,"GitPatchModelId":9,"Name":"Mobile Menu Back","Description":"You can now click the page after selecting a Section, to go back to Section nav.","Commit":"Fix","Important":"False"},{"Id":17,"GitPatchModelId":10,"Name":"Mobile Menu Fixed","Description":"Fixed the mobile menu not actually being positioned to the bottom of the screen on phones.","Commit":"Fix","Important":"False"},{"Id":18,"GitPatchModelId":11,"Name":"Tablet Menu","Description":"Added a hamburger nav menu for tablets.","Commit":"Feature","Important":"False"},{"Id":19,"GitPatchModelId":11,"Name":"Mobile Menu","Description":"Added a bottom nav menu for phones.","Commit":"Feature","Important":"False"},{"Id":20,"GitPatchModelId":12,"Name":"0.0.6.8375a","Description":"Database updated to 0.0.6.8375a","Commit":"Game Patch","Important":"True"},{"Id":21,"GitPatchModelId":12,"Name":"Database Descriptions","Description":"Added more text descriptions to buildings and etc..","Commit":"Feature","Important":"False"},{"Id":22,"GitPatchModelId":12,"Name":"Guids","Description":"Now using Guids and strings over enums. View in /raw-database page.","Commit":"Feature","Important":"False"},{"Id":23,"GitPatchModelId":12,"Name":"Mobile UI","Description":"Additional mobile UI improvements. Harass calculator now has fewer inputs that don\u0027t matter.","Commit":"Feature","Important":"False"},{"Id":24,"GitPatchModelId":12,"Name":"Bug Tasks","Description":"Added feature/bug task indicator to agile view. Added consume mote bug in build calculator to next sprint. (Calculator not consuming motes on Town Hall building)","Commit":"Feature","Important":"False"},{"Id":25,"GitPatchModelId":12,"Name":"Entity Display UI","Description":"Display UI improved. Build Calculator now uses the same Entity display UI as the Database.","Commit":"Style","Important":"False"},{"Id":26,"GitPatchModelId":13,"Name":"Removed Embedded YouTube","Description":"Having embedded videos makes my privacy policy look completely untrue. Removed the video (it\u0027s now a link) and added a message on the privacy policy to point out that the error occured.","Commit":"Fix","Important":"False"},{"Id":27,"GitPatchModelId":13,"Name":"Agile View Backlog","Description":"Added backlog rendering to the Agile View Page. Added priority level to better indicate what tasks have high or zero priority.","Commit":"Feature","Important":"False"},{"Id":28,"GitPatchModelId":14,"Name":"Privacy Policy Page","Description":"The privacy policy is now a page rather than a blurb on the About page.","Commit":"Feature","Important":"False"},{"Id":29,"GitPatchModelId":14,"Name":"Privacy Policy Update","Description":"I added information on how I use personal data. And a disclaimer that privacy can never be guaranteed.","Commit":"Privacy Policy","Important":"False"},{"Id":30,"GitPatchModelId":14,"Name":"Minor Tweaks","Description":"Minor UI changes and text fixes.","Commit":"None","Important":"False"},{"Id":31,"GitPatchModelId":15,"Name":"Homepage","Description":"Making Of page no longer shows on the homepage","Commit":"Fix","Important":"False"},{"Id":32,"GitPatchModelId":15,"Name":"DevOnly Component","Description":"Added a DevOnly component to wrap UI content that should not be released to production. I.e. the Homepage bug.","Commit":"Feature","Important":"False"},{"Id":33,"GitPatchModelId":16,"Name":"Agile View","Description":"Add an agile page to show current activities.","Commit":"Feature","Important":"False"},{"Id":34,"GitPatchModelId":16,"Name":"Rendering Entire Database","Description":"I can now render the database without lag. Not sure what fixed it.","Commit":"Fix","Important":"False"},{"Id":35,"GitPatchModelId":16,"Name":"Database Data","Description":"Added a ton of data to the database. Such as various descriptions. More work is still to be done.","Commit":"Feature","Important":"False"},{"Id":36,"GitPatchModelId":16,"Name":"Database Ids","Description":"Database has less duplicated content. Army entities now link to their Upgrades and Abilities. More work is still to be done.","Commit":"Feature","Important":"False"},{"Id":37,"GitPatchModelId":16,"Name":"Blades of the Godhead Requirement","Description":"Fixed the requirement incorrectly being the Eye of Aros. Now is properly Bearer of the Crown.","Commit":"Fix","Important":"False"},{"Id":38,"GitPatchModelId":16,"Name":"UI Changes","Description":"Various UI changes and tweaks","Commit":"Style","Important":"False"},{"Id":39,"GitPatchModelId":16,"Name":"Streams","Description":"Added a Streams page. It mentions plans to do Twitch streams on Sunday.","Commit":"Feature","Important":"False"},{"Id":40,"GitPatchModelId":16,"Name":"IMMORTAL","Description":"Fixed \u0022IMMORTAL: Gates of Pyre\u0022 game title. Will no longer refer to it as \u0022Immortal: Gates of Pyre\u0022.","Commit":"Typo","Important":"False"},{"Id":41,"GitPatchModelId":16,"Name":"Mobile Support","Description":"All the pages should now work on phones.","Commit":"Feature","Important":"False"},{"Id":42,"GitPatchModelId":17,"Name":"Form Text","Description":"Fixed search bar in database, name and colour in build calculator, from not rendering \uD83D\uDE10","Commit":"Fix","Important":"False"},{"Id":43,"GitPatchModelId":17,"Name":"UI Test Automation Road Map","Description":"Adding test automation to the roadmap","Commit":"Planning","Important":"False"},{"Id":44,"GitPatchModelId":18,"Name":"Build Calculator Interval","Description":"600 is too laggy. Reducing to 360 until optimizations are done.","Commit":"Fix","Important":"False"},{"Id":45,"GitPatchModelId":18,"Name":"Changelog Patch Date","Description":"Fixed date on previous patch in changelog. Should be one day earlier.","Commit":"Fix","Important":"False"},{"Id":46,"GitPatchModelId":19,"Name":"UI Overhaul","Description":"Cleaned up and restyled a lot of UI. Like Page Containers, Alerts, Forms, Nav Buttons, and more.","Commit":"Style","Important":"False"},{"Id":47,"GitPatchModelId":19,"Name":"Separate Pages","Description":"Navigation now uses different pages, instead of loading content onto the main page.","Commit":"Feature","Important":"False"},{"Id":48,"GitPatchModelId":19,"Name":"Making Of","Description":"Adding Making Of page for design reference.","Commit":"Feature","Important":"False"},{"Id":49,"GitPatchModelId":19,"Name":"Change Log","Description":"Adding Change Log page for viewing update history.","Commit":"Feature","Important":"False"},{"Id":50,"GitPatchModelId":19,"Name":"Mobile Priority","Description":"Changed mobile support priority in roadmap from low and possible to high and planned, and updated description.","Commit":"Planning","Important":"False"},{"Id":51,"GitPatchModelId":20,"Name":"Purple Colours","Description":"Added placeholder-ish purple color scheme.","Commit":"Style","Important":"False"},{"Id":52,"GitPatchModelId":20,"Name":"SQL","Description":"Agile and Change Log pages now use JSON made from SQL","Commit":"Feature","Important":"False"},{"Id":53,"GitPatchModelId":21,"Name":"Discord Link","Description":"Made a discord for the website, and added invite link to contact page","Commit":"Feature","Important":"False"},{"Id":54,"GitPatchModelId":21,"Name":"Loading Improvemnts","Description":"Agile and Change Log loading improved","Commit":"Feature","Important":"False"},{"Id":55,"GitPatchModelId":21,"Name":"Desktop Nav closing","Description":"Desktop nav menu now closes when a page link is clicked","Commit":"Feature","Important":"False"},{"Id":56,"GitPatchModelId":22,"Name":"0.0.6.8900a","Description":"Database updated to 0.0.6.8900a","Commit":"Game Patch","Important":"True"},{"Id":57,"GitPatchModelId":23,"Name":"Database Links","Description":"Various entity references in the database now link to the entity via a dialog interface","Commit":"Feature","Important":"False"},{"Id":58,"GitPatchModelId":24,"Name":"Documentation Page","Description":"Added a docs page with some starter setup information","Commit":"Feature","Important":"False"},{"Id":59,"GitPatchModelId":24,"Name":"Database Filters","Description":"Fixed filter defaults. Removed unimportant filter types","Commit":"Fix","Important":"False"},{"Id":60,"GitPatchModelId":25,"Name":"Database Fixes","Description":"Various fixes to bad data. Added some missing entities","Commit":"Fix","Important":"False"},{"Id":61,"GitPatchModelId":25,"Name":"Plain View","Description":"Database can now change to plain view for easy copy and pasting","Commit":"Feature","Important":"False"},{"Id":62,"GitPatchModelId":25,"Name":"Direct Links","Description":"Database now supports direct links. database/Throne to see just Throne","Commit":"Feature","Important":"False"},{"Id":63,"GitPatchModelId":26,"Name":"Better Navigation","Description":"Documentational pages now use a more logical navigation format, with sections, and parent-child documents","Commit":"Feature","Important":"False"},{"Id":64,"GitPatchModelId":26,"Name":"Style Improvements","Description":"Improved home page styling on website highlighted content","Commit":"Style","Important":"False"},{"Id":65,"GitPatchModelId":26,"Name":"Warning Cleanup","Description":"Removed a bunch of development code warnings","Commit":"Chore","Important":"False"},{"Id":66,"GitPatchModelId":27,"Name":"Toasts","Description":"Added some error toasts to build calculator. Needs work","Commit":"Feature","Important":"False"},{"Id":67,"GitPatchModelId":27,"Name":"Localization Text","Description":"Added localization logic for handling some text. Currently only supporting English","Commit":"Feature","Important":"False"},{"Id":68,"GitPatchModelId":27,"Name":"GitHub Button","Description":"Harass Calculator now links to code in repo, instead of showing it as text","Commit":"Feature","Important":"False"},{"Id":69,"GitPatchModelId":28,"Name":"Markdown","Description":"Docs and Notes are now easily editable markdown files. Navigation will still be handled via SQL formatted data.","Commit":"Feature","Important":"False"},{"Id":70,"GitPatchModelId":28,"Name":"Passive Data","Description":"Added new passive data from Twitter post.","Commit":"Feature","Important":"True"},{"Id":71,"GitPatchModelId":28,"Name":"Toast Fade","Description":"Fixed toasts not fading out over time.","Commit":"Fix","Important":"False"},{"Id":72,"GitPatchModelId":28,"Name":"Click Desktop Menu","Description":"Added better menu navigation for desktop users.","Commit":"Feature","Important":"False"},{"Id":73,"GitPatchModelId":29,"Name":"Added document on Hotkeys","Description":"Document on how to customize hotkeys","Commit":"Feature","Important":"False"},{"Id":74,"GitPatchModelId":29,"Name":"0.0.6.9121a","Description":"Database updated to v0.0.6.9121a","Commit":"Game Patch","Important":"True"},{"Id":75,"GitPatchModelId":30,"Name":"Build Calculator Optimizations","Description":"Now faster","Commit":"Feature","Important":"False"},{"Id":76,"GitPatchModelId":31,"Name":"Cancel Not Reverting","Description":"Cancel button removes unlocked tech again","Commit":"Fix","Important":"False"},{"Id":77,"GitPatchModelId":31,"Name":"GroveHeart Upgrade","Description":"Can upgrade Grove Heart again","Commit":"Fix","Important":"False"},{"Id":78,"GitPatchModelId":31,"Name":"Locked Text","Description":"Hotkey Text is now always visible. Text is gray when key is locked behind tech","Commit":"Style","Important":"False"},{"Id":79,"GitPatchModelId":31,"Name":"Immortal Filters","Description":"This works again. Switching between Ajari and Orzum will changes unit choices","Commit":"Fix","Important":"False"},{"Id":80,"GitPatchModelId":31,"Name":"Added Missing Data","Description":"Added missing data for filtering and unlocking entities","Commit":"Fix","Important":"False"},{"Id":81,"GitPatchModelId":32,"Name":"Offline mode","Description":"You can now use the website offline","Commit":"Feature","Important":"False"},{"Id":82,"GitPatchModelId":32,"Name":"Search Bar","Description":"Desktop users now have a search bar. Very WIP, needs some QOL","Commit":"Feature","Important":"False"},{"Id":83,"GitPatchModelId":32,"Name":"Style Changes","Description":"Changes to styles to RoadMap and Desktop Navigation","Commit":"Style","Important":"False"},{"Id":84,"GitPatchModelId":32,"Name":"Build Calculator Improvements","Description":"Additional tweaks to build calculator UI and features","Commit":"Feature","Important":"False"},{"Id":85,"GitPatchModelId":32,"Name":"Stub Pages","Description":"Added blank stub pages","Commit":"Feature","Important":"False"},{"Id":86,"GitPatchModelId":33,"Name":"Search Hotkey","Description":"Making the search hotkey work.","Commit":"Feature","Important":"False"},{"Id":87,"GitPatchModelId":34,"Name":"Economy Comparison","Description":"Compare two economies together. WIP and contains bugs","Commit":"Feature","Important":"False"},{"Id":88,"GitPatchModelId":35,"Name":"v0.0.6.9201a","Description":"Database updated to v0.0.6.9201a","Commit":"Game Patch","Important":"True"},{"Id":89,"GitPatchModelId":36,"Name":"Cancel Button Gives Money","Description":"Now properly clearing out saved economy data. Also fixed missing 1 second offset","Commit":"Fix","Important":"False"},{"Id":90,"GitPatchModelId":37,"Name":"Wait Buttons","Description":"Wait and Wait To buttons have been implemented. Cancel can clear out last made waits","Commit":"Feature","Important":"False"},{"Id":91,"GitPatchModelId":37,"Name":"Pyre in Build Calc","Description":"You can now see the Pyre in the build calculator.","Commit":"Feature","Important":"False"},{"Id":92,"GitPatchModelId":37,"Name":"Travel Times Harass Calc","Description":"You can now set multiple values for base travel times","Commit":"Feature","Important":"False"},{"Id":93,"GitPatchModelId":37,"Name":"Harass Calculator Logic Fixed","Description":"Fixed making the harass calc logic bad in the last update.","Commit":"Feature","Important":"False"},{"Id":94,"GitPatchModelId":37,"Name":"Training Queue","Description":"Calculator now considers a training queue. Will wait if full","Commit":"Feature","Important":"False"},{"Id":95,"GitPatchModelId":38,"Name":"Permission Page","Description":"Can now enable/disable storage and analytics permissions.","Commit":"Feature","Important":"False"},{"Id":96,"GitPatchModelId":38,"Name":"Storage Page","Description":"Can now set a bunch of Build Calculator defaults on the Storage Page","Commit":"Feature","Important":"False"},{"Id":97,"GitPatchModelId":39,"Name":"Added Analytics","Description":"Can now opt into data tracking","Commit":"Analytics","Important":"False"},{"Id":98,"GitPatchModelId":39,"Name":"CI Tests","Description":"GitHub Action now runs tests on dev after each build","Commit":"Tests","Important":"False"},{"Id":99,"GitPatchModelId":39,"Name":"Harass Calculator Tests","Description":"Testing Harass Calculator inputs and example math","Commit":"Tests","Important":"False"}]
\ No newline at end of file
+[{"Id":1,"GitPatchModelId":1,"Name":"Shrink Header Navigation","Description":"The full header navigation is now only visible on desktop when hovered.","Commit":"Feature","Important":"False"},{"Id":2,"GitPatchModelId":1,"Name":"Database UX Update","Description":"Desktop Database Filter UI has been updated. It\u0027s now always visible.","Commit":"Feature","Important":"False"},{"Id":3,"GitPatchModelId":2,"Name":"Fixing Thrum Stats","Description":"Speed was too low. Health and Shields ratio is slightly different.","Commit":"Fix","Important":"False"},{"Id":4,"GitPatchModelId":3,"Name":"Memory Tester","Description":"Fun quick feature added while I rewrite my database. Tests memory of units ranges and speeds.","Commit":"Feature","Important":"False"},{"Id":5,"GitPatchModelId":3,"Name":"Privacy Policy Removed","Description":"Removed cringe privacy policy. It misses the issue. Will eventually add operational analytics and cookies, and add a more applicable Privacy Policy if needed. Not a priority though.","Commit":"Fix","Important":"False"},{"Id":6,"GitPatchModelId":3,"Name":"Input Tripling","Description":"Fixed a bug where inputs could get tripled on the Build Calculator.","Commit":"Fix","Important":"False"},{"Id":7,"GitPatchModelId":3,"Name":"Agile Changes","Description":"Updated Agile log to indicate the next 2 weeks will be spent on SQL","Commit":"Planning","Important":"False"},{"Id":8,"GitPatchModelId":4,"Name":"Hiding WIP Pyre Feature","Description":"Whoops, WIP Pyre feature accidentally got committed to production. Now hidden.","Commit":"Fix","Important":"False"},{"Id":9,"GitPatchModelId":5,"Name":"Build Calc Optimization","Description":"Improved speeds","Commit":"Fix","Important":"False"},{"Id":10,"GitPatchModelId":5,"Name":"Change Log Filter","Description":"Change log now defaults to showing only important patches","Commit":"Feature","Important":"False"},{"Id":11,"GitPatchModelId":5,"Name":"Motes Consumed","Description":"Motes now consumed in the build calculator when making a townhall.","Commit":"Fix","Important":"False"},{"Id":12,"GitPatchModelId":6,"Name":"Agile UI Tweaks","Description":"Making the agile text look a bit better before stream.","Commit":"Style","Important":"False"},{"Id":13,"GitPatchModelId":7,"Name":"Database Armor","Description":"Added missing armor display to database.","Commit":"Fix","Important":"False"},{"Id":14,"GitPatchModelId":8,"Name":"Home Page","Description":"Added a quick placeholder-ish homepage.","Commit":"Feature","Important":"False"},{"Id":15,"GitPatchModelId":8,"Name":"Database Army Default","Description":"Database UI now defaults to Army selection. Given most people are probably going to want to view the units.","Commit":"Fix","Important":"False"},{"Id":16,"GitPatchModelId":9,"Name":"Mobile Menu Back","Description":"You can now click the page after selecting a Section, to go back to Section nav.","Commit":"Fix","Important":"False"},{"Id":17,"GitPatchModelId":10,"Name":"Mobile Menu Fixed","Description":"Fixed the mobile menu not actually being positioned to the bottom of the screen on phones.","Commit":"Fix","Important":"False"},{"Id":18,"GitPatchModelId":11,"Name":"Tablet Menu","Description":"Added a hamburger nav menu for tablets.","Commit":"Feature","Important":"False"},{"Id":19,"GitPatchModelId":11,"Name":"Mobile Menu","Description":"Added a bottom nav menu for phones.","Commit":"Feature","Important":"False"},{"Id":20,"GitPatchModelId":12,"Name":"0.0.6.8375a","Description":"Database updated to 0.0.6.8375a","Commit":"Game Patch","Important":"True"},{"Id":21,"GitPatchModelId":12,"Name":"Database Descriptions","Description":"Added more text descriptions to buildings and etc..","Commit":"Feature","Important":"False"},{"Id":22,"GitPatchModelId":12,"Name":"Guids","Description":"Now using Guids and strings over enums. View in /raw-database page.","Commit":"Feature","Important":"False"},{"Id":23,"GitPatchModelId":12,"Name":"Mobile UI","Description":"Additional mobile UI improvements. Harass calculator now has fewer inputs that don\u0027t matter.","Commit":"Feature","Important":"False"},{"Id":24,"GitPatchModelId":12,"Name":"Bug Tasks","Description":"Added feature/bug task indicator to agile view. Added consume mote bug in build calculator to next sprint. (Calculator not consuming motes on Town Hall building)","Commit":"Feature","Important":"False"},{"Id":25,"GitPatchModelId":12,"Name":"Entity Display UI","Description":"Display UI improved. Build Calculator now uses the same Entity display UI as the Database.","Commit":"Style","Important":"False"},{"Id":26,"GitPatchModelId":13,"Name":"Removed Embedded YouTube","Description":"Having embedded videos makes my privacy policy look completely untrue. Removed the video (it\u0027s now a link) and added a message on the privacy policy to point out that the error occured.","Commit":"Fix","Important":"False"},{"Id":27,"GitPatchModelId":13,"Name":"Agile View Backlog","Description":"Added backlog rendering to the Agile View Page. Added priority level to better indicate what tasks have high or zero priority.","Commit":"Feature","Important":"False"},{"Id":28,"GitPatchModelId":14,"Name":"Privacy Policy Page","Description":"The privacy policy is now a page rather than a blurb on the About page.","Commit":"Feature","Important":"False"},{"Id":29,"GitPatchModelId":14,"Name":"Privacy Policy Update","Description":"I added information on how I use personal data. And a disclaimer that privacy can never be guaranteed.","Commit":"Privacy Policy","Important":"False"},{"Id":30,"GitPatchModelId":14,"Name":"Minor Tweaks","Description":"Minor UI changes and text fixes.","Commit":"None","Important":"False"},{"Id":31,"GitPatchModelId":15,"Name":"Homepage","Description":"Making Of page no longer shows on the homepage","Commit":"Fix","Important":"False"},{"Id":32,"GitPatchModelId":15,"Name":"DevOnly Component","Description":"Added a DevOnly component to wrap UI content that should not be released to production. I.e. the Homepage bug.","Commit":"Feature","Important":"False"},{"Id":33,"GitPatchModelId":16,"Name":"Agile View","Description":"Add an agile page to show current activities.","Commit":"Feature","Important":"False"},{"Id":34,"GitPatchModelId":16,"Name":"Rendering Entire Database","Description":"I can now render the database without lag. Not sure what fixed it.","Commit":"Fix","Important":"False"},{"Id":35,"GitPatchModelId":16,"Name":"Database Data","Description":"Added a ton of data to the database. Such as various descriptions. More work is still to be done.","Commit":"Feature","Important":"False"},{"Id":36,"GitPatchModelId":16,"Name":"Database Ids","Description":"Database has less duplicated content. Army entities now link to their Upgrades and Abilities. More work is still to be done.","Commit":"Feature","Important":"False"},{"Id":37,"GitPatchModelId":16,"Name":"Blades of the Godhead Requirement","Description":"Fixed the requirement incorrectly being the Eye of Aros. Now is properly Bearer of the Crown.","Commit":"Fix","Important":"False"},{"Id":38,"GitPatchModelId":16,"Name":"UI Changes","Description":"Various UI changes and tweaks","Commit":"Style","Important":"False"},{"Id":39,"GitPatchModelId":16,"Name":"Streams","Description":"Added a Streams page. It mentions plans to do Twitch streams on Sunday.","Commit":"Feature","Important":"False"},{"Id":40,"GitPatchModelId":16,"Name":"IMMORTAL","Description":"Fixed \u0022IMMORTAL: Gates of Pyre\u0022 game title. Will no longer refer to it as \u0022Immortal: Gates of Pyre\u0022.","Commit":"Typo","Important":"False"},{"Id":41,"GitPatchModelId":16,"Name":"Mobile Support","Description":"All the pages should now work on phones.","Commit":"Feature","Important":"False"},{"Id":42,"GitPatchModelId":17,"Name":"Form Text","Description":"Fixed search bar in database, name and colour in build calculator, from not rendering \uD83D\uDE10","Commit":"Fix","Important":"False"},{"Id":43,"GitPatchModelId":17,"Name":"UI Test Automation Road Map","Description":"Adding test automation to the roadmap","Commit":"Planning","Important":"False"},{"Id":44,"GitPatchModelId":18,"Name":"Build Calculator Interval","Description":"600 is too laggy. Reducing to 360 until optimizations are done.","Commit":"Fix","Important":"False"},{"Id":45,"GitPatchModelId":18,"Name":"Changelog Patch Date","Description":"Fixed date on previous patch in changelog. Should be one day earlier.","Commit":"Fix","Important":"False"},{"Id":46,"GitPatchModelId":19,"Name":"UI Overhaul","Description":"Cleaned up and restyled a lot of UI. Like Page Containers, Alerts, Forms, Nav Buttons, and more.","Commit":"Style","Important":"False"},{"Id":47,"GitPatchModelId":19,"Name":"Separate Pages","Description":"Navigation now uses different pages, instead of loading content onto the main page.","Commit":"Feature","Important":"False"},{"Id":48,"GitPatchModelId":19,"Name":"Making Of","Description":"Adding Making Of page for design reference.","Commit":"Feature","Important":"False"},{"Id":49,"GitPatchModelId":19,"Name":"Change Log","Description":"Adding Change Log page for viewing update history.","Commit":"Feature","Important":"False"},{"Id":50,"GitPatchModelId":19,"Name":"Mobile Priority","Description":"Changed mobile support priority in roadmap from low and possible to high and planned, and updated description.","Commit":"Planning","Important":"False"},{"Id":51,"GitPatchModelId":20,"Name":"Purple Colours","Description":"Added placeholder-ish purple color scheme.","Commit":"Style","Important":"False"},{"Id":52,"GitPatchModelId":20,"Name":"SQL","Description":"Agile and Change Log pages now use JSON made from SQL","Commit":"Feature","Important":"False"},{"Id":53,"GitPatchModelId":21,"Name":"Discord Link","Description":"Made a discord for the website, and added invite link to contact page","Commit":"Feature","Important":"False"},{"Id":54,"GitPatchModelId":21,"Name":"Loading Improvemnts","Description":"Agile and Change Log loading improved","Commit":"Feature","Important":"False"},{"Id":55,"GitPatchModelId":21,"Name":"Desktop Nav closing","Description":"Desktop nav menu now closes when a page link is clicked","Commit":"Feature","Important":"False"},{"Id":56,"GitPatchModelId":22,"Name":"0.0.6.8900a","Description":"Database updated to 0.0.6.8900a","Commit":"Game Patch","Important":"True"},{"Id":57,"GitPatchModelId":23,"Name":"Database Links","Description":"Various entity references in the database now link to the entity via a dialog interface","Commit":"Feature","Important":"False"},{"Id":58,"GitPatchModelId":24,"Name":"Documentation Page","Description":"Added a docs page with some starter setup information","Commit":"Feature","Important":"False"},{"Id":59,"GitPatchModelId":24,"Name":"Database Filters","Description":"Fixed filter defaults. Removed unimportant filter types","Commit":"Fix","Important":"False"},{"Id":60,"GitPatchModelId":25,"Name":"Database Fixes","Description":"Various fixes to bad data. Added some missing entities","Commit":"Fix","Important":"False"},{"Id":61,"GitPatchModelId":25,"Name":"Plain View","Description":"Database can now change to plain view for easy copy and pasting","Commit":"Feature","Important":"False"},{"Id":62,"GitPatchModelId":25,"Name":"Direct Links","Description":"Database now supports direct links. database/Throne to see just Throne","Commit":"Feature","Important":"False"},{"Id":63,"GitPatchModelId":26,"Name":"Better Navigation","Description":"Documentational pages now use a more logical navigation format, with sections, and parent-child documents","Commit":"Feature","Important":"False"},{"Id":64,"GitPatchModelId":26,"Name":"Style Improvements","Description":"Improved home page styling on website highlighted content","Commit":"Style","Important":"False"},{"Id":65,"GitPatchModelId":26,"Name":"Warning Cleanup","Description":"Removed a bunch of development code warnings","Commit":"Chore","Important":"False"},{"Id":66,"GitPatchModelId":27,"Name":"Toasts","Description":"Added some error toasts to build calculator. Needs work","Commit":"Feature","Important":"False"},{"Id":67,"GitPatchModelId":27,"Name":"Localization Text","Description":"Added localization logic for handling some text. Currently only supporting English","Commit":"Feature","Important":"False"},{"Id":68,"GitPatchModelId":27,"Name":"GitHub Button","Description":"Harass Calculator now links to code in repo, instead of showing it as text","Commit":"Feature","Important":"False"},{"Id":69,"GitPatchModelId":28,"Name":"Markdown","Description":"Docs and Notes are now easily editable markdown files. Navigation will still be handled via SQL formatted data.","Commit":"Feature","Important":"False"},{"Id":70,"GitPatchModelId":28,"Name":"Passive Data","Description":"Added new passive data from Twitter post.","Commit":"Feature","Important":"True"},{"Id":71,"GitPatchModelId":28,"Name":"Toast Fade","Description":"Fixed toasts not fading out over time.","Commit":"Fix","Important":"False"},{"Id":72,"GitPatchModelId":28,"Name":"Click Desktop Menu","Description":"Added better menu navigation for desktop users.","Commit":"Feature","Important":"False"},{"Id":73,"GitPatchModelId":29,"Name":"Added document on Hotkeys","Description":"Document on how to customize hotkeys","Commit":"Feature","Important":"False"},{"Id":74,"GitPatchModelId":29,"Name":"0.0.6.9121a","Description":"Database updated to v0.0.6.9121a","Commit":"Game Patch","Important":"True"},{"Id":75,"GitPatchModelId":30,"Name":"Build Calculator Optimizations","Description":"Now faster","Commit":"Feature","Important":"False"},{"Id":76,"GitPatchModelId":31,"Name":"Cancel Not Reverting","Description":"Cancel button removes unlocked tech again","Commit":"Fix","Important":"False"},{"Id":77,"GitPatchModelId":31,"Name":"GroveHeart Upgrade","Description":"Can upgrade Grove Heart again","Commit":"Fix","Important":"False"},{"Id":78,"GitPatchModelId":31,"Name":"Locked Text","Description":"Hotkey Text is now always visible. Text is gray when key is locked behind tech","Commit":"Style","Important":"False"},{"Id":79,"GitPatchModelId":31,"Name":"Immortal Filters","Description":"This works again. Switching between Ajari and Orzum will changes unit choices","Commit":"Fix","Important":"False"},{"Id":80,"GitPatchModelId":31,"Name":"Added Missing Data","Description":"Added missing data for filtering and unlocking entities","Commit":"Fix","Important":"False"},{"Id":81,"GitPatchModelId":32,"Name":"Offline mode","Description":"You can now use the website offline","Commit":"Feature","Important":"False"},{"Id":82,"GitPatchModelId":32,"Name":"Search Bar","Description":"Desktop users now have a search bar. Very WIP, needs some QOL","Commit":"Feature","Important":"False"},{"Id":83,"GitPatchModelId":32,"Name":"Style Changes","Description":"Changes to styles to RoadMap and Desktop Navigation","Commit":"Style","Important":"False"},{"Id":84,"GitPatchModelId":32,"Name":"Build Calculator Improvements","Description":"Additional tweaks to build calculator UI and features","Commit":"Feature","Important":"False"},{"Id":85,"GitPatchModelId":32,"Name":"Stub Pages","Description":"Added blank stub pages","Commit":"Feature","Important":"False"},{"Id":86,"GitPatchModelId":33,"Name":"Search Hotkey","Description":"Making the search hotkey work.","Commit":"Feature","Important":"False"},{"Id":87,"GitPatchModelId":34,"Name":"Economy Comparison","Description":"Compare two economies together. WIP and contains bugs","Commit":"Feature","Important":"False"},{"Id":88,"GitPatchModelId":35,"Name":"v0.0.6.9201a","Description":"Database updated to v0.0.6.9201a","Commit":"Game Patch","Important":"True"},{"Id":89,"GitPatchModelId":36,"Name":"Cancel Button Gives Money","Description":"Now properly clearing out saved economy data. Also fixed missing 1 second offset","Commit":"Fix","Important":"False"},{"Id":90,"GitPatchModelId":37,"Name":"Wait Buttons","Description":"Wait and Wait To buttons have been implemented. Cancel can clear out last made waits","Commit":"Feature","Important":"False"},{"Id":91,"GitPatchModelId":37,"Name":"Pyre in Build Calc","Description":"You can now see the Pyre in the build calculator.","Commit":"Feature","Important":"False"},{"Id":92,"GitPatchModelId":37,"Name":"Travel Times Harass Calc","Description":"You can now set multiple values for base travel times","Commit":"Feature","Important":"False"},{"Id":93,"GitPatchModelId":37,"Name":"Harass Calculator Logic Fixed","Description":"Fixed making the harass calc logic bad in the last update.","Commit":"Feature","Important":"False"},{"Id":94,"GitPatchModelId":37,"Name":"Training Queue","Description":"Calculator now considers a training queue. Will wait if full","Commit":"Feature","Important":"False"},{"Id":95,"GitPatchModelId":38,"Name":"Permission Page","Description":"Can now enable/disable storage and analytics permissions.","Commit":"Feature","Important":"False"},{"Id":96,"GitPatchModelId":38,"Name":"Storage Page","Description":"Can now set a bunch of Build Calculator defaults on the Storage Page","Commit":"Feature","Important":"False"},{"Id":97,"GitPatchModelId":39,"Name":"Added Analytics","Description":"Can now opt into data tracking","Commit":"Analytics","Important":"False"},{"Id":98,"GitPatchModelId":39,"Name":"CI Tests","Description":"GitHub Action now runs tests on dev after each build","Commit":"Tests","Important":"False"},{"Id":99,"GitPatchModelId":39,"Name":"Harass Calculator Tests","Description":"Testing Harass Calculator inputs and example math","Commit":"Tests","Important":"False"},{"Id":100,"GitPatchModelId":39,"Name":"v0.0.6.9513a","Description":"Database updated to v0.0.6.9513a","Commit":"Feature","Important":"True"},{"Id":101,"GitPatchModelId":39,"Name":"BuildCalc Keys","Description":"Updated Calc Hotkey UI","Commit":"Feature","Important":"False"},{"Id":102,"GitPatchModelId":39,"Name":"Test Logs","Description":"Test Logs are now automatically posted to discord","Commit":"Tests","Important":"False"}]
\ No newline at end of file
diff --git a/IGP/wwwroot/generated/GitPatchModels.json b/IGP/wwwroot/generated/GitPatchModels.json
index 67933d2..bc9368a 100644
--- a/IGP/wwwroot/generated/GitPatchModels.json
+++ b/IGP/wwwroot/generated/GitPatchModels.json
@@ -1 +1 @@
-[{"Id":1,"Name":"Database UX Patch","Date":"2022-03-13T00:00:00","GitChangeModels":[],"Important":"False"},{"Id":2,"Name":"Thrum Stats Hotfix","Date":"2022-03-12T00:00:00","GitChangeModels":[],"Important":"False"},{"Id":3,"Name":"Memory Tester Patch","Date":"2022-03-01T00:00:00","GitChangeModels":[],"Important":"False"},{"Id":4,"Name":"Hide Pyre Hotfix","Date":"2022-02-20T00:00:00","GitChangeModels":[],"Important":"False"},{"Id":5,"Name":"Stream Patch 1","Date":"2022-02-20T00:00:00","GitChangeModels":[],"Important":"False"},{"Id":6,"Name":"Agile UI Hotfix","Date":"2022-02-20T00:00:00","GitChangeModels":[],"Important":"False"},{"Id":7,"Name":"Armor Patch","Date":"2022-02-19T00:00:00","GitChangeModels":[],"Important":"False"},{"Id":8,"Name":"Home Page Patch","Date":"2022-02-19T00:00:00","GitChangeModels":[],"Important":"False"},{"Id":9,"Name":"Mobile Menu Hotfix 2","Date":"2022-02-19T00:00:00","GitChangeModels":[],"Important":"False"},{"Id":10,"Name":"Mobile Menu Hotfix","Date":"2022-02-19T00:00:00","GitChangeModels":[],"Important":"False"},{"Id":11,"Name":"Mobile Menu Patch","Date":"2022-02-19T00:00:00","GitChangeModels":[],"Important":"False"},{"Id":12,"Name":"0.0.6.8375a Patch","Date":"2022-02-18T00:00:00","GitChangeModels":[],"Important":"True"},{"Id":13,"Name":"Google Tracking Hotfix","Date":"2022-02-18T00:00:00","GitChangeModels":[],"Important":"False"},{"Id":14,"Name":"Privacy Policy Patch","Date":"2022-02-17T00:00:00","GitChangeModels":[],"Important":"False"},{"Id":15,"Name":"Home Page Quick Hotfix","Date":"2022-02-16T00:00:00","GitChangeModels":[],"Important":"False"},{"Id":16,"Name":"Early Agile Patch","Date":"2022-02-16T00:00:00","GitChangeModels":[],"Important":"False"},{"Id":17,"Name":"Form Text Rendering Hotfix","Date":"2022-02-15T00:00:00","GitChangeModels":[],"Important":"False"},{"Id":18,"Name":"Reducing Timing Interval Hotfix","Date":"2022-02-15T00:00:00","GitChangeModels":[],"Important":"False"},{"Id":19,"Name":"Changelog Patch","Date":"2022-02-14T00:00:00","GitChangeModels":[],"Important":"False"},{"Id":20,"Name":"SQL Patch","Date":"2022-03-26T00:00:00","GitChangeModels":[],"Important":"False"},{"Id":21,"Name":"Stream Patch 2","Date":"2022-03-30T00:00:00","GitChangeModels":[],"Important":"False"},{"Id":22,"Name":"0.0.6.8900a Patch","Date":"2022-03-30T00:00:00","GitChangeModels":[],"Important":"True"},{"Id":23,"Name":"Database Links Patch","Date":"2022-04-01T00:00:00","GitChangeModels":[],"Important":"False"},{"Id":24,"Name":"Open Source Patch","Date":"2022-04-03T00:00:00","GitChangeModels":[],"Important":"False"},{"Id":25,"Name":"Stream Patch 3","Date":"2022-04-03T00:00:00","GitChangeModels":[],"Important":"False"},{"Id":26,"Name":"Notes/Docs Patch","Date":"2022-04-10T00:00:00","GitChangeModels":[],"Important":"False"},{"Id":27,"Name":"Stream Patch 4","Date":"2022-04-10T00:00:00","GitChangeModels":[],"Important":"False"},{"Id":28,"Name":"Passive Patch","Date":"2022-04-12T00:00:00","GitChangeModels":[],"Important":"True"},{"Id":29,"Name":"0.0.6.9121a Patch","Date":"2022-04-13T00:00:00","GitChangeModels":[],"Important":"True"},{"Id":30,"Name":"Stream Patch 5","Date":"2022-04-13T00:00:00","GitChangeModels":[],"Important":"False"},{"Id":31,"Name":"BuildCalc Hotfix","Date":"2022-04-13T00:00:00","GitChangeModels":[],"Important":"False"},{"Id":32,"Name":"Search Patch","Date":"2022-04-16T00:00:00","GitChangeModels":[],"Important":"False"},{"Id":33,"Name":"Search Hotfix","Date":"2022-04-16T00:00:00","GitChangeModels":[],"Important":"False"},{"Id":34,"Name":"Stream Patch 6","Date":"2022-04-17T00:00:00","GitChangeModels":[],"Important":"False"},{"Id":35,"Name":"v0.0.6.9201a Patch","Date":"2022-04-18T00:00:00","GitChangeModels":[],"Important":"True"},{"Id":36,"Name":"Build Calc Free Money Hotfix","Date":"2022-04-18T00:00:00","GitChangeModels":[],"Important":"False"},{"Id":37,"Name":"BuildCalc Pyre Patch","Date":"2022-04-24T00:00:00","GitChangeModels":[],"Important":"False"},{"Id":38,"Name":"Stream Patch 7","Date":"2022-04-24T00:00:00","GitChangeModels":[],"Important":"False"},{"Id":39,"Name":"Infrastructure Patch","Date":"2022-05-20T00:00:00","GitChangeModels":[],"Important":"False"}]
\ No newline at end of file
+[{"Id":1,"Name":"Database UX Patch","Date":"2022-03-13T00:00:00","GitChangeModels":[],"Important":"False"},{"Id":2,"Name":"Thrum Stats Hotfix","Date":"2022-03-12T00:00:00","GitChangeModels":[],"Important":"False"},{"Id":3,"Name":"Memory Tester Patch","Date":"2022-03-01T00:00:00","GitChangeModels":[],"Important":"False"},{"Id":4,"Name":"Hide Pyre Hotfix","Date":"2022-02-20T00:00:00","GitChangeModels":[],"Important":"False"},{"Id":5,"Name":"Stream Patch 1","Date":"2022-02-20T00:00:00","GitChangeModels":[],"Important":"False"},{"Id":6,"Name":"Agile UI Hotfix","Date":"2022-02-20T00:00:00","GitChangeModels":[],"Important":"False"},{"Id":7,"Name":"Armor Patch","Date":"2022-02-19T00:00:00","GitChangeModels":[],"Important":"False"},{"Id":8,"Name":"Home Page Patch","Date":"2022-02-19T00:00:00","GitChangeModels":[],"Important":"False"},{"Id":9,"Name":"Mobile Menu Hotfix 2","Date":"2022-02-19T00:00:00","GitChangeModels":[],"Important":"False"},{"Id":10,"Name":"Mobile Menu Hotfix","Date":"2022-02-19T00:00:00","GitChangeModels":[],"Important":"False"},{"Id":11,"Name":"Mobile Menu Patch","Date":"2022-02-19T00:00:00","GitChangeModels":[],"Important":"False"},{"Id":12,"Name":"0.0.6.8375a Patch","Date":"2022-02-18T00:00:00","GitChangeModels":[],"Important":"True"},{"Id":13,"Name":"Google Tracking Hotfix","Date":"2022-02-18T00:00:00","GitChangeModels":[],"Important":"False"},{"Id":14,"Name":"Privacy Policy Patch","Date":"2022-02-17T00:00:00","GitChangeModels":[],"Important":"False"},{"Id":15,"Name":"Home Page Quick Hotfix","Date":"2022-02-16T00:00:00","GitChangeModels":[],"Important":"False"},{"Id":16,"Name":"Early Agile Patch","Date":"2022-02-16T00:00:00","GitChangeModels":[],"Important":"False"},{"Id":17,"Name":"Form Text Rendering Hotfix","Date":"2022-02-15T00:00:00","GitChangeModels":[],"Important":"False"},{"Id":18,"Name":"Reducing Timing Interval Hotfix","Date":"2022-02-15T00:00:00","GitChangeModels":[],"Important":"False"},{"Id":19,"Name":"Changelog Patch","Date":"2022-02-14T00:00:00","GitChangeModels":[],"Important":"False"},{"Id":20,"Name":"SQL Patch","Date":"2022-03-26T00:00:00","GitChangeModels":[],"Important":"False"},{"Id":21,"Name":"Stream Patch 2","Date":"2022-03-30T00:00:00","GitChangeModels":[],"Important":"False"},{"Id":22,"Name":"0.0.6.8900a Patch","Date":"2022-03-30T00:00:00","GitChangeModels":[],"Important":"True"},{"Id":23,"Name":"Database Links Patch","Date":"2022-04-01T00:00:00","GitChangeModels":[],"Important":"False"},{"Id":24,"Name":"Open Source Patch","Date":"2022-04-03T00:00:00","GitChangeModels":[],"Important":"False"},{"Id":25,"Name":"Stream Patch 3","Date":"2022-04-03T00:00:00","GitChangeModels":[],"Important":"False"},{"Id":26,"Name":"Notes/Docs Patch","Date":"2022-04-10T00:00:00","GitChangeModels":[],"Important":"False"},{"Id":27,"Name":"Stream Patch 4","Date":"2022-04-10T00:00:00","GitChangeModels":[],"Important":"False"},{"Id":28,"Name":"Passive Patch","Date":"2022-04-12T00:00:00","GitChangeModels":[],"Important":"True"},{"Id":29,"Name":"0.0.6.9121a Patch","Date":"2022-04-13T00:00:00","GitChangeModels":[],"Important":"True"},{"Id":30,"Name":"Stream Patch 5","Date":"2022-04-13T00:00:00","GitChangeModels":[],"Important":"False"},{"Id":31,"Name":"BuildCalc Hotfix","Date":"2022-04-13T00:00:00","GitChangeModels":[],"Important":"False"},{"Id":32,"Name":"Search Patch","Date":"2022-04-16T00:00:00","GitChangeModels":[],"Important":"False"},{"Id":33,"Name":"Search Hotfix","Date":"2022-04-16T00:00:00","GitChangeModels":[],"Important":"False"},{"Id":34,"Name":"Stream Patch 6","Date":"2022-04-17T00:00:00","GitChangeModels":[],"Important":"False"},{"Id":35,"Name":"v0.0.6.9201a Patch","Date":"2022-04-18T00:00:00","GitChangeModels":[],"Important":"True"},{"Id":36,"Name":"Build Calc Free Money Hotfix","Date":"2022-04-18T00:00:00","GitChangeModels":[],"Important":"False"},{"Id":37,"Name":"BuildCalc Pyre Patch","Date":"2022-04-24T00:00:00","GitChangeModels":[],"Important":"False"},{"Id":38,"Name":"Stream Patch 7","Date":"2022-04-24T00:00:00","GitChangeModels":[],"Important":"False"},{"Id":39,"Name":"v0.0.6.9513a Patch","Date":"2022-04-29T00:00:00","GitChangeModels":[],"Important":"True"}]
\ No newline at end of file
diff --git a/IGP/wwwroot/generated/Variables.json b/IGP/wwwroot/generated/Variables.json
index 7514d33..d1eb359 100644
--- a/IGP/wwwroot/generated/Variables.json
+++ b/IGP/wwwroot/generated/Variables.json
@@ -1 +1 @@
-[{"Key":"GamePatch","Value":"v0.0.6.9201a"}]
\ No newline at end of file
+[{"Key":"GamePatch","Value":"v0.0.6.9513a"}]
\ No newline at end of file
diff --git a/Model/Entity/Data/DATA.cs b/Model/Entity/Data/DATA.cs
index 824063f..ef60a4d 100644
--- a/Model/Entity/Data/DATA.cs
+++ b/Model/Entity/Data/DATA.cs
@@ -55,14 +55,17 @@ public class DATA
                 DataType.TEAPOT_FlyingTeapot, new EntityModel(DataType.TEAPOT_FlyingTeapot, EntityType.Teapot)
                     .AddPart(new EntityInfoModel
                     {
-                        Name = "Flying Teapot",
-                        Description = "Basic observer. Can fly and see hidden units within 1000 range.",
+                        Name = "Detector",
+                        Description = "Has 1100 vision, and can see hidden units within 1000 range.",
                         Notes = @"Doesn't take up a scout slot."
                     })
                     .AddPart(new EntityRequirementModel { Id = DataType.TEAPOT_Teapot })
+                    .AddPart(new EntitySupplyModel{Takes = 1})
                     .AddPart(new EntityProductionModel { Alloy = 100, Ether = 50 })
-                    .AddPart(new EntityVitalityModel { Health = 70, Armor = ArmorType.Light })
-                    .AddPart(new EntityMovementModel { Speed = 400, Movement = MovementType.Air })
+                    .AddPart(new EntityVitalityModel { Health = 100, DefenseLayer = 30, Armor = ArmorType.Light })
+                    .AddPart(new EntityMovementModel { Speed = 280, Movement = MovementType.Air })
+                    .AddPart(new EntityIdPassiveModel{ Id = DataType.PASSIVE_Detection})
+                    
             },
 
             // Families
@@ -333,8 +336,7 @@ public class DATA
                 new EntityModel(DataType.IPASSIVE_StalkersSense, EntityType.Passive)
                     .AddPart(new EntityInfoModel
                     {
-                        Name = "Stalker's Sense", Description = "Xol's units sense nearby enemies in the fog of war.",
-                        Notes = "Not implemented."
+                        Name = "Stalker's Sense", Description = "Xol's units sense nearby enemies in the fog of war."
                     })
             },
 
@@ -627,6 +629,7 @@ public class DATA
                     .AddPart(new EntityIdAbilityModel { Id = DataType.ABILITY_BirthingStorm })
                     .AddPart(new EntityIdAbilityModel { Id = DataType.ABILITY_SummonSiegeMaw })
                     .AddPart(new EntityIdUpgradeModel { Id = DataType.UPGRADE_BirthingStorm })
+                    .AddPart(new EntityIdPassiveModel { Id = DataType.PASSIVE_CastingFromBlood })
             },
             {
                 DataType.VANGUARD_BoneStalker_Xol,
@@ -685,6 +688,8 @@ public class DATA
                         Targets = TargetType.Ground
                     })
                     .AddPart(new EntityIdAbilityModel { Id = DataType.ABILITY_LethalBond })
+                    .AddPart(new EntityIdPassiveModel { Id = DataType.PASSIVE_CastingFromBlood })
+
             },
             // Units
             // Q'Rath
@@ -769,7 +774,7 @@ public class DATA
                     })
                     .AddPart(new EntityIdAbilityModel { Id = DataType.ABILITY_DeployMagi })
                     .AddPart(new EntityIdAbilityModel { Id = DataType.ABILITY_MobilizeQrath })
-                    .AddPart(new EntityIdPassiveModel { Id = DataType.PASSIVE_MendingCommand })
+                    .AddPart(new EntityIdPassiveModel { Id = DataType.PASSIVE_MendingDecree })
             },
             {
                 DataType.UNIT_Zephyr,
@@ -820,7 +825,7 @@ public class DATA
                     .AddPart(new EntityFactionModel { Faction = DataType.FACTION_QRath })
                     .AddPart(new EntityProductionModel { Alloy = 125, Ether = 10, BuildTime = 35, ProducedBy = DataType.BUILDING_SoulFoundry })
                     .AddPart(new EntitySupplyModel { Takes = 4 })
-                    .AddPart(new EntityVitalityModel { Health = 140, DefenseLayer = 100, Armor = ArmorType.Medium })
+                    .AddPart(new EntityVitalityModel { Health = 120, DefenseLayer = 100, Armor = ArmorType.Medium })
                     .AddPart(new EntityRequirementModel
                     {
                         Id = DataType.BUILDING_SoulFoundry,
@@ -829,7 +834,7 @@ public class DATA
                     .AddPart(new EntityMovementModel { Speed = 435, Movement = MovementType.Ground })
                     .AddPart(new EntityWeaponModel
                     {
-                        LightDamage = 32, MediumDamage = 24, Damage = 16, Range = 300, AttacksPerSecond = 0.5f,
+                        LightDamage = 24, MediumDamage = 18, Damage = 12, Range = 400, AttacksPerSecond = 0.5f,
                         Targets = TargetType.Ground
                     })
                     .AddPart(new EntityIdUpgradeModel { Id = DataType.UPGRADE_SiroccoScript })
@@ -1037,7 +1042,7 @@ public class DATA
                     .AddPart(new EntityTierModel { Tier = 3.5f })
                     .AddPart(new EntityHotkeyModel { Hotkey = "F", HoldSpace = true, HotkeyGroup = "Z" })
                     .AddPart(new EntityFactionModel { Faction = DataType.FACTION_QRath })
-                    .AddPart(new EntityProductionModel { Alloy = 110, Ether = 175, BuildTime = 55, ProducedBy = DataType.BUILDING_Angelarium })
+                    .AddPart(new EntityProductionModel { Alloy = 110, Ether = 250, BuildTime = 55, ProducedBy = DataType.BUILDING_Angelarium })
                     .AddPart(new EntitySupplyModel { Takes = 6 })
                     .AddPart(new EntityRequirementModel
                     {
@@ -1168,6 +1173,8 @@ public class DATA
                     })
                     .AddPart(new EntityIdPassiveModel { Id = DataType.PASSIVE_QuenchingScythes })
                     .AddPart(new EntityIdPassiveModel { Id = DataType.ABILITY_CullingStrike })
+                    .AddPart(new EntityIdPassiveModel { Id = DataType.PASSIVE_CastingFromBlood })
+                    
             },
             {
                 DataType.UNIT_RedSeer,
@@ -1201,6 +1208,7 @@ public class DATA
                     .AddPart(new EntityIdUpgradeModel { Id = DataType.UPGRADE_BloodPlague })
                     .AddPart(new EntityIdAbilityModel { Id = DataType.ABILITY_DrainingEmbrace })
                     .AddPart(new EntityIdAbilityModel { Id = DataType.ABILITY_AwakenAcaaluk })
+                    .AddPart(new EntityIdPassiveModel { Id = DataType.PASSIVE_CastingFromBlood })
             },
             {
                 DataType.UNIT_Underspine,
@@ -1447,7 +1455,7 @@ public class DATA
                         Name = "Research Radiant Ward", Descriptive = DescriptiveType.Upgrade,
                         Description = "Unlocks the dervish's Radiant Ward ability"
                     })
-                    .AddPart(new EntityHotkeyModel { Hotkey = "V", HotkeyGroup = "TAB" })
+                    .AddPart(new EntityHotkeyModel { Hotkey = "R", HoldSpace = true, HotkeyGroup = "TAB" })
                     .AddPart(new EntityFactionModel { Faction = DataType.FACTION_QRath })
                     .AddPart(new EntityProductionModel { Alloy = 80, Ether = 80, BuildTime = 34, ProducedBy = DataType.BUILDING_HouseOfFadingSaints })
                     .AddPart(new EntityRequirementModel
@@ -1637,7 +1645,7 @@ public class DATA
                 new EntityModel(DataType.UPGRADE_BloodMothersFevor, EntityType.Tech)
                     .AddPart(new EntityInfoModel
                         { Name = "Blood Mother's Fevor", Descriptive = DescriptiveType.Upgrade })
-                    .AddPart(new EntityHotkeyModel { Hotkey = "V", HotkeyGroup = "TAB" })
+                    .AddPart(new EntityHotkeyModel { Hotkey = "CAPSLOCK", HotkeyGroup = "TAB" })
                     .AddPart(new EntityFactionModel { Faction = DataType.FACTION_Aru })
                     .AddPart(new EntityVanguardReplacedModel
                         { ImmortalId = DataType.IMMORTAL_Xol, ReplacedById = DataType.UPGRADE_Ambush })
@@ -1772,7 +1780,7 @@ public class DATA
                         Description = "When Hidden, the Bone Stalker's next attack deals double damage",
                         Descriptive = DescriptiveType.Upgrade
                     })
-                    .AddPart(new EntityHotkeyModel { Hotkey = "V", HotkeyGroup = "TAB", HoldSpace = false })
+                    .AddPart(new EntityHotkeyModel { Hotkey = "CAPSLOCK", HotkeyGroup = "TAB", HoldSpace = false })
                     .AddPart(new EntityFactionModel { Faction = DataType.FACTION_Aru })
                     .AddPart(new EntityProductionModel { Alloy = 100, Ether = 125, BuildTime = 80, ProducedBy = DataType.BUILDING_RedVale })
                     .AddPart(new EntityRequirementModel
@@ -1822,6 +1830,19 @@ public class DATA
 
             // Passives
             // Neutral
+            
+            {
+            DataType.PASSIVE_Detection,
+            new EntityModel(DataType.PASSIVE_Detection, EntityType.Passive)
+                .AddPart(new EntityInfoModel
+                {
+                    Name = "Detection", Descriptive = DescriptiveType.Passive,
+                    Description =
+                        @"Unit can see all hidden units in its detection radius."
+                })
+                .AddPart(new EntityFactionModel { Faction = DataType.Any })
+        },
+            
             {
                 DataType.PASSIVE_BastionPassives,
                 new EntityModel(DataType.PASSIVE_BastionPassives, EntityType.Passive)
@@ -2015,6 +2036,18 @@ public class DATA
                     })
                     .AddPart(new EntityFactionModel { Faction = DataType.FACTION_QRath })
             },
+            
+            {
+                DataType.PASSIVE_HallowedWeapons,
+                new EntityModel(DataType.PASSIVE_HallowedWeapons, EntityType.Passive)
+                    .AddPart(new EntityInfoModel
+                    {
+                        Name = "Hallowed Weapons", Descriptive = DescriptiveType.Applies_Debuff,
+                        Description = @"Gains 14 damage while in Hallowed Ground"
+                    })
+                    .AddPart(new EntityFactionModel { Faction = DataType.FACTION_QRath })
+            },
+
 
             {
                 DataType.PASSIVE_Zeal,
@@ -2038,17 +2071,6 @@ public class DATA
                     .AddPart(new EntityFactionModel { Faction = DataType.FACTION_QRath })
             },
 
-            {
-                DataType.PASSIVE_CastFromLife,
-                new EntityModel(DataType.PASSIVE_HallowedGround, EntityType.Passive)
-                    .AddPart(new EntityInfoModel
-                    {
-                        Name = "Cast From Life", Descriptive = DescriptiveType.Passive,
-                        Description = @"Can spend life instead of energy, when needed.",
-                        Notes = "Can't spend more life then unit has. Unit cannot kill itself with Cast From Life."
-                    })
-                    .AddPart(new EntityFactionModel { Faction = DataType.FACTION_Aru })
-            },
 
             {
                 DataType.PASSIVE_WraithBowRange,
@@ -2207,14 +2229,14 @@ public class DATA
                     .AddPart(new EntityFactionModel { Faction = DataType.FACTION_QRath })
             },
             {
-                DataType.PASSIVE_MendingCommand,
-                new EntityModel(DataType.PASSIVE_MendingCommand, EntityType.Passive)
+                DataType.PASSIVE_MendingDecree,
+                new EntityModel(DataType.PASSIVE_MendingDecree, EntityType.Passive)
                     .AddPart(new EntityInfoModel
                     {
-                        Name = "Mending Command", Descriptive = DescriptiveType.Ability,
-                        Description = @"Autocast ability that heals 48 life and 24 shields over 2 seconds."
+                        Name = "Mending Decree", Descriptive = DescriptiveType.Ability,
+                        Description = @"Heals a nearby allied unit."
                     })
-                    .AddPart(new EntityProductionModel { Pyre = 10, Cooldown = 3 })
+                    .AddPart(new EntityProductionModel { Energy = 10, Cooldown = 3 })
                     .AddPart(new EntityFactionModel { Faction = DataType.FACTION_QRath })
             },
             {
@@ -2267,6 +2289,20 @@ public class DATA
                         { Id = DataType.UPGRADE_XacalDamage, Requirement = RequirementType.Research_Upgrade })
                     .AddPart(new EntityFactionModel { Faction = DataType.FACTION_Aru })
             },
+                
+            {
+            DataType.PASSIVE_CastingFromBlood,
+            new EntityModel(DataType.PASSIVE_CastingFromBlood, EntityType.Passive)
+                .AddPart(new EntityInfoModel
+                {
+                    Name = "Cast From Blood", Descriptive = DescriptiveType.Ability,
+                    Description =
+                        @"This unit can spend life to cast abilities when it doesn't have enough energy.",
+                    Notes = "They must have at least one remaining hitpoint after to perform Cast From Blood."
+                })
+                .AddPart(new EntityFactionModel { Faction = DataType.FACTION_Aru })
+        },
+            
             {
                 DataType.PASSIVE_OssifyingSwarm,
                 new EntityModel(DataType.PASSIVE_OssifyingSwarm, EntityType.Passive)
@@ -2365,6 +2401,8 @@ public class DATA
                             @"Spawns a mine that reveals enemy units, slows them, and makes them take increased damage for a duration."
                     })
                     .AddPart(new EntityFactionModel { Faction = DataType.FACTION_QRath })
+                    .AddPart(new EntityHotkeyModel { Hotkey = "R", HotkeyGroup = "D", HoldSpace = true})
+
                     .AddPart(new EntityProductionModel { DefensiveLayer = 30, Cooldown = 40 })
                     .AddPart(new EntityRequirementModel { Id = DataType.UPGRADE_RadiantWard })
                     .AddPart(new EntityVitalityModel
@@ -2423,7 +2461,7 @@ public class DATA
                         Description =
                             @"The Saoshin leaps to the target location. If she has enough mana, she activates Intervention upon landing."
                     })
-                    .AddPart(new EntityHotkeyModel { Hotkey = "V", HotkeyGroup = "D" })
+                    .AddPart(new EntityHotkeyModel { Hotkey = "E", HotkeyGroup = "D" })
                     .AddPart(new EntityFactionModel { Faction = DataType.FACTION_QRath })
                     .AddPart(new EntityProductionModel { Cooldown = 5, Energy = 70 })
             },
@@ -2449,7 +2487,7 @@ public class DATA
                         Description =
                             @"Deploying the Absolver drastically <b style=""color: orange"">increases its attack speed</b>."
                     })
-                    .AddPart(new EntityHotkeyModel { Hotkey = "V", HotkeyGroup = "D" })
+                    .AddPart(new EntityHotkeyModel { Hotkey = "CAPSLOCK", HotkeyGroup = "D" })
                     .AddPart(new EntityFactionModel { Faction = DataType.FACTION_QRath })
             },
             {
@@ -2553,7 +2591,7 @@ public class DATA
                     .AddPart(new EntityHotkeyModel { Hotkey = "R", HotkeyGroup = "D" })
                     .AddPart(new EntityVanguardAddedModel
                         { ImmortalId = DataType.IMMORTAL_Xol, ReplaceId = DataType.ABILITY_CullingStrike })
-                    .AddPart(new EntityProductionModel { Energy = 40 })
+                    .AddPart(new EntityProductionModel { Energy = 40, Cooldown = 4})
                     .AddPart(new EntityFactionModel { Faction = DataType.FACTION_Aru })
             },
             {
@@ -2589,7 +2627,7 @@ public class DATA
                         Name = "Deploy Resinant", Descriptive = DescriptiveType.Ability,
                         Description = "Deploying the Resinant enables it to deal area of effect damage at long range."
                     })
-                    .AddPart(new EntityHotkeyModel { Hotkey = "V", HotkeyGroup = "D" })
+                    .AddPart(new EntityHotkeyModel { Hotkey = "CAPSLOCK", HotkeyGroup = "D" })
                     .AddPart(new EntityFactionModel { Faction = DataType.FACTION_Aru })
             },
             {
@@ -2646,9 +2684,10 @@ public class DATA
                     .AddPart(new EntityFactionModel { Faction = DataType.FACTION_Aru })
                     .AddPart(new EntityVanguardAddedModel
                         { ImmortalId = DataType.IMMORTAL_Mala, ReplaceId = DataType.UNIT_Acaaluk })
-                    .AddPart(new EntityProductionModel { Energy = 80, BuildTime = 4, Cooldown = 20 })
+                    .AddPart(new EntityProductionModel { Energy = 80, BuildTime = 10, Cooldown = 30 })
                     .AddPart(new EntitySupplyModel { Takes = 0 })
-                    .AddPart(new EntityVitalityModel { Health = 300, DefenseLayer = 100, Armor = ArmorType.Heavy })
+                    .AddPart(new EntityVitalityModel { Health = 300, DefenseLayer = 100, Armor = ArmorType.Heavy, 
+                    Lasts = 75, Vision = 1000})
                     .AddPart(new EntityMovementModel { Speed = 0, Movement = MovementType.Ground })
                     .AddPart(new EntityWeaponModel
                     {
@@ -2686,7 +2725,7 @@ public class DATA
                         Name = "Summon Citadel",
                         Description = "Creates a powerful defensive structure on a Tower Foundation."
                     })
-                    .AddPart(new EntityHotkeyModel { Hotkey = "Q", HotkeyGroup = "1" })
+                    .AddPart(new EntityHotkeyModel { Hotkey = "Q", HotkeyGroup = "V" })
                     .AddPart(new EntityFactionModel { Faction = DataType.FACTION_QRath })
                     .AddPart(new EntityProductionModel { Pyre = 75, BuildTime = 70 })
                     .AddPart(new EntityVitalityModel
@@ -2708,7 +2747,7 @@ public class DATA
                         Description =
                             @"Summons a powerful monument that slams into the ground to <b style=""color:orange"">deal damage</b> to enemy ground units (and takes damage from everything it lands on). It then creates <b style=""color:white"">Hallowed Ground</b> and nearby friendly units <b style=""color:orange"">gain Attack Speed<b>"
                     })
-                    .AddPart(new EntityHotkeyModel { Hotkey = "R", HotkeyGroup = "1" })
+                    .AddPart(new EntityHotkeyModel { Hotkey = "R", HotkeyGroup = "V" })
                     .AddPart(new EntityFactionModel { Faction = DataType.FACTION_QRath })
                     .AddPart(new EntityVanguardAddedModel { ImmortalId = DataType.IMMORTAL_Orzum })
                     .AddPart(new EntityProductionModel { Pyre = 100, Cooldown = 15 })
@@ -2725,7 +2764,7 @@ public class DATA
                         Description =
                             @"Structures in target area <b style=""color:lime"">reduce incoming damage significantly</b> for several seconds."
                     })
-                    .AddPart(new EntityHotkeyModel { Hotkey = "E", HotkeyGroup = "1" })
+                    .AddPart(new EntityHotkeyModel { Hotkey = "E", HotkeyGroup = "V" })
                     .AddPart(new EntityFactionModel { Faction = DataType.FACTION_QRath })
                     .AddPart(new EntityVanguardAddedModel { ImmortalId = DataType.IMMORTAL_Orzum })
                     .AddPart(new EntityProductionModel { Pyre = 50, Cooldown = 15 })
@@ -2739,7 +2778,7 @@ public class DATA
                         Description =
                             @"Allied units in a large area <b style=""color:skyblue"">gain Movement Speed</b> and <b style=""color:orange"">gain Attack Speed</b> for several seconds."
                     })
-                    .AddPart(new EntityHotkeyModel { Hotkey = "W", HotkeyGroup = "1" })
+                    .AddPart(new EntityHotkeyModel { Hotkey = "W", HotkeyGroup = "V" })
                     .AddPart(new EntityFactionModel { Faction = DataType.Any })
                     .AddPart(new EntityProductionModel { Pyre = 75, Cooldown = 20 })
             },
@@ -2752,7 +2791,7 @@ public class DATA
                         Description =
                             @"Units in the area <b style=""gain bonus shields"">. After a short delay, allied units in teh area <b style=""color:skyblue"">teleport to your nearest Town Hall</b>."
                     })
-                    .AddPart(new EntityHotkeyModel { Hotkey = "E", HotkeyGroup = "1" })
+                    .AddPart(new EntityHotkeyModel { Hotkey = "E", HotkeyGroup = "V" })
                     .AddPart(new EntityFactionModel { Faction = DataType.FACTION_QRath })
                     .AddPart(new EntityVanguardAddedModel { ImmortalId = DataType.IMMORTAL_Ajari })
                     .AddPart(new EntityProductionModel { Pyre = 50, Cooldown = 60 })
@@ -2766,7 +2805,7 @@ public class DATA
                         Description =
                             @"All allied units <b style=""color:lime"">gain bonus shields</b> for several seconds."
                     })
-                    .AddPart(new EntityHotkeyModel { Hotkey = "R", HotkeyGroup = "1" })
+                    .AddPart(new EntityHotkeyModel { Hotkey = "R", HotkeyGroup = "V" })
                     .AddPart(new EntityFactionModel { Faction = DataType.FACTION_QRath })
                     .AddPart(new EntityVanguardAddedModel { ImmortalId = DataType.IMMORTAL_Ajari })
                     .AddPart(new EntityProductionModel { Pyre = 150, Cooldown = 120 })
@@ -2781,7 +2820,7 @@ public class DATA
                         Name = "Summon Grove Guardian",
                         Description = "Creates a powerful defensive structure on a Tower Foundation."
                     })
-                    .AddPart(new EntityHotkeyModel { Hotkey = "Q", HotkeyGroup = "1" })
+                    .AddPart(new EntityHotkeyModel { Hotkey = "Q", HotkeyGroup = "V" })
                     .AddPart(new EntityFactionModel { Faction = DataType.FACTION_Aru })
                     .AddPart(new EntityProductionModel { Pyre = 75, BuildTime = 70 })
                     .AddPart(new EntityVitalityModel
@@ -2800,7 +2839,7 @@ public class DATA
                         Description =
                             "Creates a rootway generating structure that heals nearby allied units, and transfers it's blood to nearby allied units."
                     })
-                    .AddPart(new EntityHotkeyModel { Hotkey = "F", HotkeyGroup = "1" })
+                    .AddPart(new EntityHotkeyModel { Hotkey = "F", HotkeyGroup = "V" })
                     .AddPart(new EntityFactionModel { Faction = DataType.FACTION_Aru })
                     .AddPart(new EntityProductionModel { Pyre = 50, Cooldown = 21 })
                     .AddPart(new EntityVitalityModel
@@ -2817,7 +2856,7 @@ public class DATA
                         Name = "Red Tithe",
                         Description = "Sacrifice target unit to create an area that regenerates life and mana."
                     })
-                    .AddPart(new EntityHotkeyModel { Hotkey = "E", HotkeyGroup = "1" })
+                    .AddPart(new EntityHotkeyModel { Hotkey = "E", HotkeyGroup = "V" })
                     .AddPart(new EntityVanguardAddedModel { ImmortalId = DataType.IMMORTAL_Mala })
                     .AddPart(new EntityFactionModel { Faction = DataType.FACTION_Aru })
                     .AddPart(new EntityProductionModel { Pyre = 40, Cooldown = 60 })
@@ -2830,7 +2869,7 @@ public class DATA
                         Name = "Rain of Blood",
                         Description = "Massively increases life, shield and mana regeneration for 30 seconds."
                     })
-                    .AddPart(new EntityHotkeyModel { Hotkey = "R", HotkeyGroup = "1" })
+                    .AddPart(new EntityHotkeyModel { Hotkey = "R", HotkeyGroup = "V" })
                     .AddPart(new EntityFactionModel { Faction = DataType.FACTION_Aru })
                     .AddPart(new EntityVanguardAddedModel { ImmortalId = DataType.IMMORTAL_Mala })
                     .AddPart(new EntityProductionModel { Pyre = 130, Cooldown = 30 })
@@ -2845,7 +2884,7 @@ public class DATA
                             @"Enemy units in the target area are <b>Revealed</b> through fog of war. Units still in the area after a short delay are marked for 10 seconds to take bonus damage and provide Pyre when killed.",
                         Notes = "+3 pyre for kills"
                     })
-                    .AddPart(new EntityHotkeyModel { Hotkey = "E", HotkeyGroup = "1" })
+                    .AddPart(new EntityHotkeyModel { Hotkey = "E", HotkeyGroup = "V" })
                     .AddPart(new EntityFactionModel { Faction = DataType.FACTION_Aru })
                     .AddPart(new EntityVanguardAddedModel { ImmortalId = DataType.IMMORTAL_Xol })
                     .AddPart(new EntityProductionModel { Cooldown = 15, Pyre = 25 })
@@ -2858,7 +2897,7 @@ public class DATA
                         Name = "The Great Hunt",
                         Description = "Enemy unit and structures have their vision reduce to 3 for a short time."
                     })
-                    .AddPart(new EntityHotkeyModel { Hotkey = "R", HotkeyGroup = "1" })
+                    .AddPart(new EntityHotkeyModel { Hotkey = "R", HotkeyGroup = "V" })
                     .AddPart(new EntityFactionModel { Faction = DataType.FACTION_Aru })
                     .AddPart(new EntityVanguardAddedModel { ImmortalId = DataType.IMMORTAL_Xol })
                     .AddPart(new EntityProductionModel { Pyre = 150, Cooldown = 120 })
@@ -2939,7 +2978,7 @@ public class DATA
                         Name = "Apostle of Binding", Descriptive = DescriptiveType.Ether_Extractor,
                         Description = "Ether Extractor (Structure) - Must be placed on an Ether Node."
                     })
-                    .AddPart(new EntityHotkeyModel { Hotkey = "V", HotkeyGroup = "C" })
+                    .AddPart(new EntityHotkeyModel { Hotkey = "CAPSLOCK", HotkeyGroup = "C" })
                     .AddPart(new EntityFactionModel { Faction = DataType.FACTION_QRath })
                     .AddPart(new EntityProductionModel { Alloy = 100, BuildTime = 30, RequiresWorker = true })
                     .AddPart(new EntityVitalityModel
@@ -2982,8 +3021,11 @@ public class DATA
                         Id = DataType.BUILDING_KeeperOfTheHardenedFlames,
                         Requirement = RequirementType.Research_Building
                     })
+                    .AddPart(new EntityWeaponModel {Damage = 14, Range = 700, SecondsBetweenAttacks = 1.8f, Targets 
+                    = TargetType.All})
+                    .AddPart(new EntityIdPassiveModel {Id = DataType.PASSIVE_HallowedWeapons})
                     .AddPart(new EntityVitalityModel
-                        { Health = 300, DefenseLayer = 300, Armor = ArmorType.Heavy, IsStructure = true })
+                        { Health = 300, DefenseLayer = 150, Armor = ArmorType.Heavy, IsStructure = true })
                     .AddPart(new EntityIdPassiveModel { Id = DataType.PASSIVE_PsalmOfFire })
             },
             {
@@ -2994,7 +3036,7 @@ public class DATA
                         Name = "Keeper Of the Hardened Flames", Descriptive = DescriptiveType.Defense,
                         Description = ""
                     })
-                    .AddPart(new EntityHotkeyModel { Hotkey = "V", HoldSpace = true, HotkeyGroup = "C" })
+                    .AddPart(new EntityHotkeyModel { Hotkey = "CAPSLOCK", HoldSpace = true, HotkeyGroup = "C" })
                     .AddPart(new EntityFactionModel { Faction = DataType.FACTION_QRath })
                     .AddPart(new EntityProductionModel { Alloy = 125, BuildTime = 30, RequiresWorker = true })
                     .AddPart(new EntityVitalityModel
@@ -3224,7 +3266,7 @@ public class DATA
                         Name = "Ether Maw", Descriptive = DescriptiveType.Ether_Extractor,
                         Description = "Ether Extractor (Structure) - Must be placed on an Ether Node."
                     }) //TODO Add Ether Node to database
-                    .AddPart(new EntityHotkeyModel { Hotkey = "V", HotkeyGroup = "C" })
+                    .AddPart(new EntityHotkeyModel { Hotkey = "CAPSLOCK", HotkeyGroup = "C" })
                     .AddPart(new EntityFactionModel { Faction = DataType.FACTION_Aru })
                     .AddPart(new EntityProductionModel { Alloy = 100, BuildTime = 30, RequiresWorker = true })
                     .AddPart(new EntityVitalityModel
diff --git a/Model/Entity/Data/Ids_Entity.cs b/Model/Entity/Data/Ids_Entity.cs
index 0d36e4b..ff77101 100644
--- a/Model/Entity/Data/Ids_Entity.cs
+++ b/Model/Entity/Data/Ids_Entity.cs
@@ -55,6 +55,8 @@ public static class DataType
     public static string ISPELL_RedTithe = "57008163-5e3a-4b95-98f3-d00b54e18684";
     public static string ISPELL_RainOfBlood = "792df385-c66a-4710-9f75-97731897a565";
 
+    
+    
     public static string IPASSIVE_HealingGround = "3ec17526-8dc5-4592-9c15-ef1d9b1ca2f6";
     public static string IPASSIVE_Expansionist = "b6cd4335-2165-44c3-b3dc-4500c0111870";
 
@@ -124,6 +126,8 @@ public static class DataType
 
     public static string UPGRADE_Stalk = "36fbc2c0-e9e3-4f54-a79a-981db908c25c";
     public static string UPGRADE_Ambush = "6cf83dc9-717f-4fa9-b417-a3371474a1da";
+    
+    public static string PASSIVE_Detection = "434468fa-83b2-4fc9-a38c-1a3d00bcf055";
 
     public static string PASSIVE_WraithBowRange = "196dd8a6-2044-44e1-aac4-fbaa40552699";
 
@@ -156,9 +160,11 @@ public static class DataType
     public static string PASSIVE_HallowingRites = "9c8ae47b-954e-4a17-8f35-f128c9114b61";
     public static string PASSIVE_RegentsWrath = "f111f004-6548-4430-9d13-ef44ab108ae7";
     public static string PASSIVE_PsalmOfFire = "d28f6b7c-d319-4fb8-bdd4-92ede40a0751";
+    
+    public static string PASSIVE_HallowedWeapons = "f9ac4b3e-d02d-42d4-8d9d-beb9c5d7edcb";
+    
     public static string PASSIVE_Zeal = "62c4942b-5578-422d-8d4e-d1789f4efa68";
     public static string PASSIVE_HallowedGround = "bdb28984-246f-4642-84ab-9e83c02b3e2e";
-    public static string PASSIVE_CastFromLife = "3cc734de-f8e7-4e69-9fa5-bdf725c4941b";
     public static string PASSIVE_Rootway = "46768d4a-5047-4973-b5ca-995cda25ee8d";
     public static string PASSIVE_BehemothCapacity = "a210f109-d3ac-44d4-9724-601c795a2394";
     public static string PASSIVE_QuitlStorage2 = "0b27b863-fce5-40e4-96c7-6df94bdd92b9";
@@ -175,6 +181,9 @@ public static class DataType
 
 
     public static string PASSIVE_OssifyingSwarm = "b8897247-8393-416e-b246-409a6b3263c2";
+    
+    public static string PASSIVE_CastingFromBlood = "c97d1cf1-67d9-402b-9fa1-1abb9bfd7bfd";
+    
 
     public static string PASSIVE_QuenchingScythes = "dbf07db4-e7b6-4f81-9f8e-e5391850eead";
     public static string PASSIVE_AaroxBurn = "921fe250-2b97-40c0-9765-9e6c1e766dd5";
@@ -186,7 +195,7 @@ public static class DataType
 
     public static string PASSIVE_BloodFrenzy = "356b6c33-a857-489c-8218-68c53d03db90";
 
-    public static string PASSIVE_MendingCommand = "25d94c3d-dba9-4f02-abf4-904269b539c6";
+    public static string PASSIVE_MendingDecree = "25d94c3d-dba9-4f02-abf4-904269b539c6";
     public static string PASSIVE_FireQuitl = "80f6b382-da1c-49a1-8235-1ea37983ea54";
     public static string PASSIVE_XacalDamage = "69928f20-5332-418f-ada3-694da3f7b199";
 
diff --git a/Model/Entity/Parts/EntityVitalityModel.cs b/Model/Entity/Parts/EntityVitalityModel.cs
index 4f83ddb..37b83a9 100644
--- a/Model/Entity/Parts/EntityVitalityModel.cs
+++ b/Model/Entity/Parts/EntityVitalityModel.cs
@@ -15,4 +15,6 @@ public class EntityVitalityModel : IEntityPartInterface
     public bool IsStructure { get; set; } = false;
 
     public int Energy { get; set; } = 0;
+
+    public int Vision { get; set; } = 0;
 }
\ No newline at end of file
diff --git a/Model/Hotkeys/HotkeyModel.cs b/Model/Hotkeys/HotkeyModel.cs
index 792ba2c..b5bbae1 100644
--- a/Model/Hotkeys/HotkeyModel.cs
+++ b/Model/Hotkeys/HotkeyModel.cs
@@ -5,7 +5,7 @@ namespace Model.Hotkeys;
 public class HotkeyModel
 {
     public static readonly string[] KeyGroups = { "Z", "1", "2", "TAB", "CONTROL", "SHIFT", "C" };
-    public static readonly string[] HotKeys = { "`", "Q", "W", "E", "R", "A", "S", "F", "X", "V" };
+    public static readonly string[] HotKeys = { "`", "Q", "W", "E", "R", "A", "S", "F", "X", "V", "CAPSLOCK" };
     public string KeyText { get; set; }
     public KeyType KeyType { get; set; }
     public int PositionX { get; set; }
@@ -29,25 +29,49 @@ public class HotkeyModel
         {
             new()
             {
-                KeyText = "`",
-                KeyType = KeyType.Cancel,
+                KeyText = "Z",
+                KeyType = KeyType.ControlGroup,
                 PositionX = 0,
                 PositionY = 0
             },
             new()
             {
-                KeyText = "TAB",
+                KeyText = "D",
                 KeyType = KeyType.ControlGroup,
-                PositionX = 0,
-                PositionY = 1
+                PositionX = 1,
+                PositionY = 0
             },
             new()
             {
-                KeyText = "1",
+                KeyText = "C",
                 KeyType = KeyType.ControlGroup,
-                PositionX = 1,
+                PositionX = 2,
+                PositionY = 0
+            },
+            new()
+            {
+                KeyText = "V",
+                KeyType = KeyType.Pyre,
+                PositionX = 3,
                 PositionY = 0
             },
+            new()
+            {
+                KeyText = "TAB",
+                KeyType = KeyType.ControlGroup,
+                PositionX = 4,
+                PositionY = 0
+            },
+            
+            
+            new()
+            {
+                KeyText = "`",
+                KeyType = KeyType.Cancel,
+                PositionX = 0,
+                PositionY = 1
+            },
+          
             new()
             {
                 KeyText = "Q",
@@ -76,6 +100,15 @@ public class HotkeyModel
                 PositionX = 4,
                 PositionY = 1
             },
+            
+            new()
+            {
+                KeyText = "CAPSLOCK",
+                KeyType = KeyType.Action,
+                PositionX = 0,
+                PositionY = 2
+            },
+            
             new()
             {
                 KeyText = "A",
@@ -97,6 +130,7 @@ public class HotkeyModel
                 PositionX = 3,
                 PositionY = 2
             },
+           
             new()
             {
                 KeyText = "F",
@@ -105,39 +139,11 @@ public class HotkeyModel
                 PositionY = 2
             },
             new()
-            {
-                KeyText = "Z",
-                KeyType = KeyType.ControlGroup,
-                PositionX = 1,
-                PositionY = 3
-            },
-            new()
-            {
-                KeyText = "X",
-                KeyType = KeyType.Action,
-                PositionX = 2,
-                PositionY = 3
-            },
-            new()
-            {
-                KeyText = "C",
-                KeyType = KeyType.ControlGroup,
-                PositionX = 3,
-                PositionY = 3
-            },
-            new()
-            {
-                KeyText = "V",
-                KeyType = KeyType.Action,
-                PositionX = 4,
-                PositionY = 3
-            },
-            new()
             {
                 KeyText = "SPACE",
                 KeyType = KeyType.Advance,
                 PositionX = 1,
-                PositionY = 4
+                PositionY = 3
             },
             // Economy
             new()
@@ -145,15 +151,15 @@ public class HotkeyModel
                 KeyText = "SHIFT", //TODO Update when game changes
                 KeyType = KeyType.Economy,
                 PositionX = 0,
-                PositionY = 2
+                PositionY = 3
             },
             // Pyre
             new()
             {
-                KeyText = "2",
-                KeyType = KeyType.Pyre,
-                PositionX = 2,
-                PositionY = 0,
+                KeyText = "ALT",
+                KeyType = KeyType.Economy,
+                PositionX = 1,
+                PositionY = 5,
                 IsHidden = true
             },
 
@@ -163,7 +169,7 @@ public class HotkeyModel
                 KeyText = "CONTROL",
                 KeyType = KeyType.Economy,
                 PositionX = 0,
-                PositionY = 3
+                PositionY = 4
             }
         };
     }