From 071d2f5e35d1df8061e0010fd6fb2dcc9c99febb Mon Sep 17 00:00:00 2001 From: Jonathan Date: Thu, 12 Jun 2025 00:06:39 -0400 Subject: [PATCH] More data fixes and added a bunch of disclaimers --- IGP/Pages/DataTables/DataTablesPage.razor | 8 +++++ IGP/Pages/Database/DatabasePage.razor | 7 +++++ IGP/Pages/Database/DatabaseSinglePage.razor | 9 ++++++ .../Parts/EntityFilterComponent.razor | 1 + IGP/Pages/HarassCalculatorPage.razor | 7 +++++ Model/Entity/Data/DATA.cs | 31 +++---------------- Model/Entity/Data/Ids_Entity.cs | 1 - Services/Immortal/EntityFilterService.cs | 1 + 8 files changed, 37 insertions(+), 28 deletions(-) diff --git a/IGP/Pages/DataTables/DataTablesPage.razor b/IGP/Pages/DataTables/DataTablesPage.razor index 4352934..0d2db5f 100644 --- a/IGP/Pages/DataTables/DataTablesPage.razor +++ b/IGP/Pages/DataTables/DataTablesPage.razor @@ -6,6 +6,14 @@ Data Tables + + + Errors Present + + Incomplete feature for easily comparing unit stats. + + + diff --git a/IGP/Pages/Database/DatabasePage.razor b/IGP/Pages/Database/DatabasePage.razor index ed7449f..2a10057 100644 --- a/IGP/Pages/Database/DatabasePage.razor +++ b/IGP/Pages/Database/DatabasePage.razor @@ -10,6 +10,13 @@ Database + + Errors Present + + Database information was quickly updated to the June 2025 Playtest. Expect a lot of errors in the data. + + + diff --git a/IGP/Pages/Database/DatabaseSinglePage.razor b/IGP/Pages/Database/DatabaseSinglePage.razor index 82c0282..45a0e7d 100644 --- a/IGP/Pages/Database/DatabaseSinglePage.razor +++ b/IGP/Pages/Database/DatabaseSinglePage.razor @@ -10,6 +10,15 @@ + + + Errors Present + + Database information was quickly updated to the June 2025 Playtest. Expect a lot of errors in the data. + + + + diff --git a/IGP/Pages/Database/Parts/EntityFilterComponent.razor b/IGP/Pages/Database/Parts/EntityFilterComponent.razor index 7a5b6bc..e72514b 100644 --- a/IGP/Pages/Database/Parts/EntityFilterComponent.razor +++ b/IGP/Pages/Database/Parts/EntityFilterComponent.razor @@ -71,6 +71,7 @@ Immortal + diff --git a/IGP/Pages/HarassCalculatorPage.razor b/IGP/Pages/HarassCalculatorPage.razor index 6058925..7769c6c 100644 --- a/IGP/Pages/HarassCalculatorPage.razor +++ b/IGP/Pages/HarassCalculatorPage.razor @@ -8,6 +8,13 @@ Harass Calculator + + + Might be out of date + + This calculation is from several years ago and might not reflect the current state of the game. + + Credit to Zard for deriving the formula. diff --git a/Model/Entity/Data/DATA.cs b/Model/Entity/Data/DATA.cs index 412ee70..0ff1634 100644 --- a/Model/Entity/Data/DATA.cs +++ b/Model/Entity/Data/DATA.cs @@ -697,7 +697,7 @@ public abstract class DATA { DataType.VANGUARD_RootShepard_Atzlan, new EntityModel(DataType.VANGUARD_RootShepard_Atzlan, EntityType.Army) - .AddPart(new EntityInfoModel { Name = "Bone Stalker", Descriptive = DescriptiveType.Skirmisher }) + .AddPart(new EntityInfoModel { Name = "Root Shepard", Descriptive = DescriptiveType.Skirmisher }) .AddPart(new EntityTierModel { Tier = 2 }) .AddPart(new EntityRequirementModel { @@ -740,6 +740,8 @@ public abstract class DATA }) .AddPart(new EntityHotkeyModel { Hotkey = "F", HotkeyGroup = "Z" }) .AddPart(new EntityFactionModel { Faction = DataType.FACTION_Aru }) + .AddPart(new EntityVanguardAddedModel + { ReplaceId = DataType.UNIT_BloodAnchor, ImmortalId = DataType.IMMORTAL_Atzlan }) .AddPart(new EntityProductionModel { Alloy = 150, Ether = 125, BuildTime = 32, ProducedBy = DataType.BUILDING_AmberWomb }) .AddPart(new EntitySupplyModel { Takes = 6 }) @@ -1261,7 +1263,6 @@ public abstract class DATA HeavyDamage = 5 }) .AddPart(new EntityIdUpgradeModel { Id = DataType.UPGRADE_Offering }) - .AddPart(new EntityIdUpgradeModel { Id = DataType.UPGRADE_BloodMothersFevor }) .AddPart(new EntityIdPassiveModel { Id = DataType.ABILITY_Offering }) }, { @@ -1911,28 +1912,6 @@ public abstract class DATA .AddPart(new EntityProductionModel { Alloy = 100, Ether = 75, BuildTime = 60, ProducedBy = DataType.BUILDING_Neurocyte }) }, - { - DataType.UPGRADE_BloodMothersFevor, - new EntityModel(DataType.UPGRADE_BloodMothersFevor, EntityType.Tech) - .AddPart(new EntityInfoModel - { Name = "Blood Mother's Fevor", Descriptive = DescriptiveType.Upgrade }) - .AddPart(new EntityHotkeyModel { Hotkey = "CAPSLOCK", HotkeyGroup = "X" }) - .AddPart(new EntityFactionModel { Faction = DataType.FACTION_Aru }) - .AddPart(new EntityVanguardReplacedModel - { ImmortalId = DataType.IMMORTAL_Xol, ReplacedById = DataType.UPGRADE_Ambush }) - .AddPart(new EntityRequirementModel - { - Id = DataType.BUILDING_RedVale, - Requirement = RequirementType.Research_Building - }) - .AddPart(new EntityRequirementModel - { - Id = DataType.BUILDING_AltarOfTheWorthy, - Requirement = RequirementType.Research_Building - }) - .AddPart(new EntityProductionModel - { Alloy = 100, Ether = 150, BuildTime = 100, ProducedBy = DataType.BUILDING_RedVale }) - }, { DataType.UPGRADE_PursuitLigaments, new EntityModel(DataType.UPGRADE_PursuitLigaments, EntityType.Tech) @@ -2163,8 +2142,6 @@ public abstract class DATA Id = DataType.BUILDING_RedVale, Requirement = RequirementType.Research_Building }) - .AddPart(new EntityVanguardAddedModel - { ReplaceId = DataType.UPGRADE_BloodMothersFevor, ImmortalId = DataType.IMMORTAL_Xol }) }, { DataType.UPGRADE_BloodPlague, @@ -4010,7 +3987,7 @@ public abstract 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 = "CAPSLOCK", HotkeyGroup = "C" }) + .AddPart(new EntityHotkeyModel { Hotkey = "TAB", HotkeyGroup = "C" }) .AddPart(new EntityFactionModel { Faction = DataType.FACTION_Aru }) .AddPart(new EntityProductionModel { Alloy = 225, BuildTime = 30, RequiresWorker = true }) .AddPart(new EntityVitalityModel diff --git a/Model/Entity/Data/Ids_Entity.cs b/Model/Entity/Data/Ids_Entity.cs index 3b5bc62..2eb999e 100644 --- a/Model/Entity/Data/Ids_Entity.cs +++ b/Model/Entity/Data/Ids_Entity.cs @@ -134,7 +134,6 @@ public static class DataType public static string UPGRADE_TitheBlades = nameof(UPGRADE_TitheBlades); public static string UPGRADE_Offering = nameof(UPGRADE_Offering); - public static string UPGRADE_BloodMothersFevor = nameof(UPGRADE_BloodMothersFevor); public static string UPGRADE_PursuitLigaments = nameof(UPGRADE_PursuitLigaments); public static string UPGRADE_EthericFibers = nameof(UPGRADE_EthericFibers); public static string UPGRADE_ObstructingSwarm = nameof(UPGRADE_ObstructingSwarm); diff --git a/Services/Immortal/EntityFilterService.cs b/Services/Immortal/EntityFilterService.cs index 8b623fb..4b3681d 100644 --- a/Services/Immortal/EntityFilterService.cs +++ b/Services/Immortal/EntityFilterService.cs @@ -157,6 +157,7 @@ public class EntityFilterService : IEntityFilterService if (_selectedFaction == DataType.FACTION_Aru || _selectedFaction == DataType.Any) { + _immortalChoices.Add(DataType.IMMORTAL_Atzlan); _immortalChoices.Add(DataType.IMMORTAL_Mala); _immortalChoices.Add(DataType.IMMORTAL_Xol); }