diff --git a/IGP/Pages/BuildCalculator/Parts/HighlightsComponent.razor b/IGP/Pages/BuildCalculator/Parts/HighlightsComponent.razor index d146335..6988af7 100644 --- a/IGP/Pages/BuildCalculator/Parts/HighlightsComponent.razor +++ b/IGP/Pages/BuildCalculator/Parts/HighlightsComponent.razor @@ -42,6 +42,26 @@ } } + +
+
Depleted
+ //TODO WIP + + @foreach (var ordersAtTime in buildOrderService.CompletedOrders.Reverse()) + { + foreach (var order in ordersAtTime.Value) + { +
+ + @ordersAtTime.Key | T @Interval.ToTime(ordersAtTime.Key) +
+
+ @order.Info().Name +
+
+ } + } +
diff --git a/Model/BuildOrders/BuildOrderModel.cs b/Model/BuildOrders/BuildOrderModel.cs index 398fc04..f147f15 100644 --- a/Model/BuildOrders/BuildOrderModel.cs +++ b/Model/BuildOrders/BuildOrderModel.cs @@ -25,6 +25,7 @@ public class BuildOrderModel public int CurrentSupplyUsed { get; set; } = 0; public Dictionary> StartedOrders { get; set; } = new(); public Dictionary> CompletedOrders { get; set; } = new(); + public Dictionary> DepletedOrders { get; set; } = new(); public Dictionary UniqueCompletedTimes { get; set; } = new(); public Dictionary UniqueCompletedCount { get; set; } = new(); public Dictionary SupplyCountTimes { get; set; } = new(); diff --git a/Services/IServices.cs b/Services/IServices.cs index bdf7e41..6f44244 100644 --- a/Services/IServices.cs +++ b/Services/IServices.cs @@ -284,6 +284,7 @@ public interface IBuildOrderService { public Dictionary> StartedOrders { get; } public Dictionary> CompletedOrders { get; } + public Dictionary> DepletedOrders { get; } public Dictionary UniqueCompletedTimes { get; } public Dictionary SupplyCountTimes { get; } diff --git a/Services/Immortal/BuildOrderService.cs b/Services/Immortal/BuildOrderService.cs index cae73a5..18dd75e 100644 --- a/Services/Immortal/BuildOrderService.cs +++ b/Services/Immortal/BuildOrderService.cs @@ -30,6 +30,7 @@ public class BuildOrderService : IBuildOrderService public Dictionary> StartedOrders => _buildOrder.StartedOrders; public Dictionary> CompletedOrders => _buildOrder.CompletedOrders; + public Dictionary> DepletedOrders => _buildOrder.DepletedOrders; public Dictionary UniqueCompletedTimes => _buildOrder.UniqueCompletedTimes; public Dictionary SupplyCountTimes => _buildOrder.SupplyCountTimes; diff --git a/Services/Immortal/EconomyService.cs b/Services/Immortal/EconomyService.cs index 7943e92..e5da889 100644 --- a/Services/Immortal/EconomyService.cs +++ b/Services/Immortal/EconomyService.cs @@ -169,7 +169,7 @@ public class EconomyService : IEconomyService var usedWorkers = Math.Min(harvesterPoint.Slots, freeWorkers); economyAtSecond.Alloy += harvesterPoint.HarvestedPerInterval * usedWorkers; economyAtSecond.AlloyIncome += harvesterPoint.HarvestedPerInterval * usedWorkers; - + freeWorkers -= usedWorkers; if (usedWorkers < harvesterPoint.Slots) workersNeeded += 1;