Merge branch 'dev' into wooden-boards

SeaBlock/changelog.txt

@@ -2,15 +2,21 @@
 Version: 0.5.14
 Date: ???
   Changes:
+    - Added support for Early Construction mod #254
     - Added missing prerequisites #295
-    - Changed replaced recipe Forage for Cellulose Fiber with recipe Forage for Driftwood
-    - Reworked tutorial techs, removing paper making
+    - Added support for Grappling Gun mod #308
+    - Added support for Jetpack mod #309
+    - Wood vs Paper changes #310
+      - Replaced recipe Forage for Cellulose Fiber with recipe Forage for Driftwood
+      - Reworked tutorial techs, removing paper making
   Bugfixes:
     - Fixed Radar being unlocked by both Military and Radars 1 #296
     - Fixed Exoplanetary Studies Lab recipe not including previous lab tier #303
     - Fixed Wind Turbine energy production graph #304
     - Fixed Washing Plant pipe arrow #305
+    - Fixed Companion Drone multiplayer compatibility #307
 ---------------------------------------------------------------------------------------------------
+Version: 0.5.13
 Date: 14.07.2023
   Changes:
     - Milestones mod compatibility #292

SeaBlock/control.lua

@@ -199,12 +199,17 @@ if script.active_mods["Companion_Drones"] then
     if s then
       local companions = s.find_entities_filtered({ name = "companion" })
       for _, companion in pairs(companions) do
-        companion.remove_item("coal")
-        companion.insert("wood-pellets")
-        local grid = companion.grid
-        for _, item in pairs(grid.equipment) do
-          if (item.name == "companion-defense-equipment") or (item.name == "companion-shield-equipment") then
-            grid.take({ equipment = item })
+        local inventory = companion.get_main_inventory()
+        local i = companion.remove_item("coal")
+        -- Only do drone inventory cleanup if coal is found
+        -- Else players will get free wood pellets any time a new player joins
+        if i > 0 then
+          companion.insert("wood-pellets")
+          local grid = companion.grid
+          for _, item in pairs(grid.equipment) do
+            if (item.name == "companion-defense-equipment") or (item.name == "companion-shield-equipment") then
+              grid.take({ equipment = item })
+            end
           end
         end
       end

SeaBlock/data-updates.lua

@@ -6,6 +6,7 @@ require("data-updates/furnaces")
 require("data-updates/groups")
 require("data-updates/military")
 require("data-updates/misc")
+require("data-updates/other-mods")
 require("data-updates/rubber")
 require("data-updates/science-cost-tweaker")
 require("data-updates/slag-processing")

SeaBlock/data-updates/algae.lua

@@ -21,7 +21,7 @@ bobmods.lib.recipe.set_category("lithium-water-electrolysis", "petrochem-electro
 bobmods.lib.tech.remove_recipe_unlock("water-treatment-3", "solid-lithium")
 bobmods.lib.recipe.hide("solid-lithium")
 
--- Move Sodium Carbonate from Brown Algae to Sodium processing
+-- Move Sodium Carbonate from Brown Algae to Sodium processing 2
 seablock.lib.moveeffect("algae-brown-burning-wash", "bio-processing-green", "sodium-processing-2", nil)
 
 -- Move Methanol from Cellulose Fibre to Advanced chemistry 1

SeaBlock/data-updates/misc.lua

@@ -6,6 +6,7 @@ end
 
 -- No natural gas, use methane for manganese pellet smelting
 seablock.lib.substingredient("pellet-manganese-smelting", "gas-natural-1", "gas-methane")
+bobmods.lib.tech.remove_prerequisite("angels-manganese-smelting-3", "oil-gas-extraction")
 bobmods.lib.tech.add_prerequisite("angels-manganese-smelting-3", "gas-processing")
 
 -- Remove steel's prerequiste on Chemical processing 1

SeaBlock/data-updates/other-mods.lua

@@ -0,0 +1,45 @@
+if mods["early_construction"] then
+  bobmods.lib.recipe.replace_ingredient("early-construction-robot", "coal", "wood-charcoal")
+  bobmods.lib.tech.add_prerequisite("early-construction-light-armor", "military")
+  bobmods.lib.tech.add_prerequisite("early-construction-light-armor", "bio-wood-processing-2")
+end
+
+if mods["grappling-gun"] then
+  bobmods.lib.recipe.replace_ingredient("grappling-gun-ammo", "coal", "wood-charcoal")
+end
+
+if mods["jetpack"] then
+  bobmods.lib.tech.remove_science_pack("jetpack-1", "chemical-science-pack")
+  bobmods.lib.tech.add_science_pack("jetpack-1", "military-science-pack", 1)
+  bobmods.lib.tech.remove_prerequisite("jetpack-1", "rocket-fuel")
+  bobmods.lib.tech.remove_prerequisite("jetpack-1", "solar-panel-equipment")
+  bobmods.lib.tech.add_prerequisite("jetpack-1", "modular-armor")
+  bobmods.lib.tech.add_prerequisite("jetpack-1", "rocket-booster-1")
+  bobmods.lib.tech.add_prerequisite("jetpack-1", "military-science-pack")
+  bobmods.lib.tech.add_prerequisite("jetpack-1", "zinc-processing")
+  bobmods.lib.recipe.replace_ingredient("jetpack-1", "electronic-circuit", "advanced-circuit")
+  bobmods.lib.recipe.replace_ingredient("jetpack-1", "pipe", "brass-pipe")
+  bobmods.lib.recipe.replace_ingredient("jetpack-1", "steel-plate", "invar-alloy")
+
+  bobmods.lib.tech.add_science_pack("jetpack-2", "military-science-pack", 1)
+  bobmods.lib.tech.add_prerequisite("jetpack-2", "advanced-electronics-2")
+  bobmods.lib.recipe.replace_ingredient("jetpack-2", "advanced-circuit", "processing-unit")
+
+  bobmods.lib.tech.add_science_pack("jetpack-3", "military-science-pack", 1)
+  bobmods.lib.tech.add_science_pack("jetpack-3", "production-science-pack", 1)
+  bobmods.lib.recipe.replace_ingredient("jetpack-3", "processing-unit", "advanced-processing-unit")
+
+  bobmods.lib.tech.add_science_pack("jetpack-4", "military-science-pack", 1)
+  bobmods.lib.tech.add_science_pack("jetpack-4", "production-science-pack", 1)
+  if mods["bobmodules"] then
+    if mods["CircuitProcessing"] then
+      bobmods.lib.recipe.remove_ingredient("jetpack-4", "speed-module-4")
+      bobmods.lib.recipe.remove_ingredient("jetpack-4", "effectivity-module-4")
+      bobmods.lib.recipe.add_new_ingredient("jetpack-4", { type = "item", name = "speed-module-8", amount = 2 })
+      bobmods.lib.recipe.add_new_ingredient("jetpack-4", { type = "item", name = "effectivity-module-8", amount = 2 })
+    else
+      bobmods.lib.recipe.replace_ingredient("jetpack-4", "speed-module-3", "speed-module-8")
+      bobmods.lib.recipe.replace_ingredient("jetpack-4", "effectivity-module-3", "effectivity-module-8")
+    end
+  end
+end

SeaBlock/data-updates/wood.lua

@@ -37,3 +37,4 @@ bobmods.lib.tech.add_recipe_unlock("bio-wood-processing-3", "cellulose-fiber-raw
 
 bobmods.lib.tech.add_recipe_unlock("resins", "bio-resin-wood-reprocessing")
 bobmods.lib.tech.add_prerequisite("resins", "bio-farm-1")
+bobmods.lib.tech.remove_prerequisite("bio-wood-processing-2", "bio-farm-1")

SeaBlock/remote.lua

@@ -217,11 +217,16 @@ local function milestones_presets()
   }
 end
 
+local function get_jetpack_fuels()
+  return { ["enriched-fuel"] = 0.7 }
+end
+
 remote.add_interface("SeaBlock", {
   get_unlocks = get_unlocks,
   set_unlock = set_unlock,
   get_starting_items = get_starting_items,
   set_starting_item = set_starting_item,
   set_starting_items = set_starting_items,
   milestones_presets = milestones_presets,
+  jetpack_fuels = get_jetpack_fuels,
 })