From db81ee44e238c5b13ea162d5227ca7ad0e6b01cd Mon Sep 17 00:00:00 2001
From: Brevven <brevingame@gmail.com>
Date: Mon, 15 Aug 2022 00:02:40 -0700
Subject: [PATCH] mv

---
 chlorine.lua => prototypes/chlorine.lua |  0
 epoxy.lua => prototypes/epoxy.lua       |  0
 pcb.lua => prototypes/pcb.lua           | 17 +++++++++++++----
 salt.lua => prototypes/salt.lua         |  0
 4 files changed, 13 insertions(+), 4 deletions(-)
 rename chlorine.lua => prototypes/chlorine.lua (100%)
 rename epoxy.lua => prototypes/epoxy.lua (100%)
 rename pcb.lua => prototypes/pcb.lua (87%)
 rename salt.lua => prototypes/salt.lua (100%)

diff --git a/chlorine.lua b/prototypes/chlorine.lua
similarity index 100%
rename from chlorine.lua
rename to prototypes/chlorine.lua
diff --git a/epoxy.lua b/prototypes/epoxy.lua
similarity index 100%
rename from epoxy.lua
rename to prototypes/epoxy.lua
diff --git a/pcb.lua b/prototypes/pcb.lua
similarity index 87%
rename from pcb.lua
rename to prototypes/pcb.lua
index 9e22931..77f6512 100644
--- a/pcb.lua
+++ b/prototypes/pcb.lua
@@ -10,6 +10,9 @@ data:extend({
     order = "f[advanced-circuit][pcb-substrate]",
     stack_size = util.get_stack_size(200),
   },
+})
+if (not mods.bobelectronics and not mods.MDbobelectronics) then
+data:extend({
   {
     type = "item",
     name = "pcb",
@@ -21,6 +24,7 @@ data:extend({
   },
 
 })
+end
 
 data:extend({
   {
@@ -37,6 +41,14 @@ data:extend({
     category = "chemistry",
     energy_required = 6,
   },
+})
+util.add_unlock("advanced-electronics", "pcb-substrate")
+-- These updates should be in data phase
+util.replace_some_ingredient("pcb-substrate", "plastic-bar", 1, "silica", 3, {force=true})
+util.replace_some_ingredient("pcb-substrate", "plastic-bar", 1, "bakelite", 1, {force=true})
+
+if (not mods.bobelectronics and not mods.MDbobelectronics) then
+data:extend({
   {
     type = "recipe",
     name = "pcb",
@@ -55,9 +67,6 @@ data:extend({
   },
 })
 
-util.add_unlock("advanced-electronics", "pcb-substrate")
 util.add_unlock("advanced-electronics", "pcb")
 
--- These updates should be in data phase
-util.replace_some_ingredient("pcb-substrate", "plastic-bar", 1, "silica", 3)
-util.replace_some_ingredient("pcb-substrate", "plastic-bar", 1, "bakelite", 1)
+end
diff --git a/salt.lua b/prototypes/salt.lua
similarity index 100%
rename from salt.lua
rename to prototypes/salt.lua