Stream Patch plus WIP and quick fixes

IGP/Pages/Database/Entity/EntityViewComponent.razor

@@ -2,7 +2,7 @@
 {
     var isVanguard = Entity.VanguardAdded() != null ? " vanguard" : "";
 
-    <div class="enititiesContainer @isVanguard">
+    <div class="entitiesContainer @isVanguard">
         <EntityHeaderComponent></EntityHeaderComponent>
         <div class="entityPartsContainer">
             <EntityVanguardAddedComponent></EntityVanguardAddedComponent>
@@ -21,7 +21,7 @@
 }
 
 <style>
-    .enititiesContainer {
+    .entitiesContainer {
         margin-bottom: 12px;
         width: 100%;
         overflow-y: auto;
@@ -41,7 +41,7 @@
     }
     
     @@media only screen and (max-width: 1025px) {
-        .enititiesContainer {
+        .entitiesContainer {
             padding: 0px;
         }
     }

IGP/Pages/Database/Entity/Parts/EntityInfoComponent.razor

@@ -20,7 +20,7 @@
             @if (Entity.Faction() != null)
             {
                 <div>
-                    <b>Faction:</b> @Entity.Faction().Faction
+                    <b>Faction:</b> @DATA.Get()[Entity.Faction().Faction].Info().Name
                 </div>
             }
             @if (Entity.Tier() != null)
@@ -70,7 +70,7 @@ else
                 @if (Entity.Faction() != null)
                 {
                     <div>
-                        <b>Faction:</b> @Entity.Faction().Faction
+                        <b>Faction:</b> @DATA.Get()[Entity.Faction().Faction].Info().Name
                     </div>
                 }
                 @if (Entity.Tier() != null)

IGP/Pages/Database/Entity/Parts/EntityWeaponsComponent.razor

@@ -1,4 +1,9 @@
-@if (Entity!.Weapons().Count > 0)
+@inject IStorageService StorageService
+@using Services.Website
+@implements IDisposable
+
+
+@if (Entity!.Weapons().Count > 0)
 {
     @if (StyleType.Equals("Plain"))
     {
@@ -72,6 +77,7 @@
                     </div>
                 }
 
+
                 <div>
                     <b>- Targets:</b> @data.Targets
                 </div>
@@ -149,6 +155,7 @@
                         <div>
                             <b>Range:</b> @data.Range
                         </div>
+
                         @if (data.SecondsBetweenAttacks > 0)
                         {
                             <div>
@@ -233,4 +240,22 @@
     [CascadingParameter]
     public string StyleType { get; set; } = "Detailed";
 
+    private bool _isDynamicFormatting = false;
+
+    protected override void OnInitialized()
+    {
+        StorageService.Subscribe(RefreshDefaults);
+    }
+
+
+    void RefreshDefaults()
+    {
+        _isDynamicFormatting = StorageService.GetValue<bool>(StorageKeys.IsDynamicFormatting);
+    }
+
+    void IDisposable.Dispose()
+    {
+        StorageService.Unsubscribe(RefreshDefaults);
+    }
+
 }

IGP/Pages/Database/Parts/EntityFilterComponent.razor

@@ -9,7 +9,11 @@
                     {
                         styleClass = "selected";
                     }
-                    <button @onclick="@(e => OnChangeFaction(choice))" class="choiceButton @styleClass">@choice</button>
+                    <button @onclick="@(e => OnChangeFaction(choice))" 
+                            class="choiceButton @styleClass">@(choice == DataType.Any 
+                                                                 ? DataType.Any 
+                                                                 : DATA.Get()[choice].Info().Name)
+                        </button>
                 }
             </div>
 

IGP/Pages/StoragePage.razor

@@ -19,9 +19,21 @@
             <FormLayoutComponent>
                 <FormToggleComponent
                     Label="Is Plain View"
+                    Info="Should Entity view be in plain text?"
                     Value="@_isEntityPlainView"
                     OnChange="EntityViewChanged"/>
             </FormLayoutComponent>
+
+            <DevOnlyComponent>
+                <FormLayoutComponent>
+                           <FormToggleComponent
+                               Label="Is Dynamic Formatting"
+                               Info="Should [Attacks Per Second/Seconds Between Attack] match in-game values?"
+                               Value="@_isDynamicFormatting"
+                               OnChange="DynamicFormattingChanged"/>
+                       </FormLayoutComponent>     
+            </DevOnlyComponent>
+           
         </PaperComponent>
 
         <PaperComponent>
@@ -51,60 +63,72 @@
                         }
                     </FormInfoComponent>
                 </FormNumberComponent>
-                
+
                 <FormSelectComponent OnChange="@OnFactionChanged">
                     <FormLabelComponent>Faction</FormLabelComponent>
                     <ChildContent>
-                        <option value="@DataType.FACTION_Aru" 
+                        <option value="@DataType.FACTION_Aru"
-                                selected="@(Faction.Equals(DataType.FACTION_Aru))">Aru</option>
+                                selected="@(Faction.Equals(DataType.FACTION_Aru))">
-                        <option value="@DataType.FACTION_QRath" 
+                            Aru
-                                selected="@(Faction.Equals(DataType.FACTION_QRath))">Q'Rath</option>
+                        </option>
+                        <option value="@DataType.FACTION_QRath"
+                                selected="@(Faction.Equals(DataType.FACTION_QRath))">
+                            Q'Rath
+                        </option>
                     </ChildContent>
                 </FormSelectComponent>
-                
-                <FormSelectComponent OnChange="@OnImmortalChanged">
-                        <FormLabelComponent>Immortal</FormLabelComponent>
-                        <ChildContent>
-                            @if (Faction == DataType.FACTION_QRath)
-                            {
-                                <option value="@DataType.IMMORTAL_Orzum" 
-                                        selected="@(Immortal.Equals(DataType.IMMORTAL_Orzum))">Orzum</option>
-                                <option value="@DataType.IMMORTAL_Ajari"
-                                        selected="@(Immortal.Equals(DataType.IMMORTAL_Ajari))">Ajari</option>
-                            }
-                            @if (Faction == DataType.FACTION_Aru)
-                            {
-                                <option value="@DataType.IMMORTAL_Mala" 
-                                        selected="@(Immortal.Equals(DataType.IMMORTAL_Mala))">Mala</option>
-                                <option value="@DataType.IMMORTAL_Xol"
-                                        selected="@(Immortal.Equals(DataType.IMMORTAL_Xol))">Xol</option>
-                            }
-                        </ChildContent>
-                    </FormSelectComponent>
 
-                
+                <FormSelectComponent OnChange="@OnImmortalChanged">
-    <FormNumberComponent Max="600"
+                    <FormLabelComponent>Immortal</FormLabelComponent>
-                         Min="0"
+                    <ChildContent>
-                         Value="@(_buildingInputDelay == null ? 0 : (int)_buildingInputDelay)"
+                        @if (Faction == DataType.FACTION_QRath)
-                         OnChange="OnBuildingInputDelayChanged">
+                        {
-        <FormLabelComponent>Building Input Delay</FormLabelComponent>
+                            <option value="@DataType.IMMORTAL_Orzum"
-        <FormInfoComponent>Add a input delay to constructing buildings for simulating worker movement and player micro.</FormInfoComponent>
+                                    selected="@(Immortal.Equals(DataType.IMMORTAL_Orzum))">
-    </FormNumberComponent>
+                                Orzum
-            <FormNumberComponent Max="600"
+                            </option>
-                                 Min="1"
+                            <option value="@DataType.IMMORTAL_Ajari"
-                                 Value="@(_waitTime == null ? 0 : (int)_waitTime)"
+                                    selected="@(Immortal.Equals(DataType.IMMORTAL_Ajari))">
-                                 OnChange="@OnWaitTimeChanged">
+                                Ajari
-                <FormLabelComponent>Wait Time</FormLabelComponent>
+                            </option>
-            </FormNumberComponent>
+                        }
-        </FormLayoutComponent>
+                        @if (Faction == DataType.FACTION_Aru)
-        <FormLayoutComponent>
+                        {
-            <FormNumberComponent Max="2048"
+                            <option value="@DataType.IMMORTAL_Mala"
-                                 Min="1"
+                                    selected="@(Immortal.Equals(DataType.IMMORTAL_Mala))">
-                                 Value="@(_waitTo == null ? 0 : (int)_waitTo)"
+                                Mala
-                                 OnChange="@OnWaitToChanged">
+                            </option>
-                <FormLabelComponent>Wait To</FormLabelComponent>
+                            <option value="@DataType.IMMORTAL_Xol"
-            </FormNumberComponent>
+                                    selected="@(Immortal.Equals(DataType.IMMORTAL_Xol))">
-                
+                                Xol
+                            </option>
+                        }
+                    </ChildContent>
+                </FormSelectComponent>
+
+
+                <FormNumberComponent Max="600"
+                                     Min="0"
+                                     Value="@(_buildingInputDelay == null ? 0 : (int)_buildingInputDelay)"
+                                     OnChange="OnBuildingInputDelayChanged">
+                    <FormLabelComponent>Building Input Delay</FormLabelComponent>
+                    <FormInfoComponent>Add a input delay to constructing buildings for simulating worker movement and player micro.</FormInfoComponent>
+                </FormNumberComponent>
+                <FormNumberComponent Max="600"
+                                     Min="1"
+                                     Value="@(_waitTime == null ? 0 : (int)_waitTime)"
+                                     OnChange="@OnWaitTimeChanged">
+                    <FormLabelComponent>Wait Time</FormLabelComponent>
+                </FormNumberComponent>
+            </FormLayoutComponent>
+            <FormLayoutComponent>
+                <FormNumberComponent Max="2048"
+                                     Min="1"
+                                     Value="@(_waitTo == null ? 0 : (int)_waitTo)"
+                                     OnChange="@OnWaitToChanged">
+                    <FormLabelComponent>Wait To</FormLabelComponent>
+                </FormNumberComponent>
+
             </FormLayoutComponent>
         </PaperComponent>
     }
@@ -127,7 +151,7 @@
 
         StorageService.Subscribe(RefreshDefaults);
     }
-    
+
     void IDisposable.Dispose()
     {
         StorageService.Unsubscribe(RefreshDefaults);
@@ -138,28 +162,28 @@
 
     private string? _faction = null;
     private string? _immortal = null;
-    
+
     private string? Faction => _faction == null ? DataType.FACTION_QRath : _faction;
     private string? Immortal => _immortal == null ? DataType.IMMORTAL_Orzum : _immortal;
 
-    
 
     private int? _buildingInputDelay;
     private int? _waitTime;
     private int? _waitTo;
 
 
-    
     void RefreshDefaults()
     {
         _isEntityPlainView = StorageService.GetValue<bool>(StorageKeys.IsPlainView);
+        _isDynamicFormatting = StorageService.GetValue<bool>(StorageKeys.IsDynamicFormatting);
+
         _attackTime = StorageService.GetValue<int?>(StorageKeys.AttackTime);
         _travelTime = StorageService.GetValue<int?>(StorageKeys.TravelTime);
-        
+
-        
+
         _faction = StorageService.GetValue<string?>(StorageKeys.SelectedFaction);
         _immortal = StorageService.GetValue<string?>(StorageKeys.SelectedImmortal);
-        
+
         _buildingInputDelay = StorageService.GetValue<int?>(StorageKeys.BuildInputDelay);
         _waitTime = StorageService.GetValue<int?>(StorageKeys.WaitTime);
         _waitTo = StorageService.GetValue<int?>(StorageKeys.WaitTo);
@@ -168,12 +192,18 @@
     }
 
     private bool _isEntityPlainView;
+    private bool _isDynamicFormatting;
 
     private void EntityViewChanged(ChangeEventArgs obj)
     {
         StorageService.SetValue(StorageKeys.IsPlainView, obj.Value);
     }
 
+    private void DynamicFormattingChanged(ChangeEventArgs obj)
+    {
+        StorageService.SetValue(StorageKeys.IsDynamicFormatting, obj.Value);
+    }
+
     private void AttackTimeChanged(ChangeEventArgs obj)
     {
         StorageService.SetValue(StorageKeys.AttackTime, obj.Value);
@@ -193,6 +223,7 @@
     {
         StorageService.SetValue(StorageKeys.SelectedImmortal, obj.Value);
     }
+
     private void OnBuildingInputDelayChanged(ChangeEventArgs obj)
     {
         StorageService.SetValue(StorageKeys.BuildInputDelay, obj.Value);
@@ -202,7 +233,7 @@
     {
         StorageService.SetValue(StorageKeys.WaitTime, obj.Value);
     }
-    
+
     private void OnWaitToChanged(ChangeEventArgs obj)
     {
         StorageService.SetValue(StorageKeys.WaitTo, obj.Value);

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","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","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","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","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","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","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":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"}]

Services/Website/StorageService.cs

@@ -8,6 +8,7 @@ public class StorageKeys
     public static string EnabledStorage = "StorageEnabled";
     public static string EnabledDataCollection = "StorageDataCollection";
     public static string IsPlainView { get; set; } = "IsPlainView";
+    public static string IsDynamicFormatting { get; set; } = "IsDynamicFormatting";
     public static string AttackTime { get; set; } = "AttackTime";
     public static string TravelTime { get; set; } = "TravelTime";
     public static string SelectedFaction { get; set; } = "SelectedFaction";