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

feat(TestAutomation) Harass Calculator tests and Search box style fix

Browse Source
This commit is contained in:
Jonathan McCaffrey
2022-04-25 16:43:45 -04:00
parent 43d7391df2
commit 7c10149ff3
14 changed files with 445 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files
IGP/Database.db
BIN
View File
Binary file not shown.
IGP/Dialog/SearchDialogComponent.razor
+3 -4
View File
@@ -50,7 +50,7 @@
filter: blur(2px);
}
.confirmDialogBackground {
.searchBackground {
position: fixed;
top: 0;
left: 0;
@@ -84,7 +84,7 @@
}
.confirmDialogContainer {
.searchContainer {
margin-left: auto;
margin-right: auto;
margin-top: 64px;
@@ -120,7 +120,6 @@
protected override void OnInitialized()
{
base.OnInitialized();
searchService.Subscribe(OnSearchChanged);
timer = new Timer(200);
@@ -145,7 +144,7 @@
StateHasChanged();
}
void IDisposable.Dispose()
public void Dispose()
{
searchService.Unsubscribe(OnSearchChanged);
timer.Elapsed -= FocusTimer;
IGP/IGP.sln
+6
View File
@@ -15,6 +15,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Services", "..\Services\Ser
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IGP_Convert", "..\IGP_Convert\IGP_Convert.csproj", "{82F1848E-4BF6-4B16-A9DD-574AF566712B}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestAutomation", "..\TestAutomation\TestAutomation.csproj", "{8B49D038-D013-460D-9C4F-817CAFFEB06F}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -45,6 +47,10 @@ Global
{82F1848E-4BF6-4B16-A9DD-574AF566712B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{82F1848E-4BF6-4B16-A9DD-574AF566712B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{82F1848E-4BF6-4B16-A9DD-574AF566712B}.Release|Any CPU.Build.0 = Release|Any CPU
{8B49D038-D013-460D-9C4F-817CAFFEB06F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{8B49D038-D013-460D-9C4F-817CAFFEB06F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8B49D038-D013-460D-9C4F-817CAFFEB06F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{8B49D038-D013-460D-9C4F-817CAFFEB06F}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
IGP/Pages/HarassCalculatorPage.razor
+130 -80
View File
@@ -1,10 +1,10 @@
@layout PageLayout
@inject IDataCollectionService DataCollectionService
@using Model
@inherits BasePage
@page "/harass-calculator"
@using Model
<LayoutMediumContentComponent>
<WebsiteTitleComponent>Harass Calculator</WebsiteTitleComponent>
@@ -12,21 +12,21 @@
<PaperComponent>
Credit to Zard for deriving the formula.
</PaperComponent>
<PaperComponent>
<LayoutRowComponent>
<LayoutColumnComponent>
<FormLayoutComponent>
<FormDisplayComponent Label="Cost of worker">
<Display>@costOfWorker</Display>
<Display>@CostOfWorker</Display>
</FormDisplayComponent>
<FormDisplayComponent Label="Alloy mined per second by worker">
<Display>@alloyMinedPerSecondByWorker</Display>
<Display>@AlloyMinedPerSecondByWorker</Display>
</FormDisplayComponent>
<FormDisplayComponent Label="Time to produce worker">
<Display>@timeToProduceWorker</Display>
<Display>@TimeToProduceWorker</Display>
</FormDisplayComponent>
</FormLayoutComponent>
</LayoutColumnComponent>
@@ -34,40 +34,45 @@
<LayoutColumnComponent>
<FormLayoutComponent>
<FormNumberComponent Min="1"
Value="@((int)numberOfWorkersLostToHarass)"
OnChange="@(e => { numberOfWorkersLostToHarass = int.Parse(e.Value!.ToString()!); Calculate();})">
Id="numberOfWorkersLostToHarass"
Value="@((int)NumberOfWorkersLostToHarass)"
OnChange="@(e => { NumberOfWorkersLostToHarass = int.Parse(e.Value!.ToString()!); Calculate();})">
<FormLabelComponent>Number of workers lost to harass</FormLabelComponent>
</FormNumberComponent>
<FormNumberComponent Min="1"
Value="@((int)numberOfTownHallsExisting)"
Id="numberOfTownHallsExisting"
Value="@((int)NumberOfTownHallsExisting)"
OnChange="OnTownHallsChanged">
<FormLabelComponent>Number of townhalls you have</FormLabelComponent>
</FormNumberComponent>
<div id="numberOfTownHallTravelTimes">
@{
var index = 0;
}
@foreach (var travelTime in TravelTimes)
{
@foreach (var travelTime in TravelTimes) {
index++;
if (index == 1)
{
if (index == 1) {
continue;
}
var id = $"numberOfTownHallsExisting_{index}";
<FormNumberComponent Min="0"
Value="@(travelTime.Value)"
Id="@id"
Value="@((int)travelTime.Value)"
OnChange="e => { OnTownHallTravelTimeChanged(e, travelTime); }">
<FormLabelComponent>Worker travel time from other base @(travelTime.Index + 1)</FormLabelComponent>
</FormNumberComponent>
}
</div>
<FormDisplayComponent Label="Total alloy lost">
<Display>
<div style="font-size: 1.5rem; font-weight: 800;">
@totalAlloyHarassment
<span id="totalAlloyHarassment">
@TotalAlloyHarassment
</span>
</div>
</Display>
</FormDisplayComponent>
@@ -77,19 +82,16 @@
<br/>
<div>
(<b>Worker replacement costs:</b> @WorkerReplacementCost())
(<b>Worker replacement costs:</b> <span id="workerReplacementCost">@WorkerReplacementCost()</span>)
</div>
<div>
(<b>Delayed mining time:</b> @DelayedMiningCost())
(<b>Delayed mining time:</b> <span id="delayedMiningCost">@DelayedMiningCost()</span>)
</div>
<div>
(<b>Average travel time:</b> @GetAverageTravelTime())
(<b>Average travel time:</b> <span id="getAverageTravelTime">@GetAverageTravelTime()</span>)
</div>
</LayoutColumnComponent>
</LayoutRowComponent>
</PaperComponent>
@@ -101,7 +103,10 @@
What is this tool?
</InfoQuestionComponent>
<InfoAnswerComponent>
The Harass Calculator allows you to calculate damage done to an enemy alloy line. For example, if you were to attack with Ichors, and kill 6 enemy workers, you can set the <b>Number of workers lost to harass</b> to 6. This would determine a loss of 741 alloy. Quite the large number.
The Harass Calculator allows you to calculate damage done to an enemy alloy line. For example, if you
were to attack with Ichors, and kill 6 enemy workers, you can set the <b>Number of workers lost to
harass</b> to 6. This would determine a loss of <span id="exampleTotalAlloyLoss">@ExampleTotalAlloyLoss</span> alloy. Quite
the large number.
</InfoAnswerComponent>
</InfoBodyComponent>
@@ -110,12 +115,21 @@
What can I learn from this?
</InfoQuestionComponent>
<InfoAnswerComponent>
Well, let's assume you lost a full alloy line of workers, and have to take that 741 alloy cost (300 to rebuy the workers, and 441 in lost mining time.)
Well, let's assume you lost a full alloy line of workers, and have to take that
@ExampleTotalAlloyLoss alloy cost (<span id="exampleWorkerCost">@ExampleWorkerCost</span>
to rebuy the workers, and <span id="exampleMiningTimeCost">@ExampleMiningTimeCost</span> in lost mining
time.)
<br/><br/>
If you were to set the <b>Number of townhalls you have</b> to 2, the calculator will consider worker transfer micro. Allowing you to cut the total cost by roughly 315 alloy. However, that number isn't entirely accurate, you are also going to have to bump up the <b>Worker travel time to alloy</b> to account for the time it takes the transferred workers to arrive at the decimated alloy line.
If you were to set the <b>Number of townhalls you have</b> to 2, the calculator will consider worker
transfer micro. Allowing you to cut the total cost by roughly
<span id="exampleTotalAlloyLossDifference">@ExampleTotalAlloyLossDifference</span> alloy. However, that number isn't
entirely accurate, you are also going to have to bump up the <b>Worker travel time to alloy</b> to account for the time it takes the transferred workers to arrive at the decimated alloy line.
<br/><br/>
Let's say it takes 10 seconds for workers to transfer from your second base. We can divide that number by 2, to represent our bases, and add those 5 additional seconds to <b>Worker travel time to alloy</b>, for the more accurate loss of 456 alloy (saving you 285 alloy.) <i>Which is much better than not transferring workers!</i>
Let's say it takes 10 seconds for workers to transfer from your second base. Let's enter that for the
second base travel time for the more accurate loss of <span
id="exampleTotalAlloyLossAccurate">@ExampleTotalAlloyLossAccurate</span> alloy
(saving you <span id="exampleTotalAlloyLossAccurateDifference">@ExampleTotalAlloyLossAccurateDifference</span> alloy.) <i>Which is
much better than not transferring workers!</i>
</InfoAnswerComponent>
</InfoBodyComponent>
@@ -194,101 +208,137 @@
</style>
@code {
float totalAlloyHarassment = 0;
// Example calcs
float ExampleTotalAlloyLoss => Calculate(
WorkerReplacementCost(6),
SimultaneousProductionFloor(1,6),
6,
new List<float> { 0 });
float ExampleWorkerCost => WorkerReplacementCost(6);
float ExampleMiningTimeCost => ExampleTotalAlloyLoss - ExampleWorkerCost;
float ExampleTotalAlloyLossDifference => ExampleTotalAlloyLoss - Calculate(
WorkerReplacementCost(6),
SimultaneousProductionFloor(2,6),
6,
new List<float> { 0, 0 });
float ExampleTotalAlloyLossAccurate => Calculate(
WorkerReplacementCost(6),
SimultaneousProductionFloor(2,6),
6,
new List<float> { 0, 10 });
readonly float costOfWorker = 50;
readonly float alloyMinedPerSecondByWorker = 1;
readonly float timeToProduceWorker = 20;
float numberOfWorkersLostToHarass = 1;
float numberOfTownHallsExisting = 1;
float ExampleTotalAlloyLossAccurateDifference => ExampleTotalAlloyLoss - ExampleTotalAlloyLossAccurate;
float TotalAlloyHarassment = 0;
float GetAverageTravelTime()
{
if (TravelTimes.Count == 0)
{
readonly float CostOfWorker = 50;
readonly float AlloyMinedPerSecondByWorker = 1;
readonly float TimeToProduceWorker = 20;
float NumberOfWorkersLostToHarass = 1;
float NumberOfTownHallsExisting = 1;
float GetAverageTravelTime() {
if (TravelTimes.Count == 0) {
return 0;
}
var sum = 0;
float sum = 0;
foreach (var travelTime in TravelTimes)
{
foreach (var travelTime in TravelTimes) {
sum += travelTime.Value;
}
return sum / numberOfTownHallsExisting;
return sum / NumberOfTownHallsExisting;
}
float SimultaneousProductionFloor()
{
if (numberOfTownHallsExisting <= 0 || numberOfWorkersLostToHarass <= 0)
{
float SimultaneousProductionFloor() {
if (NumberOfTownHallsExisting <= 0 || NumberOfWorkersLostToHarass <= 0) {
return 0;
}
return numberOfWorkersLostToHarass / Math.Min(numberOfTownHallsExisting, numberOfWorkersLostToHarass);
return NumberOfWorkersLostToHarass / Math.Min(NumberOfTownHallsExisting, NumberOfWorkersLostToHarass);
}
float SimultaneousProductionFloor(float existingTownHalls, float numberOfWorkersLost) {
if (existingTownHalls <= 0 || numberOfWorkersLost <= 0) {
return 0;
}
return numberOfWorkersLost / Math.Min(existingTownHalls, numberOfWorkersLost);
}
float WorkerReplacementCost()
{
return costOfWorker * numberOfWorkersLostToHarass;
float WorkerReplacementCost() {
return CostOfWorker * NumberOfWorkersLostToHarass;
}
float WorkerReplacementCost(int numberOfWorkersLostToHarass) {
return CostOfWorker * numberOfWorkersLostToHarass;
}
float DelayedMiningCost()
{
return totalAlloyHarassment - WorkerReplacementCost();
float DelayedMiningCost() {
return TotalAlloyHarassment - WorkerReplacementCost();
}
void Calculate()
{
totalAlloyHarassment = WorkerReplacementCost();
void Calculate() {
TotalAlloyHarassment = Calculate(WorkerReplacementCost(),
SimultaneousProductionFloor(),
NumberOfWorkersLostToHarass,
TravelTimes.Select(x => x.Value).ToList(),
TimeToProduceWorker,
AlloyMinedPerSecondByWorker);
}
float Calculate(float workerReplacementCost,
float simultaneousProductionFloor,
float numberOfWorkersLostToHarass,
IList<float> travelTimes,
float timeToProduceWorker = 20,
float alloyMinedPerSecondByWorker = 1) {
float totalAlloyHarassment = workerReplacementCost;
for (var workerProductionIndex = 0; workerProductionIndex < SimultaneousProductionFloor(); workerProductionIndex++)
{
for (var workerProductionIndex = 0; workerProductionIndex < simultaneousProductionFloor; workerProductionIndex++) {
totalAlloyHarassment += alloyMinedPerSecondByWorker * timeToProduceWorker * (workerProductionIndex + 1);
}
var remainder = (int)(numberOfWorkersLostToHarass % SimultaneousProductionFloor());
for (var remainderIndex = 0; remainderIndex < remainder; remainderIndex++)
{
totalAlloyHarassment += alloyMinedPerSecondByWorker * timeToProduceWorker * (SimultaneousProductionFloor() + 1);
var remainder = (int)(numberOfWorkersLostToHarass % simultaneousProductionFloor);
for (var remainderIndex = 0; remainderIndex < remainder; remainderIndex++) {
totalAlloyHarassment += alloyMinedPerSecondByWorker * timeToProduceWorker * (simultaneousProductionFloor + 1);
}
for (var travelTimeIndex = 0; travelTimeIndex < numberOfWorkersLostToHarass; travelTimeIndex++)
{
var townHallIndex = travelTimeIndex % TravelTimes.Count;
totalAlloyHarassment += alloyMinedPerSecondByWorker * TravelTimes[townHallIndex].Value;
for (var travelTimeIndex = 0; travelTimeIndex < numberOfWorkersLostToHarass; travelTimeIndex++) {
var townHallIndex = travelTimeIndex % travelTimes.Count;
totalAlloyHarassment += alloyMinedPerSecondByWorker * travelTimes[townHallIndex];
}
return totalAlloyHarassment;
}
protected override void OnInitialized()
{
protected override void OnInitialized() {
base.OnInitialized();
Calculate();
}
void ValueChanged(float test)
{
Calculate();
}
public List<TravelTime> TravelTimes { get; set; } = new() { new TravelTime(0, 0) };
private void OnTownHallsChanged(ChangeEventArgs obj)
{
numberOfTownHallsExisting = int.Parse(obj.Value!.ToString()!);
private void OnTownHallsChanged(ChangeEventArgs obj) {
NumberOfTownHallsExisting = int.Parse(obj.Value!.ToString()!);
while (TravelTimes.Count > numberOfTownHallsExisting)
while (TravelTimes.Count > NumberOfTownHallsExisting)
TravelTimes.Remove(TravelTimes.Last());
while (TravelTimes.Count < numberOfTownHallsExisting)
TravelTimes.Add(new TravelTime(TravelTimes.Count, 0));
while (TravelTimes.Count < NumberOfTownHallsExisting)
TravelTimes.Add(new TravelTime(TravelTimes.Count, 10 * (TravelTimes.Count)));
Calculate();
}
private void OnTownHallTravelTimeChanged(ChangeEventArgs obj, TravelTime travelTime)
{
private void OnTownHallTravelTimeChanged(ChangeEventArgs obj, TravelTime travelTime) {
travelTime.Value = (int)obj.Value!;
Calculate();
IGP/Portals/SearchPortal.razor
+12 -11
View File
@@ -1,28 +1,29 @@
@implements IDisposable;
@inject ISearchService SearchService
@inject IJSRuntime JsRuntime
@inject ISearchService searchService
@inject IJSRuntime jsRuntime
<SearchDialogComponent></SearchDialogComponent>
@code {
private string test = "Q";
protected override void OnInitialized()
{
base.OnInitialized();
SearchService.Subscribe(OnUpdate);
searchService.Subscribe(OnUpdate);
}
protected override async Task OnInitializedAsync()
{
await SearchService.Load();
await JsRuntime.InvokeVoidAsync("SetDotnetReference", DotNetObjectReference.Create(this));
await searchService.Load();
await jsRuntime.InvokeVoidAsync("SetDotnetReference", DotNetObjectReference.Create(this));
}
void IDisposable.Dispose()
public void Dispose()
{
SearchService.Unsubscribe(OnUpdate);
searchService.Unsubscribe(OnUpdate);
}
void OnUpdate()
@@ -35,13 +36,13 @@
{
if (code.ToLower().Equals("k") && (ctrlKey || shiftKey || altKey || metaKey))
{
if (SearchService.IsVisible)
if (searchService.IsVisible)
{
SearchService.Hide();
searchService.Hide();
}
else
{
SearchService.Show();
searchService.Show();
}
}
}
IGP/wwwroot/generated/AgileTaskModels.json
+1 -1
View File
File diff suppressed because one or more lines are too long