fix: Load the quality filter for entity and item triggers.

Author: DaleStan

Yafc.Model/Data/DataClasses.cs

@@ -974,6 +974,8 @@ public class EntityContainer : Entity {
 }
 
 public class Technology : RecipeOrTechnology { // Technology is very similar to recipe
+    private Quality? _triggerMinimumQuality;
+
     public float count { get; internal set; } // TODO support formula count
     public Technology[] prerequisites { get; internal set; } = [];
     public List<Recipe> unlockRecipes { get; } = [];
@@ -992,6 +994,16 @@ public class Technology : RecipeOrTechnology { // Technology is very similar to
     /// or <see cref="RecipeFlags.HasResearchTriggerSendToOrbit"/>.
     /// </summary>
     public FactorioObject? triggerObject { get; internal set; }
+    /// <summary>
+    /// For entity and item triggers, the minimum quality. Factorio tracks more complicated filters (e.g. &lt; rare), but the only thing we care about
+    /// for accessibility is the minimum acceptable quality. This is not stored as an <see cref="IObjectWithQuality{T}"/> because those don't exist
+    /// when this field is loaded from the lua tables.
+    /// </summary>
+    [AllowNull]
+    public Quality triggerMinimumQuality {
+        get => _triggerMinimumQuality ?? Quality.Normal;
+        internal set => _triggerMinimumQuality = value;
+    }
 
     /// <summary>
     /// Sets the value used to construct <see cref="triggerEntities"/>.
@@ -1012,6 +1024,11 @@ protected override List<DependencyNode> GetDependenciesHelper() {
         if (flags.HasFlag(RecipeFlags.HasResearchTriggerBuildEntity)) {
             nodes.Add((triggerEntities, DependencyNode.Flags.Source));
         }
+        if (flags.HasFlagAny(RecipeFlags.HasResearchTriggerBuildEntity | RecipeFlags.HasResearchTriggerCraft)) {
+            if (triggerMinimumQuality > Quality.Normal) {
+                nodes.Add(([triggerMinimumQuality], DependencyNode.Flags.Source));
+            }
+        }
         if (flags.HasFlag(RecipeFlags.HasResearchTriggerCreateSpacePlatform)) {
             var items = Database.items.all.Where(i => i.factorioType == "space-platform-starter-pack");
             nodes.Add((items.Select(i => Database.objectsByTypeName["Mechanics.launch." + i.name]), DependencyNode.Flags.Source));

Yafc.Parser/Data/FactorioDataDeserializer.cs

@@ -162,11 +162,12 @@ public Project LoadData(string projectPath, LuaTable data, LuaTable prototypes,
         DeserializePrototypes(raw, "planet", DeserializeLocation, progress, errorCollector);
         DeserializePrototypes(raw, "space-location", DeserializeLocation, progress, errorCollector);
         rootAccessible.Add(GetObject<Location>("nauvis"));
-        progress.Report((LSs.ProgressLoading, LSs.ProgressLoadingTechnologies));
-        DeserializePrototypes(raw, "technology", DeserializeTechnology, progress, errorCollector);
         progress.Report((LSs.ProgressLoading, LSs.ProgressLoadingQualities));
         DeserializePrototypes(raw, "quality", DeserializeQuality, progress, errorCollector);
         Quality.Normal = GetObject<Quality>("normal");
+        // Qualities must be loaded before technologies, to properly initialize Technology.triggerMinimumQuality
+        progress.Report((LSs.ProgressLoading, LSs.ProgressLoadingTechnologies));
+        DeserializePrototypes(raw, "technology", DeserializeTechnology, progress, errorCollector);
         rootAccessible.Add(Quality.Normal);
         DeserializePrototypes(raw, "asteroid-chunk", DeserializeAsteroidChunk, progress, errorCollector);
 

Yafc.Parser/Data/FactorioDataDeserializer_RecipeAndTechnology.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using Yafc.I18n;
 using Yafc.Model;
@@ -139,7 +140,7 @@ private void LoadTechnologyData(Technology technology, LuaTable table, bool forc
             recipeCategories.Add(SpecialNames.Labs, technology);
         }
         else if (table.Get("research_trigger", out LuaTable? researchTriggerTable)) {
-            LoadResearchTrigger(researchTriggerTable, ref technology, errorCollector);
+            LoadResearchTrigger(researchTriggerTable, technology, errorCollector);
             technology.ingredients ??= [];
             recipeCategories.Add(SpecialNames.TechnologyTrigger, technology);
         }
@@ -319,7 +320,7 @@ private Ingredient[] LoadResearchIngredientList(LuaTable table) {
         }).Where(x => x is not null).ToArray() ?? [];
     }
 
-    private void LoadResearchTrigger(LuaTable researchTriggerTable, ref Technology technology, ErrorCollector errorCollector) {
+    private void LoadResearchTrigger(LuaTable researchTriggerTable, Technology technology, ErrorCollector errorCollector) {
         if (!researchTriggerTable.Get("type", out string? type)) {
             errorCollector.Error($"Research trigger of {technology.typeDotName} does not have a type field", ErrorSeverity.MinorDataLoss);
             return;
@@ -337,8 +338,8 @@ private void LoadResearchTrigger(LuaTable researchTriggerTable, ref Technology t
 
                 break;
             case "craft-item":
-                if (!researchTriggerTable.Get("item", out string? craftItemName)) {
-                    errorCollector.Error($"Research trigger {type} of {technology.typeDotName} does not have an item field", ErrorSeverity.MinorDataLoss);
+                if (!loadQualityFromFilter(technology, researchTriggerTable, "item", out string? craftItemName)) {
+                    errorCollector.Error($"Research trigger {type} of {technology.typeDotName} does not have a recognized item field", ErrorSeverity.MinorDataLoss);
                     break;
                 }
                 craftCount = researchTriggerTable.Get("count", 1);
@@ -368,13 +369,11 @@ private void LoadResearchTrigger(LuaTable researchTriggerTable, ref Technology t
                 break;
             case "build-entity":
                 technology.flags = RecipeFlags.HasResearchTriggerBuildEntity;
-                if (researchTriggerTable.Get("entity", out entity)
-                    || (researchTriggerTable.Get("entity", out LuaTable? entityFilter) && entityFilter.Get("name", out entity))) {
-
+                if (loadQualityFromFilter(technology, researchTriggerTable, "entity", out entity)) {
                     technology.getTriggerEntities = new(() => [((Entity)Database.objectsByTypeName["Entity." + entity])]);
                 }
                 else {
-                    errorCollector.Error($"Research trigger {type} of {technology.typeDotName} does not have an entity field", ErrorSeverity.MinorDataLoss);
+                    errorCollector.Error($"Research trigger {type} of {technology.typeDotName} does not have a recognized entity field", ErrorSeverity.MinorDataLoss);
                 }
 
                 break;
@@ -405,6 +404,38 @@ private void LoadResearchTrigger(LuaTable researchTriggerTable, ref Technology t
                 errorCollector.Error(LSs.ResearchHasAnUnsupportedTriggerType.L(technology.typeDotName, type), ErrorSeverity.MinorDataLoss);
                 break;
         }
+
+        bool loadQualityFromFilter(Technology technology, LuaTable trigger, string key, [NotNullWhen(true)] out string? objectName) {
+            if (trigger.Get(key, out objectName)) {
+                // Basic string value
+                return true;
+            }
+
+            if (trigger.Get(key, out LuaTable? filter) && filter.Get("name", out objectName)) {
+                // Load the quality specifiers from the table-based filter
+                if (!registeredObjects.TryGetValue((typeof(Quality), filter.Get<string>("quality")), out var quality)) {
+                    return true;
+                }
+
+                switch (filter.Get<string>("comparator")) {
+                    // `≠ normal` is the same as `> normal`. `≠ anything-else` is the same as `= normal` for dependency analysis.
+                    case "!=" or "≠" when quality == Quality.Normal:
+                    case ">":
+                        // This filter requires at least the quality after the specified quality.
+                        // I expect `> legendary` is a load error in Factorio, so treating it as "any quality" here should be fine.
+                        technology.triggerMinimumQuality = ((Quality)quality).nextQuality;
+                        break;
+                    case ">=" or "≥" or "=":
+                        technology.triggerMinimumQuality = (Quality)quality;
+                        break;
+                    default:
+                        // Nothing special: Normal quality is acceptable, no quality, or no comparator
+                        break;
+                }
+                return true;
+            }
+            return false;
+        }
     }
 
     private void LoadRecipeData(Recipe recipe, LuaTable table, bool forceDisable, ErrorCollector errorCollector) {

Yafc/Widgets/ObjectTooltip.cs

@@ -145,7 +145,7 @@ private static void BuildIconRow(ImGui gui, IReadOnlyList<IFactorioObjectWrapper
 
     private static void BuildItem(ImGui gui, IFactorioObjectWrapper item, string? extraText = null) {
         using (gui.EnterRow()) {
-            gui.BuildFactorioObjectIcon(item.target);
+            gui.BuildFactorioObjectIcon(item);
             gui.BuildText(item.text + extraText, TextBlockDisplayStyle.WrappedText);
         }
     }
@@ -608,7 +608,8 @@ private static void BuildTechnology(Technology technology, ImGui gui) {
             using (gui.EnterGroup(contentPadding)) {
                 using var grid = gui.EnterInlineGrid(3f);
                 grid.Next();
-                _ = gui.BuildFactorioObjectWithAmount(technology.ingredients[0].goods, technology.ingredients[0].amount, ButtonDisplayStyle.ProductionTableUnscaled);
+                _ = gui.BuildFactorioObjectWithAmount(technology.ingredients[0].goods.With(technology.triggerMinimumQuality),
+                    technology.ingredients[0].amount, ButtonDisplayStyle.ProductionTableUnscaled);
             }
         }
         else if (isResearchTriggerCapture) {
@@ -626,7 +627,7 @@ private static void BuildTechnology(Technology technology, ImGui gui) {
         else if (isResearchTriggerBuild) {
             BuildSubHeader(gui, LSs.TooltipHeaderTechnologyBuildEntity.L(technology.triggerEntities.Count));
             using (gui.EnterGroup(contentPadding)) {
-                BuildIconRow(gui, technology.triggerEntities, 2);
+                BuildIconRow(gui, [.. technology.triggerEntities.Select(e => e.With(technology.triggerMinimumQuality))], 2);
             }
         }
         else if (isResearchTriggerPlatform) {

changelog.txt

@@ -23,6 +23,7 @@ Version:
 Date:
     Fixes:
         - Support craft-fluid and scripted research triggers.
+        - Consider quality restrictions when analyzing craft-item or build-item technology triggers.
 ----------------------------------------------------------------------------------------------------------------------
 Version: 2.16.0
 Date: October 24th 2025