JonathanMcCaffrey
/
IGP-Fan-Reference
1
0
Fork 0
Code Issues 26 Pull Requests Projects 1 Releases Wiki Activity
Browse Source

style(BuildCalc) Bank UI improvements and code cleanup

main
Jonathan McCaffrey 4 years ago
parent
85e8f3c278
commit
fb70b788bc
8 changed files with 172 additions and 107 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 38
      IGP/Pages/BuildCalculator/Parts/BankComponent.razor
  2. 6
      IGP/Pages/BuildCalculator/Parts/BuildChartComponent.razor
  3. 4
      IGP/Pages/EconomyComparison/Parts/ChartComponent.razor
  4. 2
      Model/Economy/EconomyModel.cs
  5. 2
      Services/IServices.cs
  6. 2
      Services/Immortal/BuildOrderService.cs
  7. 8
      Services/Immortal/EconomyComparisonService.cs
  8. 217
      Services/Immortal/EconomyService.cs

38
IGP/Pages/BuildCalculator/Parts/BankComponent.razor
Unescape View File

@ -5,7 +5,7 @@
@implements IDisposable @implements IDisposable
<FormLayoutComponent> <div class="bankContainer">
<FormDisplayComponent Label="Time"> <FormDisplayComponent Label="Time">
<Display>@BuildOrderService.GetLastRequestInterval() | T @Interval.ToTime(BuildOrderService.GetLastRequestInterval())</Display> <Display>@BuildOrderService.GetLastRequestInterval() | T @Interval.ToTime(BuildOrderService.GetLastRequestInterval())</Display>
</FormDisplayComponent> </FormDisplayComponent>
@ -18,16 +18,42 @@
</FormDisplayComponent> </FormDisplayComponent>
</div> </div>
<div class="bankRow"> <div class="bankRow">
<FormDisplayComponent Label="Pyre"> <FormDisplayComponent Label="Pyre">
<Display>@economy.Pyre</Display> <Display>@economy.Pyre</Display>
</FormDisplayComponent> </FormDisplayComponent>
<FormDisplayComponent Label="Supply"> <FormDisplayComponent Label="Supply">
<Display>@supplyTaken / @supplyGranted (@(supplyGranted / 16)@(extraBuildings > 0 ? "+" + extraBuildings : ""))</Display> <Display>@supplyTaken / @supplyGranted (@(supplyGranted / 16)@(extraBuildings > 0 ? "+" + extraBuildings : ""))</Display>
</FormDisplayComponent> </FormDisplayComponent>
</div> </div>
</FormLayoutComponent>
<div>
<div class="workerText">Workers</div>
<div class="bankRow">
<FormDisplayComponent Label="Current">
<Display>@economy.WorkerCount</Display>
</FormDisplayComponent>
<FormDisplayComponent Label="Busy">
<Display>@economy.BusyWorkerCount</Display>
</FormDisplayComponent>
<FormDisplayComponent Label="Creating">
<Display>@economy.CreatingWorkerCount</Display>
</FormDisplayComponent>
</div>
</div>
</div>
<style> <style>
.bankContainer {
display: flex;
flex-direction: column;
gap: 5px;
}
.workerText {
margin-bottom: -2px;
font-size: 0.8em;
}
.bankRow { .bankRow {
display: flex; display: flex;
gap: 8px; gap: 8px;
@ -75,8 +101,6 @@
void OnBuildOrderChanged() void OnBuildOrderChanged()
{ {
Console.WriteLine("OnBuildOrderChanged()");
economy = EconomyService.GetEconomy(BuildOrderService.GetLastRequestInterval()); economy = EconomyService.GetEconomy(BuildOrderService.GetLastRequestInterval());
var ordersOverTime = BuildOrderService.GetOrders(); var ordersOverTime = BuildOrderService.GetOrders();

6
IGP/Pages/BuildCalculator/Parts/BuildChartComponent.razor
Unescape View File

@ -213,19 +213,19 @@ else
var economyAtSecond = economyOverTime[interval]; var economyAtSecond = economyOverTime[interval];
var alloyWorkerHarvesters = from harvester in economyAtSecond.Harvesters var alloyWorkerHarvesters = from harvester in economyAtSecond.HarvestPoints
where harvester.Harvest() != null where harvester.Harvest() != null
where harvester.Harvest().RequiresWorker where harvester.Harvest().RequiresWorker
where harvester.Harvest().Resource == ResourceType.Alloy where harvester.Harvest().Resource == ResourceType.Alloy
select harvester; select harvester;
var alloyAutomaticHarvesters = from harvester in economyAtSecond.Harvesters var alloyAutomaticHarvesters = from harvester in economyAtSecond.HarvestPoints
where harvester.Harvest() != null where harvester.Harvest() != null
where harvester.Harvest().RequiresWorker == false where harvester.Harvest().RequiresWorker == false
where harvester.Harvest().Resource == ResourceType.Alloy where harvester.Harvest().Resource == ResourceType.Alloy
select harvester; select harvester;
var etherAutomaticHarvesters = from harvester in economyAtSecond.Harvesters var etherAutomaticHarvesters = from harvester in economyAtSecond.HarvestPoints
where harvester.Harvest() != null where harvester.Harvest() != null
where harvester.Harvest().RequiresWorker == false where harvester.Harvest().RequiresWorker == false
where harvester.Harvest().Resource == ResourceType.Ether where harvester.Harvest().Resource == ResourceType.Ether

4
IGP/Pages/EconomyComparison/Parts/ChartComponent.razor
Unescape View File

@ -130,13 +130,13 @@
var economyAtSecond = economyOverTime[interval]; var economyAtSecond = economyOverTime[interval];
var alloyWorkerHarvesters = from harvester in economyAtSecond.Harvesters var alloyWorkerHarvesters = from harvester in economyAtSecond.HarvestPoints
where harvester.Harvest() != null where harvester.Harvest() != null
where harvester.Harvest().RequiresWorker where harvester.Harvest().RequiresWorker
where harvester.Harvest().Resource == ResourceType.Alloy where harvester.Harvest().Resource == ResourceType.Alloy
select harvester; select harvester;
var alloyAutomaticHarvesters = from harvester in economyAtSecond.Harvesters var alloyAutomaticHarvesters = from harvester in economyAtSecond.HarvestPoints
where harvester.Harvest() != null where harvester.Harvest() != null
where harvester.Harvest().RequiresWorker == false where harvester.Harvest().RequiresWorker == false
where harvester.Harvest().Resource == ResourceType.Alloy where harvester.Harvest().Resource == ResourceType.Alloy

2
Model/Economy/EconomyModel.cs
Unescape View File

@ -14,5 +14,5 @@ public class EconomyModel
public int BusyWorkerCount { get; set; } = 0; public int BusyWorkerCount { get; set; } = 0;
public int CreatingWorkerCount { get; set; } = 0; public int CreatingWorkerCount { get; set; } = 0;
public List<int> CreatingWorkerDelays { get; set; } = new(); public List<int> CreatingWorkerDelays { get; set; } = new();
public List<EntityModel> Harvesters { get; set; } = new(); public List<EntityModel> HarvestPoints { get; set; } = new();
} }

2
Services/IServices.cs
Unescape View File

@ -323,7 +323,7 @@ public interface IBuildOrderService
public int? WillMeetSupply(EntityModel entity); public int? WillMeetSupply(EntityModel entity);
public Dictionary<int, List<EntityModel>> GetOrders(); public Dictionary<int, List<EntityModel>> GetOrders();
public List<EntityModel> GetCompletedBefore(int interval); public List<EntityModel> GetCompletedBefore(int interval);
public List<EntityModel> GetHarvestersCompletedBefore(int interval); public List<EntityModel> GetHarvestPointsCompletedBefore(int interval);
public void RemoveLast(); public void RemoveLast();
public void Reset(); public void Reset();

2
Services/Immortal/BuildOrderService.cs
Unescape View File

@ -239,7 +239,7 @@ public class BuildOrderService : IBuildOrderService
select orders).ToList(); select orders).ToList();
} }
public List<EntityModel> GetHarvestersCompletedBefore(int interval) public List<EntityModel> GetHarvestPointsCompletedBefore(int interval)
{ {
return (from ordersAtTime in buildOrder.StartedOrders return (from ordersAtTime in buildOrder.StartedOrders
from orders in ordersAtTime.Value from orders in ordersAtTime.Value

8
Services/Immortal/EconomyComparisonService.cs
Unescape View File

@ -93,7 +93,7 @@ public class EconomyComparisionService : IEconomyComparisonService
economyAtSecond.WorkerCount = buildEconomyOverTime[interval - 1].WorkerCount; economyAtSecond.WorkerCount = buildEconomyOverTime[interval - 1].WorkerCount;
economyAtSecond.BusyWorkerCount = buildEconomyOverTime[interval - 1].BusyWorkerCount; economyAtSecond.BusyWorkerCount = buildEconomyOverTime[interval - 1].BusyWorkerCount;
economyAtSecond.CreatingWorkerCount = buildEconomyOverTime[interval - 1].CreatingWorkerCount; economyAtSecond.CreatingWorkerCount = buildEconomyOverTime[interval - 1].CreatingWorkerCount;
economyAtSecond.Harvesters = buildEconomyOverTime[interval - 1].Harvesters.ToList(); economyAtSecond.HarvestPoints = buildEconomyOverTime[interval - 1].HarvestPoints.ToList();
economyAtSecond.CreatingWorkerDelays = buildEconomyOverTime[interval - 1].CreatingWorkerDelays.ToList(); economyAtSecond.CreatingWorkerDelays = buildEconomyOverTime[interval - 1].CreatingWorkerDelays.ToList();
} }
@ -103,7 +103,7 @@ public class EconomyComparisionService : IEconomyComparisonService
float freeWorkers = economyAtSecond.WorkerCount - economyAtSecond.BusyWorkerCount; float freeWorkers = economyAtSecond.WorkerCount - economyAtSecond.BusyWorkerCount;
var workersNeeded = 0; var workersNeeded = 0;
economyAtSecond.Harvesters = economyAtSecond.HarvestPoints =
(from harvester in buildOrder.GetHarvestersCompletedBefore(interval) (from harvester in buildOrder.GetHarvestersCompletedBefore(interval)
select harvester).ToList(); select harvester).ToList();
@ -111,7 +111,7 @@ public class EconomyComparisionService : IEconomyComparisonService
economyAtSecond.Pyre += 1; economyAtSecond.Pyre += 1;
// Add funds // Add funds
foreach (var entity in economyAtSecond.Harvesters) foreach (var entity in economyAtSecond.HarvestPoints)
{ {
var harvester = entity.Harvest(); var harvester = entity.Harvest();
if (harvester.RequiresWorker) if (harvester.RequiresWorker)
@ -185,7 +185,7 @@ public class EconomyComparisionService : IEconomyComparisonService
foreach (var newEntity in completedAtInterval) foreach (var newEntity in completedAtInterval)
{ {
var harvest = newEntity; var harvest = newEntity;
if (harvest != null) economyAtSecond.Harvesters.Add(harvest); if (harvest != null) economyAtSecond.HarvestPoints.Add(harvest);
var production = newEntity.Production(); var production = newEntity.Production();
if (production != null && production.RequiresWorker) economyAtSecond.BusyWorkerCount -= 1; if (production != null && production.RequiresWorker) economyAtSecond.BusyWorkerCount -= 1;

217
Services/Immortal/EconomyService.cs
Unescape View File

@ -54,121 +54,162 @@ public class EconomyService : IEconomyService
buildEconomyOverTime[interval] = new EconomyModel(); buildEconomyOverTime[interval] = new EconomyModel();
var economyAtSecond = buildEconomyOverTime[interval]; var economyAtSecond = buildEconomyOverTime[interval];
if (interval > 0)
{ CarryOverEconomyFromPreviousInterval(interval, economyAtSecond);
economyAtSecond.Alloy = buildEconomyOverTime[interval - 1].Alloy;
economyAtSecond.Ether = buildEconomyOverTime[interval - 1].Ether; SetupCurrentInverval(buildOrder, economyAtSecond, interval);
economyAtSecond.Pyre = buildEconomyOverTime[interval - 1].Pyre; AddPassivePyreGain(interval, economyAtSecond);
economyAtSecond.WorkerCount = buildEconomyOverTime[interval - 1].WorkerCount; float freeWorkers = economyAtSecond.WorkerCount - economyAtSecond.BusyWorkerCount;
economyAtSecond.BusyWorkerCount = buildEconomyOverTime[interval - 1].BusyWorkerCount; var workersNeeded = AddFundsFromHarvestPoints(economyAtSecond, freeWorkers);
economyAtSecond.CreatingWorkerCount = buildEconomyOverTime[interval - 1].CreatingWorkerCount; workersNeeded -= CalculateCreatingWorkerCosts(economyAtSecond);
economyAtSecond.Harvesters = buildEconomyOverTime[interval - 1].Harvesters.ToList(); MakeNeededNewWorkersRequests(workersNeeded, economyAtSecond);
economyAtSecond.CreatingWorkerDelays = buildEconomyOverTime[interval - 1].CreatingWorkerDelays.ToList(); SubtractFundsOnRequestedOrders(buildOrder, interval, economyAtSecond);
} HandledAddingNewHarvestPointsAndWorkersToEconomy(buildOrder, interval, economyAtSecond);
}
economyAtSecond.Interval = interval;
// Add funds NotifyDataChanged();
float freeWorkers = economyAtSecond.WorkerCount - economyAtSecond.BusyWorkerCount; }
var workersNeeded = 0;
economyAtSecond.Harvesters = private static void SetupCurrentInverval(IBuildOrderService buildOrder, EconomyModel economyAtSecond, int interval)
(from harvester in buildOrder.GetHarvestersCompletedBefore(interval) {
select harvester).ToList(); economyAtSecond.Interval = interval;
economyAtSecond.HarvestPoints =
(from harvester in buildOrder.GetHarvestPointsCompletedBefore(interval)
select harvester).ToList();
}
// Add funds private static void HandledAddingNewHarvestPointsAndWorkersToEconomy(IBuildOrderService buildOrder, int interval,
if (interval % 3 == 0) EconomyModel economyAtSecond)
{
if (buildOrder.CompletedOrders.TryGetValue(interval, out var completedAtInterval))
foreach (var newEntity in completedAtInterval)
{ {
economyAtSecond.Pyre += 1; var harvest = newEntity;
if (harvest != null) economyAtSecond.HarvestPoints.Add(harvest);
var production = newEntity.Production();
if (production != null && production.RequiresWorker) economyAtSecond.BusyWorkerCount -= 1;
} }
// Add funds }
foreach (var entity in economyAtSecond.Harvesters)
{
var harvester = entity.Harvest();
if (harvester.RequiresWorker)
if (harvester.Resource == ResourceType.Alloy)
{
var usedWorkers = Math.Min(harvester.Slots, freeWorkers);
economyAtSecond.Alloy += harvester.HarvestedPerInterval * usedWorkers;
freeWorkers -= usedWorkers;
if (usedWorkers < harvester.Slots) workersNeeded += 1; private static void SubtractFundsOnRequestedOrders(IBuildOrderService buildOrder, int interval,
} EconomyModel economyAtSecond)
{
if (buildOrder.StartedOrders.TryGetValue(interval, out var ordersAtTime))
foreach (var order in ordersAtTime)
{
var foundEntity = EntityModel.GetDictionary()[order.DataType];
var production = foundEntity.Production();
if (harvester.RequiresWorker == false) if (production != null)
{ {
if (harvester.Resource == ResourceType.Ether) economyAtSecond.Alloy -= production.Alloy;
economyAtSecond.Ether += harvester.HarvestedPerInterval * harvester.Slots; economyAtSecond.Ether -= production.Ether;
economyAtSecond.Pyre -= production.Pyre;
var finishedAt = interval + production.BuildTime;
if (harvester.Resource == ResourceType.Alloy) if (production.RequiresWorker) economyAtSecond.BusyWorkerCount += 1;
economyAtSecond.Alloy += harvester.HarvestedPerInterval * harvester.Slots;
if (production.ConsumesWorker) economyAtSecond.WorkerCount -= 1;
} }
} }
}
// Create new worker private static void MakeNeededNewWorkersRequests(int workersNeeded, EconomyModel economyAtSecond)
if (economyAtSecond.CreatingWorkerCount > 0) {
for (var i = 0; i < economyAtSecond.CreatingWorkerDelays.Count; i++) if (workersNeeded > economyAtSecond.CreatingWorkerCount)
if (economyAtSecond.CreatingWorkerDelays[i] > 0) {
{ economyAtSecond.CreatingWorkerCount += 1;
if (economyAtSecond.Alloy > 2.5f) economyAtSecond.CreatingWorkerDelays.Add(20);
{ }
economyAtSecond.Alloy -= 2.5f; }
economyAtSecond.CreatingWorkerDelays[i]--;
} /**
} * Returns amount of workers created
else */
private static int CalculateCreatingWorkerCosts(EconomyModel economyAtSecond)
{
int createdWorkers = 0;
if (economyAtSecond.CreatingWorkerCount > 0)
for (var i = 0; i < economyAtSecond.CreatingWorkerDelays.Count; i++)
if (economyAtSecond.CreatingWorkerDelays[i] > 0)
{
if (economyAtSecond.Alloy > 2.5f)
{ {
economyAtSecond.CreatingWorkerCount -= 1; economyAtSecond.Alloy -= 2.5f;
economyAtSecond.WorkerCount += 1; economyAtSecond.CreatingWorkerDelays[i]--;
economyAtSecond.CreatingWorkerDelays.Remove(i);
i--;
} }
}
else
{
economyAtSecond.CreatingWorkerCount -= 1;
economyAtSecond.WorkerCount += 1;
createdWorkers++;
economyAtSecond.CreatingWorkerDelays.Remove(i);
i--;
}
if (workersNeeded > economyAtSecond.CreatingWorkerCount) return createdWorkers;
{ }
economyAtSecond.CreatingWorkerCount += 1;
economyAtSecond.CreatingWorkerDelays.Add(50);
}
// Remove Funds from Build Order
if (buildOrder.StartedOrders.TryGetValue(interval, out var ordersAtTime)) /**
foreach (var order in ordersAtTime) * Returns needed workers to maximize harvest points
*/
private static int AddFundsFromHarvestPoints(EconomyModel economyAtSecond, float freeWorkers)
{
int workersNeeded = 0;
foreach (var entity in economyAtSecond.HarvestPoints)
{
var harvester = entity.Harvest();
if (harvester.RequiresWorker)
if (harvester.Resource == ResourceType.Alloy)
{ {
var foundEntity = EntityModel.GetDictionary()[order.DataType]; var usedWorkers = Math.Min(harvester.Slots, freeWorkers);
var production = foundEntity.Production(); economyAtSecond.Alloy += harvester.HarvestedPerInterval * usedWorkers;
freeWorkers -= usedWorkers;
if (production != null) if (usedWorkers < harvester.Slots) workersNeeded += 1;
{ }
economyAtSecond.Alloy -= production.Alloy;
economyAtSecond.Ether -= production.Ether;
economyAtSecond.Pyre -= production.Pyre;
var finishedAt = interval + production.BuildTime;
if (production.RequiresWorker) economyAtSecond.BusyWorkerCount += 1; if (harvester.RequiresWorker == false)
{
if (harvester.Resource == ResourceType.Ether)
economyAtSecond.Ether += harvester.HarvestedPerInterval * harvester.Slots;
if (production.ConsumesWorker) economyAtSecond.WorkerCount -= 1; if (harvester.Resource == ResourceType.Alloy)
} economyAtSecond.Alloy += harvester.HarvestedPerInterval * harvester.Slots;
} }
}
// Handle new entities return workersNeeded;
if (buildOrder.CompletedOrders.TryGetValue(interval, out var completedAtInterval)) }
foreach (var newEntity in completedAtInterval)
{
var harvest = newEntity;
if (harvest != null) economyAtSecond.Harvesters.Add(harvest);
var production = newEntity.Production(); private static void AddPassivePyreGain(int interval, EconomyModel economyAtSecond)
if (production != null && production.RequiresWorker) economyAtSecond.BusyWorkerCount -= 1; {
} if (interval % 3 == 0)
{
economyAtSecond.Pyre += 1;
} }
}
NotifyDataChanged(); private void CarryOverEconomyFromPreviousInterval(int interval, EconomyModel economyAtSecond)
{
if (interval > 0)
{
economyAtSecond.Alloy = buildEconomyOverTime[interval - 1].Alloy;
economyAtSecond.Ether = buildEconomyOverTime[interval - 1].Ether;
economyAtSecond.Pyre = buildEconomyOverTime[interval - 1].Pyre;
economyAtSecond.WorkerCount = buildEconomyOverTime[interval - 1].WorkerCount;
economyAtSecond.BusyWorkerCount = buildEconomyOverTime[interval - 1].BusyWorkerCount;
economyAtSecond.CreatingWorkerCount = buildEconomyOverTime[interval - 1].CreatingWorkerCount;
economyAtSecond.HarvestPoints = buildEconomyOverTime[interval - 1].HarvestPoints.ToList();
economyAtSecond.CreatingWorkerDelays = buildEconomyOverTime[interval - 1].CreatingWorkerDelays.ToList();
}
} }
public EconomyModel GetEconomy(int atInterval) public EconomyModel GetEconomy(int atInterval)
{ {
if (atInterval >= buildEconomyOverTime.Count) return buildEconomyOverTime.Last(); if (atInterval >= buildEconomyOverTime.Count) return buildEconomyOverTime.Last();

Write Preview
Loading…
Cancel
Save