Non-recipe quality selection (#343)

This allows quality selection for everything except recipes, and should
reflect the quality-related values everywhere they are relevant.

This corresponds to tasks "Select quality of crafting entity with new
GUI" through "Use quality-dependent stats for modules/beacons" and
"UnlockQualityModifier in TechnologyPrototype::effects for milestone
analysis" in #311.

Author: shpaass

Yafc.Model.Tests/Model/ProductionTableContentTests.cs

@@ -17,8 +17,8 @@ public void ChangeFuelEntityModules_ShouldPreserveFixedAmount() {
         table.AddRecipe(Database.recipes.all.Single(r => r.name == "recipe"), DataUtils.DeterministicComparer);
         RecipeRow row = table.GetAllRecipes().Single();
 
-        table.modules.beacon = Database.allBeacons.Single();
-        table.modules.beaconModule = Database.allModules.Single(m => m.name == "speed-module");
+        table.modules.beacon = new(Database.allBeacons.Single(), Quality.Normal);
+        table.modules.beaconModule = new(Database.allModules.Single(m => m.name == "speed-module"), Quality.Normal);
         table.modules.beaconsPerBuilding = 2;
         table.modules.autoFillPayback = MathF.Sqrt(float.MaxValue);
 
@@ -28,7 +28,7 @@ public void ChangeFuelEntityModules_ShouldPreserveFixedAmount() {
         // assert will ensure the currently fixed value has not changed by more than 0.01%.
         static void testCombinations(RecipeRow row, ProductionTable table, Action assert) {
             foreach (EntityCrafter crafter in Database.allCrafters) {
-                row.entity = crafter;
+                row.entity = new(crafter, Quality.Normal);
 
                 foreach (Goods fuel in crafter.energy.fuels) {
                     row.fuel = fuel;
@@ -37,7 +37,7 @@ static void testCombinations(RecipeRow row, ProductionTable table, Action assert
                         ModuleTemplateBuilder builder = new();
 
                         if (module != null) {
-                            builder.list.Add((module, 0));
+                            builder.list.Add((new(module, Quality.Normal), 0));
                         }
 
                         row.modules = builder.Build(row);
@@ -70,7 +70,7 @@ public void ChangeProductionTableModuleConfig_ShouldPreserveFixedAmount() {
         // Call assert for each combination. assert will ensure the currently fixed value has not changed by more than 0.01%.
         void testCombinations(RecipeRow row, ProductionTable table, Action assert) {
             foreach (EntityCrafter crafter in Database.allCrafters) {
-                row.entity = crafter;
+                row.entity = new(crafter, Quality.Normal);
 
                 foreach (Goods fuel in crafter.energy.fuels) {
                     row.fuel = fuel;
@@ -82,14 +82,14 @@ void testCombinations(RecipeRow row, ProductionTable table, Action assert) {
                                     // Pre-emptive code for if ProductionTable.modules is made writable.
                                     // The ProductionTable.modules setter must notify all relevant recipes if it is added.
                                     _ = method.Invoke(table, [new ModuleFillerParameters(table) {
-                                        beacon = beacon,
-                                        beaconModule = module,
+                                        beacon = new(beacon, Quality.Normal),
+                                        beaconModule = new(module, Quality.Normal),
                                         beaconsPerBuilding = beaconCount,
                                     }]);
                                 }
                                 else {
-                                    table.modules.beacon = beacon;
-                                    table.modules.beaconModule = module;
+                                    table.modules.beacon = new(beacon, Quality.Normal);
+                                    table.modules.beaconModule = new(module, Quality.Normal);
                                     table.modules.beaconsPerBuilding = beaconCount;
                                 }
                                 table.Solve((ProjectPage)table.owner).Wait();
@@ -140,7 +140,7 @@ private static void RunTest(RecipeRow row, Action<RecipeRow, ProductionTable, Ac
 
         // The complicated tests for when the fixed value is expected to reset when fixed fuels are involved.
         Action testFuel(RecipeRow row, ProductionTable table) => () => {
-            if (row.entity.energy.fuels.Contains(oldFuel)) {
+            if (row.entity.target.energy.fuels.Contains(oldFuel)) {
                 Assert.Equal(fuelAmount, row.FuelInformation.Amount, fuelAmount * .0001);
                 assertCalls++;
             }

Yafc.Model/Analysis/CostAnalysis.cs

@@ -135,7 +135,7 @@ public override void Compute(Project project, ErrorCollector warnings) {
                     minSize = crafter.size;
                 }
 
-                float power = crafter.energy.type == EntityEnergyType.Void ? 0f : recipe.time * crafter.power / (crafter.craftingSpeed * crafter.energy.effectivity);
+                float power = crafter.energy.type == EntityEnergyType.Void ? 0f : recipe.time * crafter.basePower / (crafter.baseCraftingSpeed * crafter.energy.effectivity);
 
                 if (power < minPower) {
                     minPower = power;

Yafc.Model/Blueprints/Blueprint.cs

@@ -98,13 +98,14 @@ public void Set(Goods goods) {
 public class BlueprintEntity {
     [JsonPropertyName("entity_number")] public int index { get; set; }
     public string? name { get; set; }
+    public string? quality { get; set; }
     public BlueprintPosition position { get; set; } = new BlueprintPosition();
     public int direction { get; set; }
     public string? recipe { get; set; }
     [JsonPropertyName("control_behavior")] public BlueprintControlBehavior? controlBehavior { get; set; }
     public BlueprintConnection? connections { get; set; }
     [JsonPropertyName("request_filters")] public List<BlueprintRequestFilter> requestFilters { get; } = [];
-    public Dictionary<string, int>? items { get; set; }
+    public List<BlueprintItem> items { get; } = [];
 
     public void Connect(BlueprintEntity other, bool red = true, bool secondPort = false, bool targetSecond = false) {
         ConnectSingle(other, red, secondPort, targetSecond);
@@ -168,3 +169,26 @@ public class BlueprintControlFilter {
     public int index { get; set; }
     public int count { get; set; }
 }
+
+[Serializable]
+public class BlueprintItem {
+    public BlueprintId id { get; } = new();
+    public BlueprintItemInventory items { get; } = new();
+}
+
+[Serializable]
+public class BlueprintId {
+    public string? name { get; set; }
+    public string? quality { get; set; }
+}
+
+[Serializable]
+public class BlueprintItemInventory {
+    [JsonPropertyName("in_inventory")] public List<BlueprintInventoryItem> inInventory { get; } = [];
+}
+
+[Serializable]
+public class BlueprintInventoryItem {
+    public int inventory { get; } = 4; // unknown magic number (probably 'modules', needs more investigating)
+    public int stack { get; set; }
+}