pumpjack tech w aai

changelog.txt

@@ -1,8 +1,9 @@
 ---------------------------------------------------------------------------------------------------
 Version: 0.7.2
-Date: 2022-08-11
+Date: 2022-08-12
   Changes:
-    - AAII: Oil processing depends on tungsten processing
+    - AAI: Oil processing now depends on tungsten processing. Added new pumpjack tech to enable
+      pumpjacks prior to other oil processing recipes.
 ---------------------------------------------------------------------------------------------------
 Version: 0.7.1
 Date: 2022-08-10

data-updates.lua

@@ -9,10 +9,14 @@ require("compatibility/248k")
 local util = require("data-util");
 
 if mods["aai-industry"] then
+  util.add_prerequisite("pumpjack", "tinned-cable")
+  util.add_prerequisite("oil-processing", "pumpjack")
   util.add_prerequisite("oil-processing", "tungsten-processing")
+  util.remove_recipe_effect("oil-processing", "pumpjack")
 end
 
 if mods.Asteroid_Mining then
   require("__Asteroid_Mining__.scripts.addmodule")
   amfunc.addtype("tungsten-ore", {a = 0,r = 0.55,g = 0.60,b = 0.5})
 end
+

data-util.lua

@@ -945,6 +945,7 @@ function util.replace_ingredients_prior_to(tech, old, new, multiplier)
   for i, recipe in pairs(data.raw.recipe) do
     if (recipe.enabled and recipe.enabled ~= 'false')
       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)
       util.replace_ingredient(recipe.name, old, new, multiplier, true)

locale/en/tungsten.cfg

@@ -39,6 +39,7 @@ bz-tungsten-processing=Basic tungsten processing
 enriched-tungsten=Enriched tungsten
 tungsten-matter-processing=Tungsten conversion
 advanced-carbon-furnace=__ITEM__advanced-carbon-furnace__
+pumpjack=__ENTITY__pumpjack__
 
 [technology-description]
 enriched-tungsten=Enrich tungsten ore, purifying with ammonia [fluid=ammonia] and water [fluid=water], improving the final yield. Produce dirty water [fluid=dirty-water] as a byproduct.

tungsten-recipe.lua

@@ -139,6 +139,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",