feat: quality system compatibility — matter source/void quality filtering + entity health scaling

control.lua

@@ -1,7 +1,6 @@
 require("defines")
 require("util")
 
-require("scripts.autofill-requester-chest")
 require("scripts.cheats")
 require("scripts.configurable-super-boiler")
 require("scripts.creative-cargo-wagon")

data-final-fixes.lua

@@ -188,14 +188,25 @@ data.raw["construction-robot"][creative_mode_defines.names.entities.super_constr
 
 --------------------------------------------------------------
 
--- Allow the creative lab to accept all research materials.
+-- Allow the creative lab to accept every science pack that any real lab can use.
+-- Deriving the list from other labs' inputs (rather than matching the "science-pack"
+-- subgroup) keeps non-pack items that merely share that subgroup -- such as "coin" and
+-- the "science" pictogram -- out of the creative lab.
+local creative_lab_name = creative_mode_defines.names.entities.creative_lab
+local void_lab_name = creative_mode_defines.names.entities.void_lab
+local seen_science_packs = {}
 local tools = {}
-for _, item in pairs(data.raw["item"]) do
-  if item.subgroup == "science-pack" then
-    table.insert(tools, item.name)
+for lab_name, lab in pairs(data.raw["lab"]) do
+  if lab_name ~= creative_lab_name and lab_name ~= void_lab_name and lab.inputs then
+    for _, input_name in pairs(lab.inputs) do
+      if not seen_science_packs[input_name] then
+        seen_science_packs[input_name] = true
+        table.insert(tools, input_name)
+      end
+    end
   end
 end
-data.raw["lab"][creative_mode_defines.names.entities.creative_lab].inputs = tools
+data.raw["lab"][creative_lab_name].inputs = tools
 
 --------------------------------------------------------------
 

defines.lua

@@ -44,7 +44,6 @@ creative_mode_defines.names.settings = {
   unhide_items = creative_mode_defines.name_prefix .. "unhide-items",
   creative_chest_size = creative_mode_defines.name_prefix .. "creative-chest-size",
   creative_chest_contains_hidden_items = creative_mode_defines.name_prefix .. "creative-chest-contains-hidden-items",
-  autofill_requester_chest_size = creative_mode_defines.name_prefix .. "autofill-requester-chest-size",
   duplicating_chest_size = creative_mode_defines.name_prefix .. "duplicating-chest-size",
   void_requester_chest_size = creative_mode_defines.name_prefix .. "void-requester-chest-size",
   void_chest_size = creative_mode_defines.name_prefix .. "void-chest-size",
@@ -91,8 +90,6 @@ creative_mode_defines.names.entities = {
   inf_requester_chest = creative_mode_defines.name_prefix .. "inf-requester-chest",
   inf_provider_chest = creative_mode_defines.name_prefix .. "inf-provider-chest",
   new_creative_provider_chest = creative_mode_defines.name_prefix .. "new-creative-provider-chest",
-  autofill_requester_chest = creative_mode_defines.name_prefix .. "autofill-requester-chest",
-  new_autofill_requester_chest = creative_mode_defines.name_prefix .. "new-autofill-requester-chest",
   duplicating_chest = creative_mode_defines.name_prefix .. "duplicating-chest",
   duplicating_provider_chest = creative_mode_defines.name_prefix .. "duplicating-provider-chest",
   void_requester_chest = creative_mode_defines.name_prefix .. "void-requester-chest",
@@ -160,7 +157,6 @@ creative_mode_defines.names.items = {
   creative_provider_chest = creative_mode_defines.name_prefix .. "creative-provider-chest",
   inf_requester_chest = creative_mode_defines.name_prefix .. "inf-requester-chest",
   inf_provider_chest = creative_mode_defines.name_prefix .. "inf-provider-chest",
-  autofill_requester_chest = creative_mode_defines.name_prefix .. "autofill-requester-chest",
   duplicating_chest = creative_mode_defines.name_prefix .. "duplicating-chest",
   duplicating_provider_chest = creative_mode_defines.name_prefix .. "duplicating-provider-chest",
   void_requester_chest = creative_mode_defines.name_prefix .. "void-requester-chest",
@@ -249,7 +245,6 @@ creative_mode_defines.names.recipes = {
   creative_provider_chest = creative_mode_defines.name_prefix .. "creative-provider-chest",
   inf_requester_chest = creative_mode_defines.name_prefix .. "inf-requester-chest",
   inf_provider_chest = creative_mode_defines.name_prefix .. "inf-provider-chest",
-  autofill_requester_chest = creative_mode_defines.name_prefix .. "autofill-requester-chest",
   duplicating_chest = creative_mode_defines.name_prefix .. "duplicating-chest",
   duplicating_provider_chest = creative_mode_defines.name_prefix .. "duplicating-provider-chest",
   void_requester_chest = creative_mode_defines.name_prefix .. "void-requester-chest",
@@ -1530,10 +1525,6 @@ table.insert(
   creative_mode_defines.values.creative_provider_chest_additional_content_names,
   creative_mode_defines.names.items.creative_provider_chest
 )
-table.insert(
-  creative_mode_defines.values.creative_provider_chest_additional_content_names,
-  creative_mode_defines.names.items.autofill_requester_chest
-)
 table.insert(
   creative_mode_defines.values.creative_provider_chest_additional_content_names,
   creative_mode_defines.names.items.duplicating_chest

locale/en/base.cfg

@@ -5,8 +5,6 @@ creative-mod_creative-provider-chest=Creative provider chest
 creative-mod_new-creative-provider-chest=Creative provider chest
 creative-mod_inf-requester-chest=Infinity requester chest
 creative-mod_inf-provider-chest=Infinity provider chest
-creative-mod_autofill-requester-chest=Autofill requester chest
-creative-mod_new-autofill-requester-chest=Autofill requester chest
 creative-mod_duplicating-chest=Duplicating chest
 creative-mod_duplicating-provider-chest=Duplicating provider chest
 creative-mod_void-requester-chest=Void requester chest
@@ -61,8 +59,6 @@ creative-mod_creative-provider-chest=A passive provider chest that contains all
 creative-mod_new-creative-provider-chest=A passive provider chest that contains all items in the game and can auto refill itself. Its last slot can be used for voiding unwanted items. (May need to place more than one to get more items.)\nClears contents upon removal.
 creative-mod_inf-requester-chest=A chest that can be used to create or destroy items, and acts as a requester chest. Set the infinity filters to be the item(s) and amount(s) you wish the chest to keep stocked. Checking the box will have it remove any items not in a filter.
 creative-mod_inf-provider-chest=A chest that can be used to create or destroy items, and acts as a provider chest. Set the infinity filters to be the item(s) and amount(s) you wish the chest to keep stocked. Checking the box will have it remove any items not in a filter.
-creative-mod_autofill-requester-chest=A requester chest that automatically refills itself according to the requests. Unlike the normal requester chests, 2 identical requests in this chest will be filled twice. The unused slots will be emptied.\nClears contents upon removed.
-creative-mod_new-autofill-requester-chest=A requester chest that automatically refills itself according to the requests. Unlike the normal requester chests, 2 identical requests in this chest will be filled twice. The unused slots will be emptied.\nClears contents upon removed.
 creative-mod_duplicating-chest=A steel chest that duplicates the item in its first slot.\nClears contents upon removal.
 creative-mod_duplicating-provider-chest=A passive provider chest that duplicates the item in its first slot.\nClears contents upon removed.
 creative-mod_void-requester-chest=A requester chest that removes all items inside it.\nClears contents upon removal.
@@ -158,7 +154,6 @@ creative-mod_default-initial-action=Default initial action
 creative-mod_unhide-items=Unhide items
 creative-mod_creative-chest-size=Creative chest size
 creative-mod_creative-chest-contains-hidden-items=Creative chests contain hidden items
-creative-mod_autofill-requester-chest-size=Autofill request chest size
 creative-mod_duplicating-chest-size=Duplicating chest size
 creative-mod_void-requester-chest-size=Void requester chest size
 creative-mod_void-chest-size=Void chest size
@@ -185,7 +180,6 @@ creative-mod_default-initial-actions=What should be done to Creative Mode when a
 creative-mod_unhide-items=Unhide the items and entities provided by Creative Mode from the slot filters, so you can select them in matter source's filters, logistic requester slots, deconstruction filters, etc. But they will be visible even when Creative Mode is not enabled in the game.
 creative-mod_creative-chest-size=Usable inventory size of each __ENTITY__creative-mod_creative-chest__ and __ENTITY__creative-mod_creative-provider-chest__.\nAn extra slot will be added for trashing.\nIts value affects how many chests you need to place for one item cycle. Larger inventory size means fewer chests are needed. However, it is also more likely to cause performance issues when hovering the chests.\nChanging its value for an existing game will cause item regrouping.
 creative-mod_creative-chest-contains-hidden-items=Whether __ENTITY__creative-mod_creative-chest__ and __ENTITY__creative-mod_creative-provider-chest__ should contain hidden items.\nSome items are hidden for good reasons, like rocket parts, which is meaningless even if you can get it.\nChanging this value for an existing game will cause item regrouping.
-creative-mod_autofill-requester-chest-size=Inventory size of each __ENTITY__creative-mod_autofill-requester-chest__.
 creative-mod_duplicating-chest-size=Inventory size of each __ENTITY__creative-mod_duplicating-chest__ and __ENTITY__creative-mod_duplicating-provider-chest__.
 creative-mod_void-requester-chest-size=Inventory size of each __ENTITY__creative-mod_void-requester-chest__.
 creative-mod_void-chest-size=Inventory size of each __ENTITY__creative-mod_void-chest__.

locale/zh-CN/base.cfg

@@ -5,8 +5,6 @@ creative-mod_creative-provider-chest=创造提供箱
 creative-mod_new-creative-provider-chest=创造提供箱
 creative-mod_inf-requester-chest=无限请求箱
 creative-mod_inf-provider-chest=无限提供箱
-creative-mod_autofill-requester-chest=自动填充请求箱
-creative-mod_new-autofill-requester-chest=自动填充请求箱
 creative-mod_duplicating-chest=复制箱
 creative-mod_duplicating-provider-chest=复制提供箱
 creative-mod_void-requester-chest=虚空请求箱
@@ -59,8 +57,6 @@ creative-mod_creative-provider-chest=一个包含游戏中所有物品并能够
 creative-mod_new-creative-provider-chest=一个包含游戏中所有物品并能够自动重新填充的被动提供箱子。它的最后一个槽位可以用来丢弃不需要的物品。（可能需要放置多个以获得更多物品。）\n移除时清空内容。
 creative-mod_inf-requester-chest=一个可以用于创建或销毁物品，并作为请求箱的箱子。设置无限过滤器为你希望箱子保持的物品和数量。勾选框将移除不在过滤器中的物品。
 creative-mod_inf-provider-chest=一个可以用于创建或销毁物品，并作为提供箱的箱子。设置无限过滤器为你希望箱子保持的物品和数量。勾选框将移除不在过滤器中的物品。
-creative-mod_autofill-requester-chest=一个根据请求自动重新填充自身的请求箱。与普通请求箱不同，这个箱子中的两个相同请求将被填充两次。未使用的槽位将被清空。\n移除时清空内容。
-creative-mod_new-autofill-requester-chest=一个根据请求自动重新填充自身的请求箱。与普通请求箱不同，这个箱子中的两个相同请求将被填充两次。未使用的槽位将被清空。\n移除时清空内容。
 creative-mod_duplicating-chest=一个复制其第一个槽位物品的钢制箱子。\n移除时清空内容。
 creative-mod_duplicating-provider-chest=一个复制其第一个槽位物品的被动提供箱子。\n移除时清空内容。
 creative-mod_void-requester-chest=一个移除其内部所有物品的请求箱。\n移除时清空内容。
@@ -152,7 +148,6 @@ creative-mod_default-initial-action=默认初始操作
 creative-mod_unhide-items=取消隐藏物品
 creative-mod_creative-chest-size=创造箱大小
 creative-mod_creative-chest-contains-hidden-items=创造箱包含隐藏物品
-creative-mod_autofill-requester-chest-size=自动填充请求箱大小
 creative-mod_duplicating-chest-size=复制箱大小
 creative-mod_void-requester-chest-size=虚空请求箱大小
 creative-mod_void-chest-size=虚空箱大小
@@ -179,7 +174,6 @@ creative-mod_default-initial-actions=在新的游戏开始或在现有游戏中
 creative-mod_unhide-items=取消隐藏创造模式提供的物品和实体，以便你可以在物质源的过滤器、物流请求槽、拆除过滤器等中选择它们。但即使游戏未启用创造模式，它们也将可见。
 creative-mod_creative-chest-size=每个__ENTITY__creative-mod_creative-chest__和__ENTITY__creative-provider-chest__的可用库存大小。\n将添加一个额外的槽位用于丢弃。\n它的值影响你需要放置多少个箱子来完成一个物品循环。更大的库存大小意味着需要更少的箱子。然而，它也更可能导致在悬停箱子时出现性能问题。\n为现有游戏更改其值将导致物品重新分组。
 creative-mod_creative-chest-contains-hidden-items=__ENTITY__creative-mod_creative-chest__和__ENTITY__creative-provider-chest__是否应包含隐藏物品。\n一些物品被隐藏是有原因的，比如火箭部件，即使你可以得到它，也是没有意义的。\n为现有游戏更改此值将导致物品重新分组。
-creative-mod_autofill-requester-chest-size=每个__ENTITY__creative-mod_autofill-requester-chest__的库存大小。
 creative-mod_duplicating-chest-size=每个__ENTITY__creative-mod_duplicating-chest__和__ENTITY__creative-provider-chest__的库存大小。
 creative-mod_void-requester-chest-size=每个__ENTITY__creative-mod_void-requester-chest__的库存大小。
 creative-mod_void-chest-size=每个__ENTITY__creative-mod_void-chest__的库存大小。

locale/zh-TW/base.cfg

@@ -1,7 +1,6 @@
 [entity-name]
 creative-mod_creative-chest=創造箱
 creative-mod_creative-provider-chest=創造供貨箱
-creative-mod_autofill-requester-chest=自動補給需求箱
 creative-mod_duplicating-chest=物品複製箱
 creative-mod_duplicating-provider-chest=複製供貨箱
 creative-mod_void-requester-chest=虛空需求箱
@@ -47,7 +46,6 @@ creative-mode_infinite-resource=__1__ (無限)
 [entity-description]
 creative-mod_creative-chest=能夠提供遊戲內的所有物品的鋼箱，會自動補給，最後一格可以用來丟棄物品。 (可能需要放置多於一個以獲取更多物品)\n被移除時自動清空
 creative-mod_creative-provider-chest=能夠提供遊戲內的所有物品的被動供貨箱，會自動補給，最後一格可以用來丟棄物品。 (可能需要放置多於一個以獲取更多物品)\n被移除時自動清空
-creative-mod_autofill-requester-chest=能夠自動補給所需物品的需求箱。不同於普通需求箱，兩個相同的需求會被補給兩次。未使用的欄位會被清空。\n被移除時自動清空
 creative-mod_duplicating-chest=能夠不斷複製第一格物品的鋼箱。\n被移除時自動清空
 creative-mod_duplicating-provider-chest=能夠不斷複製第一格物品的被動供貨箱。\n被移除時自動清空
 creative-mod_void-requester-chest=能夠不斷銷毀物品的需求箱。\n被移除時自動清空
@@ -129,7 +127,6 @@ creative-mod_default-initial-action=預設初始動作
 creative-mod_unhide-items=不隱藏物品
 creative-mod_creative-chest-size=創造箱大小
 creative-mod_creative-chest-contains-hidden-items=創造箱包含隱藏物品
-creative-mod_autofill-requester-chest-size=自動補給需求箱大小
 creative-mod_duplicating-chest-size=複製箱大小
 creative-mod_void-requester-chest-size=虛空需求箱大小
 creative-mod_void-chest-size=虛空箱大小
@@ -154,7 +151,6 @@ creative-mod_default-initial-actions=當新遊戲開始時、或此模組第一
 creative-mod_unhide-items=讓創造模式的物品顯示在物品篩選界面上，這樣就能在物質產生器的篩選欄、物流需求槽、拆除計畫者的篩選欄等選擇它們，但即使創造模式並未在遊戲內啟動也可看見
 creative-mod_creative-chest-size=每個__ENTITY__creative-mod_creative-chest__和__ENTITY__creative-mod_creative-provider-chest__的可用格數\n外加一格用來棄置物品\n此數值會影響每一個物品週期需要多少個創造箱，箱子越大，需要的箱子越少，但也越容易在選取箱子時產生性能問題\n為運行中的遊戲更改此數值會使物品重新分組
 creative-mod_creative-chest-contains-hidden-items=__ENTITY__creative-mod_creative-chest__和__ENTITY__creative-mod_creative-provider-chest__應否包含隱藏物品\n遊戲內有部份物品因為特殊理由而被隱藏，例如火箭零件，即使拿到手上也沒有任何作用\n為運行中的遊戲更改此數值會使物品重新分組
-creative-mod_autofill-requester-chest-size=每個__ENTITY__creative-mod_autofill-requester-chest__的大小
 creative-mod_duplicating-chest-size=每個__ENTITY__creative-mod_duplicating-chest__和__ENTITY__creative-mod_duplicating-provider-chest__的大小
 creative-mod_void-requester-chest-size=每個__ENTITY__creative-mod_void-requester-chest__的大小
 creative-mod_void-chest-size=每個__ENTITY__creative-mod_void-chest__的大小

prototypes/entity.lua

@@ -1215,16 +1215,6 @@ data:extend({
     settings.startup[creative_mode_defines.names.settings.creative_chest_size].value + 1,
     "passive-provider"
   ),
-  -- Autofill requester chest
-  logistic_container(
-    creative_mode_defines.names.entities.autofill_requester_chest,
-    creative_mode_defines.names.items.autofill_requester_chest,
-    "autofill-requester-chest.png",
-    "autofill-requester-chest.png",
-    nil,
-    settings.startup[creative_mode_defines.names.settings.autofill_requester_chest_size].value,
-    "requester"
-  ),
   -- New Creative Chest
   infcontainer(
     creative_mode_defines.names.entities.new_creative_chest,
@@ -1244,16 +1234,6 @@ data:extend({
     settings.startup[creative_mode_defines.names.settings.creative_chest_size].value + 1,
     "passive-provider"
   ),
-  -- New Autofill requester chest
-  infcontainer(
-    creative_mode_defines.names.entities.new_autofill_requester_chest,
-    creative_mode_defines.names.items.autofill_requester_chest,
-    "autofill-requester-chest.png",
-    "autofill-requester-chest.png",
-    nil,
-    settings.startup[creative_mode_defines.names.settings.autofill_requester_chest_size].value,
-    "requester"
-  ),
   -- Duplicating chest
   container(
     creative_mode_defines.names.entities.duplicating_chest,

prototypes/item.lua

@@ -30,18 +30,6 @@ data:extend({
     place_result = creative_mode_defines.names.entities.new_creative_provider_chest,
     stack_size = 50,
   },
-  {
-    -- Autofill requester chest
-    type = "item",
-    name = creative_mode_defines.names.items.autofill_requester_chest,
-    icon_size = 32,
-    icon = creative_mode_defines.mod_directory .. "/graphics/icons/autofill-requester-chest.png",
-    hidden = hidden,
-    subgroup = creative_mode_defines.names.item_subgroups.items,
-    order = "c",
-    place_result = creative_mode_defines.names.entities.new_autofill_requester_chest,
-    stack_size = 50,
-  },
   {
     -- Infinity Requester Chest
     type = "item",

prototypes/recipe.lua

@@ -45,14 +45,6 @@ data:extend({
     results = { { type = "item", name = creative_mode_defines.names.items.creative_provider_chest, amount = 1 } },
     enabled = false,
   },
-  {
-    -- Autofill requester chest
-    type = "recipe",
-    name = creative_mode_defines.names.recipes.autofill_requester_chest,
-    ingredients = {},
-    results = { { type = "item", name = creative_mode_defines.names.items.autofill_requester_chest, amount = 1 } },
-    enabled = false,
-  },
   {
     -- Duplicating chest
     type = "recipe",