From 243490ca8b1557f3b45ef572777e7eb7862e0be0 Mon Sep 17 00:00:00 2001
From: KiwiHawk <59639+KiwiHawk@users.noreply.github.com>
Date: Sun, 1 Oct 2023 19:44:11 +1300
Subject: [PATCH] Removed tech "Pumpjack"

I don't see any need for Revamp to add this
---
 bobmining/prototypes/pumpjack-updates.lua |  4 ----
 bobrevamp/changelog.txt                   |  1 +
 bobrevamp/data-updates.lua                |  6 ------
 bobrevamp/data.lua                        | 26 -----------------------
 bobrevamp/locale/en/bobrevamp.cfg         |  1 -
 5 files changed, 1 insertion(+), 37 deletions(-)

diff --git a/bobmining/prototypes/pumpjack-updates.lua b/bobmining/prototypes/pumpjack-updates.lua
index 3eb6cb956..70349f2bd 100644
--- a/bobmining/prototypes/pumpjack-updates.lua
+++ b/bobmining/prototypes/pumpjack-updates.lua
@@ -1,8 +1,4 @@
 if settings.startup["bobmods-mining-pumpjacks"].value == true then
-  if data.raw.technology["pumpjack"] then
-    bobmods.lib.tech.replace_prerequisite("bob-pumpjacks-1", "oil-processing", "pumpjack")
-  end
-
   if data.raw.item["steel-gear-wheel"] then
     bobmods.lib.recipe.replace_ingredient("bob-pumpjack-1", "iron-gear-wheel", "steel-gear-wheel")
   end
diff --git a/bobrevamp/changelog.txt b/bobrevamp/changelog.txt
index ee743ccbd..3320a6eb8 100644
--- a/bobrevamp/changelog.txt
+++ b/bobrevamp/changelog.txt
@@ -4,6 +4,7 @@ Date: ???
   Changes:
     - Removed technology Solid Fuel #120
     - Moved solid fuel recipes to tech "Flammables" #120
+    - Removed technology "Pumpjack" #120
 ---------------------------------------------------------------------------------------------------
 Version: 1.1.6
 Date: 01. 01. 2023
diff --git a/bobrevamp/data-updates.lua b/bobrevamp/data-updates.lua
index 87beadf43..7db41107a 100644
--- a/bobrevamp/data-updates.lua
+++ b/bobrevamp/data-updates.lua
@@ -29,18 +29,12 @@ bobmods.lib.recipe.add_ingredient("rocket-silo", { "heat-shield-tile", 100 })
 -- oil overhaul
 if settings.startup["bobmods-revamp-old-oil"].value == true or settings.startup["bobmods-revamp-oil"].value == true then
   bobmods.lib.tech.remove_recipe_unlock("oil-processing", "chemical-plant")
-  bobmods.lib.tech.remove_recipe_unlock("oil-processing", "pumpjack")
   bobmods.lib.tech.remove_recipe_unlock("oil-processing", "solid-fuel-from-petroleum-gas")
   bobmods.lib.tech.add_recipe_unlock("flammables", "solid-fuel-from-petroleum-gas")
   bobmods.lib.tech.remove_prerequisite("oil-processing", "steel-processing")
-  bobmods.lib.tech.add_prerequisite("oil-processing", "pumpjack")
   data.raw.technology["oil-processing"].icon = "__base__/graphics/technology/oil-processing.png"
   bobmods.lib.tech.set_science_pack_count("oil-processing", 30)
 
-  if bobmods.electronics then
-    bobmods.lib.tech.add_prerequisite("pumpjack", "electronics")
-  end
-
   if
     data.raw.recipe["basic-oil-processing"]
     and data.raw.recipe["basic-oil-processing"].results
diff --git a/bobrevamp/data.lua b/bobrevamp/data.lua
index 8a2b9a52e..357b85428 100644
--- a/bobrevamp/data.lua
+++ b/bobrevamp/data.lua
@@ -13,32 +13,6 @@ require("prototypes.rtg")
 -- oil overhaul
 if settings.startup["bobmods-revamp-old-oil"].value == true or settings.startup["bobmods-revamp-oil"].value == true then
   data:extend({
-    {
-      type = "technology",
-      name = "pumpjack",
-      icon = "__base__/graphics/technology/oil-gathering.png",
-      icon_size = 256,
-      icon_mipmaps = 4,
-      order = "d-a-c",
-      prerequisites = {
-        "steel-processing",
-        "logistic-science-pack",
-      },
-      unit = {
-        count = 30,
-        time = 30,
-        ingredients = {
-          { "automation-science-pack", 1 },
-          { "logistic-science-pack", 1 },
-        },
-      },
-      effects = {
-        {
-          type = "unlock-recipe",
-          recipe = "pumpjack",
-        },
-      },
-    },
     {
       type = "technology",
       name = "chemical-plant",
diff --git a/bobrevamp/locale/en/bobrevamp.cfg b/bobrevamp/locale/en/bobrevamp.cfg
index e09cb32c7..3b428b21a 100644
--- a/bobrevamp/locale/en/bobrevamp.cfg
+++ b/bobrevamp/locale/en/bobrevamp.cfg
@@ -1,6 +1,5 @@
 [technology-name]
 chemical-plant=Chemical plant
-pumpjack=Pumpjack research
 solid-fuel=Solid fuel research
 rocket-fuel=__ITEM__rocket-fuel__ research
 hydrazine=Hydrazine research