diff --git a/Components/Inputs/EntityLabelComponent.razor b/Components/Inputs/EntityLabelComponent.razor index 5bd3f86..c2e166b 100644 --- a/Components/Inputs/EntityLabelComponent.razor +++ b/Components/Inputs/EntityLabelComponent.razor @@ -7,26 +7,24 @@ @inject IEntityDialogService entityDialogService -@if (entity == null) +@if (EntityId == null) {
Add a entity
} else { - + } @code { [Parameter] public string EntityId { get; set; } - private EntityModel entity = null; - + private EntityModel Entity => DATA.Get()[EntityId]; + protected override void OnInitialized() { - entity = DATA.Get()[EntityId]; - Console.Write(entity.Info().Name); - + Console.Write(Entity.Info().Name); } void EntityLabelClicked() diff --git a/IGP/Database.db b/IGP/Database.db index cb5f4da..4443386 100644 Binary files a/IGP/Database.db and b/IGP/Database.db differ diff --git a/IGP/Dialog/EntityDialogComponent.razor b/IGP/Dialog/EntityDialogComponent.razor index 00bd483..da32e18 100644 --- a/IGP/Dialog/EntityDialogComponent.razor +++ b/IGP/Dialog/EntityDialogComponent.razor @@ -1,14 +1,8 @@ @implements IDisposable; - @inject IEntityDialogService entityDialogService -
- @{ - var entity = DATA.Get()[entityDialogService.GetEntityId()]; - } -
@@ -22,7 +16,6 @@ @if (entityDialogService.HasHistory()) { } @@ -33,19 +26,21 @@
-
- - - - - - - - - - - -
+ + + + + + + + + + + + + + +
@@ -140,9 +135,15 @@ @code { + + EntityModel entity = null; + + private int refresh = 0; protected override void OnInitialized() { + entity = DATA.Get()[entityDialogService.GetEntityId()]; + entityDialogService.Subscribe(OnUpdate); } @@ -152,10 +153,13 @@ void OnUpdate() { + entity = DATA.Get()[entityDialogService.GetEntityId()]; + refresh++; + + Console.WriteLine("OnUpdate()"); StateHasChanged(); } - public void CloseDialog() { entityDialogService.CloseDialog(); diff --git a/IGP/Index.razor b/IGP/Index.razor index df7aea2..a681dc2 100644 --- a/IGP/Index.razor +++ b/IGP/Index.razor @@ -2,7 +2,4 @@ @layout PageLayout - - - - + \ No newline at end of file diff --git a/IGP/Pages/Database/DatabasePage.razor b/IGP/Pages/Database/DatabasePage.razor index 984e59a..b0625c6 100644 --- a/IGP/Pages/Database/DatabasePage.razor +++ b/IGP/Pages/Database/DatabasePage.razor @@ -21,7 +21,9 @@ @if (searches != null) {
@foreach (var entity in searches) { - + + + }
} diff --git a/IGP/Pages/Database/Entity/EntityViewComponent.razor b/IGP/Pages/Database/Entity/EntityViewComponent.razor index c06d70d..68ea6a8 100644 --- a/IGP/Pages/Database/Entity/EntityViewComponent.razor +++ b/IGP/Pages/Database/Entity/EntityViewComponent.razor @@ -2,21 +2,23 @@ var isVanguard = Entity.VanguardAdded() != null ? " vanguard" : "";
- + -
- - - - - - - - - - - -
+ +
+ + + + + + + + + + + +
+
} @@ -48,8 +50,6 @@ @code { - - [Parameter] - public EntityModel Entity { get; set; } - + [CascadingParameter] + public EntityModel? Entity { get; set; } } \ No newline at end of file diff --git a/IGP/Pages/Database/Entity/Parts/EntityAbilitiesComponent.razor b/IGP/Pages/Database/Entity/Parts/EntityAbilitiesComponent.razor index 46c169d..788e645 100644 --- a/IGP/Pages/Database/Entity/Parts/EntityAbilitiesComponent.razor +++ b/IGP/Pages/Database/Entity/Parts/EntityAbilitiesComponent.razor @@ -47,7 +47,8 @@ @code { - [Parameter] - public EntityModel Entity { get; set; } + [CascadingParameter] + public EntityModel? Entity { get; set; } + } \ No newline at end of file diff --git a/IGP/Pages/Database/Entity/Parts/EntityHeaderComponent.razor b/IGP/Pages/Database/Entity/Parts/EntityHeaderComponent.razor index 1727ab5..f6e8e97 100644 --- a/IGP/Pages/Database/Entity/Parts/EntityHeaderComponent.razor +++ b/IGP/Pages/Database/Entity/Parts/EntityHeaderComponent.razor @@ -40,7 +40,7 @@ @code { - [Parameter] - public EntityModel Entity { get; set; } + [CascadingParameter] + public EntityModel? Entity { get; set; } } \ No newline at end of file diff --git a/IGP/Pages/Database/Entity/Parts/EntityInfoComponent.razor b/IGP/Pages/Database/Entity/Parts/EntityInfoComponent.razor index 97c01f7..54fa49d 100644 --- a/IGP/Pages/Database/Entity/Parts/EntityInfoComponent.razor +++ b/IGP/Pages/Database/Entity/Parts/EntityInfoComponent.razor @@ -5,6 +5,13 @@
} + @if (Entity.Info().Notes != "") { +
+ Notes: @((MarkupString)Entity.Info().Notes) +
+ } + +
@if (Entity.Faction() != null) { @@ -51,7 +58,7 @@ @code { - [Parameter] - public EntityModel Entity { get; set; } + [CascadingParameter] + public EntityModel? Entity { get; set; } } \ No newline at end of file diff --git a/IGP/Pages/Database/Entity/Parts/EntityMechanicsComponent.razor b/IGP/Pages/Database/Entity/Parts/EntityMechanicsComponent.razor index bd5af69..0810cbc 100644 --- a/IGP/Pages/Database/Entity/Parts/EntityMechanicsComponent.razor +++ b/IGP/Pages/Database/Entity/Parts/EntityMechanicsComponent.razor @@ -21,7 +21,7 @@ @code { - [Parameter] - public EntityModel Entity { get; set; } + [CascadingParameter] + public EntityModel? Entity { get; set; } } \ No newline at end of file diff --git a/IGP/Pages/Database/Entity/Parts/EntityPassivesComponent.razor b/IGP/Pages/Database/Entity/Parts/EntityPassivesComponent.razor index afb9ea6..02ac0b9 100644 --- a/IGP/Pages/Database/Entity/Parts/EntityPassivesComponent.razor +++ b/IGP/Pages/Database/Entity/Parts/EntityPassivesComponent.razor @@ -44,7 +44,7 @@ @code { - [Parameter] - public EntityModel Entity { get; set; } + [CascadingParameter] + public EntityModel? Entity { get; set; } } \ No newline at end of file diff --git a/IGP/Pages/Database/Entity/Parts/EntityProductionComponent.razor b/IGP/Pages/Database/Entity/Parts/EntityProductionComponent.razor index 0a3e4ae..0af9893 100644 --- a/IGP/Pages/Database/Entity/Parts/EntityProductionComponent.razor +++ b/IGP/Pages/Database/Entity/Parts/EntityProductionComponent.razor @@ -1,76 +1,70 @@ -@{ - var production = Entity.Production(); - var supply = Entity.Supply(); - var requirements = Entity.Requirements(); -} - -@if (production != null || supply != null || requirements.Count > 0) { +@if (@Production != null || Supply != null || Requirements.Count > 0) { -
- @if (requirements.Count() > 0) { +
+ @if (Requirements.Count() > 0) {
- @foreach (var requirement in requirements) { + @foreach (var requirement in Requirements) {
- @requirement.Requirement.Replace("_", " "): + @requirement.Requirement.Replace("_", " "):
}
} - @if (production != null && (!production.Alloy.Equals(0) - || !production.Ether.Equals(0) - || !production.BuildTime.Equals(0) - || !production.Cooldown.Equals(0))) { + @if (Production != null && (!Production.Alloy.Equals(0) + || !Production.Ether.Equals(0) + || !Production.BuildTime.Equals(0) + || !Production.Cooldown.Equals(0))) {
- @if (!production.Alloy.Equals(0)) { + @if (!Production.Alloy.Equals(0)) {
- Alloy: @production.Alloy + Alloy: @Production.Alloy
} - @if (!production.Ether.Equals(0)) { + @if (!Production.Ether.Equals(0)) {
- Ether: @production.Ether + Ether: @Production.Ether
} - @if (!production.Pyre.Equals(0)) { + @if (!Production.Pyre.Equals(0)) {
- Pyre: @production.Pyre + Pyre: @Production.Pyre
} - @if (!production.BuildTime.Equals(0)) { + @if (!Production.BuildTime.Equals(0)) {
- Build Time: @production.BuildTime.ToString()s + Build Time: @Production.BuildTime.ToString()s
} - @if (!production.Energy.Equals(0)) { + @if (!Production.Energy.Equals(0)) {
- Energy: @production.Energy + Energy: @Production.Energy
} - @if (!production.Cooldown.Equals(0)) { + @if (!Production.Cooldown.Equals(0)) {
- Cooldown: @production.Cooldown.ToString()s + Cooldown: @Production.Cooldown.ToString()s
}
} - @if (supply != null) { + @if (Supply != null) {
- @if (!supply.Grants.Equals(0)) { + @if (!Supply.Grants.Equals(0)) {
- Grants: @supply.Grants + Grants: @Supply.Grants
} - @if (!supply.Takes.Equals(0)) { + @if (!Supply.Takes.Equals(0)) {
- Takes: @supply.Takes Supply + Takes: @Supply.Takes Supply
}
@@ -80,13 +74,13 @@ } @code { + [CascadingParameter] + public EntityModel? Entity { get; set; } - [Parameter] - public EntityModel Entity { get; set; } - + private EntityVitalityModel Vitality => Entity.Vitality(); + private EntityMovementModel Movement => Entity.Movement(); } \ No newline at end of file diff --git a/IGP/Pages/Database/Entity/Parts/EntityUpgradesComponent.razor b/IGP/Pages/Database/Entity/Parts/EntityUpgradesComponent.razor index 51707d9..71522f8 100644 --- a/IGP/Pages/Database/Entity/Parts/EntityUpgradesComponent.razor +++ b/IGP/Pages/Database/Entity/Parts/EntityUpgradesComponent.razor @@ -32,7 +32,7 @@ @code { - [Parameter] - public EntityModel Entity { get; set; } + [CascadingParameter] + public EntityModel? Entity { get; set; } } \ No newline at end of file diff --git a/IGP/Pages/Database/Entity/Parts/EntityVanguardAddedComponent.razor b/IGP/Pages/Database/Entity/Parts/EntityVanguardAddedComponent.razor index 9e9174b..f21336d 100644 --- a/IGP/Pages/Database/Entity/Parts/EntityVanguardAddedComponent.razor +++ b/IGP/Pages/Database/Entity/Parts/EntityVanguardAddedComponent.razor @@ -24,8 +24,8 @@ } @code { - - [Parameter] - public EntityModel Entity { get; set; } + [CascadingParameter] + public EntityModel? Entity { get; set; } + } \ No newline at end of file diff --git a/IGP/Pages/Database/Entity/Parts/EntityVanguardsComponent.razor b/IGP/Pages/Database/Entity/Parts/EntityVanguardsComponent.razor index 2a5b821..1947727 100644 --- a/IGP/Pages/Database/Entity/Parts/EntityVanguardsComponent.razor +++ b/IGP/Pages/Database/Entity/Parts/EntityVanguardsComponent.razor @@ -26,7 +26,7 @@ @code { - [Parameter] - public EntityModel Entity { get; set; } - + [CascadingParameter] + public EntityModel? Entity { get; set; } + } \ No newline at end of file diff --git a/IGP/Pages/Database/Entity/Parts/EntityWeaponsComponent.razor b/IGP/Pages/Database/Entity/Parts/EntityWeaponsComponent.razor index 4cbd5ac..1367a47 100644 --- a/IGP/Pages/Database/Entity/Parts/EntityWeaponsComponent.razor +++ b/IGP/Pages/Database/Entity/Parts/EntityWeaponsComponent.razor @@ -108,7 +108,7 @@ @code { - [Parameter] - public EntityModel Entity { get; set; } - + [CascadingParameter] + public EntityModel? Entity { get; set; } + } \ No newline at end of file diff --git a/IGP/wwwroot/generated/SprintModels.json b/IGP/wwwroot/generated/SprintModels.json index 3123b8d..9f46454 100644 --- a/IGP/wwwroot/generated/SprintModels.json +++ b/IGP/wwwroot/generated/SprintModels.json @@ -1 +1 @@ -[{"Id":1,"Name":"Agile Sprint","Description":"Changelogs and sprint views were going to be pushed till later, but I am feeling inspired by the IGP Content Creators\u0027 minimum weekly lifecycle requirement. So I am going to focus on agile-related tasks, and handle roadmap tasks after this initial sprint. All weekly sprints will release on Sunday, starting next Sunday.","StartDate":"2022-02-14T00:00:00","EndDate":"2022-02-20T00:00:00","Notes":null},{"Id":2,"Name":"SQL Update","Description":"The SQL update is big enough to be a full sprint in of itself, and I spent less time this week for development. Will just extend sprint by 2 week, and remove all non SQL tasks from the sprint.","StartDate":"2022-02-20T00:00:00","EndDate":"2022-03-27T00:00:00","Notes":null},{"Id":3,"Name":"Database Page","Description":"Improvements to the Database page","StartDate":"2022-03-27T00:00:00","EndDate":"2022-04-03T00:00:00","Notes":null}] \ No newline at end of file +[{"Id":1,"Name":"Agile Sprint","Description":"Changelogs and sprint views were going to be pushed till later, but I am feeling inspired by the IGP Content Creators\u0027 minimum weekly lifecycle requirement. So I am going to focus on agile-related tasks, and handle roadmap tasks after this initial sprint. All weekly sprints will release on Sunday, starting next Sunday.","StartDate":"2022-02-14T00:00:00","EndDate":"2022-02-20T00:00:00","Notes":null},{"Id":2,"Name":"SQL Update","Description":"The SQL update is big enough to be a full sprint in of itself, and I spent less time this week for development. Will just extend sprint by 2 week, and remove all non SQL tasks from the sprint.","StartDate":"2022-02-20T00:00:00","EndDate":"2022-03-27T00:00:00","Notes":null},{"Id":3,"Name":"Database Page","Description":"Improvements to the Database page","StartDate":"2022-03-27T00:00:00","EndDate":"2022-04-03T00:00:00","Notes":null},{"Id":4,"Name":"Branding","Description":"Improve streaming branding around the website","StartDate":"2022-04-03T00:00:00","EndDate":"2022-04-10T00:00:00","Notes":null}] \ No newline at end of file diff --git a/IGP/wwwroot/generated/TaskModels.json b/IGP/wwwroot/generated/TaskModels.json index 884ad64..c14d608 100644 --- a/IGP/wwwroot/generated/TaskModels.json +++ b/IGP/wwwroot/generated/TaskModels.json @@ -1 +1 @@ -[{"Id":1,"SprintModelId":null,"Name":"Support Safari","Description":"Consider other web browsers.","Notes":"Added","Status":"Todo","Priority":"Low","Task":"Feature","Project":"Management","Created":"2022-02-20T00:00:00","Finished":"2022-02-20T00:00:00"},{"Id":2,"SprintModelId":2,"Name":"Filter Patch Notes","Description":"You should be showing people what they really want to see in the patch notes.","Notes":"Added","Status":"Done","Priority":"Blocker","Task":"Feature","Project":"Management","Created":"2022-02-20T00:00:00","Finished":"2022-02-20T00:00:00"},{"Id":3,"SprintModelId":null,"Name":"Consider Pyre","Description":"Add Pyre Income. Make it so you can take Pyre Camps and Pyre Miners","Notes":"Add notes...","Status":"In_Progress","Priority":"Medium","Task":"Feature","Project":"Management","Created":"2022-02-20T00:00:00","Finished":null},{"Id":4,"SprintModelId":null,"Name":"Optimizations","Description":"Build Calculator should be usable.","Notes":"Add notes...","Status":"Todo","Priority":"Medium","Task":"Feature","Project":"Management","Created":"2022-02-20T00:00:00","Finished":null},{"Id":5,"SprintModelId":null,"Name":"Change Attack Timing Interval","Description":"Be able to sett attack timing.","Notes":"Add notes...","Status":"Todo","Priority":"Medium","Task":"Feature","Project":"Management","Created":"2022-02-20T00:00:00","Finished":null},{"Id":6,"SprintModelId":null,"Name":"Add Pyre Spells","Description":"Make Pyre Spells castable and consume Pyre on build order","Notes":"Add notes...","Status":"In_Progress","Priority":"Medium","Task":"Feature","Project":"Management","Created":"2022-02-20T00:00:00","Finished":null},{"Id":7,"SprintModelId":null,"Name":"Default builds (Rush Thrones)","Description":"Add a dropdown list of default builds.","Notes":"Add notes...","Status":"Todo","Priority":"Medium","Task":"Feature","Project":"Management","Created":"2022-02-20T00:00:00","Finished":null},{"Id":8,"SprintModelId":null,"Name":"Load older builds","Description":"Be able to load older builds. How are you going to handle auto correct to current patch?","Notes":"Add notes...","Status":"Todo","Priority":"Medium","Task":"Feature","Project":"Management","Created":"2022-02-20T00:00:00","Finished":null},{"Id":9,"SprintModelId":null,"Name":"How to use Build Calculator step by step","Description":"Need docs","Notes":"Add notes...","Status":"Todo","Priority":"Medium","Task":"Feature","Project":"Management","Created":"2022-02-20T00:00:00","Finished":null},{"Id":10,"SprintModelId":null,"Name":"Compare Health and Damage","Description":"Refer to community example spreadsheet.","Notes":"Add notes...","Status":"Todo","Priority":"Medium","Task":"Feature","Project":"Management","Created":"2022-02-20T00:00:00","Finished":null},{"Id":11,"SprintModelId":null,"Name":"Compare Unit\u0027s Damage with it\u0027s own costs","Description":"Refer to community example spreadsheet.","Notes":"Add notes...","Status":"Todo","Priority":"Medium","Task":"Feature","Project":"Management","Created":"2022-02-20T00:00:00","Finished":null},{"Id":12,"SprintModelId":null,"Name":"View one unit stats from a link. Make YAML copy and paste","Description":"Design so people can easily copy and paste data into discord","Notes":"Lame. Not currently supported in Blazor. I could automate up a solution, or just manually implement the url parsing, but probably best to wait","Status":"Todo","Priority":"Medium","Task":"Feature","Project":"Management","Created":"2022-02-20T00:00:00","Finished":null},{"Id":13,"SprintModelId":2,"Name":"Look into SQL","Description":"You really should be using SQL.","Notes":"Agile and Change log pages now use SQL","Status":"Done","Priority":"Medium","Task":"Feature","Project":"Management","Created":"2022-02-20T00:00:00","Finished":null},{"Id":14,"SprintModelId":1,"Name":"Mobile Menu","Description":"You need a real mobile menu. Viewers don\u0027t scroll below the fold, so no one is going to know what happens when you click a button on phones.","Notes":"Added smaller menus for tablets and phones.","Status":"Done","Priority":"High","Task":"Feature","Project":"Management","Created":"2022-02-18T00:00:00","Finished":"2022-02-19T00:00:00"},{"Id":15,"SprintModelId":2,"Name":"Acropolis Consume Mote","Description":"The Mote is suppose to be consumed when making a Town Hall.","Notes":"Fixed","Status":"Done","Priority":"High","Task":"Bug","Project":"Management","Created":"2022-02-18T00:00:00","Finished":"2022-02-20T00:00:00"},{"Id":16,"SprintModelId":null,"Name":"Multiple Travel Time in Calculator","Description":"Travel time should be based on the amount of bases used. 3 bases is 3 travel times.","Notes":"Add notes...","Status":"Todo","Priority":"Low","Task":"Feature","Project":"Management","Created":"2022-02-18T00:00:00","Finished":null},{"Id":17,"SprintModelId":1,"Name":"Update Database to 0.0.6.8375a","Description":"Xacal tech change, and Hallower damage change. Update Godhead text.","Notes":"Done","Status":"Done","Priority":"None","Task":"Feature","Project":"Management","Created":"2022-02-18T00:00:00","Finished":"2022-02-18T00:00:00"},{"Id":18,"SprintModelId":null,"Name":"Patch History Viewer","Description":"Add an ability to compare patches, to see all nerfs and buffs made between them.","Notes":"Inspired by Zkay\u0027s post on discord, where he details a possible \u0027patch history viewer\u0027 implementation.","Status":"Fun_Idea","Priority":"None","Task":"Feature","Project":"Management","Created":"2022-02-16T00:00:00","Finished":null},{"Id":19,"SprintModelId":1,"Name":"Twitch Page","Description":"Did a ~3 hour test stream, and was personal quite happy with the quality. Make Twitch page, and stream patch, sprint planning and development on Sunday.","Notes":"Page added under General, and named \u0022Streams\u0022.","Status":"Done","Priority":"Medium","Task":"Feature","Project":"Management","Created":"2022-02-16T00:00:00","Finished":"2022-02-16T00:00:00"},{"Id":20,"SprintModelId":1,"Name":"Finish the database","Description":"Add more descriptions for everything. Reduce any data duplication with ids. Add upgrade connections. Add ability connections. Add passives and passives connections.","Notes":"Good enough for now","Status":"Done","Priority":"Medium","Task":"Feature","Project":"Management","Created":"2022-02-11T00:00:00","Finished":"2022-02-19T00:00:00"},{"Id":21,"SprintModelId":1,"Name":"Change Log View","Description":"Add a log to view last changes.","Notes":"Added changelog page. Shows Today, X Days Ago, or exact date if patch is over a week old.","Status":"Done","Priority":"Medium","Task":"Feature","Project":"Management","Created":"2022-02-14T00:00:00","Finished":"2022-02-14T00:00:00"},{"Id":22,"SprintModelId":1,"Name":"Agile View","Description":"Add the agile view.","Notes":"Finished.","Status":"Done","Priority":"Medium","Task":"Feature","Project":"Management","Created":"2022-02-11T00:00:00","Finished":"2022-02-17T00:00:00"},{"Id":23,"SprintModelId":1,"Name":"GUID for Ids","Description":"Stop using enums for ids, and start using guids. Enums are just too limited, I lose out on component and inheritance design with them. Replace all your enums with guids, rip off the bandaid.","Notes":"Add notes...","Status":"Done","Priority":"Medium","Task":"Feature","Project":"Management","Created":"2022-02-11T00:00:00","Finished":"2022-02-18T00:00:00"},{"Id":24,"SprintModelId":1,"Name":"Co-op overview","Description":"Write some sort of blog on co-op gameplay so you have something the feels very content-ish. Maybe make it a video.","Notes":"Finished and released early.","Status":"Done","Priority":"Medium","Task":"Feature","Project":"Management","Created":"2022-02-11T00:00:00","Finished":"2022-02-12T00:00:00"},{"Id":25,"SprintModelId":1,"Name":"Mobile UI","Description":"Make website work on mobile.","Notes":"Should be good. Will test on phone later.","Status":"Done","Priority":"Medium","Task":"Feature","Project":"Management","Created":"2022-02-15T00:00:00","Finished":"2022-02-18T00:00:00"},{"Id":26,"SprintModelId":1,"Name":"Add Making Of View","Description":"View to reference UI designs. Nicely encourages the pratice of making the UI code a lot cleaner.","Notes":"Good enough for now","Status":"Done","Priority":"Medium","Task":"Feature","Project":"Management","Created":"2022-02-11T00:00:00","Finished":"2022-02-19T00:00:00"},{"Id":27,"SprintModelId":3,"Name":"Close Nav Menu on Navigation","Description":"Close Nav Menu on Navigation","Notes":null,"Status":"Done","Priority":"High","Task":"Bug","Project":"Management","Created":"2022-03-27T00:00:00","Finished":"2022-03-27T00:00:00"},{"Id":28,"SprintModelId":3,"Name":"Add Passive Descriptions and Passive","Description":"Have to guess on a bunch of passives","Notes":null,"Status":"Done","Priority":"Medium","Task":"Feature","Project":"Management","Created":"2022-03-27T00:00:00","Finished":"2022-03-31T00:00:00"},{"Id":29,"SprintModelId":3,"Name":"Tooltips that show referenced units","Description":"I should see any referenced unit by hovering over it","Notes":"Links can now go to links which can go to links.","Status":"Done","Priority":"Medium","Task":"Feature","Project":"Management","Created":"2022-03-27T00:00:00","Finished":"2022-04-01T00:00:00"},{"Id":30,"SprintModelId":null,"Name":"Update Logo for Website","Description":"After color scheme is picked","Notes":null,"Status":"Todo","Priority":"Low","Task":"Feature","Project":"Management","Created":"2022-03-27T00:00:00","Finished":null},{"Id":31,"SprintModelId":3,"Name":"Documentation page","Description":"Add documents on how to maintain website","Notes":"Added start of documents","Status":"Done","Priority":"Low","Task":"Feature","Project":"Management","Created":"2022-03-27T00:00:00","Finished":"2022-04-03T00:00:00"},{"Id":32,"SprintModelId":null,"Name":"Test Automation","Description":"Selenium Tests","Notes":"Start adding IDs to everything","Status":"Todo","Priority":"Low","Task":"Feature","Project":"Management","Created":"2022-03-27T00:00:00","Finished":null},{"Id":33,"SprintModelId":null,"Name":"Unit Test","Description":"Add some unit tests","Notes":null,"Status":"Todo","Priority":"Low","Task":"Feature","Project":"Management","Created":"2022-03-27T00:00:00","Finished":null},{"Id":34,"SprintModelId":null,"Name":"Fully Transfer everything to SQL","Description":"Need to regenerate the database once everthing is fully transfered","Notes":null,"Status":"Todo","Priority":"Medium","Task":"Feature","Project":"Management","Created":"2022-03-27T00:00:00","Finished":null},{"Id":35,"SprintModelId":3,"Name":"Adding a loading Component","Description":"For JSON loading","Notes":"Added loading component to Agile and Changelog screens","Status":"Done","Priority":"Medium","Task":"Feature","Project":"Management","Created":"2022-03-27T00:00:00","Finished":"2022-03-27T00:00:00"},{"Id":36,"SprintModelId":3,"Name":"Optimize Loading of Data","Description":"Currently loading non Agile stuff on Agile page","Notes":"Moved SQL database injection to app root","Status":"Done","Priority":"Medium","Task":"Feature","Project":"Management","Created":"2022-03-27T00:00:00","Finished":"2022-03-27T00:00:00"},{"Id":37,"SprintModelId":3,"Name":"Convert Notes to Markdown","Description":"Using Markdown and generating the Note pages seems like a better solution to SQL or hardcoding data","Notes":null,"Status":"Done","Priority":"Medium","Task":"Feature","Project":"Management","Created":"2022-03-27T00:00:00","Finished":"2022-04-01T00:00:00"},{"Id":38,"SprintModelId":3,"Name":"Improve Entity Filter Options","Description":"The options I give you is strange, given it filers on Faction type","Notes":null,"Status":"Done","Priority":"High","Task":"Bug","Project":"Management","Created":"2022-04-01T00:00:00","Finished":"2022-04-03T00:00:00"}] \ No newline at end of file +[{"Id":1,"SprintModelId":null,"Name":"Support Safari","Description":"Consider other web browsers.","Notes":"Added","Status":"Todo","Priority":"Low","Task":"Feature","Project":"Management","Created":"2022-02-20T00:00:00","Finished":"2022-02-20T00:00:00"},{"Id":2,"SprintModelId":2,"Name":"Filter Patch Notes","Description":"You should be showing people what they really want to see in the patch notes.","Notes":"Added","Status":"Done","Priority":"Blocker","Task":"Feature","Project":"Management","Created":"2022-02-20T00:00:00","Finished":"2022-02-20T00:00:00"},{"Id":3,"SprintModelId":null,"Name":"Consider Pyre","Description":"Add Pyre Income. Make it so you can take Pyre Camps and Pyre Miners","Notes":"Add notes...","Status":"In_Progress","Priority":"Medium","Task":"Feature","Project":"Management","Created":"2022-02-20T00:00:00","Finished":null},{"Id":4,"SprintModelId":null,"Name":"Optimizations","Description":"Build Calculator should be usable.","Notes":"Add notes...","Status":"Todo","Priority":"Medium","Task":"Feature","Project":"Management","Created":"2022-02-20T00:00:00","Finished":null},{"Id":5,"SprintModelId":null,"Name":"Change Attack Timing Interval","Description":"Be able to sett attack timing.","Notes":"Add notes...","Status":"Todo","Priority":"Medium","Task":"Feature","Project":"Management","Created":"2022-02-20T00:00:00","Finished":null},{"Id":6,"SprintModelId":null,"Name":"Add Pyre Spells","Description":"Make Pyre Spells castable and consume Pyre on build order","Notes":"Add notes...","Status":"In_Progress","Priority":"Medium","Task":"Feature","Project":"Management","Created":"2022-02-20T00:00:00","Finished":null},{"Id":7,"SprintModelId":null,"Name":"Default builds (Rush Thrones)","Description":"Add a dropdown list of default builds.","Notes":"Add notes...","Status":"Todo","Priority":"Medium","Task":"Feature","Project":"Management","Created":"2022-02-20T00:00:00","Finished":null},{"Id":8,"SprintModelId":null,"Name":"Load older builds","Description":"Be able to load older builds. How are you going to handle auto correct to current patch?","Notes":"Add notes...","Status":"Todo","Priority":"Medium","Task":"Feature","Project":"Management","Created":"2022-02-20T00:00:00","Finished":null},{"Id":9,"SprintModelId":null,"Name":"How to use Build Calculator step by step","Description":"Need docs","Notes":"Add notes...","Status":"Todo","Priority":"Medium","Task":"Feature","Project":"Management","Created":"2022-02-20T00:00:00","Finished":null},{"Id":10,"SprintModelId":null,"Name":"Compare Health and Damage","Description":"Refer to community example spreadsheet.","Notes":"Add notes...","Status":"Todo","Priority":"Medium","Task":"Feature","Project":"Management","Created":"2022-02-20T00:00:00","Finished":null},{"Id":11,"SprintModelId":null,"Name":"Compare Unit\u0027s Damage with it\u0027s own costs","Description":"Refer to community example spreadsheet.","Notes":"Add notes...","Status":"Todo","Priority":"Medium","Task":"Feature","Project":"Management","Created":"2022-02-20T00:00:00","Finished":null},{"Id":12,"SprintModelId":null,"Name":"View one unit stats from a link. Make YAML copy and paste","Description":"Design so people can easily copy and paste data into discord","Notes":"Lame. Not currently supported in Blazor. I could automate up a solution, or just manually implement the url parsing, but probably best to wait","Status":"Todo","Priority":"Medium","Task":"Feature","Project":"Management","Created":"2022-02-20T00:00:00","Finished":null},{"Id":13,"SprintModelId":2,"Name":"Look into SQL","Description":"You really should be using SQL.","Notes":"Agile and Change log pages now use SQL","Status":"Done","Priority":"Medium","Task":"Feature","Project":"Management","Created":"2022-02-20T00:00:00","Finished":null},{"Id":14,"SprintModelId":1,"Name":"Mobile Menu","Description":"You need a real mobile menu. Viewers don\u0027t scroll below the fold, so no one is going to know what happens when you click a button on phones.","Notes":"Added smaller menus for tablets and phones.","Status":"Done","Priority":"High","Task":"Feature","Project":"Management","Created":"2022-02-18T00:00:00","Finished":"2022-02-19T00:00:00"},{"Id":15,"SprintModelId":2,"Name":"Acropolis Consume Mote","Description":"The Mote is suppose to be consumed when making a Town Hall.","Notes":"Fixed","Status":"Done","Priority":"High","Task":"Bug","Project":"Management","Created":"2022-02-18T00:00:00","Finished":"2022-02-20T00:00:00"},{"Id":16,"SprintModelId":null,"Name":"Multiple Travel Time in Calculator","Description":"Travel time should be based on the amount of bases used. 3 bases is 3 travel times.","Notes":"Add notes...","Status":"Todo","Priority":"Low","Task":"Feature","Project":"Management","Created":"2022-02-18T00:00:00","Finished":null},{"Id":17,"SprintModelId":1,"Name":"Update Database to 0.0.6.8375a","Description":"Xacal tech change, and Hallower damage change. Update Godhead text.","Notes":"Done","Status":"Done","Priority":"None","Task":"Feature","Project":"Management","Created":"2022-02-18T00:00:00","Finished":"2022-02-18T00:00:00"},{"Id":18,"SprintModelId":null,"Name":"Patch History Viewer","Description":"Add an ability to compare patches, to see all nerfs and buffs made between them.","Notes":"Inspired by Zkay\u0027s post on discord, where he details a possible \u0027patch history viewer\u0027 implementation.","Status":"Fun_Idea","Priority":"None","Task":"Feature","Project":"Management","Created":"2022-02-16T00:00:00","Finished":null},{"Id":19,"SprintModelId":1,"Name":"Twitch Page","Description":"Did a ~3 hour test stream, and was personal quite happy with the quality. Make Twitch page, and stream patch, sprint planning and development on Sunday.","Notes":"Page added under General, and named \u0022Streams\u0022.","Status":"Done","Priority":"Medium","Task":"Feature","Project":"Management","Created":"2022-02-16T00:00:00","Finished":"2022-02-16T00:00:00"},{"Id":20,"SprintModelId":1,"Name":"Finish the database","Description":"Add more descriptions for everything. Reduce any data duplication with ids. Add upgrade connections. Add ability connections. Add passives and passives connections.","Notes":"Good enough for now","Status":"Done","Priority":"Medium","Task":"Feature","Project":"Management","Created":"2022-02-11T00:00:00","Finished":"2022-02-19T00:00:00"},{"Id":21,"SprintModelId":1,"Name":"Change Log View","Description":"Add a log to view last changes.","Notes":"Added changelog page. Shows Today, X Days Ago, or exact date if patch is over a week old.","Status":"Done","Priority":"Medium","Task":"Feature","Project":"Management","Created":"2022-02-14T00:00:00","Finished":"2022-02-14T00:00:00"},{"Id":22,"SprintModelId":1,"Name":"Agile View","Description":"Add the agile view.","Notes":"Finished.","Status":"Done","Priority":"Medium","Task":"Feature","Project":"Management","Created":"2022-02-11T00:00:00","Finished":"2022-02-17T00:00:00"},{"Id":23,"SprintModelId":1,"Name":"GUID for Ids","Description":"Stop using enums for ids, and start using guids. Enums are just too limited, I lose out on component and inheritance design with them. Replace all your enums with guids, rip off the bandaid.","Notes":"Add notes...","Status":"Done","Priority":"Medium","Task":"Feature","Project":"Management","Created":"2022-02-11T00:00:00","Finished":"2022-02-18T00:00:00"},{"Id":24,"SprintModelId":1,"Name":"Co-op overview","Description":"Write some sort of blog on co-op gameplay so you have something the feels very content-ish. Maybe make it a video.","Notes":"Finished and released early.","Status":"Done","Priority":"Medium","Task":"Feature","Project":"Management","Created":"2022-02-11T00:00:00","Finished":"2022-02-12T00:00:00"},{"Id":25,"SprintModelId":1,"Name":"Mobile UI","Description":"Make website work on mobile.","Notes":"Should be good. Will test on phone later.","Status":"Done","Priority":"Medium","Task":"Feature","Project":"Management","Created":"2022-02-15T00:00:00","Finished":"2022-02-18T00:00:00"},{"Id":26,"SprintModelId":1,"Name":"Add Making Of View","Description":"View to reference UI designs. Nicely encourages the pratice of making the UI code a lot cleaner.","Notes":"Good enough for now","Status":"Done","Priority":"Medium","Task":"Feature","Project":"Management","Created":"2022-02-11T00:00:00","Finished":"2022-02-19T00:00:00"},{"Id":27,"SprintModelId":3,"Name":"Close Nav Menu on Navigation","Description":"Close Nav Menu on Navigation","Notes":null,"Status":"Done","Priority":"High","Task":"Bug","Project":"Management","Created":"2022-03-27T00:00:00","Finished":"2022-03-27T00:00:00"},{"Id":28,"SprintModelId":3,"Name":"Add Passive Descriptions and Passive","Description":"Have to guess on a bunch of passives","Notes":null,"Status":"Done","Priority":"Medium","Task":"Feature","Project":"Management","Created":"2022-03-27T00:00:00","Finished":"2022-03-31T00:00:00"},{"Id":29,"SprintModelId":3,"Name":"Tooltips that show referenced units","Description":"I should see any referenced unit by hovering over it","Notes":"Links can now go to links which can go to links.","Status":"Done","Priority":"Medium","Task":"Feature","Project":"Management","Created":"2022-03-27T00:00:00","Finished":"2022-04-01T00:00:00"},{"Id":30,"SprintModelId":null,"Name":"Update Logo for Website","Description":"After color scheme is picked","Notes":null,"Status":"Todo","Priority":"Low","Task":"Feature","Project":"Management","Created":"2022-03-27T00:00:00","Finished":null},{"Id":31,"SprintModelId":3,"Name":"Documentation page","Description":"Add documents on how to maintain website","Notes":"Added start of documents","Status":"Done","Priority":"Low","Task":"Feature","Project":"Management","Created":"2022-03-27T00:00:00","Finished":"2022-04-03T00:00:00"},{"Id":32,"SprintModelId":null,"Name":"Test Automation","Description":"Selenium Tests","Notes":"Start adding IDs to everything","Status":"Todo","Priority":"Low","Task":"Feature","Project":"Management","Created":"2022-03-27T00:00:00","Finished":null},{"Id":33,"SprintModelId":null,"Name":"Unit Test","Description":"Add some unit tests","Notes":null,"Status":"Todo","Priority":"Low","Task":"Feature","Project":"Management","Created":"2022-03-27T00:00:00","Finished":null},{"Id":34,"SprintModelId":null,"Name":"Fully Transfer everything to SQL","Description":"Need to regenerate the database once everthing is fully transfered","Notes":null,"Status":"Todo","Priority":"Medium","Task":"Feature","Project":"Management","Created":"2022-03-27T00:00:00","Finished":null},{"Id":35,"SprintModelId":3,"Name":"Adding a loading Component","Description":"For JSON loading","Notes":"Added loading component to Agile and Changelog screens","Status":"Done","Priority":"Medium","Task":"Feature","Project":"Management","Created":"2022-03-27T00:00:00","Finished":"2022-03-27T00:00:00"},{"Id":36,"SprintModelId":3,"Name":"Optimize Loading of Data","Description":"Currently loading non Agile stuff on Agile page","Notes":"Moved SQL database injection to app root","Status":"Done","Priority":"Medium","Task":"Feature","Project":"Management","Created":"2022-03-27T00:00:00","Finished":"2022-03-27T00:00:00"},{"Id":37,"SprintModelId":3,"Name":"Convert Notes to Markdown","Description":"Using Markdown and generating the Note pages seems like a better solution to SQL or hardcoding data","Notes":null,"Status":"Done","Priority":"Medium","Task":"Feature","Project":"Management","Created":"2022-03-27T00:00:00","Finished":"2022-04-01T00:00:00"},{"Id":38,"SprintModelId":3,"Name":"Improve Entity Filter Options","Description":"The options I give you is strange, given it filers on Faction type","Notes":null,"Status":"Done","Priority":"High","Task":"Bug","Project":"Management","Created":"2022-04-01T00:00:00","Finished":"2022-04-03T00:00:00"},{"Id":39,"SprintModelId":4,"Name":"Refresh Database Bug","Description":"Database dialog UI isn\u0027t refreshing enough","Notes":null,"Status":"In_Progress","Priority":"High","Task":"Bug","Project":"Management","Created":"2022-04-03T00:00:00","Finished":null},{"Id":40,"SprintModelId":4,"Name":"Branding Stuff","Description":"Add a schedule, improving branding, etc, ","Notes":null,"Status":"Todo","Priority":"Medium","Task":"Feature","Project":"Management","Created":"2022-04-03T00:00:00","Finished":null}] \ No newline at end of file diff --git a/Model/Entity/Data/DATA.cs b/Model/Entity/Data/DATA.cs index 1726f2c..39640de 100644 --- a/Model/Entity/Data/DATA.cs +++ b/Model/Entity/Data/DATA.cs @@ -1,4 +1,5 @@ using System.Collections.Generic; +using System.Security.Cryptography; using Model.Immortal.Entity.Parts; using Model.Immortal.Types; using Newtonsoft.Json; @@ -37,14 +38,14 @@ public class DATA { // TEAPOTS { DataType.TEAPOT_Teapot, new EntityModel(DataType.TEAPOT_Teapot, EntityType.Teapot) - .AddPart(new EntityInfoModel { Name = "Teapot", Notes = @"Very powerful! So Fast" }) + .AddPart(new EntityInfoModel { Name = "Teapot", Description = "Basic scout. Every faction has this", Notes = @"Very powerful! So Fast" }) .AddPart(new EntityVitalityModel { Health = 70, Armor = ArmorType.Light }) .AddPart(new EntityMovementModel { Speed = 400 }) - }, { + }, + { DataType.TEAPOT_FlyingTeapot, new EntityModel(DataType.TEAPOT_FlyingTeapot, EntityType.Teapot) - .AddPart(new EntityInfoModel { Name = "Flying Teapot", Notes = @"Much flying, Wow!" }) - .AddPart(new EntityRequirementModel - { Name = "Teapot", Requirement = RequirementType.Morph, DataType = DataType.TEAPOT_Teapot }) + .AddPart(new EntityInfoModel { Name = "Flying Teapot", Description = "Basic observer. Can fly and see hidden units", Notes = @"Much flying, Wow!" }) + .AddPart(new EntityRequirementModel{ DataType = DataType.TEAPOT_Teapot }) .AddPart(new EntityProductionModel { Alloy = 100, Ether = 50 }) .AddPart(new EntityVitalityModel { Health = 70, Armor = ArmorType.Light }) .AddPart(new EntityMovementModel { Speed = 400, Movement = MovementType.Air }) @@ -55,101 +56,48 @@ public class DATA { DataType.FAMILY_Rae, new EntityModel(DataType.FAMILY_Rae, EntityType.Family, true) .AddPart(new EntityInfoModel { - Name = "Rae", - Notes = - @"Enslaved insectoid faction family. Controlled by the Amn Baal, a god not from the dimension of creation. Few Rae are allowed to have free will, and all must obey the call of the work. Maybe?" + Name = "Rae" }) - .AddPart(new EntityMechanicModel - { Name = "Centralized?", Description = "Units can be built only out of the town hall. Maybe?" }) - .AddPart(new EntityMechanicModel { - Name = "Breach?", - Description = "Under certain conditions, units can be built anywhere on the map. Maybe?" - }) - .AddPart(new EntityStrategyModel { - Notes = - "Protect your town halls! If they get sniped, you are going to have trouble keeping up in army production. Maybe?" - }) - }, { + }, + { DataType.FAMILY_Sylv, new EntityModel(DataType.FAMILY_Sylv, EntityType.Family, true) .AddPart(new EntityInfoModel { - Name = "Sylv", - Notes = - "Plantoid faction family. They heavily rely on their connection to roots and to each other." - }) - .AddPart(new EntityMechanicModel { - Name = "Vineway", - Description = "Buildings can only built on the vines that spread from already made buildings." + Name = "Sylv" }) - .AddPart(new EntityStrategyModel { - Notes = - "Taking a risky base? Try to move vineway generating units to the location, so you can build static defense faster." - }) - }, { + }, + { DataType.FAMILY_Angelic, new EntityModel(DataType.FAMILY_Angelic, EntityType.Family, true) .AddPart(new EntityInfoModel { - Name = "Angelic", - Notes = - "Pyre-based faction family. They seek to protect and guide creation, in the teachings of their god Aros." - }) - .AddPart(new EntityMechanicModel { - Name = "Hallowed Ground", - Description = - "All buildings generate an angelic field that boosts nearby units with additional effects." - }) - .AddPart(new EntityStrategyModel { - Notes = - "Try to ensure your always fightning on your Hallowed Ground. When on attack, bring with you units that can generate Hallowed Ground, such as the Magi or Ark Mother." - }) - .AddPart(new EntityStrategyModel { - Notes = - "Your proxy rushes are more dangerous than other families, given your buildings can easily be placed anywhere on the map, and provide the Hallowed Ground bonus." + Name = "Angelic" }) }, { DataType.FAMILY_Human, new EntityModel(DataType.FAMILY_Human, EntityType.Family, true) .AddPart(new EntityInfoModel { Name = "Human", - Notes = - "Human governing faction family. They seek power and trade, expanding their territory and control." - }) - .AddPart(new EntityMechanicModel { - Name = "Grid?", - Description = "Your building benefit from power connections to your townhall. Maybe?" }) - .AddPart(new EntityStrategyModel { - Notes = - "Keep small forward bases on the map, so your units have somewhere nearby to reload after a skirmish. Maybe?" - }) - }, { + }, + { DataType.FAMILY_Coalition, new EntityModel(DataType.FAMILY_Coalition, EntityType.Family, true) .AddPart(new EntityInfoModel { Name = "Coalition?", - Notes = - "Coalition of species faction family. They make up of variety of groups joining together to surivive in creation. Maybe?" }) - .AddPart(new EntityMechanicModel { - Name = "Diversity?", - Description = - "Your tech tree is flat, allowing you to special in truly unexpected build orders and compositions. Maybe?" - }) - }, { + }, + { DataType.FAMILY_Demonic, new EntityModel(DataType.FAMILY_Demonic, EntityType.Family, true) .AddPart(new EntityInfoModel { Name = "Demonic?", - Notes = - "Not much is known about demons, aside that they are like a pyre-cancer. A part of creation, just not a healthy part. We shouldn't expect any new info a demons until many years after the release of Immortal, should the faction family ever get a gameplay element. Maybe?" }) - }, { + }, + { DataType.FAMILY_NazRa, new EntityModel(DataType.FAMILY_NazRa, EntityType.Family, true) .AddPart(new EntityInfoModel { Name = "Naz'Ra", - Notes = - "An ancient species, believed to of consumed their gods. Naz'Ra were probably all killed off in old wars against the Rae. Some could still be alive, but if I had to guess, they probably won't be appart of the game. Maybe?" }) }, // Factions @@ -159,8 +107,6 @@ public class DATA { new EntityModel(DataType.FACTION_Aru, EntityType.Faction) .AddPart(new EntityInfoModel { Name = "Aru", - Notes = - "Sylv variant that is no longer as reliant on the vineway. Instead they rely on a blood god's rootway, and on the god's beasts for protection." }) .AddPart(new EntityPassiveModel { Name = "Overgrowth", @@ -177,32 +123,18 @@ public class DATA { Description = "You can summon blood wells for pyre, that allow you to heal your units health and mana." }) - .AddPart(new EntityStrategyModel { - Notes = - "Due to Overgrowth, Aru benfit from being able to quickly skrimish their units in and out of combat. Additionally, certain units in the Aru arsenal also favour this playstyle, like the Behemoths, Incubators, Xacals and more." - }) - .AddPart(new EntityStrategyModel { - Notes = - "Aru have no healing outside of Pyre utility buildings: Towers and Blood Wells. You should always try to hold pyre camps, but also try to consider how you will spend the Pyre to help keep your army alive." - }) - }, { + }, + { DataType.FACTION_Iratek, new EntityModel(DataType.FACTION_Iratek, EntityType.Faction, true) .AddPart(new EntityInfoModel { - Name = "Iratek", Notes = "Sylv faction that relies on the vineway to create a hivemind. Maybe?" + Name = "Iratek" }) - .AddPart(new EntityPassiveModel { - Name = "The Chorus?", - Description = "Your units become isolated when leaving the vineway. Maybe?" - }) - }, { + }, + { DataType.FACTION_Yul, new EntityModel(DataType.FACTION_Yul, EntityType.Faction, true) - .AddPart(new EntityInfoModel { Name = "Yul", Notes = "A more fungal Sylv faction. Maybe?" }) - .AddPart(new EntityPassiveModel { - Name = "Plant Growth?", - Description = "You want to grow important utility units on the vineway. Maybe?" - }) + .AddPart(new EntityInfoModel { Name = "Yul" }) }, // Factions // Angelic @@ -212,87 +144,56 @@ public class DATA { .AddPart(new EntityInfoModel { Name = "Q'Rath", Notes = - "Anglic faction that has adopted many humans into their ranks. They seek to bring more into their collective." + "Angelic faction that has adopted many humans into their ranks. They seek to bring more into their collective." }) .AddPart(new EntityPassiveModel { Name = "Wards", Description = "Your units have an extra layer of health that is always (but slowly) regenerates. The regeneration is double on Hallowed Ground." }) - .AddPart(new EntityStrategyModel { - Notes = - "As Q'Rath, you care about fighting on Hallowed Ground, given the regen it provides your units. Additionally, units like the Sipari and Zentari will get additional bonuses when fighting on Hallowed Ground. Try to hold position at forward buildings, Pillars and Ark Mothers." - }) - }, { + }, + { DataType.FACTION_YRiah, new EntityModel(DataType.FACTION_QRath, EntityType.Faction, true) - .AddPart(new EntityInfoModel { Name = "R'Raih", Notes = "An angrier angelic faction. Maybe?" }) - .AddPart(new EntityPassiveModel - { Name = "Berserk?", Description = "Your units get stronger when at low health. Maybe?" }) + .AddPart(new EntityInfoModel { Name = "R'Raih" }) }, { DataType.FACTION_ArkShai, new EntityModel(DataType.FACTION_QRath, EntityType.Faction, true) .AddPart(new EntityInfoModel - { Name = "Ark'Shai", Notes = "An more soul sucking angelic faction. Maybe?" }) - .AddPart(new EntityPassiveModel - { Name = "Life Steal?", Description = "Your units gain life when attacking. Maybe?" }) + { Name = "Ark'Shai" }) }, // Factions // Human { DataType.FACTION_Jora, new EntityModel(DataType.FACTION_Jora, EntityType.Faction, true) - .AddPart(new EntityInfoModel { Name = "Jora", Notes = "Industrial human faction. Maybe?" }) - .AddPart(new EntityPassiveModel { - Name = "Ammo?", - Description = - "Your units have limited attacks, which need to be replenished at a building. Maybe?" - }) - }, { + .AddPart(new EntityInfoModel { Name = "Jora" }) + }, + { DataType.FACTION_Telmetra, new EntityModel(DataType.FACTION_Telmetra, EntityType.Faction, true) - .AddPart(new EntityInfoModel { Name = "Talmetra", Notes = "Heavy political faction. Maybe?" }) - .AddPart(new EntityPassiveModel { - Name = "Trade Lines?", - Description = "Increase alloy and ether production by connecting bases with roads. Maybe?" - }) - }, { + .AddPart(new EntityInfoModel { Name = "Talmetra" }) + }, + { DataType.FACTION_Kjor, new EntityModel(DataType.FACTION_Kjor, EntityType.Faction, true) .AddPart(new EntityInfoModel - { Name = "Kjor", Notes = "Aggressive warriors with magical runes. Maybe?" }) - .AddPart(new EntityPassiveModel { - Name = "Rune Recharging?", - Description = "Your units have spells that they can only recover at buildings. Maybe?" - }) + { Name = "Kjor" } + ) }, // Factions // Rae { DataType.FACTION_Herlesh, new EntityModel(DataType.FACTION_Herlesh, EntityType.Faction, true) - .AddPart(new EntityInfoModel { Name = "Herlesh", Notes = "Biomechanical Rae faction. Maybe?" }) - .AddPart(new EntityPassiveModel { - Name = "Miasma?", - Description = "Units leave damage-over-time area-of-effects when the die. Maybe?" - }) - }, { - DataType.FACTION_EntralledRae, - new EntityModel(DataType.FACTION_EntralledRae, EntityType.Faction, true) - .AddPart(new EntityInfoModel - { Name = "Entralled Rae", Notes = "Mind controlled Rae faction. Maybe?" }) - .AddPart(new EntityPassiveModel - { Name = "Mind Control?", Description = "Can temporary shut down enemy units. Maybe?" }) - }, + .AddPart(new EntityInfoModel { Name = "Herlesh"}) + }, // Factions // Coalition { DataType.FACTION_Khardu, new EntityModel(DataType.FACTION_Khardu, EntityType.Faction, true) - .AddPart(new EntityInfoModel { Name = "Khardu", Notes = "Horde composed of many species. Maybe?" }) - .AddPart(new EntityPassiveModel { - Name = "Totems?", Description = "Place totems in combat that offer a variety of bonuses. Maybe?" - }) + .AddPart(new EntityInfoModel { Name = "Khardu" }) }, // Immortals // Aru @@ -330,10 +231,6 @@ public class DATA { Description = "[PlaceholderText] Your units can sense nearby enemies in the fog of war. (Not implemented)" }) - .AddPart(new EntityStrategyModel { - Notes = - "Sneak small skrimishing units around the map to attack workers and isolated enemy units." - }) .AddPart(new EntityIdPyreSpellModel { Id = DataType.ISPELL_SummonGroveGuardian }) .AddPart(new EntityIdPyreSpellModel { Id = DataType.ISPELL_InfuseTroops }) .AddPart(new EntityIdPyreSpellModel { Id = DataType.ISPELL_ConstructBloodWell }) @@ -356,8 +253,6 @@ public class DATA { Name = "[PlaceholderText] Healing Hallowed Ground", Description = "[PlaceholderText] Your Hallowed Ground also heals units." }) - .AddPart(new EntityStrategyModel - { Notes = "Bring your damaged units to full health with Hallowed Ground." }) .AddPart(new EntityIdPyreSpellModel { Id = DataType.ISPELL_SummonCitadel }) .AddPart(new EntityIdPyreSpellModel { Id = DataType.ISPELL_InfuseTroops }) .AddPart(new EntityIdPyreSpellModel { Id = DataType.ISPELL_DeliverFromEvil }) @@ -377,8 +272,6 @@ public class DATA { Name = "[PlaceholderText] Expansionist", Description = "[PlaceholderText] Your towers cost 25 less pyre." }) - .AddPart(new EntityStrategyModel - { Notes = "You want to leverage building a lot of towers for vision and map control." }) .AddPart(new EntityIdPyreSpellModel { Id = DataType.ISPELL_InfuseTroops }) .AddPart(new EntityIdPyreSpellModel { Id = DataType.ISPELL_SummonCitadel }) .AddPart(new EntityIdPyreSpellModel { Id = DataType.ISPELL_EmpireUnbroken }) @@ -392,12 +285,12 @@ public class DATA { DataType.COMMAND_Attack, new EntityModel(DataType.COMMAND_Attack, EntityType.Command) .AddPart(new EntityInfoModel - { Name = "Attack", Notes = "Makes selected units attack targeted area." }) + { Name = "Attack", Description = "Makes selected units attack targeted area." }) .AddPart(new EntityHotkeyModel { Hotkey = "A", HotkeyGroup = "D" }) }, { DataType.COMMAND_StandGround, new EntityModel(DataType.COMMAND_StandGround, EntityType.Command) - .AddPart(new EntityInfoModel { Name = "Stand Ground", Notes = "Makes selected units stop moving." }) + .AddPart(new EntityInfoModel { Name = "Stand Ground", Description = "Makes selected units stop moving." }) .AddPart(new EntityHotkeyModel { Hotkey = "S", HotkeyGroup = "D" }) }, // Starting Structures @@ -405,22 +298,34 @@ public class DATA { DataType.STARTING_Bastion, new EntityModel(DataType.STARTING_Bastion, EntityType.Building) .AddPart(new EntityInfoModel - { Name = "Bastion", Notes = "Provides a fully upgraded base worth of alloy." }) + { Name = "Bastion", + Description = "Provides a fully upgraded base worth of alloy.", + Notes = "Revives in 40 seconds when destroyed." }) .AddPart(new EntityFactionModel { Faction = FactionType.Neutral }) .AddPart(new EntityFactionModel { Faction = FactionType.Neutral }) .AddPart(new EntityHarvestModel { HarvestedPerInterval = 6, RequiresWorker = false, Resource = ResourceType.Alloy, Slots = 1, TotalAmount = 6000 }) - }, { + .AddPart(new EntityVitalityModel{ Health = 500, Armor = ArmorType.Heavy}) + .AddPart(new EntityWeaponModel{ Damage = 30, AttacksPerSecond = 1.401f, Targets = TargetType.All, Range = 700,}) + }, + { DataType.STARTING_Tower, - new EntityModel(DataType.STARTING_Bastion, EntityType.Building) + new EntityModel(DataType.STARTING_Tower, EntityType.Building) .AddPart(new EntityInfoModel { Name = "Starting Tower", Notes = "Currently not in game. Can be upgraded to the factions pyre tower." }) .AddPart(new EntityFactionModel { Faction = FactionType.Neutral }) .AddPart(new EntityFactionModel { Faction = FactionType.Neutral }) + .AddPart(new EntityVitalityModel + { Health = 1000, DefenseLayer = 500, Armor = ArmorType.Heavy, IsStructure = true }) + .AddPart(new EntityWeaponModel { + Damage = 20, Range = 800, AttacksPerSecond = 1.124f, Targets = TargetType.All, + MediumDamage = 25, HeavyDamage = 30 + }) + .AddPart(new EntityIdPassiveModel{Id = DataType.PASSIVE_Respite}) }, // Starting Structures // Aru @@ -474,8 +379,7 @@ public class DATA { { Damage = 26, Range = 100, AttacksPerSecond = 0.699f, Targets = TargetType.Ground }) .AddPart(new EntityWeaponModel { Damage = 26, Range = 300, AttacksPerSecond = 0.699f, Targets = TargetType.Ground }) - .AddPart(new EntityRequirementModel { - Name = "Legion Hall", DataType = DataType.BUILDING_LegionHall, + .AddPart(new EntityRequirementModel{ DataType = DataType.BUILDING_LegionHall, Requirement = RequirementType.Production_Building }) .AddPart(new EntityMovementModel { Speed = 380, Movement = MovementType.Ground }) @@ -500,8 +404,7 @@ public class DATA { Damage = 40, MediumDamage = 45, HeavyDamage = 50, Range = 600, SecondsBetweenAttacks = 1.8f, AttacksPerSecond = 0.637f, Targets = TargetType.Ground, HasSplash = true }) - .AddPart(new EntityRequirementModel { - Name = "Angelarium", DataType = DataType.BUILDING_Angelarium, + .AddPart(new EntityRequirementModel{ DataType = DataType.BUILDING_Angelarium, Requirement = RequirementType.Production_Building }) .AddPart(new EntityVanguardAddedModel { ReplaceId = DataType.UNIT_Warden, ImmortalId = DataType.IMMORTAL_Orzum }) @@ -523,12 +426,10 @@ public class DATA { .AddPart(new EntityVitalityModel { Health = 140, DefenseLayer = 100, Armor = ArmorType.Light, IsEtheric = true }) .AddPart(new EntityMovementModel { Speed = 380, Movement = MovementType.Ground }) - .AddPart(new EntityRequirementModel { - Name = "Legion Hall", DataType = DataType.BUILDING_LegionHall, + .AddPart(new EntityRequirementModel{ DataType = DataType.BUILDING_LegionHall, Requirement = RequirementType.Production_Building }) - .AddPart(new EntityRequirementModel { - Name = "Reliquary", DataType = DataType.BUILDING_Reliquary, + .AddPart(new EntityRequirementModel{ DataType = DataType.BUILDING_Reliquary, Requirement = RequirementType.Production_Building }) .AddPart(new EntityWeaponModel @@ -551,12 +452,10 @@ public class DATA { .AddPart(new EntitySupplyModel { Takes = 5 }) .AddPart(new EntityVitalityModel { Energy = 100, Health = 100, DefenseLayer = 100, Armor = ArmorType.Medium, IsEtheric = true }) - .AddPart(new EntityRequirementModel { - Name = "Soul Foundry", DataType = DataType.BUILDING_SoulFoundry, + .AddPart(new EntityRequirementModel{ DataType = DataType.BUILDING_SoulFoundry, Requirement = RequirementType.Production_Building }) - .AddPart(new EntityRequirementModel { - Name = "House of Fading Saints", DataType = DataType.BUILDING_HouseOfFadingSaints, + .AddPart(new EntityRequirementModel{ DataType = DataType.BUILDING_HouseOfFadingSaints, Requirement = RequirementType.Research_Building }) .AddPart(new EntityMovementModel { Speed = 335, Movement = MovementType.Ground }) @@ -572,8 +471,7 @@ public class DATA { new EntityModel(DataType.VANGUARD_Incubator_Mala, EntityType.Army) .AddPart(new EntityInfoModel { Name = "Incubator", Descriptive = DescriptiveType.Force_Multiplier }) .AddPart(new EntityTierModel { Tier = 2 }) - .AddPart(new EntityRequirementModel { - Name = "Amber Womb", DataType = DataType.BUILDING_AmberWomb, + .AddPart(new EntityRequirementModel{ DataType = DataType.BUILDING_AmberWomb, Requirement = RequirementType.Production_Building }) .AddPart(new EntityHotkeyModel { Hotkey = "Q", HoldSpace = true, HotkeyGroup = "Z" }) @@ -592,12 +490,10 @@ public class DATA { new EntityModel(DataType.VANGUARD_DreadSister_Mala, EntityType.Army) .AddPart(new EntityInfoModel { Name = "Dread Sister", Descriptive = DescriptiveType.Elite_Caster }) .AddPart(new EntityTierModel { Tier = 3 }) - .AddPart(new EntityRequirementModel { - Name = "Altar of the Worthy", DataType = DataType.BUILDING_AltarOfTheWorthy, + .AddPart(new EntityRequirementModel{ DataType = DataType.BUILDING_AltarOfTheWorthy, Requirement = RequirementType.Production_Building }) - .AddPart(new EntityRequirementModel { - Name = "Blood Vale", DataType = DataType.BUILDING_RedVale, + .AddPart(new EntityRequirementModel{ DataType = DataType.BUILDING_RedVale, Requirement = RequirementType.Research_Building }) .AddPart(new EntityHotkeyModel { Hotkey = "F", HoldSpace = true, HotkeyGroup = "Z" }) @@ -621,8 +517,7 @@ public class DATA { new EntityModel(DataType.VANGUARD_BoneStalker_Xol, EntityType.Army) .AddPart(new EntityInfoModel { Name = "Bone Stalker", Descriptive = DescriptiveType.Generalist }) .AddPart(new EntityTierModel { Tier = 1 }) - .AddPart(new EntityRequirementModel { - Name = "Altar of the Worthy", DataType = DataType.BUILDING_AltarOfTheWorthy, + .AddPart(new EntityRequirementModel{ DataType = DataType.BUILDING_AltarOfTheWorthy, Requirement = RequirementType.Production_Building }) .AddPart(new EntityHotkeyModel { Hotkey = "W", HotkeyGroup = "Z" }) @@ -640,12 +535,10 @@ public class DATA { new EntityModel(DataType.VANGUARD_WhiteWoodReaper_Xol, EntityType.Army) .AddPart(new EntityInfoModel { Name = "White Wood Reaper", Descriptive = DescriptiveType.Assassin }) .AddPart(new EntityTierModel { Tier = 3 }) - .AddPart(new EntityRequirementModel { - Name = "Altar of the Worthy", DataType = DataType.BUILDING_AltarOfTheWorthy, + .AddPart(new EntityRequirementModel{ DataType = DataType.BUILDING_AltarOfTheWorthy, Requirement = RequirementType.Production_Building }) - .AddPart(new EntityRequirementModel { - Name = "Blood Vale", DataType = DataType.BUILDING_RedVale, + .AddPart(new EntityRequirementModel{ DataType = DataType.BUILDING_RedVale, Requirement = RequirementType.Research_Building }) .AddPart(new EntityHotkeyModel { Hotkey = "E", HotkeyGroup = "Z" }) @@ -691,8 +584,7 @@ public class DATA { .AddPart(new EntityProductionModel { Alloy = 75, BuildTime = 25 }) .AddPart(new EntitySupplyModel { Takes = 3 }) .AddPart(new EntityVitalityModel { Health = 140, DefenseLayer = 70, Armor = ArmorType.Light }) - .AddPart(new EntityRequirementModel { - Name = "Legion Hall", DataType = DataType.BUILDING_LegionHall, + .AddPart(new EntityRequirementModel{ DataType = DataType.BUILDING_LegionHall, Requirement = RequirementType.Production_Building }) .AddPart(new EntityMovementModel { Speed = 380, Movement = MovementType.Ground }) @@ -714,12 +606,10 @@ public class DATA { .AddPart(new EntityProductionModel { Alloy = 75, Ether = 75, BuildTime = 35 }) .AddPart(new EntitySupplyModel { Takes = 3 }) .AddPart(new EntityVanguardReplacedModel { ImmortalId = DataType.IMMORTAL_Ajari, ReplacedById = DataType.VANGUARD_Saoshin_Ajari }) - .AddPart(new EntityRequirementModel { - Name = "Legion Hall", DataType = DataType.BUILDING_LegionHall, + .AddPart(new EntityRequirementModel{ DataType = DataType.BUILDING_LegionHall, Requirement = RequirementType.Production_Building }) - .AddPart(new EntityRequirementModel { - Name = "Reliquary", DataType = DataType.BUILDING_Reliquary, + .AddPart(new EntityRequirementModel{ DataType = DataType.BUILDING_Reliquary, Requirement = RequirementType.Production_Building }) .AddPart(new EntityVitalityModel @@ -744,12 +634,10 @@ public class DATA { .AddPart(new EntityFactionModel { Faction = FactionType.QRath }) .AddPart(new EntityProductionModel { Alloy = 100, Ether = 40, BuildTime = 30 }) .AddPart(new EntitySupplyModel { Takes = 4 }) - .AddPart(new EntityRequirementModel { - Name = "Legion Hall", DataType = DataType.BUILDING_LegionHall, + .AddPart(new EntityRequirementModel{ DataType = DataType.BUILDING_LegionHall, Requirement = RequirementType.Production_Building }) - .AddPart(new EntityRequirementModel { - Name = "Reliquary", DataType = DataType.BUILDING_Reliquary, + .AddPart(new EntityRequirementModel{ DataType = DataType.BUILDING_Reliquary, Requirement = RequirementType.Production_Building }) .AddPart(new EntityVitalityModel { Health = 180, DefenseLayer = 90, Armor = ArmorType.Heavy }) @@ -773,8 +661,7 @@ public class DATA { .AddPart(new EntityProductionModel { Alloy = 125, Ether = 10, BuildTime = 35 }) .AddPart(new EntitySupplyModel { Takes = 4 }) .AddPart(new EntityVitalityModel { Health = 140, DefenseLayer = 100, Armor = ArmorType.Medium }) - .AddPart(new EntityRequirementModel { - Name = "Soul Foundry", DataType = DataType.BUILDING_SoulFoundry, + .AddPart(new EntityRequirementModel{ DataType = DataType.BUILDING_SoulFoundry, Requirement = RequirementType.Production_Building }) .AddPart(new EntityMovementModel { Speed = 435, Movement = MovementType.Ground }) @@ -797,8 +684,7 @@ public class DATA { .AddPart(new EntityProductionModel { Alloy = 150, Ether = 75, BuildTime = 35 }) .AddPart(new EntitySupplyModel { Takes = 5 }) .AddPart(new EntityVitalityModel { Health = 175, DefenseLayer = 150, Armor = ArmorType.Medium }) - .AddPart(new EntityRequirementModel { - Name = "Soul Foundry", DataType = DataType.BUILDING_SoulFoundry, + .AddPart(new EntityRequirementModel{ DataType = DataType.BUILDING_SoulFoundry, Requirement = RequirementType.Production_Building }) .AddPart(new EntityMovementModel { Speed = 315, Movement = MovementType.Ground }) @@ -829,8 +715,7 @@ public class DATA { .AddPart(new EntitySupplyModel { Takes = 5 }) .AddPart(new EntityVitalityModel { Health = 200, DefenseLayer = 100, Armor = ArmorType.Heavy }) .AddPart(new EntityMovementModel { Speed = 340, Movement = MovementType.Ground }) - .AddPart(new EntityRequirementModel { - Name = "Soul Foundry", DataType = DataType.BUILDING_SoulFoundry, + .AddPart(new EntityRequirementModel{ DataType = DataType.BUILDING_SoulFoundry, Requirement = RequirementType.Production_Building }) .AddPart(new EntityWeaponModel { @@ -855,12 +740,10 @@ public class DATA { .AddPart(new EntityFactionModel { Faction = FactionType.QRath }) .AddPart(new EntityProductionModel { Alloy = 150, Ether = 75, BuildTime = 35 }) .AddPart(new EntitySupplyModel { Takes = 5 }) - .AddPart(new EntityRequirementModel { - Name = "Soul Foundry", DataType = DataType.BUILDING_SoulFoundry, + .AddPart(new EntityRequirementModel{ DataType = DataType.BUILDING_SoulFoundry, Requirement = RequirementType.Production_Building }) - .AddPart(new EntityRequirementModel { - Name = "House of Fading Saints", DataType = DataType.BUILDING_HouseOfFadingSaints, + .AddPart(new EntityRequirementModel{ DataType = DataType.BUILDING_HouseOfFadingSaints, Requirement = RequirementType.Production_Building }) .AddPart(new EntityVitalityModel { Health = 100, DefenseLayer = 130, Armor = ArmorType.Heavy }) @@ -883,8 +766,7 @@ public class DATA { .AddPart(new EntitySupplyModel { Takes = 5 }) .AddPart(new EntityVitalityModel { Health = 150, DefenseLayer = 100, Armor = ArmorType.Medium }) .AddPart(new EntityMovementModel { Speed = 525, Movement = MovementType.Air }) - .AddPart(new EntityRequirementModel { - Name = "Angelarium", DataType = DataType.BUILDING_Angelarium, + .AddPart(new EntityRequirementModel{ DataType = DataType.BUILDING_Angelarium, Requirement = RequirementType.Production_Building }) .AddPart(new EntityWeaponModel { @@ -905,12 +787,10 @@ public class DATA { .AddPart(new EntityProductionModel { Alloy = 250, Ether = 100, BuildTime = 50 }) .AddPart(new EntitySupplyModel { Takes = 9 }) .AddPart(new EntityVitalityModel { Health = 350, DefenseLayer = 200, Armor = ArmorType.Heavy }) - .AddPart(new EntityRequirementModel { - Name = "Angelarium", DataType = DataType.BUILDING_Angelarium, + .AddPart(new EntityRequirementModel{ DataType = DataType.BUILDING_Angelarium, Requirement = RequirementType.Production_Building }) - .AddPart(new EntityRequirementModel { - Name = "Bearer of the Crown", DataType = DataType.BUILDING_BearerOfTheCrown, + .AddPart(new EntityRequirementModel{ DataType = DataType.BUILDING_BearerOfTheCrown, Requirement = RequirementType.Research_Building }) .AddPart(new EntityMovementModel { Speed = 262, Movement = MovementType.Air }) @@ -936,8 +816,7 @@ public class DATA { .AddPart(new EntityFactionModel { Faction = FactionType.QRath }) .AddPart(new EntityProductionModel { Alloy = 175, Ether = 100, BuildTime = 40 }) .AddPart(new EntitySupplyModel { Takes = 6 }) - .AddPart(new EntityRequirementModel { - Name = "Angelarium", DataType = DataType.BUILDING_Angelarium, + .AddPart(new EntityRequirementModel{ DataType = DataType.BUILDING_Angelarium, Requirement = RequirementType.Production_Building }) .AddPart(new EntityVitalityModel { Health = 300, DefenseLayer = 80, Armor = ArmorType.Heavy }) @@ -953,12 +832,10 @@ public class DATA { .AddPart(new EntityFactionModel { Faction = FactionType.QRath }) .AddPart(new EntityProductionModel { Alloy = 110, Ether = 175, BuildTime = 55 }) .AddPart(new EntitySupplyModel { Takes = 6 }) - .AddPart(new EntityRequirementModel { - Name = "Angelarium", DataType = DataType.BUILDING_Angelarium, + .AddPart(new EntityRequirementModel{ DataType = DataType.BUILDING_Angelarium, Requirement = RequirementType.Production_Building }) - .AddPart(new EntityRequirementModel { - Name = "Eye of Eros", DataType = DataType.BUILDING_EyeOfAros, + .AddPart(new EntityRequirementModel{ DataType = DataType.BUILDING_EyeOfAros, Requirement = RequirementType.Research_Building }) .AddPart(new EntityVitalityModel @@ -978,8 +855,7 @@ public class DATA { .AddPart(new EntityInfoModel { Name = "Symbiote", Descriptive = DescriptiveType.Worker }) .AddPart(new EntityFactionModel { Faction = FactionType.Aru }) .AddPart(new EntityProductionModel { Alloy = 50, BuildTime = 20 }) - .AddPart(new EntityRequirementModel { - Name = "Grove Heart", DataType = DataType.BUILDING_GroveHeart, + .AddPart(new EntityRequirementModel{ DataType = DataType.BUILDING_GroveHeart, Requirement = RequirementType.Production_Building }) .AddPart(new EntityVitalityModel { Health = 50, DefenseLayer = 10, Armor = ArmorType.Light }) @@ -998,8 +874,7 @@ public class DATA { .AddPart(new EntityHotkeyModel { Hotkey = "W", HotkeyGroup = "Z" }) .AddPart(new EntityVanguardReplacedModel { ImmortalId = DataType.IMMORTAL_Xol, ReplacedById = DataType.VANGUARD_BoneStalker_Xol }) - .AddPart(new EntityRequirementModel { - Name = "Altar of the Worthy", DataType = DataType.BUILDING_AltarOfTheWorthy, + .AddPart(new EntityRequirementModel{ DataType = DataType.BUILDING_AltarOfTheWorthy, Requirement = RequirementType.Production_Building }) .AddPart(new EntityFactionModel { Faction = FactionType.Aru }) @@ -1017,12 +892,10 @@ public class DATA { new EntityModel(DataType.UNIT_Xacal, EntityType.Army) .AddPart(new EntityInfoModel { Name = "Xacal", Descriptive = DescriptiveType.Frontliner }) .AddPart(new EntityTierModel { Tier = 1.5f }) - .AddPart(new EntityRequirementModel { - Name = "Altar of the Worthy", DataType = DataType.BUILDING_AltarOfTheWorthy, + .AddPart(new EntityRequirementModel{ DataType = DataType.BUILDING_AltarOfTheWorthy, Requirement = RequirementType.Production_Building }) - .AddPart(new EntityRequirementModel { - Name = "Neurocyte", DataType = DataType.BUILDING_Neurocyte, + .AddPart(new EntityRequirementModel{ DataType = DataType.BUILDING_Neurocyte, Requirement = RequirementType.Research_Building }) .AddPart(new EntityHotkeyModel { Hotkey = "Q", HotkeyGroup = "Z" }) @@ -1044,12 +917,10 @@ public class DATA { .AddPart(new EntityTierModel { Tier = 3 }) .AddPart(new EntityVanguardReplacedModel { ImmortalId = DataType.IMMORTAL_Xol, ReplacedById = DataType.VANGUARD_WhiteWoodReaper_Xol }) - .AddPart(new EntityRequirementModel { - Name = "Altar of the Worthy", DataType = DataType.BUILDING_AltarOfTheWorthy, + .AddPart(new EntityRequirementModel{ DataType = DataType.BUILDING_AltarOfTheWorthy, Requirement = RequirementType.Production_Building }) - .AddPart(new EntityRequirementModel { - Name = "Blood Vale", DataType = DataType.BUILDING_RedVale, + .AddPart(new EntityRequirementModel{ DataType = DataType.BUILDING_RedVale, Requirement = RequirementType.Research_Building }) .AddPart(new EntityHotkeyModel { Hotkey = "E", HotkeyGroup = "Z" }) @@ -1072,12 +943,10 @@ public class DATA { .AddPart(new EntityTierModel { Tier = 3 }) .AddPart(new EntityVanguardReplacedModel { ImmortalId = DataType.IMMORTAL_Mala, ReplacedById = DataType.VANGUARD_DreadSister_Mala }) - .AddPart(new EntityRequirementModel { - Name = "Altar of the Worthy", DataType = DataType.BUILDING_AltarOfTheWorthy, + .AddPart(new EntityRequirementModel{ DataType = DataType.BUILDING_AltarOfTheWorthy, Requirement = RequirementType.Production_Building }) - .AddPart(new EntityRequirementModel { - Name = "Blood Vale", DataType = DataType.BUILDING_RedVale, + .AddPart(new EntityRequirementModel{ DataType = DataType.BUILDING_RedVale, Requirement = RequirementType.Research_Building }) .AddPart(new EntityHotkeyModel { Hotkey = "F", HoldSpace = true, HotkeyGroup = "Z" }) @@ -1102,9 +971,13 @@ public class DATA { .AddPart(new EntityTierModel { Tier = 2 }) .AddPart(new EntityVanguardReplacedModel { ImmortalId = DataType.IMMORTAL_Mala, ReplacedById = DataType.VANGUARD_Incubator_Mala }) .AddPart(new EntityRequirementModel { - Name = "Amber Womb", DataType = DataType.BUILDING_AmberWomb, + DataType = DataType.BUILDING_AltarOfTheWorthy, Requirement = RequirementType.Production_Building }) + .AddPart(new EntityRequirementModel { + DataType = DataType.BUILDING_Neurocyte, + Requirement = RequirementType.Research_Building + }) .AddPart(new EntityHotkeyModel { Hotkey = "Q", HoldSpace = true, HotkeyGroup = "Z" }) .AddPart(new EntityFactionModel { Faction = FactionType.Aru }) .AddPart(new EntityProductionModel { Alloy = 70, Ether = 50, BuildTime = 25 }) @@ -1125,8 +998,7 @@ public class DATA { new EntityModel(DataType.UNIT_Ichor, EntityType.Army) .AddPart(new EntityInfoModel { Name = "Ichor", Descriptive = DescriptiveType.Harrier }) .AddPart(new EntityTierModel { Tier = 2 }) - .AddPart(new EntityRequirementModel { - Name = "Amber Womb", DataType = DataType.BUILDING_AmberWomb, + .AddPart(new EntityRequirementModel{ DataType = DataType.BUILDING_AmberWomb, Requirement = RequirementType.Production_Building }) .AddPart(new EntityHotkeyModel { Hotkey = "R", HotkeyGroup = "Z" }) @@ -1146,12 +1018,10 @@ public class DATA { new EntityModel(DataType.UNIT_Resinant, EntityType.Army) .AddPart(new EntityInfoModel { Name = "Resinant", Descriptive = DescriptiveType.Zone_Control }) .AddPart(new EntityTierModel { Tier = 2.5f }) - .AddPart(new EntityRequirementModel { - Name = "Amber Womb", DataType = DataType.BUILDING_AmberWomb, + .AddPart(new EntityRequirementModel{ DataType = DataType.BUILDING_AmberWomb, Requirement = RequirementType.Production_Building }) - .AddPart(new EntityRequirementModel { - Name = "Neurocyte", DataType = DataType.BUILDING_Neurocyte, + .AddPart(new EntityRequirementModel{ DataType = DataType.BUILDING_Neurocyte, Requirement = RequirementType.Research_Building }) .AddPart(new EntityHotkeyModel { Hotkey = "F", HotkeyGroup = "Z" }) @@ -1176,12 +1046,10 @@ public class DATA { new EntityModel(DataType.UNIT_Aarox, EntityType.Army) .AddPart(new EntityInfoModel { Name = "Aarox", Descriptive = DescriptiveType.Air_Superiority }) .AddPart(new EntityTierModel { Tier = 3 }) - .AddPart(new EntityRequirementModel { - Name = "Bone Canopy", DataType = DataType.BUILDING_BoneCanopy, + .AddPart(new EntityRequirementModel{ DataType = DataType.BUILDING_BoneCanopy, Requirement = RequirementType.Production_Building }) - .AddPart(new EntityRequirementModel { - Name = "Neurocyte", DataType = DataType.BUILDING_Neurocyte, + .AddPart(new EntityRequirementModel{ DataType = DataType.BUILDING_Neurocyte, Requirement = RequirementType.Research_Building }) .AddPart(new EntityHotkeyModel { Hotkey = "E", HoldSpace = true, HotkeyGroup = "Z" }) @@ -1199,8 +1067,7 @@ public class DATA { new EntityModel(DataType.UNIT_Thrum, EntityType.Army) .AddPart(new EntityInfoModel { Name = "Thrum", Descriptive = DescriptiveType.Harrier }) .AddPart(new EntityTierModel { Tier = 3 }) - .AddPart(new EntityRequirementModel { - Name = "Bone Canopy", DataType = DataType.BUILDING_BoneCanopy, + .AddPart(new EntityRequirementModel{ DataType = DataType.BUILDING_BoneCanopy, Requirement = RequirementType.Production_Building }) .AddPart(new EntityHotkeyModel { Hotkey = "R", HoldSpace = true, HotkeyGroup = "Z" }) @@ -1219,8 +1086,7 @@ public class DATA { new EntityModel(DataType.UNIT_WraithBow, EntityType.Army) .AddPart(new EntityInfoModel { Name = "Wraith Bow", Descriptive = DescriptiveType.Air_Denial }) .AddPart(new EntityTierModel { Tier = 2 }) - .AddPart(new EntityRequirementModel { - Name = "Amber Womb", DataType = DataType.BUILDING_AmberWomb, + .AddPart(new EntityRequirementModel{ DataType = DataType.BUILDING_AmberWomb, Requirement = RequirementType.Production_Building }) .AddPart(new EntityHotkeyModel { Hotkey = "W", HoldSpace = true, HotkeyGroup = "Z" }) @@ -1239,12 +1105,10 @@ public class DATA { new EntityModel(DataType.UNIT_Behemoth, EntityType.Army) .AddPart(new EntityInfoModel { Name = "Behemoth", Descriptive = DescriptiveType.Skirmisher }) .AddPart(new EntityTierModel { Tier = 3.5f }) - .AddPart(new EntityRequirementModel { - Name = "Bone Canopy", DataType = DataType.BUILDING_BoneCanopy, + .AddPart(new EntityRequirementModel{ DataType = DataType.BUILDING_BoneCanopy, Requirement = RequirementType.Production_Building }) - .AddPart(new EntityRequirementModel { - Name = "Neurocyte", DataType = DataType.BUILDING_Neurocyte, + .AddPart(new EntityRequirementModel{ DataType = DataType.BUILDING_Neurocyte, Requirement = RequirementType.Research_Building }) .AddPart(new EntityHotkeyModel { Hotkey = "A", HoldSpace = true, HotkeyGroup = "Z" }) @@ -1279,9 +1143,7 @@ public class DATA { .AddPart(new EntityHotkeyModel { Hotkey = "Q", HotkeyGroup = "TAB" }) .AddPart(new EntityFactionModel { Faction = FactionType.QRath }) .AddPart(new EntityProductionModel { Alloy = 50, Ether = 100, BuildTime = 60 }) - .AddPart(new EntityRequirementModel { - DataType = DataType.BUILDING_Reliquary, Requirement = RequirementType.Production_Building, - Name = "Reliquary" + .AddPart(new EntityRequirementModel{ Requirement = RequirementType.Production_Building }) }, { DataType.UPGRADE_RelicOfTheWrathfulGaze, @@ -1295,7 +1157,7 @@ public class DATA { .AddPart(new EntityProductionModel { Alloy = 75, Ether = 75, BuildTime = 29 }) .AddPart(new EntityRequirementModel { DataType = DataType.BUILDING_HouseOfFadingSaints, - Requirement = RequirementType.Production_Building, Name = "House of Fading Saints" + Requirement = RequirementType.Production_Building }) }, { DataType.UPGRADE_WindStep, @@ -1305,10 +1167,7 @@ public class DATA { .AddPart(new EntityHotkeyModel { Hotkey = "W", HotkeyGroup = "TAB" }) .AddPart(new EntityFactionModel { Faction = FactionType.QRath }) .AddPart(new EntityProductionModel { Alloy = 50, Ether = 75, BuildTime = 55 }) - .AddPart(new EntityRequirementModel { - DataType = DataType.BUILDING_Reliquary, Requirement = RequirementType.Production_Building, - Name = "Reliquary" - }) + .AddPart(new EntityRequirementModel{ Requirement = RequirementType.Production_Building }) }, { DataType.UPGRADE_ZephyrRange, new EntityModel(DataType.UPGRADE_ZephyrRange, EntityType.Tech) @@ -1319,10 +1178,7 @@ public class DATA { .AddPart(new EntityHotkeyModel { Hotkey = "E", HotkeyGroup = "TAB" }) .AddPart(new EntityFactionModel { Faction = FactionType.QRath }) .AddPart(new EntityProductionModel { Alloy = 150, Ether = 100, BuildTime = 43 }) - .AddPart(new EntityRequirementModel { - DataType = DataType.BUILDING_Reliquary, Requirement = RequirementType.Production_Building, - Name = "Reliquary" - }) + .AddPart(new EntityRequirementModel{ Requirement = RequirementType.Production_Building}) .AddPart(new EntityIdUpgradeModel { Id = DataType.UPGRADE_WindStep }) .AddPart(new EntityIdUpgradeModel { Id = DataType.UPGRADE_ZephyrRange }) }, { @@ -1337,7 +1193,7 @@ public class DATA { .AddPart(new EntityProductionModel { Alloy = 75, Ether = 100, BuildTime = 60 }) .AddPart(new EntityRequirementModel { DataType = DataType.BUILDING_HouseOfFadingSaints, - Requirement = RequirementType.Production_Building, Name = "House of Fading Saints" + Requirement = RequirementType.Production_Building }) }, { DataType.UPGRADE_IconOfKhastEem, @@ -1349,9 +1205,7 @@ public class DATA { .AddPart(new EntityHotkeyModel { Hotkey = "Q", HoldSpace = true, HotkeyGroup = "TAB" }) .AddPart(new EntityFactionModel { Faction = FactionType.QRath }) .AddPart(new EntityProductionModel { Alloy = 100, Ether = 100, BuildTime = 43 }) - .AddPart(new EntityRequirementModel { - DataType = DataType.BUILDING_EyeOfAros, Requirement = RequirementType.Production_Building, - Name = "Eye of Aros" + .AddPart(new EntityRequirementModel{ Requirement = RequirementType.Production_Building }) }, { DataType.UPGRADE_BladesOfTheGodhead, @@ -1363,10 +1217,7 @@ public class DATA { .AddPart(new EntityHotkeyModel { Hotkey = "A", HoldSpace = true, HotkeyGroup = "TAB" }) .AddPart(new EntityFactionModel { Faction = FactionType.QRath }) .AddPart(new EntityProductionModel { Alloy = 100, Ether = 75, BuildTime = 45 }) - .AddPart(new EntityRequirementModel { - DataType = DataType.BUILDING_BearerOfTheCrown, - Requirement = RequirementType.Production_Building, Name = "Bearer of the Crown" - }) + .AddPart(new EntityRequirementModel { DataType = DataType.BUILDING_BearerOfTheCrown, Requirement = RequirementType.Production_Building }) }, { DataType.UPGRADE_WingsOfTheKenLatir, new EntityModel(DataType.UPGRADE_WingsOfTheKenLatir, EntityType.Tech) @@ -1377,10 +1228,7 @@ public class DATA { .AddPart(new EntityHotkeyModel { Hotkey = "R", HoldSpace = true, HotkeyGroup = "TAB" }) .AddPart(new EntityFactionModel { Faction = FactionType.QRath }) .AddPart(new EntityProductionModel { Alloy = 150, Ether = 100, BuildTime = 30 }) - .AddPart(new EntityRequirementModel { - DataType = DataType.BUILDING_BearerOfTheCrown, - Requirement = RequirementType.Production_Building, Name = "Bearer of the Crown" - }) + .AddPart(new EntityRequirementModel { DataType = DataType.BUILDING_BearerOfTheCrown, Requirement = RequirementType.Production_Building}) }, // Upgrades // Aru @@ -1391,12 +1239,10 @@ public class DATA { { Name = "Offering", Descriptive = DescriptiveType.Upgrade, Description = "Unlocks Offering" }) .AddPart(new EntityHotkeyModel { Hotkey = "W", HotkeyGroup = "TAB" }) .AddPart(new EntityFactionModel { Faction = FactionType.Aru }) - .AddPart(new EntityRequirementModel { - Name = "Altar of Worthy", DataType = DataType.BUILDING_AltarOfTheWorthy, + .AddPart(new EntityRequirementModel{ DataType = DataType.BUILDING_AltarOfTheWorthy, Requirement = RequirementType.Research_Building }) - .AddPart(new EntityRequirementModel { - Name = "Neurocyte", DataType = DataType.BUILDING_Neurocyte, + .AddPart(new EntityRequirementModel{ DataType = DataType.BUILDING_Neurocyte, Requirement = RequirementType.Production_Building }) .AddPart(new EntityProductionModel { Alloy = 100, Ether = 80, BuildTime = 60 }) @@ -1407,12 +1253,10 @@ public class DATA { { Name = "Blood Mother's Fevor", Descriptive = DescriptiveType.Upgrade }) .AddPart(new EntityHotkeyModel { Hotkey = "V", HotkeyGroup = "TAB" }) .AddPart(new EntityFactionModel { Faction = FactionType.Aru }) - .AddPart(new EntityRequirementModel { - Name = "Amber Womb", DataType = DataType.BUILDING_AmberWomb, + .AddPart(new EntityRequirementModel{ DataType = DataType.BUILDING_AmberWomb, Requirement = RequirementType.Research_Building }) - .AddPart(new EntityRequirementModel { - Name = "Neurocyte", DataType = DataType.BUILDING_Neurocyte, + .AddPart(new EntityRequirementModel{ DataType = DataType.BUILDING_Neurocyte, Requirement = RequirementType.Research_Building }) .AddPart(new EntityProductionModel { Alloy = 100, Ether = 150, BuildTime = 80 }) @@ -1422,8 +1266,7 @@ public class DATA { .AddPart(new EntityInfoModel { Name = "Den Instinct", Descriptive = DescriptiveType.Upgrade }) .AddPart(new EntityHotkeyModel { Hotkey = "E", HotkeyGroup = "TAB" }) .AddPart(new EntityFactionModel { Faction = FactionType.Aru }) - .AddPart(new EntityRequirementModel { - Name = "Neurocyte", DataType = DataType.BUILDING_Neurocyte, + .AddPart(new EntityRequirementModel{ DataType = DataType.BUILDING_Neurocyte, Requirement = RequirementType.Research_Building }) .AddPart(new EntityProductionModel { Alloy = 100, Ether = 120, BuildTime = 45 }) @@ -1433,8 +1276,7 @@ public class DATA { .AddPart(new EntityInfoModel { Name = "Pursuit Ligaments", Descriptive = DescriptiveType.Upgrade }) .AddPart(new EntityHotkeyModel { Hotkey = "R", HotkeyGroup = "TAB" }) .AddPart(new EntityFactionModel { Faction = FactionType.Aru }) - .AddPart(new EntityRequirementModel { - Name = "Neurocyte", DataType = DataType.BUILDING_Neurocyte, + .AddPart(new EntityRequirementModel{ DataType = DataType.BUILDING_Neurocyte, Requirement = RequirementType.Research_Building }) .AddPart(new EntityProductionModel { Alloy = 75, Ether = 100, BuildTime = 45 }) @@ -1444,12 +1286,10 @@ public class DATA { .AddPart(new EntityInfoModel { Name = "Resinant Deploy", Descriptive = DescriptiveType.Upgrade }) .AddPart(new EntityHotkeyModel { Hotkey = "F", HotkeyGroup = "TAB" }) .AddPart(new EntityFactionModel { Faction = FactionType.Aru }) - .AddPart(new EntityRequirementModel { - Name = "Neurocyte", DataType = DataType.BUILDING_Neurocyte, + .AddPart(new EntityRequirementModel{ DataType = DataType.BUILDING_Neurocyte, Requirement = RequirementType.Research_Building }) - .AddPart(new EntityRequirementModel { - Name = "Amber Womb", DataType = DataType.BUILDING_AmberWomb, + .AddPart(new EntityRequirementModel{ DataType = DataType.BUILDING_AmberWomb, Requirement = RequirementType.Research_Building }) .AddPart(new EntityProductionModel { Alloy = 50, Ether = 100, BuildTime = 43 }) @@ -1459,8 +1299,7 @@ public class DATA { .AddPart(new EntityInfoModel { Name = "Xacal Damage", Descriptive = DescriptiveType.Upgrade }) .AddPart(new EntityHotkeyModel { Hotkey = "Q", HotkeyGroup = "TAB" }) .AddPart(new EntityFactionModel { Faction = FactionType.Aru }) - .AddPart(new EntityRequirementModel { - Name = "Neurocyte", DataType = DataType.BUILDING_Neurocyte, + .AddPart(new EntityRequirementModel{ DataType = DataType.BUILDING_Neurocyte, Requirement = RequirementType.Research_Building }) .AddPart(new EntityProductionModel { Alloy = 100, Ether = 75, BuildTime = 60 }) @@ -1470,23 +1309,21 @@ public class DATA { .AddPart(new EntityInfoModel { Name = "Behemoth Capacity", Descriptive = DescriptiveType.Upgrade }) .AddPart(new EntityHotkeyModel { Hotkey = "A", HotkeyGroup = "TAB", HoldSpace = true }) .AddPart(new EntityFactionModel { Faction = FactionType.Aru }) - .AddPart(new EntityRequirementModel { - Name = "Deep Nest", DataType = DataType.BUILDING_DeepNest, + .AddPart(new EntityRequirementModel{ DataType = DataType.BUILDING_DeepNest, Requirement = RequirementType.Research_Building }) .AddPart(new EntityProductionModel { Alloy = 150, Ether = 150, BuildTime = 46 }) }, { - DataType.UPGRADE_WraithBow, - new EntityModel(DataType.UPGRADE_WraithBow, EntityType.Tech) - .AddPart(new EntityInfoModel { Name = "Wraith Bow", Descriptive = DescriptiveType.Upgrade }) + DataType.UPGRADE_WraithBowRange, + new EntityModel(DataType.UPGRADE_WraithBowRange, EntityType.Tech) + .AddPart(new EntityInfoModel { Name = "Wraith Bow Range", Description = "Increase's the range of the Wraith Bow anti-air attack.", Descriptive = DescriptiveType.Upgrade }) .AddPart(new EntityHotkeyModel { Hotkey = "W", HotkeyGroup = "TAB", HoldSpace = true }) .AddPart(new EntityFactionModel { Faction = FactionType.Aru }) - .AddPart(new EntityRequirementModel { - Name = "Neurocyte", DataType = DataType.BUILDING_Neurocyte, + .AddPart(new EntityRequirementModel{ DataType = DataType.BUILDING_Neurocyte, Requirement = RequirementType.Research_Building }) .AddPart(new EntityProductionModel { Alloy = 50, Ether = 75, BuildTime = 29 }) - .AddPart(new EntityIdUpgradeModel { Id = DataType.UPGRADE_WraithBow }) + .AddPart(new EntityIdUpgradeModel { Id = DataType.UPGRADE_WraithBowRange }) }, { DataType.UPGRADE_BloodPlague, new EntityModel(DataType.UPGRADE_BloodPlague, EntityType.Tech) @@ -1496,8 +1333,7 @@ public class DATA { }) .AddPart(new EntityHotkeyModel { Hotkey = "F", HotkeyGroup = "TAB", HoldSpace = true }) .AddPart(new EntityFactionModel { Faction = FactionType.Aru }) - .AddPart(new EntityRequirementModel { - Name = "Blood Vale", DataType = DataType.BUILDING_RedVale, + .AddPart(new EntityRequirementModel{ DataType = DataType.BUILDING_RedVale, Requirement = RequirementType.Research_Building }) .AddPart(new EntityProductionModel { Alloy = 75, Ether = 120, BuildTime = 80 }) @@ -1510,17 +1346,29 @@ public class DATA { .AddPart(new EntityInfoModel { Name = "Birthing Storm", Descriptive = DescriptiveType.Upgrade }) .AddPart(new EntityHotkeyModel { Hotkey = "F", HotkeyGroup = "TAB", HoldSpace = true }) .AddPart(new EntityFactionModel { Faction = FactionType.Aru }) - .AddPart(new EntityRequirementModel { - Name = "Blood Vale", DataType = DataType.BUILDING_RedVale, + .AddPart(new EntityRequirementModel{ DataType = DataType.BUILDING_RedVale, Requirement = RequirementType.Research_Building }) .AddPart(new EntityProductionModel { Alloy = 75, Ether = 120, BuildTime = 80 }) .AddPart(new EntityVanguardAddedModel { ImmortalId = DataType.IMMORTAL_Mala, ReplaceId = DataType.ABILITY_BloodPlague }) }, - + // Passives + // Neutral + { + DataType.PASSIVE_Respite, + new EntityModel(DataType.PASSIVE_Respite, EntityType.Passive) + .AddPart(new EntityInfoModel { + Name = "Respite", Descriptive = DescriptiveType.Ability, + Description = + @"Nearby units will slowly heal after not attacking for several seconds." + }) + .AddPart(new EntityFactionModel { Faction = FactionType.Any }) + }, + // Passives // Q'Rath Passives + { DataType.PASSIVE_MendingCommand, new EntityModel(DataType.PASSIVE_MendingCommand, EntityType.Passive) @@ -1889,7 +1737,6 @@ public class DATA { .AddPart(new EntityVanguardAddedModel { ImmortalId = DataType.IMMORTAL_Mala, ReplaceId = DataType.UNIT_Acaaluk }) .AddPart(new EntityProductionModel { Energy = 80, BuildTime = 4, Cooldown = 20 }) .AddPart(new EntitySupplyModel { Takes = 0 }) - .AddPart(new EntityRequirementModel { Name = "Red Seer", DataType = DataType.UNIT_RedSeer }) .AddPart(new EntityVitalityModel { Health = 300, DefenseLayer = 100, Armor = ArmorType.Heavy }) .AddPart(new EntityMovementModel { Speed = 0, Movement = MovementType.Ground }) .AddPart(new EntityWeaponModel { @@ -1907,8 +1754,7 @@ public class DATA { .AddPart(new EntityFactionModel { Faction = FactionType.Aru }) .AddPart(new EntityProductionModel { Alloy = 100, BuildTime = 25 }) .AddPart(new EntitySupplyModel { Takes = 6 }) - .AddPart(new EntityRequirementModel - { Name = "Red Seer", DataType = DataType.UNIT_RedSeer, Requirement = RequirementType.Morph }) + .AddPart(new EntityRequirementModel{ Requirement = RequirementType.Morph }) .AddPart(new EntityVitalityModel { Health = 200, DefenseLayer = 60, Armor = ArmorType.Heavy }) .AddPart(new EntityMovementModel { Speed = 210, Movement = MovementType.Ground }) .AddPart(new EntityWeaponModel @@ -1932,6 +1778,7 @@ public class DATA { Damage = 20, Range = 800, AttacksPerSecond = 1.124f, Targets = TargetType.All, MediumDamage = 25, HeavyDamage = 30 }) + .AddPart(new EntityIdPassiveModel(){Id = DataType.PASSIVE_Respite}) }, { DataType.ISPELL_PillarOfHeaven, new EntityModel(DataType.ISPELL_PillarOfHeaven, EntityType.Pyre_Spell) @@ -2008,6 +1855,7 @@ public class DATA { { Health = 1200, DefenseLayer = 200, Armor = ArmorType.Heavy, IsStructure = true }) .AddPart(new EntityWeaponModel { Damage = 15, Range = 800, AttacksPerSecond = 1.887f, Targets = TargetType.All }) + .AddPart(new EntityIdPassiveModel(){Id = DataType.PASSIVE_Respite}) }, { DataType.ISPELL_ConstructBloodWell, new EntityModel(DataType.ISPELL_ConstructBloodWell, EntityType.Pyre_Spell) @@ -2079,8 +1927,7 @@ public class DATA { }) .AddPart(new EntityHotkeyModel { Hotkey = "E", HotkeyGroup = "CONTROL" }) .AddPart(new EntityFactionModel { Faction = FactionType.QRath }) - .AddPart(new EntityRequirementModel { - Name = "Acropolis", DataType = DataType.BUILDING_Acropolis, Requirement = RequirementType.Morph + .AddPart(new EntityRequirementModel{ Requirement = RequirementType.Morph }) .AddPart(new EntityProductionModel { Alloy = 75, BuildTime = 20, RequiresWorker = false }) .AddPart(new EntityHarvestModel { @@ -2096,8 +1943,7 @@ public class DATA { }) .AddPart(new EntityHotkeyModel { Hotkey = "R", HotkeyGroup = "CONTROL" }) .AddPart(new EntityFactionModel { Faction = FactionType.QRath }) - .AddPart(new EntityRequirementModel { - Name = "Mining Level 2", DataType = DataType.BUPGRADE_MiningLevel2_QRath, + .AddPart(new EntityRequirementModel{ DataType = DataType.BUPGRADE_MiningLevel2_QRath, Requirement = RequirementType.Morph }) .AddPart(new EntityProductionModel { Alloy = 125, BuildTime = 20, RequiresWorker = false }) @@ -2134,7 +1980,8 @@ public class DATA { .AddPart(new EntityProductionModel { Alloy = 250, BuildTime = 38, RequiresWorker = true }) .AddPart(new EntityVitalityModel { Health = 500, DefenseLayer = 500, Armor = ArmorType.Heavy, IsStructure = true }) - }, { + }, + { DataType.DEFENSE_FireSinger, new EntityModel(DataType.DEFENSE_FireSinger, EntityType.Building) .AddPart(new EntityInfoModel { @@ -2145,12 +1992,27 @@ public class DATA { .AddPart(new EntityFactionModel { Faction = FactionType.QRath }) .AddPart(new EntityProductionModel { Alloy = 150, BuildTime = 30, RequiresWorker = true }) .AddPart(new EntityRequirementModel { - Name = "Legion Hall", DataType = DataType.BUILDING_LegionHall, - Requirement = RequirementType.Production_Building + DataType = DataType.BUILDING_KeeperOfTheHardenedFlames, + Requirement = RequirementType.Research_Building }) .AddPart(new EntityVitalityModel { Health = 300, DefenseLayer = 300, Armor = ArmorType.Heavy, IsStructure = true }) - }, { + }, + { + DataType.BUILDING_KeeperOfTheHardenedFlames, + new EntityModel(DataType.BUILDING_KeeperOfTheHardenedFlames, EntityType.Building_Upgrade) + .AddPart(new EntityInfoModel { + Name = "Keeper Of the Hardened Flames", Descriptive = DescriptiveType.Defense, + Description = "" + }) + .AddPart(new EntityHotkeyModel { Hotkey = "V", HoldSpace = true, HotkeyGroup = "C" }) + .AddPart(new EntityFactionModel { Faction = FactionType.QRath }) + .AddPart(new EntityProductionModel { Alloy = 125, BuildTime = 30, RequiresWorker = true }) + .AddPart(new EntityVitalityModel + { Health = 350, DefenseLayer = 450, Armor = ArmorType.Heavy, IsStructure = true }) + }, + + { DataType.BUILDING_Reliquary, new EntityModel(DataType.BUILDING_Reliquary, EntityType.Building) .AddPart(new EntityInfoModel { @@ -2162,8 +2024,7 @@ public class DATA { .AddPart(new EntityFactionModel { Faction = FactionType.QRath }) .AddPart(new EntityProductionModel { Alloy = 150, Ether = 10, BuildTime = 45, RequiresWorker = true }) - .AddPart(new EntityRequirementModel { - Name = "Legion Hall", DataType = DataType.BUILDING_LegionHall, + .AddPart(new EntityRequirementModel{ DataType = DataType.BUILDING_LegionHall, Requirement = RequirementType.Production_Building }) .AddPart(new EntityVitalityModel @@ -2180,8 +2041,7 @@ public class DATA { .AddPart(new EntityProductionModel { Alloy = 250, Ether = 80, BuildTime = 45, RequiresWorker = true }) .AddPart(new EntitySupplyModel { Grants = 16 }) - .AddPart(new EntityRequirementModel { - Name = "Legion Hall", DataType = DataType.BUILDING_LegionHall, + .AddPart(new EntityRequirementModel{ DataType = DataType.BUILDING_LegionHall, Requirement = RequirementType.Production_Building }) .AddPart(new EntityVitalityModel @@ -2197,12 +2057,11 @@ public class DATA { .AddPart(new EntityFactionModel { Faction = FactionType.QRath }) .AddPart(new EntityProductionModel { Alloy = 175, Ether = 200, BuildTime = 52, RequiresWorker = true }) - .AddPart(new EntityRequirementModel { - Name = "Soul Foundry", DataType = DataType.BUILDING_SoulFoundry, + .AddPart(new EntityRequirementModel{ DataType = DataType.BUILDING_SoulFoundry, Requirement = RequirementType.Production_Building }) .AddPart(new EntityVitalityModel - { Health = 1600, DefenseLayer = 800, Armor = ArmorType.Heavy, IsStructure = true }) + { Health = 500, DefenseLayer = 500, Armor = ArmorType.Heavy, IsStructure = true }) }, { DataType.BUILDING_Angelarium, new EntityModel(DataType.BUILDING_Angelarium, EntityType.Building) @@ -2215,12 +2074,11 @@ public class DATA { .AddPart(new EntityProductionModel { Alloy = 250, Ether = 80, BuildTime = 48, RequiresWorker = true }) .AddPart(new EntitySupplyModel { Grants = 16 }) - .AddPart(new EntityRequirementModel { - Name = "Soul Foundry", DataType = DataType.BUILDING_SoulFoundry, + .AddPart(new EntityRequirementModel{ DataType = DataType.BUILDING_SoulFoundry, Requirement = RequirementType.Production_Building }) .AddPart(new EntityVitalityModel - { Health = 1600, DefenseLayer = 800, Armor = ArmorType.Heavy, IsStructure = true }) + { Health = 600, DefenseLayer = 600, Armor = ArmorType.Heavy, IsStructure = true }) }, { DataType.BUILDING_EyeOfAros, new EntityModel(DataType.BUILDING_EyeOfAros, EntityType.Building) @@ -2232,8 +2090,7 @@ public class DATA { .AddPart(new EntityFactionModel { Faction = FactionType.QRath }) .AddPart(new EntityProductionModel { Alloy = 200, Ether = 200, BuildTime = 36, RequiresWorker = true }) - .AddPart(new EntityRequirementModel { - Name = "Angelarium", DataType = DataType.BUILDING_Angelarium, + .AddPart(new EntityRequirementModel{ DataType = DataType.BUILDING_Angelarium, Requirement = RequirementType.Production_Building }) .AddPart(new EntityVitalityModel @@ -2249,8 +2106,7 @@ public class DATA { .AddPart(new EntityFactionModel { Faction = FactionType.QRath }) .AddPart(new EntityProductionModel { Alloy = 250, Ether = 200, BuildTime = 52, RequiresWorker = true }) - .AddPart(new EntityRequirementModel { - Name = "Angelarium", DataType = DataType.BUILDING_Angelarium, + .AddPart(new EntityRequirementModel{ DataType = DataType.BUILDING_Angelarium, Requirement = RequirementType.Production_Building }) .AddPart(new EntityVitalityModel @@ -2284,12 +2140,10 @@ public class DATA { .AddPart(new EntityFactionModel { Faction = FactionType.Aru }) .AddPart(new EntityVitalityModel { Health = 2150, DefenseLayer = 450, Armor = ArmorType.Heavy, IsStructure = true }) - .AddPart(new EntityRequirementModel { - Name = "Grove Heart", DataType = DataType.STARTING_TownHall_Aru, + .AddPart(new EntityRequirementModel{ DataType = DataType.STARTING_TownHall_Aru, Requirement = RequirementType.Morph }) - .AddPart(new EntityRequirementModel { - Name = "Altar of the Worthy", DataType = DataType.BUILDING_AltarOfTheWorthy, + .AddPart(new EntityRequirementModel{ DataType = DataType.BUILDING_AltarOfTheWorthy, Requirement = RequirementType.Research_Building }) .AddPart(new EntityProductionModel @@ -2303,8 +2157,7 @@ public class DATA { }) .AddPart(new EntityHotkeyModel { Hotkey = "E", HotkeyGroup = "CONTROL" }) .AddPart(new EntityFactionModel { Faction = FactionType.Aru }) - .AddPart(new EntityRequirementModel { - Name = "Grove Heart", DataType = DataType.BUILDING_GroveHeart, + .AddPart(new EntityRequirementModel{ DataType = DataType.BUILDING_GroveHeart, Requirement = RequirementType.Morph }) .AddPart(new EntityProductionModel { Alloy = 75, BuildTime = 20, RequiresWorker = false }) @@ -2321,8 +2174,7 @@ public class DATA { }) .AddPart(new EntityHotkeyModel { Hotkey = "R", HotkeyGroup = "CONTROL" }) .AddPart(new EntityFactionModel { Faction = FactionType.Aru }) - .AddPart(new EntityRequirementModel { - Name = "Mining Level 2", DataType = DataType.BUPGRADE_MiningLevel2_Aru, + .AddPart(new EntityRequirementModel{ DataType = DataType.BUPGRADE_MiningLevel2_Aru, Requirement = RequirementType.Morph }) .AddPart(new EntityProductionModel { Alloy = 125, BuildTime = 20, RequiresWorker = false }) @@ -2341,7 +2193,7 @@ public class DATA { .AddPart(new EntityFactionModel { Faction = FactionType.Aru }) .AddPart(new EntityProductionModel { Alloy = 100, BuildTime = 30, RequiresWorker = true }) .AddPart(new EntityVitalityModel - { Health = 500, DefenseLayer = 0, Armor = ArmorType.Heavy, IsStructure = true }) + { Health = 400, DefenseLayer = 100, Armor = ArmorType.Heavy, IsStructure = true }) .AddPart(new EntityHarvestModel { HarvestedPerInterval = 1.5625f, RequiresWorker = false, Resource = ResourceType.Ether, Slots = 1, TotalAmount = 1200 @@ -2357,7 +2209,7 @@ public class DATA { .AddPart(new EntityFactionModel { Faction = FactionType.Aru }) .AddPart(new EntitySupplyModel { Grants = 16 }) .AddPart(new EntityProductionModel { Alloy = 250, BuildTime = 36, RequiresWorker = true }) - .AddPart(new EntityVitalityModel { Health = 1000, Armor = ArmorType.Heavy, IsStructure = true }) + .AddPart(new EntityVitalityModel { Health = 900, DefenseLayer = 100, Armor = ArmorType.Heavy, IsStructure = true }) }, { DataType.BUILDING_Neurocyte, new EntityModel(DataType.BUILDING_Neurocyte, EntityType.Building) @@ -2369,13 +2221,13 @@ public class DATA { .AddPart(new EntityFactionModel { Faction = FactionType.Aru }) .AddPart(new EntityProductionModel { Alloy = 100, Ether = 75, BuildTime = 30, RequiresWorker = true }) - .AddPart(new EntityRequirementModel { - Name = "Altar of the Worthy", DataType = DataType.BUILDING_AltarOfTheWorthy, + .AddPart(new EntityRequirementModel{ DataType = DataType.BUILDING_AltarOfTheWorthy, Requirement = RequirementType.Production_Building }) .AddPart(new EntityVitalityModel { Health = 650, DefenseLayer = 150, Armor = ArmorType.Heavy, IsStructure = true }) - }, { + }, + { DataType.DEFENSE_Aerovore, new EntityModel(DataType.DEFENSE_Aerovore, EntityType.Building) .AddPart(new EntityInfoModel { @@ -2387,17 +2239,20 @@ public class DATA { .AddPart(new EntityProductionModel { Alloy = 100, BuildTime = 18, RequiresWorker = true }) .AddPart(new EntityVitalityModel { Health = 300, DefenseLayer = 50, Armor = ArmorType.Heavy, IsStructure = true }) - }, { + }, + { DataType.BUPGRADE_Omnivore, new EntityModel(DataType.BUPGRADE_Omnivore, EntityType.Building_Upgrade) .AddPart(new EntityInfoModel { Name = "Omnivore", Descriptive = DescriptiveType.Upgrade }) .AddPart(new EntityHotkeyModel { Hotkey = "Q", HotkeyGroup = "SHIFT" }) .AddPart(new EntityFactionModel { Faction = FactionType.Aru }) - .AddPart(new EntityRequirementModel { - Name = "Aerovore", DataType = DataType.DEFENSE_Aerovore, Requirement = RequirementType.Morph - }) + .AddPart(new EntityRequirementModel{ Requirement = RequirementType.Morph }) .AddPart(new EntityProductionModel { Alloy = 50, BuildTime = 18, RequiresWorker = false }) - }, { + .AddPart(new EntityVitalityModel + { Health = 400, DefenseLayer = 50, Armor = ArmorType.Heavy, IsStructure = true }) + + }, + { DataType.BUILDING_AmberWomb, new EntityModel(DataType.BUILDING_AmberWomb, EntityType.Building) .AddPart(new EntityInfoModel { @@ -2409,15 +2264,13 @@ public class DATA { .AddPart(new EntityProductionModel { Alloy = 250, Ether = 80, BuildTime = 45, RequiresWorker = true }) .AddPart(new EntitySupplyModel { Grants = 16 }) - .AddPart(new EntityRequirementModel { - Name = "Altar of the Worthy", DataType = DataType.BUILDING_AltarOfTheWorthy, + .AddPart(new EntityRequirementModel{ DataType = DataType.BUILDING_AltarOfTheWorthy, Requirement = RequirementType.Research_Building }) - .AddPart(new EntityRequirementModel { - Name = "God Heart", DataType = DataType.BUPGRADE_GodHeart, + .AddPart(new EntityRequirementModel{ DataType = DataType.BUPGRADE_GodHeart, Requirement = RequirementType.Research_Building }) - .AddPart(new EntityVitalityModel { Health = 1250, Armor = ArmorType.Heavy, IsStructure = true }) + .AddPart(new EntityVitalityModel { Health = 1000, DefenseLayer = 250, Armor = ArmorType.Heavy, IsStructure = true }) }, { DataType.BUILDING_BoneCanopy, new EntityModel(DataType.BUILDING_BoneCanopy, EntityType.Building) @@ -2430,11 +2283,10 @@ public class DATA { .AddPart(new EntityProductionModel { Alloy = 250, Ether = 80, BuildTime = 36, RequiresWorker = true }) .AddPart(new EntitySupplyModel { Grants = 16 }) - .AddPart(new EntityRequirementModel { - Name = "God Heart", DataType = DataType.BUPGRADE_GodHeart, + .AddPart(new EntityRequirementModel{ DataType = DataType.BUPGRADE_GodHeart, Requirement = RequirementType.Research_Building }) - .AddPart(new EntityVitalityModel { Health = 1250, Armor = ArmorType.Heavy, IsStructure = true }) + .AddPart(new EntityVitalityModel { Health = 1000, DefenseLayer = 300, Armor = ArmorType.Heavy, IsStructure = true }) }, { DataType.BUILDING_RedVale, new EntityModel(DataType.BUILDING_RedVale, EntityType.Building) @@ -2446,8 +2298,7 @@ public class DATA { .AddPart(new EntityFactionModel { Faction = FactionType.Aru }) .AddPart(new EntityProductionModel { Alloy = 100, Ether = 100, BuildTime = 36, RequiresWorker = true }) - .AddPart(new EntityRequirementModel { - Name = "Altar of the Worthy", DataType = DataType.BUILDING_AltarOfTheWorthy, + .AddPart(new EntityRequirementModel{ DataType = DataType.BUILDING_AltarOfTheWorthy, Requirement = RequirementType.Production_Building }) .AddPart(new EntityVitalityModel @@ -2463,8 +2314,7 @@ public class DATA { .AddPart(new EntityFactionModel { Faction = FactionType.Aru }) .AddPart(new EntityProductionModel { Alloy = 175, Ether = 150, BuildTime = 38, RequiresWorker = true }) - .AddPart(new EntityRequirementModel { - Name = "Bone Canopy", DataType = DataType.BUILDING_BoneCanopy, + .AddPart(new EntityRequirementModel{ DataType = DataType.BUILDING_BoneCanopy, Requirement = RequirementType.Research_Building }) .AddPart(new EntityVitalityModel diff --git a/Model/Entity/Data/Ids_Entity.cs b/Model/Entity/Data/Ids_Entity.cs index 62a7e83..8e33bd9 100644 --- a/Model/Entity/Data/Ids_Entity.cs +++ b/Model/Entity/Data/Ids_Entity.cs @@ -23,7 +23,6 @@ public static class DataType { public static string FACTION_YRiah = "c7537d12-a536-4ef5-99b9-d7ad704716fe"; public static string FACTION_ArkShai = "ffe82eea-b8c6-4933-9230-cd019fd1c259"; public static string FACTION_Herlesh = "e6c09f4a-ae7d-4bfd-b5d4-a63445d59498"; - public static string FACTION_EntralledRae = "9316a2a1-a8e6-47ae-a4c6-411ff54f949a"; public static string FACTION_Khardu = "a1764de6-8178-4775-819a-59d23677dd76"; public static string COMMAND_Attack = "168486ff-581e-46da-a308-74f1d7d615fd"; public static string COMMAND_StandGround = "cb9ee44f-7293-4a82-826c-a3829491006b"; @@ -76,6 +75,10 @@ public static class DataType { public static string BUILDING_DeepNest = "3076ae6e-89bf-4ea1-a66c-ea45ffcb4046"; public static string BUILDING_Neurocyte = "90c6e53f-0430-4992-a1eb-4f91699292cb"; public static string DEFENSE_FireSinger = "c7a90286-6977-4d92-91e0-2a0a46eb13ea"; + + public static string BUILDING_KeeperOfTheHardenedFlames = "db784823-5199-4bae-bc5e-96174490cd00"; + + public static string DEFENSE_Aerovore = "b68307b7-4759-43a3-8679-d844ac3aa73f"; public static string UPGRADE_FaithCastBlades = "32087a66-900e-4f25-95f7-de56d5b424c7"; public static string UPGRADE_RelicOfTheWrathfulGaze = "e6fa5ded-53f5-4914-85bb-1fdff5f32b64"; @@ -91,11 +94,14 @@ public static class DataType { public static string UPGRADE_PursuitLigaments = "51a4e848-ae67-4182-9c1f-27cb24e9c531"; public static string UPGRADE_XacalDamage = "f10b8f7a-0c52-4e78-8d7d-002ac14e8862"; public static string UPGRADE_ResinantDeploy = "29f49353-8fdf-4c5d-b034-37f96447dedb"; - public static string UPGRADE_WraithBow = "80c09dc3-28a5-48cf-886e-c7f5a52f6b47"; + public static string UPGRADE_WraithBowRange = "80c09dc3-28a5-48cf-886e-c7f5a52f6b47"; public static string UPGRADE_BehemothCapacity = "d0390dd2-d9a5-4b20-9d8b-f554f4c52143"; public static string UPGRADE_BloodPlague = "9c207e21-f595-49d0-967d-f30ca8cc3745"; public static string UPGRADE_BirthingStorm = "0cb2f1a4-03b3-491b-9db3-d2d4590ede3a"; + + public static string PASSIVE_Respite = "607c39f4-a957-4a7a-8fc6-a239f9e570ec"; + public static string PASSIVE_OssifyingSwarm = "b8897247-8393-416e-b246-409a6b3263c2"; diff --git a/Model/Entity/Parts/EntityRequirementModel.cs b/Model/Entity/Parts/EntityRequirementModel.cs index ee46262..056107b 100644 --- a/Model/Entity/Parts/EntityRequirementModel.cs +++ b/Model/Entity/Parts/EntityRequirementModel.cs @@ -4,7 +4,6 @@ namespace Model.Immortal.Entity.Parts; public class EntityRequirementModel : IEntityPartInterface { public string Type { get; set; } = "EntityRequirementModel"; - public string Name { get; set; } = ""; public string DataType { get; set; } public string Requirement { get; set; } = RequirementType.Production_Building; } \ No newline at end of file diff --git a/Services/Website/EntityDialogService.cs b/Services/Website/EntityDialogService.cs index a88a444..fdfd531 100644 --- a/Services/Website/EntityDialogService.cs +++ b/Services/Website/EntityDialogService.cs @@ -1,4 +1,5 @@ -using Model.Immortal.Entity; +using System.ComponentModel.DataAnnotations; +using DataType = Model.Immortal.Entity.Data.DataType; namespace Services.Website;