Fluids, recipe icons and file shuffling

Author: kirazy

changelog.txt

@@ -1,6 +1,6 @@
 ---------------------------------------------------------------------------------------------------
 Version: 0.0.18
-Date: 2020.08.XX
+Date: 2020.08.03
   Features:
     - Implemented cobaltite, sulfur, rutile, and thorium ores
     - Implemented lithia and ground water
@@ -9,6 +9,7 @@ Date: 2020.08.XX
     - Implemented plates, gears, bearings, and ball-bearings
     - Implemented nuclear fuels and recipes, and solid fuels and recipes
     - Implemented bullets, projectiles, ammo magazines, warheads, and rockets
+    - Implemented fluids, seedlings, fertiliser, wood pellets and other recipe icons
   Changes:
     - Batteries now respect Bob's Metals, Chemicals, and Intermediaries "Color updates" setting
     - Revised handling for deferred icon assignments; pipes, heat pipes, and Deadlocks loaders and beltboxes no longer deferred

data-updates.lua

@@ -7,6 +7,7 @@
 if mods["ShinyBobGFX"] then
     require("shiny-bob-compatibility")
 end
+
 ----------------------------------------------------------------------------------------------------
 -- ITEMS
 ----------------------------------------------------------------------------------------------------

graphics/icons/greenhouse/items/fertiliser.png

@@ -16,26 +16,26 @@ local inputs = {
 -- Setup input defaults
 reskins.lib.parse_inputs(inputs)
 
--- Wires
-local wires_inputs = util.copy(inputs)
-
-local wires = {
-    "gilded-copper-cable",
-    "tinned-copper-cable",
-    "insulated-cable",
+local intermediaries = {
+    -- Wires
+    ["gilded-copper-cable"] = {subfolder = "wires"},
+    ["tinned-copper-cable"] = {subfolder = "wires"},
+    ["insulated-cable"] = {subfolder = "wires"},
 }
 
-for _, name in pairs(wires) do
-    -- Fetch item
-    local item = data.raw.item[name]
-
-    -- Check if item exists, if not, skip this iteration
-    if not item then goto continue end
-
-    wires_inputs.icon_filename = wires_inputs.directory.."/graphics/icons/electronics/wires/"..name..".png"
-
-    reskins.lib.construct_icon(name, 0, wires_inputs)
-
-    -- Label to skip to next iteration
-    ::continue::
-end
+-- Items and recipes shared with other mods within Bob's suite
+if not mods["bobplates"] then
+    -- Intermediaries
+    intermediaries["solder-alloy"] = {folder = "plates", subfolder = "plates"}
+    intermediaries["rubber"] = {folder = "plates", subfolder = "items"}
+    intermediaries["resin"] = {folder = "plates", subfolder = "items"}
+    intermediaries["ferric-chloride-solution"] = {type = "fluid", folder = "plates", subfolder = "fluids"}
+
+    -- Recipes
+    intermediaries["coal-cracking"] = {type = "recipe", folder = "plates", subfolder = "recipes"}
+    intermediaries["synthetic-wood"] = {type = "recipe", folder = "plates", subfolder = "recipes"}
+    intermediaries["bob-resin-wood"] = {type = "recipe", folder = "plates", subfolder = "recipes"}
+    intermediaries["bob-resin-oil"] = {type = "recipe", folder = "plates", subfolder = "recipes"}
+end
+
+reskins.lib.create_icons_from_list(intermediaries, inputs)

graphics/icons/greenhouse/items/seedling.png

@@ -0,0 +1,27 @@
+-- Copyright (c) 2020 Kirazy
+-- Part of Artisanal Reskins: Bob's Mods
+--     
+-- See LICENSE.md in the project directory for license information.
+
+-- Check to see if reskinning needs to be done.
+if not mods["bobgreenhouse"] then return end
+
+-- Setup inputs
+local inputs = {
+    directory = reskins.bobs.directory,
+    mod = "bobs",
+    group = "greenhouse",
+}
+
+-- Setup input defaults
+reskins.lib.parse_inputs(inputs)
+
+local intermediaries = {
+    ["seedling"] = {subfolder = "items"},
+    ["fertiliser"] = {subfolder = "items"},
+    ["wood-pellets"] = {subfolder = "items"},
+    ["bob-basic-greenhouse-cycle"] = {type = "recipe", subfolder = "recipes"},
+    ["bob-advanced-greenhouse-cycle"] = {type = "recipe", subfolder = "recipes"},
+}
+
+reskins.lib.create_icons_from_list(intermediaries, inputs)

graphics/icons/greenhouse/items/wood-pellets.png

@@ -0,0 +1,27 @@
+-- Copyright (c) 2020 Kirazy
+-- Part of Artisanal Reskins: Bob's Mods
+--     
+-- See LICENSE.md in the project directory for license information.
+
+-- Check to see if reskinning needs to be done.
+if not mods["bobores"] then return end
+
+-- Setup inputs
+local inputs = {
+    directory = reskins.bobs.directory,
+    mod = "bobs",
+    group = "ores",
+}
+
+-- Setup input defaults
+reskins.lib.parse_inputs(inputs)
+
+local intermediaries = {}
+
+-- Items and recipes shared with other mods within Bob's suite
+if not mods["bobplates"] then
+    -- Intermediaries
+    intermediaries["lithia-water"] = {type = "fluid", folder = "plates", subfolder = "fluids"}
+end
+
+reskins.lib.create_icons_from_list(intermediaries, inputs)

graphics/icons/greenhouse/recipes/bob-advanced-greenhouse-cycle.png

@@ -20,7 +20,6 @@ local intermediaries = {
     ----------------------------------------------------------------------------------------------------
     -- Intermediaries
     ----------------------------------------------------------------------------------------------------
-
     -- Plates
     ["aluminium-plate"] = {subfolder = "plates"},
     ["brass-alloy"] = {subfolder = "plates"},
@@ -37,7 +36,7 @@ local intermediaries = {
     ["nitinol-alloy"] = {subfolder = "plates"},
     -- ["silicon-plate"] = {subfolder = "plates"},
     ["silver-plate"] = {subfolder = "plates"},
-    ["solder-alloy"] = {subfolder = "plates"},
+    ["solder-alloy"] = {subfolder = "plates"}, -- Shared with Bob's Electronics
     ["tin-plate"] = {subfolder = "plates"},
     ["titanium-plate"] = {subfolder = "plates"},
     ["tungsten-carbide"] = {subfolder = "plates"},
@@ -78,36 +77,52 @@ local intermediaries = {
     ["plutonium-239"] = {subfolder = "nuclear"},
     ["thorium-232"] = {subfolder = "nuclear"},
 
-    -- Miscellaneous
-    ["glass"] = {subfolder = "intermediaries"},
-    ["carbon"] = {subfolder = "intermediaries"},
-    ["rubber"] = {subfolder = "intermediaries"},
-    ["resin"] = {subfolder = "intermediaries"},
-    ["enriched-fuel"] = {subfolder = "fuels"},
-    ["liquid-fuel"] = {subfolder = "fluids", type = "fluid"},
+    -- Fluids
+    ["liquid-fuel"] = {type = "fluid", subfolder = "fluids"},
+    ["ferric-chloride-solution"] = {type = "fluid", subfolder = "fluids"}, -- Shared with Bob's Electronics
+    ["lithia-water"] = {type = "fluid", subfolder = "fluids"}, -- Shared with Bob's Ores
+    ["alien-acid"] = {type = "fluid", subfolder = "fluids"},
+    ["alien-explosive"] = {type = "fluid", subfolder = "fluids"},
+    ["alien-fire"] = {type = "fluid", subfolder = "fluids"},
+    ["alien-poison"] = {type = "fluid", subfolder = "fluids"},
+
+    -- Miscellaneous Items
+    ["glass"] = {subfolder = "items"},
+    ["carbon"] = {subfolder = "items"},
+    ["rubber"] = {subfolder = "items"}, -- Shared with Bob's Electronics
+    ["resin"] = {subfolder = "items"}, -- Shared with Bob's Electronics
+    ["enriched-fuel"] = {subfolder = "items"},
 
     ----------------------------------------------------------------------------------------------------
     -- Recipes
     ----------------------------------------------------------------------------------------------------
     -- Plates
-    ["cobalt-oxide-from-copper"] = {type = "recipe", subfolder = "plates"},
-    ["silver-from-lead"] = {type = "recipe", subfolder = "plates"},
+    ["cobalt-oxide-from-copper"] = {type = "recipe", subfolder = "recipes"},
+    ["silver-from-lead"] = {type = "recipe", subfolder = "recipes"},
 
     -- Nuclear
-    ["thorium-processing"] = {type = "recipe", subfolder = "nuclear"},
-    ["thorium-fuel-reprocessing"] = {type = "recipe", subfolder = "nuclear", image = "thorium-nuclear-fuel-reprocessing"},
-    ["deuterium-fuel-reprocessing"] = {type = "recipe", subfolder = "nuclear", image = "deuterium-nuclear-fuel-reprocessing-pink"},
-    ["bobingabout-enrichment-process"] = {type = "recipe", subfolder = "nuclear"},
+    ["thorium-processing"] = {type = "recipe", subfolder = "recipes"},
+    ["thorium-fuel-reprocessing"] = {type = "recipe", subfolder = "recipes", image = "thorium-nuclear-fuel-reprocessing"},
+    ["deuterium-fuel-reprocessing"] = {type = "recipe", subfolder = "recipes", image = "deuterium-nuclear-fuel-reprocessing-pink"},
+    ["bobingabout-enrichment-process"] = {type = "recipe", subfolder = "recipes"},
 
     -- Solid Fuels
-    ["solid-fuel-from-hydrogen"] = {type = "recipe", subfolder = "fuels"},
-    ["solid-fuel-from-sour-gas"] = {type = "recipe", subfolder = "fuels"},
-    ["enriched-fuel-from-hydrazine"] = {type = "recipe", subfolder = "fuels"},
-    ["enriched-fuel-from-liquid-fuel"] = {type = "recipe", subfolder = "fuels"},
-
-    -- Miscellaneous
-    ["bob-resin-wood"] = {type = "recipe", subfolder = "intermediaries"},
-    ["bob-resin-oil"] = {type = "recipe", subfolder = "intermediaries"},
+    ["solid-fuel-from-hydrogen"] = {type = "recipe", subfolder = "recipes"},
+    ["solid-fuel-from-sour-gas"] = {type = "recipe", subfolder = "recipes"}, -- Shared with Bob's Revamp
+    ["enriched-fuel-from-hydrazine"] = {type = "recipe", subfolder = "recipes"},
+    ["enriched-fuel-from-liquid-fuel"] = {type = "recipe", subfolder = "recipes"},
+
+    -- Chemicals and Fluids
+    -- ["sulfuric-nitric-acid"] = {type = "recipe", subfolder = "recipes"},
+    -- ["pure-water"] = {type = "recipe", subfolder = "recipes"},
+    -- ["pure-water-from-lithia"] = {type = "recipe", subfolder = "recipes"},
+    ["coal-cracking"] = {type = "recipe", subfolder = "recipes"}, -- Shared with Bob's Electronics
+    ["petroleum-gas-cracking"] = {type = "recipe", subfolder = "recipes"},
+
+    -- Wood
+    ["bob-resin-wood"] = {type = "recipe", subfolder = "recipes"}, -- Shared with Bob's Electronics
+    ["bob-resin-oil"] = {type = "recipe", subfolder = "recipes"}, -- Shared with Bob's Electronics
+    ["synthetic-wood"] = {type = "recipe", subfolder = "recipes"}, -- Shared with Bob's Electronics
 }
 
 -- Handle deuterium color
@@ -118,7 +133,7 @@ end
 
 -- Handle nuclear update
 if reskins.lib.setting("bobmods-plates-nuclearupdate") == true then
-    intermediaries["nuclear-fuel-reprocessing"] = {type = "recipe", subfolder = "nuclear", defer_to_data_updates = true}
+    intermediaries["nuclear-fuel-reprocessing"] = {type = "recipe", subfolder = "recipes", defer_to_data_updates = true}
 
     -- Handle deuterium's default process color
     if reskins.lib.setting("bobmods-plates-bluedeuterium") == true then
@@ -136,31 +151,9 @@ else
 
 end
 
-for name, map in pairs(intermediaries) do
-    -- Fetch intermediary
-    local intermediary = data.raw.item[name]
-    if map.type then
-        intermediary = data.raw[map.type][name]
-    end
-
-    -- Check if intermediary exists, if not, skip this iteration
-    if not intermediary then goto continue end
-
-    -- Parse map
-    local image = map.image or name
-    inputs.type = map.type or nil
-    inputs.defer_to_data_updates = map.defer_to_data_updates or nil
-    inputs.defer_to_data_final_fixes = map.defer_to_data_final_fixes or nil
-
-    inputs.icon_filename = inputs.directory.."/graphics/icons/plates/"..map.subfolder.."/"..image..".png"
-
-    reskins.lib.construct_icon(name, 0, inputs)
-
-    -- One-off fixes
-    if name == "nickel-plate" then
-        reskins.lib.clear_icon_specification("bob-nickel-plate", "recipe")
-    end
+reskins.lib.create_icons_from_list(intermediaries, inputs)
 
-    -- Label to skip to next iteration
-    ::continue::
+-- One-off fixes
+if data.raw.item["nickel-plate"] then
+    reskins.lib.clear_icon_specification("bob-nickel-plate", "recipe")
 end

graphics/icons/greenhouse/recipes/bob-basic-greenhouse-cycle.png

@@ -0,0 +1,29 @@
+-- Copyright (c) 2020 Kirazy
+-- Part of Artisanal Reskins: Bob's Mods
+--     
+-- See LICENSE.md in the project directory for license information.
+
+-- Check to see if reskinning needs to be done.
+if not mods["bobrevamp"] then return end
+
+-- Setup inputs
+local inputs = {
+    directory = reskins.bobs.directory,
+    mod = "bobs",
+    group = "revamp",
+}
+
+-- Setup input defaults
+reskins.lib.parse_inputs(inputs)
+
+local intermediaries = {
+    ["brine"] = {type = "fluid", subfolder = "fluids"},
+    ["ammoniated-brine"] = {type = "fluid", subfolder = "fluids"},
+}
+
+-- Items and recipes shared with other mods within Bob's suite
+if not mods["bobplates"] then
+    intermediaries["solid-fuel-from-sour-gas"] = {type = "recipe", folder = "plates", subfolder = "recipes"}
+end
+
+reskins.lib.create_icons_from_list(intermediaries, inputs)

graphics/icons/plates/fluids/alien-acid.png

@@ -0,0 +1,24 @@
+-- Copyright (c) 2020 Kirazy
+-- Part of Artisanal Reskins: Bob's Mods
+--     
+-- See LICENSE.md in the project directory for license information.
+
+-- Check to see if reskinning needs to be done.
+if not mods["bobgreenhouse"] then return end
+
+-- Setup inputs
+local inputs = {
+    directory = reskins.bobs.directory,
+    mod = "bobs",
+    group = "greenhouse",
+    type = "technology",
+}
+
+-- Setup input defaults
+reskins.lib.parse_inputs(inputs)
+
+local technology = {
+    ["bob-fertiliser"] = {subfolder = "fertiliser", image = "fertiliser"}
+}
+
+reskins.lib.create_icons_from_list(technology, inputs, true)

graphics/icons/plates/fluids/alien-explosive.png

@@ -5,13 +5,21 @@
 
 -- When compatibility with ShinyBobGFX is finally dropped, the contents of this file will be moved to data.lua
 
+----------------------------------------------------------------------------------------------------
+-- TECHNOLOGIES
+----------------------------------------------------------------------------------------------------
+require("prototypes.technology.greenhouse")
+
 ----------------------------------------------------------------------------------------------------
 -- ITEMS
 ----------------------------------------------------------------------------------------------------
 require("prototypes.item.electronics")
+require("prototypes.item.greenhouse")
 require("prototypes.item.logistics")
 require("prototypes.item.modules")
+require("prototypes.item.ores")
 require("prototypes.item.plates")
+require("prototypes.item.revamp")
 require("prototypes.item.technology")
 require("prototypes.item.warfare")