1.1.3

Author: ickputzdirwech

README.md

@@ -41,38 +41,53 @@ This mod is a custom version of the [Sea Block Pack](mods.factorio.com/mod/SeaBl
 
 **Settings**
 
+* Changed startup setting "Enable pressure fluid tanks" from mod "Angel's Addons - Storage Options" default to "false" and hid it (does nothing).
 * Changed startup setting "Auto-barreling" from mod "Angel's Refining" default to "true".
-* Changes startup setting "Vehicle: Spidertron remote" from mod "Shortcuts for 1.1" default to "Enabled (hide remote from inventory)".
 * Hid startup settings regarding "Starting resources" from mod "Angel's Refining".
+* Changed startup settings "Always show assembling machines" and "Always show products" from "Bob & Angel RAWs Patch" default to "false".
+* Changed startup setting "Multi-purpose furnaces" from "Bob's Assembling machines mod" default to "false" and hid it.
+* Changed startup setting "Fluid burning furnaces" from "Bob's Assembling machines mod" default to "false".
+* Changed startup settings "Fluid wagon base size" and "Storage tank base size" from "Bob's logistics mod" default to 50.
+* Changed startup settings "Add conversion recipes" from "Bob's Metals, Chemicals and Intermediates mod" default to "false" and hid it.
+* Hid startup settings "Enable water ores" and "infinite ores" from "Bob's Ores mod" (do nothing).
+* Changed startup setting "Burner and fluid powered heat sources" from mod "Bob's Power mod" default to "true" and hid it (does nothing).
+* Hid startup setting "Burner power phase" from "Bob's Technology mod" (messes everything up).
+* Hid startup setting "Science pack colors update" from "Bob's Technology mod" (does nothing).
+* Changes startup setting "Vehicle: Spidertron remote" from mod "Shortcuts for 1.1" default to "Enabled (hide remote from inventory)".
 * Added startup setting "Hide burner inserter", default true.
 * Added startup setting "Hide walls and gates", default true.
 
 
-**Recipes**
+**Recipes (WIP)**
 
+* Warehouses require silos.
 * Repair packs require their previous tier.
+* If burner inserters are enabled, they are an ingredient of the inserter.
+* Steel and electric furnaces require stone and steel furnaces.
 * Armors require their previous tier.
 * Tankotrons require a tank instead of spidertron cannons.
-* If burner inserters are enabled, they are an ingredient of the inserter.
 * If walls and gates are enabled, reinforced walls and gates require normal walls and gates.
 
 
-**Technologies**
+**Technologies (WIP)**
 
+* Warehouses and logistic warehouses are dependent on silos and logistic silos.
 * Raw gem recipes are unlocked by geode crystallization 1.
-* Alien artifact recipes are unlocked by alien bio processing 3.
 * Rubite and bobmonium ore crushing and lead and tin plate are unlocked by slag processing 1.
 * Glass, copper, iron, lead and tin plate from ores are unlocked by mechanical refining.
+* Advanced lead and tin smelting are dependent on slag processing 1.
 * Silver plate is unlocked by hydro-refining.
+* Alien artifact recipes are unlocked by alien bio processing 3.
 
 
 **Graphics (WIP)**
 
 * New icon for "Logistics" tab (medium power pole and storage chest).
 * New icon for "Bob's logistics" tab (vanilla "Logistics" tab icon).
 * New icon for "Bob's materials" tab (polished emerald).
+* Improved SpaceX Combinator icon.
 * Changed diesel fuel recipe icon to the diesel fuel fluid icon.
-- Added roman numerals to the icons of the three carbon dioxide recipes.
+* Added roman numerals to the icons of the three carbon dioxide recipes.
 * New icons for thermal water recipes.
 * Changed clean ceramic filter recipe icon to spent ceramic filter icon.
 
@@ -87,21 +102,27 @@ This mod is a custom version of the [Sea Block Pack](mods.factorio.com/mod/SeaBl
 **Hidden stuff (WIP)**
 
 * Items, recipes, entities and technologies got hidden where necessary. Redundant technology unlocks got removed.
-* Hid burner and steam inserters.
-* Hid accumulator.
 * Hid armoured rolling stock.
-* Hid burner and fluid burning heat sources.
 * Hid ore silos (default and logistic variants are still available).
+* Hid burner inserter (can be reenabled).
+* Hid steam inserter.
 * Hid converter valve.
+* Hid storage tanks from angels.
+* Hid accumulator.
 * Hid burner and big burner generators.
+* Hid burner and fluid burning heat sources.
 * Hid diesel generator and oil boiler.
+* Hid chemical and metal mixing furnaces.
 * Hid all combat robots and their components.
 * Hid spidertron cannon.
 * Hid landmines.
 * Hid invar cobalt-steel and titanium-ceramic armor.
+* Hid walls and gates (can be reenabled).
 * Hid ground water bore.
+* Hid bob's electrolyser from GUIs.
 * Hid pollution	modules from GUIs.
 * Hid mining drills and pumpjacks from GUIs.
+* Hid mining recipes from GUIs (had to remove all resource entities).
 * Hid lithia water from GUIs.
 
 
@@ -111,8 +132,8 @@ This mod is a custom version of the [Sea Block Pack](mods.factorio.com/mod/SeaBl
 * Moved car, tanks, spider vehicles and artillery wagons in "Combat" tab.
 * Moved all pipes in "Barrelling and fluid control" tab.
 * Moved "Barrelling and fluid control" tab behind "Bob's logistics" tab.
-- Reordered "Barrelling and fluid control" tab. (WIP)
-* Reordered "Production" tab. (WIP)
+* Reordered "Barrelling and fluid control" tab. (WIP)
+* Reordered "Production" tab.
 * Moved repair packs in "Logistics" tab.
 * Reordered "Modules" tab.
 * Merged "Intermediate products" and "Bob's intermediates" tabs.

TODO.md

@@ -8,23 +8,27 @@
 * Research queue on
 *
 
-# Hide recipes and items
+# FEATURES
+
+* Small tank size
+* Steam turbine and heat exchanger temperature
+*
+
+# HIDE
 
 * Military tab
 *
 
 # ORDER
 
-* Alt. furnace recipes
-* Alt. boiler recipes
-* Production tab
 * Military tab
 * Petrochemical refining tab
 *
 
 # ICONS
 
 * Adjustable inserter GUI
+* Artisanal reskin tier labels (small storage tanks, armor, spidertrons)
 * sb-water-mineralized-crystallization recipe
 * enriched fuel block recipe
 * rocket booster
@@ -33,11 +37,9 @@
 * sodium hydroxide solution
 *
 
-# Upgrade recipes
+# UPGRADE RECIPES
 
-* Logistic chests, silos and warehouses
-* Red and green wire in combinators
-* Angel's Storage tanks
+* Guns
 *
 
 # RENAME
@@ -46,10 +48,14 @@
 
 # TECHNOLOGY DEPENDENCIES
 
-* Silos and warehouses
+* Alloy processing
 *
 
 # ISSUES I DON'T WANT TO DEAL WITH
 
 * Carbon dioxide from charcoal vs carbon ?
 *
+
+# ISSUES I CAN'T SOLVE
+
+*

changelog.txt

@@ -1,3 +1,42 @@
+---------------------------------------------------------------------------------------------------
+Version: 1.1.3
+Date: 2021-01-03
+  Settings:
+    - Changed startup setting "Enable pressure fluid tanks" from mod "Angel's Addons - Storage Options" default to "false" and hid it (does nothing).
+    - Changed startup settings "Always show assembling machines" and "Always show products" from "Bob & Angel RAWs Patch" default to "false".
+    - Changed startup setting "Multi-purpose furnaces" from "Bob's Assembling machines mod" default to "false" and hid it.
+    - Changed startup setting "Fluid burning furnaces" from "Bob's Assembling machines mod" default to "false".
+    - Changed startup settings "Fluid wagon base size" and "Storage tank base size" from "Bob's logistics mod" default to "50".
+    - Changed startup settings "Add conversion recipes" from "Bob's Metals, Chemicals and Intermediates mod" default to "false" and hid it.
+    - Hid startup settings "Enable water ores" and "infinite ores" from "Bob's Ores mod" (do nothing).
+    - Changed startup setting "Burner and fluid powered heat sources" from mod "Bob's Power mod" default to "false" and hid it (does nothing).
+    - Hid startup setting "Burner power phase" from "Bob's Technology mod" (messes everything up).
+    - Hid startup setting "Science pack colors update" from "Bob's Technology mod" (does nothing).
+  Recipes:
+    - Warehouses require silos.
+    - Steel and electric furnaces require stone and steel furnaces.
+    - Reduces steel count for heavy armor recipe to account for light armor.
+    - Moved recipes for bob's chemical and metal mixing furnaces to either angel's chemical furnace or sintering oven.
+  Technologies:
+    - Warehouses and logistic warehouses are dependent on silos and logistic silos.
+  Graphics:
+    - Improved SpaceX Combinator icon.
+  Hidden:
+    - Hid storage tanks from angels.
+    - Hid bob's chemical and metal mixing furnaces.
+    - Hid bob's electrolyser from GUIs.
+    - Hid mining recipes from GUIs (had to remove all resource entities).
+    - Hid some more combat robots related stuff.
+  Locale:
+    - Renamed third carbon dioxide recipe to "Carbon dioxide from wood pellets".
+  Order:
+    - Reordered some more things in "Production" tab.
+    - Reordered some more things in "Intermediate products" tab.
+    - Reordered some more things in "Combat" tab. (WIP)
+  Bugfixes:
+    - Fixed that recipes with new technology to unlock were not unlocked if the technology was researched already.
+    - Fixed that hiding technologies could result in unresearchable technologies.
+
 ---------------------------------------------------------------------------------------------------
 Version: 1.1.2
 Date: 2021-01-01
@@ -22,8 +61,7 @@ Date: 2021-01-01
     - Rubite and bobmonium ore crushing and lead and tin plate are unlocked by slag processing 1.
     - Glass, copper, iron, lead and tin plate from ores are unlocked by mechanical refining.
     - Silver plate is unlocked by hydro-refining.
-    - Advanced lead smelting is now dependent on slag processing 1.
-    - Advanced tin smelting is now dependent on slag processing 1.
+    - Advanced lead and tin smelting are dependent on slag processing 1.
   Graphics:
     - Changed diesel fuel recipe icon to the diesel fuel fluid icon.
     - Added roman numerals to the icons of the three carbon dioxide recipes.

control.lua

@@ -4,7 +4,7 @@ local function initialize()
     local recipe = force.recipes
     local function fix_tech_unlocks(name, tech_name)
       if recipe[name] and tech[tech_name] then
-        recipe[name].enabled = false
+        recipe[name].enabled = tech[tech_name].researched
       end
     end
 

graphics/spacex-combinator.png

@@ -1,6 +1,6 @@
 {
   "name": "SeaBlockCustomPack",
-  "version": "1.1.2",
+  "version": "1.1.3",
   "factorio_version": "1.1",
   "title": "ick's Sea Block Pack",
   "author": "ickputzdirwech",

info.json

@@ -6,6 +6,7 @@ ick-seablock-walls-and-gates=Hide walls and gates
 coolant-used-filtration-1=Coolant coal filtering
 coolant-used-filtration-2=Coolant ceramic filtering
 
+gas-carbon-dioxide-from-wood=Carbon dioxide from wood pellets
 carbon-separation-2=Carbon dioxide from charcoal
 carbon-dioxide=Carbon dioxide from carbon
 

locale/en/ickputzdirwech.cfg

@@ -10,7 +10,33 @@ end
 
 local function set_hidden(name, type)
   if data.raw[type][name] then
-    data.raw[type][name].hidden = true
+    local hide_name = data.raw[type][name]
+    hide_name.hidden = true
+    if type == "technology" then
+      for _, tech in pairs(data.raw.technology) do
+        if tech.hidden ~= true and tech.prerequisites then
+          for i, dependency in pairs(tech.prerequisites) do
+            if dependency == name then
+              table.remove(tech.prerequisites, i)
+              if hide_name.prerequisites then
+                for _, prerequisite in pairs(hide_name.prerequisites) do
+                  ickputzdirwech = {}
+                  ickputzdirwech.insert = true
+                  for _, already_exists in pairs(tech.prerequisites) do
+                    if prerequisite == already_exists then
+                      ickputzdirwech.insert = false
+                    end
+                  end
+                  if ickputzdirwech.insert == true then
+                    table.insert(tech.prerequisites, prerequisite)
+                  end
+                end
+              end
+            end
+          end
+        end
+      end
+    end
   end
 end
 
@@ -50,6 +76,34 @@ local function hide_stuff(name, item_type, entity_type, tech_name, effect_type)
 end
 
 
+-- HIDE MINING RECIPES
+data:extend({{
+		type = "resource-category",
+		name = "nothing"
+}})
+
+for _, drill in pairs(data.raw["mining-drill"]) do
+  drill.resource_categories = {"nothing"}
+end
+
+local function remove_ore(name)
+  if data.raw["resource"][name] then
+    data.raw["resource"][name] = nil
+  end
+end
+
+remove_ore("angels-ore1")
+remove_ore("angels-ore2")
+remove_ore("angels-ore3")
+remove_ore("angels-ore4")
+remove_ore("angels-ore5")
+remove_ore("angels-ore6")
+
+if data.raw["offshore-pump"]["ground-water-pump"] then
+  data.raw["offshore-pump"]["ground-water-pump"].fluid = "fluid-unknown"
+end
+
+
 -- LOGISTICS
 hide_stuff("bob-armoured-locomotive", "item-with-entity-data", "locomotive", "bob-armoured-railway")
 hide_stuff("bob-armoured-cargo-wagon", "item-with-entity-data", "cargo-wagon")
@@ -75,6 +129,15 @@ if settings.startup["ick-seablock-burner-inserter"].value == true then
 end
 
 
+-- ANGELS-FLUID-CONTROL
+hide_stuff("valve-converter", "item", nil, "angels-fluid-control", "unlock-recipe")
+
+hide_stuff("angels-storage-tank-3", "item", nil, "angels-fluid-control", "unlock-recipe")
+hide_stuff("angels-storage-tank-2", "item", nil, "angels-oil-processing", "unlock-recipe")
+hide_stuff("angels-storage-tank-1", "item", nil, "gas-processing", "unlock-recipe")
+hide_stuff("angels-pressure-tank-1", "item", nil, "pressure-tanks")
+
+
 -- PRODUCTION
 hide_stuff("burner-mining-drill", nil, "mining-drill")
 hide_stuff("electric-mining-drill", nil, "mining-drill")
@@ -99,6 +162,16 @@ hide_stuff("fluid-reactor-from-fluid-furnace")
 hide_stuff("fluid-reactor-2", "item", "reactor", "fluid-reactor-2")
 hide_stuff("fluid-reactor-3", "item", "reactor", "fluid-reactor-3")
 
+hide_stuff("stone-chemical-furnace", "item", "assembling-machine", "chemical-processing-1")
+hide_stuff("steel-chemical-furnace", "item", "assembling-machine", "steel-chemical-furnace")
+hide_stuff("electric-chemical-furnace", "item", "assembling-machine", "electric-chemical-furnace")
+
+hide_stuff("stone-mixing-furnace", "item", "assembling-machine", "alloy-processing", "unlock-recipe")
+hide_stuff("steel-mixing-furnace", "item", "assembling-machine", "steel-mixing-furnace")
+hide_stuff("electric-mixing-furnace", "item", "assembling-machine", "electric-mixing-furnace")
+
+hide_stuff("electrolyser", nil, "assembling-machine")
+
 
 -- MODULES
 hide_stuff("pollution-clean-processor", "tool")
@@ -151,6 +224,11 @@ hide_stuff("bob-robot-laser-drone", "item", "unit", "bob-robot-laser-drones")
 hide_stuff("bob-robot-flamethrower-drone", "item", "unit", "bob-robot-flamethrower-drones")
 hide_stuff("bob-robot-plasma-drone", "item", "unit", "bob-robot-plasma-drones")
 
+hide_stuff("robot-drone-frame", "item", nil, "robotics", "remove-unlock")
+hide_stuff("robot-drone-frame-large", "item", nil, "robotics", "remove-unlock")
+
+hide_stuff("combat-robot-dispenser-equipment", "item")
+
 hide_stuff(nil, nil, nil, "follower-robot-count-1")
 hide_stuff(nil, nil, nil, "follower-robot-count-2")
 hide_stuff(nil, nil, nil, "follower-robot-count-3")
@@ -170,10 +248,6 @@ if settings.startup["ick-seablock-walls-and-gates"].value == true then
 end
 
 
--- ANGELS-FLUID-CONTROL
-hide_stuff("valve-converter", "item", nil, "angels-fluid-control", "unlock-recipe")
-
-
 -- WATER-TREATMENT
 hide_stuff("lithia-water", "fluid")
 hide_stuff("ground-water-pump", "item", nil, "water-treatment", "unlock-recipe")

prototypes/hide.lua

@@ -1,3 +1,4 @@
+-- ITEM-GROUP
 if data.raw["item-group"]["logistics"] then
   data.raw["item-group"]["logistics"].icon = nil
   data.raw["item-group"]["logistics"].icon_size = nil
@@ -15,7 +16,7 @@ if data.raw["item-group"]["logistics"] then
       icon_mipmaps = 4,
       scale = 0.5,
       shift = {16, 16}
-    },
+    }
   }
 end
 
@@ -31,6 +32,16 @@ if data.raw["item-group"]["bob-resource-products"] then
   data.raw["item-group"]["bob-resource-products"].icon_mipmaps = 1
 end
 
+
+-- ITEM
+if data.raw.item["spacex-combinator"] then
+  data.raw.item["spacex-combinator"].icon = "__SeaBlockCustomPack__/graphics/spacex-combinator.png"
+  data.raw.item["spacex-combinator"].icon_size = 64
+  data.raw.item["spacex-combinator"].icon_mipmaps = 4
+end
+
+
+-- RECIPE
 if data.raw.recipe["gas-carbon-dioxide-from-wood"] and data.raw.recipe["carbon-separation-2"] and data.raw.recipe["carbon-dioxide"] then
   data.raw.recipe["gas-carbon-dioxide-from-wood"].icons = angelsmods.functions.create_gas_recipe_icon(
     {{"__angelspetrochem__/graphics/icons/molecules/carbon-dioxide.png", 72}},