Fix K2 matter recipe generation and tech icon

bztungsten2/changelog.txt

@@ -1,10 +1,4 @@
 ---------------------------------------------------------------------------------------------------
-Version: 2.0.2
-Date: 02.11.2025
-  Bug Fixes:
-    - Change "optics" to "lamp" to respect the Factorio 2.0 renaming
-    - Remove duplicate pumpjack technology
----------------------------------------------------------------------------------------------------
 Version: 2.0.1
 Date: 21.10.2025
   Changes:

bztungsten2/data-final-fixes.lua

@@ -36,7 +36,7 @@ end
 
 
 -- SE + K2: Keep radar at red science level
-util.remove_prerequisite("kr-radar", "lamp")
+util.remove_prerequisite("kr-radar", "optics")
 util.add_prerequisite("kr-radar", "electricity")
 
 
@@ -48,7 +48,7 @@ util.add_ingredient("omt-electric-mining-drill", "tungsten-carbide", 10)
 
 
 -- Junk Trains, no optics:
-util.remove_prerequisite("automated-scrap-rail-transportation", "lamp")
+util.remove_prerequisite("automated-scrap-rail-transportation", "optics")
 util.remove_ingredient("train-stop-scrap", "small-lamp")
 util.remove_ingredient("rail-signal-scrap", "small-lamp")
 util.remove_ingredient("rail-chain-signal-scrap", "small-lamp")

bztungsten2/data-util.lua

@@ -1193,8 +1193,8 @@ function util.replace_ingredients_prior_to(tech, old, new, multiplier)
   end
   util.remove_prior_unlocks(tech, old)
   for i, recipe in pairs(data.raw.recipe) do
-    if (recipe.enabled and recipe.enabled ~= false)
+    if (recipe.enabled and recipe.enabled ~= 'false')
-      and (not recipe.hidden or recipe.hidden == true) -- probably don't want to change hidden recipes
+      and (not recipe.hidden or recipe.hidden == 'true') -- probably don't want to change hidden recipes
       and string.sub(recipe.name, 1, 3) ~= 'se-' -- have to exlude SE in general :(
     then
       -- log("BZZZ due to 'enabled' replacing " .. old .. " with " .. new .." in " .. recipe.name) -- Handy Debug :|

bztungsten2/info.json

@@ -1,6 +1,6 @@
 {
   "name": "bztungsten2",
-  "version": "2.0.2",
+  "version": "2.0.1",
   "factorio_version": "2.0",
   "title": "Tungsten",
   "description": "Adds tungsten ore (wolframite), tungsten plates, tungsten carbide and rocket engine nozzles to the base game.",

bztungsten2/tungsten-recipe-updates.lua

@@ -4,12 +4,12 @@ local cuw = "tungsten-plate"
 if util.me.cuw() then cuw = "cuw" end
 
 -- Lamps
-util.add_prerequisite("lamp", util.me.tungsten_processing)
+util.add_prerequisite("optics", util.me.tungsten_processing)
-util.set_tech_recipe("lamp", {{"automation-science-pack", 1}, {"logistic-science-pack", 1}})
+util.set_tech_recipe("optics", {{"automation-science-pack", 1}, {"logistic-science-pack", 1}})
 util.add_ingredient("small-lamp", "tungsten-plate", 1)
 
 -- Rail signals use lamps
-util.add_prerequisite("rail-signals", "lamp")
+util.add_prerequisite("rail-signals", "optics")
 util.add_ingredient("rail-signal", "small-lamp", 1)
 util.add_ingredient("rail-chain-signal", "small-lamp", 1)
 
@@ -104,14 +104,14 @@ util.add_ingredient("deadlock-floor-lamp", "tungsten-plate", 2)
 if mods["Krastorio2"] then
   util.set_tech_recipe("engine", {{"kr-basic-tech-card", 1}, {"automation-science-pack", 1}, {"logistic-science-pack", 1}})
   util.set_tech_recipe("fluid-handling", {{"kr-basic-tech-card", 1}, {"automation-science-pack", 1}, {"logistic-science-pack", 1}})
-  util.set_tech_recipe("lamp", {{"kr-basic-tech-card", 1}, {"automation-science-pack", 1}, {"logistic-science-pack", 1}})
+  util.set_tech_recipe("optics", {{"kr-basic-tech-card", 1}, {"automation-science-pack", 1}, {"logistic-science-pack", 1}})
   -- TODO: Fix
   --util.set_tech_recipe("oil-processing", {{"kr-basic-tech-card", 1}, {"automation-science-pack", 1}, {"logistic-science-pack", 1}})
   util.set_tech_recipe("plastics", {{"kr-basic-tech-card", 1}, {"automation-science-pack", 1}, {"logistic-science-pack", 1}})
   if util.me.get_setting("bztungsten-avoid-military") == "yes" then
     util.set_tech_recipe("rocketry", {{"kr-basic-tech-card", 1}, {"automation-science-pack", 1}, {"logistic-science-pack", 1}})
   end
-  util.remove_prerequisite("kr-sentinel", "lamp")
+  util.remove_prerequisite("kr-sentinel", "optics")
 
 
   util.add_prerequisite(util.me.tungsten_processing, "kr-mineral-water-gathering")
@@ -453,7 +453,7 @@ util.add_ingredient("simply-power-armor-mk3", "tungsten-plate", 20)
 
 
 -- Cargo Ships
-util.add_prerequisite("water_transport_signals", "lamp")
+util.add_prerequisite("water_transport_signals", "optics")
 util.add_ingredient("buoy", "small-lamp", 1)
 util.add_ingredient("chain_buoy", "small-lamp", 1)
 util.add_ingredient("oil_rig", "tungsten-carbide", 5)

bztungsten2/tungsten-recipe.lua

@@ -101,6 +101,37 @@ data:extend({
   } or nil,
 })
 
+if mods["aai-industry"] and not data.raw.technology["pumpjack"] then
+data:extend({
+  {
+    type = "technology",
+    name = "pumpjack",
+    icons = {
+      { icon = data.raw.technology["oil-processing"].icon, icon_size=data.raw.technology["oil-processing"].icon_size },
+    },
+    effects =
+    {
+      {
+        type = "unlock-recipe",
+        recipe = "pumpjack",
+      },
+    },
+    unit =
+    {
+      count = 25,
+      ingredients = 
+          {
+            {"automation-science-pack", 1},
+            {"logistic-science-pack", 1}
+          },
+      time = 30,
+    },
+    prerequisites = {"fluid-handling"},
+    order = "b-b",
+  },
+})
+end
+
 data:extend({
   {
     type = "recipe",