move smart farm and native flora to chem

pyanodon · Dec 6, 2023 · fc4855c · fc4855c
1 parent fdc4518
commit fc4855c
Show file tree

Hide file tree

Showing 8 changed files with 950 additions and 945 deletions.
diff --git a/...e+pycoalprocessing+pyfusionenergy+pyhightech+pyindustry+pypetroleumhandling+pyrawores.lua b/...e+pycoalprocessing+pyfusionenergy+pyhightech+pyindustry+pypetroleumhandling+pyrawores.lua
diff --git a/.../pyalienlife+pycoalprocessing+pyfusionenergy+pyindustry+pypetroleumhandling+pyrawores.lua b/.../pyalienlife+pycoalprocessing+pyfusionenergy+pyindustry+pypetroleumhandling+pyrawores.lua
diff --git a/prototypes/buildings/harvester.lua b/prototypes/buildings/harvester.lua
@@ -4,12 +4,12 @@ RECIPE {
     energy_required = 0.5,
     enabled = false,
     ingredients = {
-        {"botanical-nursery-mk03", 2},
-        {"soil-extractormk03", 1},
-        {"processing-unit", 20},
+        {"botanical-nursery-mk02", 2},
+        {"soil-extractormk02", 1},
+        {"advanced-circuit", 20},
         {"iron-gear-wheel", 100},
         {"plastic-bar", 80},
-        {"control-unit", 5},
+        --{"control-unit", 5},
     },
     results = {
         {"harvester", 1}

diff --git a/prototypes/buildings/mega-farm.lua b/prototypes/buildings/mega-farm.lua
@@ -8,15 +8,15 @@ RECIPE {
     ingredients = {
         {"concrete", 200},
         {"treated-wood", 50},
-        {"control-unit", 10},
+        --{"control-unit", 10},
         {"boron-carbide", 30},
-        {"super-alloy", 20},
-        {"blanket", 5},
+        --{"super-alloy", 20},
+        --{"blanket", 5},
         {"nbfe-alloy", 50},
         {"kevlar", 100},
-        {"divertor", 10},
-        {"metallic-glass", 30},
-        {"processing-unit", 50},
+        --{"divertor", 10},
+        --{"metallic-glass", 30},
+        --{"advanced-circuit", 50},
     },
     results = {
         {"mega-farm", 1}

diff --git a/prototypes/recipes/recipes.lua b/prototypes/recipes/recipes.lua
@@ -1708,16 +1708,16 @@ RECIPE {
     ingredients = {
         {type = 'item', name = 'earth-generic-sample', amount = 5},
         {type = 'item', name = 'titanium-plate', amount = 100},
-        {type = 'item', name = 'metallic-glass', amount = 2},
+        --{type = 'item', name = 'metallic-glass', amount = 2},
         {type = 'item', name = 'biofilm', amount = 20},
         {type = 'item', name = 'plastic-bar', amount = 100},
-        {type = 'item', name = 'blanket-chassi', amount = 1},
+        --{type = 'item', name = 'blanket-chassi', amount = 1},
         {type = 'item', name = 'fertilizer', amount = 40},
     },
     results = {
         {type = 'item', name = 'replicator-bioreserve', amount = 1},
     },
-}:add_unlock("mega-farm-bioreserve"):add_ingredient({type = "item", name = "nems", amount = 10}):add_ingredient({type = "item", name = "carbon-nanotube", amount = 10})
+}:add_unlock("mega-farm-bioreserve")--:add_ingredient({type = "item", name = "nems", amount = 10}):add_ingredient({type = "item", name = "carbon-nanotube", amount = 10})
 
 
 RECIPE {

diff --git a/prototypes/technologies/mega-farm.lua b/prototypes/technologies/mega-farm.lua
@@ -4,17 +4,17 @@ TECHNOLOGY {
     icon = "__pyalienlifegraphics__/graphics/technology/mega-farm.png",
     icon_size = 128,
     order = "c-a",
-    prerequisites = {"botany-mk04","fusion-mk01"},
+    prerequisites = {},
     effects = {},
     unit = {
         count = 300,
         ingredients = {
             {'automation-science-pack', 4},
             {'logistic-science-pack', 3},
-            {'military-science-pack', 3},
+            --{'military-science-pack', 3},
             {"chemical-science-pack", 1},
-            {"production-science-pack", 1},
-            {'utility-science-pack', 3},
+            --{"production-science-pack", 1},
+            --{'utility-science-pack', 3},
         },
         time = 45
     }
@@ -145,10 +145,10 @@ TECHNOLOGY {
         ingredients = {
             {'automation-science-pack', 4},
             {'logistic-science-pack', 3},
-            {'military-science-pack', 3},
+            --{'military-science-pack', 3},
             {"chemical-science-pack", 1},
-            {"production-science-pack", 1},
-            {'utility-science-pack', 3},
+            --{"production-science-pack", 1},
+            --{'utility-science-pack', 3},
         },
         time = 45
     }

diff --git a/prototypes/updates/pyhightech-updates.lua b/prototypes/updates/pyhightech-updates.lua
@@ -284,7 +284,7 @@ RECIPE('moondrop-greenhouse-mk04'):add_unlock('botany-mk04'):subgroup_order("py-
 data.raw['assembling-machine']['moondrop-greenhouse-mk04'].module_specification.module_slots = 64
 data.raw['assembling-machine']['moondrop-greenhouse-mk04'].crafting_speed = FUN.farm_speed_derived(64, "moondrop-greenhouse-mk01")
 
-RECIPE('harvester'):replace_ingredient("plastic-bar", "biopolymer"):add_ingredient({type = "item", name = "aerogel", amount = 20})
+RECIPE('harvester'):add_ingredient({type = "item", name = "aerogel", amount = 20})--:replace_ingredient("plastic-bar", "biopolymer")
 RECIPE('harmonic-absorber'):add_ingredient({type = "item", name = "negasium", amount = 1})
 RECIPE('hyperelastic-material'):add_ingredient({type = "item", name = "hyaline", amount = 1})
 RECIPE('arthurian-pen-mk03'):add_ingredient({type = "item", name = "carbon-nanotube", amount = 15})
@@ -373,7 +373,6 @@ RECIPE('yotoi-aloe-orchard-mk04'):add_ingredient({type = "item", name = "aerogel
 RECIPE('zipir-reef-mk04'):add_ingredient({type = "item", name = "hyperelastic-material", amount = 50})
 RECIPE('bio-printer-mk04'):add_ingredient({type = "item", name = "harmonic-absorber", amount = 20}):add_ingredient({type = "item", name = "hyperelastic-material", amount = 50}):add_ingredient({type = "item", name = "intelligent-unit", amount = 15})
 RECIPE('ez-ranch-mk04'):add_ingredient({type = "item", name = "intelligent-unit", amount = 30}):add_ingredient({type = "item", name = "quantum-vortex-storage-system", amount = 10}):add_ingredient({type = "item", name = "phosphate-glass", amount = 100})
-RECIPE('mega-farm'):add_ingredient({type = "item", name = "superconductor-servomechanims", amount = 10}):add_ingredient({type = "item", name = "harmonic-absorber", amount = 30}):add_ingredient({type = "item", name = "intelligent-unit", amount = 50})
 RECIPE('research-center-mk04'):add_ingredient({type = "item", name = "quantum-vortex-storage-system", amount = 10}):add_ingredient({type = "item", name = "aerogel", amount = 100}):add_ingredient({type = "item", name = "intelligent-unit", amount = 50})
 RECIPE('arqad-hive-mk04'):add_ingredient({type = "item", name = "phosphate-glass", amount = 100}):add_ingredient({type = "item", name = "hyperelastic-material", amount = 30})
 RECIPE('simik-den-mk04'):add_ingredient({type = "item", name = "intelligent-unit", amount = 50}):add_ingredient({type = "item", name = "superconductor-servomechanims", amount = 20})

diff --git a/prototypes/updates/pypetroleumhandling-updates.lua b/prototypes/updates/pypetroleumhandling-updates.lua
@@ -77,7 +77,7 @@ RECIPE('chemical-science-01'):replace_ingredient("water","crude-oil")
 RECIPE('production-science-01'):replace_ingredient("water","crude-oil")
 RECIPE('production-science-pack'):add_ingredient({type = "item", name = "small-parts-03", amount = 10})
 RECIPE('chemical-science-01'):replace_ingredient("water","crude-oil")
-RECIPE('harvester'):replace_ingredient("small-parts-01","small-parts-03")
+RECIPE('harvester'):replace_ingredient("small-parts-01","small-parts-02")
 RECIPE('seeds-extract-01'):add_ingredient({type = "item", name = "guar-seeds", amount = 100})
 RECIPE('arqad-jelly-01'):replace_ingredient("active-carbon","carbon-black"):replace_ingredient("oleochemicals-barrel","btx-barrel")