Updating tutorial to use wood rather than paper

SeaBlock/control.lua

@@ -58,8 +58,7 @@ local function init()
     end
   end
   global.unlocks = {
-    ["angels-ore3-crushed"] = { "sb-startup1", "landfill" },
-    ["algae-brown"] = { "sb-startup2", "bio-wood-processing", "bio-paper-1" },
+    ["angels-ore3-crushed"] = { "sb-startup1", "bio-wood-processing", "landfill" },
     ["basic-circuit-board"] = { "sb-startup3", "sct-lab-t1" },
   }
   if game.technology_prototypes["sct-automation-science-pack"] then

SeaBlock/data-final-fixes/tech-tree.lua

@@ -15,9 +15,8 @@ seablock.lib.hide_technology("chemical-processing-1")
 seablock.lib.hide_technology("chemical-processing-2")
 
 bobmods.lib.tech.remove_recipe_unlock("angels-advanced-gas-processing", "solid-fuel-methane")
-bobmods.lib.tech.remove_prerequisite("circuit-network", "bio-wood-processing")
-bobmods.lib.tech.remove_recipe_unlock("circuit-network", "bob-rubber")
-bobmods.lib.tech.remove_recipe_unlock("circuit-network", "insulated-cable")
+bobmods.lib.tech.remove_prerequisite("circuit-network", "bio-wood-processing-2")
+bobmods.lib.tech.add_prerequisite("circuit-network", "bio-paper-1")
 bobmods.lib.tech.remove_prerequisite("rubbers", "circuit-network")
 
 -- Unhide solid fuel from hydrogen

SeaBlock/data-updates/algae.lua

@@ -1,20 +1,11 @@
 -- Speed up algae farm
 data.raw["assembling-machine"]["algae-farm"].crafting_speed = 0.75
 
--- Brown algae
-bobmods.lib.tech.remove_prerequisite("bio-processing-brown", "automation")
-bobmods.lib.tech.add_prerequisite("bio-processing-brown", "water-treatment")
-bobmods.lib.tech.add_prerequisite("bio-processing-brown", "bio-processing-green")
-bobmods.lib.tech.remove_recipe_unlock("bio-processing-brown", "algae-green-simple")
-seablock.lib.moveeffect("algae-brown", "bio-processing-green", "bio-processing-brown", nil)
-seablock.lib.moveeffect("algae-farm-2", "bio-processing-green", "bio-processing-brown", 1)
-bobmods.lib.tech.ignore_tech_cost_multiplier("bio-processing-brown", false)
-
--- Green algae
-bobmods.lib.recipe.set_category("algae-green", "bio-processing")
-bobmods.lib.tech.remove_prerequisite("bio-processing-green", "bio-processing-brown")
+-- Improved algae processing
 bobmods.lib.tech.remove_prerequisite("bio-processing-green", "water-treatment")
 bobmods.lib.tech.add_prerequisite("bio-processing-green", "bio-wood-processing-2")
+bobmods.lib.tech.add_prerequisite("bio-processing-green", "water-washing-1")
+data.raw.technology["bio-processing-green"].localised_name = { "technology-name.sb-bio-processing-green" }
 
 -- Move Lithia Salt to Thermal Water Extraction
 seablock.lib.moveeffect("algae-brown-burning", "bio-processing-green", "thermal-water-extraction", 2)
@@ -34,10 +25,11 @@ seablock.lib.moveeffect("algae-brown-burning-wash", "bio-processing-green", "sod
 seablock.lib.moveeffect("gas-methanol-from-wood", "bio-processing-green", "angels-advanced-chemistry-1", 5)
 
 -- Make Red Algae depend on Blue Algae instead of Green Algae
-bobmods.lib.tech.replace_prerequisite("bio-processing-red", "bio-processing-green", "bio-processing-blue")
+bobmods.lib.tech.remove_prerequisite("bio-processing-red", "bio-processing-green")
+bobmods.lib.tech.add_prerequisite("bio-processing-red", "bio-processing-blue")
 
 -- Blue algae
-bobmods.lib.tech.replace_prerequisite("bio-processing-blue", "bio-processing-red", "bio-processing-brown")
+bobmods.lib.tech.replace_prerequisite("bio-processing-blue", "bio-processing-red", "bio-processing-green")
 bobmods.lib.tech.remove_prerequisite("bio-processing-blue", "chemical-science-pack")
 bobmods.lib.tech.remove_science_pack("bio-processing-blue", "chemical-science-pack")
 bobmods.lib.tech.remove_recipe_unlock("bio-processing-blue", "algae-farm-4")
@@ -51,13 +43,8 @@ bobmods.lib.recipe.set_category("alien-bacteria", "bio-processing-3")
 
 -- Make these craftable by hand
 bobmods.lib.recipe.set_category("solid-alginic-acid", "crafting")
-bobmods.lib.recipe.set_category("wooden-board-paper", "crafting")
 
 -- Fix handcrafting trying to use wrong crafting path
-bobmods.lib.recipe.set_category("wooden-board", "electronics-machine")
-bobmods.lib.recipe.enabled("wooden-board", false)
-bobmods.lib.tech.add_recipe_unlock("bio-wood-processing-3", "wooden-board")
-
 data.raw.recipe["cellulose-fiber-algae"].allow_as_intermediate = false
 data.raw.recipe["cellulose-fiber-raw-wood"].allow_as_intermediate = false
 

SeaBlock/data-updates/misc.lua

@@ -45,7 +45,6 @@ bobmods.lib.tech.add_prerequisite("water-treatment", "slag-processing-1")
 bobmods.lib.tech.remove_prerequisite("water-washing-1", "water-treatment")
 bobmods.lib.tech.add_prerequisite("water-washing-1", "automation")
 seablock.lib.moveeffect("yellow-waste-water-purification", "water-treatment-2", "water-treatment")
-seablock.lib.moveeffect("clarifier", "water-treatment", "water-washing-1", 3)
 
 bobmods.lib.tech.remove_prerequisite("electronics", "chemical-processing-1")
 

SeaBlock/data-updates/rubber.lua

@@ -1,5 +1,6 @@
 bobmods.lib.recipe.hide("bob-rubber")
-seablock.lib.moveeffect("insulated-cable", "electronics", "rubbers")
+bobmods.lib.tech.remove_recipe_unlock("circuit-network", "insulated-cable")
+bobmods.lib.tech.add_recipe_unlock("rubbers", "insulated-cable")
 
 -- Circuit network wires should not require rubber
 bobmods.lib.recipe.set_ingredients("green-wire", { { "solid-paper", 2 }, { "tinned-copper-cable", 1 } })

SeaBlock/data-updates/startup.lua

@@ -2,12 +2,9 @@
 -- Electrolyser   5                                               22*4
 -- Liquifier      5                    2
 -- Flare stack    5*2            10*2
--- Offshore pump  2*2            1*2                   10*2
+-- Offshore pump  2              1                     10  
 -- Crystallizer   5                                                           5
 
--- Second stage:
--- Algae farm     5                                               10*2
-
 local knowningredients = {
   ["angels-electrolyser"] = {
     { "iron-plate", 10 },
@@ -230,20 +227,9 @@ if mods["Explosive Excavation"] then
 end
 
 -- Make bio-wood-processing a startup tutorial tech
-data.raw.technology["bio-wood-processing"].prerequisites = { "sb-startup2" }
+data.raw.technology["bio-wood-processing"].prerequisites = { "sb-startup1" }
 data.raw.technology["bio-wood-processing"].unit = {
   count = 1,
   ingredients = {},
   time = 1,
 }
-
--- Make bio-paper-1 a startup tutorial tech
-data.raw.technology["bio-paper-1"].prerequisites = { "sb-startup2" }
-data.raw.technology["bio-paper-1"].unit = {
-  count = 1,
-  ingredients = {},
-  time = 1,
-}
-bobmods.lib.tech.remove_recipe_unlock("bio-processing-brown", "solid-alginic-acid")
-bobmods.lib.tech.add_recipe_unlock("bio-paper-1", "solid-alginic-acid")
-bobmods.lib.tech.remove_prerequisite("bio-paper-2", "bio-paper-1")

SeaBlock/data-updates/wood.lua

@@ -1,9 +1,3 @@
--- No wood for electric poles, use wood bricks instead
-seablock.lib.substingredient("small-electric-pole", "wood", "wood-bricks", nil)
-
--- Wood removal
-seablock.lib.substingredient("phenolic-board", "wood", "wooden-board", 2)
-
 -- Remove wood from basic underground belt and splitter recipes
 seablock.lib.removeingredient("basic-underground-belt", "wood")
 seablock.lib.removeingredient("basic-splitter", "wood")
@@ -15,26 +9,33 @@ for k, v in pairs(data.raw.module) do
   end
 end
 
-bobmods.lib.tech.remove_recipe_unlock("bio-wood-processing-2", "carbon-from-charcoal")
-bobmods.lib.tech.remove_recipe_unlock("bio-wood-processing-2", "wood-charcoal")
-
-bobmods.lib.tech.replace_prerequisite("bio-wood-processing-3", "angels-coal-processing-3", "bio-arboretum-1")
-bobmods.lib.tech.replace_prerequisite("bio-wood-processing-3", "angels-coal-processing-3", "bio-arboretum-1")
-
-bobmods.lib.tech.remove_prerequisite("bio-arboretum-1", "bio-wood-processing")
-
--- Remove wooden chest from composter recipe
-bobmods.lib.recipe.remove_ingredient("composter", "wooden-chest")
-
-seablock.lib.moveeffect("cellulose-fiber-algae", "bio-processing-brown", "bio-wood-processing", 1)
-seablock.lib.add_recipe_unlock("bio-wood-processing", "cellulose-fiber-raw-wood", 2)
+bobmods.lib.recipe.enabled("wooden-chest", false)
+bobmods.lib.recipe.enabled("wooden-board", false)
 bobmods.lib.recipe.enabled("cellulose-fiber-raw-wood", false)
-seablock.lib.add_recipe_unlock("bio-wood-processing", "wood-pellets", 3)
-seablock.lib.moveeffect("wood-bricks", "bio-wood-processing-3", "bio-wood-processing", 4)
-seablock.lib.add_recipe_unlock("bio-wood-processing", "small-electric-pole", 5)
+
+bobmods.lib.tech.remove_recipe_unlock("bio-wood-processing", "wood-pellets")
+bobmods.lib.tech.add_recipe_unlock("bio-wood-processing", "small-electric-pole")
 bobmods.lib.tech.add_recipe_unlock("bio-wood-processing", "wooden-chest")
-bobmods.lib.recipe.enabled("wooden-chest", false)
+bobmods.lib.tech.add_recipe_unlock("bio-wood-processing", "wooden-board")
+bobmods.lib.tech.add_recipe_unlock("bio-wood-processing", "basic-circuit-board")
+
+bobmods.lib.tech.remove_prerequisite("bio-wood-processing-2", "bio-farm-1")
+bobmods.lib.tech.remove_prerequisite("bio-wood-processing-2", "bio-wood-processing")
+bobmods.lib.tech.add_prerequisite("bio-wood-processing-2", "bio-processing-brown")
+bobmods.lib.tech.remove_recipe_unlock("bio-wood-processing-2", "wood-charcoal")
+bobmods.lib.tech.remove_recipe_unlock("bio-wood-processing-2", "bio-resin-wood-reprocessing")
+bobmods.lib.tech.remove_recipe_unlock("bio-wood-processing-2", "bob-rubber")
+bobmods.lib.tech.add_recipe_unlock("bio-wood-processing-2", "wood-pellets")
+bobmods.lib.tech.add_recipe_unlock("bio-wood-processing-2", "wood-bricks")
+bobmods.lib.tech.add_recipe_unlock("bio-wood-processing-2", "sb-wood-bricks-charcoal")
+bobmods.lib.tech.add_recipe_unlock("bio-wood-processing-2", "carbon-separation-2")
+
+bobmods.lib.tech.remove_prerequisite("bio-wood-processing-3", "angels-coal-processing")
+bobmods.lib.tech.remove_prerequisite("bio-wood-processing-3", "logistic-science-pack")
+bobmods.lib.tech.add_prerequisite("bio-wood-processing-3", "bio-arboretum-1")
+bobmods.lib.tech.remove_recipe_unlock("bio-wood-processing-3", "wood-bricks")
+bobmods.lib.tech.add_recipe_unlock("bio-wood-processing-3", "cellulose-fiber-raw-wood")
+bobmods.lib.tech.remove_science_pack("bio-wood-processing-3", "logistic-science-pack")
 
-bobmods.lib.tech.remove_recipe_unlock("bio-arboretum-1", "bio-resin-wood-reprocessing")
 bobmods.lib.tech.add_recipe_unlock("resins", "bio-resin-wood-reprocessing")
 bobmods.lib.tech.add_prerequisite("resins", "bio-farm-1")

SeaBlock/data/recipe.lua

@@ -7,8 +7,6 @@ angelsmods.functions.make_void("solid-compost", "bio", 5)
 
 -- Remove recipe Wood pellets > Carbon dioxide
 -- Move recipe Charcoal > Carbon dioxide from Basic chemistry to Wood processing 2
-bobmods.lib.tech.remove_recipe_unlock("bio-wood-processing-2", "gas-carbon-dioxide-from-wood")
+bobmods.lib.tech.remove_recipe_unlock("bio-wood-processing-3", "gas-carbon-dioxide-from-wood")
 bobmods.lib.recipe.hide("gas-carbon-dioxide-from-wood")
 bobmods.lib.tech.remove_recipe_unlock("basic-chemistry", "carbon-separation-2")
-bobmods.lib.tech.add_recipe_unlock("bio-wood-processing-2", "sb-wood-bricks-charcoal")
-bobmods.lib.tech.add_recipe_unlock("bio-wood-processing-2", "carbon-separation-2")

SeaBlock/data/tables.lua

@@ -5,7 +5,6 @@ seablock.scripted_techs = {
   ["sb-startup1"] = true,
   ["landfill"] = true,
   ["sb-startup2"] = true,
-  ["bio-paper-1"] = true,
   ["bio-wood-processing"] = true,
   ["sb-startup3"] = true,
   ["sb-startup4"] = true,
@@ -55,7 +54,7 @@ seablock.startup_recipes = {
   ["dirt-water-separation"] = true,
   ["liquifier"] = true,
   ["offshore-pump"] = true,
-  ["sb-cellulose-foraging"] = true,
+  ["sb-wood-foraging"] = true,
   ["sb-water-mineralized-crystallization"] = true,
   ["slag-processing-stone"] = true,
   ["stone-pipe"] = true,

SeaBlock/data/tech-tree.lua

@@ -34,11 +34,6 @@ end
 bobmods.lib.tech.add_prerequisite("angels-glass-smelting-1", "silicon-processing")
 bobmods.lib.tech.add_prerequisite("angels-stone-smelting-2", "silicon-processing")
 
--- Clear prerequisites so it's available at end of tutorial
-bobmods.lib.tech.remove_prerequisite("bio-wood-processing-2", "bio-wood-processing")
-bobmods.lib.tech.remove_prerequisite("bio-wood-processing-2", "angels-coal-processing")
-bobmods.lib.tech.remove_prerequisite("bio-wood-processing-2", "advanced-material-processing")
-
 -- Add missing Science Pack Tech prerequisites
 
 -- Bio

SeaBlock/locale/en/SeaBlock.cfg

@@ -1,6 +1,6 @@
 [recipe-name]
 sb-water-mineralized-crystallization=Mineralized water crystallization
-sb-cellulose-foraging=Forage for cellulose fiber
+sb-wood-foraging=Forage for driftwood
 sb-blue-algae-liquefaction=Blue algae liquefaction
 slag-processing-filtering-1=Slurry charcoal filtering
 crystal-slurry-filtering-1=Crystal slurry charcoal filtering
@@ -31,28 +31,23 @@ silo-coal=Silo with a "Charcoal" aesthetic.
 
 [technology-name]
 sb-startup1=Crush stiratite
-sb-startup2=Farm brown algae
 sb-startup3=Basic circuit board
 sb-startup4=Laboratory
-bio-processing-brown=Brown algae processing
-bio-processing-green=Green algae processing
-sb-bio-processing-advanced=Advanced algae processing
+sb-bio-processing-green=Improved algae processing
 sct-lab-lab2=Exoplanetary Studies Lab
 angels-coal-processing=Charcoal processing
 ftl-theory-D=Faster than light theory D2
 ftl-theory-D2=Faster than light theory E
 
 [technology-description]
 sb-startup1=Crushed saphirite can be smelted to iron plates. Crushed stiratite can be smelted to copper plates.
-sb-startup2=Grow brown algae in an algae farm. Brown algae can be crafted into alginic acid which is needed to make wooden boards.
 sb-startup3=Craft a basic circuit board. Basic circuit boards are required to craft most machines.
 sct-lab-lab2=Exoplanetary Studies Lab
 ftl-theory-D=Theoretical faster than light travel part D2 - logistics bias
 ftl-theory-D2=Theoretical faster than light travel part E
 
 [item-description]
 sb-angelsore3-tool=Collect crushed stiratite ore from a burner ore crusher to complete this research
-sb-algae-brown-tool=Collect brown algae from an algae farm to complete this research
 sb-basic-circuit-board-tool=Craft one basic circuit board to complete this research
 sb-lab-tool=Craft a lab to complete this research
 

SeaBlock/prototypes/recipe.lua

@@ -59,17 +59,17 @@ data:extend({
   },
   {
     type = "recipe",
-    name = "sb-cellulose-foraging",
-    localised_name = { "recipe-name.sb-cellulose-foraging" },
+    name = "sb-wood-foraging",
+    localised_name = { "recipe-name.sb-wood-foraging" },
     category = "crafting-handonly",
     subgroup = "bio-processing-green",
     enabled = true,
-    energy_required = 2,
+    energy_required = 4,
     ingredients = {},
     results = {
-      { type = "item", name = "cellulose-fiber", amount = 1 },
+      { type = "item", name = "wood", amount = 1 },
     },
-    order = "ab[sb-cellulose-foraging]",
+    order = "ab[sb-wood-foraging]",
     allow_as_intermediate = true,
     allow_decomposition = false,
   },

SeaBlock/prototypes/technology.lua

@@ -19,16 +19,6 @@ data:extend({
     stack_size = 100,
     durability = 1,
   },
-  {
-    type = "tool",
-    name = "sb-algae-brown-tool",
-    localised_name = { "item-name.algae-brown" },
-    icon = "__angelsbioprocessing__/graphics/icons/algae-brown.png",
-    icon_size = 32,
-    flags = { "hidden" },
-    stack_size = 100,
-    durability = 1,
-  },
   {
     type = "tool",
     name = "sb-lab-tool",
@@ -48,28 +38,11 @@ data:extend({
     effects = {
       { type = "unlock-recipe", recipe = "angelsore1-crushed-smelting" },
       { type = "unlock-recipe", recipe = "angelsore3-crushed-smelting" },
-      { type = "unlock-recipe", recipe = "algae-farm" },
-      { type = "unlock-recipe", recipe = "algae-green-simple" },
-    },
-    unit = {
-      count = 1,
-      ingredients = { { "sb-angelsore3-tool", 1 } },
-      time = 1,
-    },
-  },
-  {
-    type = "technology",
-    name = "sb-startup2",
-    icon = "__angelsbioprocessing__/graphics/technology/algae-farm-tech.png",
-    icon_size = 128,
-    effects = {
-      { type = "unlock-recipe", recipe = "basic-circuit-board" },
       { type = "unlock-recipe", recipe = "copper-cable" },
     },
-    prerequisites = { "landfill" },
     unit = {
       count = 1,
-      ingredients = { { "sb-algae-brown-tool", 1 } },
+      ingredients = { { "sb-angelsore3-tool", 1 } },
       time = 1,
     },
   },
@@ -89,7 +62,7 @@ data:extend({
       { type = "unlock-recipe", recipe = "burner-inserter" },
       { type = "unlock-recipe", recipe = "iron-chest" },
     },
-    prerequisites = { "bio-wood-processing", "bio-paper-1" },
+    prerequisites = { "bio-wood-processing" },
     unit = {
       count = 1,
       ingredients = { { "sb-basic-circuit-board-tool", 1 } },
@@ -114,6 +87,8 @@ data:extend({
   {
     type = "technology",
     name = "sb-bio-processing-advanced",
+    localised_name = { "technology-name.bio-processing-green" },
+    localised_description = { "technology-description.bio-processing-green" },
     icon = "__angelsbioprocessing__/graphics/technology/algae-farm-tech.png",
     icon_size = 128,
     order = "c-a",

SeaBlock/starting-items.lua

@@ -10,10 +10,10 @@ function seablock.populate_starting_items(items)
     ["stone-pipe"] = 100,
     ["stone-pipe-to-ground"] = 50,
     ["stone-brick"] = 500,
-    ["pipe"] = 22,
+    ["pipe"] = 21,
     ["copper-pipe"] = 5,
-    ["iron-gear-wheel"] = 20,
-    ["iron-stick"] = 108,
+    ["iron-gear-wheel"] = 10,
+    ["iron-stick"] = 88,
     ["pipe-to-ground"] = 2,
   }