diff --git a/Bio_Industries_2/Test_Spawn.lua b/Bio_Industries_2/Test_Spawn.lua new file mode 100644 index 0000000..8c50d88 --- /dev/null +++ b/Bio_Industries_2/Test_Spawn.lua @@ -0,0 +1,85 @@ +----- Just used for Testing + + +function Test_Spawn() + local surface = game.surfaces['nauvis'] + + surface.create_entity({ name = "tree-01", position = { 2, 10 }, force = game.forces.player }) + surface.create_entity({ name = "tree-02", position = { 4, 10 }, force = game.forces.player }) + surface.create_entity({ name = "tree-02-red", position = { 6, 10 }, force = game.forces.player }) + surface.create_entity({ name = "tree-03", position = { 8, 10 }, force = game.forces.player }) + surface.create_entity({ name = "tree-04", position = { 10, 10 }, force = game.forces.player }) + surface.create_entity({ name = "tree-05", position = { 12, 10 }, force = game.forces.player }) + surface.create_entity({ name = "tree-06", position = { 14, 10 }, force = game.forces.player }) + surface.create_entity({ name = "tree-06-brown", position = { 16, 10 }, force = game.forces.player }) + surface.create_entity({ name = "tree-07", position = { 18, 10 }, force = game.forces.player }) + surface.create_entity({ name = "tree-08", position = { 20, 10 }, force = game.forces.player }) + surface.create_entity({ name = "tree-08-brown", position = { 22, 10 }, force = game.forces.player }) + surface.create_entity({ name = "tree-09", position = { 24, 10 }, force = game.forces.player }) + surface.create_entity({ name = "tree-09-brown", position = { 26, 10 }, force = game.forces.player }) + surface.create_entity({ name = "tree-09-red", position = { 28, 10 }, force = game.forces.player }) + surface.create_entity({ name = "tree-desert-a", position = { 30, 10 }, force = game.forces.player }) + surface.create_entity({ name = "tree-desert-b", position = { 32, 10 }, force = game.forces.player }) + surface.create_entity({ name = "tree-desert-c", position = { 34, 10 }, force = game.forces.player }) + surface.create_entity({ name = "tree-desert-d", position = { 36, 10 }, force = game.forces.player }) + surface.create_entity({ name = "tree-desert-e", position = { 38, 10 }, force = game.forces.player }) + surface.create_entity({ name = "tree-desert-f", position = { 40, 10 }, force = game.forces.player }) + surface.create_entity({ name = "tree-desert-g", position = { 42, 10 }, force = game.forces.player }) + surface.create_entity({ name = "tree-desert-h", position = { 44, 10 }, force = game.forces.player }) + surface.create_entity({ name = "tree-desert-i", position = { 46, 10 }, force = game.forces.player }) + surface.create_entity({ name = "tree-desert-j", position = { 48, 10 }, force = game.forces.player }) + surface.create_entity({ name = "tree-desert-k", position = { 50, 10 }, force = game.forces.player }) + surface.create_entity({ name = "tree-desert-l", position = { 52, 10 }, force = game.forces.player }) + surface.create_entity({ name = "tree-desert-m", position = { 54, 10 }, force = game.forces.player }) + surface.create_entity({ name = "tree-desert-n", position = { 56, 10 }, force = game.forces.player }) + surface.create_entity({ name = "tree-dryland-a", position = { 58, 10 }, force = game.forces.player }) + surface.create_entity({ name = "tree-dryland-b", position = { 60, 10 }, force = game.forces.player }) + surface.create_entity({ name = "tree-dryland-c", position = { 62, 10 }, force = game.forces.player }) + surface.create_entity({ name = "tree-dryland-d", position = { 64, 10 }, force = game.forces.player }) + surface.create_entity({ name = "tree-dryland-e", position = { 66, 10 }, force = game.forces.player }) + surface.create_entity({ name = "tree-dryland-f", position = { 68, 10 }, force = game.forces.player }) + surface.create_entity({ name = "tree-dryland-g", position = { 70, 10 }, force = game.forces.player }) + surface.create_entity({ name = "tree-dryland-h", position = { 72, 10 }, force = game.forces.player }) + surface.create_entity({ name = "tree-dryland-i", position = { 74, 10 }, force = game.forces.player }) + surface.create_entity({ name = "tree-dryland-j", position = { 76, 10 }, force = game.forces.player }) + surface.create_entity({ name = "tree-dryland-k", position = { 78, 10 }, force = game.forces.player }) + surface.create_entity({ name = "tree-dryland-l", position = { 80, 10 }, force = game.forces.player }) + surface.create_entity({ name = "tree-dryland-m", position = { 82, 10 }, force = game.forces.player }) + surface.create_entity({ name = "tree-dryland-n", position = { 84, 10 }, force = game.forces.player }) + surface.create_entity({ name = "tree-dryland-o", position = { 86, 10 }, force = game.forces.player }) + --surface.create_entity({name = "tree-grassland-0", position = {88, 10}, force = game.forces.player}) + surface.create_entity({ name = "tree-grassland-a", position = { 90, 10 }, force = game.forces.player }) + surface.create_entity({ name = "tree-grassland-b", position = { 92, 10 }, force = game.forces.player }) + surface.create_entity({ name = "tree-grassland-c", position = { 94, 10 }, force = game.forces.player }) + surface.create_entity({ name = "tree-grassland-d", position = { 96, 10 }, force = game.forces.player }) + surface.create_entity({ name = "tree-grassland-e", position = { 98, 10 }, force = game.forces.player }) + surface.create_entity({ name = "tree-grassland-f", position = { 100, 10 }, force = game.forces.player }) + surface.create_entity({ name = "tree-grassland-g", position = { 102, 10 }, force = game.forces.player }) + surface.create_entity({ name = "tree-grassland-h", position = { 104, 10 }, force = game.forces.player }) + surface.create_entity({ name = "tree-grassland-h2", position = { 106, 10 }, force = game.forces.player }) + surface.create_entity({ name = "tree-grassland-h3", position = { 108, 10 }, force = game.forces.player }) + surface.create_entity({ name = "tree-grassland-i", position = { 110, 10 }, force = game.forces.player }) + surface.create_entity({ name = "tree-grassland-k", position = { 112, 10 }, force = game.forces.player }) + surface.create_entity({ name = "tree-grassland-l", position = { 114, 10 }, force = game.forces.player }) + surface.create_entity({ name = "tree-grassland-m", position = { 116, 10 }, force = game.forces.player }) + surface.create_entity({ name = "tree-grassland-n", position = { 118, 10 }, force = game.forces.player }) + surface.create_entity({ name = "tree-grassland-p", position = { 120, 10 }, force = game.forces.player }) + surface.create_entity({ name = "tree-grassland-q", position = { 122, 10 }, force = game.forces.player }) + surface.create_entity({ name = "tree-snow-a", position = { 124, 10 }, force = game.forces.player }) + surface.create_entity({ name = "tree-volcanic-a", position = { 126, 10 }, force = game.forces.player }) + surface.create_entity({ name = "tree-wetland-a", position = { 128, 10 }, force = game.forces.player }) + surface.create_entity({ name = "tree-wetland-b", position = { 130, 10 }, force = game.forces.player }) + surface.create_entity({ name = "tree-wetland-c", position = { 132, 10 }, force = game.forces.player }) + surface.create_entity({ name = "tree-wetland-d", position = { 134, 10 }, force = game.forces.player }) + surface.create_entity({ name = "tree-wetland-e", position = { 136, 10 }, force = game.forces.player }) + surface.create_entity({ name = "tree-wetland-f", position = { 138, 10 }, force = game.forces.player }) + surface.create_entity({ name = "tree-wetland-g", position = { 140, 10 }, force = game.forces.player }) + surface.create_entity({ name = "tree-wetland-h", position = { 142, 10 }, force = game.forces.player }) + surface.create_entity({ name = "tree-wetland-i", position = { 144, 10 }, force = game.forces.player }) + surface.create_entity({ name = "tree-wetland-j", position = { 146, 10 }, force = game.forces.player }) + surface.create_entity({ name = "tree-wetland-k", position = { 148, 10 }, force = game.forces.player }) + surface.create_entity({ name = "tree-wetland-l", position = { 150, 10 }, force = game.forces.player }) + surface.create_entity({ name = "tree-wetland-m", position = { 152, 10 }, force = game.forces.player }) + surface.create_entity({ name = "tree-wetland-n", position = { 154, 10 }, force = game.forces.player }) + surface.create_entity({ name = "tree-wetland-o", position = { 156, 10 }, force = game.forces.player }) +end diff --git a/Bio_Industries_2/changelog.txt b/Bio_Industries_2/changelog.txt index 70b4905..2ddf8ba 100644 --- a/Bio_Industries_2/changelog.txt +++ b/Bio_Industries_2/changelog.txt @@ -1,30 +1,4 @@ --------------------------------------------------------------------------------------------------- -Version: 2.0.6 -Date: 31.08.2025 - Bug Fixes: - - Add missing subgroups (put icons in correct tab) ---------------------------------------------------------------------------------------------------- -Version: 2.0.5 -Date: 31.08.2025 - Bug Fixes: - - Fixed Wood Underground pipe graphic (TheSAguy) - - Fixed Wood Underground pipe graphic (TheSAguy) - - Fixed Dart Turret ammo (TheSAguy) - Changes: - - Updated Rail Recipe (TheSAguy) - - Added Wooden Rail (TheSAguy) - - Updated some graphics (TheSAguy; BIG thanks to Snouz!) ---------------------------------------------------------------------------------------------------- -Version: 2.0.4 -Date: 28.07.2025 - Bug Fixes: - - Fix Bio Boiler ---------------------------------------------------------------------------------------------------- -Version: 2.0.3 -Date: 13.07.2025 - Bug Fixes: - - Fix several entities ---------------------------------------------------------------------------------------------------- Version: 2.0.2 Date: 07.07.2025 Bug Fixes: diff --git a/Bio_Industries_2/common.lua b/Bio_Industries_2/common.lua index 267ac21..08fd075 100644 --- a/Bio_Industries_2/common.lua +++ b/Bio_Industries_2/common.lua @@ -247,7 +247,6 @@ return function(mod_name) -- Rudimentary check of the arguments passed to a function common.check_args = function(arg, arg_type, desc) if not (arg and type(arg) == arg_type) then - game.print(type(arg) .. " = " .. arg_type) common.arg_err(arg or "nil", desc or arg_type or "nil") end end @@ -597,7 +596,7 @@ return function(mod_name) common.show("#g_table", g_table and table_size(g_table)) common.check_args(g_table, "table") - common.check_args(base_entity, "userdata") + common.check_args(base_entity, "table") if not base_entity.valid then common.arg_err(base_entity, "base entity") diff --git a/Bio_Industries_2/control.lua b/Bio_Industries_2/control.lua index fb3669f..5c967f0 100644 --- a/Bio_Industries_2/control.lua +++ b/Bio_Industries_2/control.lua @@ -460,14 +460,10 @@ local function On_Built(event) elseif entity.type == "electric-pole" then local pole = entity -- Make sure hidden poles of the Bio gardens are connected correctly! - local garden_names = { "bi-bio-garden", "bi-bio-garden-larger", "bi-bio-garden-huge" } - for _, gname in ipairs(garden_names) do - if entities[gname] and pole.name == entities[gname].hidden[h_key].name and base then - BioInd.writeDebug("Bio garden (" .. gname .. ")!") - BioInd.connect_garden_pole(base, pole) - BioInd.writeDebug("Connected %s (%s)", { pole.name, pole.unit_number or "nil" }) - break - end + if pole.name == entities["bi-bio-garden"].hidden[h_key].name and base then + BioInd.writeDebug("Bio garden!") + BioInd.connect_garden_pole(base, pole) + BioInd.writeDebug("Connected %s (%s)", { pole.name, pole.unit_number or "nil" }) end -- A seedling has been planted @@ -649,37 +645,16 @@ end -- Radar stuff -------------------------------------------------------------------- --- Robust sector scanned handler for Arboretum radar +-- Radar completed a sector scan local function On_Sector_Scanned(event) - -- defensive checks - BioInd.writeDebug("On_Sector_Scanned fired") - --game.print("On_Sector_Scanned fired") - if not (event and event.radar) then return end - local radar = event.radar - if not (radar.valid and radar.unit_number) then return end + local f_name = "On_Sector_Scanned" + BioInd.writeDebug("Entered function %s(%s)", { f_name, event }) - -- Make sure compound-entity data is available before accessing it - local arb_proto = BioInd.compound_entities and BioInd.compound_entities["bi-arboretum"] - if not (arb_proto and arb_proto.hidden and arb_proto.hidden.radar and arb_proto.hidden.radar.name) then - -- not ready yet (init not finished) — bail out safely - return + ---- Each time a Arboretum-Radar scans a sector ---- + local arboretum = storage.bi_arboretum_radar_table[event.radar.unit_number] + if arboretum then + Get_Arboretum_Recipe(storage.bi_arboretum_table[arboretum], event) end - - -- Only handle scans from our arboretum radar type - if radar.name ~= arb_proto.hidden.radar.name then return end - - -- Look up the base arboretum unit_number (stored when the hidden radar was created) - local base_unit_number = storage.bi_arboretum_radar_table and storage.bi_arboretum_radar_table[radar.unit_number] - if not base_unit_number then - -- no mapping found -> nothing to do - return - end - - local arb_table = storage.bi_arboretum_table and storage.bi_arboretum_table[base_unit_number] - if not arb_table then return end - - -- All good: call the arboretum recipe handler - Get_Arboretum_Recipe(arb_table, event) end diff --git a/Bio_Industries_2/control_arboretum.lua b/Bio_Industries_2/control_arboretum.lua index 570d71d..db79727 100644 --- a/Bio_Industries_2/control_arboretum.lua +++ b/Bio_Industries_2/control_arboretum.lua @@ -42,21 +42,12 @@ end -- Check that all ingredients are available! local function check_ingredients(arboretum) local recipe = arboretum.get_recipe() - if not recipe then - --game.print("No recipe set on arboretum") - return nil - end - --game.print("Recipe name: " .. recipe.name) - local need = storage.bi_arboretum_recipe_table[recipe.name] - if not need then - --game.print("No recipe data found for " .. recipe.name) - return nil - end + local need = recipe and storage.bi_arboretum_recipe_table[recipe.name] local function check(need, have) for name, amount in pairs(need or {}) do if not (have and have[name]) or (have[name] < amount) then - --game.print("Missing ingredient " .. name .. " (have " .. (have[name] or 0) .. " of " .. amount .. ")") + BioInd.writeDebug("Missing ingredient %s (have %s of %s)", { name, have[name] or 0, amount }) return false end end @@ -64,38 +55,9 @@ local function check_ingredients(arboretum) end local inventory = arboretum.get_inventory(defines.inventory.assembling_machine_input) - local inv_contents_raw = inventory and inventory.get_contents() or {} - - -- Check if inv_contents_raw is a map or list, convert if needed - local function is_map(t) - if type(t) ~= "table" then return false end - for k, v in pairs(t) do - if type(k) ~= "string" or type(v) ~= "number" then - return false - end - end - return true - end - - local inv_contents - if is_map(inv_contents_raw) then - inv_contents = inv_contents_raw - else - -- Convert list of item stacks to map - inv_contents = {} - for _, item in pairs(inv_contents_raw) do - inv_contents[item.name] = (inv_contents[item.name] or 0) + item.count - end - end - - local fluid_contents = arboretum.get_fluid_contents() or {} - - --game.print("Inventory contents (map): " .. serpent.line(inv_contents)) - --game.print("Fluid contents: " .. serpent.line(fluid_contents)) - return need and - check(need.items, inv_contents) and - check(need.fluids, fluid_contents) and + check(need.items, inventory and inventory.get_contents()) and + check(need.fluids, arboretum.get_fluid_contents()) and { ingredients = need, name = recipe.name } or nil end @@ -149,14 +111,10 @@ function Get_Arboretum_Recipe(ArboretumTable, event) local check = check_ingredients(arboretum) local ingredients, recipe_name if check then - --game.print("There are ingredients") ingredients, recipe_name = check.ingredients, check.name - else - --game.print("No ingredients") end if ingredients then - local create_seedling, new_plant pos = BioInd.normalize_position(arboretum.position) or BioInd.arg_err("nil", "position") diff --git a/Bio_Industries_2/data-final-fixes.lua b/Bio_Industries_2/data-final-fixes.lua index 5b488e0..da22eae 100644 --- a/Bio_Industries_2/data-final-fixes.lua +++ b/Bio_Industries_2/data-final-fixes.lua @@ -170,6 +170,8 @@ if BI.Settings.BI_Game_Tweaks_Player then end +-- Moved to data-updates.lua for 0.18.34/1.1.4! + ---- Game Tweaks ---- Production science pack recipe if data.raw.recipe["bi-production-science-pack"] then @@ -182,6 +184,7 @@ end if BI.Settings.BI_Game_Tweaks_Bot then -- Logistic & Construction bots can't catch fire or be mined local function immunify(bot) + -- Changed for 0.18.34/1.1.4! local can_insert = true bot.flags = bot.flags or {} bot.resistances = bot.resistances or {} @@ -287,6 +290,7 @@ if BI.Settings.BI_Game_Tweaks_Emissions_Multiplier then ["coal-crushed"] = 1.50, ["wood"] = 1.60, ["coal"] = 2.00, + -- Removed in 0.17.48/0.18.16 }) do BI_Functions.lib.fuel_emissions_multiplier_update(item, factor) end @@ -386,6 +390,9 @@ if mods["pycoalprocessing"] and BI.Settings.BI_Bio_Fuel then end +-- Moved to data-updates.lua for 0.18.34/1.1.4! + + --- If Space Exploration Mod is installed. if mods["space-exploration"] then -- Space Exploration Mod likes Stack Sizes to be 200 max. diff --git a/Bio_Industries_2/data-updates.lua b/Bio_Industries_2/data-updates.lua index f3129be..171aa13 100644 --- a/Bio_Industries_2/data-updates.lua +++ b/Bio_Industries_2/data-updates.lua @@ -18,8 +18,6 @@ end BioInd.show("BI.Settings.BI_Easy_Bio_Gardens", BI.Settings.BI_Easy_Bio_Gardens) local ICONPATH = "__Bio_Industries_2__/graphics/icons/" -local ICONPATH_E = BioInd.modRoot .. "/graphics/icons/entity/" -local ICONPATH_PY = "__Bio_Industries_2__/graphics/icons/mod_py/" ----Update the Wood Pipe Images require("prototypes.Wood_Products.pipes") @@ -388,7 +386,7 @@ if data.raw.item["ash"] and mods["pycoalprocessing"] then thxbob.lib.recipe.replace_ingredient("bi-sulfur", "bi-ash", "ash") thxbob.lib.recipe.replace_ingredient("bi-sulfur-angels", "bi-ash", "ash") - data.raw.recipe["bi-sulfur"].icon = ICONPATH_PY .. "py_bio_sulfur.png" + data.raw.recipe["bi-sulfur"].icon = ICONPATH .. "py_bio_sulfur.png" data.raw.recipe["bi-sulfur"].icon_size = 64 end @@ -399,17 +397,17 @@ if data.raw.item["ash"] and mods["pycoalprocessing"] then data.raw.recipe["bi-ash-2"].icon_size = 32 -- Use ash icon from pycoalprocessing in icons of recipes using ash - data.raw.recipe["bi-seed-2"].icon = ICONPATH_PY .. "py_bio_seed2.png" + data.raw.recipe["bi-seed-2"].icon = ICONPATH .. "py_bio_seed2.png" data.raw.recipe["bi-seed-2"].icon_size = 64 - data.raw.recipe["bi-seedling-2"].icon = ICONPATH_PY .. "py_Seedling2.png" + data.raw.recipe["bi-seedling-2"].icon = ICONPATH .. "py_Seedling2.png" data.raw.recipe["bi-seedling-2"].icon_size = 64 - data.raw.recipe["bi-logs-2"].icon = ICONPATH_PY .. "py_raw-wood-mk2.png" + data.raw.recipe["bi-logs-2"].icon = ICONPATH .. "py_raw-wood-mk2.png" data.raw.recipe["bi-logs-2"].icon_size = 64 - data.raw.recipe["bi-ash-1"].icon = ICONPATH_PY .. "py_ash_raw-wood.png" + data.raw.recipe["bi-ash-1"].icon = ICONPATH .. "py_ash_raw-wood.png" data.raw.recipe["bi-ash-1"].icon_size = 64 - data.raw.recipe["bi-ash-2"].icon = ICONPATH_PY .. "py_ash_woodpulp.png" + data.raw.recipe["bi-ash-2"].icon = ICONPATH .. "py_ash_woodpulp.png" data.raw.recipe["bi-ash-2"].icon_size = 64 - data.raw.recipe["bi-stone-brick"].icon = ICONPATH_PY .. "py_bi_stone_brick.png" + data.raw.recipe["bi-stone-brick"].icon = ICONPATH .. "py_bi_stone_brick.png" data.raw.recipe["bi-stone-brick"].icon_size = 64 end @@ -458,8 +456,7 @@ if not data.raw.fluid["nitrogen"] then flow_color = { r = 0.0, g = 0.0, b = 1.0 }, pressure_to_speed_ratio = 0.4, flow_to_energy_ratio = 0.59, - subgroup = "bio-bio-farm-intermediate-product", - order = "ab" + order = "a[fluid]-b[nitrogen]" }, }) BioInd.writeDebug("Made recipe for \"nitrogen\".") @@ -486,8 +483,7 @@ if not data.raw.fluid["nitrogen"] then flow_color = { r = 0.5, g = 1.0, b = 1.0 }, pressure_to_speed_ratio = 0.4, flow_to_energy_ratio = 0.59, - subgroup = "bio-bio-farm-intermediate-product", - order = "aa" + order = "a[fluid]-b[liquid-air]" }, }) BioInd.writeDebug("Made recipe for \"liquid-air\".") @@ -528,8 +524,7 @@ if BI.Settings.BI_Game_Tweaks_Recipe then --- Stone Wall thxbob.lib.recipe.add_new_ingredient("stone-wall", { type = "item", name = "iron-stick", amount = 1 }) - --- Rail Stuff - --(Remove Stone and Add Crushed Stone) + --- Rail (Remove Stone and Add Crushed Stone) if data.raw.item["stone-crushed"] then thxbob.lib.recipe.remove_ingredient("rail", "stone") thxbob.lib.recipe.add_new_ingredient("rail", { type = "item", name = "stone-crushed", amount = 6 }) @@ -538,15 +533,7 @@ if BI.Settings.BI_Game_Tweaks_Recipe then end -- vanilla rail recipe update - thxbob.lib.recipe.remove_ingredient("rail", "iron-stick") - thxbob.lib.recipe.add_new_ingredient("rail", { type = "item", name = "concrete", amount = 2 }) - data.raw["legacy-straight-rail"]["legacy-straight-rail"].icon = ICONPATH_E .. "rail-concrete.png" - data.raw["straight-rail"]["straight-rail"].icon = ICONPATH_E .. "rail-concrete.png" - ---- Wood Rail added to Tech - thxbob.lib.tech.add_recipe_unlock("railway", "bi-rail-wood") - thxbob.lib.tech.add_recipe_unlock("railway", "bi-rail-wood-to-concrete") - + thxbob.lib.recipe.add_new_ingredient("rail", { type = "item", name = "concrete", amount = 6 }) end @@ -705,7 +692,7 @@ if set then end -- Compatibility with Industrial Revolution ---require("prototypes.Industrial_Revolution") +require("prototypes.Industrial_Revolution") ------------------------------------------------------------------------------------ diff --git a/Bio_Industries_2/data.lua b/Bio_Industries_2/data.lua index 39e0599..aab3060 100644 --- a/Bio_Industries_2/data.lua +++ b/Bio_Industries_2/data.lua @@ -26,7 +26,6 @@ for var, name in pairs({ BI.Settings[var] = BioInd.get_startup_setting(name) end - --- Help Files require("libs.item-functions") -- From Bob's Libary require("libs.recipe-functions") -- From Bob's Libary @@ -80,7 +79,10 @@ if not mods["Natural_Evolution_Buildings"] then require("prototypes.Bio_Turret.recipe") require("prototypes.Bio_Turret.entity") + --- Bio Cannon + + -- Items Groups require("prototypes.Bio_Cannon.item-group") diff --git a/Bio_Industries_2/graphics/entities/bio_accumulator/bi_large_accumulator.png b/Bio_Industries_2/graphics/entities/bio_accumulator/bi_large_accumulator.png deleted file mode 100644 index ff2a7b3..0000000 Binary files a/Bio_Industries_2/graphics/entities/bio_accumulator/bi_large_accumulator.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/entities/bio_accumulator/bi_large_accumulator_anim_charge.png b/Bio_Industries_2/graphics/entities/bio_accumulator/bi_large_accumulator_anim_charge.png deleted file mode 100644 index e484121..0000000 Binary files a/Bio_Industries_2/graphics/entities/bio_accumulator/bi_large_accumulator_anim_charge.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/entities/bio_accumulator/bi_large_accumulator_anim_discharge.png b/Bio_Industries_2/graphics/entities/bio_accumulator/bi_large_accumulator_anim_discharge.png deleted file mode 100644 index 42d620c..0000000 Binary files a/Bio_Industries_2/graphics/entities/bio_accumulator/bi_large_accumulator_anim_discharge.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/entities/bio_accumulator/bi_large_accumulator_shadow.png b/Bio_Industries_2/graphics/entities/bio_accumulator/bi_large_accumulator_shadow.png deleted file mode 100644 index 16e8ae8..0000000 Binary files a/Bio_Industries_2/graphics/entities/bio_accumulator/bi_large_accumulator_shadow.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/entities/bio_accumulator/big-bi_large_accumulator_reflection.png b/Bio_Industries_2/graphics/entities/bio_accumulator/big-bi_large_accumulator_reflection.png deleted file mode 100644 index 5a2c760..0000000 Binary files a/Bio_Industries_2/graphics/entities/bio_accumulator/big-bi_large_accumulator_reflection.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/entities/bio_boiler/boiler-E-idle.png b/Bio_Industries_2/graphics/entities/bio_boiler/boiler-E-idle.png deleted file mode 100644 index 7695ea7..0000000 Binary files a/Bio_Industries_2/graphics/entities/bio_boiler/boiler-E-idle.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/entities/bio_boiler/boiler-N-idle.png b/Bio_Industries_2/graphics/entities/bio_boiler/boiler-N-idle.png deleted file mode 100644 index 9c6454c..0000000 Binary files a/Bio_Industries_2/graphics/entities/bio_boiler/boiler-N-idle.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/entities/bio_boiler/boiler-S-idle.png b/Bio_Industries_2/graphics/entities/bio_boiler/boiler-S-idle.png deleted file mode 100644 index db142a0..0000000 Binary files a/Bio_Industries_2/graphics/entities/bio_boiler/boiler-S-idle.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/entities/bio_boiler/boiler-W-idle.png b/Bio_Industries_2/graphics/entities/bio_boiler/boiler-W-idle.png deleted file mode 100644 index 7a58dc0..0000000 Binary files a/Bio_Industries_2/graphics/entities/bio_boiler/boiler-W-idle.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/entities/bio_cokery/cokery_anim.png b/Bio_Industries_2/graphics/entities/bio_cokery/cokery_anim.png deleted file mode 100644 index 42c4caa..0000000 Binary files a/Bio_Industries_2/graphics/entities/bio_cokery/cokery_anim.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/entities/bio_cokery/cokery_idle.png b/Bio_Industries_2/graphics/entities/bio_cokery/cokery_idle.png deleted file mode 100644 index c998e23..0000000 Binary files a/Bio_Industries_2/graphics/entities/bio_cokery/cokery_idle.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/entities/bio_cokery/cokery_shadow.png b/Bio_Industries_2/graphics/entities/bio_cokery/cokery_shadow.png deleted file mode 100644 index 374995e..0000000 Binary files a/Bio_Industries_2/graphics/entities/bio_cokery/cokery_shadow.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/entities/bio_farm/bio_farm.png b/Bio_Industries_2/graphics/entities/bio_farm/bio_farm.png deleted file mode 100644 index d4a761d..0000000 Binary files a/Bio_Industries_2/graphics/entities/bio_farm/bio_farm.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/entities/bio_farm/bio_farm_light.png b/Bio_Industries_2/graphics/entities/bio_farm/bio_farm_light.png deleted file mode 100644 index c93275e..0000000 Binary files a/Bio_Industries_2/graphics/entities/bio_farm/bio_farm_light.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/entities/bio_farm/bio_farm_shadow.png b/Bio_Industries_2/graphics/entities/bio_farm/bio_farm_shadow.png deleted file mode 100644 index 3150204..0000000 Binary files a/Bio_Industries_2/graphics/entities/bio_farm/bio_farm_shadow.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/entities/bio_farm/biofarm_pipes/bio_farm-pipe-E.png b/Bio_Industries_2/graphics/entities/bio_farm/biofarm_pipes/bio_farm-pipe-E.png deleted file mode 100644 index 2e200ea..0000000 Binary files a/Bio_Industries_2/graphics/entities/bio_farm/biofarm_pipes/bio_farm-pipe-E.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/entities/bio_farm/biofarm_pipes/bio_farm-pipe-S.png b/Bio_Industries_2/graphics/entities/bio_farm/biofarm_pipes/bio_farm-pipe-S.png deleted file mode 100644 index b57c891..0000000 Binary files a/Bio_Industries_2/graphics/entities/bio_farm/biofarm_pipes/bio_farm-pipe-S.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/entities/bio_farm/biofarm_pipes/bio_farm-pipe-W.png b/Bio_Industries_2/graphics/entities/bio_farm/biofarm_pipes/bio_farm-pipe-W.png deleted file mode 100644 index 5a40d64..0000000 Binary files a/Bio_Industries_2/graphics/entities/bio_farm/biofarm_pipes/bio_farm-pipe-W.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/entities/bio_garden/assembling-machine-3-pipe-E.png b/Bio_Industries_2/graphics/entities/bio_garden/assembling-machine-3-pipe-E.png deleted file mode 100644 index 5be2a22..0000000 Binary files a/Bio_Industries_2/graphics/entities/bio_garden/assembling-machine-3-pipe-E.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/entities/bio_garden/assembling-machine-3-pipe-S.png b/Bio_Industries_2/graphics/entities/bio_garden/assembling-machine-3-pipe-S.png deleted file mode 100644 index d85618b..0000000 Binary files a/Bio_Industries_2/graphics/entities/bio_garden/assembling-machine-3-pipe-S.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/entities/bio_garden/assembling-machine-3-pipe-W.png b/Bio_Industries_2/graphics/entities/bio_garden/assembling-machine-3-pipe-W.png deleted file mode 100644 index 4857a0d..0000000 Binary files a/Bio_Industries_2/graphics/entities/bio_garden/assembling-machine-3-pipe-W.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/entities/bio_garden/bio_garden_anim_light.png b/Bio_Industries_2/graphics/entities/bio_garden/bio_garden_anim_light.png deleted file mode 100644 index afb0011..0000000 Binary files a/Bio_Industries_2/graphics/entities/bio_garden/bio_garden_anim_light.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/entities/bio_garden/bio_garden_anim_trees.png b/Bio_Industries_2/graphics/entities/bio_garden/bio_garden_anim_trees.png deleted file mode 100644 index dac23e6..0000000 Binary files a/Bio_Industries_2/graphics/entities/bio_garden/bio_garden_anim_trees.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/entities/bio_garden/bio_garden_huge.png b/Bio_Industries_2/graphics/entities/bio_garden/bio_garden_huge.png deleted file mode 100644 index 0083548..0000000 Binary files a/Bio_Industries_2/graphics/entities/bio_garden/bio_garden_huge.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/entities/bio_garden/bio_garden_huge_shadow.png b/Bio_Industries_2/graphics/entities/bio_garden/bio_garden_huge_shadow.png deleted file mode 100644 index b17198d..0000000 Binary files a/Bio_Industries_2/graphics/entities/bio_garden/bio_garden_huge_shadow.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/entities/bio_garden/bio_garden_huge_turbine_anim.png b/Bio_Industries_2/graphics/entities/bio_garden/bio_garden_huge_turbine_anim.png deleted file mode 100644 index 8404aac..0000000 Binary files a/Bio_Industries_2/graphics/entities/bio_garden/bio_garden_huge_turbine_anim.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/entities/bio_garden/bio_garden_large.png b/Bio_Industries_2/graphics/entities/bio_garden/bio_garden_large.png deleted file mode 100644 index b5799bc..0000000 Binary files a/Bio_Industries_2/graphics/entities/bio_garden/bio_garden_large.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/entities/bio_garden/bio_garden_large_light.png b/Bio_Industries_2/graphics/entities/bio_garden/bio_garden_large_light.png deleted file mode 100644 index 544a26b..0000000 Binary files a/Bio_Industries_2/graphics/entities/bio_garden/bio_garden_large_light.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/entities/bio_garden/bio_garden_large_shadow.png b/Bio_Industries_2/graphics/entities/bio_garden/bio_garden_large_shadow.png deleted file mode 100644 index 32cff3c..0000000 Binary files a/Bio_Industries_2/graphics/entities/bio_garden/bio_garden_large_shadow.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/entities/bio_garden/bio_garden_shadow.png b/Bio_Industries_2/graphics/entities/bio_garden/bio_garden_shadow.png deleted file mode 100644 index f5ec862..0000000 Binary files a/Bio_Industries_2/graphics/entities/bio_garden/bio_garden_shadow.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/entities/bio_garden/hr-assembling-machine-3-pipe-E.png b/Bio_Industries_2/graphics/entities/bio_garden/hr-assembling-machine-3-pipe-E.png deleted file mode 100644 index fb37d17..0000000 Binary files a/Bio_Industries_2/graphics/entities/bio_garden/hr-assembling-machine-3-pipe-E.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/entities/bio_garden/hr-assembling-machine-3-pipe-S.png b/Bio_Industries_2/graphics/entities/bio_garden/hr-assembling-machine-3-pipe-S.png deleted file mode 100644 index 1c4090b..0000000 Binary files a/Bio_Industries_2/graphics/entities/bio_garden/hr-assembling-machine-3-pipe-S.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/entities/bio_garden/hr-assembling-machine-3-pipe-W.png b/Bio_Industries_2/graphics/entities/bio_garden/hr-assembling-machine-3-pipe-W.png deleted file mode 100644 index d84143f..0000000 Binary files a/Bio_Industries_2/graphics/entities/bio_garden/hr-assembling-machine-3-pipe-W.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/entities/bio_greenhouse/bio_greenhouse.png b/Bio_Industries_2/graphics/entities/bio_greenhouse/bio_greenhouse.png deleted file mode 100644 index 8a41cc1..0000000 Binary files a/Bio_Industries_2/graphics/entities/bio_greenhouse/bio_greenhouse.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/entities/bio_greenhouse/bio_greenhouse_light_anim.png b/Bio_Industries_2/graphics/entities/bio_greenhouse/bio_greenhouse_light_anim.png deleted file mode 100644 index e790672..0000000 Binary files a/Bio_Industries_2/graphics/entities/bio_greenhouse/bio_greenhouse_light_anim.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/entities/bio_greenhouse/bio_greenhouse_shadow.png b/Bio_Industries_2/graphics/entities/bio_greenhouse/bio_greenhouse_shadow.png deleted file mode 100644 index ad2cb39..0000000 Binary files a/Bio_Industries_2/graphics/entities/bio_greenhouse/bio_greenhouse_shadow.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/entities/bio_greenhouse/pipe/assembling-machine-3-pipe-E.png b/Bio_Industries_2/graphics/entities/bio_greenhouse/pipe/assembling-machine-3-pipe-E.png deleted file mode 100644 index 8275572..0000000 Binary files a/Bio_Industries_2/graphics/entities/bio_greenhouse/pipe/assembling-machine-3-pipe-E.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/entities/bio_greenhouse/pipe/assembling-machine-3-pipe-N.png b/Bio_Industries_2/graphics/entities/bio_greenhouse/pipe/assembling-machine-3-pipe-N.png deleted file mode 100644 index 58f4c75..0000000 Binary files a/Bio_Industries_2/graphics/entities/bio_greenhouse/pipe/assembling-machine-3-pipe-N.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/entities/bio_greenhouse/pipe/assembling-machine-3-pipe-S.png b/Bio_Industries_2/graphics/entities/bio_greenhouse/pipe/assembling-machine-3-pipe-S.png deleted file mode 100644 index ea31edf..0000000 Binary files a/Bio_Industries_2/graphics/entities/bio_greenhouse/pipe/assembling-machine-3-pipe-S.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/entities/bio_greenhouse/pipe/assembling-machine-3-pipe-W.png b/Bio_Industries_2/graphics/entities/bio_greenhouse/pipe/assembling-machine-3-pipe-W.png deleted file mode 100644 index 5312d0f..0000000 Binary files a/Bio_Industries_2/graphics/entities/bio_greenhouse/pipe/assembling-machine-3-pipe-W.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/entities/bio_greenhouse/pipe/hr-assembling-machine-3-pipe-E.png b/Bio_Industries_2/graphics/entities/bio_greenhouse/pipe/hr-assembling-machine-3-pipe-E.png deleted file mode 100644 index ec130e2..0000000 Binary files a/Bio_Industries_2/graphics/entities/bio_greenhouse/pipe/hr-assembling-machine-3-pipe-E.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/entities/bio_greenhouse/pipe/hr-assembling-machine-3-pipe-N-exp.png b/Bio_Industries_2/graphics/entities/bio_greenhouse/pipe/hr-assembling-machine-3-pipe-N-exp.png deleted file mode 100644 index 0e6453f..0000000 Binary files a/Bio_Industries_2/graphics/entities/bio_greenhouse/pipe/hr-assembling-machine-3-pipe-N-exp.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/entities/bio_greenhouse/pipe/hr-assembling-machine-3-pipe-S.png b/Bio_Industries_2/graphics/entities/bio_greenhouse/pipe/hr-assembling-machine-3-pipe-S.png deleted file mode 100644 index ef05934..0000000 Binary files a/Bio_Industries_2/graphics/entities/bio_greenhouse/pipe/hr-assembling-machine-3-pipe-S.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/entities/bio_greenhouse/pipe/hr-assembling-machine-3-pipe-W.png b/Bio_Industries_2/graphics/entities/bio_greenhouse/pipe/hr-assembling-machine-3-pipe-W.png deleted file mode 100644 index cf57a30..0000000 Binary files a/Bio_Industries_2/graphics/entities/bio_greenhouse/pipe/hr-assembling-machine-3-pipe-W.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/entities/bio_musk_floor/solarfloor.png b/Bio_Industries_2/graphics/entities/bio_musk_floor/solarfloor.png deleted file mode 100644 index a236b3b..0000000 Binary files a/Bio_Industries_2/graphics/entities/bio_musk_floor/solarfloor.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/entities/bio_musk_floor/solarfloor_inner-corner-mask.png b/Bio_Industries_2/graphics/entities/bio_musk_floor/solarfloor_inner-corner-mask.png deleted file mode 100644 index 024d7d0..0000000 Binary files a/Bio_Industries_2/graphics/entities/bio_musk_floor/solarfloor_inner-corner-mask.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/entities/bio_musk_floor/solarfloor_inner-corner.png b/Bio_Industries_2/graphics/entities/bio_musk_floor/solarfloor_inner-corner.png deleted file mode 100644 index ef21358..0000000 Binary files a/Bio_Industries_2/graphics/entities/bio_musk_floor/solarfloor_inner-corner.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/entities/bio_musk_floor/solarfloor_o-mask.png b/Bio_Industries_2/graphics/entities/bio_musk_floor/solarfloor_o-mask.png deleted file mode 100644 index fee4da1..0000000 Binary files a/Bio_Industries_2/graphics/entities/bio_musk_floor/solarfloor_o-mask.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/entities/bio_musk_floor/solarfloor_o.png b/Bio_Industries_2/graphics/entities/bio_musk_floor/solarfloor_o.png deleted file mode 100644 index bcb9ffa..0000000 Binary files a/Bio_Industries_2/graphics/entities/bio_musk_floor/solarfloor_o.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/entities/bio_musk_floor/solarfloor_outer-corner-mask.png b/Bio_Industries_2/graphics/entities/bio_musk_floor/solarfloor_outer-corner-mask.png deleted file mode 100644 index cd3803c..0000000 Binary files a/Bio_Industries_2/graphics/entities/bio_musk_floor/solarfloor_outer-corner-mask.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/entities/bio_musk_floor/solarfloor_outer-corner.png b/Bio_Industries_2/graphics/entities/bio_musk_floor/solarfloor_outer-corner.png deleted file mode 100644 index b386083..0000000 Binary files a/Bio_Industries_2/graphics/entities/bio_musk_floor/solarfloor_outer-corner.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/entities/bio_musk_floor/solarfloor_side-mask.png b/Bio_Industries_2/graphics/entities/bio_musk_floor/solarfloor_side-mask.png deleted file mode 100644 index b3bf9d7..0000000 Binary files a/Bio_Industries_2/graphics/entities/bio_musk_floor/solarfloor_side-mask.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/entities/bio_musk_floor/solarfloor_side.png b/Bio_Industries_2/graphics/entities/bio_musk_floor/solarfloor_side.png deleted file mode 100644 index c786811..0000000 Binary files a/Bio_Industries_2/graphics/entities/bio_musk_floor/solarfloor_side.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/entities/bio_musk_floor/solarfloor_u-mask.png b/Bio_Industries_2/graphics/entities/bio_musk_floor/solarfloor_u-mask.png deleted file mode 100644 index d51d71d..0000000 Binary files a/Bio_Industries_2/graphics/entities/bio_musk_floor/solarfloor_u-mask.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/entities/bio_musk_floor/solarfloor_u.png b/Bio_Industries_2/graphics/entities/bio_musk_floor/solarfloor_u.png deleted file mode 100644 index 3160a5a..0000000 Binary files a/Bio_Industries_2/graphics/entities/bio_musk_floor/solarfloor_u.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/entities/bio_reactor/bioreactor_anim.png b/Bio_Industries_2/graphics/entities/bio_reactor/bioreactor_anim.png deleted file mode 100644 index 5192b2e..0000000 Binary files a/Bio_Industries_2/graphics/entities/bio_reactor/bioreactor_anim.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/entities/bio_reactor/bioreactor_idle.png b/Bio_Industries_2/graphics/entities/bio_reactor/bioreactor_idle.png deleted file mode 100644 index ffd92c2..0000000 Binary files a/Bio_Industries_2/graphics/entities/bio_reactor/bioreactor_idle.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/entities/bio_reactor/bioreactor_shadow.png b/Bio_Industries_2/graphics/entities/bio_reactor/bioreactor_shadow.png deleted file mode 100644 index 0c9a68e..0000000 Binary files a/Bio_Industries_2/graphics/entities/bio_reactor/bioreactor_shadow.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/entities/bio_reactor/pipes/bioreactor-pipe-e.png b/Bio_Industries_2/graphics/entities/bio_reactor/pipes/bioreactor-pipe-e.png deleted file mode 100644 index 6111448..0000000 Binary files a/Bio_Industries_2/graphics/entities/bio_reactor/pipes/bioreactor-pipe-e.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/entities/bio_reactor/pipes/bioreactor-pipe-s.png b/Bio_Industries_2/graphics/entities/bio_reactor/pipes/bioreactor-pipe-s.png deleted file mode 100644 index 46d9864..0000000 Binary files a/Bio_Industries_2/graphics/entities/bio_reactor/pipes/bioreactor-pipe-s.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/entities/bio_reactor/pipes/bioreactor-pipe-w.png b/Bio_Industries_2/graphics/entities/bio_reactor/pipes/bioreactor-pipe-w.png deleted file mode 100644 index 6239713..0000000 Binary files a/Bio_Industries_2/graphics/entities/bio_reactor/pipes/bioreactor-pipe-w.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/entities/bio_reactor/pipes/hr_bioreactor-pipe-e.png b/Bio_Industries_2/graphics/entities/bio_reactor/pipes/hr_bioreactor-pipe-e.png deleted file mode 100644 index 53a6e38..0000000 Binary files a/Bio_Industries_2/graphics/entities/bio_reactor/pipes/hr_bioreactor-pipe-e.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/entities/bio_reactor/pipes/hr_bioreactor-pipe-s.png b/Bio_Industries_2/graphics/entities/bio_reactor/pipes/hr_bioreactor-pipe-s.png deleted file mode 100644 index df32b61..0000000 Binary files a/Bio_Industries_2/graphics/entities/bio_reactor/pipes/hr_bioreactor-pipe-s.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/entities/bio_reactor/pipes/hr_bioreactor-pipe-w.png b/Bio_Industries_2/graphics/entities/bio_reactor/pipes/hr_bioreactor-pipe-w.png deleted file mode 100644 index 8c72efb..0000000 Binary files a/Bio_Industries_2/graphics/entities/bio_reactor/pipes/hr_bioreactor-pipe-w.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/entities/bio_solar_boiler/bio_Solar_Boiler.png b/Bio_Industries_2/graphics/entities/bio_solar_boiler/bio_Solar_Boiler.png deleted file mode 100644 index 086fe28..0000000 Binary files a/Bio_Industries_2/graphics/entities/bio_solar_boiler/bio_Solar_Boiler.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/entities/bio_solar_boiler/bio_Solar_Boiler_light.png b/Bio_Industries_2/graphics/entities/bio_solar_boiler/bio_Solar_Boiler_light.png deleted file mode 100644 index 59cd10c..0000000 Binary files a/Bio_Industries_2/graphics/entities/bio_solar_boiler/bio_Solar_Boiler_light.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/entities/bio_solar_boiler/bio_Solar_Boiler_shadow.png b/Bio_Industries_2/graphics/entities/bio_solar_boiler/bio_Solar_Boiler_shadow.png deleted file mode 100644 index b5f355e..0000000 Binary files a/Bio_Industries_2/graphics/entities/bio_solar_boiler/bio_Solar_Boiler_shadow.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/entities/bio_solar_farm/Bio_Solar_Boiler.png b/Bio_Industries_2/graphics/entities/bio_solar_farm/Bio_Solar_Boiler.png new file mode 100644 index 0000000..5ab7410 Binary files /dev/null and b/Bio_Industries_2/graphics/entities/bio_solar_farm/Bio_Solar_Boiler.png differ diff --git a/Bio_Industries_2/graphics/entities/bio_solar_farm/Bio_Solar_Boiler_on.png b/Bio_Industries_2/graphics/entities/bio_solar_farm/Bio_Solar_Boiler_on.png new file mode 100644 index 0000000..8f277ed Binary files /dev/null and b/Bio_Industries_2/graphics/entities/bio_solar_farm/Bio_Solar_Boiler_on.png differ diff --git a/Bio_Industries_2/graphics/entities/bio_solar_farm/Bio_Solar_Farm_Off.png b/Bio_Industries_2/graphics/entities/bio_solar_farm/Bio_Solar_Farm_Off.png new file mode 100644 index 0000000..02a7c31 Binary files /dev/null and b/Bio_Industries_2/graphics/entities/bio_solar_farm/Bio_Solar_Farm_Off.png differ diff --git a/Bio_Industries_2/graphics/entities/bio_solar_farm/Bio_Solar_Farm_Off_alt.png b/Bio_Industries_2/graphics/entities/bio_solar_farm/Bio_Solar_Farm_Off_alt.png new file mode 100644 index 0000000..4bc79b2 Binary files /dev/null and b/Bio_Industries_2/graphics/entities/bio_solar_farm/Bio_Solar_Farm_Off_alt.png differ diff --git a/Bio_Industries_2/graphics/entities/bio_solar_farm/Bio_Solar_Farm_On.png b/Bio_Industries_2/graphics/entities/bio_solar_farm/Bio_Solar_Farm_On.png new file mode 100644 index 0000000..91767e5 Binary files /dev/null and b/Bio_Industries_2/graphics/entities/bio_solar_farm/Bio_Solar_Farm_On.png differ diff --git a/Bio_Industries_2/graphics/entities/bio_solar_farm/Bio_Solar_Farm_On_alt_old.png b/Bio_Industries_2/graphics/entities/bio_solar_farm/Bio_Solar_Farm_On_alt_old.png new file mode 100644 index 0000000..1efa2f8 Binary files /dev/null and b/Bio_Industries_2/graphics/entities/bio_solar_farm/Bio_Solar_Farm_On_alt_old.png differ diff --git a/Bio_Industries_2/graphics/entities/bio_solar_farm/LargeAccumulatorAnimated.png b/Bio_Industries_2/graphics/entities/bio_solar_farm/LargeAccumulatorAnimated.png new file mode 100644 index 0000000..2287a01 Binary files /dev/null and b/Bio_Industries_2/graphics/entities/bio_solar_farm/LargeAccumulatorAnimated.png differ diff --git a/Bio_Industries_2/graphics/entities/bio_solar_farm/bi_LargeAccumulator.png b/Bio_Industries_2/graphics/entities/bio_solar_farm/bi_LargeAccumulator.png new file mode 100644 index 0000000..72806b1 Binary files /dev/null and b/Bio_Industries_2/graphics/entities/bio_solar_farm/bi_LargeAccumulator.png differ diff --git a/Bio_Industries_2/graphics/entities/bio_solar_farm/bi_LargeAccumulatorAnimated.png b/Bio_Industries_2/graphics/entities/bio_solar_farm/bi_LargeAccumulatorAnimated.png new file mode 100644 index 0000000..0c5497b Binary files /dev/null and b/Bio_Industries_2/graphics/entities/bio_solar_farm/bi_LargeAccumulatorAnimated.png differ diff --git a/Bio_Industries_2/graphics/entities/bio_solar_farm/bi_LargeSubstation.png b/Bio_Industries_2/graphics/entities/bio_solar_farm/bi_LargeSubstation.png new file mode 100644 index 0000000..e81cb4c Binary files /dev/null and b/Bio_Industries_2/graphics/entities/bio_solar_farm/bi_LargeSubstation.png differ diff --git a/Bio_Industries_2/graphics/entities/bio_solar_farm/bi_LargeSubstation_Old.png b/Bio_Industries_2/graphics/entities/bio_solar_farm/bi_LargeSubstation_Old.png new file mode 100644 index 0000000..dc69e31 Binary files /dev/null and b/Bio_Industries_2/graphics/entities/bio_solar_farm/bi_LargeSubstation_Old.png differ diff --git a/Bio_Industries_2/graphics/entities/bio_solar_farm/bio_Solar_Farm.png b/Bio_Industries_2/graphics/entities/bio_solar_farm/bio_Solar_Farm.png deleted file mode 100644 index d4b2cb3..0000000 Binary files a/Bio_Industries_2/graphics/entities/bio_solar_farm/bio_Solar_Farm.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/entities/bio_solar_farm/bio_Solar_Farm_shadow.png b/Bio_Industries_2/graphics/entities/bio_solar_farm/bio_Solar_Farm_shadow.png deleted file mode 100644 index 29f3fd4..0000000 Binary files a/Bio_Industries_2/graphics/entities/bio_solar_farm/bio_Solar_Farm_shadow.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/entities/bio_solar_farm/solar-inner-corner.png b/Bio_Industries_2/graphics/entities/bio_solar_farm/solar-inner-corner.png new file mode 100644 index 0000000..78802e0 Binary files /dev/null and b/Bio_Industries_2/graphics/entities/bio_solar_farm/solar-inner-corner.png differ diff --git a/Bio_Industries_2/graphics/entities/bio_solar_farm/solar-o.png b/Bio_Industries_2/graphics/entities/bio_solar_farm/solar-o.png new file mode 100644 index 0000000..6291f11 Binary files /dev/null and b/Bio_Industries_2/graphics/entities/bio_solar_farm/solar-o.png differ diff --git a/Bio_Industries_2/graphics/entities/bio_solar_farm/solar-outer-corner.png b/Bio_Industries_2/graphics/entities/bio_solar_farm/solar-outer-corner.png new file mode 100644 index 0000000..c68bd03 Binary files /dev/null and b/Bio_Industries_2/graphics/entities/bio_solar_farm/solar-outer-corner.png differ diff --git a/Bio_Industries_2/graphics/entities/bio_solar_farm/solar-side.png b/Bio_Industries_2/graphics/entities/bio_solar_farm/solar-side.png new file mode 100644 index 0000000..c630a88 Binary files /dev/null and b/Bio_Industries_2/graphics/entities/bio_solar_farm/solar-side.png differ diff --git a/Bio_Industries_2/graphics/entities/bio_solar_farm/solar-u.png b/Bio_Industries_2/graphics/entities/bio_solar_farm/solar-u.png new file mode 100644 index 0000000..13492a4 Binary files /dev/null and b/Bio_Industries_2/graphics/entities/bio_solar_farm/solar-u.png differ diff --git a/Bio_Industries_2/graphics/entities/bio_solar_farm/solar1.png b/Bio_Industries_2/graphics/entities/bio_solar_farm/solar1.png new file mode 100644 index 0000000..127c305 Binary files /dev/null and b/Bio_Industries_2/graphics/entities/bio_solar_farm/solar1.png differ diff --git a/Bio_Industries_2/graphics/entities/bio_solar_farm/solar1x.png b/Bio_Industries_2/graphics/entities/bio_solar_farm/solar1x.png new file mode 100644 index 0000000..0e931f0 Binary files /dev/null and b/Bio_Industries_2/graphics/entities/bio_solar_farm/solar1x.png differ diff --git a/Bio_Industries_2/graphics/entities/bio_solar_farm/solar2.png b/Bio_Industries_2/graphics/entities/bio_solar_farm/solar2.png new file mode 100644 index 0000000..c865e1e Binary files /dev/null and b/Bio_Industries_2/graphics/entities/bio_solar_farm/solar2.png differ diff --git a/Bio_Industries_2/graphics/entities/bio_stone_crusher/stone_crusher_anim.png b/Bio_Industries_2/graphics/entities/bio_stone_crusher/stone_crusher_anim.png deleted file mode 100644 index c559516..0000000 Binary files a/Bio_Industries_2/graphics/entities/bio_stone_crusher/stone_crusher_anim.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/entities/bio_stone_crusher/stone_crusher_off.png b/Bio_Industries_2/graphics/entities/bio_stone_crusher/stone_crusher_off.png deleted file mode 100644 index 44c024e..0000000 Binary files a/Bio_Industries_2/graphics/entities/bio_stone_crusher/stone_crusher_off.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/entities/bio_stone_crusher/stone_crusher_shadow.png b/Bio_Industries_2/graphics/entities/bio_stone_crusher/stone_crusher_shadow.png deleted file mode 100644 index c416a8d..0000000 Binary files a/Bio_Industries_2/graphics/entities/bio_stone_crusher/stone_crusher_shadow.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/entities/bio_substation/bio_substation.png b/Bio_Industries_2/graphics/entities/bio_substation/bio_substation.png deleted file mode 100644 index 5616ead..0000000 Binary files a/Bio_Industries_2/graphics/entities/bio_substation/bio_substation.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/entities/bio_substation/bio_substation_shadow.png b/Bio_Industries_2/graphics/entities/bio_substation/bio_substation_shadow.png deleted file mode 100644 index d99a5bb..0000000 Binary files a/Bio_Industries_2/graphics/entities/bio_substation/bio_substation_shadow.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/entities/bio_terraformer/arboretum.png b/Bio_Industries_2/graphics/entities/bio_terraformer/arboretum.png deleted file mode 100644 index e4e7709..0000000 Binary files a/Bio_Industries_2/graphics/entities/bio_terraformer/arboretum.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/entities/bio_terraformer/arboretum_light.png b/Bio_Industries_2/graphics/entities/bio_terraformer/arboretum_light.png deleted file mode 100644 index f9b044f..0000000 Binary files a/Bio_Industries_2/graphics/entities/bio_terraformer/arboretum_light.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/entities/bio_terraformer/arboretum_radar_anim.png b/Bio_Industries_2/graphics/entities/bio_terraformer/arboretum_radar_anim.png deleted file mode 100644 index 6a5702f..0000000 Binary files a/Bio_Industries_2/graphics/entities/bio_terraformer/arboretum_radar_anim.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/entities/bio_terraformer/arboretum_shadow.png b/Bio_Industries_2/graphics/entities/bio_terraformer/arboretum_shadow.png deleted file mode 100644 index 3d66dc2..0000000 Binary files a/Bio_Industries_2/graphics/entities/bio_terraformer/arboretum_shadow.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/entities/bio_turret/bio_turret.png b/Bio_Industries_2/graphics/entities/bio_turret/bio_turret.png index c0f404d..4870a77 100644 Binary files a/Bio_Industries_2/graphics/entities/bio_turret/bio_turret.png and b/Bio_Industries_2/graphics/entities/bio_turret/bio_turret.png differ diff --git a/Bio_Industries_2/graphics/entities/biofarm/Bio_Farm_Idle.png b/Bio_Industries_2/graphics/entities/biofarm/Bio_Farm_Idle.png new file mode 100644 index 0000000..a914d79 Binary files /dev/null and b/Bio_Industries_2/graphics/entities/biofarm/Bio_Farm_Idle.png differ diff --git a/Bio_Industries_2/graphics/entities/biofarm/Bio_Farm_Idle_alt.png b/Bio_Industries_2/graphics/entities/biofarm/Bio_Farm_Idle_alt.png new file mode 100644 index 0000000..341c20c Binary files /dev/null and b/Bio_Industries_2/graphics/entities/biofarm/Bio_Farm_Idle_alt.png differ diff --git a/Bio_Industries_2/graphics/entities/biofarm/Bio_Farm_Working.png b/Bio_Industries_2/graphics/entities/biofarm/Bio_Farm_Working.png new file mode 100644 index 0000000..dc258e0 Binary files /dev/null and b/Bio_Industries_2/graphics/entities/biofarm/Bio_Farm_Working.png differ diff --git a/Bio_Industries_2/graphics/entities/biofarm/Bio_Farm_Working_alt.png b/Bio_Industries_2/graphics/entities/biofarm/Bio_Farm_Working_alt.png new file mode 100644 index 0000000..75d69c7 Binary files /dev/null and b/Bio_Industries_2/graphics/entities/biofarm/Bio_Farm_Working_alt.png differ diff --git a/Bio_Industries_2/graphics/entities/biofarm/bio_greenhouse.png b/Bio_Industries_2/graphics/entities/biofarm/bio_greenhouse.png new file mode 100644 index 0000000..451bdbe Binary files /dev/null and b/Bio_Industries_2/graphics/entities/biofarm/bio_greenhouse.png differ diff --git a/Bio_Industries_2/graphics/entities/biofarm/bio_greenhouse_off.png b/Bio_Industries_2/graphics/entities/biofarm/bio_greenhouse_off.png new file mode 100644 index 0000000..4929795 Binary files /dev/null and b/Bio_Industries_2/graphics/entities/biofarm/bio_greenhouse_off.png differ diff --git a/Bio_Industries_2/graphics/entities/biofarm/bio_greenhouse_on.png b/Bio_Industries_2/graphics/entities/biofarm/bio_greenhouse_on.png new file mode 100644 index 0000000..2908b5c Binary files /dev/null and b/Bio_Industries_2/graphics/entities/biofarm/bio_greenhouse_on.png differ diff --git a/Bio_Industries_2/graphics/entities/biofarm/bio_greenhouse_x.png b/Bio_Industries_2/graphics/entities/biofarm/bio_greenhouse_x.png new file mode 100644 index 0000000..be1e772 Binary files /dev/null and b/Bio_Industries_2/graphics/entities/biofarm/bio_greenhouse_x.png differ diff --git a/Bio_Industries_2/graphics/entities/bio_farm/biofarm_pipes/Bio_Farm-pipe-E_l.png b/Bio_Industries_2/graphics/entities/biofarm/pipe_connections/Bio_Farm-pipe-E_l.png similarity index 100% rename from Bio_Industries_2/graphics/entities/bio_farm/biofarm_pipes/Bio_Farm-pipe-E_l.png rename to Bio_Industries_2/graphics/entities/biofarm/pipe_connections/Bio_Farm-pipe-E_l.png diff --git a/Bio_Industries_2/graphics/entities/bio_farm/biofarm_pipes/Bio_Farm-pipe-E_r.png b/Bio_Industries_2/graphics/entities/biofarm/pipe_connections/Bio_Farm-pipe-E_r.png similarity index 100% rename from Bio_Industries_2/graphics/entities/bio_farm/biofarm_pipes/Bio_Farm-pipe-E_r.png rename to Bio_Industries_2/graphics/entities/biofarm/pipe_connections/Bio_Farm-pipe-E_r.png diff --git a/Bio_Industries_2/graphics/entities/bio_farm/biofarm_pipes/Bio_Farm-pipe-N_l.png b/Bio_Industries_2/graphics/entities/biofarm/pipe_connections/Bio_Farm-pipe-N_l.png similarity index 100% rename from Bio_Industries_2/graphics/entities/bio_farm/biofarm_pipes/Bio_Farm-pipe-N_l.png rename to Bio_Industries_2/graphics/entities/biofarm/pipe_connections/Bio_Farm-pipe-N_l.png diff --git a/Bio_Industries_2/graphics/entities/bio_farm/biofarm_pipes/Bio_Farm-pipe-N_r.png b/Bio_Industries_2/graphics/entities/biofarm/pipe_connections/Bio_Farm-pipe-N_r.png similarity index 100% rename from Bio_Industries_2/graphics/entities/bio_farm/biofarm_pipes/Bio_Farm-pipe-N_r.png rename to Bio_Industries_2/graphics/entities/biofarm/pipe_connections/Bio_Farm-pipe-N_r.png diff --git a/Bio_Industries_2/graphics/entities/bio_farm/biofarm_pipes/Bio_Farm-pipe-S_l.png b/Bio_Industries_2/graphics/entities/biofarm/pipe_connections/Bio_Farm-pipe-S_l.png similarity index 100% rename from Bio_Industries_2/graphics/entities/bio_farm/biofarm_pipes/Bio_Farm-pipe-S_l.png rename to Bio_Industries_2/graphics/entities/biofarm/pipe_connections/Bio_Farm-pipe-S_l.png diff --git a/Bio_Industries_2/graphics/entities/bio_farm/biofarm_pipes/Bio_Farm-pipe-S_r.png b/Bio_Industries_2/graphics/entities/biofarm/pipe_connections/Bio_Farm-pipe-S_r.png similarity index 100% rename from Bio_Industries_2/graphics/entities/bio_farm/biofarm_pipes/Bio_Farm-pipe-S_r.png rename to Bio_Industries_2/graphics/entities/biofarm/pipe_connections/Bio_Farm-pipe-S_r.png diff --git a/Bio_Industries_2/graphics/entities/bio_farm/biofarm_pipes/Bio_Farm-pipe-W_l.png b/Bio_Industries_2/graphics/entities/biofarm/pipe_connections/Bio_Farm-pipe-W_l.png similarity index 100% rename from Bio_Industries_2/graphics/entities/bio_farm/biofarm_pipes/Bio_Farm-pipe-W_l.png rename to Bio_Industries_2/graphics/entities/biofarm/pipe_connections/Bio_Farm-pipe-W_l.png diff --git a/Bio_Industries_2/graphics/entities/bio_farm/biofarm_pipes/Bio_Farm-pipe-W_r.png b/Bio_Industries_2/graphics/entities/biofarm/pipe_connections/Bio_Farm-pipe-W_r.png similarity index 100% rename from Bio_Industries_2/graphics/entities/bio_farm/biofarm_pipes/Bio_Farm-pipe-W_r.png rename to Bio_Industries_2/graphics/entities/biofarm/pipe_connections/Bio_Farm-pipe-W_r.png diff --git a/Bio_Industries_2/graphics/entities/biofarm/pipe_connections/x/Bio_Farm-pipe-E.png b/Bio_Industries_2/graphics/entities/biofarm/pipe_connections/x/Bio_Farm-pipe-E.png new file mode 100644 index 0000000..bc6a3db Binary files /dev/null and b/Bio_Industries_2/graphics/entities/biofarm/pipe_connections/x/Bio_Farm-pipe-E.png differ diff --git a/Bio_Industries_2/graphics/entities/biofarm/pipe_connections/x/Bio_Farm-pipe-N.png b/Bio_Industries_2/graphics/entities/biofarm/pipe_connections/x/Bio_Farm-pipe-N.png new file mode 100644 index 0000000..42d4b33 Binary files /dev/null and b/Bio_Industries_2/graphics/entities/biofarm/pipe_connections/x/Bio_Farm-pipe-N.png differ diff --git a/Bio_Industries_2/graphics/entities/biofarm/pipe_connections/x/Bio_Farm-pipe-S.png b/Bio_Industries_2/graphics/entities/biofarm/pipe_connections/x/Bio_Farm-pipe-S.png new file mode 100644 index 0000000..bd66ea1 Binary files /dev/null and b/Bio_Industries_2/graphics/entities/biofarm/pipe_connections/x/Bio_Farm-pipe-S.png differ diff --git a/Bio_Industries_2/graphics/entities/biofarm/pipe_connections/x/Bio_Farm-pipe-W.png b/Bio_Industries_2/graphics/entities/biofarm/pipe_connections/x/Bio_Farm-pipe-W.png new file mode 100644 index 0000000..c48bd8c Binary files /dev/null and b/Bio_Industries_2/graphics/entities/biofarm/pipe_connections/x/Bio_Farm-pipe-W.png differ diff --git a/Bio_Industries_2/graphics/entities/biogarden/bio_garden_x.png b/Bio_Industries_2/graphics/entities/biogarden/bio_garden_x.png new file mode 100644 index 0000000..ef39292 Binary files /dev/null and b/Bio_Industries_2/graphics/entities/biogarden/bio_garden_x.png differ diff --git a/Bio_Industries_2/graphics/entities/bioreactor/bioreactor.png b/Bio_Industries_2/graphics/entities/bioreactor/bioreactor.png new file mode 100644 index 0000000..0ccdf29 Binary files /dev/null and b/Bio_Industries_2/graphics/entities/bioreactor/bioreactor.png differ diff --git a/Bio_Industries_2/graphics/entities/bioreactor/pipe-east.png b/Bio_Industries_2/graphics/entities/bioreactor/pipe-east.png new file mode 100644 index 0000000..829f23e Binary files /dev/null and b/Bio_Industries_2/graphics/entities/bioreactor/pipe-east.png differ diff --git a/Bio_Industries_2/graphics/entities/bioreactor/pipe-south.png b/Bio_Industries_2/graphics/entities/bioreactor/pipe-south.png new file mode 100644 index 0000000..03bf04c Binary files /dev/null and b/Bio_Industries_2/graphics/entities/bioreactor/pipe-south.png differ diff --git a/Bio_Industries_2/graphics/entities/bioreactor/pipe-west.png b/Bio_Industries_2/graphics/entities/bioreactor/pipe-west.png new file mode 100644 index 0000000..f8d44f1 Binary files /dev/null and b/Bio_Industries_2/graphics/entities/bioreactor/pipe-west.png differ diff --git a/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-01.png b/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-01.png index 2b127c4..9296ebd 100644 Binary files a/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-01.png and b/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-01.png differ diff --git a/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-02.png b/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-02.png index 4f54b64..a4f7cb4 100644 Binary files a/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-02.png and b/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-02.png differ diff --git a/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-03.png b/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-03.png index 65dae70..bc2b747 100644 Binary files a/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-03.png and b/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-03.png differ diff --git a/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-04.png b/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-04.png index 7a4aeb8..3e8ff8d 100644 Binary files a/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-04.png and b/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-04.png differ diff --git a/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-05.png b/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-05.png index 8fc6c29..473112b 100644 Binary files a/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-05.png and b/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-05.png differ diff --git a/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-06.png b/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-06.png index 5afded5..da6491a 100644 Binary files a/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-06.png and b/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-06.png differ diff --git a/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-07.png b/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-07.png index 0d24718..9ac3ccd 100644 Binary files a/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-07.png and b/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-07.png differ diff --git a/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-08.png b/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-08.png index 250a8cc..4bd00ff 100644 Binary files a/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-08.png and b/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-08.png differ diff --git a/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-09.png b/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-09.png index 0ab3422..98c02f7 100644 Binary files a/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-09.png and b/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-09.png differ diff --git a/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-10.png b/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-10.png index 2320279..940b8ef 100644 Binary files a/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-10.png and b/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-10.png differ diff --git a/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-11.png b/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-11.png index 444657a..8b8b73c 100644 Binary files a/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-11.png and b/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-11.png differ diff --git a/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-12.png b/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-12.png index 95c40e6..33d6739 100644 Binary files a/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-12.png and b/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-12.png differ diff --git a/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-13.png b/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-13.png index 17368b2..8cbb9a5 100644 Binary files a/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-13.png and b/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-13.png differ diff --git a/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-14.png b/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-14.png index 9864a42..3caba33 100644 Binary files a/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-14.png and b/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-14.png differ diff --git a/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-15.png b/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-15.png index a9829be..7c7da9e 100644 Binary files a/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-15.png and b/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-15.png differ diff --git a/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-16.png b/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-16.png index 49cc103..6bf9d2d 100644 Binary files a/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-16.png and b/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-16.png differ diff --git a/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-17.png b/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-17.png index 587eb03..6fb0637 100644 Binary files a/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-17.png and b/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-17.png differ diff --git a/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-18.png b/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-18.png index 7234681..68910dd 100644 Binary files a/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-18.png and b/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-18.png differ diff --git a/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-19.png b/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-19.png index 07181fb..e8389f3 100644 Binary files a/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-19.png and b/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-19.png differ diff --git a/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-20.png b/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-20.png index afed4c7..c102635 100644 Binary files a/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-20.png and b/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-20.png differ diff --git a/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-21.png b/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-21.png index ed0e324..54727be 100644 Binary files a/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-21.png and b/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-21.png differ diff --git a/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-22.png b/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-22.png index 9baf196..689ad87 100644 Binary files a/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-22.png and b/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-22.png differ diff --git a/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-23.png b/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-23.png index df958fe..b6ed1c4 100644 Binary files a/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-23.png and b/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-23.png differ diff --git a/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-24.png b/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-24.png index efb5da8..dd146fd 100644 Binary files a/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-24.png and b/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-24.png differ diff --git a/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-25.png b/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-25.png index 503c795..6ab232e 100644 Binary files a/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-25.png and b/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-25.png differ diff --git a/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-26.png b/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-26.png index b5db2d1..32a117a 100644 Binary files a/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-26.png and b/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-26.png differ diff --git a/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-27.png b/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-27.png index 5dda286..5632d8b 100644 Binary files a/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-27.png and b/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-27.png differ diff --git a/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-28.png b/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-28.png index c88a0b0..9e599aa 100644 Binary files a/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-28.png and b/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-28.png differ diff --git a/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-29.png b/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-29.png index aef7e39..33157d2 100644 Binary files a/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-29.png and b/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-29.png differ diff --git a/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-shadow-01.png b/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-shadow-01.png index a297450..3f83343 100644 Binary files a/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-shadow-01.png and b/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-shadow-01.png differ diff --git a/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-shadow-02.png b/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-shadow-02.png index c105a8e..d6f939b 100644 Binary files a/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-shadow-02.png and b/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-shadow-02.png differ diff --git a/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-shadow-03.png b/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-shadow-03.png index 42b77c6..f205e93 100644 Binary files a/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-shadow-03.png and b/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-shadow-03.png differ diff --git a/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-shadow-04.png b/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-shadow-04.png index 87ba90a..5743c3a 100644 Binary files a/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-shadow-04.png and b/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-shadow-04.png differ diff --git a/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-shadow-05.png b/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-shadow-05.png index 2389b4d..a71fb63 100644 Binary files a/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-shadow-05.png and b/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-shadow-05.png differ diff --git a/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-shadow-06.png b/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-shadow-06.png index f08090a..a2139b1 100644 Binary files a/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-shadow-06.png and b/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-shadow-06.png differ diff --git a/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-shadow-07.png b/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-shadow-07.png index 7fbdf40..9e3ee2b 100644 Binary files a/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-shadow-07.png and b/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-shadow-07.png differ diff --git a/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-shadow-08.png b/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-shadow-08.png index a42e023..d1cf2e7 100644 Binary files a/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-shadow-08.png and b/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-shadow-08.png differ diff --git a/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-shadow-09.png b/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-shadow-09.png index 868ad89..c0d9764 100644 Binary files a/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-shadow-09.png and b/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-shadow-09.png differ diff --git a/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-shadow-10.png b/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-shadow-10.png index 167eead..8ce400e 100644 Binary files a/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-shadow-10.png and b/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-shadow-10.png differ diff --git a/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-shadow-11.png b/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-shadow-11.png index c934e82..9ce6ca6 100644 Binary files a/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-shadow-11.png and b/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-shadow-11.png differ diff --git a/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-shadow-12.png b/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-shadow-12.png index 5959605..a828908 100644 Binary files a/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-shadow-12.png and b/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-shadow-12.png differ diff --git a/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-shadow-13.png b/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-shadow-13.png index 3494435..359b0f9 100644 Binary files a/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-shadow-13.png and b/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-shadow-13.png differ diff --git a/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-shadow-14.png b/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-shadow-14.png index 6a8c219..cfc887f 100644 Binary files a/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-shadow-14.png and b/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-shadow-14.png differ diff --git a/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-shadow-15.png b/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-shadow-15.png index d362df4..ca3afb8 100644 Binary files a/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-shadow-15.png and b/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-shadow-15.png differ diff --git a/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-shadow-16.png b/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-shadow-16.png index d9e74aa..1fceb9b 100644 Binary files a/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-shadow-16.png and b/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-shadow-16.png differ diff --git a/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-shadow-17.png b/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-shadow-17.png index 3c822f2..1ddff55 100644 Binary files a/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-shadow-17.png and b/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-shadow-17.png differ diff --git a/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-shadow-18.png b/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-shadow-18.png index 6b5d244..b269c9e 100644 Binary files a/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-shadow-18.png and b/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-shadow-18.png differ diff --git a/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-shadow-19.png b/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-shadow-19.png index 57d5fb1..1afa206 100644 Binary files a/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-shadow-19.png and b/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-shadow-19.png differ diff --git a/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-shadow-20.png b/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-shadow-20.png index 132e839..4221467 100644 Binary files a/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-shadow-20.png and b/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-shadow-20.png differ diff --git a/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-shadow-21.png b/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-shadow-21.png index 3665a92..3043cca 100644 Binary files a/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-shadow-21.png and b/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-shadow-21.png differ diff --git a/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-shadow-22.png b/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-shadow-22.png index 6dae9b6..5dcb466 100644 Binary files a/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-shadow-22.png and b/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-shadow-22.png differ diff --git a/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-shadow-23.png b/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-shadow-23.png index 666dfa9..8845d3b 100644 Binary files a/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-shadow-23.png and b/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-shadow-23.png differ diff --git a/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-shadow-24.png b/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-shadow-24.png index d489c3f..bd7c548 100644 Binary files a/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-shadow-24.png and b/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-shadow-24.png differ diff --git a/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-shadow-25.png b/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-shadow-25.png index 9d08add..d6b8fa1 100644 Binary files a/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-shadow-25.png and b/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-shadow-25.png differ diff --git a/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-shadow-26.png b/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-shadow-26.png index 468ef46..335cab7 100644 Binary files a/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-shadow-26.png and b/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-shadow-26.png differ diff --git a/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-shadow-27.png b/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-shadow-27.png index 9cbbcda..ebe3f8b 100644 Binary files a/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-shadow-27.png and b/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-shadow-27.png differ diff --git a/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-shadow-28.png b/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-shadow-28.png index 9f18609..958c94d 100644 Binary files a/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-shadow-28.png and b/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-shadow-28.png differ diff --git a/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-shadow-29.png b/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-shadow-29.png index 8983453..b2ea348 100644 Binary files a/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-shadow-29.png and b/Bio_Industries_2/graphics/entities/branch-particle/branch-particle-shadow-29.png differ diff --git a/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-01.png b/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-01.png index a055c1d..2eeb389 100644 Binary files a/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-01.png and b/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-01.png differ diff --git a/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-02.png b/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-02.png index 05a18de..3e9bd14 100644 Binary files a/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-02.png and b/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-02.png differ diff --git a/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-03.png b/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-03.png index 5d4e374..8d21e90 100644 Binary files a/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-03.png and b/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-03.png differ diff --git a/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-04.png b/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-04.png index 17dea46..49d5ddb 100644 Binary files a/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-04.png and b/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-04.png differ diff --git a/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-05.png b/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-05.png index 46ce5fb..05c57b1 100644 Binary files a/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-05.png and b/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-05.png differ diff --git a/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-06.png b/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-06.png index 80c8d13..a5485b4 100644 Binary files a/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-06.png and b/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-06.png differ diff --git a/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-07.png b/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-07.png index 1ca079e..514bd7c 100644 Binary files a/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-07.png and b/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-07.png differ diff --git a/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-08.png b/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-08.png index 60851b5..e10235d 100644 Binary files a/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-08.png and b/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-08.png differ diff --git a/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-09.png b/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-09.png index 5763634..0474f0d 100644 Binary files a/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-09.png and b/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-09.png differ diff --git a/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-10.png b/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-10.png index db5829a..37697b0 100644 Binary files a/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-10.png and b/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-10.png differ diff --git a/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-11.png b/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-11.png index b491072..1f108fd 100644 Binary files a/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-11.png and b/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-11.png differ diff --git a/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-12.png b/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-12.png index 5947169..d982475 100644 Binary files a/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-12.png and b/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-12.png differ diff --git a/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-13.png b/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-13.png index 6e7e8c6..cb768da 100644 Binary files a/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-13.png and b/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-13.png differ diff --git a/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-14.png b/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-14.png index fee529c..783e74e 100644 Binary files a/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-14.png and b/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-14.png differ diff --git a/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-15.png b/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-15.png index 34a87f4..f43239c 100644 Binary files a/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-15.png and b/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-15.png differ diff --git a/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-16.png b/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-16.png index 02b4d5d..1702223 100644 Binary files a/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-16.png and b/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-16.png differ diff --git a/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-17.png b/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-17.png index 7f40910..0b31004 100644 Binary files a/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-17.png and b/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-17.png differ diff --git a/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-18.png b/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-18.png index 28878aa..9081e9b 100644 Binary files a/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-18.png and b/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-18.png differ diff --git a/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-19.png b/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-19.png index bc858eb..567642a 100644 Binary files a/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-19.png and b/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-19.png differ diff --git a/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-20.png b/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-20.png index 4800eab..733f5b8 100644 Binary files a/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-20.png and b/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-20.png differ diff --git a/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-21.png b/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-21.png index e980813..beb57ce 100644 Binary files a/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-21.png and b/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-21.png differ diff --git a/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-22.png b/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-22.png index 361ac56..d21c567 100644 Binary files a/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-22.png and b/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-22.png differ diff --git a/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-23.png b/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-23.png index 7c47da7..049cf01 100644 Binary files a/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-23.png and b/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-23.png differ diff --git a/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-24.png b/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-24.png index a533695..f3ca3bf 100644 Binary files a/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-24.png and b/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-24.png differ diff --git a/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-25.png b/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-25.png index a31c0a3..b469b3e 100644 Binary files a/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-25.png and b/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-25.png differ diff --git a/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-26.png b/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-26.png index 02de86a..0bc30bf 100644 Binary files a/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-26.png and b/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-26.png differ diff --git a/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-27.png b/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-27.png index 0416b26..e6fd35b 100644 Binary files a/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-27.png and b/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-27.png differ diff --git a/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-28.png b/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-28.png index d1103ec..2be589d 100644 Binary files a/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-28.png and b/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-28.png differ diff --git a/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-29.png b/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-29.png index 8a2ba76..b6efdef 100644 Binary files a/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-29.png and b/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-29.png differ diff --git a/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-shadow-01.png b/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-shadow-01.png index 2e47189..cd0c683 100644 Binary files a/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-shadow-01.png and b/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-shadow-01.png differ diff --git a/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-shadow-02.png b/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-shadow-02.png index 2607d6e..0be650a 100644 Binary files a/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-shadow-02.png and b/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-shadow-02.png differ diff --git a/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-shadow-03.png b/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-shadow-03.png index f508b3c..521fe10 100644 Binary files a/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-shadow-03.png and b/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-shadow-03.png differ diff --git a/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-shadow-04.png b/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-shadow-04.png index e4beba1..880c539 100644 Binary files a/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-shadow-04.png and b/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-shadow-04.png differ diff --git a/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-shadow-05.png b/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-shadow-05.png index 6f8c7b4..154e16d 100644 Binary files a/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-shadow-05.png and b/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-shadow-05.png differ diff --git a/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-shadow-06.png b/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-shadow-06.png index cc4eefc..ff546eb 100644 Binary files a/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-shadow-06.png and b/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-shadow-06.png differ diff --git a/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-shadow-07.png b/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-shadow-07.png index 5990c3b..8d94e53 100644 Binary files a/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-shadow-07.png and b/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-shadow-07.png differ diff --git a/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-shadow-08.png b/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-shadow-08.png index 5ffb7c1..071eb2c 100644 Binary files a/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-shadow-08.png and b/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-shadow-08.png differ diff --git a/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-shadow-09.png b/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-shadow-09.png index 6e19895..9b24c62 100644 Binary files a/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-shadow-09.png and b/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-shadow-09.png differ diff --git a/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-shadow-10.png b/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-shadow-10.png index 0cc29c6..d26db87 100644 Binary files a/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-shadow-10.png and b/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-shadow-10.png differ diff --git a/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-shadow-11.png b/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-shadow-11.png index a77a327..fce5bba 100644 Binary files a/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-shadow-11.png and b/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-shadow-11.png differ diff --git a/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-shadow-12.png b/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-shadow-12.png index 76f0a41..1818b2f 100644 Binary files a/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-shadow-12.png and b/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-shadow-12.png differ diff --git a/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-shadow-13.png b/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-shadow-13.png index 3a1ad1f..6b5d70d 100644 Binary files a/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-shadow-13.png and b/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-shadow-13.png differ diff --git a/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-shadow-14.png b/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-shadow-14.png index 95a8b62..af1d0e3 100644 Binary files a/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-shadow-14.png and b/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-shadow-14.png differ diff --git a/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-shadow-15.png b/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-shadow-15.png index 4e94f47..29ee90e 100644 Binary files a/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-shadow-15.png and b/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-shadow-15.png differ diff --git a/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-shadow-16.png b/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-shadow-16.png index de92dd6..1e18476 100644 Binary files a/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-shadow-16.png and b/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-shadow-16.png differ diff --git a/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-shadow-17.png b/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-shadow-17.png index 137588e..247b20d 100644 Binary files a/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-shadow-17.png and b/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-shadow-17.png differ diff --git a/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-shadow-18.png b/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-shadow-18.png index 7449c90..c5f6b21 100644 Binary files a/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-shadow-18.png and b/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-shadow-18.png differ diff --git a/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-shadow-19.png b/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-shadow-19.png index deb0c01..aa94663 100644 Binary files a/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-shadow-19.png and b/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-shadow-19.png differ diff --git a/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-shadow-20.png b/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-shadow-20.png index f7e7d93..e2f6d7a 100644 Binary files a/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-shadow-20.png and b/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-shadow-20.png differ diff --git a/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-shadow-21.png b/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-shadow-21.png index 59e5656..8093ee6 100644 Binary files a/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-shadow-21.png and b/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-shadow-21.png differ diff --git a/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-shadow-22.png b/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-shadow-22.png index 4724731..ecb47f1 100644 Binary files a/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-shadow-22.png and b/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-shadow-22.png differ diff --git a/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-shadow-23.png b/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-shadow-23.png index 30acef3..19d081d 100644 Binary files a/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-shadow-23.png and b/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-shadow-23.png differ diff --git a/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-shadow-24.png b/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-shadow-24.png index 245a347..16f4e62 100644 Binary files a/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-shadow-24.png and b/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-shadow-24.png differ diff --git a/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-shadow-25.png b/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-shadow-25.png index 1271450..a8ee926 100644 Binary files a/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-shadow-25.png and b/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-shadow-25.png differ diff --git a/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-shadow-26.png b/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-shadow-26.png index 925b868..722a2c9 100644 Binary files a/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-shadow-26.png and b/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-shadow-26.png differ diff --git a/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-shadow-27.png b/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-shadow-27.png index 5de24b6..b14a220 100644 Binary files a/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-shadow-27.png and b/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-shadow-27.png differ diff --git a/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-shadow-28.png b/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-shadow-28.png index 57e31ef..5d15047 100644 Binary files a/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-shadow-28.png and b/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-shadow-28.png differ diff --git a/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-shadow-29.png b/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-shadow-29.png index 709e9f4..dd212fc 100644 Binary files a/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-shadow-29.png and b/Bio_Industries_2/graphics/entities/branch-particle/hr-branch-particle-shadow-29.png differ diff --git a/Bio_Industries_2/graphics/entities/cokery/cokery-idle.png b/Bio_Industries_2/graphics/entities/cokery/cokery-idle.png new file mode 100644 index 0000000..765f841 Binary files /dev/null and b/Bio_Industries_2/graphics/entities/cokery/cokery-idle.png differ diff --git a/Bio_Industries_2/graphics/entities/cokery/cokery_sheet.png b/Bio_Industries_2/graphics/entities/cokery/cokery_sheet.png new file mode 100644 index 0000000..baf2200 Binary files /dev/null and b/Bio_Industries_2/graphics/entities/cokery/cokery_sheet.png differ diff --git a/Bio_Industries_2/graphics/entities/leaf-particle/leaf-particle-01-shadow.png b/Bio_Industries_2/graphics/entities/leaf-particle/leaf-particle-01-shadow.png index 48567e8..4699e54 100644 Binary files a/Bio_Industries_2/graphics/entities/leaf-particle/leaf-particle-01-shadow.png and b/Bio_Industries_2/graphics/entities/leaf-particle/leaf-particle-01-shadow.png differ diff --git a/Bio_Industries_2/graphics/entities/leaf-particle/leaf-particle-01.png b/Bio_Industries_2/graphics/entities/leaf-particle/leaf-particle-01.png index ac690b5..850a49a 100644 Binary files a/Bio_Industries_2/graphics/entities/leaf-particle/leaf-particle-01.png and b/Bio_Industries_2/graphics/entities/leaf-particle/leaf-particle-01.png differ diff --git a/Bio_Industries_2/graphics/entities/leaf-particle/leaf-particle-02-shadow.png b/Bio_Industries_2/graphics/entities/leaf-particle/leaf-particle-02-shadow.png index 73de01f..66a5eb5 100644 Binary files a/Bio_Industries_2/graphics/entities/leaf-particle/leaf-particle-02-shadow.png and b/Bio_Industries_2/graphics/entities/leaf-particle/leaf-particle-02-shadow.png differ diff --git a/Bio_Industries_2/graphics/entities/leaf-particle/leaf-particle-03-shadow.png b/Bio_Industries_2/graphics/entities/leaf-particle/leaf-particle-03-shadow.png index fe3d9ff..8bfb569 100644 Binary files a/Bio_Industries_2/graphics/entities/leaf-particle/leaf-particle-03-shadow.png and b/Bio_Industries_2/graphics/entities/leaf-particle/leaf-particle-03-shadow.png differ diff --git a/Bio_Industries_2/graphics/entities/leaf-particle/leaf-particle-04-shadow.png b/Bio_Industries_2/graphics/entities/leaf-particle/leaf-particle-04-shadow.png index 721be18..480b709 100644 Binary files a/Bio_Industries_2/graphics/entities/leaf-particle/leaf-particle-04-shadow.png and b/Bio_Industries_2/graphics/entities/leaf-particle/leaf-particle-04-shadow.png differ diff --git a/Bio_Industries_2/graphics/entities/leaf-particle/leaf-particle-04.png b/Bio_Industries_2/graphics/entities/leaf-particle/leaf-particle-04.png index 27636c4..9bf85d8 100644 Binary files a/Bio_Industries_2/graphics/entities/leaf-particle/leaf-particle-04.png and b/Bio_Industries_2/graphics/entities/leaf-particle/leaf-particle-04.png differ diff --git a/Bio_Industries_2/graphics/entities/leaf-particle/leaf-particle-05-shadow.png b/Bio_Industries_2/graphics/entities/leaf-particle/leaf-particle-05-shadow.png index 96e240c..a916c00 100644 Binary files a/Bio_Industries_2/graphics/entities/leaf-particle/leaf-particle-05-shadow.png and b/Bio_Industries_2/graphics/entities/leaf-particle/leaf-particle-05-shadow.png differ diff --git a/Bio_Industries_2/graphics/entities/leaf-particle/leaf-particle-06-shadow.png b/Bio_Industries_2/graphics/entities/leaf-particle/leaf-particle-06-shadow.png index 2c31861..3e43355 100644 Binary files a/Bio_Industries_2/graphics/entities/leaf-particle/leaf-particle-06-shadow.png and b/Bio_Industries_2/graphics/entities/leaf-particle/leaf-particle-06-shadow.png differ diff --git a/Bio_Industries_2/graphics/entities/leaf-particle/leaf-particle-06.png b/Bio_Industries_2/graphics/entities/leaf-particle/leaf-particle-06.png index 5df8dd3..017954b 100644 Binary files a/Bio_Industries_2/graphics/entities/leaf-particle/leaf-particle-06.png and b/Bio_Industries_2/graphics/entities/leaf-particle/leaf-particle-06.png differ diff --git a/Bio_Industries_2/graphics/entities/leaf-particle/leaf-particle-07-shadow.png b/Bio_Industries_2/graphics/entities/leaf-particle/leaf-particle-07-shadow.png index 58cac9b..17b971d 100644 Binary files a/Bio_Industries_2/graphics/entities/leaf-particle/leaf-particle-07-shadow.png and b/Bio_Industries_2/graphics/entities/leaf-particle/leaf-particle-07-shadow.png differ diff --git a/Bio_Industries_2/graphics/entities/leaf-particle/leaf-particle-08-shadow.png b/Bio_Industries_2/graphics/entities/leaf-particle/leaf-particle-08-shadow.png index 6dec497..950e88c 100644 Binary files a/Bio_Industries_2/graphics/entities/leaf-particle/leaf-particle-08-shadow.png and b/Bio_Industries_2/graphics/entities/leaf-particle/leaf-particle-08-shadow.png differ diff --git a/Bio_Industries_2/graphics/entities/leaf-particle/leaf-particle-08.png b/Bio_Industries_2/graphics/entities/leaf-particle/leaf-particle-08.png index ada1dc3..c482432 100644 Binary files a/Bio_Industries_2/graphics/entities/leaf-particle/leaf-particle-08.png and b/Bio_Industries_2/graphics/entities/leaf-particle/leaf-particle-08.png differ diff --git a/Bio_Industries_2/graphics/entities/small-lamp/light-on-patch.png b/Bio_Industries_2/graphics/entities/small-lamp/light-on-patch.png new file mode 100644 index 0000000..41c2221 Binary files /dev/null and b/Bio_Industries_2/graphics/entities/small-lamp/light-on-patch.png differ diff --git a/Bio_Industries_2/graphics/entities/stone-crusher/stone-crusher-anim.png b/Bio_Industries_2/graphics/entities/stone-crusher/stone-crusher-anim.png new file mode 100644 index 0000000..7c34767 Binary files /dev/null and b/Bio_Industries_2/graphics/entities/stone-crusher/stone-crusher-anim.png differ diff --git a/Bio_Industries_2/graphics/entities/stone-crusher/stone-crusher-off-anim.png b/Bio_Industries_2/graphics/entities/stone-crusher/stone-crusher-off-anim.png new file mode 100644 index 0000000..e0ba4a8 Binary files /dev/null and b/Bio_Industries_2/graphics/entities/stone-crusher/stone-crusher-off-anim.png differ diff --git a/Bio_Industries_2/graphics/entities/stone-crusher/stone-crusher.png b/Bio_Industries_2/graphics/entities/stone-crusher/stone-crusher.png new file mode 100644 index 0000000..b815559 Binary files /dev/null and b/Bio_Industries_2/graphics/entities/stone-crusher/stone-crusher.png differ diff --git a/Bio_Industries_2/graphics/entities/stone-crusher/stone_crusher_anim.png b/Bio_Industries_2/graphics/entities/stone-crusher/stone_crusher_anim.png new file mode 100644 index 0000000..3c5057d Binary files /dev/null and b/Bio_Industries_2/graphics/entities/stone-crusher/stone_crusher_anim.png differ diff --git a/Bio_Industries_2/graphics/entities/wood_products/giga_wooden_chest.png b/Bio_Industries_2/graphics/entities/wood_products/giga_wooden_chest.png index 0ad85e7..6ef25c4 100644 Binary files a/Bio_Industries_2/graphics/entities/wood_products/giga_wooden_chest.png and b/Bio_Industries_2/graphics/entities/wood_products/giga_wooden_chest.png differ diff --git a/Bio_Industries_2/graphics/entities/wood_products/giga_wooden_chest_shadow.png b/Bio_Industries_2/graphics/entities/wood_products/giga_wooden_chest_shadow.png deleted file mode 100644 index 9550951..0000000 Binary files a/Bio_Industries_2/graphics/entities/wood_products/giga_wooden_chest_shadow.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/entities/wood_products/huge_wooden_chest.png b/Bio_Industries_2/graphics/entities/wood_products/huge_wooden_chest.png index 3aac0f7..535c450 100644 Binary files a/Bio_Industries_2/graphics/entities/wood_products/huge_wooden_chest.png and b/Bio_Industries_2/graphics/entities/wood_products/huge_wooden_chest.png differ diff --git a/Bio_Industries_2/graphics/entities/wood_products/huge_wooden_chest_shadow.png b/Bio_Industries_2/graphics/entities/wood_products/huge_wooden_chest_shadow.png deleted file mode 100644 index 5b86d44..0000000 Binary files a/Bio_Industries_2/graphics/entities/wood_products/huge_wooden_chest_shadow.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/entities/wood_products/large_wooden_chest.png b/Bio_Industries_2/graphics/entities/wood_products/large_wooden_chest.png index a03066b..a32a75e 100644 Binary files a/Bio_Industries_2/graphics/entities/wood_products/large_wooden_chest.png and b/Bio_Industries_2/graphics/entities/wood_products/large_wooden_chest.png differ diff --git a/Bio_Industries_2/graphics/entities/wood_products/large_wooden_chest_shadow.png b/Bio_Industries_2/graphics/entities/wood_products/large_wooden_chest_shadow.png deleted file mode 100644 index 900e218..0000000 Binary files a/Bio_Industries_2/graphics/entities/wood_products/large_wooden_chest_shadow.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/entities/wood_products/wood_floor/hr_woodfloor_inner-corner-mask.png b/Bio_Industries_2/graphics/entities/wood_products/wood_floor/hr_woodfloor_inner-corner-mask.png deleted file mode 100644 index 765ac42..0000000 Binary files a/Bio_Industries_2/graphics/entities/wood_products/wood_floor/hr_woodfloor_inner-corner-mask.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/entities/wood_products/wood_floor/hr_woodfloor_o-mask.png b/Bio_Industries_2/graphics/entities/wood_products/wood_floor/hr_woodfloor_o-mask.png deleted file mode 100644 index 3863476..0000000 Binary files a/Bio_Industries_2/graphics/entities/wood_products/wood_floor/hr_woodfloor_o-mask.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/entities/wood_products/wood_floor/hr_woodfloor_o.png b/Bio_Industries_2/graphics/entities/wood_products/wood_floor/hr_woodfloor_o.png deleted file mode 100644 index 1c8f0bf..0000000 Binary files a/Bio_Industries_2/graphics/entities/wood_products/wood_floor/hr_woodfloor_o.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/entities/wood_products/wood_floor/hr_woodfloor_outer-corner-mask.png b/Bio_Industries_2/graphics/entities/wood_products/wood_floor/hr_woodfloor_outer-corner-mask.png deleted file mode 100644 index 3b0acfd..0000000 Binary files a/Bio_Industries_2/graphics/entities/wood_products/wood_floor/hr_woodfloor_outer-corner-mask.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/entities/wood_products/wood_floor/hr_woodfloor_side-mask.png b/Bio_Industries_2/graphics/entities/wood_products/wood_floor/hr_woodfloor_side-mask.png deleted file mode 100644 index 662627f..0000000 Binary files a/Bio_Industries_2/graphics/entities/wood_products/wood_floor/hr_woodfloor_side-mask.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/entities/wood_products/wood_floor/hr_woodfloor_u-mask.png b/Bio_Industries_2/graphics/entities/wood_products/wood_floor/hr_woodfloor_u-mask.png deleted file mode 100644 index 58f2ad7..0000000 Binary files a/Bio_Industries_2/graphics/entities/wood_products/wood_floor/hr_woodfloor_u-mask.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/entities/wood_products/wood_floor/woodfloor.png b/Bio_Industries_2/graphics/entities/wood_products/wood_floor/woodfloor.png deleted file mode 100644 index 9b4a8bf..0000000 Binary files a/Bio_Industries_2/graphics/entities/wood_products/wood_floor/woodfloor.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/entities/wood_products/wood_floor/woodfloor_inner-corner.png b/Bio_Industries_2/graphics/entities/wood_products/wood_floor/woodfloor_inner-corner.png deleted file mode 100644 index 4b0e1b0..0000000 Binary files a/Bio_Industries_2/graphics/entities/wood_products/wood_floor/woodfloor_inner-corner.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/entities/wood_products/wood_floor/woodfloor_outer-corner.png b/Bio_Industries_2/graphics/entities/wood_products/wood_floor/woodfloor_outer-corner.png deleted file mode 100644 index 414bba3..0000000 Binary files a/Bio_Industries_2/graphics/entities/wood_products/wood_floor/woodfloor_outer-corner.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/entities/wood_products/wood_floor/woodfloor_side.png b/Bio_Industries_2/graphics/entities/wood_products/wood_floor/woodfloor_side.png deleted file mode 100644 index 979af68..0000000 Binary files a/Bio_Industries_2/graphics/entities/wood_products/wood_floor/woodfloor_side.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/entities/wood_products/wood_floor/woodfloor_u.png b/Bio_Industries_2/graphics/entities/wood_products/wood_floor/woodfloor_u.png deleted file mode 100644 index d805b17..0000000 Binary files a/Bio_Industries_2/graphics/entities/wood_products/wood_floor/woodfloor_u.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/entities/wood_products/wood_pipe/hq_pipe_sheet.png b/Bio_Industries_2/graphics/entities/wood_products/wood_pipe/hq_pipe_sheet.png index 0503dd1..f7f6a72 100644 Binary files a/Bio_Industries_2/graphics/entities/wood_products/wood_pipe/hq_pipe_sheet.png and b/Bio_Industries_2/graphics/entities/wood_products/wood_pipe/hq_pipe_sheet.png differ diff --git a/Bio_Industries_2/graphics/entities/wood_products/wood_pipe/lq_pipe_sheet.png b/Bio_Industries_2/graphics/entities/wood_products/wood_pipe/lq_pipe_sheet.png index 4be35d1..2837929 100644 Binary files a/Bio_Industries_2/graphics/entities/wood_products/wood_pipe/lq_pipe_sheet.png and b/Bio_Industries_2/graphics/entities/wood_products/wood_pipe/lq_pipe_sheet.png differ diff --git a/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-01.png b/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-01.png index 826e65b..184edc6 100644 Binary files a/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-01.png and b/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-01.png differ diff --git a/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-02.png b/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-02.png index 1284735..04e4510 100644 Binary files a/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-02.png and b/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-02.png differ diff --git a/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-03.png b/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-03.png index 4ec4435..3fe5842 100644 Binary files a/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-03.png and b/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-03.png differ diff --git a/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-04.png b/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-04.png index e5f0005..60e2043 100644 Binary files a/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-04.png and b/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-04.png differ diff --git a/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-05.png b/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-05.png index b6a0db4..0c7ccf9 100644 Binary files a/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-05.png and b/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-05.png differ diff --git a/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-06.png b/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-06.png index 34571a3..e7108ff 100644 Binary files a/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-06.png and b/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-06.png differ diff --git a/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-07.png b/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-07.png index 565a1ea..6cb6b54 100644 Binary files a/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-07.png and b/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-07.png differ diff --git a/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-08.png b/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-08.png index 1680593..1e945ea 100644 Binary files a/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-08.png and b/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-08.png differ diff --git a/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-09.png b/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-09.png index cf365b2..b50caab 100644 Binary files a/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-09.png and b/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-09.png differ diff --git a/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-10.png b/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-10.png index f9577a7..a92be4e 100644 Binary files a/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-10.png and b/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-10.png differ diff --git a/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-11.png b/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-11.png index bf8d724..754ef36 100644 Binary files a/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-11.png and b/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-11.png differ diff --git a/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-12.png b/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-12.png index 66e9a66..fab0922 100644 Binary files a/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-12.png and b/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-12.png differ diff --git a/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-13.png b/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-13.png index ccdce62..170f425 100644 Binary files a/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-13.png and b/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-13.png differ diff --git a/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-14.png b/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-14.png index 19b5379..ae6b436 100644 Binary files a/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-14.png and b/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-14.png differ diff --git a/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-15.png b/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-15.png index 73458ec..ca63804 100644 Binary files a/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-15.png and b/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-15.png differ diff --git a/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-16.png b/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-16.png index d7f24af..d63bbb4 100644 Binary files a/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-16.png and b/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-16.png differ diff --git a/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-17.png b/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-17.png index 36aef2a..1cd3cf7 100644 Binary files a/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-17.png and b/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-17.png differ diff --git a/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-18.png b/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-18.png index ca3dc88..76f7a76 100644 Binary files a/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-18.png and b/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-18.png differ diff --git a/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-19.png b/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-19.png index b7b940a..b37b874 100644 Binary files a/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-19.png and b/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-19.png differ diff --git a/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-20.png b/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-20.png index 68f82e2..cdb37c4 100644 Binary files a/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-20.png and b/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-20.png differ diff --git a/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-21.png b/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-21.png index c8a5378..77365d6 100644 Binary files a/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-21.png and b/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-21.png differ diff --git a/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-22.png b/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-22.png index 856d648..a2992eb 100644 Binary files a/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-22.png and b/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-22.png differ diff --git a/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-23.png b/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-23.png index 731c4e8..dca2004 100644 Binary files a/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-23.png and b/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-23.png differ diff --git a/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-24.png b/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-24.png index e2ebeb4..7f6bc45 100644 Binary files a/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-24.png and b/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-24.png differ diff --git a/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-25.png b/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-25.png index 542138f..222f577 100644 Binary files a/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-25.png and b/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-25.png differ diff --git a/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-shadow-01.png b/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-shadow-01.png index 7455a65..aae0be6 100644 Binary files a/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-shadow-01.png and b/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-shadow-01.png differ diff --git a/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-shadow-02.png b/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-shadow-02.png index 78db69a..f19a655 100644 Binary files a/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-shadow-02.png and b/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-shadow-02.png differ diff --git a/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-shadow-03.png b/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-shadow-03.png index a0256b4..6e58f83 100644 Binary files a/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-shadow-03.png and b/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-shadow-03.png differ diff --git a/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-shadow-04.png b/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-shadow-04.png index 0479e66..262125c 100644 Binary files a/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-shadow-04.png and b/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-shadow-04.png differ diff --git a/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-shadow-05.png b/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-shadow-05.png index 7d953fd..48aeb26 100644 Binary files a/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-shadow-05.png and b/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-shadow-05.png differ diff --git a/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-shadow-06.png b/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-shadow-06.png index bf180b9..b870c48 100644 Binary files a/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-shadow-06.png and b/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-shadow-06.png differ diff --git a/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-shadow-07.png b/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-shadow-07.png index 4523c51..7fc7fd0 100644 Binary files a/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-shadow-07.png and b/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-shadow-07.png differ diff --git a/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-shadow-08.png b/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-shadow-08.png index c387ef5..7fd59de 100644 Binary files a/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-shadow-08.png and b/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-shadow-08.png differ diff --git a/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-shadow-09.png b/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-shadow-09.png index 436cdd2..673023e 100644 Binary files a/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-shadow-09.png and b/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-shadow-09.png differ diff --git a/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-shadow-10.png b/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-shadow-10.png index f217b9d..052b7f7 100644 Binary files a/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-shadow-10.png and b/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-shadow-10.png differ diff --git a/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-shadow-11.png b/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-shadow-11.png index 6d2759b..71a0383 100644 Binary files a/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-shadow-11.png and b/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-shadow-11.png differ diff --git a/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-shadow-12.png b/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-shadow-12.png index 11eb6a6..a50c3e7 100644 Binary files a/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-shadow-12.png and b/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-shadow-12.png differ diff --git a/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-shadow-13.png b/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-shadow-13.png index 2e2a729..51fab9a 100644 Binary files a/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-shadow-13.png and b/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-shadow-13.png differ diff --git a/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-shadow-14.png b/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-shadow-14.png index 201613f..678d326 100644 Binary files a/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-shadow-14.png and b/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-shadow-14.png differ diff --git a/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-shadow-15.png b/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-shadow-15.png index a76c43e..3db8415 100644 Binary files a/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-shadow-15.png and b/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-shadow-15.png differ diff --git a/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-shadow-16.png b/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-shadow-16.png index 51937dd..59a018d 100644 Binary files a/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-shadow-16.png and b/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-shadow-16.png differ diff --git a/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-shadow-17.png b/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-shadow-17.png index 9f2e289..8a3b9b0 100644 Binary files a/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-shadow-17.png and b/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-shadow-17.png differ diff --git a/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-shadow-18.png b/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-shadow-18.png index c3d0bf8..f3096d5 100644 Binary files a/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-shadow-18.png and b/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-shadow-18.png differ diff --git a/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-shadow-19.png b/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-shadow-19.png index 5ea9e9e..52a37ca 100644 Binary files a/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-shadow-19.png and b/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-shadow-19.png differ diff --git a/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-shadow-20.png b/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-shadow-20.png index fb0e183..6f9c422 100644 Binary files a/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-shadow-20.png and b/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-shadow-20.png differ diff --git a/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-shadow-21.png b/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-shadow-21.png index edec301..002384b 100644 Binary files a/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-shadow-21.png and b/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-shadow-21.png differ diff --git a/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-shadow-22.png b/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-shadow-22.png index b8a5fd9..803afd2 100644 Binary files a/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-shadow-22.png and b/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-shadow-22.png differ diff --git a/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-shadow-23.png b/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-shadow-23.png index 7a3ca00..da99f94 100644 Binary files a/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-shadow-23.png and b/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-shadow-23.png differ diff --git a/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-shadow-24.png b/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-shadow-24.png index d9f26fc..a0c2b6a 100644 Binary files a/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-shadow-24.png and b/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-shadow-24.png differ diff --git a/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-shadow-25.png b/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-shadow-25.png index 4736098..21818fd 100644 Binary files a/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-shadow-25.png and b/Bio_Industries_2/graphics/entities/wooden-particle/hr-wooden-particle-shadow-25.png differ diff --git a/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-01.png b/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-01.png index bb0addf..3905425 100644 Binary files a/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-01.png and b/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-01.png differ diff --git a/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-02.png b/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-02.png index 34c459f..5265b7d 100644 Binary files a/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-02.png and b/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-02.png differ diff --git a/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-03.png b/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-03.png index adb0091..665b873 100644 Binary files a/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-03.png and b/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-03.png differ diff --git a/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-04.png b/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-04.png index 3e8da60..d0670f9 100644 Binary files a/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-04.png and b/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-04.png differ diff --git a/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-05.png b/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-05.png index c22707e..8e4c37e 100644 Binary files a/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-05.png and b/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-05.png differ diff --git a/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-06.png b/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-06.png index 803278d..80b14c9 100644 Binary files a/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-06.png and b/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-06.png differ diff --git a/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-07.png b/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-07.png index c782605..3d69ef3 100644 Binary files a/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-07.png and b/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-07.png differ diff --git a/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-08.png b/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-08.png index 7f31bcf..e045e35 100644 Binary files a/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-08.png and b/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-08.png differ diff --git a/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-09.png b/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-09.png index ff44971..ff4e273 100644 Binary files a/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-09.png and b/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-09.png differ diff --git a/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-10.png b/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-10.png index 00946a8..4eb7aa5 100644 Binary files a/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-10.png and b/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-10.png differ diff --git a/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-11.png b/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-11.png index 032074c..3cb2b32 100644 Binary files a/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-11.png and b/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-11.png differ diff --git a/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-12.png b/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-12.png index 0506f37..412220a 100644 Binary files a/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-12.png and b/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-12.png differ diff --git a/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-13.png b/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-13.png index 6bd338d..53059e0 100644 Binary files a/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-13.png and b/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-13.png differ diff --git a/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-14.png b/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-14.png index b099058..456e7ad 100644 Binary files a/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-14.png and b/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-14.png differ diff --git a/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-15.png b/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-15.png index 764c720..54aea9b 100644 Binary files a/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-15.png and b/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-15.png differ diff --git a/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-16.png b/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-16.png index d3b7558..303fa44 100644 Binary files a/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-16.png and b/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-16.png differ diff --git a/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-17.png b/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-17.png index fdced3d..65b2eed 100644 Binary files a/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-17.png and b/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-17.png differ diff --git a/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-18.png b/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-18.png index b1e2ca3..039bd2f 100644 Binary files a/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-18.png and b/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-18.png differ diff --git a/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-19.png b/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-19.png index 8768c5e..7556685 100644 Binary files a/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-19.png and b/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-19.png differ diff --git a/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-20.png b/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-20.png index 4b78b73..29e0f74 100644 Binary files a/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-20.png and b/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-20.png differ diff --git a/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-21.png b/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-21.png index 3ea9daa..ec64d41 100644 Binary files a/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-21.png and b/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-21.png differ diff --git a/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-22.png b/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-22.png index 5f76aa5..30b88dc 100644 Binary files a/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-22.png and b/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-22.png differ diff --git a/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-23.png b/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-23.png index 53198dd..0ebe654 100644 Binary files a/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-23.png and b/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-23.png differ diff --git a/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-24.png b/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-24.png index 91d6aa4..a549593 100644 Binary files a/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-24.png and b/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-24.png differ diff --git a/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-25.png b/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-25.png index 6c8ed13..bdfdeb0 100644 Binary files a/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-25.png and b/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-25.png differ diff --git a/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-3.png b/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-3.png index cfe9666..ee850f7 100644 Binary files a/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-3.png and b/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-3.png differ diff --git a/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-4.png b/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-4.png index 00e9f47..b0c05b2 100644 Binary files a/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-4.png and b/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-4.png differ diff --git a/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-shadow-01.png b/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-shadow-01.png index f93813a..a24c1cd 100644 Binary files a/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-shadow-01.png and b/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-shadow-01.png differ diff --git a/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-shadow-02.png b/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-shadow-02.png index a7323e3..f07ef9a 100644 Binary files a/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-shadow-02.png and b/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-shadow-02.png differ diff --git a/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-shadow-03.png b/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-shadow-03.png index a990af6..7274513 100644 Binary files a/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-shadow-03.png and b/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-shadow-03.png differ diff --git a/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-shadow-04.png b/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-shadow-04.png index 58956d5..7a09b87 100644 Binary files a/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-shadow-04.png and b/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-shadow-04.png differ diff --git a/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-shadow-05.png b/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-shadow-05.png index 0edf69a..7830853 100644 Binary files a/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-shadow-05.png and b/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-shadow-05.png differ diff --git a/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-shadow-06.png b/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-shadow-06.png index 3c07a46..1edc1a5 100644 Binary files a/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-shadow-06.png and b/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-shadow-06.png differ diff --git a/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-shadow-07.png b/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-shadow-07.png index 807d369..b7897cb 100644 Binary files a/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-shadow-07.png and b/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-shadow-07.png differ diff --git a/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-shadow-08.png b/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-shadow-08.png index 6b7b5a2..5895685 100644 Binary files a/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-shadow-08.png and b/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-shadow-08.png differ diff --git a/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-shadow-09.png b/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-shadow-09.png index 3b90dce..af541b5 100644 Binary files a/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-shadow-09.png and b/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-shadow-09.png differ diff --git a/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-shadow-10.png b/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-shadow-10.png index 1eb7d3a..202aa3f 100644 Binary files a/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-shadow-10.png and b/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-shadow-10.png differ diff --git a/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-shadow-11.png b/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-shadow-11.png index 99ef0c1..9fabd15 100644 Binary files a/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-shadow-11.png and b/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-shadow-11.png differ diff --git a/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-shadow-12.png b/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-shadow-12.png index ab166e4..d8a5e9b 100644 Binary files a/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-shadow-12.png and b/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-shadow-12.png differ diff --git a/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-shadow-13.png b/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-shadow-13.png index c5a089e..5cf843d 100644 Binary files a/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-shadow-13.png and b/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-shadow-13.png differ diff --git a/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-shadow-14.png b/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-shadow-14.png index 1aad2b8..f80b89c 100644 Binary files a/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-shadow-14.png and b/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-shadow-14.png differ diff --git a/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-shadow-15.png b/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-shadow-15.png index f1e0ea3..d49306f 100644 Binary files a/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-shadow-15.png and b/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-shadow-15.png differ diff --git a/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-shadow-16.png b/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-shadow-16.png index 213ed02..e96b495 100644 Binary files a/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-shadow-16.png and b/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-shadow-16.png differ diff --git a/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-shadow-17.png b/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-shadow-17.png index 63329b9..e71bad6 100644 Binary files a/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-shadow-17.png and b/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-shadow-17.png differ diff --git a/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-shadow-18.png b/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-shadow-18.png index a4202e6..56420d7 100644 Binary files a/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-shadow-18.png and b/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-shadow-18.png differ diff --git a/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-shadow-19.png b/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-shadow-19.png index f45ffb0..875076d 100644 Binary files a/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-shadow-19.png and b/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-shadow-19.png differ diff --git a/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-shadow-20.png b/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-shadow-20.png index b9d28db..8e8f4af 100644 Binary files a/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-shadow-20.png and b/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-shadow-20.png differ diff --git a/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-shadow-21.png b/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-shadow-21.png index bf5f50a..1cae7f8 100644 Binary files a/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-shadow-21.png and b/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-shadow-21.png differ diff --git a/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-shadow-22.png b/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-shadow-22.png index 8530033..855260d 100644 Binary files a/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-shadow-22.png and b/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-shadow-22.png differ diff --git a/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-shadow-23.png b/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-shadow-23.png index 2aa561d..807b6ac 100644 Binary files a/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-shadow-23.png and b/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-shadow-23.png differ diff --git a/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-shadow-24.png b/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-shadow-24.png index cccc3c3..b51e9ea 100644 Binary files a/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-shadow-24.png and b/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-shadow-24.png differ diff --git a/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-shadow-25.png b/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-shadow-25.png index be9c37a..ca8acbb 100644 Binary files a/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-shadow-25.png and b/Bio_Industries_2/graphics/entities/wooden-particle/wooden-particle-shadow-25.png differ diff --git a/Bio_Industries_2/graphics/icons/entity_old/Arboretum_Icon.png b/Bio_Industries_2/graphics/icons/Arboretum_Icon.png similarity index 100% rename from Bio_Industries_2/graphics/icons/entity_old/Arboretum_Icon.png rename to Bio_Industries_2/graphics/icons/Arboretum_Icon.png diff --git a/Bio_Industries_2/graphics/icons/entity_old/Arboretum_Icon_64.png b/Bio_Industries_2/graphics/icons/Arboretum_Icon_64.png similarity index 100% rename from Bio_Industries_2/graphics/icons/entity_old/Arboretum_Icon_64.png rename to Bio_Industries_2/graphics/icons/Arboretum_Icon_64.png diff --git a/Bio_Industries_2/graphics/icons/entity_old/Bio_Farm_Cabeling.png b/Bio_Industries_2/graphics/icons/Bio_Farm_Cabeling.png similarity index 100% rename from Bio_Industries_2/graphics/icons/entity_old/Bio_Farm_Cabeling.png rename to Bio_Industries_2/graphics/icons/Bio_Farm_Cabeling.png diff --git a/Bio_Industries_2/graphics/icons/entity_old/Bio_Farm_Icon.png b/Bio_Industries_2/graphics/icons/Bio_Farm_Icon.png similarity index 100% rename from Bio_Industries_2/graphics/icons/entity_old/Bio_Farm_Icon.png rename to Bio_Industries_2/graphics/icons/Bio_Farm_Icon.png diff --git a/Bio_Industries_2/graphics/icons/entity_old/Bio_Farm_Icon_64.png b/Bio_Industries_2/graphics/icons/Bio_Farm_Icon_64.png similarity index 100% rename from Bio_Industries_2/graphics/icons/entity_old/Bio_Farm_Icon_64.png rename to Bio_Industries_2/graphics/icons/Bio_Farm_Icon_64.png diff --git a/Bio_Industries_2/graphics/icons/entity_old/Bio_Farm_Lamp.png b/Bio_Industries_2/graphics/icons/Bio_Farm_Lamp.png similarity index 100% rename from Bio_Industries_2/graphics/icons/entity_old/Bio_Farm_Lamp.png rename to Bio_Industries_2/graphics/icons/Bio_Farm_Lamp.png diff --git a/Bio_Industries_2/graphics/icons/entity_old/Bio_Farm_Solar.png b/Bio_Industries_2/graphics/icons/Bio_Farm_Solar.png similarity index 100% rename from Bio_Industries_2/graphics/icons/entity_old/Bio_Farm_Solar.png rename to Bio_Industries_2/graphics/icons/Bio_Farm_Solar.png diff --git a/Bio_Industries_2/graphics/icons/entity_old/Bio_Solar_Boiler_64.png b/Bio_Industries_2/graphics/icons/Bio_Solar_Boiler_64.png similarity index 100% rename from Bio_Industries_2/graphics/icons/entity_old/Bio_Solar_Boiler_64.png rename to Bio_Industries_2/graphics/icons/Bio_Solar_Boiler_64.png diff --git a/Bio_Industries_2/graphics/icons/entity_old/Bio_Solar_Boiler_Boiler_Icon.png b/Bio_Industries_2/graphics/icons/Bio_Solar_Boiler_Boiler_Icon.png similarity index 100% rename from Bio_Industries_2/graphics/icons/entity_old/Bio_Solar_Boiler_Boiler_Icon.png rename to Bio_Industries_2/graphics/icons/Bio_Solar_Boiler_Boiler_Icon.png diff --git a/Bio_Industries_2/graphics/icons/entity_old/Bio_Solar_Boiler_Icon.png b/Bio_Industries_2/graphics/icons/Bio_Solar_Boiler_Icon.png similarity index 100% rename from Bio_Industries_2/graphics/icons/entity_old/Bio_Solar_Boiler_Icon.png rename to Bio_Industries_2/graphics/icons/Bio_Solar_Boiler_Icon.png diff --git a/Bio_Industries_2/graphics/icons/entity_old/Bio_Solar_Boiler_Panel_Icon.png b/Bio_Industries_2/graphics/icons/Bio_Solar_Boiler_Panel_Icon.png similarity index 100% rename from Bio_Industries_2/graphics/icons/entity_old/Bio_Solar_Boiler_Panel_Icon.png rename to Bio_Industries_2/graphics/icons/Bio_Solar_Boiler_Panel_Icon.png diff --git a/Bio_Industries_2/graphics/icons/entity_old/Bio_Solar_Farm_64.png b/Bio_Industries_2/graphics/icons/Bio_Solar_Farm_64.png similarity index 100% rename from Bio_Industries_2/graphics/icons/entity_old/Bio_Solar_Farm_64.png rename to Bio_Industries_2/graphics/icons/Bio_Solar_Farm_64.png diff --git a/Bio_Industries_2/graphics/icons/entity_old/Bio_Solar_Farm_Icon.png b/Bio_Industries_2/graphics/icons/Bio_Solar_Farm_Icon.png similarity index 100% rename from Bio_Industries_2/graphics/icons/entity_old/Bio_Solar_Farm_Icon.png rename to Bio_Industries_2/graphics/icons/Bio_Solar_Farm_Icon.png diff --git a/Bio_Industries_2/graphics/icons/Clean_Air2.png b/Bio_Industries_2/graphics/icons/Clean_Air2.png index 04ff2e4..0c8b837 100644 Binary files a/Bio_Industries_2/graphics/icons/Clean_Air2.png and b/Bio_Industries_2/graphics/icons/Clean_Air2.png differ diff --git a/Bio_Industries_2/graphics/icons/Fuel_Brick.png b/Bio_Industries_2/graphics/icons/Fuel_Brick.png index 433491a..b06eb47 100644 Binary files a/Bio_Industries_2/graphics/icons/Fuel_Brick.png and b/Bio_Industries_2/graphics/icons/Fuel_Brick.png differ diff --git a/Bio_Industries_2/graphics/icons/Seed_bomb_icon_a.png b/Bio_Industries_2/graphics/icons/Seed_bomb_icon_a.png new file mode 100644 index 0000000..c4b7f4c Binary files /dev/null and b/Bio_Industries_2/graphics/icons/Seed_bomb_icon_a.png differ diff --git a/Bio_Industries_2/graphics/icons/Seed_bomb_icon_b.png b/Bio_Industries_2/graphics/icons/Seed_bomb_icon_b.png new file mode 100644 index 0000000..602be90 Binary files /dev/null and b/Bio_Industries_2/graphics/icons/Seed_bomb_icon_b.png differ diff --git a/Bio_Industries_2/graphics/icons/Seed_bomb_icon_s.png b/Bio_Industries_2/graphics/icons/Seed_bomb_icon_s.png new file mode 100644 index 0000000..bb9adcb Binary files /dev/null and b/Bio_Industries_2/graphics/icons/Seed_bomb_icon_s.png differ diff --git a/Bio_Industries_2/graphics/icons/Seedling.png b/Bio_Industries_2/graphics/icons/Seedling.png index f317eea..3141480 100644 Binary files a/Bio_Industries_2/graphics/icons/Seedling.png and b/Bio_Industries_2/graphics/icons/Seedling.png differ diff --git a/Bio_Industries_2/graphics/icons/Seedling1.png b/Bio_Industries_2/graphics/icons/Seedling1.png index f317eea..279dde4 100644 Binary files a/Bio_Industries_2/graphics/icons/Seedling1.png and b/Bio_Industries_2/graphics/icons/Seedling1.png differ diff --git a/Bio_Industries_2/graphics/icons/Seedling2.png b/Bio_Industries_2/graphics/icons/Seedling2.png index 4a5c4d5..9f1ab4d 100644 Binary files a/Bio_Industries_2/graphics/icons/Seedling2.png and b/Bio_Industries_2/graphics/icons/Seedling2.png differ diff --git a/Bio_Industries_2/graphics/icons/Seedling3.png b/Bio_Industries_2/graphics/icons/Seedling3.png index d5b8d15..468bf1e 100644 Binary files a/Bio_Industries_2/graphics/icons/Seedling3.png and b/Bio_Industries_2/graphics/icons/Seedling3.png differ diff --git a/Bio_Industries_2/graphics/icons/Seedling4.png b/Bio_Industries_2/graphics/icons/Seedling4.png index c4bd0e1..9639877 100644 Binary files a/Bio_Industries_2/graphics/icons/Seedling4.png and b/Bio_Industries_2/graphics/icons/Seedling4.png differ diff --git a/Bio_Industries_2/graphics/icons/Seedling_a.png b/Bio_Industries_2/graphics/icons/Seedling_a.png index 77dd572..56becb2 100644 Binary files a/Bio_Industries_2/graphics/icons/Seedling_a.png and b/Bio_Industries_2/graphics/icons/Seedling_a.png differ diff --git a/Bio_Industries_2/graphics/icons/Seedling_b.png b/Bio_Industries_2/graphics/icons/Seedling_b.png index 136ca3b..72a93a4 100644 Binary files a/Bio_Industries_2/graphics/icons/Seedling_b.png and b/Bio_Industries_2/graphics/icons/Seedling_b.png differ diff --git a/Bio_Industries_2/graphics/icons/Woodpulp_raw-wood.png b/Bio_Industries_2/graphics/icons/Woodpulp_raw-wood.png index 157b5c8..e963697 100644 Binary files a/Bio_Industries_2/graphics/icons/Woodpulp_raw-wood.png and b/Bio_Industries_2/graphics/icons/Woodpulp_raw-wood.png differ diff --git a/Bio_Industries_2/graphics/icons/ash-recipes/py_Seedling2.png b/Bio_Industries_2/graphics/icons/ash-recipes/py_Seedling2.png new file mode 100644 index 0000000..efdbf13 Binary files /dev/null and b/Bio_Industries_2/graphics/icons/ash-recipes/py_Seedling2.png differ diff --git a/Bio_Industries_2/graphics/icons/ash-recipes/py_ash_raw-wood.png b/Bio_Industries_2/graphics/icons/ash-recipes/py_ash_raw-wood.png new file mode 100644 index 0000000..caad3ca Binary files /dev/null and b/Bio_Industries_2/graphics/icons/ash-recipes/py_ash_raw-wood.png differ diff --git a/Bio_Industries_2/graphics/icons/ash-recipes/py_ash_woodpulp.png b/Bio_Industries_2/graphics/icons/ash-recipes/py_ash_woodpulp.png new file mode 100644 index 0000000..2378cbe Binary files /dev/null and b/Bio_Industries_2/graphics/icons/ash-recipes/py_ash_woodpulp.png differ diff --git a/Bio_Industries_2/graphics/icons/ash-recipes/py_bi_stone_brick.png b/Bio_Industries_2/graphics/icons/ash-recipes/py_bi_stone_brick.png new file mode 100644 index 0000000..ce7ca94 Binary files /dev/null and b/Bio_Industries_2/graphics/icons/ash-recipes/py_bi_stone_brick.png differ diff --git a/Bio_Industries_2/graphics/icons/ash-recipes/py_bio_seed2.png b/Bio_Industries_2/graphics/icons/ash-recipes/py_bio_seed2.png new file mode 100644 index 0000000..62ab8f2 Binary files /dev/null and b/Bio_Industries_2/graphics/icons/ash-recipes/py_bio_seed2.png differ diff --git a/Bio_Industries_2/graphics/icons/ash-recipes/py_bio_sulfur.png b/Bio_Industries_2/graphics/icons/ash-recipes/py_bio_sulfur.png new file mode 100644 index 0000000..1b3c7ef Binary files /dev/null and b/Bio_Industries_2/graphics/icons/ash-recipes/py_bio_sulfur.png differ diff --git a/Bio_Industries_2/graphics/icons/ash-recipes/py_raw-wood-mk2.png b/Bio_Industries_2/graphics/icons/ash-recipes/py_raw-wood-mk2.png new file mode 100644 index 0000000..7475060 Binary files /dev/null and b/Bio_Industries_2/graphics/icons/ash-recipes/py_raw-wood-mk2.png differ diff --git a/Bio_Industries_2/graphics/icons/ash.png b/Bio_Industries_2/graphics/icons/ash.png index 35c6a54..37fe5b8 100644 Binary files a/Bio_Industries_2/graphics/icons/ash.png and b/Bio_Industries_2/graphics/icons/ash.png differ diff --git a/Bio_Industries_2/graphics/icons/ash_64.png b/Bio_Industries_2/graphics/icons/ash_64.png new file mode 100644 index 0000000..37fe5b8 Binary files /dev/null and b/Bio_Industries_2/graphics/icons/ash_64.png differ diff --git a/Bio_Industries_2/graphics/icons/ash_raw-wood.png b/Bio_Industries_2/graphics/icons/ash_raw-wood.png index 4e825dc..504e0de 100644 Binary files a/Bio_Industries_2/graphics/icons/ash_raw-wood.png and b/Bio_Industries_2/graphics/icons/ash_raw-wood.png differ diff --git a/Bio_Industries_2/graphics/icons/ash_woodpulp.png b/Bio_Industries_2/graphics/icons/ash_woodpulp.png index 7d9d21c..09e8f00 100644 Binary files a/Bio_Industries_2/graphics/icons/ash_woodpulp.png and b/Bio_Industries_2/graphics/icons/ash_woodpulp.png differ diff --git a/Bio_Industries_2/graphics/icons/basic_dart_icon.png b/Bio_Industries_2/graphics/icons/basic_dart_icon.png new file mode 100644 index 0000000..9299513 Binary files /dev/null and b/Bio_Industries_2/graphics/icons/basic_dart_icon.png differ diff --git a/Bio_Industries_2/graphics/icons/entity_old/bi_LargeAccumulator.png b/Bio_Industries_2/graphics/icons/bi_LargeAccumulator.png similarity index 100% rename from Bio_Industries_2/graphics/icons/entity_old/bi_LargeAccumulator.png rename to Bio_Industries_2/graphics/icons/bi_LargeAccumulator.png diff --git a/Bio_Industries_2/graphics/icons/entity_old/bi_LargeAccumulator_64.png b/Bio_Industries_2/graphics/icons/bi_LargeAccumulator_64.png similarity index 100% rename from Bio_Industries_2/graphics/icons/entity_old/bi_LargeAccumulator_64.png rename to Bio_Industries_2/graphics/icons/bi_LargeAccumulator_64.png diff --git a/Bio_Industries_2/graphics/icons/entity_old/bi_LargeSubstation_64.png b/Bio_Industries_2/graphics/icons/bi_LargeSubstation_64.png similarity index 100% rename from Bio_Industries_2/graphics/icons/entity_old/bi_LargeSubstation_64.png rename to Bio_Industries_2/graphics/icons/bi_LargeSubstation_64.png diff --git a/Bio_Industries_2/graphics/icons/entity_old/bi_LargeSubstation_icon.png b/Bio_Industries_2/graphics/icons/bi_LargeSubstation_icon.png similarity index 100% rename from Bio_Industries_2/graphics/icons/entity_old/bi_LargeSubstation_icon.png rename to Bio_Industries_2/graphics/icons/bi_LargeSubstation_icon.png diff --git a/Bio_Industries_2/graphics/icons/bi_basic_gas_processing.png b/Bio_Industries_2/graphics/icons/bi_basic_gas_processing.png index 58e557f..dd44fe7 100644 Binary files a/Bio_Industries_2/graphics/icons/bi_basic_gas_processing.png and b/Bio_Industries_2/graphics/icons/bi_basic_gas_processing.png differ diff --git a/Bio_Industries_2/graphics/icons/bi_basic_gas_processing_angels.png b/Bio_Industries_2/graphics/icons/bi_basic_gas_processing_angels.png new file mode 100644 index 0000000..049223b Binary files /dev/null and b/Bio_Industries_2/graphics/icons/bi_basic_gas_processing_angels.png differ diff --git a/Bio_Industries_2/graphics/icons/bi_change_0.png b/Bio_Industries_2/graphics/icons/bi_change_0.png deleted file mode 100644 index 40a5ac3..0000000 Binary files a/Bio_Industries_2/graphics/icons/bi_change_0.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/icons/bi_change_1.png b/Bio_Industries_2/graphics/icons/bi_change_1.png index 3beaa40..cf55d25 100644 Binary files a/Bio_Industries_2/graphics/icons/bi_change_1.png and b/Bio_Industries_2/graphics/icons/bi_change_1.png differ diff --git a/Bio_Industries_2/graphics/icons/bi_change_2.png b/Bio_Industries_2/graphics/icons/bi_change_2.png index 9e66213..b735410 100644 Binary files a/Bio_Industries_2/graphics/icons/bi_change_2.png and b/Bio_Industries_2/graphics/icons/bi_change_2.png differ diff --git a/Bio_Industries_2/graphics/icons/bi_change_plant_1.png b/Bio_Industries_2/graphics/icons/bi_change_plant_1.png index 9cf9f53..a669a21 100644 Binary files a/Bio_Industries_2/graphics/icons/bi_change_plant_1.png and b/Bio_Industries_2/graphics/icons/bi_change_plant_1.png differ diff --git a/Bio_Industries_2/graphics/icons/bi_change_plant_2.png b/Bio_Industries_2/graphics/icons/bi_change_plant_2.png index a569d6e..868ef39 100644 Binary files a/Bio_Industries_2/graphics/icons/bi_change_plant_2.png and b/Bio_Industries_2/graphics/icons/bi_change_plant_2.png differ diff --git a/Bio_Industries_2/graphics/icons/bi_dart_rifle_icon.png b/Bio_Industries_2/graphics/icons/bi_dart_rifle_icon.png new file mode 100644 index 0000000..678d265 Binary files /dev/null and b/Bio_Industries_2/graphics/icons/bi_dart_rifle_icon.png differ diff --git a/Bio_Industries_2/graphics/icons/bi_mineralized_sulfuric.png b/Bio_Industries_2/graphics/icons/bi_mineralized_sulfuric.png new file mode 100644 index 0000000..9db4ade Binary files /dev/null and b/Bio_Industries_2/graphics/icons/bi_mineralized_sulfuric.png differ diff --git a/Bio_Industries_2/graphics/icons/bi_resin.png b/Bio_Industries_2/graphics/icons/bi_resin.png index 9327022..e4bc205 100644 Binary files a/Bio_Industries_2/graphics/icons/bi_resin.png and b/Bio_Industries_2/graphics/icons/bi_resin.png differ diff --git a/Bio_Industries_2/graphics/icons/bi_resin_pulp.png b/Bio_Industries_2/graphics/icons/bi_resin_pulp.png index 81bdcad..16a1ba2 100644 Binary files a/Bio_Industries_2/graphics/icons/bi_resin_pulp.png and b/Bio_Industries_2/graphics/icons/bi_resin_pulp.png differ diff --git a/Bio_Industries_2/graphics/icons/bi_resin_wood.png b/Bio_Industries_2/graphics/icons/bi_resin_wood.png index 1694b5e..4d80708 100644 Binary files a/Bio_Industries_2/graphics/icons/bi_resin_wood.png and b/Bio_Industries_2/graphics/icons/bi_resin_wood.png differ diff --git a/Bio_Industries_2/graphics/icons/bi_slurry.png b/Bio_Industries_2/graphics/icons/bi_slurry.png new file mode 100644 index 0000000..bb19cd4 Binary files /dev/null and b/Bio_Industries_2/graphics/icons/bi_slurry.png differ diff --git a/Bio_Industries_2/graphics/icons/bi_solid_fuel_wood_brick.png b/Bio_Industries_2/graphics/icons/bi_solid_fuel_wood_brick.png index 754ce0d..c337706 100644 Binary files a/Bio_Industries_2/graphics/icons/bi_solid_fuel_wood_brick.png and b/Bio_Industries_2/graphics/icons/bi_solid_fuel_wood_brick.png differ diff --git a/Bio_Industries_2/graphics/icons/bi_stone_brick.png b/Bio_Industries_2/graphics/icons/bi_stone_brick.png index 97337af..949453a 100644 Binary files a/Bio_Industries_2/graphics/icons/bi_stone_brick.png and b/Bio_Industries_2/graphics/icons/bi_stone_brick.png differ diff --git a/Bio_Industries_2/graphics/icons/bi_wooden_board.png b/Bio_Industries_2/graphics/icons/bi_wooden_board.png new file mode 100644 index 0000000..cd66413 Binary files /dev/null and b/Bio_Industries_2/graphics/icons/bi_wooden_board.png differ diff --git a/Bio_Industries_2/graphics/icons/bi_wooden_board_shiny.png b/Bio_Industries_2/graphics/icons/bi_wooden_board_shiny.png new file mode 100644 index 0000000..dfd68be Binary files /dev/null and b/Bio_Industries_2/graphics/icons/bi_wooden_board_shiny.png differ diff --git a/Bio_Industries_2/graphics/icons/entity_old/big-wooden-pole.png b/Bio_Industries_2/graphics/icons/big-wooden-pole.png similarity index 100% rename from Bio_Industries_2/graphics/icons/entity_old/big-wooden-pole.png rename to Bio_Industries_2/graphics/icons/big-wooden-pole.png diff --git a/Bio_Industries_2/graphics/icons/entity_old/big-wooden-pole_64.png b/Bio_Industries_2/graphics/icons/big-wooden-pole_64.png similarity index 100% rename from Bio_Industries_2/graphics/icons/entity_old/big-wooden-pole_64.png rename to Bio_Industries_2/graphics/icons/big-wooden-pole_64.png diff --git a/Bio_Industries_2/graphics/icons/bio_acid.png b/Bio_Industries_2/graphics/icons/bio_acid.png index 057159c..250da27 100644 Binary files a/Bio_Industries_2/graphics/icons/bio_acid.png and b/Bio_Industries_2/graphics/icons/bio_acid.png differ diff --git a/Bio_Industries_2/graphics/icons/bio_battery.png b/Bio_Industries_2/graphics/icons/bio_battery.png index 613a112..c4a6f35 100644 Binary files a/Bio_Industries_2/graphics/icons/bio_battery.png and b/Bio_Industries_2/graphics/icons/bio_battery.png differ diff --git a/Bio_Industries_2/graphics/icons/entity_old/bio_boiler.png b/Bio_Industries_2/graphics/icons/bio_boiler.png similarity index 100% rename from Bio_Industries_2/graphics/icons/entity_old/bio_boiler.png rename to Bio_Industries_2/graphics/icons/bio_boiler.png diff --git a/Bio_Industries_2/graphics/icons/bio_conversion_1.png b/Bio_Industries_2/graphics/icons/bio_conversion_1.png index be4a50e..43d2681 100644 Binary files a/Bio_Industries_2/graphics/icons/bio_conversion_1.png and b/Bio_Industries_2/graphics/icons/bio_conversion_1.png differ diff --git a/Bio_Industries_2/graphics/icons/bio_conversion_2.png b/Bio_Industries_2/graphics/icons/bio_conversion_2.png index db45b9f..b4620b1 100644 Binary files a/Bio_Industries_2/graphics/icons/bio_conversion_2.png and b/Bio_Industries_2/graphics/icons/bio_conversion_2.png differ diff --git a/Bio_Industries_2/graphics/icons/bio_conversion_2_angels.png b/Bio_Industries_2/graphics/icons/bio_conversion_2_angels.png new file mode 100644 index 0000000..d8b1761 Binary files /dev/null and b/Bio_Industries_2/graphics/icons/bio_conversion_2_angels.png differ diff --git a/Bio_Industries_2/graphics/icons/bio_conversion_3.png b/Bio_Industries_2/graphics/icons/bio_conversion_3.png index 36e4fed..ba9fba2 100644 Binary files a/Bio_Industries_2/graphics/icons/bio_conversion_3.png and b/Bio_Industries_2/graphics/icons/bio_conversion_3.png differ diff --git a/Bio_Industries_2/graphics/icons/bio_conversion_4.png b/Bio_Industries_2/graphics/icons/bio_conversion_4.png index 4866466..6b42c6a 100644 Binary files a/Bio_Industries_2/graphics/icons/bio_conversion_4.png and b/Bio_Industries_2/graphics/icons/bio_conversion_4.png differ diff --git a/Bio_Industries_2/graphics/icons/entity_old/bio_garden_64.png b/Bio_Industries_2/graphics/icons/bio_garden_64.png similarity index 100% rename from Bio_Industries_2/graphics/icons/entity_old/bio_garden_64.png rename to Bio_Industries_2/graphics/icons/bio_garden_64.png diff --git a/Bio_Industries_2/graphics/icons/entity_old/bio_garden_icon.png b/Bio_Industries_2/graphics/icons/bio_garden_icon.png similarity index 100% rename from Bio_Industries_2/graphics/icons/entity_old/bio_garden_icon.png rename to Bio_Industries_2/graphics/icons/bio_garden_icon.png diff --git a/Bio_Industries_2/graphics/icons/entity_old/bio_greenhouse.png b/Bio_Industries_2/graphics/icons/bio_greenhouse.png similarity index 100% rename from Bio_Industries_2/graphics/icons/entity_old/bio_greenhouse.png rename to Bio_Industries_2/graphics/icons/bio_greenhouse.png diff --git a/Bio_Industries_2/graphics/icons/entity_old/bio_greenhouse_64.png b/Bio_Industries_2/graphics/icons/bio_greenhouse_64.png similarity index 100% rename from Bio_Industries_2/graphics/icons/entity_old/bio_greenhouse_64.png rename to Bio_Industries_2/graphics/icons/bio_greenhouse_64.png diff --git a/Bio_Industries_2/graphics/icons/bio_seed.png b/Bio_Industries_2/graphics/icons/bio_seed.png index bec410d..c8f74c8 100644 Binary files a/Bio_Industries_2/graphics/icons/bio_seed.png and b/Bio_Industries_2/graphics/icons/bio_seed.png differ diff --git a/Bio_Industries_2/graphics/icons/bio_seed1.png b/Bio_Industries_2/graphics/icons/bio_seed1.png index bec410d..7d0f7c6 100644 Binary files a/Bio_Industries_2/graphics/icons/bio_seed1.png and b/Bio_Industries_2/graphics/icons/bio_seed1.png differ diff --git a/Bio_Industries_2/graphics/icons/bio_seed2.png b/Bio_Industries_2/graphics/icons/bio_seed2.png index 42dfdc9..fd7ddbf 100644 Binary files a/Bio_Industries_2/graphics/icons/bio_seed2.png and b/Bio_Industries_2/graphics/icons/bio_seed2.png differ diff --git a/Bio_Industries_2/graphics/icons/bio_seed3.png b/Bio_Industries_2/graphics/icons/bio_seed3.png index 3875952..e594e6b 100644 Binary files a/Bio_Industries_2/graphics/icons/bio_seed3.png and b/Bio_Industries_2/graphics/icons/bio_seed3.png differ diff --git a/Bio_Industries_2/graphics/icons/bio_seed4.png b/Bio_Industries_2/graphics/icons/bio_seed4.png index 0091093..55cf5b8 100644 Binary files a/Bio_Industries_2/graphics/icons/bio_seed4.png and b/Bio_Industries_2/graphics/icons/bio_seed4.png differ diff --git a/Bio_Industries_2/graphics/icons/bio_sulfur.png b/Bio_Industries_2/graphics/icons/bio_sulfur.png index a79028a..b25b126 100644 Binary files a/Bio_Industries_2/graphics/icons/bio_sulfur.png and b/Bio_Industries_2/graphics/icons/bio_sulfur.png differ diff --git a/Bio_Industries_2/graphics/icons/entity_old/bio_turret_icon.png b/Bio_Industries_2/graphics/icons/bio_turret_icon.png similarity index 100% rename from Bio_Industries_2/graphics/icons/entity_old/bio_turret_icon.png rename to Bio_Industries_2/graphics/icons/bio_turret_icon.png diff --git a/Bio_Industries_2/graphics/icons/entity_old/bio_turret_icon_64.png b/Bio_Industries_2/graphics/icons/bio_turret_icon_64.png similarity index 100% rename from Bio_Industries_2/graphics/icons/entity_old/bio_turret_icon_64.png rename to Bio_Industries_2/graphics/icons/bio_turret_icon_64.png diff --git a/Bio_Industries_2/graphics/icons/entity_old/biocannon_icon.png b/Bio_Industries_2/graphics/icons/biocannon_icon.png similarity index 100% rename from Bio_Industries_2/graphics/icons/entity_old/biocannon_icon.png rename to Bio_Industries_2/graphics/icons/biocannon_icon.png diff --git a/Bio_Industries_2/graphics/icons/entity_old/biocannon_icon_64.png b/Bio_Industries_2/graphics/icons/biocannon_icon_64.png similarity index 100% rename from Bio_Industries_2/graphics/icons/entity_old/biocannon_icon_64.png rename to Bio_Industries_2/graphics/icons/biocannon_icon_64.png diff --git a/Bio_Industries_2/graphics/icons/biomass.png b/Bio_Industries_2/graphics/icons/biomass.png index 3ab2e57..f7dd399 100644 Binary files a/Bio_Industries_2/graphics/icons/biomass.png and b/Bio_Industries_2/graphics/icons/biomass.png differ diff --git a/Bio_Industries_2/graphics/icons/biomass_1.png b/Bio_Industries_2/graphics/icons/biomass_1.png index 3ab2e57..48e92dd 100644 Binary files a/Bio_Industries_2/graphics/icons/biomass_1.png and b/Bio_Industries_2/graphics/icons/biomass_1.png differ diff --git a/Bio_Industries_2/graphics/icons/biomass_2.png b/Bio_Industries_2/graphics/icons/biomass_2.png index 4918166..18cc8fd 100644 Binary files a/Bio_Industries_2/graphics/icons/biomass_2.png and b/Bio_Industries_2/graphics/icons/biomass_2.png differ diff --git a/Bio_Industries_2/graphics/icons/biomass_3.png b/Bio_Industries_2/graphics/icons/biomass_3.png index 1c6aaf4..be1e8dd 100644 Binary files a/Bio_Industries_2/graphics/icons/biomass_3.png and b/Bio_Industries_2/graphics/icons/biomass_3.png differ diff --git a/Bio_Industries_2/graphics/icons/entity_old/bioreactor.png b/Bio_Industries_2/graphics/icons/bioreactor.png similarity index 100% rename from Bio_Industries_2/graphics/icons/entity_old/bioreactor.png rename to Bio_Industries_2/graphics/icons/bioreactor.png diff --git a/Bio_Industries_2/graphics/icons/entity_old/bioreactor_64.png b/Bio_Industries_2/graphics/icons/bioreactor_64.png similarity index 100% rename from Bio_Industries_2/graphics/icons/entity_old/bioreactor_64.png rename to Bio_Industries_2/graphics/icons/bioreactor_64.png diff --git a/Bio_Industries_2/graphics/icons/cellulose.png b/Bio_Industries_2/graphics/icons/cellulose.png index 2f9d620..8a0ed13 100644 Binary files a/Bio_Industries_2/graphics/icons/cellulose.png and b/Bio_Industries_2/graphics/icons/cellulose.png differ diff --git a/Bio_Industries_2/graphics/icons/cellulose_2.png b/Bio_Industries_2/graphics/icons/cellulose_2.png index f0aeaba..b8f1270 100644 Binary files a/Bio_Industries_2/graphics/icons/cellulose_2.png and b/Bio_Industries_2/graphics/icons/cellulose_2.png differ diff --git a/Bio_Industries_2/graphics/icons/charcoal.png b/Bio_Industries_2/graphics/icons/charcoal.png index 1b24125..9f1fc85 100644 Binary files a/Bio_Industries_2/graphics/icons/charcoal.png and b/Bio_Industries_2/graphics/icons/charcoal.png differ diff --git a/Bio_Industries_2/graphics/icons/charcoal_pellets.png b/Bio_Industries_2/graphics/icons/charcoal_pellets.png new file mode 100644 index 0000000..4501d73 Binary files /dev/null and b/Bio_Industries_2/graphics/icons/charcoal_pellets.png differ diff --git a/Bio_Industries_2/graphics/icons/charcoal_raw-wood.png b/Bio_Industries_2/graphics/icons/charcoal_raw-wood.png index d9e920c..0dafa98 100644 Binary files a/Bio_Industries_2/graphics/icons/charcoal_raw-wood.png and b/Bio_Industries_2/graphics/icons/charcoal_raw-wood.png differ diff --git a/Bio_Industries_2/graphics/icons/charcoal_woodpulp.png b/Bio_Industries_2/graphics/icons/charcoal_woodpulp.png index a244156..20728cc 100644 Binary files a/Bio_Industries_2/graphics/icons/charcoal_woodpulp.png and b/Bio_Industries_2/graphics/icons/charcoal_woodpulp.png differ diff --git a/Bio_Industries_2/graphics/icons/clean-air_mk1.png b/Bio_Industries_2/graphics/icons/clean-air_mk1.png index a16de3c..39b3b1f 100644 Binary files a/Bio_Industries_2/graphics/icons/clean-air_mk1.png and b/Bio_Industries_2/graphics/icons/clean-air_mk1.png differ diff --git a/Bio_Industries_2/graphics/icons/clean-air_mk2.png b/Bio_Industries_2/graphics/icons/clean-air_mk2.png index e76efdb..178bcd8 100644 Binary files a/Bio_Industries_2/graphics/icons/clean-air_mk2.png and b/Bio_Industries_2/graphics/icons/clean-air_mk2.png differ diff --git a/Bio_Industries_2/graphics/icons/coal.png b/Bio_Industries_2/graphics/icons/coal.png deleted file mode 100644 index 0a1fe92..0000000 Binary files a/Bio_Industries_2/graphics/icons/coal.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/icons/coal_mk2.png b/Bio_Industries_2/graphics/icons/coal_mk2.png index 277ad79..f75d12e 100644 Binary files a/Bio_Industries_2/graphics/icons/coal_mk2.png and b/Bio_Industries_2/graphics/icons/coal_mk2.png differ diff --git a/Bio_Industries_2/graphics/icons/entity_old/cokery.png b/Bio_Industries_2/graphics/icons/cokery.png similarity index 100% rename from Bio_Industries_2/graphics/icons/entity_old/cokery.png rename to Bio_Industries_2/graphics/icons/cokery.png diff --git a/Bio_Industries_2/graphics/icons/entity_old/cokery_64.png b/Bio_Industries_2/graphics/icons/cokery_64.png similarity index 100% rename from Bio_Industries_2/graphics/icons/entity_old/cokery_64.png rename to Bio_Industries_2/graphics/icons/cokery_64.png diff --git a/Bio_Industries_2/graphics/icons/crushed-stone-concrete.png b/Bio_Industries_2/graphics/icons/crushed-stone-concrete.png index 6391644..a7e5139 100644 Binary files a/Bio_Industries_2/graphics/icons/crushed-stone-concrete.png and b/Bio_Industries_2/graphics/icons/crushed-stone-concrete.png differ diff --git a/Bio_Industries_2/graphics/icons/crushed-stone-hazard-concrete.png b/Bio_Industries_2/graphics/icons/crushed-stone-hazard-concrete.png index 7e3ab57..10bd670 100644 Binary files a/Bio_Industries_2/graphics/icons/crushed-stone-hazard-concrete.png and b/Bio_Industries_2/graphics/icons/crushed-stone-hazard-concrete.png differ diff --git a/Bio_Industries_2/graphics/icons/crushed-stone-refined-concrete.png b/Bio_Industries_2/graphics/icons/crushed-stone-refined-concrete.png index e145212..7d30e18 100644 Binary files a/Bio_Industries_2/graphics/icons/crushed-stone-refined-concrete.png and b/Bio_Industries_2/graphics/icons/crushed-stone-refined-concrete.png differ diff --git a/Bio_Industries_2/graphics/icons/crushed-stone-refined-hazard-concrete.png b/Bio_Industries_2/graphics/icons/crushed-stone-refined-hazard-concrete.png index 2ac8e24..1c0eb17 100644 Binary files a/Bio_Industries_2/graphics/icons/crushed-stone-refined-hazard-concrete.png and b/Bio_Industries_2/graphics/icons/crushed-stone-refined-hazard-concrete.png differ diff --git a/Bio_Industries_2/graphics/icons/crushed-stone-stone.png b/Bio_Industries_2/graphics/icons/crushed-stone-stone.png index 0924611..fe7fedd 100644 Binary files a/Bio_Industries_2/graphics/icons/crushed-stone-stone.png and b/Bio_Industries_2/graphics/icons/crushed-stone-stone.png differ diff --git a/Bio_Industries_2/graphics/icons/crushed-stone.png b/Bio_Industries_2/graphics/icons/crushed-stone.png index f318fd6..81f548c 100644 Binary files a/Bio_Industries_2/graphics/icons/crushed-stone.png and b/Bio_Industries_2/graphics/icons/crushed-stone.png differ diff --git a/Bio_Industries_2/graphics/icons/entity_old/curved-rail-concrete.png b/Bio_Industries_2/graphics/icons/curved-rail-concrete.png similarity index 100% rename from Bio_Industries_2/graphics/icons/entity_old/curved-rail-concrete.png rename to Bio_Industries_2/graphics/icons/curved-rail-concrete.png diff --git a/Bio_Industries_2/graphics/icons/entity_old/curved-rail-wood.png b/Bio_Industries_2/graphics/icons/curved-rail-wood.png similarity index 100% rename from Bio_Industries_2/graphics/icons/entity_old/curved-rail-wood.png rename to Bio_Industries_2/graphics/icons/curved-rail-wood.png diff --git a/Bio_Industries_2/graphics/icons/disassemble_burner-mining-drill.png b/Bio_Industries_2/graphics/icons/disassemble_burner-mining-drill.png deleted file mode 100644 index 11631ce..0000000 Binary files a/Bio_Industries_2/graphics/icons/disassemble_burner-mining-drill.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/icons/disassemble_burner_inserter.png b/Bio_Industries_2/graphics/icons/disassemble_burner_inserter.png deleted file mode 100644 index cc5eace..0000000 Binary files a/Bio_Industries_2/graphics/icons/disassemble_burner_inserter.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/icons/disassemble_burnering-drill.png b/Bio_Industries_2/graphics/icons/disassemble_burnering-drill.png deleted file mode 100644 index cb3d09c..0000000 Binary files a/Bio_Industries_2/graphics/icons/disassemble_burnering-drill.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/icons/disassemble_long_handed_inserter.png b/Bio_Industries_2/graphics/icons/disassemble_long_handed_inserter.png deleted file mode 100644 index 03f5cbc..0000000 Binary files a/Bio_Industries_2/graphics/icons/disassemble_long_handed_inserter.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/icons/disassemble_steel-furnace.png b/Bio_Industries_2/graphics/icons/disassemble_steel-furnace.png deleted file mode 100644 index efa60ed..0000000 Binary files a/Bio_Industries_2/graphics/icons/disassemble_steel-furnace.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/icons/disassemble_stone_furnace.png b/Bio_Industries_2/graphics/icons/disassemble_stone_furnace.png deleted file mode 100644 index 9023078..0000000 Binary files a/Bio_Industries_2/graphics/icons/disassemble_stone_furnace.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/icons/enhanced_dart_icon.png b/Bio_Industries_2/graphics/icons/enhanced_dart_icon.png new file mode 100644 index 0000000..e240098 Binary files /dev/null and b/Bio_Industries_2/graphics/icons/enhanced_dart_icon.png differ diff --git a/Bio_Industries_2/graphics/icons/entity/arboretum_Icon.png b/Bio_Industries_2/graphics/icons/entity/arboretum_Icon.png deleted file mode 100644 index 9699098..0000000 Binary files a/Bio_Industries_2/graphics/icons/entity/arboretum_Icon.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/icons/entity/arboretum_radar_icon.png b/Bio_Industries_2/graphics/icons/entity/arboretum_radar_icon.png deleted file mode 100644 index f302520..0000000 Binary files a/Bio_Industries_2/graphics/icons/entity/arboretum_radar_icon.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/icons/entity/bi_LargeAccumulator.png b/Bio_Industries_2/graphics/icons/entity/bi_LargeAccumulator.png deleted file mode 100644 index fba3b82..0000000 Binary files a/Bio_Industries_2/graphics/icons/entity/bi_LargeAccumulator.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/icons/entity/bi_LargeSubstation_icon.png b/Bio_Industries_2/graphics/icons/entity/bi_LargeSubstation_icon.png deleted file mode 100644 index 8fe9443..0000000 Binary files a/Bio_Industries_2/graphics/icons/entity/bi_LargeSubstation_icon.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/icons/entity/big-wooden-pole.png b/Bio_Industries_2/graphics/icons/entity/big-wooden-pole.png deleted file mode 100644 index 00b688c..0000000 Binary files a/Bio_Industries_2/graphics/icons/entity/big-wooden-pole.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/icons/entity/bio_Farm_Cabeling.png b/Bio_Industries_2/graphics/icons/entity/bio_Farm_Cabeling.png deleted file mode 100644 index 7600381..0000000 Binary files a/Bio_Industries_2/graphics/icons/entity/bio_Farm_Cabeling.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/icons/entity/bio_Farm_Icon.png b/Bio_Industries_2/graphics/icons/entity/bio_Farm_Icon.png deleted file mode 100644 index b69beaa..0000000 Binary files a/Bio_Industries_2/graphics/icons/entity/bio_Farm_Icon.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/icons/entity/bio_Farm_Lamp.png b/Bio_Industries_2/graphics/icons/entity/bio_Farm_Lamp.png deleted file mode 100644 index 3038263..0000000 Binary files a/Bio_Industries_2/graphics/icons/entity/bio_Farm_Lamp.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/icons/entity/bio_Farm_Solar.png b/Bio_Industries_2/graphics/icons/entity/bio_Farm_Solar.png deleted file mode 100644 index a4efab2..0000000 Binary files a/Bio_Industries_2/graphics/icons/entity/bio_Farm_Solar.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/icons/entity/bio_Solar_Boiler_Icon.png b/Bio_Industries_2/graphics/icons/entity/bio_Solar_Boiler_Icon.png deleted file mode 100644 index 3cbc6c1..0000000 Binary files a/Bio_Industries_2/graphics/icons/entity/bio_Solar_Boiler_Icon.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/icons/entity/bio_Solar_Farm_Icon.png b/Bio_Industries_2/graphics/icons/entity/bio_Solar_Farm_Icon.png deleted file mode 100644 index 90ae41b..0000000 Binary files a/Bio_Industries_2/graphics/icons/entity/bio_Solar_Farm_Icon.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/icons/entity/bio_boiler.png b/Bio_Industries_2/graphics/icons/entity/bio_boiler.png deleted file mode 100644 index 58f8cb9..0000000 Binary files a/Bio_Industries_2/graphics/icons/entity/bio_boiler.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/icons/entity/bio_garden_huge_icon.png b/Bio_Industries_2/graphics/icons/entity/bio_garden_huge_icon.png deleted file mode 100644 index 6d93318..0000000 Binary files a/Bio_Industries_2/graphics/icons/entity/bio_garden_huge_icon.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/icons/entity/bio_garden_icon.png b/Bio_Industries_2/graphics/icons/entity/bio_garden_icon.png deleted file mode 100644 index 6e31f73..0000000 Binary files a/Bio_Industries_2/graphics/icons/entity/bio_garden_icon.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/icons/entity/bio_garden_large_icon.png b/Bio_Industries_2/graphics/icons/entity/bio_garden_large_icon.png deleted file mode 100644 index 5571aa5..0000000 Binary files a/Bio_Industries_2/graphics/icons/entity/bio_garden_large_icon.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/icons/entity/bio_greenhouse.png b/Bio_Industries_2/graphics/icons/entity/bio_greenhouse.png deleted file mode 100644 index 746daf5..0000000 Binary files a/Bio_Industries_2/graphics/icons/entity/bio_greenhouse.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/icons/entity/bio_turret_icon.png b/Bio_Industries_2/graphics/icons/entity/bio_turret_icon.png deleted file mode 100644 index 6bead72..0000000 Binary files a/Bio_Industries_2/graphics/icons/entity/bio_turret_icon.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/icons/entity/biocannon_icon.png b/Bio_Industries_2/graphics/icons/entity/biocannon_icon.png deleted file mode 100644 index 82b5fa1..0000000 Binary files a/Bio_Industries_2/graphics/icons/entity/biocannon_icon.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/icons/entity/bioreactor.png b/Bio_Industries_2/graphics/icons/entity/bioreactor.png deleted file mode 100644 index dc9c337..0000000 Binary files a/Bio_Industries_2/graphics/icons/entity/bioreactor.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/icons/entity/cokery.png b/Bio_Industries_2/graphics/icons/entity/cokery.png deleted file mode 100644 index 790ce3e..0000000 Binary files a/Bio_Industries_2/graphics/icons/entity/cokery.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/icons/entity/curved-rail-concrete.png b/Bio_Industries_2/graphics/icons/entity/curved-rail-concrete.png deleted file mode 100644 index b7a9eb0..0000000 Binary files a/Bio_Industries_2/graphics/icons/entity/curved-rail-concrete.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/icons/entity/curved-rail-wood.png b/Bio_Industries_2/graphics/icons/entity/curved-rail-wood.png deleted file mode 100644 index c5215f1..0000000 Binary files a/Bio_Industries_2/graphics/icons/entity/curved-rail-wood.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/icons/entity/electric-to-rail.png b/Bio_Industries_2/graphics/icons/entity/electric-to-rail.png deleted file mode 100644 index bf8e321..0000000 Binary files a/Bio_Industries_2/graphics/icons/entity/electric-to-rail.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/icons/entity/giga_wooden_chest_icon.png b/Bio_Industries_2/graphics/icons/entity/giga_wooden_chest_icon.png deleted file mode 100644 index 6858867..0000000 Binary files a/Bio_Industries_2/graphics/icons/entity/giga_wooden_chest_icon.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/icons/entity/huge-wooden-pole.png b/Bio_Industries_2/graphics/icons/entity/huge-wooden-pole.png deleted file mode 100644 index 403b06a..0000000 Binary files a/Bio_Industries_2/graphics/icons/entity/huge-wooden-pole.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/icons/entity/huge_wooden_chest_icon.png b/Bio_Industries_2/graphics/icons/entity/huge_wooden_chest_icon.png deleted file mode 100644 index cd050c5..0000000 Binary files a/Bio_Industries_2/graphics/icons/entity/huge_wooden_chest_icon.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/icons/entity/large_wooden_chest_icon.png b/Bio_Industries_2/graphics/icons/entity/large_wooden_chest_icon.png deleted file mode 100644 index f4d9d0c..0000000 Binary files a/Bio_Industries_2/graphics/icons/entity/large_wooden_chest_icon.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/icons/entity/pipe-to-ground-wood.png b/Bio_Industries_2/graphics/icons/entity/pipe-to-ground-wood.png deleted file mode 100644 index c3f0f1e..0000000 Binary files a/Bio_Industries_2/graphics/icons/entity/pipe-to-ground-wood.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/icons/entity/rail-concrete-power.png b/Bio_Industries_2/graphics/icons/entity/rail-concrete-power.png deleted file mode 100644 index f879ad2..0000000 Binary files a/Bio_Industries_2/graphics/icons/entity/rail-concrete-power.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/icons/entity/rail-concrete.png b/Bio_Industries_2/graphics/icons/entity/rail-concrete.png deleted file mode 100644 index cfc703b..0000000 Binary files a/Bio_Industries_2/graphics/icons/entity/rail-concrete.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/icons/entity/rail-wood-bridge.png b/Bio_Industries_2/graphics/icons/entity/rail-wood-bridge.png deleted file mode 100644 index 1ee7a7d..0000000 Binary files a/Bio_Industries_2/graphics/icons/entity/rail-wood-bridge.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/icons/entity/rail-wood-to-concrete.png b/Bio_Industries_2/graphics/icons/entity/rail-wood-to-concrete.png deleted file mode 100644 index 66e854f..0000000 Binary files a/Bio_Industries_2/graphics/icons/entity/rail-wood-to-concrete.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/icons/entity/rail-wood.png b/Bio_Industries_2/graphics/icons/entity/rail-wood.png deleted file mode 100644 index 64e889f..0000000 Binary files a/Bio_Industries_2/graphics/icons/entity/rail-wood.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/icons/entity/solar-mat.png b/Bio_Industries_2/graphics/icons/entity/solar-mat.png deleted file mode 100644 index b323b06..0000000 Binary files a/Bio_Industries_2/graphics/icons/entity/solar-mat.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/icons/entity/stone_crusher.png b/Bio_Industries_2/graphics/icons/entity/stone_crusher.png deleted file mode 100644 index 5d79f7e..0000000 Binary files a/Bio_Industries_2/graphics/icons/entity/stone_crusher.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/icons/entity/straight-rail-concrete.png b/Bio_Industries_2/graphics/icons/entity/straight-rail-concrete.png deleted file mode 100644 index cfc703b..0000000 Binary files a/Bio_Industries_2/graphics/icons/entity/straight-rail-concrete.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/icons/entity/straight-rail-wood.png b/Bio_Industries_2/graphics/icons/entity/straight-rail-wood.png deleted file mode 100644 index 64e889f..0000000 Binary files a/Bio_Industries_2/graphics/icons/entity/straight-rail-wood.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/icons/entity/wood_pipe.png b/Bio_Industries_2/graphics/icons/entity/wood_pipe.png deleted file mode 100644 index 63c24c1..0000000 Binary files a/Bio_Industries_2/graphics/icons/entity/wood_pipe.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/icons/entity/wooden-fence.png b/Bio_Industries_2/graphics/icons/entity/wooden-fence.png deleted file mode 100644 index f5b6e56..0000000 Binary files a/Bio_Industries_2/graphics/icons/entity/wooden-fence.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/icons/fertilizer.png b/Bio_Industries_2/graphics/icons/fertilizer.png index c9f7096..063f9b1 100644 Binary files a/Bio_Industries_2/graphics/icons/fertilizer.png and b/Bio_Industries_2/graphics/icons/fertilizer.png differ diff --git a/Bio_Industries_2/graphics/icons/fertilizer_advanced.png b/Bio_Industries_2/graphics/icons/fertilizer_advanced.png deleted file mode 100644 index 19cba52..0000000 Binary files a/Bio_Industries_2/graphics/icons/fertilizer_advanced.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/icons/fertilizer_sodium_hydroxide.png b/Bio_Industries_2/graphics/icons/fertilizer_sodium_hydroxide.png new file mode 100644 index 0000000..08c978a Binary files /dev/null and b/Bio_Industries_2/graphics/icons/fertilizer_sodium_hydroxide.png differ diff --git a/Bio_Industries_2/graphics/icons/fertilizer_solid_sodium_hydroxide.png b/Bio_Industries_2/graphics/icons/fertilizer_solid_sodium_hydroxide.png new file mode 100644 index 0000000..c54ae5e Binary files /dev/null and b/Bio_Industries_2/graphics/icons/fertilizer_solid_sodium_hydroxide.png differ diff --git a/Bio_Industries_2/graphics/icons/fluid_advanced_fertilizer_recipe_64.png b/Bio_Industries_2/graphics/icons/fluid_advanced_fertilizer_recipe_64.png index a2c61c5..2237f21 100644 Binary files a/Bio_Industries_2/graphics/icons/fluid_advanced_fertilizer_recipe_64.png and b/Bio_Industries_2/graphics/icons/fluid_advanced_fertilizer_recipe_64.png differ diff --git a/Bio_Industries_2/graphics/icons/fluid_fertilizer_64.png b/Bio_Industries_2/graphics/icons/fluid_fertilizer_64.png index 146acc9..c7f6bbf 100644 Binary files a/Bio_Industries_2/graphics/icons/fluid_fertilizer_64.png and b/Bio_Industries_2/graphics/icons/fluid_fertilizer_64.png differ diff --git a/Bio_Industries_2/graphics/icons/entity_old/giga_wooden_chest_64.png b/Bio_Industries_2/graphics/icons/giga_wooden_chest_64.png similarity index 100% rename from Bio_Industries_2/graphics/icons/entity_old/giga_wooden_chest_64.png rename to Bio_Industries_2/graphics/icons/giga_wooden_chest_64.png diff --git a/Bio_Industries_2/graphics/icons/entity_old/giga_wooden_chest_icon.png b/Bio_Industries_2/graphics/icons/giga_wooden_chest_icon.png similarity index 100% rename from Bio_Industries_2/graphics/icons/entity_old/giga_wooden_chest_icon.png rename to Bio_Industries_2/graphics/icons/giga_wooden_chest_icon.png diff --git a/Bio_Industries_2/graphics/icons/entity_old/huge-wooden-pole.png b/Bio_Industries_2/graphics/icons/huge-wooden-pole.png similarity index 100% rename from Bio_Industries_2/graphics/icons/entity_old/huge-wooden-pole.png rename to Bio_Industries_2/graphics/icons/huge-wooden-pole.png diff --git a/Bio_Industries_2/graphics/icons/entity_old/huge-wooden-pole_64.png b/Bio_Industries_2/graphics/icons/huge-wooden-pole_64.png similarity index 100% rename from Bio_Industries_2/graphics/icons/entity_old/huge-wooden-pole_64.png rename to Bio_Industries_2/graphics/icons/huge-wooden-pole_64.png diff --git a/Bio_Industries_2/graphics/icons/entity_old/huge_wooden_chest_64.png b/Bio_Industries_2/graphics/icons/huge_wooden_chest_64.png similarity index 100% rename from Bio_Industries_2/graphics/icons/entity_old/huge_wooden_chest_64.png rename to Bio_Industries_2/graphics/icons/huge_wooden_chest_64.png diff --git a/Bio_Industries_2/graphics/icons/entity_old/huge_wooden_chest_icon.png b/Bio_Industries_2/graphics/icons/huge_wooden_chest_icon.png similarity index 100% rename from Bio_Industries_2/graphics/icons/entity_old/huge_wooden_chest_icon.png rename to Bio_Industries_2/graphics/icons/huge_wooden_chest_icon.png diff --git a/Bio_Industries_2/graphics/icons/entity_old/large_wooden_chest_64.png b/Bio_Industries_2/graphics/icons/large_wooden_chest_64.png similarity index 100% rename from Bio_Industries_2/graphics/icons/entity_old/large_wooden_chest_64.png rename to Bio_Industries_2/graphics/icons/large_wooden_chest_64.png diff --git a/Bio_Industries_2/graphics/icons/entity_old/large_wooden_chest_icon.png b/Bio_Industries_2/graphics/icons/large_wooden_chest_icon.png similarity index 100% rename from Bio_Industries_2/graphics/icons/entity_old/large_wooden_chest_icon.png rename to Bio_Industries_2/graphics/icons/large_wooden_chest_icon.png diff --git a/Bio_Industries_2/graphics/icons/liquid-air.png b/Bio_Industries_2/graphics/icons/liquid-air.png index cfa6962..f7eeedb 100644 Binary files a/Bio_Industries_2/graphics/icons/liquid-air.png and b/Bio_Industries_2/graphics/icons/liquid-air.png differ diff --git a/Bio_Industries_2/graphics/icons/mips/Ash_1.png b/Bio_Industries_2/graphics/icons/mips/Ash_1.png index 0900876..c895dfc 100644 Binary files a/Bio_Industries_2/graphics/icons/mips/Ash_1.png and b/Bio_Industries_2/graphics/icons/mips/Ash_1.png differ diff --git a/Bio_Industries_2/graphics/icons/mips/Ash_2.png b/Bio_Industries_2/graphics/icons/mips/Ash_2.png index 9ebc270..90d4fc5 100644 Binary files a/Bio_Industries_2/graphics/icons/mips/Ash_2.png and b/Bio_Industries_2/graphics/icons/mips/Ash_2.png differ diff --git a/Bio_Industries_2/graphics/icons/mips/Ash_3.png b/Bio_Industries_2/graphics/icons/mips/Ash_3.png index 3dd3a41..deb2c5b 100644 Binary files a/Bio_Industries_2/graphics/icons/mips/Ash_3.png and b/Bio_Industries_2/graphics/icons/mips/Ash_3.png differ diff --git a/Bio_Industries_2/graphics/icons/mips/Ash_4.png b/Bio_Industries_2/graphics/icons/mips/Ash_4.png index 87cc444..6789685 100644 Binary files a/Bio_Industries_2/graphics/icons/mips/Ash_4.png and b/Bio_Industries_2/graphics/icons/mips/Ash_4.png differ diff --git a/Bio_Industries_2/graphics/icons/mips/Charcoal_1.png b/Bio_Industries_2/graphics/icons/mips/Charcoal_1.png index 30b386f..0c816a4 100644 Binary files a/Bio_Industries_2/graphics/icons/mips/Charcoal_1.png and b/Bio_Industries_2/graphics/icons/mips/Charcoal_1.png differ diff --git a/Bio_Industries_2/graphics/icons/mips/Charcoal_2.png b/Bio_Industries_2/graphics/icons/mips/Charcoal_2.png index 0fb965b..be1e391 100644 Binary files a/Bio_Industries_2/graphics/icons/mips/Charcoal_2.png and b/Bio_Industries_2/graphics/icons/mips/Charcoal_2.png differ diff --git a/Bio_Industries_2/graphics/icons/mips/Charcoal_3.png b/Bio_Industries_2/graphics/icons/mips/Charcoal_3.png index 6c191a0..3ac772c 100644 Binary files a/Bio_Industries_2/graphics/icons/mips/Charcoal_3.png and b/Bio_Industries_2/graphics/icons/mips/Charcoal_3.png differ diff --git a/Bio_Industries_2/graphics/icons/mips/Charcoal_4.png b/Bio_Industries_2/graphics/icons/mips/Charcoal_4.png index d590140..67ef3e5 100644 Binary files a/Bio_Industries_2/graphics/icons/mips/Charcoal_4.png and b/Bio_Industries_2/graphics/icons/mips/Charcoal_4.png differ diff --git a/Bio_Industries_2/graphics/icons/mips/Crush_1.png b/Bio_Industries_2/graphics/icons/mips/Crush_1.png index bfc86bb..2018d64 100644 Binary files a/Bio_Industries_2/graphics/icons/mips/Crush_1.png and b/Bio_Industries_2/graphics/icons/mips/Crush_1.png differ diff --git a/Bio_Industries_2/graphics/icons/mips/Crush_2.png b/Bio_Industries_2/graphics/icons/mips/Crush_2.png index 45f7262..d381596 100644 Binary files a/Bio_Industries_2/graphics/icons/mips/Crush_2.png and b/Bio_Industries_2/graphics/icons/mips/Crush_2.png differ diff --git a/Bio_Industries_2/graphics/icons/mips/Crush_3.png b/Bio_Industries_2/graphics/icons/mips/Crush_3.png index e7ea9d9..4414cc7 100644 Binary files a/Bio_Industries_2/graphics/icons/mips/Crush_3.png and b/Bio_Industries_2/graphics/icons/mips/Crush_3.png differ diff --git a/Bio_Industries_2/graphics/icons/mips/Crush_4.png b/Bio_Industries_2/graphics/icons/mips/Crush_4.png index 4ac65fa..37c11b7 100644 Binary files a/Bio_Industries_2/graphics/icons/mips/Crush_4.png and b/Bio_Industries_2/graphics/icons/mips/Crush_4.png differ diff --git a/Bio_Industries_2/graphics/icons/mips/Seedling_1.png b/Bio_Industries_2/graphics/icons/mips/Seedling_1.png index 27ba1e3..38440fa 100644 Binary files a/Bio_Industries_2/graphics/icons/mips/Seedling_1.png and b/Bio_Industries_2/graphics/icons/mips/Seedling_1.png differ diff --git a/Bio_Industries_2/graphics/icons/mips/Seedling_2.png b/Bio_Industries_2/graphics/icons/mips/Seedling_2.png index d6011ba..4b5ff3b 100644 Binary files a/Bio_Industries_2/graphics/icons/mips/Seedling_2.png and b/Bio_Industries_2/graphics/icons/mips/Seedling_2.png differ diff --git a/Bio_Industries_2/graphics/icons/mips/Seedling_3.png b/Bio_Industries_2/graphics/icons/mips/Seedling_3.png index 311b4d9..4d76d61 100644 Binary files a/Bio_Industries_2/graphics/icons/mips/Seedling_3.png and b/Bio_Industries_2/graphics/icons/mips/Seedling_3.png differ diff --git a/Bio_Industries_2/graphics/icons/mips/Seedling_4.png b/Bio_Industries_2/graphics/icons/mips/Seedling_4.png index b62c5e8..600515c 100644 Binary files a/Bio_Industries_2/graphics/icons/mips/Seedling_4.png and b/Bio_Industries_2/graphics/icons/mips/Seedling_4.png differ diff --git a/Bio_Industries_2/graphics/icons/mips/Seedling_5.png b/Bio_Industries_2/graphics/icons/mips/Seedling_5.png index bac99ca..0cdf499 100644 Binary files a/Bio_Industries_2/graphics/icons/mips/Seedling_5.png and b/Bio_Industries_2/graphics/icons/mips/Seedling_5.png differ diff --git a/Bio_Industries_2/graphics/icons/mips/Seedling_6.png b/Bio_Industries_2/graphics/icons/mips/Seedling_6.png index 49334f7..ce039f6 100644 Binary files a/Bio_Industries_2/graphics/icons/mips/Seedling_6.png and b/Bio_Industries_2/graphics/icons/mips/Seedling_6.png differ diff --git a/Bio_Industries_2/graphics/icons/mips/Seedling_7.png b/Bio_Industries_2/graphics/icons/mips/Seedling_7.png index 6073673..56becb2 100644 Binary files a/Bio_Industries_2/graphics/icons/mips/Seedling_7.png and b/Bio_Industries_2/graphics/icons/mips/Seedling_7.png differ diff --git a/Bio_Industries_2/graphics/icons/mips/Seedling_8.png b/Bio_Industries_2/graphics/icons/mips/Seedling_8.png index 9b8bd43..72a93a4 100644 Binary files a/Bio_Industries_2/graphics/icons/mips/Seedling_8.png and b/Bio_Industries_2/graphics/icons/mips/Seedling_8.png differ diff --git a/Bio_Industries_2/graphics/icons/mips/Seedling_9.png b/Bio_Industries_2/graphics/icons/mips/Seedling_9.png index d7cbf08..3141480 100644 Binary files a/Bio_Industries_2/graphics/icons/mips/Seedling_9.png and b/Bio_Industries_2/graphics/icons/mips/Seedling_9.png differ diff --git a/Bio_Industries_2/graphics/icons/mips/Woodpulp_1.png b/Bio_Industries_2/graphics/icons/mips/Woodpulp_1.png index b394928..b4fa21d 100644 Binary files a/Bio_Industries_2/graphics/icons/mips/Woodpulp_1.png and b/Bio_Industries_2/graphics/icons/mips/Woodpulp_1.png differ diff --git a/Bio_Industries_2/graphics/icons/mips/Woodpulp_2.png b/Bio_Industries_2/graphics/icons/mips/Woodpulp_2.png index e13671f..a32890a 100644 Binary files a/Bio_Industries_2/graphics/icons/mips/Woodpulp_2.png and b/Bio_Industries_2/graphics/icons/mips/Woodpulp_2.png differ diff --git a/Bio_Industries_2/graphics/icons/mips/Woodpulp_3.png b/Bio_Industries_2/graphics/icons/mips/Woodpulp_3.png index 78ca0f5..435c6cf 100644 Binary files a/Bio_Industries_2/graphics/icons/mips/Woodpulp_3.png and b/Bio_Industries_2/graphics/icons/mips/Woodpulp_3.png differ diff --git a/Bio_Industries_2/graphics/icons/mips/Woodpulp_4.png b/Bio_Industries_2/graphics/icons/mips/Woodpulp_4.png index 3eb6b39..fae84df 100644 Binary files a/Bio_Industries_2/graphics/icons/mips/Woodpulp_4.png and b/Bio_Industries_2/graphics/icons/mips/Woodpulp_4.png differ diff --git a/Bio_Industries_2/graphics/icons/mips/bio_seed_1.png b/Bio_Industries_2/graphics/icons/mips/bio_seed_1.png index cc39989..9ed5eba 100644 Binary files a/Bio_Industries_2/graphics/icons/mips/bio_seed_1.png and b/Bio_Industries_2/graphics/icons/mips/bio_seed_1.png differ diff --git a/Bio_Industries_2/graphics/icons/mips/bio_seed_2.png b/Bio_Industries_2/graphics/icons/mips/bio_seed_2.png index 60aa46b..79e5688 100644 Binary files a/Bio_Industries_2/graphics/icons/mips/bio_seed_2.png and b/Bio_Industries_2/graphics/icons/mips/bio_seed_2.png differ diff --git a/Bio_Industries_2/graphics/icons/mips/bio_seed_3.png b/Bio_Industries_2/graphics/icons/mips/bio_seed_3.png index 3a80491..4be7e79 100644 Binary files a/Bio_Industries_2/graphics/icons/mips/bio_seed_3.png and b/Bio_Industries_2/graphics/icons/mips/bio_seed_3.png differ diff --git a/Bio_Industries_2/graphics/icons/mips/bio_seed_4.png b/Bio_Industries_2/graphics/icons/mips/bio_seed_4.png index 5be8bb7..c8f74c8 100644 Binary files a/Bio_Industries_2/graphics/icons/mips/bio_seed_4.png and b/Bio_Industries_2/graphics/icons/mips/bio_seed_4.png differ diff --git a/Bio_Industries_2/graphics/icons/mod_aai/sand-aai.png b/Bio_Industries_2/graphics/icons/mod_aai/sand-aai.png deleted file mode 100644 index 7ea9266..0000000 Binary files a/Bio_Industries_2/graphics/icons/mod_aai/sand-aai.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/icons/mod_bobangels/bi_basic_gas_processing_angels.png b/Bio_Industries_2/graphics/icons/mod_bobangels/bi_basic_gas_processing_angels.png deleted file mode 100644 index 7f8cd86..0000000 Binary files a/Bio_Industries_2/graphics/icons/mod_bobangels/bi_basic_gas_processing_angels.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/icons/mod_bobangels/bi_mineralized_sulfuric.png b/Bio_Industries_2/graphics/icons/mod_bobangels/bi_mineralized_sulfuric.png deleted file mode 100644 index 185861e..0000000 Binary files a/Bio_Industries_2/graphics/icons/mod_bobangels/bi_mineralized_sulfuric.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/icons/mod_bobangels/bi_slurry.png b/Bio_Industries_2/graphics/icons/mod_bobangels/bi_slurry.png deleted file mode 100644 index 472850c..0000000 Binary files a/Bio_Industries_2/graphics/icons/mod_bobangels/bi_slurry.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/icons/mod_bobangels/bi_wooden_board.png b/Bio_Industries_2/graphics/icons/mod_bobangels/bi_wooden_board.png deleted file mode 100644 index 00e6522..0000000 Binary files a/Bio_Industries_2/graphics/icons/mod_bobangels/bi_wooden_board.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/icons/mod_bobangels/bi_wooden_board_shiny.png b/Bio_Industries_2/graphics/icons/mod_bobangels/bi_wooden_board_shiny.png deleted file mode 100644 index ad498a3..0000000 Binary files a/Bio_Industries_2/graphics/icons/mod_bobangels/bi_wooden_board_shiny.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/icons/mod_bobangels/bio_conversion_2_angels.png b/Bio_Industries_2/graphics/icons/mod_bobangels/bio_conversion_2_angels.png deleted file mode 100644 index 8eab6b3..0000000 Binary files a/Bio_Industries_2/graphics/icons/mod_bobangels/bio_conversion_2_angels.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/icons/mod_bobangels/charcoal_pellets.png b/Bio_Industries_2/graphics/icons/mod_bobangels/charcoal_pellets.png deleted file mode 100644 index 26b7a31..0000000 Binary files a/Bio_Industries_2/graphics/icons/mod_bobangels/charcoal_pellets.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/icons/mod_bobangels/fertilizer_sodium_hydroxide.png b/Bio_Industries_2/graphics/icons/mod_bobangels/fertilizer_sodium_hydroxide.png deleted file mode 100644 index b974be0..0000000 Binary files a/Bio_Industries_2/graphics/icons/mod_bobangels/fertilizer_sodium_hydroxide.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/icons/mod_bobangels/fertilizer_solid_sodium_hydroxide.png b/Bio_Industries_2/graphics/icons/mod_bobangels/fertilizer_solid_sodium_hydroxide.png deleted file mode 100644 index 2db545d..0000000 Binary files a/Bio_Industries_2/graphics/icons/mod_bobangels/fertilizer_solid_sodium_hydroxide.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/icons/mod_bobangels/pellet_coke_1.png b/Bio_Industries_2/graphics/icons/mod_bobangels/pellet_coke_1.png deleted file mode 100644 index 6cd0d6c..0000000 Binary files a/Bio_Industries_2/graphics/icons/mod_bobangels/pellet_coke_1.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/icons/mod_bobangels/pellet_coke_a.png b/Bio_Industries_2/graphics/icons/mod_bobangels/pellet_coke_a.png deleted file mode 100644 index 05070f1..0000000 Binary files a/Bio_Industries_2/graphics/icons/mod_bobangels/pellet_coke_a.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/icons/mod_bobangels/pellet_coke_b.png b/Bio_Industries_2/graphics/icons/mod_bobangels/pellet_coke_b.png deleted file mode 100644 index ffb4218..0000000 Binary files a/Bio_Industries_2/graphics/icons/mod_bobangels/pellet_coke_b.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/icons/mod_bobangels/pellet_coke_c.png b/Bio_Industries_2/graphics/icons/mod_bobangels/pellet_coke_c.png deleted file mode 100644 index ab3945a..0000000 Binary files a/Bio_Industries_2/graphics/icons/mod_bobangels/pellet_coke_c.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/icons/mod_krastorio/sand-Krastorio.png b/Bio_Industries_2/graphics/icons/mod_krastorio/sand-Krastorio.png deleted file mode 100644 index 9fcfbc8..0000000 Binary files a/Bio_Industries_2/graphics/icons/mod_krastorio/sand-Krastorio.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/icons/mod_py/py_ash_raw-wood.png b/Bio_Industries_2/graphics/icons/mod_py/py_ash_raw-wood.png deleted file mode 100644 index 9be8829..0000000 Binary files a/Bio_Industries_2/graphics/icons/mod_py/py_ash_raw-wood.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/icons/mod_py/py_ash_woodpulp.png b/Bio_Industries_2/graphics/icons/mod_py/py_ash_woodpulp.png deleted file mode 100644 index e9eedd0..0000000 Binary files a/Bio_Industries_2/graphics/icons/mod_py/py_ash_woodpulp.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/icons/mod_py/py_bi_stone_brick.png b/Bio_Industries_2/graphics/icons/mod_py/py_bi_stone_brick.png deleted file mode 100644 index 99b84f8..0000000 Binary files a/Bio_Industries_2/graphics/icons/mod_py/py_bi_stone_brick.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/icons/mod_py/py_bio_seed2.png b/Bio_Industries_2/graphics/icons/mod_py/py_bio_seed2.png deleted file mode 100644 index 5f8a14a..0000000 Binary files a/Bio_Industries_2/graphics/icons/mod_py/py_bio_seed2.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/icons/mod_py/py_raw-wood-mk2.png b/Bio_Industries_2/graphics/icons/mod_py/py_raw-wood-mk2.png deleted file mode 100644 index 65e86e6..0000000 Binary files a/Bio_Industries_2/graphics/icons/mod_py/py_raw-wood-mk2.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/icons/mod_py/py_seedling2.png b/Bio_Industries_2/graphics/icons/mod_py/py_seedling2.png deleted file mode 100644 index 1a42e4b..0000000 Binary files a/Bio_Industries_2/graphics/icons/mod_py/py_seedling2.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/icons/nitrogen.png b/Bio_Industries_2/graphics/icons/nitrogen.png index a014828..41bbaef 100644 Binary files a/Bio_Industries_2/graphics/icons/nitrogen.png and b/Bio_Industries_2/graphics/icons/nitrogen.png differ diff --git a/Bio_Industries_2/graphics/icons/pellet_coke.png b/Bio_Industries_2/graphics/icons/pellet_coke.png deleted file mode 100644 index d0f43c2..0000000 Binary files a/Bio_Industries_2/graphics/icons/pellet_coke.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/icons/pellet_coke_1.png b/Bio_Industries_2/graphics/icons/pellet_coke_1.png new file mode 100644 index 0000000..a2ee820 Binary files /dev/null and b/Bio_Industries_2/graphics/icons/pellet_coke_1.png differ diff --git a/Bio_Industries_2/graphics/icons/pellet_coke_a.png b/Bio_Industries_2/graphics/icons/pellet_coke_a.png new file mode 100644 index 0000000..8190064 Binary files /dev/null and b/Bio_Industries_2/graphics/icons/pellet_coke_a.png differ diff --git a/Bio_Industries_2/graphics/icons/pellet_coke_b.png b/Bio_Industries_2/graphics/icons/pellet_coke_b.png new file mode 100644 index 0000000..dc76058 Binary files /dev/null and b/Bio_Industries_2/graphics/icons/pellet_coke_b.png differ diff --git a/Bio_Industries_2/graphics/icons/pellet_coke_c.png b/Bio_Industries_2/graphics/icons/pellet_coke_c.png new file mode 100644 index 0000000..4c51595 Binary files /dev/null and b/Bio_Industries_2/graphics/icons/pellet_coke_c.png differ diff --git a/Bio_Industries_2/graphics/icons/pellet_coke_coal.png b/Bio_Industries_2/graphics/icons/pellet_coke_coal.png index 5e05abf..ff51630 100644 Binary files a/Bio_Industries_2/graphics/icons/pellet_coke_coal.png and b/Bio_Industries_2/graphics/icons/pellet_coke_coal.png differ diff --git a/Bio_Industries_2/graphics/icons/pellet_coke_solid.png b/Bio_Industries_2/graphics/icons/pellet_coke_solid.png index b1ad11a..a5012f1 100644 Binary files a/Bio_Industries_2/graphics/icons/pellet_coke_solid.png and b/Bio_Industries_2/graphics/icons/pellet_coke_solid.png differ diff --git a/Bio_Industries_2/graphics/icons/entity_old/pipe-to-ground-wood.png b/Bio_Industries_2/graphics/icons/pipe-to-ground-wood.png similarity index 100% rename from Bio_Industries_2/graphics/icons/entity_old/pipe-to-ground-wood.png rename to Bio_Industries_2/graphics/icons/pipe-to-ground-wood.png diff --git a/Bio_Industries_2/graphics/icons/plastic_bar_1.png b/Bio_Industries_2/graphics/icons/plastic_bar_1.png index 0e41055..45ef7f4 100644 Binary files a/Bio_Industries_2/graphics/icons/plastic_bar_1.png and b/Bio_Industries_2/graphics/icons/plastic_bar_1.png differ diff --git a/Bio_Industries_2/graphics/icons/plastic_bar_2.png b/Bio_Industries_2/graphics/icons/plastic_bar_2.png index 219fbb6..a85368e 100644 Binary files a/Bio_Industries_2/graphics/icons/plastic_bar_2.png and b/Bio_Industries_2/graphics/icons/plastic_bar_2.png differ diff --git a/Bio_Industries_2/graphics/icons/poison_dart_icon.png b/Bio_Industries_2/graphics/icons/poison_dart_icon.png new file mode 100644 index 0000000..434f9b8 Binary files /dev/null and b/Bio_Industries_2/graphics/icons/poison_dart_icon.png differ diff --git a/Bio_Industries_2/graphics/icons/py_Seedling2.png b/Bio_Industries_2/graphics/icons/py_Seedling2.png new file mode 100644 index 0000000..69a442a Binary files /dev/null and b/Bio_Industries_2/graphics/icons/py_Seedling2.png differ diff --git a/Bio_Industries_2/graphics/icons/py_ash_raw-wood.png b/Bio_Industries_2/graphics/icons/py_ash_raw-wood.png new file mode 100644 index 0000000..de47b1d Binary files /dev/null and b/Bio_Industries_2/graphics/icons/py_ash_raw-wood.png differ diff --git a/Bio_Industries_2/graphics/icons/py_ash_woodpulp.png b/Bio_Industries_2/graphics/icons/py_ash_woodpulp.png new file mode 100644 index 0000000..ab218cf Binary files /dev/null and b/Bio_Industries_2/graphics/icons/py_ash_woodpulp.png differ diff --git a/Bio_Industries_2/graphics/icons/py_bi_stone_brick.png b/Bio_Industries_2/graphics/icons/py_bi_stone_brick.png new file mode 100644 index 0000000..19a33cf Binary files /dev/null and b/Bio_Industries_2/graphics/icons/py_bi_stone_brick.png differ diff --git a/Bio_Industries_2/graphics/icons/py_bio_seed2.png b/Bio_Industries_2/graphics/icons/py_bio_seed2.png new file mode 100644 index 0000000..f51e716 Binary files /dev/null and b/Bio_Industries_2/graphics/icons/py_bio_seed2.png differ diff --git a/Bio_Industries_2/graphics/icons/mod_py/py_bio_sulfur.png b/Bio_Industries_2/graphics/icons/py_bio_sulfur.png similarity index 100% rename from Bio_Industries_2/graphics/icons/mod_py/py_bio_sulfur.png rename to Bio_Industries_2/graphics/icons/py_bio_sulfur.png diff --git a/Bio_Industries_2/graphics/icons/py_raw-wood-mk2.png b/Bio_Industries_2/graphics/icons/py_raw-wood-mk2.png new file mode 100644 index 0000000..56cf51f Binary files /dev/null and b/Bio_Industries_2/graphics/icons/py_raw-wood-mk2.png differ diff --git a/Bio_Industries_2/graphics/icons/entity_old/rail-wood.png b/Bio_Industries_2/graphics/icons/rail-wood.png similarity index 100% rename from Bio_Industries_2/graphics/icons/entity_old/rail-wood.png rename to Bio_Industries_2/graphics/icons/rail-wood.png diff --git a/Bio_Industries_2/graphics/icons/raw-wood-mk1.png b/Bio_Industries_2/graphics/icons/raw-wood-mk1.png index 0dbe497..6f5138b 100644 Binary files a/Bio_Industries_2/graphics/icons/raw-wood-mk1.png and b/Bio_Industries_2/graphics/icons/raw-wood-mk1.png differ diff --git a/Bio_Industries_2/graphics/icons/raw-wood-mk2.png b/Bio_Industries_2/graphics/icons/raw-wood-mk2.png index cac2c54..5b58026 100644 Binary files a/Bio_Industries_2/graphics/icons/raw-wood-mk2.png and b/Bio_Industries_2/graphics/icons/raw-wood-mk2.png differ diff --git a/Bio_Industries_2/graphics/icons/raw-wood-mk3.png b/Bio_Industries_2/graphics/icons/raw-wood-mk3.png index 32b711e..7e81927 100644 Binary files a/Bio_Industries_2/graphics/icons/raw-wood-mk3.png and b/Bio_Industries_2/graphics/icons/raw-wood-mk3.png differ diff --git a/Bio_Industries_2/graphics/icons/raw-wood-mk4.png b/Bio_Industries_2/graphics/icons/raw-wood-mk4.png index 0b5e82a..dc67c79 100644 Binary files a/Bio_Industries_2/graphics/icons/raw-wood-mk4.png and b/Bio_Industries_2/graphics/icons/raw-wood-mk4.png differ diff --git a/Bio_Industries_2/graphics/icons/entity_old/solar-mat.png b/Bio_Industries_2/graphics/icons/solar-mat.png similarity index 100% rename from Bio_Industries_2/graphics/icons/entity_old/solar-mat.png rename to Bio_Industries_2/graphics/icons/solar-mat.png diff --git a/Bio_Industries_2/graphics/icons/standard_dart_icon.png b/Bio_Industries_2/graphics/icons/standard_dart_icon.png new file mode 100644 index 0000000..528123e Binary files /dev/null and b/Bio_Industries_2/graphics/icons/standard_dart_icon.png differ diff --git a/Bio_Industries_2/graphics/icons/entity_old/stone_crusher.png b/Bio_Industries_2/graphics/icons/stone_crusher.png similarity index 100% rename from Bio_Industries_2/graphics/icons/entity_old/stone_crusher.png rename to Bio_Industries_2/graphics/icons/stone_crusher.png diff --git a/Bio_Industries_2/graphics/icons/entity_old/stone_crusher_64.png b/Bio_Industries_2/graphics/icons/stone_crusher_64.png similarity index 100% rename from Bio_Industries_2/graphics/icons/entity_old/stone_crusher_64.png rename to Bio_Industries_2/graphics/icons/stone_crusher_64.png diff --git a/Bio_Industries_2/graphics/icons/entity_old/straight-rail-concrete.png b/Bio_Industries_2/graphics/icons/straight-rail-concrete.png similarity index 100% rename from Bio_Industries_2/graphics/icons/entity_old/straight-rail-concrete.png rename to Bio_Industries_2/graphics/icons/straight-rail-concrete.png diff --git a/Bio_Industries_2/graphics/icons/entity_old/straight-rail-wood.png b/Bio_Industries_2/graphics/icons/straight-rail-wood.png similarity index 100% rename from Bio_Industries_2/graphics/icons/entity_old/straight-rail-wood.png rename to Bio_Industries_2/graphics/icons/straight-rail-wood.png diff --git a/Bio_Industries_2/graphics/icons/weapons/basic_dart_icon.png b/Bio_Industries_2/graphics/icons/weapon/basic_dart_icon.png similarity index 100% rename from Bio_Industries_2/graphics/icons/weapons/basic_dart_icon.png rename to Bio_Industries_2/graphics/icons/weapon/basic_dart_icon.png diff --git a/Bio_Industries_2/graphics/icons/weapons/bi_dart_rifle_icon.png b/Bio_Industries_2/graphics/icons/weapon/bi_dart_rifle_icon.png similarity index 100% rename from Bio_Industries_2/graphics/icons/weapons/bi_dart_rifle_icon.png rename to Bio_Industries_2/graphics/icons/weapon/bi_dart_rifle_icon.png diff --git a/Bio_Industries_2/graphics/icons/weapons/bio_cannon_ammo-shadow.png b/Bio_Industries_2/graphics/icons/weapon/bio_cannon_ammo-shadow.png similarity index 100% rename from Bio_Industries_2/graphics/icons/weapons/bio_cannon_ammo-shadow.png rename to Bio_Industries_2/graphics/icons/weapon/bio_cannon_ammo-shadow.png diff --git a/Bio_Industries_2/graphics/icons/weapons/bio_cannon_basic_ammo_icon.png b/Bio_Industries_2/graphics/icons/weapon/bio_cannon_basic_ammo_icon.png similarity index 100% rename from Bio_Industries_2/graphics/icons/weapons/bio_cannon_basic_ammo_icon.png rename to Bio_Industries_2/graphics/icons/weapon/bio_cannon_basic_ammo_icon.png diff --git a/Bio_Industries_2/graphics/icons/weapons/bio_cannon_poison_ammo_icon.png b/Bio_Industries_2/graphics/icons/weapon/bio_cannon_poison_ammo_icon.png similarity index 100% rename from Bio_Industries_2/graphics/icons/weapons/bio_cannon_poison_ammo_icon.png rename to Bio_Industries_2/graphics/icons/weapon/bio_cannon_poison_ammo_icon.png diff --git a/Bio_Industries_2/graphics/icons/weapons/bio_cannon_proto_ammo_icon.png b/Bio_Industries_2/graphics/icons/weapon/bio_cannon_proto_ammo_icon.png similarity index 100% rename from Bio_Industries_2/graphics/icons/weapons/bio_cannon_proto_ammo_icon.png rename to Bio_Industries_2/graphics/icons/weapon/bio_cannon_proto_ammo_icon.png diff --git a/Bio_Industries_2/graphics/icons/weapons/enhanced_dart_icon.png b/Bio_Industries_2/graphics/icons/weapon/enhanced_dart_icon.png similarity index 100% rename from Bio_Industries_2/graphics/icons/weapons/enhanced_dart_icon.png rename to Bio_Industries_2/graphics/icons/weapon/enhanced_dart_icon.png diff --git a/Bio_Industries_2/graphics/icons/weapons/poison_dart_icon.png b/Bio_Industries_2/graphics/icons/weapon/poison_dart_icon.png similarity index 100% rename from Bio_Industries_2/graphics/icons/weapons/poison_dart_icon.png rename to Bio_Industries_2/graphics/icons/weapon/poison_dart_icon.png diff --git a/Bio_Industries_2/graphics/icons/weapons/seed_bomb_icon_a.png b/Bio_Industries_2/graphics/icons/weapon/seed_bomb_icon_a.png similarity index 100% rename from Bio_Industries_2/graphics/icons/weapons/seed_bomb_icon_a.png rename to Bio_Industries_2/graphics/icons/weapon/seed_bomb_icon_a.png diff --git a/Bio_Industries_2/graphics/icons/weapons/seed_bomb_icon_b.png b/Bio_Industries_2/graphics/icons/weapon/seed_bomb_icon_b.png similarity index 100% rename from Bio_Industries_2/graphics/icons/weapons/seed_bomb_icon_b.png rename to Bio_Industries_2/graphics/icons/weapon/seed_bomb_icon_b.png diff --git a/Bio_Industries_2/graphics/icons/weapons/seed_bomb_icon_s.png b/Bio_Industries_2/graphics/icons/weapon/seed_bomb_icon_s.png similarity index 100% rename from Bio_Industries_2/graphics/icons/weapons/seed_bomb_icon_s.png rename to Bio_Industries_2/graphics/icons/weapon/seed_bomb_icon_s.png diff --git a/Bio_Industries_2/graphics/icons/weapons/standard_dart_icon.png b/Bio_Industries_2/graphics/icons/weapon/standard_dart_icon.png similarity index 100% rename from Bio_Industries_2/graphics/icons/weapons/standard_dart_icon.png rename to Bio_Industries_2/graphics/icons/weapon/standard_dart_icon.png diff --git a/Bio_Industries_2/graphics/icons/weapons/bio_turret_icon.png b/Bio_Industries_2/graphics/icons/weapons/bio_turret_icon.png deleted file mode 100644 index 8c06802..0000000 Binary files a/Bio_Industries_2/graphics/icons/weapons/bio_turret_icon.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/icons/weapons/bio_turret_icon_64.png b/Bio_Industries_2/graphics/icons/weapons/bio_turret_icon_64.png deleted file mode 100644 index 703054e..0000000 Binary files a/Bio_Industries_2/graphics/icons/weapons/bio_turret_icon_64.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/icons/weapons/biocannon_icon.png b/Bio_Industries_2/graphics/icons/weapons/biocannon_icon.png deleted file mode 100644 index aeb0a4b..0000000 Binary files a/Bio_Industries_2/graphics/icons/weapons/biocannon_icon.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/icons/weapons/biocannon_icon_64.png b/Bio_Industries_2/graphics/icons/weapons/biocannon_icon_64.png deleted file mode 100644 index 749492b..0000000 Binary files a/Bio_Industries_2/graphics/icons/weapons/biocannon_icon_64.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/icons/wood_from_pulp.png b/Bio_Industries_2/graphics/icons/wood_from_pulp.png index 7d918a5..ad505b3 100644 Binary files a/Bio_Industries_2/graphics/icons/wood_from_pulp.png and b/Bio_Industries_2/graphics/icons/wood_from_pulp.png differ diff --git a/Bio_Industries_2/graphics/icons/entity_old/wood_pipe.png b/Bio_Industries_2/graphics/icons/wood_pipe.png similarity index 100% rename from Bio_Industries_2/graphics/icons/entity_old/wood_pipe.png rename to Bio_Industries_2/graphics/icons/wood_pipe.png diff --git a/Bio_Industries_2/graphics/icons/entity_old/wood_pipe_alt.png b/Bio_Industries_2/graphics/icons/wood_pipe_alt.png similarity index 100% rename from Bio_Industries_2/graphics/icons/entity_old/wood_pipe_alt.png rename to Bio_Industries_2/graphics/icons/wood_pipe_alt.png diff --git a/Bio_Industries_2/graphics/icons/entity_old/wooden-fence.png b/Bio_Industries_2/graphics/icons/wooden-fence.png similarity index 100% rename from Bio_Industries_2/graphics/icons/entity_old/wooden-fence.png rename to Bio_Industries_2/graphics/icons/wooden-fence.png diff --git a/Bio_Industries_2/graphics/icons/woodpulp_64.png b/Bio_Industries_2/graphics/icons/woodpulp_64.png index 157b5c8..262bbc3 100644 Binary files a/Bio_Industries_2/graphics/icons/woodpulp_64.png and b/Bio_Industries_2/graphics/icons/woodpulp_64.png differ diff --git a/Bio_Industries_2/graphics/icons/entity_old/woodrail_64.png b/Bio_Industries_2/graphics/icons/woodrail_64.png similarity index 100% rename from Bio_Industries_2/graphics/icons/entity_old/woodrail_64.png rename to Bio_Industries_2/graphics/icons/woodrail_64.png diff --git a/Bio_Industries_2/graphics/technology/Basic_Petroleum_Gas_Processing.png b/Bio_Industries_2/graphics/technology/Basic_Petroleum_Gas_Processing.png new file mode 100644 index 0000000..dd44fe7 Binary files /dev/null and b/Bio_Industries_2/graphics/technology/Basic_Petroleum_Gas_Processing.png differ diff --git a/Bio_Industries_2/graphics/technology/BioIndustries_itemgroup.png b/Bio_Industries_2/graphics/technology/BioIndustries_itemgroup.png deleted file mode 100644 index a08a69f..0000000 Binary files a/Bio_Industries_2/graphics/technology/BioIndustries_itemgroup.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/technology/Bio_Farm_Tech_128.png b/Bio_Industries_2/graphics/technology/Bio_Farm_Tech_128.png new file mode 100644 index 0000000..1b3ca69 Binary files /dev/null and b/Bio_Industries_2/graphics/technology/Bio_Farm_Tech_128.png differ diff --git a/Bio_Industries_2/graphics/technology/Biomass_128.png b/Bio_Industries_2/graphics/technology/Biomass_128.png new file mode 100644 index 0000000..e78f038 Binary files /dev/null and b/Bio_Industries_2/graphics/technology/Biomass_128.png differ diff --git a/Bio_Industries_2/graphics/technology/Cellulose_128.png b/Bio_Industries_2/graphics/technology/Cellulose_128.png new file mode 100644 index 0000000..3ca6961 Binary files /dev/null and b/Bio_Industries_2/graphics/technology/Cellulose_128.png differ diff --git a/Bio_Industries_2/graphics/technology/Coal_128.png b/Bio_Industries_2/graphics/technology/Coal_128.png new file mode 100644 index 0000000..6f1fc13 Binary files /dev/null and b/Bio_Industries_2/graphics/technology/Coal_128.png differ diff --git a/Bio_Industries_2/graphics/technology/Fertilizer_128.png b/Bio_Industries_2/graphics/technology/Fertilizer_128.png new file mode 100644 index 0000000..4ee6965 Binary files /dev/null and b/Bio_Industries_2/graphics/technology/Fertilizer_128.png differ diff --git a/Bio_Industries_2/graphics/technology/bi-tech-bio-farming.png b/Bio_Industries_2/graphics/technology/bi-tech-bio-farming.png deleted file mode 100644 index 77e527b..0000000 Binary files a/Bio_Industries_2/graphics/technology/bi-tech-bio-farming.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/technology/bi-tech-biomass.png b/Bio_Industries_2/graphics/technology/bi-tech-biomass.png deleted file mode 100644 index e63932e..0000000 Binary files a/Bio_Industries_2/graphics/technology/bi-tech-biomass.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/technology/bi-tech-cellulose.png b/Bio_Industries_2/graphics/technology/bi-tech-cellulose.png deleted file mode 100644 index 3be4b36..0000000 Binary files a/Bio_Industries_2/graphics/technology/bi-tech-cellulose.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/technology/bi-tech-coal-processing-1.png b/Bio_Industries_2/graphics/technology/bi-tech-coal-processing-1.png deleted file mode 100644 index 984a84c..0000000 Binary files a/Bio_Industries_2/graphics/technology/bi-tech-coal-processing-1.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/technology/bi-tech-coal-processing-2.png b/Bio_Industries_2/graphics/technology/bi-tech-coal-processing-2.png deleted file mode 100644 index 984a84c..0000000 Binary files a/Bio_Industries_2/graphics/technology/bi-tech-coal-processing-2.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/technology/bi-tech-coal-processing-3.png b/Bio_Industries_2/graphics/technology/bi-tech-coal-processing-3.png deleted file mode 100644 index 984a84c..0000000 Binary files a/Bio_Industries_2/graphics/technology/bi-tech-coal-processing-3.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/technology/bi-tech-fertilizer.png b/Bio_Industries_2/graphics/technology/bi-tech-fertilizer.png deleted file mode 100644 index 832c9ae..0000000 Binary files a/Bio_Industries_2/graphics/technology/bi-tech-fertilizer.png and /dev/null differ diff --git a/Bio_Industries_2/info.json b/Bio_Industries_2/info.json index 4cc12ae..90d10f5 100644 --- a/Bio_Industries_2/info.json +++ b/Bio_Industries_2/info.json @@ -1,11 +1,10 @@ { "name": "Bio_Industries_2", - "version": "2.0.6", + "version": "2.0.2", "factorio_version": "2.0", "title": "Bio Industries", - "author": "TheSAguy - Had a few Ideas, Pi-C (Programming Genius), Snouz (Graphics Wizard), Cackling Fiend - Conversion to F2.0", - "contact": "vvwmisc@hotmail.com", - "homepage": "https://forums.factorio.com/viewtopic.php?f=93&t=17548", + "author": "cackling fiend", + "homepage": "https://discord.gg/5bevXf5W", "description": "Provides useful buildings and items, like the Bio Farm for growing trees. Solar Farm and Large Accumulator to make your electric setup easier. Bio Fuel section to produce organic plastic and batteries. Lots of New Wood Products, like the big electric pole, wooden pipes, dart turret. Plant trees using seedlings. Change terrain from deserts to grasslands using Fertilizer - helps trees grow better. And a lot more… Please visit the homepage on the forums for more information and feedback.", "dependencies": [ "base >= 2.0.55", diff --git a/Bio_Industries_2/locale/en/entity-description.cfg b/Bio_Industries_2/locale/en/entity-description.cfg index b364d8e..2a47245 100644 --- a/Bio_Industries_2/locale/en/entity-description.cfg +++ b/Bio_Industries_2/locale/en/entity-description.cfg @@ -3,8 +3,6 @@ bi-arboretum=__ENTITY__bi-arboretum__s change the surrounding terrain with fertilizer or plant trees. bi-bio-farm=__ENTITY__bi-bio-farm__s are where __ENTITY__seedling__s grow into trees that are processed to __ITEM__wood__ and __ITEM__bi-woodpulp__. An integrated solar panel provides some of the energy during the day. bi-bio-garden=The __ENTITY__bi-bio-garden__ scrubs pollution from the air. (One bio garden can absorb 45 pollution units per second — as much as 1500 trees!) -bi-bio-garden-large=The __ENTITY__bi-bio-garden__ scrubs pollution from the air. (One bio garden can absorb 300 pollution units per second — as much as 12,000 trees!) -bi-bio-garden-huge=The __ENTITY__bi-bio-garden__ scrubs pollution from the air. (One bio garden can absorb 2880 pollution units per second — as much as 96,000 trees!) bi-bio-greenhouse=Just the right place to grow __ITEM__bi-seed__s and __ENTITY__seedling__s! seedling=A young tree, perfect for planting. You can also plant this in the ground and it will grow into a tree. Remember to first fertilize the ground to improve the chances of it growing! diff --git a/Bio_Industries_2/locale/en/entity-name.cfg b/Bio_Industries_2/locale/en/entity-name.cfg index 76783cc..9b74139 100644 --- a/Bio_Industries_2/locale/en/entity-name.cfg +++ b/Bio_Industries_2/locale/en/entity-name.cfg @@ -5,8 +5,8 @@ bi-arboretum-hidden-radar=__ENTITY__bi-arboretum__ (__ENTITY__radar__) bi-bio-farm=Bio farm bi-bio-garden=Bio garden -bi-bio-garden-large=Large Bio garden -bi-bio-garden-huge=Huge Bio garden +bi-bio-garden-large=Large bio garden +bi-bio-garden-huge=Huge bio garden bi-bio-greenhouse=Bio nursery seedling=Sapling diff --git a/Bio_Industries_2/locale/en/item-description.cfg b/Bio_Industries_2/locale/en/item-description.cfg index 00bb490..d39b750 100644 --- a/Bio_Industries_2/locale/en/item-description.cfg +++ b/Bio_Industries_2/locale/en/item-description.cfg @@ -53,7 +53,4 @@ wood=Base your energy production on this renewable resource!\nPlease note: There ## Compatibility with other mods #~ sand=__ITEM__sand__ -sand= Sand - -## Rail stuff -bi-rail-wood=Wooden rails \ No newline at end of file +sand = diff --git a/Bio_Industries_2/locale/en/item-name.cfg b/Bio_Industries_2/locale/en/item-name.cfg index ac49890..856149c 100644 --- a/Bio_Industries_2/locale/en/item-name.cfg +++ b/Bio_Industries_2/locale/en/item-name.cfg @@ -52,7 +52,3 @@ wood-charcoal=Charcoal ## Compatibility with other mods sand=Sand slag=Slag - - -## Rail stuff -bi-rail-wood=Wooden rails diff --git a/Bio_Industries_2/prototypes/Bio_Cannon/entity.lua b/Bio_Industries_2/prototypes/Bio_Cannon/entity.lua index 26eff74..d9de196 100644 --- a/Bio_Industries_2/prototypes/Bio_Cannon/entity.lua +++ b/Bio_Industries_2/prototypes/Bio_Cannon/entity.lua @@ -1,6 +1,6 @@ local BioInd = require('common')('Bio_Industries_2') + local ICONPATH = BioInd.modRoot .. "/graphics/icons/" -local ICONPATH_W = BioInd.modRoot .. "/graphics/icons/weapons/" local ENTITYPATH = BioInd.modRoot .. "/graphics/entities/bio_cannon/" local REMNANTSPATH = BioInd.modRoot .. "/graphics/entities/remnants/" @@ -120,9 +120,9 @@ if BI.Settings.Bio_Cannon then { type = "ammo-turret", name = "bi-bio-cannon", - icon = ICONPATH_W .. "biocannon_icon.png", + icon = ICONPATH .. "biocannon_icon.png", icon_size = 64, - icons = {{icon = ICONPATH_W .. "biocannon_icon.png", icon_size = 64}}, + icons = {{icon = ICONPATH .. "biocannon_icon.png", icon_size = 64}}, flags = {"placeable-neutral", "placeable-player", "player-creation"}, -- makes cannon blueprintable placeable_by = {item = "bi-bio-cannon", count = 1}, @@ -177,7 +177,7 @@ if BI.Settings.Bio_Cannon then type = "corpse", name = "bi-bio-cannon-remnants", icon_size = 64, - icons = {{icon = ICONPATH_W .. "biocannon_icon.png", icon_size = 64}}, + icons = {{icon = ICONPATH .. "biocannon_icon.png", icon_size = 64}}, flags = {"placeable-neutral", "not-on-map"}, subgroup = "defensive-structure-remnants", diff --git a/Bio_Industries_2/prototypes/Bio_Cannon/item.lua b/Bio_Industries_2/prototypes/Bio_Cannon/item.lua index 8efafe6..1b65668 100644 --- a/Bio_Industries_2/prototypes/Bio_Cannon/item.lua +++ b/Bio_Industries_2/prototypes/Bio_Cannon/item.lua @@ -1,7 +1,6 @@ local BioInd = require('common')('Bio_Industries_2') local ICONPATH = BioInd.modRoot .. "/graphics/icons/" -local ICONPATH_W = BioInd.modRoot .. "/graphics/icons/weapons/" if BI.Settings.Bio_Cannon then data:extend({ @@ -11,12 +10,12 @@ if BI.Settings.Bio_Cannon then name = "bi-bio-cannon", localised_name = {"entity-name.bi-bio-cannon"}, localised_description = {"entity-description.bi-bio-cannon"}, - icon = ICONPATH_W .. "biocannon_icon.png", + icon = ICONPATH .. "biocannon_icon.png", icon_size = 64, icon_mipmaps = 1, icons = { { - icon = ICONPATH_W .. "biocannon_icon.png", + icon = ICONPATH .. "biocannon_icon.png", icon_size = 64, } }, @@ -24,7 +23,6 @@ if BI.Settings.Bio_Cannon then order = "x[turret]-x[gun-turret]", place_result = "bi-bio-cannon", stack_size = 1, - weight = 750*kg, }, }) end diff --git a/Bio_Industries_2/prototypes/Bio_Cannon/projectiles-item.lua b/Bio_Industries_2/prototypes/Bio_Cannon/projectiles-item.lua index cdfd9c8..011b395 100644 --- a/Bio_Industries_2/prototypes/Bio_Cannon/projectiles-item.lua +++ b/Bio_Industries_2/prototypes/Bio_Cannon/projectiles-item.lua @@ -1,6 +1,6 @@ local BioInd = require('common')('Bio_Industries_2') -local ICONPATH_W = BioInd.modRoot .. "/graphics/icons/weapons/" +local ICONPATH = BioInd.modRoot .. "/graphics/icons/weapon/" if BI.Settings.Bio_Cannon then @@ -10,15 +10,15 @@ if BI.Settings.Bio_Cannon then { type = "ammo", name = "bi-bio-cannon-proto-ammo", - icon = ICONPATH_W .. "bio_cannon_proto_ammo_icon.png", + icon = ICONPATH .. "bio_cannon_proto_ammo_icon.png", icon_size = 64, icons = { { - icon = ICONPATH_W .. "bio_cannon_proto_ammo_icon.png", + icon = ICONPATH .. "bio_cannon_proto_ammo_icon.png", icon_size = 64, } }, - ammo_category = "Bio_Cannon_Ammo", + ammo_category = "artillery-shell", ammo_type = { category = "Bio_Cannon_Ammo", target_type = "direction", @@ -46,15 +46,15 @@ if BI.Settings.Bio_Cannon then { type = "ammo", name = "bi-bio-cannon-basic-ammo", - icon = ICONPATH_W .. "bio_cannon_basic_ammo_icon.png", + icon = ICONPATH .. "bio_cannon_basic_ammo_icon.png", icon_size = 64, icons = { { - icon = ICONPATH_W .. "bio_cannon_basic_ammo_icon.png", + icon = ICONPATH .. "bio_cannon_basic_ammo_icon.png", icon_size = 64, } }, - ammo_category = "Bio_Cannon_Ammo", + ammo_category = "artillery-shell", ammo_type = { category = "Bio_Cannon_Ammo", target_type = "direction", @@ -81,15 +81,15 @@ if BI.Settings.Bio_Cannon then { type = "ammo", name = "bi-bio-cannon-poison-ammo", - icon = ICONPATH_W .. "bio_cannon_poison_ammo_icon.png", + icon = ICONPATH .. "bio_cannon_poison_ammo_icon.png", icon_size = 64, icons = { { - icon = ICONPATH_W .. "bio_cannon_poison_ammo_icon.png", + icon = ICONPATH .. "bio_cannon_poison_ammo_icon.png", icon_size = 64, } }, - ammo_category = "Bio_Cannon_Ammo", + ammo_category = "artillery-shell", ammo_type = { category = "Bio_Cannon_Ammo", target_type = "direction", diff --git a/Bio_Industries_2/prototypes/Bio_Cannon/technology.lua b/Bio_Industries_2/prototypes/Bio_Cannon/technology.lua index d1c1abb..776e699 100644 --- a/Bio_Industries_2/prototypes/Bio_Cannon/technology.lua +++ b/Bio_Industries_2/prototypes/Bio_Cannon/technology.lua @@ -1,4 +1,5 @@ local BioInd = require('common')('Bio_Industries_2') + local ICONPATH = BioInd.modRoot .. "/graphics/technology/" if BI.Settings.Bio_Cannon then @@ -40,7 +41,7 @@ if BI.Settings.Bio_Cannon then ingredients = { {"automation-science-pack", 1}, {"logistic-science-pack", 1}, - {"military-science-pack", 3}, + {"military-science-pack", 1}, }, time = 30, } diff --git a/Bio_Industries_2/prototypes/Bio_Farm/coal_processing.lua b/Bio_Industries_2/prototypes/Bio_Farm/coal_processing.lua index f176687..3285ed8 100644 --- a/Bio_Industries_2/prototypes/Bio_Farm/coal_processing.lua +++ b/Bio_Industries_2/prototypes/Bio_Farm/coal_processing.lua @@ -25,7 +25,7 @@ return { type = "unlock-recipe", recipe = "bi-wood-fuel-brick" }, - { + { type = "unlock-recipe", recipe = "bi-seed-2" }, @@ -37,7 +37,7 @@ return { type = "unlock-recipe", recipe = "bi-logs-2" }, - { + { type = "unlock-recipe", recipe = "bi-cokery" }, diff --git a/Bio_Industries_2/prototypes/Bio_Farm/compatible_recipes.lua b/Bio_Industries_2/prototypes/Bio_Farm/compatible_recipes.lua index 5c1fe4e..08a58d3 100644 --- a/Bio_Industries_2/prototypes/Bio_Farm/compatible_recipes.lua +++ b/Bio_Industries_2/prototypes/Bio_Farm/compatible_recipes.lua @@ -1,19 +1,17 @@ local BioInd = require('common')('Bio_Industries_2') + local ICONPATH = BioInd.modRoot .. "/graphics/icons/" -local ICONPATH_BA = BioInd.modRoot .. "/graphics/icons/mod_bobangels/" -local ICONPATH_AAI = BioInd.modRoot .. "/graphics/icons/mod_aai/" -local ICONPATH_AAI = BioInd.modRoot .. "/graphics/icons/mod_krastorio/" local ICONPATHMIPS = BioInd.modRoot .. "/graphics/icons/mips/" data:extend({ { type = "recipe", name = "bi-pellet-coke-2", - icon = ICONPATH_BA .. "pellet_coke_b.png", + icon = ICONPATH .. "pellet_coke_b.png", icon_size = 64, icons = { { - icon = ICONPATH_BA .. "pellet_coke_b.png", + icon = ICONPATH .. "pellet_coke_b.png", icon_size = 64, } }, @@ -33,11 +31,11 @@ data:extend({ { type = "recipe", name = "bi-fertilizer-2", - icon = ICONPATH_BA .. "fertilizer_sodium_hydroxide.png", + icon = ICONPATH .. "fertilizer_sodium_hydroxide.png", icon_size = 64, icons = { { - icon = ICONPATH_BA .. "fertilizer_sodium_hydroxide.png", + icon = ICONPATH .. "fertilizer_sodium_hydroxide.png", icon_size = 64, } }, @@ -77,13 +75,13 @@ if not data.raw.item["resin"] then }, icon_mipmaps = 4, pictures = { - { size = 64, filename = ICONPATHMIPS.."resin_1.png", scale = 0.2 }, - { size = 64, filename = ICONPATHMIPS.."resin_2.png", scale = 0.2 }, - { size = 64, filename = ICONPATHMIPS.."resin_3.png", scale = 0.2 }, - { size = 64, filename = ICONPATHMIPS.."resin_4.png", scale = 0.2 } + { size = 64, filename = ICONPATHMIPS.."Resin_1.png", scale = 0.2 }, + { size = 64, filename = ICONPATHMIPS.."Resin_2.png", scale = 0.2 }, + { size = 64, filename = ICONPATHMIPS.."Resin_3.png", scale = 0.2 }, + { size = 64, filename = ICONPATHMIPS.."Resin_4.png", scale = 0.2 } }, subgroup = "bio-bio-farm-raw", - order = "a[bi]-a-bb[bi-resin]", + order = "a[bi]-a-bb[bi-resin]", stack_size = 200 }, @@ -101,10 +99,10 @@ if not data.raw.item["resin"] then icon_size = 64, } }, - subgroup = "bio-bio-farm-raw", - order = "a[bi]-a-bb[bi-2-resin-2-wood]", + subgroup = "bio-bio-farm-raw", + order = "a[bi]-a-bb[bi-2-resin-2-wood]", enabled = false, - allow_as_intermediate = true, -- Changed for 0.18.34/1.1.4 + allow_as_intermediate = true, -- Changed for 0.18.34/1.1.4 always_show_made_in = false, -- Changed for 0.18.34/1.1.4 allow_decomposition = true, -- Changed for 0.18.34/1.1.4 @@ -134,23 +132,24 @@ elseif data.raw.recipe["bob-resin-wood"] then end + -- Pellet-Coke from Carbon - Bobs & Angels if data.raw.item["solid-carbon"] and mods["angelspetrochem"] then thxbob.lib.recipe.add_new_ingredient("bi-pellet-coke-2", {type = "item", name = "solid-carbon", amount = 10}) - data.raw.recipe["bi-coke-coal"].icon = ICONPATH_BA .. "pellet_coke_1.png" + data.raw.recipe["bi-coke-coal"].icon = ICONPATH .. "pellet_coke_1.png" data.raw.recipe["bi-coke-coal"].icon_size = 64 - data.raw.recipe["bi-pellet-coke-2"].icon = ICONPATH_BA .. "pellet_coke_a.png" + data.raw.recipe["bi-pellet-coke-2"].icon = ICONPATH .. "pellet_coke_a.png" data.raw.recipe["bi-pellet-coke-2"].icon_size = 64 - data.raw.recipe["bi-pellet-coke"].icon = ICONPATH_BA .. "pellet_coke_c.png" + data.raw.recipe["bi-pellet-coke"].icon = ICONPATH .. "pellet_coke_c.png" data.raw.recipe["bi-pellet-coke"].icon_size = 64 thxbob.lib.tech.add_recipe_unlock("bi-tech-coal-processing-2", "bi-pellet-coke-2") elseif data.raw.item["carbon"] and mods["bobplates"] then thxbob.lib.recipe.add_new_ingredient ("bi-pellet-coke-2", {type = "item", name = "carbon", amount = 10}) - data.raw.recipe["bi-coke-coal"].icon = ICONPATH_BA .. "pellet_coke_1.png" + data.raw.recipe["bi-coke-coal"].icon = ICONPATH .. "pellet_coke_1.png" data.raw.recipe["bi-coke-coal"].icon_size = 64 - data.raw.recipe["bi-pellet-coke-2"].icon = ICONPATH_BA .. "pellet_coke_b.png" + data.raw.recipe["bi-pellet-coke-2"].icon = ICONPATH .. "pellet_coke_b.png" data.raw.recipe["bi-pellet-coke-2"].icon_size = 64 - data.raw.recipe["bi-pellet-coke"].icon = ICONPATH_BA .. "pellet_coke_c.png" + data.raw.recipe["bi-pellet-coke"].icon = ICONPATH .. "pellet_coke_c.png" data.raw.recipe["bi-pellet-coke"].icon_size = 64 thxbob.lib.tech.add_recipe_unlock("bi-tech-coal-processing-2", "bi-pellet-coke-2") end @@ -175,7 +174,7 @@ end if data.raw.item["solid-sodium-hydroxide"] and mods["angelspetrochem"] then thxbob.lib.recipe.add_new_ingredient("bi-fertilizer-2", {type = "item", name = "solid-sodium-hydroxide", amount = 10}) thxbob.lib.recipe.replace_ingredient("bi-fertilizer-2", "nitrogen", "gas-nitrogen") - data.raw.recipe["bi-fertilizer-2"].icon = ICONPATH_BA .. "fertilizer_solid_sodium_hydroxide.png" + data.raw.recipe["bi-fertilizer-2"].icon = ICONPATH .. "fertilizer_solid_sodium_hydroxide.png" data.raw.recipe["bi-fertilizer-2"].icon_size = 64 thxbob.lib.tech.add_recipe_unlock("bi-tech-fertilizer", "bi-fertilizer-2") elseif data.raw.item["sodium-hydroxide"] and mods["bobplates"] then @@ -199,14 +198,14 @@ end -- If Angels, replace icons for biomass-conversion-2 and bi_basic_gas_processing if mods["angelspetrochem"] then local conversion = data.raw.recipe["bi-biomass-conversion-2"] - conversion.icon = ICONPATH_BA .. "bio_conversion_2_angels.png" - conversion.icons[1].icon = ICONPATH_BA .. "bio_conversion_2_angels.png" + conversion.icon = ICONPATH .. "bio_conversion_2_angels.png" + conversion.icons[1].icon = ICONPATH .. "bio_conversion_2_angels.png" conversion.localised_name = {"recipe-name.bi-biomass-conversion-2-methane"} conversion.localised_description = {"recipe-description.bi-biomass-conversion-2-methane"} local gas_processing = data.raw.recipe["bi-basic-gas-processing"] - gas_processing.icon = ICONPATH_BA .. "bi_basic_gas_processing_angels.png" - gas_processing.icons[1].icon = ICONPATH_BA .. "bi_basic_gas_processing_angels.png" + gas_processing.icon = ICONPATH .. "bi_basic_gas_processing_angels.png" + gas_processing.icons[1].icon = ICONPATH .. "bi_basic_gas_processing_angels.png" end @@ -258,11 +257,11 @@ if mods["angelsrefining"] then { type = "recipe", name = "bi-mineralized-sulfuric-waste", - icon = ICONPATH_BA .. "bi_mineralized_sulfuric.png", + icon = ICONPATH .. "bi_mineralized_sulfuric.png", icon_size = 64, icons = { { - icon = ICONPATH_BA .. "bi_mineralized_sulfuric.png", + icon = ICONPATH .. "bi_mineralized_sulfuric.png", icon_size = 64, } }, @@ -289,11 +288,11 @@ if mods["angelsrefining"] then { type = "recipe", name = "bi-slag-slurry", - icon = ICONPATH_BA .. "bi_slurry.png", + icon = ICONPATH .. "bi_slurry.png", icon_size = 64, icons = { { - icon = ICONPATH_BA .. "bi_slurry.png", + icon = ICONPATH .. "bi_slurry.png", icon_size = 64, } }, @@ -328,11 +327,11 @@ if data.raw.item["wooden-board"] and mods["bobelectronics"] then type = "recipe", name = "bi-press-wood", localised_name = {"recipe-name.bi-press-wood"}, - icon = ICONPATH_BA .. "bi_wooden_board.png", + icon = ICONPATH .. "bi_wooden_board.png", icon_size = 64, icons = { { - icon = ICONPATH_BA .. "bi_wooden_board.png", + icon = ICONPATH .. "bi_wooden_board.png", icon_size = 64, } }, @@ -359,7 +358,7 @@ if data.raw.item["wooden-board"] and mods["bobelectronics"] then thxbob.lib.tech.add_recipe_unlock("electronics", "bi-press-wood") if mods["ShinyBobGFX"] or mods["ShinyBobGFX_Continued"] then - data.raw["recipe"]["bi-press-wood"].icon = ICONPATH_BA .. "bi_wooden_board_shiny.png" + data.raw["recipe"]["bi-press-wood"].icon = ICONPATH .. "bi_wooden_board_shiny.png" data.raw["recipe"]["bi-press-wood"].icon_size = 64 end end @@ -367,7 +366,7 @@ end -- Replace Angels Charcoal Icon if data.raw.recipe["wood-charcoal"] then - data.raw.recipe["wood-charcoal"].icon = ICONPATH_BA .. "charcoal_pellets.png" + data.raw.recipe["wood-charcoal"].icon = ICONPATH .. "charcoal_pellets.png" data.raw.recipe["wood-charcoal"].icon_size = 64 data.raw.recipe["wood-charcoal"].category = "biofarm-mod-smelting" data.raw.item["wood-charcoal"].icon = ICONPATH .. "charcoal.png" @@ -383,7 +382,7 @@ if data.raw.item["sand"] or data.raw.item["biotech-sand"] or data.raw.item["solid-sand"] then - BioInd.writeDebug("Generating recipe for sand from crushed stone!") +BioInd.writeDebug("Generating recipe for sand from crushed stone!") -- General recipe for sand (will be adjusted later if necessary) data:extend({ { @@ -391,7 +390,7 @@ if data.raw.item["sand"] or name = "bi-sand", icons = { { - icon = ICONPATH_AAI .. "sand-aai.png", + icon = ICONPATH .. "sand-aai.png", icon_size = 64, mip_maps = 1, } @@ -404,7 +403,7 @@ if data.raw.item["sand"] or results = {{type="item", name="sand", amount=5}}, main_product = "", enabled = false, - allow_as_intermediate = true, -- Changed for 0.18.34/1.1.4 + allow_as_intermediate = true, -- Changed for 0.18.34/1.1.4 always_show_made_in = true, -- Changed for 0.18.34/1.1.4 allow_decomposition = true, -- Changed for 0.18.34/1.1.4 }, @@ -425,7 +424,7 @@ BioInd.writeDebug("Adjusting result for \"angelsrefining\" …") -- Adjust icon for Krastorio elseif mods["Krastorio2"] or mods["Krastorio2-spaced-out"] then BioInd.writeDebug("Using Krastorio icon …") - recipe.icons[1].icon = ICONPATH_KR .. "sand-Krastorio.png" + recipe.icons[1].icon = ICONPATH .. "sand-Krastorio.png" end -- Add recipe to technology diff --git a/Bio_Industries_2/prototypes/Bio_Farm/entities.lua b/Bio_Industries_2/prototypes/Bio_Farm/entities.lua index 39e0f7f..6fcb455 100644 --- a/Bio_Industries_2/prototypes/Bio_Farm/entities.lua +++ b/Bio_Industries_2/prototypes/Bio_Farm/entities.lua @@ -1,940 +1,851 @@ local BioInd = require('common')('Bio_Industries_2') local ICONPATH = BioInd.modRoot .. "/graphics/icons/" -local ICONPATH_E = BioInd.modRoot .. "/graphics/icons/entity/" -local ENTITYPATH_BIO = BioInd.modRoot .. "/graphics/entities/" +local ENTITYPATH = BioInd.modRoot .. "/graphics/entities/biofarm/" -require("prototypes.Bio_Farm.pipeConnectors") -require("util") +require ("prototypes.Bio_Farm.pipeConnectors") +require ("util") inv_extension2 = { - filename = ENTITYPATH_BIO .. "bio_terraformer/arboretum.png", - priority = "high", - width = 640, - height = 640, - frame_count = 1, - scale = 0.5, - shift = { 0, 0 } + filename = ENTITYPATH .. "Bio_Farm_Idle_alt.png", + priority = "high", + width = 320, + height = 320, + frame_count = 1, + direction_count = 1, + shift = {0.75, 0}, } data:extend({ - ------- Seedling - { - type = "simple-entity-with-force", - name = "seedling", - localised_name = { "entity-name.seedling" }, - localised_description = { "entity-description.seedling" }, + ------- Seedling + { + type = "simple-entity-with-force", + name = "seedling", + localised_name = {"entity-name.seedling"}, + localised_description = {"entity-description.seedling"}, + icon = ICONPATH .. "Seedling.png", + icon_size = 64, + icons = { + { icon = ICONPATH .. "Seedling.png", icon_size = 64, - icons = { - { - icon = ICONPATH .. "Seedling.png", - icon_size = 64, - } - }, - order = "x[bi]-a[bi-seedling]", - flags = { "placeable-neutral", "placeable-player", "player-creation", "breaths-air" }, - create_ghost_on_death = false, - minable = { - mining_particle = "wooden-particle", - mining_time = 0.25, - results = { { type = "item", name = "seedling", amount = 1 } }, - count = 1 - }, - corpse = nil, - remains_when_mined = nil, - emissions_per_second = { pollution = -0.0006 }, - max_health = 5, - - collision_box = { { -0.1, -0.1 }, { 0.1, 0.1 } }, - selection_box = { { -0.5, -0.5 }, { 0.5, 0.5 } }, - subgroup = "trees", - impact_category = "wood", - picture = { - filename = ICONPATH .. "Seedling_b.png", - priority = "extra-high", - width = 64, - height = 64, - scale = 0.3 - }, + } }, + order = "x[bi]-a[bi-seedling]", + flags = {"placeable-neutral", "placeable-player", "player-creation", "breaths-air"}, + create_ghost_on_death = false, + minable = { + mining_particle = "wooden-particle", + mining_time = 0.25, + results = {{type="item", name="seedling", amount=1}}, + count = 1 + }, + corpse = nil, + remains_when_mined = nil, + emissions_per_second = { pollution = -0.0006 }, + max_health = 5, - ------- Seedling - Dummy for Seed Bomb - { - type = "simple-entity-with-force", - name = "seedling-2", - localised_name = { "entity-name.seedling" }, - localised_description = { "entity-description.seedling" }, + collision_box = {{-0.1, -0.1}, {0.1, 0.1}}, + selection_box = {{-0.5, -0.5}, {0.5, 0.5}}, + subgroup = "trees", + impact_category = "wood", + picture = { + filename = ICONPATH .. "Seedling_b.png", + priority = "extra-high", + width = 64, + height = 64, + scale = 0.3 + }, + }, + + ------- Seedling - Dummy for Seed Bomb + { + type = "simple-entity-with-force", + name = "seedling-2", + localised_name = {"entity-name.seedling"}, + localised_description = {"entity-description.seedling"}, + icon = ICONPATH .. "Seedling.png", + icon_size = 64, + icons = { + { icon = ICONPATH .. "Seedling.png", icon_size = 64, - icons = { - { - icon = ICONPATH .. "Seedling.png", - icon_size = 64, - } - }, - order = "x[bi]-a[bi-seedling]", - flags = { "placeable-neutral", "placeable-player", "player-creation", "breaths-air" }, - create_ghost_on_death = false, - minable = { - mining_particle = "wooden-particle", - mining_time = 0.25, - results = { { type = "item", name = "seedling", amount = 1 } }, - count = 1 - }, - corpse = nil, - remains_when_mined = nil, - emissions_per_second = { pollution = -0.0006 }, - max_health = 5, - - collision_box = { { -0.1, -0.1 }, { 0.1, 0.1 } }, - selection_box = { { -0.5, -0.5 }, { 0.5, 0.5 } }, - subgroup = "trees", - impact_category = "wood", - picture = { - filename = ICONPATH .. "Seedling_b.png", - priority = "extra-high", - width = 64, - height = 64, - scale = 0.3 - }, + } }, + order = "x[bi]-a[bi-seedling]", + flags = {"placeable-neutral", "placeable-player", "player-creation", "breaths-air"}, + create_ghost_on_death = false, + minable = { + mining_particle = "wooden-particle", + mining_time = 0.25, + results = {{type="item", name="seedling", amount=1}}, + count = 1 + }, + corpse = nil, + remains_when_mined = nil, + emissions_per_second = { pollution = -0.0006 }, + max_health = 5, - { - type = "simple-entity-with-force", - name = "seedling-3", - localised_name = { "entity-name.seedling" }, - localised_description = { "entity-description.seedling" }, + collision_box = {{-0.1, -0.1}, {0.1, 0.1}}, + selection_box = {{-0.5, -0.5}, {0.5, 0.5}}, + subgroup = "trees", + impact_category = "wood", + picture = { + filename = ICONPATH .. "Seedling_b.png", + priority = "extra-high", + width = 64, + height = 64, + scale = 0.3 + }, + }, + + { + type = "simple-entity-with-force", + name = "seedling-3", + localised_name = {"entity-name.seedling"}, + localised_description = {"entity-description.seedling"}, + icon = ICONPATH .. "Seedling.png", + icon_size = 64, + icons = { + { icon = ICONPATH .. "Seedling.png", icon_size = 64, - icons = { - { - icon = ICONPATH .. "Seedling.png", - icon_size = 64, - } - }, - order = "x[bi]-a[bi-seedling]", - flags = { "placeable-neutral", "placeable-player", "player-creation", "breaths-air" }, - create_ghost_on_death = false, - minable = { - mining_particle = "wooden-particle", - mining_time = 0.25, - results = { { type = "item", name = "seedling", amount = 1 } }, - count = 1 - }, - corpse = nil, - remains_when_mined = nil, - emissions_per_second = { pollution = -0.0006 }, - max_health = 5, + } + }, + order = "x[bi]-a[bi-seedling]", + flags = {"placeable-neutral", "placeable-player", "player-creation", "breaths-air"}, + create_ghost_on_death = false, + minable = { + mining_particle = "wooden-particle", + mining_time = 0.25, + results = {{type="item", name="seedling", amount=1}}, + count = 1 + }, + corpse = nil, + remains_when_mined = nil, + emissions_per_second = { pollution = -0.0006 }, + max_health = 5, - collision_box = { { -0.1, -0.1 }, { 0.1, 0.1 } }, - selection_box = { { -0.5, -0.5 }, { 0.5, 0.5 } }, - subgroup = "trees", - impact_category = "wood", - picture = { - filename = ICONPATH .. "Seedling_b.png", - priority = "extra-high", - width = 64, - height = 64, + collision_box = {{-0.1, -0.1}, {0.1, 0.1}}, + selection_box = {{-0.5, -0.5}, {0.5, 0.5}}, + subgroup = "trees", + impact_category = "wood", + picture = { + filename = ICONPATH .. "Seedling_b.png", + priority = "extra-high", + width = 64, + height = 64, scale = 0.3 - }, }, + }, - ------- Bio Farm - { - type = "assembling-machine", - name = "bi-bio-farm", - icon = ICONPATH_E .. "bio_Farm_Icon.png", + ------- Bio Farm + { + type = "assembling-machine", + name = "bi-bio-farm", + icon = ICONPATH .. "Bio_Farm_Icon.png", + icon_size = 64, + icons = { + { + icon = ICONPATH .. "Bio_Farm_Icon.png", icon_size = 64, - icons = { - { - icon = ICONPATH_E .. "bio_Farm_Icon.png", - icon_size = 64, - } - }, - flags = { "placeable-neutral", "placeable-player", "player-creation" }, - minable = { hardness = 0.2, mining_time = 0.5, result = "bi-bio-farm" }, - max_health = 250, - corpse = "big-remnants", - dying_explosion = "medium-explosion", - resistances = { { type = "fire", percent = 70 } }, - fluid_boxes = { - { - production_type = "input", - pipe_picture = assembler3pipepictures(), - pipe_covers = pipecoverspictures(), - volume = 1000, - base_level = -1, - pipe_connections = { { flow_direction = "input", direction = defines.direction.north, position = { -1, -4 } } } - }, - { - production_type = "input", - pipe_picture = assembler3pipepictures(), - pipe_covers = pipecoverspictures(), - volume = 1000, - base_level = -1, - pipe_connections = { { flow_direction = "input", direction = defines.direction.north, position = { 1, -4 } } } - }, - }, - fluid_boxes_off_when_no_fluid_recipe = true, + } + }, + flags = {"placeable-neutral", "placeable-player", "player-creation"}, + minable = {hardness = 0.2, mining_time = 0.5, result = "bi-bio-farm"}, + max_health = 250, + corpse = "big-remnants", + dying_explosion = "medium-explosion", + resistances = {{type = "fire", percent = 70}}, + fluid_boxes = { + { + production_type = "input", + pipe_picture = assembler3pipepictures(), + pipe_covers = pipecoverspictures(), + volume = 1000, + base_level = -1, + pipe_connections = {{ flow_direction = "input", direction = defines.direction.north, position = {-1, -4} }} + }, + { + production_type = "input", + pipe_picture = assembler3pipepictures(), + pipe_covers = pipecoverspictures(), + volume = 1000, + base_level = -1, + pipe_connections = {{ flow_direction = "input", direction = defines.direction.north, position = {1, -4} }} + }, + }, + fluid_boxes_off_when_no_fluid_recipe = true, - collision_box = { { -4.2, -4.2 }, { 4.2, 4.2 } }, - selection_box = { { -4.5, -4.5 }, { 4.5, 4.5 } }, + collision_box = {{-4.2, -4.2}, {4.2, 4.2}}, + selection_box = {{-4.5, -4.5}, {4.5, 4.5}}, - graphics_set = { - animation = { - layers = { - { - filename = ENTITYPATH_BIO .. "bio_farm/bio_farm.png", - priority = "high", - width = 608, - height = 800, - frame_count = 1, - scale = 0.5, - shift = { 0, -2.0 } - }, - { - filename = ENTITYPATH_BIO .. "bio_farm/bio_farm_shadow.png", - priority = "high", - width = 800, - height = 800, - frame_count = 1, - scale = 0.5, - draw_as_shadow = true, - shift = { 1, -2.0 } - } - } - }, - working_visualisations = { - { - light = { intensity = 1.2, size = 9 }, - effect = "flicker", - constant_speed = true, - fadeout = true, - animation = { - filename = ENTITYPATH_BIO .. "bio_farm/bio_farm_light.png", - priority = "high", - width = 800, - height = 800, - frame_count = 1, - shift = { 1, -2 } - } - } - } - }, - - crafting_categories = { "biofarm-mod-farm" }, - crafting_speed = 1, - energy_source = { - type = "electric", - usage_priority = "primary-input", - drain = "50kW", - emissions_per_minute = { pollution = -9 }, -- the "-" means it Absorbs pollution. - }, - energy_usage = "100kW", - ingredient_count = 3, - open_sound = { filename = "__base__/sound/machine-open.ogg", volume = 0.85 }, - close_sound = { filename = "__base__/sound/machine-close.ogg", volume = 0.75 }, - module_specification = { - module_slots = 3 - }, - allowed_effects = { "consumption", "speed", "productivity", "pollution" }, + animation = { + filename = ENTITYPATH .. "Bio_Farm_Idle.png", + priority = "high", + width = 348, + height = 288, + shift = {0.96, 0}, + frame_count = 1, }, -}) + working_visualisations = { + animation = { + filename = ENTITYPATH .. "Bio_Farm_Working.png", + priority = "high", + width = 348, + height = 288, + shift = {0.96, 0}, + frame_count = 1, + }, + }, + crafting_categories = {"biofarm-mod-farm"}, + crafting_speed = 1, + energy_source = { + type = "electric", + usage_priority = "primary-input", + drain = "50kW", + emissions_per_minute = { pollution = -9 }, -- the "-" means it Absorbs pollution. + }, + energy_usage = "100kW", + ingredient_count = 3, + open_sound = { filename = "__base__/sound/machine-open.ogg", volume = 0.85 }, + close_sound = { filename = "__base__/sound/machine-close.ogg", volume = 0.75 }, + module_specification = { + module_slots = 3 + }, + allowed_effects = {"consumption", "speed", "productivity", "pollution"}, + }, + }) + + ------- Bio Farm Hidden Electric Pole data:extend({ - ------ Greenhouse - { - type = "assembling-machine", - name = "bi-bio-greenhouse", - icon = ICONPATH_E .. "bio_greenhouse.png", + ------ Greenhouse + { + type = "assembling-machine", + name = "bi-bio-greenhouse", + icon = ICONPATH .. "bio_greenhouse.png", + icon_size = 64, + icons = { + { + icon = ICONPATH .. "bio_greenhouse.png", icon_size = 64, - icons = { - { - icon = ICONPATH_E .. "bio_greenhouse.png", - icon_size = 64, - } - }, - flags = { "placeable-neutral", "placeable-player", "player-creation" }, - minable = { hardness = 0.2, mining_time = 0.25, result = "bi-bio-greenhouse" }, - collision_box = { { -1.2, -1.2 }, { 1.2, 1.2 } }, - selection_box = { { -1.5, -1.5 }, { 1.5, 1.5 } }, - max_health = 250, - corpse = "medium-remnants", - dying_explosion = "medium-explosion", - crafting_categories = { "biofarm-mod-greenhouse" }, - crafting_speed = 1, - energy_source = { - type = "electric", - usage_priority = "primary-input", - drain = "15kW", - emissions_per_minute = { pollution = -6 }, -- the "-" means it Absorbs pollution. - }, - energy_usage = "50kW", - ingredient_count = 3, - resistances = { - { - type = "fire", - percent = 70 - } - }, - fluid_boxes = { - { - production_type = "input", - pipe_picture = assembler3pipepictures(), - pipe_covers = pipecoverspictures(), - volume = 1000, - base_level = -1, - pipe_connections = { { flow_direction = "input", direction = defines.direction.north, position = { 0, -1 } } } - }, - }, - module_specification = {module_slots = 2}, - allowed_effects = { "consumption", "speed", "productivity", "pollution" }, - graphics_set = { - animation = { - layers = { - { - filename = ENTITYPATH_BIO .. "bio_greenhouse/bio_greenhouse.png", - width = 192, - height = 256, - frame_count = 1, - scale = 0.5, - shift = { 0, -0.5 } - }, - { - filename = ENTITYPATH_BIO .. "bio_greenhouse/bio_greenhouse_shadow.png", - width = 256, - height = 128, - frame_count = 1, - scale = 0.5, - draw_as_shadow = true, - shift = { 1, -0.5 } - } - } - }, - working_visualisations = { - { - light = { intensity = 1, size = 6 }, - animation = { - filename = ENTITYPATH_BIO .. "bio_greenhouse/bio_greenhouse_light_anim.png", - width = 192, - height = 256, - frame_count = 10, - scale = 0.5, - animation_speed = 0.1, - shift = { 0, 0.5 } - } - } - } - }, - open_sound = { filename = "__base__/sound/machine-open.ogg", volume = 0.85 }, - close_sound = { filename = "__base__/sound/machine-close.ogg", volume = 0.75 } + } }, + flags = {"placeable-neutral", "placeable-player", "player-creation"}, + minable = {hardness = 0.2, mining_time = 0.25, result = "bi-bio-greenhouse"}, + collision_box = {{-1.2, -1.2}, {1.2, 1.2}}, + selection_box = {{-1.5, -1.5}, {1.5, 1.5}}, + max_health = 250, + corpse = "medium-remnants", + dying_explosion = "medium-explosion", + crafting_categories = {"biofarm-mod-greenhouse"}, + crafting_speed = 1, + energy_source = { + type = "electric", + usage_priority = "primary-input", + drain = "15kW", + emissions_per_minute = { pollution = -6 }, -- the "-" means it Absorbs pollution. + }, + energy_usage = "50kW", + ingredient_count = 3, + resistances = { + { + type = "fire", + percent = 70 + } + }, + fluid_boxes = { + { + production_type = "input", + pipe_picture = assembler3pipepictures(), + pipe_covers = pipecoverspictures(), + volume = 1000, + base_level = -1, + pipe_connections = {{ flow_direction = "input", direction = defines.direction.north, position = {0, -1} }} + }, + }, + module_specification = { + module_slots = 2 + }, + allowed_effects = {"consumption", "speed", "productivity", "pollution"}, + animation = { + filename = ENTITYPATH .. "bio_greenhouse_off.png", + width = 113, + height = 93, + frame_count = 1, + scale = 1, + shift = {0.3, 0} + }, + working_visualisations = { + { + light = {intensity = 1, size = 6}, + animation = { + filename = ENTITYPATH .. "bio_greenhouse_on.png", + width = 113, + height = 93, + frame_count = 1, + scale = 1, + shift = {0.3, 0} + } + } + }, + open_sound = { filename = "__base__/sound/machine-open.ogg", volume = 0.85 }, + close_sound = { filename = "__base__/sound/machine-close.ogg", volume = 0.75 } + }, - -- COKERY - { - type = "assembling-machine", - name = "bi-cokery", - icon = ICONPATH_E .. "cokery.png", + -- COKERY + { + type = "assembling-machine", + name = "bi-cokery", + icon = ICONPATH .. "cokery.png", + icon_size = 64, + icons = { + { + icon = ICONPATH .. "cokery.png", icon_size = 64, - icons = { - { - icon = ICONPATH_E .. "cokery.png", - icon_size = 64, - } - }, - -- This is necessary for "Space Exploration" (if not true, the entity can only be - -- placed on Nauvis)! - se_allow_in_space = true, - flags = { "placeable-neutral", "placeable-player", "player-creation" }, - order = "a[cokery]", - minable = { hardness = 0.2, mining_time = 0.5, result = "bi-cokery" }, - max_health = 200, - corpse = "medium-remnants", - resistances = { { type = "fire", percent = 95 } }, - collision_box = { { -1.2, -1.2 }, { 1.2, 1.2 } }, - selection_box = { { -1.5, -1.5 }, { 1.5, 1.5 } }, - module_specification = { module_slots = 2 }, - allowed_effects = { "consumption", "speed", "pollution" }, - graphics_set = { - -- Idle animation (1 frame) - --[[ - idle_animation = { - layers = { - { - filename = ENTITYPATH_BIO .. "bio_cokery/cokery_idle.png", - priority = "high", - width = 256, - height = 256, - frame_count = 1, - repeat_count = 16, -- match working animation - shift = { 0.5, -0.5 }, - scale = 0.5 - }, - { - filename = ENTITYPATH_BIO .. "bio_cokery/cokery_shadow.png", - width = 334, - height = 126, - frame_count = 1, - repeat_count = 16, -- match working animation - draw_as_shadow = true, - shift = { 1.5, -0.5 }, - scale = 0.5 - } - } - }, - ]] - -- Working animation (16 frames) - animation = { - layers = { - { - filename = ENTITYPATH_BIO .. "bio_cokery/cokery_anim.png", - priority = "high", - width = 256, - height = 256, - frame_count = 16, - line_length = 8, - animation_speed = 0.1, - shift = { 0.5, -0.5 }, - scale = 0.5 - }, - { - filename = ENTITYPATH_BIO .. "bio_cokery/cokery_shadow.png", - width = 334, - height = 126, - frame_count = 1, - repeat_count = 16, -- match working animation - draw_as_shadow = true, - shift = { 1.5, -0.5 }, - scale = 0.5 - } - } - } - }, - crafting_categories = { "biofarm-mod-smelting" }, - energy_source = { - type = "electric", - input_priority = "secondary", - usage_priority = "secondary-input", - emissions_per_minute = { pollution = 2.5 }, - }, - energy_usage = "180kW", - crafting_speed = 2, - ingredient_count = 1 + } }, + -- This is necessary for "Space Exploration" (if not true, the entity can only be + -- placed on Nauvis)! + se_allow_in_space = true, + flags = {"placeable-neutral", "placeable-player", "player-creation"}, + order = "a[cokery]", + minable = {hardness = 0.2, mining_time = 0.5, result = "bi-cokery"}, + max_health = 200, + corpse = "medium-remnants", + resistances = {{type = "fire", percent = 95}}, + collision_box = {{-1.2, -1.2}, {1.2, 1.2}}, + selection_box = {{-1.5, -1.5}, {1.5, 1.5}}, + module_specification = { + module_slots = 2 + }, + allowed_effects = {"consumption", "speed", "pollution"}, + animation = { + filename = "__Bio_Industries_2__/graphics/entities/cokery/cokery_sheet.png", + frame_count = 28, + line_length = 7, + width = 256, + height = 256, + scale = 0.5, + shift = {0.5, -0.5}, + animation_speed = 0.1 + }, + crafting_categories = {"biofarm-mod-smelting"}, + energy_source = { + type = "electric", + input_priority = "secondary", + usage_priority = "secondary-input", + emissions_per_minute = { pollution = 2.5 }, + }, + energy_usage = "180kW", + crafting_speed = 2, + ingredient_count = 1 + }, - -- STONECRUSHER - { - type = "furnace", - name = "bi-stone-crusher", - icon = ICONPATH_E .. "stone_crusher.png", + -- STONECRUSHER + { + type = "furnace", + name = "bi-stone-crusher", + icon = ICONPATH .. "stone_crusher.png", + icon_size = 64, + -- This is necessary for "Space Exploration" (if not true, the entity can only be + -- placed on Nauvis)! + se_allow_in_space = true, + flags = {"placeable-neutral", "player-creation"}, + minable = {hardness = 0.2, mining_time = 0.5, result = "bi-stone-crusher"}, + max_health = 100, + corpse = "medium-remnants", + module_slots = 1, + resistances = {{type = "fire", percent = 70}}, + working_sound = { + sound = { + filename = "__base__/sound/assembling-machine-t1-1.ogg", + volume = 0.7 + }, + apparent_volume = 1.5 + }, + collision_box = {{-0.8, -0.8}, {0.8, 0.8}}, + selection_box = {{-1.0, -1.0}, {1.0, 1.0}}, + animation = { + filename = "__Bio_Industries_2__/graphics/entities/stone-crusher/stone_crusher_anim.png", + priority = "high", + width = 65, + height = 78, + frame_count = 11, + animation_speed = 0.5, + shift = {0.0, -0.1} + }, + working_visualisations = { + filename = "__Bio_Industries_2__/graphics/entities/stone-crusher/stone-crusher-anim.png", + priority = "high", + width = 65, + height = 78, + frame_count = 11, + animation_speed = 0.18 / 2.5, + shift = {0.0, -0.1} + }, + crafting_categories = {"biofarm-mod-crushing"}, + result_inventory_size = 1, + source_inventory_size = 1, + crafting_speed = 1, + energy_source = { + type = "electric", + usage_priority = "secondary-input", + emissions_per_minute = { pollution = 0.25 }, + }, + energy_usage = "50kW", + module_specification = { + module_slots = 2 + }, + allowed_effects = {"consumption", "speed", "pollution"}, + }, + + --- Seed Bomb Projectile - 1 + { + type = "projectile", + name = "seed-bomb-projectile-1", + flags = {"not-on-map"}, + acceleration = 0.005, + action = { + type = "direct", + action_delivery = { + type = "instant", + target_effects = { + { + type = "nested-result", + action = { + type = "area", + target_entities = false, + repeat_count = 600, + radius = 24, + action_delivery = { + type = "projectile", + projectile = "seed-bomb-wave-1", + starting_speed = 0.5 + } + } + } + } + } + }, + light = {intensity = 0.8, size = 15}, + animation = { + filename = "__Bio_Industries_2__/graphics/entities/rocket.png", + frame_count = 8, + line_length = 8, + width = 9, + height = 35, + shift = {0, 0}, + priority = "high" + }, + shadow = { + filename = "__Bio_Industries_2__/graphics/entities/rocket-shadow.png", + frame_count = 1, + width = 7, + height = 24, + priority = "high", + shift = {0, 0} + }, + smoke = { + { + name = "smoke-fast", + deviation = {0.15, 0.15}, + frequency = 1, + position = {0, -1}, + slow_down_factor = 1, + starting_frame = 3, + starting_frame_deviation = 5, + starting_frame_speed = 0, + starting_frame_speed_deviation = 5 + } + } + }, + + --- Seed Bomb Projectile - 2 + { + type = "projectile", + name = "seed-bomb-projectile-2", + flags = {"not-on-map"}, + acceleration = 0.005, + action = { + type = "direct", + action_delivery = { + type = "instant", + target_effects = { + { + type = "nested-result", + action = { + type = "area", + target_entities = false, + repeat_count = 800, + radius = 27, + action_delivery = { + type = "projectile", + projectile = "seed-bomb-wave-2", + starting_speed = 0.5 + } + } + } + } + } + }, + light = {intensity = 0.8, size = 15}, + animation = { + filename = "__Bio_Industries_2__/graphics/entities/rocket.png", + frame_count = 8, + line_length = 8, + width = 9, + height = 35, + shift = {0, 0}, + priority = "high" + }, + shadow = { + filename = "__Bio_Industries_2__/graphics/entities/rocket-shadow.png", + frame_count = 1, + width = 7, + height = 24, + priority = "high", + shift = {0, 0} + }, + smoke = { + { + name = "smoke-fast", + deviation = {0.15, 0.15}, + frequency = 1, + position = {0, -1}, + slow_down_factor = 1, + starting_frame = 3, + starting_frame_deviation = 5, + starting_frame_speed = 0, + starting_frame_speed_deviation = 5 + } + } + }, + + --- Seed Bomb Projectile - 3 + { + type = "projectile", + name = "seed-bomb-projectile-3", + flags = {"not-on-map"}, + acceleration = 0.005, + action = { + type = "direct", + action_delivery = { + type = "instant", + target_effects = { + { + type = "nested-result", + action = { + type = "area", + target_entities = false, + repeat_count = 1000, + radius = 30, + action_delivery = { + type = "projectile", + projectile = "seed-bomb-wave-3", + starting_speed = 0.5 + } + } + } + } + } + }, + light = {intensity = 0.8, size = 15}, + animation = { + filename = "__Bio_Industries_2__/graphics/entities/rocket.png", + frame_count = 8, + line_length = 8, + width = 9, + height = 35, + shift = {0, 0}, + priority = "high" + }, + shadow = { + filename = "__Bio_Industries_2__/graphics/entities/rocket-shadow.png", + frame_count = 1, + width = 7, + height = 24, + priority = "high", + shift = {0, 0} + }, + smoke = { + { + name = "smoke-fast", + deviation = {0.15, 0.15}, + frequency = 1, + position = {0, -1}, + slow_down_factor = 1, + starting_frame = 3, + starting_frame_deviation = 5, + starting_frame_speed = 0, + starting_frame_speed_deviation = 5 + } + } + }, + + --- Seed Bomb Wave - 1 + { + type = "projectile", + name = "seed-bomb-wave-1", + flags = {"not-on-map"}, + acceleration = 0, + action = { + { + type = "direct", + action_delivery = { + type = "instant", + target_effects = { + { + type = "create-entity", + entity_name = "seedling", + check_buildability = true, + trigger_created_entity = true, + } + } + } + }, + }, + animation = { + filename = "__core__/graphics/empty.png", + frame_count = 1, + width = 1, + height = 1, + priority = "high" + }, + shadow = { + filename = "__core__/graphics/empty.png", + frame_count = 1, + width = 1, + height = 1, + priority = "high" + } + }, + + --- Seed Bomb Wave - 2 + { + type = "projectile", + name = "seed-bomb-wave-2", + flags = {"not-on-map"}, + acceleration = 0, + action = { + { + type = "direct", + action_delivery = { + type = "instant", + target_effects = { + { + type = "create-entity", + entity_name = "seedling-2", + check_buildability = true, + trigger_created_entity = true, + } + } + } + }, + }, + animation = { + filename = "__core__/graphics/empty.png", + frame_count = 1, + width = 1, + height = 1, + priority = "high" + }, + shadow = { + filename = "__core__/graphics/empty.png", + frame_count = 1, + width = 1, + height = 1, + priority = "high" + } + }, + + --- Seed Bomb Wave - 3 + { + type = "projectile", + name = "seed-bomb-wave-3", + flags = {"not-on-map"}, + acceleration = 0, + action = { + { + type = "direct", + action_delivery = { + type = "instant", + target_effects = { + { + type = "create-entity", + entity_name = "seedling-3", + check_buildability = true, + trigger_created_entity = true, + }, + } + } + }, + }, + animation = { + filename = "__core__/graphics/empty.png", + frame_count = 1, + width = 1, + height = 1, + priority = "high" + }, + shadow = { + filename = "__core__/graphics/empty.png", + frame_count = 1, + width = 1, + height = 1, + priority = "high" + } + }, + + ---- Arboretum Area Overlay + { + type = "ammo-turret", + name = "bi-arboretum-area", + localised_name = {"entity-name.bi-arboretum"}, + localised_description = {"entity-description.bi-arboretum"}, + icon = ICONPATH .. "Arboretum_Icon.png", + icon_size = 64, + icons = { + { + icon = ICONPATH .. "Arboretum_Icon.png", icon_size = 64, - -- This is necessary for "Space Exploration" (if not true, the entity can only be - -- placed on Nauvis)! - se_allow_in_space = true, - flags = { "placeable-neutral", "player-creation" }, - minable = { hardness = 0.2, mining_time = 0.5, result = "bi-stone-crusher" }, - max_health = 100, - corpse = "medium-remnants", - module_slots = 1, - resistances = { { type = "fire", percent = 70 } }, - working_sound = { - sound = { - filename = "__base__/sound/assembling-machine-t1-1.ogg", - volume = 0.7 - }, - apparent_volume = 1.5 - }, - collision_box = { { -0.8, -0.8 }, { 0.8, 0.8 } }, - selection_box = { { -1.0, -1.0 }, { 1.0, 1.0 } }, - graphics_set = { - animation = { - filename = ENTITYPATH_BIO .. "bio_stone_crusher/stone_crusher_off.png", - priority = "high", - width = 130, - height = 156, - frame_count = 1, - scale = 0.5, - shift = { 0.0, -0.1 } - }, - working_visualisations = { - { - animation = { - filename = ENTITYPATH_BIO .. "bio_stone_crusher/stone_crusher_anim.png", - priority = "high", - width = 130, - height = 156, - frame_count = 20, - line_length = 10, - animation_speed = 0.2, - scale = 0.5, - shift = { 0.0, -0.1 } - } - } - }, - }, - crafting_categories = { "biofarm-mod-crushing" }, - result_inventory_size = 1, - source_inventory_size = 1, - crafting_speed = 1, - energy_source = { - type = "electric", - usage_priority = "secondary-input", - emissions_per_minute = { pollution = 0.25 }, - }, - energy_usage = "50kW", - module_specification = { - module_slots = 2 - }, - allowed_effects = { "consumption", "speed", "pollution" }, + } }, - - --- Seed Bomb Projectile - 1 - { - type = "projectile", - name = "seed-bomb-projectile-1", - flags = { "not-on-map" }, - acceleration = 0.005, - action = { - type = "direct", - action_delivery = { - type = "instant", - target_effects = { - { - type = "nested-result", - action = { - type = "area", - target_entities = false, - repeat_count = 600, - radius = 24, - action_delivery = { - type = "projectile", - projectile = "seed-bomb-wave-1", - starting_speed = 0.5 - } - } - } - } - } - }, - light = { intensity = 0.8, size = 15 }, - animation = { - filename = "__Bio_Industries_2__/graphics/entities/rocket.png", - frame_count = 8, - line_length = 8, - width = 9, - height = 35, - shift = { 0, 0 }, - priority = "high" - }, - shadow = { - filename = "__Bio_Industries_2__/graphics/entities/rocket-shadow.png", - frame_count = 1, - width = 7, - height = 24, - priority = "high", - shift = { 0, 0 } - }, - smoke = { - { - name = "smoke-fast", - deviation = { 0.15, 0.15 }, - frequency = 1, - position = { 0, -1 }, - slow_down_factor = 1, - starting_frame = 3, - starting_frame_deviation = 5, - starting_frame_speed = 0, - starting_frame_speed_deviation = 5 - } - } + flags = {"not-deconstructable", "not-on-map", "placeable-off-grid", "not-repairable"}, + open_sound = { filename = "__base__/sound/machine-open.ogg", volume = 0.85 }, + close_sound = { filename = "__base__/sound/machine-close.ogg", volume = 0.75 }, + max_health = 250, + corpse = "big-remnants", + dying_explosion = "medium-explosion", + collision_box = {{-4.5, -4.5}, {4.5, 4.5}}, + selection_box = {{-4.5, -4.5}, {4.5, 4.5}}, + order = "x[bi]-a[bi-arboretum]", + automated_ammo_count = 1, + resistances = {}, + inventory_size = 1, + attack_parameters = { + type = "projectile", + ammo_category = "bullet", + cooldown = 2, + range = 75, + projectile_creation_distance = 0.1, + action ={} }, - - --- Seed Bomb Projectile - 2 - { - type = "projectile", - name = "seed-bomb-projectile-2", - flags = { "not-on-map" }, - acceleration = 0.005, - action = { - type = "direct", - action_delivery = { - type = "instant", - target_effects = { - { - type = "nested-result", - action = { - type = "area", - target_entities = false, - repeat_count = 800, - radius = 27, - action_delivery = { - type = "projectile", - projectile = "seed-bomb-wave-2", - starting_speed = 0.5 - } - } - } - } - } - }, - light = { intensity = 0.8, size = 15 }, - animation = { - filename = "__Bio_Industries_2__/graphics/entities/rocket.png", - frame_count = 8, - line_length = 8, - width = 9, - height = 35, - shift = { 0, 0 }, - priority = "high" - }, - shadow = { - filename = "__Bio_Industries_2__/graphics/entities/rocket-shadow.png", - frame_count = 1, - width = 7, - height = 24, - priority = "high", - shift = { 0, 0 } - }, - smoke = { - { - name = "smoke-fast", - deviation = { 0.15, 0.15 }, - frequency = 1, - position = { 0, -1 }, - slow_down_factor = 1, - starting_frame = 3, - starting_frame_deviation = 5, - starting_frame_speed = 0, - starting_frame_speed_deviation = 5 - } - } - }, - - --- Seed Bomb Projectile - 3 - { - type = "projectile", - name = "seed-bomb-projectile-3", - flags = { "not-on-map" }, - acceleration = 0.005, - action = { - type = "direct", - action_delivery = { - type = "instant", - target_effects = { - { - type = "nested-result", - action = { - type = "area", - target_entities = false, - repeat_count = 1000, - radius = 30, - action_delivery = { - type = "projectile", - projectile = "seed-bomb-wave-3", - starting_speed = 0.5 - } - } - } - } - } - }, - light = { intensity = 0.8, size = 15 }, - animation = { - filename = "__Bio_Industries_2__/graphics/entities/rocket.png", - frame_count = 8, - line_length = 8, - width = 9, - height = 35, - shift = { 0, 0 }, - priority = "high" - }, - shadow = { - filename = "__Bio_Industries_2__/graphics/entities/rocket-shadow.png", - frame_count = 1, - width = 7, - height = 24, - priority = "high", - shift = { 0, 0 } - }, - smoke = { - { - name = "smoke-fast", - deviation = { 0.15, 0.15 }, - frequency = 1, - position = { 0, -1 }, - slow_down_factor = 1, - starting_frame = 3, - starting_frame_deviation = 5, - starting_frame_speed = 0, - starting_frame_speed_deviation = 5 - } - } - }, - - --- Seed Bomb Wave - 1 - { - type = "projectile", - name = "seed-bomb-wave-1", - flags = { "not-on-map" }, - acceleration = 0, - action = { - { - type = "direct", - action_delivery = { - type = "instant", - target_effects = { - { - type = "create-entity", - entity_name = "seedling", - check_buildability = true, - trigger_created_entity = true, - } - } - } - }, - }, - animation = { - filename = "__core__/graphics/empty.png", - frame_count = 1, - width = 1, - height = 1, - priority = "high" - }, - shadow = { - filename = "__core__/graphics/empty.png", - frame_count = 1, - width = 1, - height = 1, - priority = "high" - } - }, - - --- Seed Bomb Wave - 2 - { - type = "projectile", - name = "seed-bomb-wave-2", - flags = { "not-on-map" }, - acceleration = 0, - action = { - { - type = "direct", - action_delivery = { - type = "instant", - target_effects = { - { - type = "create-entity", - entity_name = "seedling-2", - check_buildability = true, - trigger_created_entity = true, - } - } - } - }, - }, - animation = { - filename = "__core__/graphics/empty.png", - frame_count = 1, - width = 1, - height = 1, - priority = "high" - }, - shadow = { - filename = "__core__/graphics/empty.png", - frame_count = 1, - width = 1, - height = 1, - priority = "high" - } - }, - - --- Seed Bomb Wave - 3 - { - type = "projectile", - name = "seed-bomb-wave-3", - flags = { "not-on-map" }, - acceleration = 0, - action = { - { - type = "direct", - action_delivery = { - type = "instant", - target_effects = { - { - type = "create-entity", - entity_name = "seedling-3", - check_buildability = true, - trigger_created_entity = true, - }, - } - } - }, - }, - animation = { - filename = "__core__/graphics/empty.png", - frame_count = 1, - width = 1, - height = 1, - priority = "high" - }, - shadow = { - filename = "__core__/graphics/empty.png", - frame_count = 1, - width = 1, - height = 1, - priority = "high" - } - }, - - ---- Arboretum Area Overlay - { - type = "ammo-turret", - name = "bi-arboretum-area", - localised_name = { "entity-name.bi-arboretum" }, - localised_description = { "entity-description.bi-arboretum" }, - icon = ICONPATH_E .. "arboretum_Icon.png", - icon_size = 64, - icons = { - { - icon = ICONPATH_E .. "arboretum_Icon.png", - icon_size = 64, - } - }, - flags = { "not-deconstructable", "not-on-map", "placeable-off-grid", "not-repairable" }, - open_sound = { filename = "__base__/sound/machine-open.ogg", volume = 0.85 }, - close_sound = { filename = "__base__/sound/machine-close.ogg", volume = 0.75 }, - max_health = 250, - corpse = "big-remnants", - dying_explosion = "medium-explosion", - collision_box = { { -4.5, -4.5 }, { 4.5, 4.5 } }, - selection_box = { { -4.5, -4.5 }, { 4.5, 4.5 } }, - order = "x[bi]-a[bi-arboretum]", - automated_ammo_count = 1, - resistances = {}, - inventory_size = 1, - attack_parameters = { - type = "projectile", - ammo_category = "bullet", - cooldown = 2, - range = 75, - projectile_creation_distance = 0.1, - action = {} - }, - folding_speed = 0.08, - folded_animation = (function() - local res = util.table.deepcopy(inv_extension2) - res.frame_count = 1 - res.line_length = 1 - return res + folding_speed = 0.08, + folded_animation = (function() + local res = util.table.deepcopy(inv_extension2) + res.frame_count = 1 + res.line_length = 1 + return res end)(), - folding_animation = (function() - local res = util.table.deepcopy(inv_extension2) - res.run_mode = "backward" - return res + folding_animation = (function() + local res = util.table.deepcopy(inv_extension2) + res.run_mode = "backward" + return res end)(), - call_for_help_radius = 1, - graphics_set = {} - }, + call_for_help_radius = 1, + graphics_set = {} + }, - --- Assembling-Machine Arboretum - { - type = "assembling-machine", - name = "bi-arboretum", - icon = ICONPATH_E .. "arboretum_Icon.png", + --- Assembling-Machine Arboretum + { + type = "assembling-machine", + name = "bi-arboretum", + icon = ICONPATH .. "Arboretum_Icon.png", + icon_size = 64, + icons = { + { + icon = ICONPATH .. "Arboretum_Icon.png", icon_size = 64, - icons = { - { - icon = ICONPATH_E .. "arboretum_Icon.png", - icon_size = 64, - } - }, - flags = { "placeable-neutral", "placeable-player", "player-creation" }, - placeable_by = { item = "bi-arboretum-area", count = 1 }, -- Fixes that entity couldn't be blueprinted - minable = { hardness = 0.2, mining_time = 0.5, result = "bi-arboretum-area" }, - max_health = 250, - corpse = "big-remnants", - dying_explosion = "medium-explosion", - resistances = { { type = "fire", percent = 70 } }, - fluid_boxes = { - { - production_type = "input", - pipe_picture = assembler3pipepictures(), - pipe_covers = pipecoverspictures(), - volume = 1000, - base_level = -1, - pipe_connections = { { flow_direction = "input", direction = defines.direction.north, position = { -1, -4 } } } - }, - { - production_type = "input", - pipe_picture = assembler3pipepictures(), - pipe_covers = pipecoverspictures(), - volume = 1000, - base_level = -1, - pipe_connections = { { flow_direction = "input", direction = defines.direction.north, position = { 1, -4 } } } - }, - }, - fluid_boxes_off_when_no_fluid_recipe = true, - collision_box = { { -4.2, -4.2 }, { 4.2, 4.2 } }, - selection_box = { { -4.5, -4.5 }, { 4.5, 4.5 } }, - order = "x[bi]-a[bi-arboretum]", - graphics_set = { - animation = { - layers = { - { - filename = ENTITYPATH_BIO .. "bio_terraformer/arboretum.png", - width = 640, - height = 640, - frame_count = 1, - scale = 0.5, - shift = { 0, 0 } - }, - { - filename = ENTITYPATH_BIO .. "bio_terraformer/arboretum_shadow.png", - width = 560, - height = 640, - frame_count = 1, - scale = 0.5, - draw_as_shadow = true, - shift = { 1.5, 0 } - } - } - }, - working_visualisations = { - { - light = { intensity = 1, size = 8 }, - animation = { - filename = ENTITYPATH_BIO .. "bio_terraformer/arboretum_light.png", - width = 560, - height = 640, - frame_count = 1, - scale = 0.5, - sshift = { 0.75, 1 } - } - } - } - }, - crafting_categories = { "bi-arboretum" }, - crafting_speed = 0.000000000001, - energy_source = { - type = "electric", - usage_priority = "primary-input", - emissions_per_minute = { pollution = -8 }, -- the "-" means it Absorbs pollution. - }, - energy_usage = "150kW", - ingredient_count = 3, - open_sound = { filename = "__base__/sound/machine-open.ogg", volume = 0.85 }, - close_sound = { filename = "__base__/sound/machine-close.ogg", volume = 0.75 }, - module_specification = {}, + } }, + flags = {"placeable-neutral", "placeable-player", "player-creation"}, + placeable_by = {item ="bi-arboretum-area", count = 1}, -- Fixes that entity couldn't be blueprinted + minable = {hardness = 0.2, mining_time = 0.5, result = "bi-arboretum-area"}, + max_health = 250, + corpse = "big-remnants", + dying_explosion = "medium-explosion", + resistances = {{type = "fire", percent = 70}}, + fluid_boxes = { + { + production_type = "input", + pipe_picture = assembler3pipepictures(), + pipe_covers = pipecoverspictures(), + volume = 1000, + base_level = -1, + pipe_connections = {{ flow_direction = "input", direction = defines.direction.north, position = {-1, -4} }} + }, + { + production_type = "input", + pipe_picture = assembler3pipepictures(), + pipe_covers = pipecoverspictures(), + volume = 1000, + base_level = -1, + pipe_connections = {{ flow_direction = "input", direction = defines.direction.north, position = {1, -4} }} + }, + }, + fluid_boxes_off_when_no_fluid_recipe = true, + collision_box = {{-4.2, -4.2}, {4.2, 4.2}}, + selection_box = {{-4.5, -4.5}, {4.5, 4.5}}, + order = "x[bi]-a[bi-arboretum]", + animation = { + filename = ENTITYPATH .. "Bio_Farm_Idle_alt.png", + priority = "low", + width = 320, + height = 320, + frame_count = 1, + shift = {0.75, 0}, + }, + + working_visualisations = { + animation = { + filename = ENTITYPATH .. "Bio_Farm_Working_alt.png", + priority = "low", + width = 320, + height = 320, + frame_count = 1, + shift = {0.75, 0}, + }, + }, + crafting_categories = {"bi-arboretum"}, + crafting_speed = 0.000000000001, + energy_source = { + type = "electric", + usage_priority = "primary-input", + emissions_per_minute = { pollution = -8 }, -- the "-" means it Absorbs pollution. + }, + energy_usage = "150kW", + ingredient_count = 3, + open_sound = { filename = "__base__/sound/machine-open.ogg", volume = 0.85 }, + close_sound = { filename = "__base__/sound/machine-close.ogg", volume = 0.75 }, + module_specification = {}, + }, }) + +--[[ +local my_seedling = util.table.deepcopy(data.raw.tree["tree-01"]) +my_seedling.name = "seedling" +my_seedling.vehicle_impact_sound = impact_category = "wood" +my_seedling.flags = {"placeable-neutral", "placeable-player", "playeminabler-creation", "breaths-air"} +my_seedling.minable = {mining_particle = "wooden-particle", mining_time = 0.25, result = "seedling", count = 1} +my_seedling.corpse = nil +my_seedling.remains_when_mined = nil +my_seedling.max_health = 5 +my_seedling.collision_box = {{-0.1, -0.1}, {0.1, 0.1}} +my_seedling.selection_box = {{-0.5, -0.5}, {0.5, 0.5}} +my_seedling.emissions_per_second = { pollution = -0.0006 } + +data:extend({my_seedling}) +]] diff --git a/Bio_Industries_2/prototypes/Bio_Farm/item.lua b/Bio_Industries_2/prototypes/Bio_Farm/item.lua index 596f38d..5dffeb7 100644 --- a/Bio_Industries_2/prototypes/Bio_Farm/item.lua +++ b/Bio_Industries_2/prototypes/Bio_Farm/item.lua @@ -1,8 +1,6 @@ local BioInd = require('common')('Bio_Industries_2') local ICONPATH = BioInd.modRoot .. "/graphics/icons/" -local ICONPATH_W = BioInd.modRoot .. "/graphics/icons/weapons/" -local ICONPATH_E = BioInd.modRoot .. "/graphics/icons/entity/" local ICONPATHMIPS = BioInd.modRoot .. "/graphics/icons/mips/" data:extend( @@ -31,8 +29,7 @@ data:extend( order = "x[bi]-a[bi-seed]", fuel_value = "0.5MJ", fuel_category = "chemical", - stack_size= 800, - weight = 0.1 * kg, + stack_size= 800 }, ---- Seedling @@ -51,23 +48,22 @@ data:extend( }, icon_mipmaps = 9, pictures = { - { size = 64, filename = ICONPATHMIPS.."seedling_1.png", scale = 0.25 }, - { size = 64, filename = ICONPATHMIPS.."seedling_2.png", scale = 0.25 }, - { size = 64, filename = ICONPATHMIPS.."seedling_3.png", scale = 0.25 }, - { size = 64, filename = ICONPATHMIPS.."seedling_4.png", scale = 0.25 }, - { size = 64, filename = ICONPATHMIPS.."seedling_5.png", scale = 0.25 }, - { size = 64, filename = ICONPATHMIPS.."seedling_6.png", scale = 0.25 }, - { size = 64, filename = ICONPATHMIPS.."seedling_7.png", scale = 0.25 }, - { size = 64, filename = ICONPATHMIPS.."seedling_8.png", scale = 0.25 }, - { size = 64, filename = ICONPATHMIPS.."seedling_9.png", scale = 0.25 } + { size = 64, filename = ICONPATHMIPS.."Seedling_1.png", scale = 0.25 }, + { size = 64, filename = ICONPATHMIPS.."Seedling_2.png", scale = 0.25 }, + { size = 64, filename = ICONPATHMIPS.."Seedling_3.png", scale = 0.25 }, + { size = 64, filename = ICONPATHMIPS.."Seedling_4.png", scale = 0.25 }, + { size = 64, filename = ICONPATHMIPS.."Seedling_5.png", scale = 0.25 }, + { size = 64, filename = ICONPATHMIPS.."Seedling_6.png", scale = 0.25 }, + { size = 64, filename = ICONPATHMIPS.."Seedling_7.png", scale = 0.25 }, + { size = 64, filename = ICONPATHMIPS.."Seedling_8.png", scale = 0.25 }, + { size = 64, filename = ICONPATHMIPS.."Seedling_9.png", scale = 0.25 } }, subgroup = "bio-bio-farm", order = "x[bi]-b[bi-seedling]", place_result = "seedling", fuel_value = "0.5MJ", fuel_category = "chemical", - stack_size= 400, - weight = 0.2 * kg, + stack_size= 400 }, ----Bio Farm @@ -76,11 +72,11 @@ data:extend( name= "bi-bio-farm", localised_name = {"entity-name.bi-bio-farm"}, localised_description = {"entity-description.bi-bio-farm"}, - icon = ICONPATH_E .. "bio_Farm_Icon.png", + icon = ICONPATH .. "Bio_Farm_Icon.png", icon_size = 64, icons = { { - icon = ICONPATH_E .. "bio_Farm_Icon.png", + icon = ICONPATH .. "Bio_Farm_Icon.png", icon_size = 64, } }, @@ -88,7 +84,6 @@ data:extend( order = "x[bi]-ab[bi-bio-farm]", place_result = "bi-bio-farm", stack_size= 10, - weight = 400 * kg, }, ----Bio Greenhouse (Nursery) @@ -97,11 +92,11 @@ data:extend( name= "bi-bio-greenhouse", localised_name = {"entity-name.bi-bio-greenhouse"}, localised_description = {"entity-description.bi-bio-greenhouse"}, - icon = ICONPATH_E .. "bio_greenhouse.png", + icon = ICONPATH .. "bio_greenhouse.png", icon_size = 64, icons = { { - icon = ICONPATH_E .. "bio_greenhouse.png", + icon = ICONPATH .. "bio_greenhouse.png", icon_size = 64, } }, @@ -109,26 +104,24 @@ data:extend( order = "x[bi]-aa[bi-bio-greenhouse]", place_result = "bi-bio-greenhouse", stack_size= 10, - weight = 250 * kg, }, --- Cokery { type = "item", name = "bi-cokery", - icon = ICONPATH_E .. "cokery.png", + icon = ICONPATH .. "cokery.png", icon_size = 64, icons = { { - icon = ICONPATH_E .. "cokery.png", + icon = ICONPATH .. "cokery.png", icon_size = 64, } }, subgroup = "production-machine", order = "x[bi]-b[bi-cokery]", place_result = "bi-cokery", - stack_size = 10, - weight = 1 * kg, + stack_size = 10 }, --- Stone Crusher @@ -137,19 +130,18 @@ data:extend( name = "bi-stone-crusher", localised_name = {"entity-name.bi-stone-crusher"}, localised_description = {"entity-description.bi-stone-crusher"}, - icon = ICONPATH_E .. "stone_crusher.png", + icon = ICONPATH .. "stone_crusher.png", icon_size = 64, icons = { { - icon = ICONPATH_E .. "stone_crusher.png", + icon = ICONPATH .. "stone_crusher.png", icon_size = 64, } }, subgroup = "production-machine", order = "x[bi]-c[bi-stone-crusher]", place_result = "bi-stone-crusher", - stack_size = 10, - weight = 400 * kg, + stack_size = 10 }, --- Wood Pulp @@ -166,17 +158,16 @@ data:extend( }, icon_mipmaps = 4, pictures = { - { size = 64, filename = ICONPATHMIPS.."woodpulp_1.png", scale = 0.2 }, - { size = 64, filename = ICONPATHMIPS.."woodpulp_2.png", scale = 0.2 }, - { size = 64, filename = ICONPATHMIPS.."woodpulp_3.png", scale = 0.2 }, - { size = 64, filename = ICONPATHMIPS.."woodpulp_4.png", scale = 0.2 } + { size = 64, filename = ICONPATHMIPS.."Woodpulp_1.png", scale = 0.2 }, + { size = 64, filename = ICONPATHMIPS.."Woodpulp_2.png", scale = 0.2 }, + { size = 64, filename = ICONPATHMIPS.."Woodpulp_3.png", scale = 0.2 }, + { size = 64, filename = ICONPATHMIPS.."Woodpulp_4.png", scale = 0.2 } }, fuel_value = "1MJ", fuel_category = "chemical", subgroup = "raw-material", order = "a-b[bi-woodpulp]", - stack_size = 800, - weight = 0.15 * kg, + stack_size = 800 }, --- Wood Bricks @@ -195,8 +186,7 @@ data:extend( order = "a[bi]-a-bx[bi-woodbrick]", fuel_category = "chemical", fuel_value = "20MJ", - stack_size = 200, - weight = 4 * kg, + stack_size = 200 }, @@ -214,15 +204,14 @@ data:extend( }, icon_mipmaps = 4, pictures = { - { size = 64, filename = ICONPATHMIPS.."ash_1.png", scale = 0.2 }, - { size = 64, filename = ICONPATHMIPS.."ash_2.png", scale = 0.2 }, - { size = 64, filename = ICONPATHMIPS.."ash_3.png", scale = 0.2 }, - { size = 64, filename = ICONPATHMIPS.."ash_4.png", scale = 0.2 } + { size = 64, filename = ICONPATHMIPS.."Ash_1.png", scale = 0.2 }, + { size = 64, filename = ICONPATHMIPS.."Ash_2.png", scale = 0.2 }, + { size = 64, filename = ICONPATHMIPS.."Ash_3.png", scale = 0.2 }, + { size = 64, filename = ICONPATHMIPS.."Ash_4.png", scale = 0.2 } }, subgroup = "raw-material", order = "a[bi]-a-b[bi-ash]", - stack_size = 400, - weight = 0.125 * kg, + stack_size = 400 }, --- Charcoal @@ -239,17 +228,16 @@ data:extend( }, icon_mipmaps = 4, pictures = { - { size = 64, filename = ICONPATHMIPS.."charcoal_1.png", scale = 0.2 }, - { size = 64, filename = ICONPATHMIPS.."charcoal_2.png", scale = 0.2 }, - { size = 64, filename = ICONPATHMIPS.."charcoal_3.png", scale = 0.2 }, - { size = 64, filename = ICONPATHMIPS.."charcoal_4.png", scale = 0.2 } + { size = 64, filename = ICONPATHMIPS.."Charcoal_1.png", scale = 0.2 }, + { size = 64, filename = ICONPATHMIPS.."Charcoal_2.png", scale = 0.2 }, + { size = 64, filename = ICONPATHMIPS.."Charcoal_3.png", scale = 0.2 }, + { size = 64, filename = ICONPATHMIPS.."Charcoal_4.png", scale = 0.2 } }, fuel_value = "6MJ", fuel_category = "chemical", subgroup = "raw-material", order = "a[bi]-a-c[charcoal]", - stack_size = 400, - weight = 1 * kg, + stack_size = 400 }, --- Coke Coal / Pellet Coke for Angels @@ -270,8 +258,7 @@ data:extend( fuel_top_speed_multiplier = 1.1, subgroup = "raw-material", order = "a[bi]-a-g[bi-coke-coal]", - stack_size = 400, - weight = 2.5 * kg, + stack_size = 400 }, @@ -289,15 +276,14 @@ data:extend( }, icon_mipmaps = 4, pictures = { - { size = 64, filename = ICONPATHMIPS.."crush_1.png", scale = 0.2 }, - { size = 64, filename = ICONPATHMIPS.."crush_2.png", scale = 0.2 }, - { size = 64, filename = ICONPATHMIPS.."crush_3.png", scale = 0.2 }, - { size = 64, filename = ICONPATHMIPS.."crush_4.png", scale = 0.2 } + { size = 64, filename = ICONPATHMIPS.."Crush_1.png", scale = 0.2 }, + { size = 64, filename = ICONPATHMIPS.."Crush_2.png", scale = 0.2 }, + { size = 64, filename = ICONPATHMIPS.."Crush_3.png", scale = 0.2 }, + { size = 64, filename = ICONPATHMIPS.."Crush_4.png", scale = 0.2 } }, subgroup = "raw-material", order = "a[bi]-a-z[stone-crushed]", - stack_size = 400, - weight = 1 * kg, + stack_size = 400 }, @@ -305,15 +291,15 @@ data:extend( { type = "ammo", name = "bi-seed-bomb-basic", - icon = ICONPATH_W .. "seed_bomb_icon_b.png", + icon = ICONPATH .. "Seed_bomb_icon_b.png", icon_size = 64, icons = { { - icon = ICONPATH_W .. "seed_bomb_icon_b.png", + icon = ICONPATH .. "Seed_bomb_icon_b.png", icon_size = 64, } }, - ammo_category = "rocket", + ammo_category = "bullet", ammo_type = { range_modifier = 3, cooldown_modifier = 3, @@ -330,8 +316,7 @@ data:extend( }, subgroup = "ammo", order = "a[rocket-launcher]-x[seed-bomb]-a", - stack_size = 10, - weight = 5 * kg, + stack_size = 10 }, @@ -339,15 +324,15 @@ data:extend( { type = "ammo", name = "bi-seed-bomb-standard", - icon = ICONPATH_W .. "seed_bomb_icon_s.png", + icon = ICONPATH .. "Seed_bomb_icon_s.png", icon_size = 64, icons = { { - icon = ICONPATH_W .. "seed_bomb_icon_s.png", + icon = ICONPATH .. "Seed_bomb_icon_s.png", icon_size = 64, } }, - ammo_category = "rocket", + ammo_category = "bullet", ammo_type = { range_modifier = 3, cooldown_modifier = 3, @@ -364,8 +349,7 @@ data:extend( }, subgroup = "ammo", order = "a[rocket-launcher]-x[seed-bomb]-b", - stack_size = 10, - weight = 5 * kg, + stack_size = 10 }, @@ -373,15 +357,15 @@ data:extend( { type = "ammo", name = "bi-seed-bomb-advanced", - icon = ICONPATH_W .. "seed_bomb_icon_a.png", + icon = ICONPATH .. "Seed_bomb_icon_a.png", icon_size = 64, icons = { { - icon = ICONPATH_W .. "seed_bomb_icon_a.png", + icon = ICONPATH .. "Seed_bomb_icon_a.png", icon_size = 64, } }, - ammo_category = "rocket", + ammo_category = "bullet", ammo_type = { range_modifier = 3, cooldown_modifier = 3, @@ -398,19 +382,18 @@ data:extend( }, subgroup = "ammo", order = "a[rocket-launcher]-x[seed-bomb]-c", - stack_size = 10, - weight = 5 * kg, + stack_size = 10 }, --- Arboretum (Entity) { type= "item", name= "bi-arboretum-area", - icon = ICONPATH_E .. "arboretum_Icon.png", + icon = ICONPATH .. "Arboretum_Icon.png", icon_size = 64, icons = { { - icon = ICONPATH_E .. "arboretum_Icon.png", + icon = ICONPATH .. "Arboretum_Icon.png", icon_size = 64, } }, @@ -418,7 +401,6 @@ data:extend( order = "x[bi]-a[bi-arboretum]", place_result = "bi-arboretum-area", stack_size= 10, - weight = 400 * kg, }, --- Arboretum Hidden Recipe @@ -530,7 +512,6 @@ data:extend( subgroup = "intermediate-product", order = "b[fertilizer]", stack_size = 200, - weight = 5 * kg, }, --- Adv fertilizer @@ -548,7 +529,6 @@ data:extend( subgroup = "intermediate-product", order = "b[fertilizer]-b[bi-adv-fertilizer]", stack_size = 200, - weight = 5 * kg, }, }) diff --git a/Bio_Industries_2/prototypes/Bio_Farm/liquids.lua b/Bio_Industries_2/prototypes/Bio_Farm/liquids.lua index edd5883..1e30ce9 100644 --- a/Bio_Industries_2/prototypes/Bio_Farm/liquids.lua +++ b/Bio_Industries_2/prototypes/Bio_Farm/liquids.lua @@ -22,7 +22,6 @@ data:extend({ flow_color = {r = 0.1, g = 1.0, b = 0.0}, pressure_to_speed_ratio = 0.4, flow_to_energy_ratio = 0.59, - subgroup = "bio-bio-fuel-fluid", order = "a[fluid]-b[biomass]" }, }) diff --git a/Bio_Industries_2/prototypes/Bio_Farm/pipeConnectors.lua b/Bio_Industries_2/prototypes/Bio_Farm/pipeConnectors.lua index 92a79bd..8df51eb 100644 --- a/Bio_Industries_2/prototypes/Bio_Farm/pipeConnectors.lua +++ b/Bio_Industries_2/prototypes/Bio_Farm/pipeConnectors.lua @@ -1,7 +1,6 @@ local BioInd = require('common')('Bio_Industries_2') local ICONPATH = BioInd.modRoot .. "/graphics/icons/" -local ENTITYPATH_BIO = "__Bio_Industries_2__/graphics/entities/" function assembler2pipepicturesCokery() @@ -191,28 +190,28 @@ function BioFarm_Pipe_Connectors_Left() return { north = { - filename = ENTITYPATH_BIO .. "bio_farm/biofarm_pipes/Bio_Farm-pipe-N_l.png", + filename = "__Bio_Industries_2__/graphics/entities/biofarm/pipe_connections/Bio_Farm-pipe-N_l.png", priority = "extra-high", width = 51, height = 35, shift = {0.25, 1}, }, east = { - filename = ENTITYPATH_BIO .. "bio_farm/biofarm_pipes/Bio_Farm-pipe-E_l.png", + filename = "__Bio_Industries_2__/graphics/entities/biofarm/pipe_connections/Bio_Farm-pipe-E_l.png", priority = "extra-high", width = 18, height = 48, shift = {-1, -0.25}, }, south = { - filename = ENTITYPATH_BIO .. "bio_farm/biofarm_pipes/Bio_Farm-pipe-S_l.png", + filename = "__Bio_Industries_2__/graphics/entities/biofarm/pipe_connections/Bio_Farm-pipe-S_l.png", priority = "extra-high", width = 49, height = 25, shift = {0.5, -1}, }, west = { - filename = ENTITYPATH_BIO .. "bio_farm/biofarm_pipes/Bio_Farm-pipe-W_l.png", + filename = "__Bio_Industries_2__/graphics/entities/biofarm/pipe_connections/Bio_Farm-pipe-W_l.png", priority = "extra-high", width = 16, height = 51, diff --git a/Bio_Industries_2/prototypes/Bio_Farm/recipe.lua b/Bio_Industries_2/prototypes/Bio_Farm/recipe.lua index 078d23f..2e1a479 100644 --- a/Bio_Industries_2/prototypes/Bio_Farm/recipe.lua +++ b/Bio_Industries_2/prototypes/Bio_Farm/recipe.lua @@ -1,1505 +1,1501 @@ local BioInd = require('common')('Bio_Industries_2') + local ICONPATH = BioInd.modRoot .. "/graphics/icons/" -local ICONPATH_W = BioInd.modRoot .. "/graphics/icons/weapons/" -local ICONPATH_E = BioInd.modRoot .. "/graphics/icons/entity/" -local ICONPATHMIPS = BioInd.modRoot .. "/graphics/icons/mips/" data:extend({ - --- Seeds from Water (BASIC) - { - type = "recipe", - name = "bi-seed-1", + --- Seeds from Water (BASIC) + { + type = "recipe", + name = "bi-seed-1", + icon = ICONPATH .. "bio_seed1.png", + icon_size = 64, + icons = { + { icon = ICONPATH .. "bio_seed1.png", icon_size = 64, - icons = { - { - icon = ICONPATH .. "bio_seed1.png", - icon_size = 64, - } - }, - category = "biofarm-mod-greenhouse", - energy_required = 200, - ingredients = { - { type = "fluid", name = "water", amount = 100 }, - { type = "item", name = "wood", amount = 20 }, - }, - results = { - { type = "item", name = "bi-seed", amount = 40 }, - }, - main_product = "", - enabled = false, - always_show_made_in = true, - allow_decomposition = false, - subgroup = "bio-bio-farm-fluid-1", - order = "a[bi]-ssw-a1[bi-seed-1]", - -- This is a custom property for use by "Krastorio 2" (it will change - -- ingredients/results; used for wood/wood pulp) - mod = "Bio_Industries_2", + } }, + category = "biofarm-mod-greenhouse", + energy_required = 200, + ingredients = { + {type = "fluid", name = "water", amount = 100}, + {type = "item", name = "wood", amount = 20}, + }, + results = { + {type = "item", name = "bi-seed", amount = 40}, + }, + main_product = "", + enabled = false, + always_show_made_in = true, + allow_decomposition = false, + subgroup = "bio-bio-farm-fluid-1", + order = "a[bi]-ssw-a1[bi-seed-1]", + -- This is a custom property for use by "Krastorio 2" (it will change + -- ingredients/results; used for wood/wood pulp) + mod = "Bio_Industries_2", + }, - --- Seeds from Water & Ash - { - type = "recipe", - name = "bi-seed-2", + --- Seeds from Water & Ash + { + type = "recipe", + name = "bi-seed-2", + icon = ICONPATH .. "bio_seed2.png", + icon_size = 64, + icons = { + { icon = ICONPATH .. "bio_seed2.png", icon_size = 64, - icons = { - { - icon = ICONPATH .. "bio_seed2.png", - icon_size = 64, - } - }, - category = "biofarm-mod-greenhouse", - energy_required = 150, - ingredients = { - { type = "fluid", name = "water", amount = 40 }, - { type = "item", name = "wood", amount = 20 }, - { type = "item", name = "bi-ash", amount = 10 }, - }, - results = { - { type = "item", name = "bi-seed", amount = 50 }, - }, - main_product = "", - enabled = false, - always_show_made_in = true, - allow_decomposition = false, - subgroup = "bio-bio-farm-fluid-1", - order = "a[bi]-ssw-a1[bi-seed-2]", - -- This is a custom property for use by "Krastorio 2" (it will change - -- ingredients/results; used for wood/wood pulp) - mod = "Bio_Industries_2", + } }, + category = "biofarm-mod-greenhouse", + energy_required = 150, + ingredients = { + {type = "fluid", name = "water", amount = 40}, + {type = "item", name = "wood", amount = 20}, + {type = "item", name = "bi-ash", amount = 10}, + }, + results = { + {type = "item", name = "bi-seed", amount = 50}, + }, + main_product = "", + enabled = false, + always_show_made_in = true, + allow_decomposition = false, + subgroup = "bio-bio-farm-fluid-1", + order = "a[bi]-ssw-a1[bi-seed-2]", + -- This is a custom property for use by "Krastorio 2" (it will change + -- ingredients/results; used for wood/wood pulp) + mod = "Bio_Industries_2", + }, - --- Seeds from Water & fertilizer - { - type = "recipe", - name = "bi-seed-3", + --- Seeds from Water & fertilizer + { + type = "recipe", + name = "bi-seed-3", + icon = ICONPATH .. "bio_seed3.png", + icon_size = 64, + icons = { + { icon = ICONPATH .. "bio_seed3.png", icon_size = 64, - icons = { - { - icon = ICONPATH .. "bio_seed3.png", - icon_size = 64, - } - }, - category = "biofarm-mod-greenhouse", - energy_required = 100, - ingredients = { - { type = "fluid", name = "water", amount = 40 }, - { type = "item", name = "wood", amount = 20 }, - { type = "item", name = "fertilizer", amount = 10 }, - }, - results = { - { type = "item", name = "bi-seed", amount = 60 }, - }, - main_product = "", - enabled = false, - always_show_made_in = true, - allow_decomposition = false, - subgroup = "bio-bio-farm-fluid-1", - order = "a[bi]-ssw-a1[bi-seed-3]", - -- This is a custom property for use by "Krastorio 2" (it will change - -- ingredients/results; used for wood/wood pulp) - mod = "Bio_Industries_2", + } }, + category = "biofarm-mod-greenhouse", + energy_required = 100, + ingredients = { + {type = "fluid", name = "water", amount = 40}, + {type = "item", name = "wood", amount = 20}, + {type = "item", name = "fertilizer", amount = 10}, + }, + results = { + {type = "item", name = "bi-seed", amount = 60}, + }, + main_product = "", + enabled = false, + always_show_made_in = true, + allow_decomposition = false, + subgroup = "bio-bio-farm-fluid-1", + order = "a[bi]-ssw-a1[bi-seed-3]", + -- This is a custom property for use by "Krastorio 2" (it will change + -- ingredients/results; used for wood/wood pulp) + mod = "Bio_Industries_2", + }, - --- Seeds from Water & Adv-fertilizer - { - type = "recipe", - name = "bi-seed-4", + --- Seeds from Water & Adv-fertilizer + { + type = "recipe", + name = "bi-seed-4", + icon = ICONPATH .. "bio_seed4.png", + icon_size = 64, + icons = { + { icon = ICONPATH .. "bio_seed4.png", icon_size = 64, - icons = { - { - icon = ICONPATH .. "bio_seed4.png", - icon_size = 64, - } - }, - category = "biofarm-mod-greenhouse", - energy_required = 50, - ingredients = { - { type = "item", name = "wood", amount = 20 }, - { type = "item", name = "bi-adv-fertilizer", amount = 10 }, - { type = "fluid", name = "water", amount = 40 }, - }, - results = { - { type = "item", name = "bi-seed", amount = 80 }, - }, - main_product = "", - enabled = false, - always_show_made_in = true, - allow_decomposition = false, - subgroup = "bio-bio-farm-fluid-1", - order = "a[bi]-ssw-a1[bi-seed-4]", - -- This is a custom property for use by "Krastorio 2" (it will change - -- ingredients/results; used for wood/wood pulp) - mod = "Bio_Industries_2", + } }, + category = "biofarm-mod-greenhouse", + energy_required = 50, + ingredients = { + {type = "item", name = "wood", amount = 20}, + {type = "item", name = "bi-adv-fertilizer", amount = 10}, + {type = "fluid", name = "water", amount = 40}, + }, + results = { + {type = "item", name = "bi-seed", amount = 80}, + }, + main_product = "", + enabled = false, + always_show_made_in = true, + allow_decomposition = false, + subgroup = "bio-bio-farm-fluid-1", + order = "a[bi]-ssw-a1[bi-seed-4]", + -- This is a custom property for use by "Krastorio 2" (it will change + -- ingredients/results; used for wood/wood pulp) + mod = "Bio_Industries_2", + }, - --- Seedlings from Water (BASIC) - { - type = "recipe", - name = "bi-seedling-1", + --- Seedlings from Water (BASIC) + { + type = "recipe", + name = "bi-seedling-1", + icon = ICONPATH .. "Seedling1.png", + icon_size = 64, + icons = { + { icon = ICONPATH .. "Seedling1.png", icon_size = 64, - icons = { - { - icon = ICONPATH .. "Seedling1.png", - icon_size = 64, - } - }, - category = "biofarm-mod-greenhouse", - energy_required = 400, - ingredients = { - { type = "item", name = "bi-seed", amount = 20 }, - { type = "fluid", name = "water", amount = 100 }, - }, - results = { - { type = "item", name = "seedling", amount = 40 }, - }, - main_product = "", - enabled = false, - always_show_made_in = true, - allow_decomposition = false, - subgroup = "bio-bio-farm-fluid-2", - order = "b[bi]-ssw-b1[bi-Seedling_Mk1]", - -- This is a custom property for use by "Krastorio 2" (it will change - -- ingredients/results; used for wood/wood pulp) - mod = "Bio_Industries_2", + } }, + category = "biofarm-mod-greenhouse", + energy_required = 400, + ingredients = { + {type = "item", name = "bi-seed", amount = 20}, + {type = "fluid", name = "water", amount = 100}, + }, + results = { + {type = "item", name = "seedling", amount = 40}, + }, + main_product = "", + enabled = false, + always_show_made_in = true, + allow_decomposition = false, + subgroup = "bio-bio-farm-fluid-2", + order = "b[bi]-ssw-b1[bi-Seedling_Mk1]", + -- This is a custom property for use by "Krastorio 2" (it will change + -- ingredients/results; used for wood/wood pulp) + mod = "Bio_Industries_2", + }, - --- Seedlings from Water & Ash - { - type = "recipe", - name = "bi-seedling-2", + --- Seedlings from Water & Ash + { + type = "recipe", + name = "bi-seedling-2", + icon = ICONPATH .. "Seedling2.png", + icon_size = 64, + icons = { + { icon = ICONPATH .. "Seedling2.png", icon_size = 64, - icons = { - { - icon = ICONPATH .. "Seedling2.png", - icon_size = 64, - } - }, - category = "biofarm-mod-greenhouse", - energy_required = 300, - ingredients = { - { type = "item", name = "bi-seed", amount = 25 }, - { type = "item", name = "bi-ash", amount = 10 }, - { type = "fluid", name = "water", amount = 100 }, - }, - results = { - { type = "item", name = "seedling", amount = 60 }, - }, - main_product = "", - enabled = false, - always_show_made_in = true, - allow_decomposition = false, - subgroup = "bio-bio-farm-fluid-2", - order = "b[bi]-ssw-b1[bi-Seedling_Mk2]", - -- This is a custom property for use by "Krastorio 2" (it will change - -- ingredients/results; used for wood/wood pulp) - mod = "Bio_Industries_2", + } }, + category = "biofarm-mod-greenhouse", + energy_required = 300, + ingredients = { + {type = "item", name = "bi-seed", amount = 25}, + {type = "item", name = "bi-ash", amount = 10}, + {type = "fluid", name = "water", amount = 100}, + }, + results = { + {type = "item", name = "seedling", amount = 60}, + }, + main_product = "", + enabled = false, + always_show_made_in = true, + allow_decomposition = false, + subgroup = "bio-bio-farm-fluid-2", + order = "b[bi]-ssw-b1[bi-Seedling_Mk2]", + -- This is a custom property for use by "Krastorio 2" (it will change + -- ingredients/results; used for wood/wood pulp) + mod = "Bio_Industries_2", + }, - --- Seedlings from Water & fertilizer - { - type = "recipe", - name = "bi-seedling-3", + --- Seedlings from Water & fertilizer + { + type = "recipe", + name = "bi-seedling-3", + icon = ICONPATH .. "Seedling3.png", + icon_size = 64, + icons = { + { icon = ICONPATH .. "Seedling3.png", icon_size = 64, - icons = { - { - icon = ICONPATH .. "Seedling3.png", - icon_size = 64, - } - }, - category = "biofarm-mod-greenhouse", - energy_required = 200, - ingredients = { - { type = "item", name = "bi-seed", amount = 30 }, - { type = "item", name = "fertilizer", amount = 10 }, - { type = "fluid", name = "water", amount = 100 }, - }, - results = { - { type = "item", name = "seedling", amount = 90 }, - }, - main_product = "", - enabled = false, - always_show_made_in = true, - subgroup = "bio-bio-farm-fluid-2", - order = "b[bi]-ssw-b1[bi-Seedling_Mk3]", - -- This is a custom property for use by "Krastorio 2" (it will change - -- ingredients/results; used for wood/wood pulp) - mod = "Bio_Industries_2", + } }, + category = "biofarm-mod-greenhouse", + energy_required = 200, + ingredients = { + {type = "item", name = "bi-seed", amount = 30}, + {type = "item", name = "fertilizer", amount = 10}, + {type = "fluid", name = "water", amount = 100}, + }, + results = { + {type = "item", name = "seedling", amount = 90}, + }, + main_product = "", + enabled = false, + always_show_made_in = true, + subgroup = "bio-bio-farm-fluid-2", + order = "b[bi]-ssw-b1[bi-Seedling_Mk3]", + -- This is a custom property for use by "Krastorio 2" (it will change + -- ingredients/results; used for wood/wood pulp) + mod = "Bio_Industries_2", + }, - --- Seedlings from Water & Adv-fertilizer - { - type = "recipe", - name = "bi-seedling-4", + --- Seedlings from Water & Adv-fertilizer + { + type = "recipe", + name = "bi-seedling-4", + icon = ICONPATH .. "Seedling4.png", + icon_size = 64, + icons = { + { icon = ICONPATH .. "Seedling4.png", icon_size = 64, - icons = { - { - icon = ICONPATH .. "Seedling4.png", - icon_size = 64, - } - }, - category = "biofarm-mod-greenhouse", - energy_required = 100, - ingredients = { - { type = "item", name = "bi-seed", amount = 40 }, - { type = "fluid", name = "water", amount = 100 }, - { type = "item", name = "bi-adv-fertilizer", amount = 10 }, - }, - results = { - { type = "item", name = "seedling", amount = 160 }, - }, - main_product = "", - enabled = false, - always_show_made_in = true, - allow_decomposition = false, - subgroup = "bio-bio-farm-fluid-2", - order = "b[bi]-ssw-b1[bi-Seedling_Mk4]", - -- This is a custom property for use by "Krastorio 2" (it will change - -- ingredients/results; used for wood/wood pulp) - mod = "Bio_Industries_2", + } }, + category = "biofarm-mod-greenhouse", + energy_required = 100, + ingredients = { + {type = "item", name = "bi-seed", amount = 40}, + {type = "fluid", name = "water", amount = 100}, + {type = "item", name = "bi-adv-fertilizer", amount = 10}, + }, + results = { + {type = "item", name = "seedling", amount = 160}, + }, + main_product = "", + enabled = false, + always_show_made_in = true, + allow_decomposition = false, + subgroup = "bio-bio-farm-fluid-2", + order = "b[bi]-ssw-b1[bi-Seedling_Mk4]", + -- This is a custom property for use by "Krastorio 2" (it will change + -- ingredients/results; used for wood/wood pulp) + mod = "Bio_Industries_2", + }, - --- Raw Wood from Water (BASIC) - { - type = "recipe", - name = "bi-logs-1", + --- Raw Wood from Water (BASIC) + { + type = "recipe", + name = "bi-logs-1", + icon = ICONPATH .. "raw-wood-mk1.png", + icon_size = 64, + icons = { + { icon = ICONPATH .. "raw-wood-mk1.png", icon_size = 64, - icons = { - { - icon = ICONPATH .. "raw-wood-mk1.png", - icon_size = 64, - } - }, - category = "biofarm-mod-farm", - enabled = false, - always_show_made_in = true, - allow_decomposition = false, - energy_required = 400, - ingredients = { - { type = "item", name = "seedling", amount = 20 }, - { type = "fluid", name = "water", amount = 100 }, - }, - results = { - { type = "item", name = "wood", amount = 40 }, - { type = "item", name = "bi-woodpulp", amount = 80 }, - }, - main_product = "", - subgroup = "bio-bio-farm-fluid-3", - order = "c[bi]-ssw-c1[raw-wood1]", - -- This is a custom property for use by "Krastorio 2" (it will change - -- ingredients/results; used for wood/wood pulp) - mod = "Bio_Industries_2", + } }, + category = "biofarm-mod-farm", + enabled = false, + always_show_made_in = true, + allow_decomposition = false, + energy_required = 400, + ingredients = { + {type = "item", name = "seedling", amount = 20}, + {type = "fluid", name = "water", amount = 100}, + }, + results = { + {type = "item", name = "wood", amount = 40}, + {type = "item", name = "bi-woodpulp", amount = 80}, + }, + main_product = "", + subgroup = "bio-bio-farm-fluid-3", + order = "c[bi]-ssw-c1[raw-wood1]", + -- This is a custom property for use by "Krastorio 2" (it will change + -- ingredients/results; used for wood/wood pulp) + mod = "Bio_Industries_2", + }, - --- Raw Wood from Water & Ash - { - type = "recipe", - name = "bi-logs-2", + --- Raw Wood from Water & Ash + { + type = "recipe", + name = "bi-logs-2", + icon = ICONPATH .. "raw-wood-mk2.png", + icon_size = 64, + icons = { + { icon = ICONPATH .. "raw-wood-mk2.png", icon_size = 64, - icons = { - { - icon = ICONPATH .. "raw-wood-mk2.png", - icon_size = 64, - } - }, - category = "biofarm-mod-farm", - enabled = false, - always_show_made_in = true, - allow_decomposition = false, - energy_required = 360, - ingredients = { - { type = "item", name = "seedling", amount = 30 }, - { type = "item", name = "bi-ash", amount = 10 }, - { type = "fluid", name = "water", amount = 100 }, - }, - results = { - { type = "item", name = "wood", amount = 75 }, - { type = "item", name = "bi-woodpulp", amount = 150 }, - }, - main_product = "", - subgroup = "bio-bio-farm-fluid-3", - order = "c[bi]-ssw-c1[raw-wood2]", - -- This is a custom property for use by "Krastorio 2" (it will change - -- ingredients/results; used for wood/wood pulp) - mod = "Bio_Industries_2", + } }, + category = "biofarm-mod-farm", + enabled = false, + always_show_made_in = true, + allow_decomposition = false, + energy_required = 360, + ingredients = { + {type = "item", name = "seedling", amount = 30}, + {type = "item", name = "bi-ash", amount = 10}, + {type = "fluid", name = "water", amount = 100}, + }, + results = { + {type = "item", name = "wood", amount = 75}, + {type = "item", name = "bi-woodpulp", amount = 150}, + }, + main_product = "", + subgroup = "bio-bio-farm-fluid-3", + order = "c[bi]-ssw-c1[raw-wood2]", + -- This is a custom property for use by "Krastorio 2" (it will change + -- ingredients/results; used for wood/wood pulp) + mod = "Bio_Industries_2", + }, - --- Raw Wood from Water & fertilizer - { - type = "recipe", - name = "bi-logs-3", + --- Raw Wood from Water & fertilizer + { + type = "recipe", + name = "bi-logs-3", + icon = ICONPATH .. "raw-wood-mk3.png", + icon_size = 64, + icons = { + { icon = ICONPATH .. "raw-wood-mk3.png", icon_size = 64, - icons = { - { - icon = ICONPATH .. "raw-wood-mk3.png", - icon_size = 64, - } - }, - category = "biofarm-mod-farm", - enabled = false, - always_show_made_in = true, - allow_decomposition = false, - energy_required = 300, - ingredients = { - { type = "item", name = "seedling", amount = 45 }, - { type = "item", name = "fertilizer", amount = 10 }, - { type = "fluid", name = "water", amount = 100 }, - }, - results = { - { type = "item", name = "wood", amount = 135 }, - { type = "item", name = "bi-woodpulp", amount = 270 }, - }, - main_product = "", - subgroup = "bio-bio-farm-fluid-3", - order = "c[bi]-ssw-c1[raw-wood3]", - -- This is a custom property for use by "Krastorio 2" (it will change - -- ingredients/results; used for wood/wood pulp) - mod = "Bio_Industries_2", + } }, + category = "biofarm-mod-farm", + enabled = false, + always_show_made_in = true, + allow_decomposition = false, + energy_required = 300, + ingredients = { + {type = "item", name = "seedling", amount = 45}, + {type = "item", name = "fertilizer", amount = 10}, + {type = "fluid", name = "water", amount = 100}, + }, + results = { + {type = "item", name = "wood", amount = 135}, + {type = "item", name = "bi-woodpulp", amount = 270}, + }, + main_product = "", + subgroup = "bio-bio-farm-fluid-3", + order = "c[bi]-ssw-c1[raw-wood3]", + -- This is a custom property for use by "Krastorio 2" (it will change + -- ingredients/results; used for wood/wood pulp) + mod = "Bio_Industries_2", + }, - --- Raw Wood from adv-fertilizer - { - type = "recipe", - name = "bi-logs-4", + --- Raw Wood from adv-fertilizer + { + type = "recipe", + name = "bi-logs-4", + icon = ICONPATH .. "raw-wood-mk4.png", + icon_size = 64, + icons = { + { icon = ICONPATH .. "raw-wood-mk4.png", icon_size = 64, - icons = { - { - icon = ICONPATH .. "raw-wood-mk4.png", - icon_size = 64, - } - }, - category = "biofarm-mod-farm", - enabled = false, - always_show_made_in = true, - allow_decomposition = false, - energy_required = 100, - ingredients = { - { type = "item", name = "seedling", amount = 40 }, - { type = "fluid", name = "water", amount = 100 }, - { type = "item", name = "bi-adv-fertilizer", amount = 5 }, - }, - results = { - { type = "item", name = "wood", amount = 160 }, - { type = "item", name = "bi-woodpulp", amount = 320 }, - }, - main_product = "", - subgroup = "bio-bio-farm-fluid-3", - order = "c[bi]-ssw-c1[raw-wood4]", - -- This is a custom property for use by "Krastorio 2" (it will change - -- ingredients/results; used for wood/wood pulp) - mod = "Bio_Industries_2", + } }, + category = "biofarm-mod-farm", + enabled = false, + always_show_made_in = true, + allow_decomposition = false, + energy_required = 100, + ingredients = { + {type = "item", name = "seedling", amount = 40}, + {type = "fluid", name = "water", amount = 100}, + {type = "item", name = "bi-adv-fertilizer", amount = 5}, + }, + results = { + {type = "item", name = "wood", amount = 160}, + {type = "item", name = "bi-woodpulp", amount = 320}, + }, + main_product = "", + subgroup = "bio-bio-farm-fluid-3", + order = "c[bi]-ssw-c1[raw-wood4]", + -- This is a custom property for use by "Krastorio 2" (it will change + -- ingredients/results; used for wood/wood pulp) + mod = "Bio_Industries_2", + }, - --- Bio Greenhouse (ENTITY) - { - type = "recipe", - name = "bi-bio-greenhouse", - localised_name = { "entity-name.bi-bio-greenhouse" }, - localised_description = { "entity-description.bi-bio-greenhouse" }, - icon = ICONPATH_E .. "bio_greenhouse.png", + --- Bio Greenhouse (ENTITY) + { + type = "recipe", + name = "bi-bio-greenhouse", + localised_name = {"entity-name.bi-bio-greenhouse"}, + localised_description = {"entity-description.bi-bio-greenhouse"}, + icon = ICONPATH .. "bio_greenhouse.png", + icon_size = 64, + icons = { + { + icon = ICONPATH .. "bio_greenhouse.png", icon_size = 64, - icons = { - { - icon = ICONPATH_E .. "bio_greenhouse.png", - icon_size = 64, - } - }, - enabled = false, - energy_required = 2.5, - ingredients = { - { type = "item", name = "iron-stick", amount = 10 }, - { type = "item", name = "stone-brick", amount = 10 }, - { type = "item", name = "small-lamp", amount = 5 }, - }, - results = { { type = "item", name = "bi-bio-greenhouse", amount = 1 } }, - main_product = "", - allow_as_intermediate = true, -- Added for 0.18.34/1.1.4 - always_show_made_in = false, -- Added for 0.18.34/1.1.4 - allow_decomposition = false, -- Added for 0.18.34/1.1.4 - subgroup = "bio-bio-farm-fluid-entity", - order = "a[bi]", + } }, + enabled = false, + energy_required = 2.5, + ingredients = { + {type="item", name="iron-stick", amount=10}, + {type="item", name="stone-brick", amount=10}, + {type="item", name="small-lamp", amount=5}, + }, + results = {{type="item", name="bi-bio-greenhouse", amount=1}}, + main_product = "", + allow_as_intermediate = true, -- Added for 0.18.34/1.1.4 + always_show_made_in = false, -- Added for 0.18.34/1.1.4 + allow_decomposition = false, -- Added for 0.18.34/1.1.4 + subgroup = "bio-bio-farm-fluid-entity", + order = "a[bi]", + }, - --- Bio Farm (ENTITY) - { - type = "recipe", - name = "bi-bio-farm", - localised_name = { "entity-name.bi-bio-farm" }, - localised_description = { "entity-description.bi-bio-farm" }, - icon = ICONPATH_E .. "bio_Farm_Icon.png", + --- Bio Farm (ENTITY) + { + type = "recipe", + name = "bi-bio-farm", + localised_name = {"entity-name.bi-bio-farm"}, + localised_description = {"entity-description.bi-bio-farm"}, + icon = ICONPATH .. "Bio_Farm_Icon.png", + icon_size = 64, + icons = { + { + icon = ICONPATH .. "Bio_Farm_Icon.png", icon_size = 64, - icons = { - { - icon = ICONPATH_E .. "bio_Farm_Icon.png", - icon_size = 64, - } - }, - enabled = false, - energy_required = 5, - ingredients = { - { type = "item", name = "bi-bio-greenhouse", amount = 4 }, - { type = "item", name = "stone-crushed", amount = 10 }, - { type = "item", name = "copper-cable", amount = 10 }, - }, - results = { { type = "item", name = "bi-bio-farm", amount = 1 } }, - main_product = "", - allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 - always_show_made_in = false, -- Added for 0.18.34/1.1.4 - allow_decomposition = true, -- Added for 0.18.34/1.1.4 - subgroup = "bio-bio-farm-fluid-entity", - order = "b[bi]", + } }, + enabled = false, + energy_required = 5, + ingredients = { + {type="item", name="bi-bio-greenhouse", amount=4}, + {type="item", name="stone-crushed", amount=10}, + {type="item", name="copper-cable", amount=10}, + }, + results = {{type="item", name="bi-bio-farm", amount=1}}, + main_product = "", + allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 + always_show_made_in = false, -- Added for 0.18.34/1.1.4 + allow_decomposition = true, -- Added for 0.18.34/1.1.4 + subgroup = "bio-bio-farm-fluid-entity", + order = "b[bi]", + }, - -- Woodpulp-- - { - type = "recipe", - name = "bi-woodpulp", + -- Woodpulp-- + { + type = "recipe", + name = "bi-woodpulp", + icon = ICONPATH .. "Woodpulp_raw-wood.png", + icon_size = 64, + icons = { + { icon = ICONPATH .. "Woodpulp_raw-wood.png", icon_size = 64, - icons = { - { - icon = ICONPATH .. "Woodpulp_raw-wood.png", - icon_size = 64, - } - }, - subgroup = "bio-bio-farm-raw", - order = "a[bi]-a-a[bi-1-woodpulp]", - enabled = false, - energy_required = 2, - ingredients = { { type = "item", name = "wood", amount = 2 } }, - results = { { type = "item", name = "bi-woodpulp", amount = 4 } }, - main_product = "", - allow_as_intermediate = true, -- Added for 0.18.34/1.1.4 - allow_intermediates = true, -- Added for 0.18.35/1.1.5 - always_show_made_in = false, -- Added for 0.18.34/1.1.4 - allow_decomposition = false, -- Added for 0.18.34/1.1.4 - -- This is a custom property for use by "Krastorio 2" (it will change - -- ingredients/results; used for wood/wood pulp) - mod = "Bio_Industries_2", + } }, + subgroup = "bio-bio-farm-raw", + order = "a[bi]-a-a[bi-1-woodpulp]", + enabled = false, + energy_required = 2, + ingredients = {{type="item", name="wood", amount=2}}, + results = {{type="item", name="bi-woodpulp", amount=4}}, + main_product = "", + allow_as_intermediate = true, -- Added for 0.18.34/1.1.4 + allow_intermediates = true, -- Added for 0.18.35/1.1.5 + always_show_made_in = false, -- Added for 0.18.34/1.1.4 + allow_decomposition = false, -- Added for 0.18.34/1.1.4 + -- This is a custom property for use by "Krastorio 2" (it will change + -- ingredients/results; used for wood/wood pulp) + mod = "Bio_Industries_2", + }, - --- Resin recipe Pulp - { - type = "recipe", - name = "bi-resin-pulp", + --- Resin recipe Pulp + { + type = "recipe", + name = "bi-resin-pulp", + icon = ICONPATH .. "bi_resin_pulp.png", + icon_size = 64, + icons = { + { icon = ICONPATH .. "bi_resin_pulp.png", icon_size = 64, - icons = { - { - icon = ICONPATH .. "bi_resin_pulp.png", - icon_size = 64, - } - }, - subgroup = "bio-bio-farm-raw", - order = "a[bi]-a-ba[bi-2-resin-2-pulp]", - enabled = false, - energy_required = 1, - ingredients = { - { type = "item", name = "bi-woodpulp", amount = 3 }, - }, - results = { { type = "item", name = "resin", amount = 1 } }, - main_product = "", - allow_as_intermediate = true, -- Added for 0.18.34/1.1.4 - always_show_made_in = false, -- Added for 0.18.34/1.1.4 - allow_decomposition = false, -- Added for 0.18.34/1.1.4 - -- This is a custom property for use by "Krastorio 2" (it will change - -- ingredients/results; used for wood/wood pulp) - mod = "Bio_Industries_2", + } }, + subgroup = "bio-bio-farm-raw", + order = "a[bi]-a-ba[bi-2-resin-2-pulp]", + enabled = false, + energy_required = 1, + ingredients = { + {type = "item", name = "bi-woodpulp", amount = 3}, + }, + results = {{type="item", name="resin", amount=1}}, + main_product = "", + allow_as_intermediate = true, -- Added for 0.18.34/1.1.4 + always_show_made_in = false, -- Added for 0.18.34/1.1.4 + allow_decomposition = false, -- Added for 0.18.34/1.1.4 + -- This is a custom property for use by "Krastorio 2" (it will change + -- ingredients/results; used for wood/wood pulp) + mod = "Bio_Industries_2", + }, - -- Wood from pulp-- - { - type = "recipe", - name = "bi-wood-from-pulp", + -- Wood from pulp-- + { + type = "recipe", + name = "bi-wood-from-pulp", + icon = ICONPATH .. "wood_from_pulp.png", + icon_size = 64, + icons = { + { icon = ICONPATH .. "wood_from_pulp.png", icon_size = 64, - icons = { - { - icon = ICONPATH .. "wood_from_pulp.png", - icon_size = 64, - } - }, - subgroup = "bio-bio-farm-raw", - order = "a[bi]-a-c[bi-3-wood_from_pulp]", - enabled = false, - energy_required = 2.5, - ingredients = { - { type = "item", name = "bi-woodpulp", amount = 8 }, - { type = "item", name = "resin", amount = 2 }, - }, - results = { { type = "item", name = "wood", amount = 4 } }, - main_product = "", - allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 - always_show_made_in = false, -- Added for 0.18.34/1.1.4 - allow_decomposition = false, -- Added for 0.18.34/1.1.4 - -- This is a custom property for use by "Krastorio 2" (it will change - -- ingredients/results; used for wood/wood pulp) - mod = "Bio_Industries_2", + } }, + subgroup = "bio-bio-farm-raw", + order = "a[bi]-a-c[bi-3-wood_from_pulp]", + enabled = false, + energy_required = 2.5, + ingredients = { + {type = "item", name = "bi-woodpulp", amount = 8}, + {type = "item", name = "resin", amount = 2}, + }, + results = {{type="item", name="wood", amount=4}}, + main_product = "", + allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 + always_show_made_in = false, -- Added for 0.18.34/1.1.4 + allow_decomposition = false, -- Added for 0.18.34/1.1.4 + -- This is a custom property for use by "Krastorio 2" (it will change + -- ingredients/results; used for wood/wood pulp) + mod = "Bio_Industries_2", + }, - -- Wood Fuel Brick - { - type = "recipe", - name = "bi-wood-fuel-brick", + -- Wood Fuel Brick + { + type = "recipe", + name = "bi-wood-fuel-brick", + icon = ICONPATH .. "Fuel_Brick.png", + icon_size = 64, + icons = { + { icon = ICONPATH .. "Fuel_Brick.png", icon_size = 64, - icons = { - { - icon = ICONPATH .. "Fuel_Brick.png", - icon_size = 64, - } - }, - subgroup = "bio-bio-farm-raw", - order = "a[bi]-a-bx[bi-4-woodbrick]", - energy_required = 2, - ingredients = { { type = "item", name = "bi-woodpulp", amount = 24 } }, - results = { { type = "item", name = "wood-bricks", amount = 1 } }, - main_product = "", - enabled = false, - allow_as_intermediate = true, -- Changed for 0.18.34/1.1.4 - always_show_made_in = false, -- Changed for 0.18.34/1.1.4 - allow_decomposition = true, -- Changed for 0.18.34/1.1.4 - -- This is a custom property for use by "Krastorio 2" (it will change - -- ingredients/results; used for wood/wood pulp) - mod = "Bio_Industries_2", + } }, + subgroup = "bio-bio-farm-raw", + order = "a[bi]-a-bx[bi-4-woodbrick]", + energy_required = 2, + ingredients = {{type="item", name="bi-woodpulp", amount=24}}, + results = {{type="item", name="wood-bricks", amount=1}}, + main_product = "", + enabled = false, + allow_as_intermediate = true, -- Changed for 0.18.34/1.1.4 + always_show_made_in = false, -- Changed for 0.18.34/1.1.4 + allow_decomposition = true, -- Changed for 0.18.34/1.1.4 + -- This is a custom property for use by "Krastorio 2" (it will change + -- ingredients/results; used for wood/wood pulp) + mod = "Bio_Industries_2", + }, - -- ASH -- - { - type = "recipe", - name = "bi-ash-1", + -- ASH -- + { + type = "recipe", + name = "bi-ash-1", + icon = ICONPATH .. "ash_raw-wood.png", + icon_size = 64, + icons = { + { icon = ICONPATH .. "ash_raw-wood.png", icon_size = 64, - icons = { - { - icon = ICONPATH .. "ash_raw-wood.png", - icon_size = 64, - } - }, - category = "biofarm-mod-smelting", - subgroup = "bio-bio-farm-raw", - order = "a[bi]-a-cb[bi-5-ash-1]", - enabled = false, - energy_required = 3, - ingredients = { { type = "item", name = "wood", amount = 5 } }, - results = { { type = "item", name = "bi-ash", amount = 5 } }, - main_product = "", - allow_as_intermediate = true, -- Changed for 0.18.34/1.1.4 - always_show_made_in = false, -- Changed for 0.18.34/1.1.4 - allow_decomposition = true, -- Changed for 0.18.34/1.1.4 - - -- This is a custom property for use by "Krastorio 2" (it will change - -- ingredients/results; used for wood/wood pulp) - mod = "Bio_Industries_2", + } }, + category = "biofarm-mod-smelting", + subgroup = "bio-bio-farm-raw", + order = "a[bi]-a-cb[bi-5-ash-1]", + enabled = false, + energy_required = 3, + ingredients = {{type="item", name="wood", amount=5}}, + results = {{type="item", name="bi-ash", amount=5}}, + main_product = "", + allow_as_intermediate = true, -- Changed for 0.18.34/1.1.4 + always_show_made_in = false, -- Changed for 0.18.34/1.1.4 + allow_decomposition = true, -- Changed for 0.18.34/1.1.4 + + -- This is a custom property for use by "Krastorio 2" (it will change + -- ingredients/results; used for wood/wood pulp) + mod = "Bio_Industries_2", + }, - -- ASH 2-- - { - type = "recipe", - name = "bi-ash-2", + -- ASH 2-- + { + type = "recipe", + name = "bi-ash-2", + icon = ICONPATH .. "ash_woodpulp.png", + icon_size = 64, + icons = { + { icon = ICONPATH .. "ash_woodpulp.png", icon_size = 64, - icons = { - { - icon = ICONPATH .. "ash_woodpulp.png", - icon_size = 64, - } - }, - category = "biofarm-mod-smelting", - subgroup = "bio-bio-farm-raw", - order = "a[bi]-a-ca[bi-5-ash-2]", - enabled = false, - allow_as_intermediate = true, -- Added for 0.18.34/1.1.4 - always_show_made_in = false, -- Changed for 0.18.34/1.1.4 - allow_decomposition = true, -- Changed for 0.18.34/1.1.4 - - energy_required = 2.5, - ingredients = { { type = "item", name = "bi-woodpulp", amount = 12 } }, - results = { { type = "item", name = "bi-ash", amount = 6 } }, - main_product = "", - -- This is a custom property for use by "Krastorio 2" (it will change - -- ingredients/results; used for wood/wood pulp) - mod = "Bio_Industries_2", + } }, + category = "biofarm-mod-smelting", + subgroup = "bio-bio-farm-raw", + order = "a[bi]-a-ca[bi-5-ash-2]", + enabled = false, + allow_as_intermediate = true, -- Added for 0.18.34/1.1.4 + always_show_made_in = false, -- Changed for 0.18.34/1.1.4 + allow_decomposition = true, -- Changed for 0.18.34/1.1.4 + + energy_required = 2.5, + ingredients = {{type="item", name="bi-woodpulp", amount=12}}, + results = {{type="item", name="bi-ash", amount=6}}, + main_product = "", + -- This is a custom property for use by "Krastorio 2" (it will change + -- ingredients/results; used for wood/wood pulp) + mod = "Bio_Industries_2", + }, - -- CHARCOAL 1 - { - type = "recipe", - name = "bi-charcoal-1", + -- CHARCOAL 1 + { + type = "recipe", + name = "bi-charcoal-1", + icon = ICONPATH .. "charcoal_woodpulp.png", + icon_size = 64, + icons = { + { icon = ICONPATH .. "charcoal_woodpulp.png", icon_size = 64, - icons = { - { - icon = ICONPATH .. "charcoal_woodpulp.png", - icon_size = 64, - } - }, - category = "biofarm-mod-smelting", - subgroup = "bio-bio-farm-raw", - order = "a[bi]-a-d[bi-6-charcoal-1]", - energy_required = 15, - ingredients = { { type = "item", name = "bi-woodpulp", amount = 24 } }, - results = { { type = "item", name = "wood-charcoal", amount = 5 } }, - main_product = "", - enabled = false, - always_show_made_in = true, - allow_decomposition = false, - allow_as_intermediate = false, - -- This is a custom property for use by "Krastorio 2" (it will change - -- ingredients/results; used for wood/wood pulp) - mod = "Bio_Industries_2", + } }, + category = "biofarm-mod-smelting", + subgroup = "bio-bio-farm-raw", + order = "a[bi]-a-d[bi-6-charcoal-1]", + energy_required = 15, + ingredients = {{type="item", name="bi-woodpulp", amount=24}}, + results = {{type="item", name="wood-charcoal", amount=5}}, + main_product = "", + enabled = false, + always_show_made_in = true, + allow_decomposition = false, + allow_as_intermediate = false, + -- This is a custom property for use by "Krastorio 2" (it will change + -- ingredients/results; used for wood/wood pulp) + mod = "Bio_Industries_2", + }, - -- CHARCOAL 2 - { - type = "recipe", - name = "bi-charcoal-2", + -- CHARCOAL 2 + { + type = "recipe", + name = "bi-charcoal-2", + icon = ICONPATH .. "charcoal_raw-wood.png", + icon_size = 64, + icons = { + { icon = ICONPATH .. "charcoal_raw-wood.png", icon_size = 64, - icons = { - { - icon = ICONPATH .. "charcoal_raw-wood.png", - icon_size = 64, - } - }, - subgroup = "bio-bio-farm-raw", - order = "a[bi]-a-d[bi-6-charcoal-2]", - category = "biofarm-mod-smelting", - energy_required = 20, - ingredients = { { type = "item", name = "wood", amount = 20 } }, - results = { { type = "item", name = "wood-charcoal", amount = 8 } }, - main_product = "", - enabled = false, - always_show_made_in = true, - allow_decomposition = false, - allow_as_intermediate = false, - -- This is a custom property for use by "Krastorio 2" (it will change - -- ingredients/results; used for wood/wood pulp) - mod = "Bio_Industries_2", + } }, + subgroup = "bio-bio-farm-raw", + order = "a[bi]-a-d[bi-6-charcoal-2]", + category = "biofarm-mod-smelting", + energy_required = 20, + ingredients = {{type="item", name="wood", amount=20}}, + results = {{type="item", name="wood-charcoal", amount=8}}, + main_product = "", + enabled = false, + always_show_made_in = true, + allow_decomposition = false, + allow_as_intermediate = false, + -- This is a custom property for use by "Krastorio 2" (it will change + -- ingredients/results; used for wood/wood pulp) + mod = "Bio_Industries_2", + }, - -- COAL 1 -- - { - type = "recipe", - name = "bi-coal-1", + -- COAL 1 -- + { + type = "recipe", + name = "bi-coal-1", + icon = ICONPATH .. "coal_mk1.png", + icon_size = 64, + icons = { + { icon = ICONPATH .. "coal_mk1.png", icon_size = 64, - icons = { - { - icon = ICONPATH .. "coal_mk1.png", - icon_size = 64, - } - }, - category = "biofarm-mod-smelting", - subgroup = "bio-bio-farm-raw", - order = "a[bi]-a-ea[bi-6-coal-1]", - energy_required = 20, - ingredients = { { type = "item", name = "wood-charcoal", amount = 10 } }, - results = { { type = "item", name = "coal", amount = 12 } }, - main_product = "", - enabled = false, - allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 - always_show_made_in = true, -- Changed for 0.18.34/1.1.4 - allow_decomposition = true, -- Changed for 0.18.34/1.1.4 - + } }, + category = "biofarm-mod-smelting", + subgroup = "bio-bio-farm-raw", + order = "a[bi]-a-ea[bi-6-coal-1]", + energy_required = 20, + ingredients = {{type="item", name="wood-charcoal", amount=10}}, + results = {{type="item", name="coal", amount=12}}, + main_product = "", + enabled = false, + allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 + always_show_made_in = true, -- Changed for 0.18.34/1.1.4 + allow_decomposition = true, -- Changed for 0.18.34/1.1.4 + + }, - -- COAL 2 -- - { - type = "recipe", - name = "bi-coal-2", + -- COAL 2 -- + { + type = "recipe", + name = "bi-coal-2", + icon = ICONPATH .. "coal_mk2.png", + icon_size = 64, + icons = { + { icon = ICONPATH .. "coal_mk2.png", icon_size = 64, - icons = { - { - icon = ICONPATH .. "coal_mk2.png", - icon_size = 64, - } - }, - category = "biofarm-mod-smelting", - subgroup = "bio-bio-farm-raw", - order = "a[bi]-a-eb[bi-6-coal-2]", - energy_required = 20, - ingredients = { { type = "item", name = "wood-charcoal", amount = 10 } }, - results = { { type = "item", name = "coal", amount = 16 } }, - main_product = "", - enabled = false, - allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 - always_show_made_in = true, -- Changed for 0.18.34/1.1.4 - allow_decomposition = true, -- Changed for 0.18.34/1.1.4 - + } }, + category = "biofarm-mod-smelting", + subgroup = "bio-bio-farm-raw", + order = "a[bi]-a-eb[bi-6-coal-2]", + energy_required = 20, + ingredients = {{type="item", name="wood-charcoal", amount=10}}, + results = {{type="item", name="coal", amount=16}}, + main_product = "", + enabled = false, + allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 + always_show_made_in = true, -- Changed for 0.18.34/1.1.4 + allow_decomposition = true, -- Changed for 0.18.34/1.1.4 + + }, - -- Solid Fuel - { - type = "recipe", - name = "bi-solid-fuel", + -- Solid Fuel + { + type = "recipe", + name = "bi-solid-fuel", + icon = ICONPATH .. "bi_solid_fuel_wood_brick.png", + icon_size = 64, + icons = { + { icon = ICONPATH .. "bi_solid_fuel_wood_brick.png", icon_size = 64, - icons = { - { - icon = ICONPATH .. "bi_solid_fuel_wood_brick.png", - icon_size = 64, - } - }, - subgroup = "bio-bio-farm-raw", - order = "a[bi]-a-fa[bi-7-solid_fuel]", - category = "chemistry", - energy_required = 2, - ingredients = { { type = "item", name = "wood-bricks", amount = 3 } }, - results = { { type = "item", name = "solid-fuel", amount = 2 } }, - main_product = "", - enabled = false, - allow_as_intermediate = true, -- Changed for 0.18.34/1.1.4 - always_show_made_in = true, -- Changed for 0.18.34/1.1.4 - allow_decomposition = true, -- Changed for 0.18.34/1.1.4 - + } }, + subgroup = "bio-bio-farm-raw", + order = "a[bi]-a-fa[bi-7-solid_fuel]", + category = "chemistry", + energy_required = 2, + ingredients = {{type="item", name="wood-bricks", amount=3}}, + results = {{type="item", name="solid-fuel", amount=2}}, + main_product = "", + enabled = false, + allow_as_intermediate = true, -- Changed for 0.18.34/1.1.4 + always_show_made_in = true, -- Changed for 0.18.34/1.1.4 + allow_decomposition = true, -- Changed for 0.18.34/1.1.4 + + }, - -- Pellet-Coke from Coal -- Used to be Coke-Coal + -- Pellet-Coke from Coal -- Used to be Coke-Coal { - type = "recipe", - name = "bi-coke-coal", + type = "recipe", + name = "bi-coke-coal", + icon = ICONPATH .. "pellet_coke_coal.png", + icon_size = 64, + icons = { + { icon = ICONPATH .. "pellet_coke_coal.png", icon_size = 64, - icons = { - { - icon = ICONPATH .. "pellet_coke_coal.png", - icon_size = 64, - } - }, - category = "biofarm-mod-smelting", - subgroup = "bio-bio-farm-raw", - order = "a[bi]-a-g[bi-8-coke-coal]-1", - energy_required = 20, - ingredients = { { type = "item", name = "coal", amount = 12 } }, - results = { { type = "item", name = "pellet-coke", amount = 2 } }, - main_product = "", - enabled = false, - allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 - always_show_made_in = true, -- Changed for 0.18.34/1.1.4 - allow_decomposition = true, -- Changed for 0.18.34/1.1.4 - + } }, + category = "biofarm-mod-smelting", + subgroup = "bio-bio-farm-raw", + order = "a[bi]-a-g[bi-8-coke-coal]-1", + energy_required = 20, + ingredients = {{type="item", name="coal", amount=12}}, + results = {{type="item", name="pellet-coke", amount=2}}, + main_product = "", + enabled = false, + allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 + always_show_made_in = true, -- Changed for 0.18.34/1.1.4 + allow_decomposition = true, -- Changed for 0.18.34/1.1.4 + + }, -- Pellet-Coke from Solid Fuel -- Used to be Coke-Coal { - type = "recipe", - name = "bi-pellet-coke", + type = "recipe", + name = "bi-pellet-coke", + icon = ICONPATH .. "pellet_coke_solid.png", + --icon = "__Bio_Industries_2__/graphics/icons/pellet_coke_c.png", + icon_size = 64, + icons = { + { icon = ICONPATH .. "pellet_coke_solid.png", - --icon = "__Bio_Industries_2__/graphics/icons/pellet_coke_c.png", icon_size = 64, - icons = { - { - icon = ICONPATH .. "pellet_coke_solid.png", - icon_size = 64, - } - }, - category = "biofarm-mod-smelting", - subgroup = "bio-bio-farm-raw", - order = "a[bi]-a-g[bi-8-coke-coal]-3", - energy_required = 6, - ingredients = { { type = "item", name = "solid-fuel", amount = 5 } }, - results = { { type = "item", name = "pellet-coke", amount = 3 } }, - main_product = "", - enabled = false, - allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 - always_show_made_in = true, -- Changed for 0.18.34/1.1.4 - allow_decomposition = true, -- Changed for 0.18.34/1.1.4 + } }, + category = "biofarm-mod-smelting", + subgroup = "bio-bio-farm-raw", + order = "a[bi]-a-g[bi-8-coke-coal]-3", + energy_required = 6, + ingredients = {{type="item", name="solid-fuel", amount=5}}, + results = {{type="item", name="pellet-coke", amount=3}}, + main_product = "", + enabled = false, + allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 + always_show_made_in = true, -- Changed for 0.18.34/1.1.4 + allow_decomposition = true, -- Changed for 0.18.34/1.1.4 + }, - -- CRUSHED STONE from stone -- - { - type = "recipe", - name = "bi-crushed-stone-1", + -- CRUSHED STONE from stone -- + { + type = "recipe", + name = "bi-crushed-stone-1", + icon = ICONPATH .. "crushed-stone-stone.png", + icon_size = 64, + icons = { + { icon = ICONPATH .. "crushed-stone-stone.png", icon_size = 64, - icons = { - { - icon = ICONPATH .. "crushed-stone-stone.png", - icon_size = 64, - } - }, - category = "biofarm-mod-crushing", - subgroup = "bio-bio-farm-raw", - order = "a[bi]-a-z[bi-9-stone-crushed-1]", - energy_required = 1.5, - ingredients = { { type = "item", name = "stone", amount = 1 } }, - results = { { type = "item", name = "stone-crushed", amount = 2 } }, - main_product = "", - enabled = false, - allow_as_intermediate = true, -- Added for 0.18.34/1.1.4 - always_show_made_in = true, -- Changed for 0.18.34/1.1.4 - allow_decomposition = true, -- Changed for 0.18.34/1.1.4 - + } }, + category = "biofarm-mod-crushing", + subgroup = "bio-bio-farm-raw", + order = "a[bi]-a-z[bi-9-stone-crushed-1]", + energy_required = 1.5, + ingredients = {{type="item", name="stone", amount=1}}, + results = {{type="item", name="stone-crushed", amount=2}}, + main_product = "", + enabled = false, + allow_as_intermediate = true, -- Added for 0.18.34/1.1.4 + always_show_made_in = true, -- Changed for 0.18.34/1.1.4 + allow_decomposition = true, -- Changed for 0.18.34/1.1.4 - -- CRUSHED STONE from concrete -- - { - type = "recipe", - name = "bi-crushed-stone-2", - localised_description = { "recipe-description.bi-crushed-stone" }, + }, + + -- CRUSHED STONE from concrete -- + { + type = "recipe", + name = "bi-crushed-stone-2", + localised_description = {"recipe-description.bi-crushed-stone"}, + icon = ICONPATH .. "crushed-stone-concrete.png", + icon_size = 64, + icons = { + { icon = ICONPATH .. "crushed-stone-concrete.png", icon_size = 64, - icons = { - { - icon = ICONPATH .. "crushed-stone-concrete.png", - icon_size = 64, - } - }, - category = "biofarm-mod-crushing", - subgroup = "bio-bio-farm-raw", - order = "a[bi]-a-z[bi-9-stone-crushed-2]", - energy_required = 2.5, -- Increased crafting time - ingredients = { { type = "item", name = "concrete", amount = 1 } }, - results = { { type = "item", name = "stone-crushed", amount = 2 } }, - main_product = "", - enabled = false, - allow_as_intermediate = true, -- Added for 0.18.34/1.1.4 - always_show_made_in = true, -- Changed for 0.18.34/1.1.4 - allow_decomposition = true, -- Changed for 0.18.34/1.1.4 + } }, + category = "biofarm-mod-crushing", + subgroup = "bio-bio-farm-raw", + order = "a[bi]-a-z[bi-9-stone-crushed-2]", + energy_required = 2.5, -- Increased crafting time + ingredients = {{type="item", name="concrete", amount=1}}, + results = {{type="item", name="stone-crushed", amount=2}}, + main_product = "", + enabled = false, + allow_as_intermediate = true, -- Added for 0.18.34/1.1.4 + always_show_made_in = true, -- Changed for 0.18.34/1.1.4 + allow_decomposition = true, -- Changed for 0.18.34/1.1.4 + }, - -- CRUSHED STONE from hazard concrete -- - { - type = "recipe", - name = "bi-crushed-stone-3", - localised_description = { "recipe-description.bi-crushed-stone" }, + -- CRUSHED STONE from hazard concrete -- + { + type = "recipe", + name = "bi-crushed-stone-3", + localised_description = {"recipe-description.bi-crushed-stone"}, + icon = ICONPATH .. "crushed-stone-hazard-concrete.png", + icon_size = 64, + icons = { + { icon = ICONPATH .. "crushed-stone-hazard-concrete.png", icon_size = 64, - icons = { - { - icon = ICONPATH .. "crushed-stone-hazard-concrete.png", - icon_size = 64, - } - }, - category = "biofarm-mod-crushing", - subgroup = "bio-bio-farm-raw", - order = "a[bi]-a-z[bi-9-stone-crushed-3]", - energy_required = 2.5, -- Increased crafting time - ingredients = { { type = "item", name = "hazard-concrete", amount = 1 } }, - results = { { type = "item", name = "stone-crushed", amount = 2 } }, - main_product = "", - enabled = false, - allow_as_intermediate = true, -- Added for 0.18.34/1.1.4 - always_show_made_in = true, -- Changed for 0.18.34/1.1.4 - allow_decomposition = true, -- Changed for 0.18.34/1.1.4 - + } }, + category = "biofarm-mod-crushing", + subgroup = "bio-bio-farm-raw", + order = "a[bi]-a-z[bi-9-stone-crushed-3]", + energy_required = 2.5, -- Increased crafting time + ingredients = {{type="item", name="hazard-concrete", amount=1}}, + results = {{type="item", name="stone-crushed", amount=2}}, + main_product = "", + enabled = false, + allow_as_intermediate = true, -- Added for 0.18.34/1.1.4 + always_show_made_in = true, -- Changed for 0.18.34/1.1.4 + allow_decomposition = true, -- Changed for 0.18.34/1.1.4 - -- CRUSHED STONE from refined concrete -- - { - type = "recipe", - name = "bi-crushed-stone-4", - localised_description = { "recipe-description.bi-crushed-stone" }, + }, + + -- CRUSHED STONE from refined concrete -- + { + type = "recipe", + name = "bi-crushed-stone-4", + localised_description = {"recipe-description.bi-crushed-stone"}, + icon = ICONPATH .. "crushed-stone-refined-concrete.png", + icon_size = 64, + icons = { + { icon = ICONPATH .. "crushed-stone-refined-concrete.png", icon_size = 64, - icons = { - { - icon = ICONPATH .. "crushed-stone-refined-concrete.png", - icon_size = 64, - } - }, - category = "biofarm-mod-crushing", - subgroup = "bio-bio-farm-raw", - order = "a[bi]-a-z[bi-9-stone-crushed-4]", - energy_required = 5, -- Increased crafting time - ingredients = { { type = "item", name = "refined-concrete", amount = 1 } }, - results = { { type = "item", name = "stone-crushed", amount = 4 } }, - main_product = "", - enabled = false, - allow_as_intermediate = true, -- Added for 0.18.34/1.1.4 - always_show_made_in = true, -- Changed for 0.18.34/1.1.4 - allow_decomposition = true, -- Changed for 0.18.34/1.1.4 + } }, + category = "biofarm-mod-crushing", + subgroup = "bio-bio-farm-raw", + order = "a[bi]-a-z[bi-9-stone-crushed-4]", + energy_required = 5, -- Increased crafting time + ingredients = {{type="item", name="refined-concrete", amount=1}}, + results = {{type="item", name="stone-crushed", amount=4}}, + main_product = "", + enabled = false, + allow_as_intermediate = true, -- Added for 0.18.34/1.1.4 + always_show_made_in = true, -- Changed for 0.18.34/1.1.4 + allow_decomposition = true, -- Changed for 0.18.34/1.1.4 + }, - -- CRUSHED STONE from refined hazard concrete -- - { - type = "recipe", - name = "bi-crushed-stone-5", - localised_description = { "recipe-description.bi-crushed-stone" }, + -- CRUSHED STONE from refined hazard concrete -- + { + type = "recipe", + name = "bi-crushed-stone-5", + localised_description = {"recipe-description.bi-crushed-stone"}, + icon = ICONPATH .. "crushed-stone-refined-hazard-concrete.png", + icon_size = 64, + icons = { + { icon = ICONPATH .. "crushed-stone-refined-hazard-concrete.png", icon_size = 64, - icons = { - { - icon = ICONPATH .. "crushed-stone-refined-hazard-concrete.png", - icon_size = 64, - } - }, - category = "biofarm-mod-crushing", - subgroup = "bio-bio-farm-raw", - order = "a[bi]-a-z[bi-9-stone-crushed-5]", - energy_required = 5, -- Increased crafting time - ingredients = { { type = "item", name = "refined-hazard-concrete", amount = 1 } }, - results = { { type = "item", name = "stone-crushed", amount = 4 } }, - main_product = "", - enabled = false, - allow_as_intermediate = true, -- Added for 0.18.34/1.1.4 - always_show_made_in = true, -- Changed for 0.18.34/1.1.4 - allow_decomposition = true, -- Changed for 0.18.34/1.1.4 + } }, + category = "biofarm-mod-crushing", + subgroup = "bio-bio-farm-raw", + order = "a[bi]-a-z[bi-9-stone-crushed-5]", + energy_required = 5, -- Increased crafting time + ingredients = {{type="item", name="refined-hazard-concrete", amount=1}}, + results = {{type="item", name="stone-crushed", amount=4}}, + main_product = "", + enabled = false, + allow_as_intermediate = true, -- Added for 0.18.34/1.1.4 + always_show_made_in = true, -- Changed for 0.18.34/1.1.4 + allow_decomposition = true, -- Changed for 0.18.34/1.1.4 + }, - -- STONE Brick-- - { - type = "recipe", - name = "bi-stone-brick", + -- STONE Brick-- + { + type = "recipe", + name = "bi-stone-brick", + icon = ICONPATH .. "bi_stone_brick.png", + icon_size = 64, + icons = { + { icon = ICONPATH .. "bi_stone_brick.png", icon_size = 64, - icons = { - { - icon = ICONPATH .. "bi_stone_brick.png", - icon_size = 64, - } - }, - --category = "smelting", - category = "chemistry", - subgroup = "bio-bio-farm-raw", - order = "a[bi]-a-z2[bi-9-stone-brick]", - energy_required = 5, - ingredients = { - { type = "item", name = "stone-crushed", amount = 6 }, - { type = "item", name = "bi-ash", amount = 2 }, - }, - results = { - { type = "item", name = "stone-brick", amount = 2 }, - }, - enabled = false, - main_product = "", - allow_as_intermediate = true, -- Added for 0.18.34/1.1.4 - always_show_made_in = true, -- Changed for 0.18.34/1.1.4 - allow_decomposition = true, -- Changed for 0.18.34/1.1.4 + } }, + --category = "smelting", + category = "chemistry", + subgroup = "bio-bio-farm-raw", + order = "a[bi]-a-z2[bi-9-stone-brick]", + energy_required = 5, + ingredients = { + {type = "item", name = "stone-crushed", amount = 6}, + {type = "item", name = "bi-ash", amount = 2}, + }, + results = { + {type = "item", name = "stone-brick", amount = 2}, + }, + enabled = false, + main_product = "", + allow_as_intermediate = true, -- Added for 0.18.34/1.1.4 + always_show_made_in = true, -- Changed for 0.18.34/1.1.4 + allow_decomposition = true, -- Changed for 0.18.34/1.1.4 + }, - -- COKERY (ENTITY)-- - { - type = "recipe", - name = "bi-cokery", - localised_name = { "entity-name.bi-cokery" }, - localised_description = { "entity-description.bi-cokery" }, - icon = ICONPATH_E .. "cokery.png", + -- COKERY (ENTITY)-- + { + type = "recipe", + name = "bi-cokery", + localised_name = {"entity-name.bi-cokery"}, + localised_description = {"entity-description.bi-cokery"}, + icon = ICONPATH .. "cokery.png", + icon_size = 64, + icons = { + { + icon = ICONPATH .. "cokery.png", icon_size = 64, - icons = { - { - icon = ICONPATH_E .. "cokery.png", - icon_size = 64, - } - }, - enabled = false, - energy_required = 8, - ingredients = { - { type = "item", name = "stone-furnace", amount = 3 }, - { type = "item", name = "steel-plate", amount = 10 }, - }, - results = { { type = "item", name = "bi-cokery", amount = 1 } }, - main_product = "", - allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 - always_show_made_in = false, -- Added for 0.18.34/1.1.4 - allow_decomposition = true, -- Added for 0.18.34/1.1.4 - subgroup = "bio-bio-farm-raw-entity", - order = "a[bi]", + } }, + enabled = false, + energy_required = 8, + ingredients = { + {type="item", name="stone-furnace", amount=3}, + {type="item", name="steel-plate", amount=10}, + }, + results = {{type="item", name="bi-cokery", amount=1}}, + main_product = "", + allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 + always_show_made_in = false, -- Added for 0.18.34/1.1.4 + allow_decomposition = true, -- Added for 0.18.34/1.1.4 + subgroup = "bio-bio-farm-raw-entity", + order = "a[bi]", + }, - -- STONE CRUSHER (ENTITY) -- - { - type = "recipe", - name = "bi-stone-crusher", - localised_name = { "entity-name.bi-stone-crusher" }, - localised_description = { "entity-description.bi-stone-crusher" }, - icon = ICONPATH_E .. "stone_crusher.png", + -- STONE CRUSHER (ENTITY) -- + { + type = "recipe", + name = "bi-stone-crusher", + localised_name = {"entity-name.bi-stone-crusher"}, + localised_description = {"entity-description.bi-stone-crusher"}, + icon = ICONPATH .. "stone_crusher.png", + icon_size = 64, + icons = { + { + icon = ICONPATH .. "stone_crusher.png", icon_size = 64, - icons = { - { - icon = ICONPATH_E .. "stone_crusher.png", - icon_size = 64, - } - }, - enabled = false, - energy_required = 3, - ingredients = { - { type = "item", name = "iron-plate", amount = 10 }, - { type = "item", name = "steel-plate", amount = 10 }, - { type = "item", name = "iron-gear-wheel", amount = 5 }, - }, - results = { { type = "item", name = "bi-stone-crusher", amount = 1 } }, - main_product = "", - allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 - always_show_made_in = false, -- Added for 0.18.34/1.1.4 - allow_decomposition = true, -- Added for 0.18.34/1.1.4 - subgroup = "bio-bio-farm-raw-entity", - order = "b[bi]", + } }, + enabled = false, + energy_required = 3, + ingredients = { + {type="item", name="iron-plate", amount=10}, + {type="item", name="steel-plate", amount=10}, + {type="item", name="iron-gear-wheel", amount=5}, + }, + results = {{type="item", name="bi-stone-crusher", amount=1}}, + main_product = "", + allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 + always_show_made_in = false, -- Added for 0.18.34/1.1.4 + allow_decomposition = true, -- Added for 0.18.34/1.1.4 + subgroup = "bio-bio-farm-raw-entity", + order = "b[bi]", + }, - -- LIQUID-AIR -- - { - type = "recipe", - name = "bi-liquid-air", + -- LIQUID-AIR -- + { + type = "recipe", + name = "bi-liquid-air", + icon = ICONPATH .. "liquid-air.png", + icon_size = 64, + icons = { + { icon = ICONPATH .. "liquid-air.png", icon_size = 64, - icons = { - { - icon = ICONPATH .. "liquid-air.png", - icon_size = 64, - } - }, - category = "chemistry", - energy_required = 1, - ingredients = {}, - results = { - { type = "fluid", name = "liquid-air", amount = 10 } - }, - main_product = "", - enabled = false, - always_show_made_in = true, - allow_decomposition = false, - allow_as_intermediate = false, - subgroup = "bio-bio-farm-intermediate-product", - order = "aa", + } }, + category = "chemistry", + energy_required = 1, + ingredients = {}, + results = { + {type = "fluid", name = "liquid-air", amount = 10} + }, + main_product = "", + enabled = false, + always_show_made_in = true, + allow_decomposition = false, + allow_as_intermediate = false, + subgroup = "bio-bio-farm-intermediate-product", + order = "aa", + }, - ---NITROGEN -- - { - type = "recipe", - name = "bi-nitrogen", + ---NITROGEN -- + { + type = "recipe", + name = "bi-nitrogen", + icon = ICONPATH .. "nitrogen.png", + icon_size = 64, + icons = { + { icon = ICONPATH .. "nitrogen.png", icon_size = 64, - icons = { - { - icon = ICONPATH .. "nitrogen.png", - icon_size = 64, - } - }, - category = "chemistry", - energy_required = 10, - ingredients = { - { type = "fluid", name = "liquid-air", amount = 20 } - }, - results = { - { type = "fluid", name = "nitrogen", amount = 20 }, - }, - main_product = "", - enabled = false, - always_show_made_in = true, - allow_decomposition = false, - allow_as_intermediate = false, - --main_product= "nitrogen", - subgroup = "bio-bio-farm-intermediate-product", - order = "ab", + } }, + category = "chemistry", + energy_required = 10, + ingredients = { + {type = "fluid", name = "liquid-air", amount = 20} + }, + results = { + {type = "fluid", name = "nitrogen", amount = 20}, + }, + main_product = "", + enabled = false, + always_show_made_in = true, + allow_decomposition = false, + allow_as_intermediate = false, + --main_product= "nitrogen", + subgroup = "bio-bio-farm-intermediate-product", + order = "ab", + }, - -- fertilizer- Sulfur- - { - type = "recipe", - name = "bi-fertilizer-1", + -- fertilizer- Sulfur- + { + type = "recipe", + name = "bi-fertilizer-1", + icon = ICONPATH .. "fertilizer_sulfur.png", + icon_size = 64, + icons = { + { icon = ICONPATH .. "fertilizer_sulfur.png", icon_size = 64, - icons = { - { - icon = ICONPATH .. "fertilizer_sulfur.png", - icon_size = 64, - } - }, - category = "chemistry", - energy_required = 5, - ingredients = { - { type = "item", name = "sulfur", amount = 1 }, - { type = "fluid", name = "nitrogen", amount = 10 }, - { type = "item", name = "bi-ash", amount = 10 } - }, - results = { - { type = "item", name = "fertilizer", amount = 5 } - }, - main_product = "", - enabled = false, - allow_as_intermediate = true, -- Changed for 0.18.34/1.1.4 - always_show_made_in = true, -- Changed for 0.18.34/1.1.4 - allow_decomposition = true, -- Changed for 0.18.34/1.1.4 - subgroup = "bio-bio-farm-intermediate-product", - order = "b[bi-fertilizer]", + } }, + category = "chemistry", + energy_required = 5, + ingredients = { + {type = "item", name = "sulfur", amount = 1}, + {type = "fluid", name = "nitrogen", amount = 10}, + {type = "item", name = "bi-ash", amount = 10} + }, + results = { + {type = "item", name = "fertilizer", amount = 5} + }, + main_product = "", + enabled = false, + allow_as_intermediate = true, -- Changed for 0.18.34/1.1.4 + always_show_made_in = true, -- Changed for 0.18.34/1.1.4 + allow_decomposition = true, -- Changed for 0.18.34/1.1.4 + subgroup = "bio-bio-farm-intermediate-product", + order = "b[bi-fertilizer]", + }, - -- Advanced fertilizer 1 -- - { - type = "recipe", - name = "bi-adv-fertilizer-1", + -- Advanced fertilizer 1 -- + { + type = "recipe", + name = "bi-adv-fertilizer-1", + icon = ICONPATH .. "advanced_fertilizer_64.png", + icon_size = 64, + icons = { + { icon = ICONPATH .. "advanced_fertilizer_64.png", icon_size = 64, - icons = { - { - icon = ICONPATH .. "advanced_fertilizer_64.png", - icon_size = 64, - } - }, - category = "chemistry", - energy_required = 50, - ingredients = { - { type = "item", name = "fertilizer", amount = 25 }, - { type = "fluid", name = "bi-biomass", amount = 10 }, -- <== Need to add during Data Updates - --{type = "fluid", name = "NE_enhanced-nutrient-solution", amount = 5}, -- Will be added if you have Natural Evolution Buildings Mod installed. - }, - results = { - { type = "item", name = "bi-adv-fertilizer", amount = 50 } - }, - main_product = "", - enabled = false, - allow_as_intermediate = true, -- Changed for 0.18.34/1.1.4 - always_show_made_in = true, -- Changed for 0.18.34/1.1.4 - allow_decomposition = true, -- Changed for 0.18.34/1.1.4 - subgroup = "bio-bio-farm-intermediate-product", - order = "b[bi-fertilizer]-b[bi-adv-fertilizer-1]", + } }, + category = "chemistry", + energy_required = 50, + ingredients = { + {type = "item", name = "fertilizer", amount = 25}, + {type = "fluid", name = "bi-biomass", amount = 10}, -- <== Need to add during Data Updates + --{type = "fluid", name = "NE_enhanced-nutrient-solution", amount = 5}, -- Will be added if you have Natural Evolution Buildings Mod installed. + }, + results = { + {type = "item", name = "bi-adv-fertilizer", amount = 50} + }, + main_product = "", + enabled = false, + allow_as_intermediate = true, -- Changed for 0.18.34/1.1.4 + always_show_made_in = true, -- Changed for 0.18.34/1.1.4 + allow_decomposition = true, -- Changed for 0.18.34/1.1.4 + subgroup = "bio-bio-farm-intermediate-product", + order = "b[bi-fertilizer]-b[bi-adv-fertilizer-1]", + }, - -- Advanced fertilizer 2-- - { - type = "recipe", - name = "bi-adv-fertilizer-2", + -- Advanced fertilizer 2-- + { + type = "recipe", + name = "bi-adv-fertilizer-2", + icon = ICONPATH .. "advanced_fertilizer_64.png", + icon_size = 64, + icons = { + { icon = ICONPATH .. "advanced_fertilizer_64.png", icon_size = 64, - icons = { - { - icon = ICONPATH .. "advanced_fertilizer_64.png", - icon_size = 64, - } - }, - category = "chemistry", - energy_required = 50, - ingredients = { - { type = "item", name = "fertilizer", amount = 20 }, - { type = "fluid", name = "bi-biomass", amount = 10 }, - { type = "item", name = "bi-woodpulp", amount = 10 }, - }, - results = { - { type = "item", name = "bi-adv-fertilizer", amount = 20 } - }, - main_product = "", - enabled = false, - allow_as_intermediate = true, -- Changed for 0.18.34/1.1.4 - always_show_made_in = true, -- Changed for 0.18.34/1.1.4 - allow_decomposition = true, -- Changed for 0.18.34/1.1.4 - subgroup = "bio-bio-farm-intermediate-product", - order = "b[bi-fertilizer]-b[bi-adv-fertilizer-2]", - -- This is a custom property for use by "Krastorio 2" (it will change - -- ingredients/results; used for wood/wood pulp) - mod = "Bio_Industries_2", + } }, + category = "chemistry", + energy_required = 50, + ingredients = { + {type = "item", name = "fertilizer", amount = 20}, + {type = "fluid", name = "bi-biomass", amount = 10}, + {type = "item", name = "bi-woodpulp", amount = 10}, + }, + results = { + {type = "item", name = "bi-adv-fertilizer", amount = 20} + }, + main_product = "", + enabled = false, + allow_as_intermediate = true, -- Changed for 0.18.34/1.1.4 + always_show_made_in = true, -- Changed for 0.18.34/1.1.4 + allow_decomposition = true, -- Changed for 0.18.34/1.1.4 + subgroup = "bio-bio-farm-intermediate-product", + order = "b[bi-fertilizer]-b[bi-adv-fertilizer-2]", + -- This is a custom property for use by "Krastorio 2" (it will change + -- ingredients/results; used for wood/wood pulp) + mod = "Bio_Industries_2", + }, - --- Seed Bomb - Basic - { - type = "recipe", - name = "bi-seed-bomb-basic", - icon = ICONPATH_W .. "seed_bomb_icon_b.png", + --- Seed Bomb - Basic + { + type = "recipe", + name = "bi-seed-bomb-basic", + icon = ICONPATH .. "Seed_bomb_icon_b.png", + icon_size = 64, + icons = { + { + icon = ICONPATH .. "Seed_bomb_icon_b.png", icon_size = 64, - icons = { - { - icon = ICONPATH_W .. "seed_bomb_icon_b.png", - icon_size = 64, - } - }, - enabled = false, - energy_required = 8, - ingredients = { - { type = "item", name = "bi-seed", amount = 400 }, - { type = "item", name = "rocket", amount = 1 }, - }, - results = { { type = "item", name = "bi-seed-bomb-basic", amount = 1 } }, - main_product = "", - allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 - always_show_made_in = false, -- Added for 0.18.34/1.1.4 - allow_decomposition = true, -- Added for 0.18.34/1.1.4 - subgroup = "bi-ammo", - order = "a[rocket-launcher]-x[seed-bomb]-a", + } }, + enabled = false, + energy_required = 8, + ingredients = { + {type="item", name="bi-seed", amount=400}, + {type="item", name="rocket", amount=1}, + }, + results = {{type="item", name="bi-seed-bomb-basic", amount=1}}, + main_product = "", + allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 + always_show_made_in = false, -- Added for 0.18.34/1.1.4 + allow_decomposition = true, -- Added for 0.18.34/1.1.4 + subgroup = "bi-ammo", + order = "a[rocket-launcher]-x[seed-bomb]-a", + }, - --- Seed Bomb - Standard - { - type = "recipe", - name = "bi-seed-bomb-standard", - icon = ICONPATH_W .. "seed_bomb_icon_s.png", + --- Seed Bomb - Standard + { + type = "recipe", + name = "bi-seed-bomb-standard", + icon = ICONPATH .. "Seed_bomb_icon_s.png", + icon_size = 64, + icons = { + { + icon = ICONPATH .. "Seed_bomb_icon_s.png", icon_size = 64, - icons = { - { - icon = ICONPATH_W .. "seed_bomb_icon_s.png", - icon_size = 64, - } - }, - enabled = false, - energy_required = 8, - ingredients = { - { type = "item", name = "bi-seed", amount = 400 }, - { type = "item", name = "fertilizer", amount = 200 }, - { type = "item", name = "rocket", amount = 1 }, - }, - results = { { type = "item", name = "bi-seed-bomb-standard", amount = 1 } }, - main_product = "", - allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 - always_show_made_in = false, -- Added for 0.18.34/1.1.4 - allow_decomposition = true, -- Added for 0.18.34/1.1.4 - subgroup = "bi-ammo", - order = "a[rocket-launcher]-x[seed-bomb]-b", + } }, + enabled = false, + energy_required = 8, + ingredients = { + {type="item", name="bi-seed", amount=400}, + {type="item", name="fertilizer", amount=200}, + {type="item", name="rocket", amount=1}, + }, + results = {{type="item", name="bi-seed-bomb-standard", amount=1}}, + main_product = "", + allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 + always_show_made_in = false, -- Added for 0.18.34/1.1.4 + allow_decomposition = true, -- Added for 0.18.34/1.1.4 + subgroup = "bi-ammo", + order = "a[rocket-launcher]-x[seed-bomb]-b", + }, - --- Seed Bomb - Advanced - { - type = "recipe", - name = "bi-seed-bomb-advanced", - icon = ICONPATH_W .. "seed_bomb_icon_a.png", + --- Seed Bomb - Advanced + { + type = "recipe", + name = "bi-seed-bomb-advanced", + icon = ICONPATH .. "Seed_bomb_icon_a.png", + icon_size = 64, + icons = { + { + icon = ICONPATH .. "Seed_bomb_icon_a.png", icon_size = 64, - icons = { - { - icon = ICONPATH_W .. "seed_bomb_icon_a.png", - icon_size = 64, - } - }, - enabled = false, - energy_required = 8, - ingredients = { - { type = "item", name = "bi-seed", amount = 400 }, - { type = "item", name = "bi-adv-fertilizer", amount = 200 }, - { type = "item", name = "rocket", amount = 1 }, - }, - results = { { type = "item", name = "bi-seed-bomb-advanced", amount = 1 } }, - main_product = "", - allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 - always_show_made_in = false, -- Added for 0.18.34/1.1.4 - allow_decomposition = true, -- Added for 0.18.34/1.1.4 - subgroup = "bi-ammo", - order = "a[rocket-launcher]-x[seed-bomb]-c", + } + }, + enabled = false, + energy_required = 8, + ingredients = { + {type="item", name="bi-seed", amount=400}, + {type="item", name="bi-adv-fertilizer", amount=200}, + {type="item", name="rocket", amount=1}, + }, + results = {{type="item", name="bi-seed-bomb-advanced", amount=1}}, + main_product = "", + allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 + always_show_made_in = false, -- Added for 0.18.34/1.1.4 + allow_decomposition = true, -- Added for 0.18.34/1.1.4 + subgroup = "bi-ammo", + order = "a[rocket-launcher]-x[seed-bomb]-c", }, - --- Arboretum (ENTITY) - { - type = "recipe", - name = "bi-arboretum", - localised_name = { "entity-name.bi-arboretum" }, - localised_description = { "entity-description.bi-arboretum" }, - icon = ICONPATH_E .. "arboretum_Icon.png", + --- Arboretum (ENTITY) + { + type = "recipe", + name = "bi-arboretum", + localised_name = {"entity-name.bi-arboretum"}, + localised_description = {"entity-description.bi-arboretum"}, + icon = ICONPATH .. "Arboretum_Icon.png", + icon_size = 64, + icons = { + { + icon = ICONPATH .. "Arboretum_Icon.png", icon_size = 64, - icons = { - { - icon = ICONPATH_E .. "arboretum_Icon.png", - icon_size = 64, - } - }, - subgroup = "production-machine", - order = "x[bi]-a[bi-arboretum]", - enabled = false, - energy_required = 10, - ingredients = { - { type = "item", name = "bi-bio-greenhouse", amount = 4 }, - { type = "item", name = "assembling-machine-2", amount = 2 }, - { type = "item", name = "stone-brick", amount = 10 }, - }, - results = { { type = "item", name = "bi-arboretum-area", amount = 1 } }, - main_product = "", - allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 - always_show_made_in = false, -- Added for 0.18.34/1.1.4 - allow_decomposition = true, -- Added for 0.18.34/1.1.4 + } }, + enabled = false, + energy_required = 10, + ingredients = { + {type="item", name="bi-bio-greenhouse", amount=4}, + {type="item", name="assembling-machine-2", amount=2}, + {type="item", name="stone-brick", amount=10}, + }, + results = {{type="item", name="bi-arboretum-area", amount=1}}, + main_product = "", + allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 + always_show_made_in = false, -- Added for 0.18.34/1.1.4 + allow_decomposition = true, -- Added for 0.18.34/1.1.4 + }, - --- Arboretum - Plant Trees - { - type = "recipe", - name = "bi-arboretum-r1", + --- Arboretum - Plant Trees + { + type = "recipe", + name = "bi-arboretum-r1", + icon = ICONPATH .. "Seedling_b.png", + icon_size = 64, + icons = { + { icon = ICONPATH .. "Seedling_b.png", icon_size = 64, - icons = { - { - icon = ICONPATH .. "Seedling_b.png", - icon_size = 64, - } - }, - category = "bi-arboretum", - energy_required = 10000, - ingredients = { - { type = "item", name = "seedling", amount = 1 }, - { type = "fluid", name = "water", amount = 100 }, - }, - results = { - { type = "item", name = "bi-arboretum-r1", amount = 1, probability = 0 }, - }, - main_product = "", - enabled = false, - always_show_made_in = true, - allow_decomposition = false, - allow_as_intermediate = false, - subgroup = "bio-arboretum-fluid", - order = "a[bi]-ssw-a1[bi-arboretum-r1]", + } }, + category = "bi-arboretum", + energy_required = 10000, + ingredients = { + {type = "item", name = "seedling", amount = 1}, + {type = "fluid", name = "water", amount = 100}, + }, + results = { + {type = "item", name = "bi-arboretum-r1", amount = 1, probability = 0}, + }, + main_product = "", + enabled = false, + always_show_made_in = true, + allow_decomposition = false, + allow_as_intermediate = false, + subgroup = "bio-arboretum-fluid", + order = "a[bi]-ssw-a1[bi-arboretum-r1]", + }, - --- Arboretum - Change Terrain - { - type = "recipe", - name = "bi-arboretum-r2", + --- Arboretum - Change Terrain + { + type = "recipe", + name = "bi-arboretum-r2", + icon = ICONPATH .. "bi_change_1.png", + icon_size = 64, + icons = { + { icon = ICONPATH .. "bi_change_1.png", icon_size = 64, - icons = { - { - icon = ICONPATH .. "bi_change_1.png", - icon_size = 64, - } - }, - category = "bi-arboretum", - energy_required = 10000, - ingredients = { - { type = "item", name = "fertilizer", amount = 1 }, - { type = "fluid", name = "water", amount = 100 }, - }, - results = { - { type = "item", name = "bi-arboretum-r2", amount = 1, probability = 0 }, - }, - main_product = "", - enabled = false, - always_show_made_in = true, - allow_decomposition = false, - allow_as_intermediate = false, - subgroup = "bio-arboretum-fluid", - order = "a[bi]-ssw-a1[bi-arboretum-r2]", + } }, + category = "bi-arboretum", + energy_required = 10000, + ingredients = { + {type = "item", name = "fertilizer", amount = 1}, + {type = "fluid", name = "water", amount = 100}, + }, + results = { + {type = "item", name = "bi-arboretum-r2", amount = 1, probability = 0}, + }, + main_product = "", + enabled = false, + always_show_made_in = true, + allow_decomposition = false, + allow_as_intermediate = false, + subgroup = "bio-arboretum-fluid", + order = "a[bi]-ssw-a1[bi-arboretum-r2]", + }, - --- Arboretum - Change Terrain - Advanced - { - type = "recipe", - name = "bi-arboretum-r3", + --- Arboretum - Change Terrain - Advanced + { + type = "recipe", + name = "bi-arboretum-r3", + icon = ICONPATH .. "bi_change_2.png", + icon_size = 64, + icons = { + { icon = ICONPATH .. "bi_change_2.png", icon_size = 64, - icons = { - { - icon = ICONPATH .. "bi_change_2.png", - icon_size = 64, - } - }, - category = "bi-arboretum", - energy_required = 10000, - ingredients = { - { type = "item", name = "bi-adv-fertilizer", amount = 1 }, - { type = "fluid", name = "water", amount = 100 }, - }, - results = { - { type = "item", name = "bi-arboretum-r3", amount = 1, probability = 0 }, - }, - main_product = "", - enabled = false, - always_show_made_in = true, - allow_decomposition = false, - allow_as_intermediate = false, - subgroup = "bio-arboretum-fluid", - order = "a[bi]-ssw-a1[bi-arboretum-r3]", + } }, + category = "bi-arboretum", + energy_required = 10000, + ingredients = { + {type = "item", name = "bi-adv-fertilizer", amount = 1}, + {type = "fluid", name = "water", amount = 100}, + }, + results = { + {type = "item", name = "bi-arboretum-r3", amount = 1, probability = 0}, + }, + main_product = "", + enabled = false, + always_show_made_in = true, + allow_decomposition = false, + allow_as_intermediate = false, + subgroup = "bio-arboretum-fluid", + order = "a[bi]-ssw-a1[bi-arboretum-r3]", + }, - --- Arboretum - Plant Trees & Change Terrain - { - type = "recipe", - name = "bi-arboretum-r4", + --- Arboretum - Plant Trees & Change Terrain + { + type = "recipe", + name = "bi-arboretum-r4", + icon = ICONPATH .. "bi_change_plant_1.png", + icon_size = 64, + icons = { + { icon = ICONPATH .. "bi_change_plant_1.png", icon_size = 64, - icons = { - { - icon = ICONPATH .. "bi_change_plant_1.png", - icon_size = 64, - } - }, - category = "bi-arboretum", - energy_required = 10000, - ingredients = { - { type = "item", name = "seedling", amount = 1 }, - { type = "item", name = "fertilizer", amount = 1 }, - { type = "fluid", name = "water", amount = 100 }, - }, - results = { - { type = "item", name = "bi-arboretum-r4", amount = 1, probability = 0 }, - }, - main_product = "", - enabled = false, - always_show_made_in = true, - allow_decomposition = false, - allow_as_intermediate = false, - subgroup = "bio-arboretum-fluid", - order = "a[bi]-ssw-a1[bi-arboretum-r4]", + } }, + category = "bi-arboretum", + energy_required = 10000, + ingredients = { + {type = "item", name = "seedling", amount = 1}, + {type = "item", name = "fertilizer", amount = 1}, + {type = "fluid", name = "water", amount = 100}, + }, + results = { + {type = "item", name = "bi-arboretum-r4", amount = 1, probability = 0}, + }, + main_product = "", + enabled = false, + always_show_made_in = true, + allow_decomposition = false, + allow_as_intermediate = false, + subgroup = "bio-arboretum-fluid", + order = "a[bi]-ssw-a1[bi-arboretum-r4]", + }, - --- Arboretum - Plant Trees & Change Terrain Advanced - { - type = "recipe", - name = "bi-arboretum-r5", + --- Arboretum - Plant Trees & Change Terrain Advanced + { + type = "recipe", + name = "bi-arboretum-r5", + icon = ICONPATH .. "bi_change_plant_2.png", + icon_size = 64, + icons = { + { icon = ICONPATH .. "bi_change_plant_2.png", icon_size = 64, - icons = { - { - icon = ICONPATH .. "bi_change_plant_2.png", - icon_size = 64, - } - }, - category = "bi-arboretum", - energy_required = 10000, - ingredients = { - { type = "item", name = "seedling", amount = 1 }, - { type = "item", name = "bi-adv-fertilizer", amount = 1 }, - { type = "fluid", name = "water", amount = 100 }, - }, - results = { - { type = "item", name = "bi-arboretum-r5", amount = 1, probability = 0 }, - }, - main_product = "", - enabled = false, - always_show_made_in = true, - allow_decomposition = false, - allow_as_intermediate = false, - subgroup = "bio-arboretum-fluid", - order = "a[bi]-ssw-a1[bi-arboretum-r5]", + } }, + category = "bi-arboretum", + energy_required = 10000, + ingredients = { + {type = "item", name = "seedling", amount = 1}, + {type = "item", name = "bi-adv-fertilizer", amount = 1}, + {type = "fluid", name = "water", amount = 100}, + }, + results = { + {type = "item", name = "bi-arboretum-r5", amount = 1, probability = 0}, + }, + main_product = "", + enabled = false, + always_show_made_in = true, + allow_decomposition = false, + allow_as_intermediate = false, + subgroup = "bio-arboretum-fluid", + order = "a[bi]-ssw-a1[bi-arboretum-r5]", + }, }) diff --git a/Bio_Industries_2/prototypes/Bio_Farm/technology.lua b/Bio_Industries_2/prototypes/Bio_Farm/technology.lua index 494408b..c9153fe 100644 --- a/Bio_Industries_2/prototypes/Bio_Farm/technology.lua +++ b/Bio_Industries_2/prototypes/Bio_Farm/technology.lua @@ -1,5 +1,6 @@ local BioInd = require('common')('Bio_Industries_2') local coal_processing = require("prototypes.Bio_Farm.coal_processing") + local ICONPATH = BioInd.modRoot .. "/graphics/technology/" ---- Bio Farm @@ -7,12 +8,12 @@ data:extend({ { type = "technology", name = "bi-tech-bio-farming", - icon_size = 256, - icon = ICONPATH .. "bi-tech-bio-farming.png", + icon_size = 128, + icon = ICONPATH .. "Bio_Farm_Tech_128.png", icons = { { - icon = ICONPATH .. "bi-tech-bio-farming.png", - icon_size = 256, + icon = ICONPATH .. "Bio_Farm_Tech_128.png", + icon_size = 128, } }, effects = { @@ -72,12 +73,12 @@ data:extend({ name = "bi-tech-coal-processing-1", localised_name = {"technology-name.bi-tech-coal-processing-1"}, localised_description = {"technology-description.bi-tech-coal-processing-1"}, - icon_size = 256, - icon = ICONPATH .. "bi-tech-coal-processing-1.png", + icon_size = 128, + icon = ICONPATH .. "Coal_128.png", icons = { { - icon = ICONPATH .. "bi-tech-coal-processing-1.png", - icon_size = 256, + icon = ICONPATH .. "Coal_128.png", + icon_size = 128, } }, effects = coal_processing[1], @@ -97,12 +98,12 @@ data:extend({ name = "bi-tech-coal-processing-2", localised_name = {"technology-name.bi-tech-coal-processing-2"}, localised_description = {"technology-description.bi-tech-coal-processing-2"}, - icon_size = 256, - icon = ICONPATH .. "bi-tech-coal-processing-2.png", + icon_size = 128, + icon = ICONPATH .. "Coal_128.png", icons = { { - icon = ICONPATH .. "bi-tech-coal-processing-2.png", - icon_size = 256, + icon = ICONPATH .. "Coal_128.png", + icon_size = 128, } }, effects = coal_processing[2], @@ -123,12 +124,12 @@ data:extend({ name = "bi-tech-coal-processing-3", localised_name = {"technology-name.bi-tech-coal-processing-3"}, localised_description = {"technology-description.bi-tech-coal-processing-3"}, - icon_size = 256, - icon = ICONPATH .. "bi-tech-coal-processing-3.png", + icon_size = 128, + icon = ICONPATH .. "Coal_128.png", icons = { { - icon = ICONPATH .. "bi-tech-coal-processing-3.png", - icon_size = 256, + icon = ICONPATH .. "Coal_128.png", + icon_size = 128, } }, effects = coal_processing[3], @@ -148,12 +149,12 @@ data:extend({ { type = "technology", name = "bi-tech-fertilizer", - icon_size = 256, - icon = ICONPATH .. "bi-tech-fertilizer.png", + icon_size = 128, + icon = ICONPATH .. "Fertilizer_128.png", icons = { { - icon = ICONPATH .. "bi-tech-fertilizer.png", - icon_size = 256, + icon = ICONPATH .. "Fertilizer_128.png", + icon_size = 128, } }, effects = { @@ -185,14 +186,6 @@ data:extend({ type = "unlock-recipe", recipe = "bi-bio-garden" }, - { - type = "unlock-recipe", - recipe = "bi-bio-garden-lagre" - }, - { - type = "unlock-recipe", - recipe = "bi-bio-garden-huge" - }, { type = "unlock-recipe", recipe = "bi-purified-air-1" diff --git a/Bio_Industries_2/prototypes/Bio_Farm/technology2.lua b/Bio_Industries_2/prototypes/Bio_Farm/technology2.lua index 14e088d..4d9207e 100644 --- a/Bio_Industries_2/prototypes/Bio_Farm/technology2.lua +++ b/Bio_Industries_2/prototypes/Bio_Farm/technology2.lua @@ -8,12 +8,12 @@ local ICONPATH = BioInd.modRoot .. "/graphics/technology/" { type = "technology", name = "bi-tech-advanced-biotechnology", - icon_size = 256, - icon = ICONPATH .. "bi-tech-biomass.png", + icon_size = 128, + icon = ICONPATH .. "Biomass_128.png", icons = { { - icon = ICONPATH .. "bi-tech-biomass.png", - icon_size = 256, + icon = ICONPATH .. "Biomass_128.png", + icon_size = 128, } }, effects = { diff --git a/Bio_Industries_2/prototypes/Bio_Fuel/entities.lua b/Bio_Industries_2/prototypes/Bio_Fuel/entities.lua index 89714ab..71091f3 100644 --- a/Bio_Industries_2/prototypes/Bio_Fuel/entities.lua +++ b/Bio_Industries_2/prototypes/Bio_Fuel/entities.lua @@ -1,442 +1,387 @@ local BioInd = require('common')('Bio_Industries_2') local ICONPATH = BioInd.modRoot .. "/graphics/icons/" -local ICONPATH_E = BioInd.modRoot .. "/graphics/icons/entity/" local ENTITYPATH = "__base__/graphics/entity/boiler/" -local ENTITYPATH_BIO = BioInd.modRoot .. "/graphics/entities/" +require ("util") +require ("prototypes.Bio_Fuel.pipeConnectors") -require("util") -require("prototypes.Bio_Fuel.pipeConnectors") - -bio_boiler_tint = { r = 0.5, g = 0.5, b = 0.1, a = 0.7 } +bio_boiler_tint = {r = 0.5, g = 0.5, b = 0.1, a = 0.7} -- Changed for 0.18.29: We always want to make advanced fertilizer, so we need to -- unlock the bio-reactor and the most basic recipe for algae biomass even if -- BI.Settings.BI_Bio_Fuel has been turned off! data:extend({ - -- BIO_REACTOR - { - type = "assembling-machine", - name = "bi-bio-reactor", - icon = ICONPATH_E .. "bioreactor.png", + -- BIOREACTOR + { + type = "assembling-machine", + name = "bi-bio-reactor", + icon = ICONPATH .. "bioreactor.png", + icon_size = 64, + icons = { + { + icon = ICONPATH .. "bioreactor.png", icon_size = 64, - icons = { - { - icon = ICONPATH_E .. "bioreactor.png", - icon_size = 64, - } - }, - -- This is necessary for "Space Exploration" (if not true, the entity can only be - -- placed on Nauvis)! - se_allow_in_space = true, - flags = { "placeable-neutral", "player-creation" }, - minable = { hardness = 0.2, mining_time = 0.5, result = "bi-bio-reactor" }, - max_health = 100, - corpse = "big-remnants", - fluid_boxes = { - { - production_type = "input", - pipe_picture = assembler2pipepicturesBioreactor(), - pipe_covers = pipecoverspicturesBioreactor(), - volume = 1000, - base_level = -1, - pipe_connections = { { flow_direction = "input", direction = defines.direction.north, position = { 0, -1 } } } - }, - { - production_type = "input", - pipe_picture = assembler2pipepicturesBioreactor(), - pipe_covers = pipecoverspicturesBioreactor(), - volume = 1000, - base_level = -1, - pipe_connections = { { flow_direction = "input", direction = defines.direction.east, position = { 1, 0 } } } - }, - { - production_type = "input", - pipe_picture = assembler2pipepicturesBioreactor(), - pipe_covers = pipecoverspicturesBioreactor(), - volume = 1000, - base_level = -1, - pipe_connections = { { flow_direction = "input", direction = defines.direction.south, position = { 0, 1 } } } - }, - { - production_type = "output", - pipe_picture = assembler2pipepicturesBioreactor(), - pipe_covers = pipecoverspicturesBioreactor(), - volume = 1000, - base_level = 1, - pipe_connections = { { flow_direction = "output", direction = defines.direction.west, position = { -1, -1 } } } - }, - { - production_type = "output", - pipe_picture = assembler2pipepicturesBioreactor(), - pipe_covers = pipecoverspicturesBioreactor(), - volume = 1000, - base_level = 1, - pipe_connections = { { flow_direction = "output", direction = defines.direction.west, position = { -1, 1 } } } - }, - }, - fluid_boxes_off_when_no_fluid_recipe = true, - collision_box = { { -1.2, -1.2 }, { 1.2, 1.2 } }, - selection_box = { { -1.5, -1.5 }, { 1.5, 1.5 } }, - graphics_set = { - -- Idle animation (1 frame) - idle_animation = { - layers = { - { - filename = ENTITYPATH_BIO .. "bio_reactor/bioreactor_idle.png", - priority = "high", - width = 182, - height = 256, - frame_count = 1, - repeat_count = 18, -- match working animation - shift = { 0, -0.5 }, - scale = 0.5 - }, - { - filename = ENTITYPATH_BIO .. "bio_reactor/bioreactor_shadow.png", - width = 270, - height = 256, - frame_count = 1, - repeat_count = 18, -- match working animation - draw_as_shadow = true, - shift = { 0.5, -0.5 }, - scale = 0.5 - } - } - }, - - -- Working animation (16 frames) - animation = { - layers = { - { - filename = ENTITYPATH_BIO .. "bio_reactor/bioreactor_anim.png", - priority = "high", - width = 182, - height = 256, - frame_count = 18, - line_length = 6, - animation_speed = 0.4, - shift = { 0, 0.25 }, - scale = 0.5 - }, - { - filename = ENTITYPATH_BIO .. "bio_reactor/bioreactor_anim.png", - width = 182, - height = 256, - frame_count = 1, - repeat_count = 18, -- match working animation - draw_as_shadow = true, - shift = { 0.5, 0.25 }, - scale = 0.5 - } - } - } - }, - energy_source = { - type = "electric", - usage_priority = "secondary-input" - }, - crafting_categories = { "biofarm-mod-bioreactor" }, - ingredient_count = 3, - crafting_speed = 1, - energy_usage = "10kW", - module_specification = { - module_slots = 3 - }, - allowed_effects = { "consumption", "speed", "productivity", "pollution" }, + } }, + -- This is necessary for "Space Exploration" (if not true, the entity can only be + -- placed on Nauvis)! + se_allow_in_space = true, + flags = {"placeable-neutral", "player-creation"}, + minable = {hardness = 0.2, mining_time = 0.5, result = "bi-bio-reactor"}, + max_health = 100, + corpse = "big-remnants", + fluid_boxes = { + { + production_type = "input", + pipe_picture = assembler2pipepicturesBioreactor(), + pipe_covers = pipecoverspicturesBioreactor(), + volume = 1000, + base_level = -1, + pipe_connections = {{ flow_direction = "input", direction = defines.direction.north, position = {0, -1} }} + }, + { + production_type = "input", + pipe_picture = assembler2pipepicturesBioreactor(), + pipe_covers = pipecoverspicturesBioreactor(), + volume = 1000, + base_level = -1, + pipe_connections = {{ flow_direction = "input", direction = defines.direction.north, position = {1, 0} }} + }, + { + production_type = "input", + pipe_picture = assembler2pipepicturesBioreactor(), + pipe_covers = pipecoverspicturesBioreactor(), + volume = 1000, + base_level = -1, + pipe_connections = {{ flow_direction = "input", direction = defines.direction.north, position = {0, 1} }} + }, + { + production_type = "output", + pipe_picture = assembler2pipepicturesBioreactor(), + pipe_covers = pipecoverspicturesBioreactor(), + volume = 1000, + base_level = 1, + pipe_connections = {{ flow_direction = "output", direction = defines.direction.north, position = {-1, -1} }} + }, + { + production_type = "output", + pipe_picture = assembler2pipepicturesBioreactor(), + pipe_covers = pipecoverspicturesBioreactor(), + volume = 1000, + base_level = 1, + pipe_connections = {{ flow_direction = "output", direction = defines.direction.north, position = {-1, 1} }} + }, + }, + fluid_boxes_off_when_no_fluid_recipe = true, + collision_box = {{-1.2, -1.2}, {1.2, 1.2}}, + selection_box = {{-1.5, -1.5}, {1.5, 1.5}}, + animation = { + filename = "__Bio_Industries_2__/graphics/entities/bioreactor/bioreactor.png", + priority = "high", + width = 128, + height = 150, + frame_count = 26, + line_length = 13, + animation_speed = 0.4, + shift = {0.55, -0.33} + }, + energy_source = { + type = "electric", + usage_priority = "secondary-input" + }, + crafting_categories = {"biofarm-mod-bioreactor"}, + ingredient_count = 3, + crafting_speed = 1, + energy_usage = "10kW", + module_specification = { + module_slots = 3 + }, + allowed_effects = {"consumption", "speed", "productivity", "pollution"}, + }, }) if BI.Settings.BI_Bio_Fuel then - data:extend({ - --- Bio Boiler + data:extend({ + --- Bio Boiler + { + type = "boiler", + name = "bi-bio-boiler", + localised_name = {"entity-name.bi-bio-boiler"}, + localised_description = {"entity-description.bi-bio-boiler"}, + icon = ICONPATH .. "bio_boiler.png", + icon_size = 64, + icons = { { - type = "boiler", - name = "bi-bio-boiler", - localised_name = { "entity-name.bi-bio-boiler" }, - localised_description = { "entity-description.bi-bio-boiler" }, - icon = ICONPATH_E .. "bio_boiler.png", - icon_size = 64, - icons = { - { - icon = ICONPATH_E .. "bio_boiler.png", - icon_size = 64, - } - }, - -- This is necessary for "Space Exploration" (if not true, the entity can only be - -- placed on Nauvis)! - se_allow_in_space = true, - flags = { "placeable-neutral", "player-creation" }, - minable = { hardness = 0.2, mining_time = 0.5, result = "bi-bio-boiler" }, - max_health = 300, - corpse = "small-remnants", - mode = "output-to-separate-pipe", - resistances = { - { - type = "fire", - percent = 100 - }, - { - type = "explosion", - percent = 100 - }, - { - type = "impact", - percent = 35 - } - }, - collision_box = { { -1.29, -0.79 }, { 1.29, 0.79 } }, - selection_box = { { -1.5, -1 }, { 1.5, 1 } }, - target_temperature = 165, - fluid_box = { - volume = 200, - base_level = -1, - pipe_covers = pipecoverspictures(), - pipe_connections = { - { flow_direction = "input-output", direction = defines.direction.west, position = { -1, 0.5 } }, - { flow_direction = "input-output", direction = defines.direction.east, position = { 1, 0.5 } } - }, - production_type = "input-output", - filter = "water" - }, - output_fluid_box = { - volume = 200, - base_level = 1, - pipe_covers = pipecoverspictures(), - pipe_connections = { - { flow_direction = "output", direction = defines.direction.north, position = { 0, -0.5 } } - }, - production_type = "output", - filter = "steam" - }, - energy_consumption = "3.6MW", - energy_source = { - type = "burner", - fuel_categories = { "chemical" }, - effectivity = 1, - fuel_inventory_size = 2, - emissions_per_minute = { pollution = 15 }, - smoke = { - { - name = "smoke", - north_position = util.by_pixel(-38, -47.5), - south_position = util.by_pixel(38.5, -32), - east_position = util.by_pixel(20, -70), - west_position = util.by_pixel(-19, -8.5), - frequency = 20, - starting_vertical_speed = 0.0, - starting_frame_deviation = 60 - } - } - }, - working_sound = { - sound = { - filename = "__base__/sound/boiler.ogg", - volume = 0.8 - }, - max_sounds_per_type = 3 - }, - pictures = { - north = { - structure = { - layers = { - { - filename = ENTITYPATH_BIO .. "bio_boiler/boiler-N-idle.png", - priority = "extra-high", - width = 269, - height = 221, - shift = util.by_pixel(-1.25, 5.25), - scale = 0.5, - --tint = bio_boiler_tint, - }, - { - filename = ENTITYPATH .. "boiler-N-shadow.png", - priority = "extra-high", - width = 274, - height = 164, - scale = 0.5, - shift = util.by_pixel(20.5, 9), - draw_as_shadow = true, - } - } - } - }, - east = { - structure = { - layers = { - { - filename = ENTITYPATH_BIO .. "bio_boiler/boiler-E-idle.png", - priority = "extra-high", - width = 216, - height = 301, - shift = util.by_pixel(-3, 1.25), - scale = 0.5, - --tint = bio_boiler_tint, - }, - { - filename = ENTITYPATH .. "boiler-E-shadow.png", - priority = "extra-high", - width = 184, - height = 194, - scale = 0.5, - shift = util.by_pixel(30, 9.5), - draw_as_shadow = true, - } - } - } - }, - south = { - structure = { - layers = { - { - filename = ENTITYPATH_BIO .. "bio_boiler/boiler-S-idle.png", - priority = "extra-high", - width = 260, - height = 192, - shift = util.by_pixel(4, 13), - scale = 0.5, - --tint = bio_boiler_tint, - }, - { - filename = ENTITYPATH .. "boiler-S-shadow.png", - priority = "extra-high", - width = 311, - height = 131, - scale = 0.5, - shift = util.by_pixel(29.75, 15.75), - draw_as_shadow = true, - } - } - } - }, - west = { - structure = { - layers = { - { - filename = ENTITYPATH_BIO .. "bio_boiler/boiler-W-idle.png", - priority = "extra-high", - width = 196, - height = 273, - shift = util.by_pixel(1.5, 7.75), - scale = 0.5, - --tint = bio_boiler_tint, - }, - { - filename = ENTITYPATH .. "boiler-W-shadow.png", - priority = "extra-high", - width = 206, - height = 218, - scale = 0.5, - shift = util.by_pixel(19.5, 6.5), - draw_as_shadow = true, - } - } - } - } - }, - patch = { - east = { - filename = ENTITYPATH .. "boiler-E-patch.png", - width = 6, - height = 36, - shift = util.by_pixel(33.5, -13.5), - scale = 0.5, - tint = bio_boiler_tint, - }, - }, - fire_flicker_enabled = true, - fire = { - north = { - filename = ENTITYPATH .. "boiler-N-fire.png", - priority = "extra-high", - frame_count = 64, - line_length = 8, - width = 26, - height = 26, - animation_speed = 0.5, - shift = util.by_pixel(0, -8.5), - scale = 0.5 - }, - east = { - filename = ENTITYPATH .. "boiler-E-fire.png", - priority = "extra-high", - frame_count = 64, - line_length = 8, - width = 28, - height = 28, - animation_speed = 0.5, - shift = util.by_pixel(-9.5, -22), - scale = 0.5 - }, - south = { - filename = ENTITYPATH .. "boiler-S-fire.png", - priority = "extra-high", - frame_count = 64, - line_length = 8, - width = 26, - height = 16, - animation_speed = 0.5, - shift = util.by_pixel(-1, -26.5), - scale = 0.5 - }, - west = { - filename = ENTITYPATH .. "boiler-W-fire.png", - priority = "extra-high", - frame_count = 64, - line_length = 8, - width = 30, - height = 29, - animation_speed = 0.5, - shift = util.by_pixel(13, -23.25), - scale = 0.5 - } - }, - fire_glow_flicker_enabled = true, - fire_glow = { - north = { - filename = ENTITYPATH .. "boiler-N-light.png", - priority = "extra-high", - frame_count = 1, - width = 200, - height = 173, - shift = util.by_pixel(-1, -6.75), - blend_mode = "additive", - scale = 0.5 - }, - east = { - filename = ENTITYPATH .. "boiler-E-light.png", - priority = "extra-high", - frame_count = 1, - width = 139, - height = 244, - shift = util.by_pixel(0.25, -13), - blend_mode = "additive", - scale = 0.5 - }, - south = { - filename = ENTITYPATH .. "boiler-S-light.png", - priority = "extra-high", - frame_count = 1, - width = 200, - height = 162, - shift = util.by_pixel(1, 5.5), - blend_mode = "additive", - scale = 0.5 - }, - west = { - filename = ENTITYPATH .. "boiler-W-light.png", - priority = "extra-high", - frame_count = 1, - width = 136, - height = 217, - shift = util.by_pixel(2, -6.25), - blend_mode = "additive", - scale = 0.5 - } - }, - burning_cooldown = 20 + icon = ICONPATH .. "bio_boiler.png", + icon_size = 64, + } + }, + -- This is necessary for "Space Exploration" (if not true, the entity can only be + -- placed on Nauvis)! + se_allow_in_space = true, + flags = {"placeable-neutral", "player-creation"}, + minable = {hardness = 0.2, mining_time = 0.5, result = "bi-bio-boiler"}, + max_health = 300, + corpse = "small-remnants", + mode = "output-to-separate-pipe", + resistances = { + { + type = "fire", + percent = 100 }, + { + type = "explosion", + percent = 100 + }, + { + type = "impact", + percent = 35 + } + }, + collision_box = {{-1.29, -0.79}, {1.29, 0.79}}, + selection_box = {{-1.5, -1}, {1.5, 1}}, + target_temperature = 165, + fluid_box = { + volume = 200, + base_level = -1, + pipe_covers = pipecoverspictures(), + pipe_connections = { + {flow_direction = "input-output", direction = defines.direction.north, position = {-1, 0.5}}, + {flow_direction = "input-output", direction = defines.direction.north, position = {1, 0.5}} + }, + production_type = "input-output", + filter = "water" + }, + output_fluid_box = { + volume = 200, + base_level = 1, + pipe_covers = pipecoverspictures(), + pipe_connections = { + {flow_direction = "output", direction = defines.direction.north, position = {0, -0.5}} + }, + production_type = "output", + filter = "steam" + }, + energy_consumption = "3.6MW", + energy_source = { + type = "burner", + fuel_categories = { "chemical" }, + effectivity = 1, + fuel_inventory_size = 2, + emissions_per_minute = { pollution = 15 }, + smoke = { + { + name = "smoke", + north_position = util.by_pixel(-38, -47.5), + south_position = util.by_pixel(38.5, -32), + east_position = util.by_pixel(20, -70), + west_position = util.by_pixel(-19, -8.5), + frequency = 20, + starting_vertical_speed = 0.0, + starting_frame_deviation = 60 + } + } + }, + working_sound = { + sound = { + filename = "__base__/sound/boiler.ogg", + volume = 0.8 + }, + max_sounds_per_type = 3 + }, + structure = { + north = { + layers = { + { + filename = ENTITYPATH .. "boiler-N-idle.png", + priority = "extra-high", + width = 269, + height = 221, + shift = util.by_pixel(-1.25, 5.25), + scale = 0.5, + tint = bio_boiler_tint, + }, + { + filename = ENTITYPATH .. "boiler-N-shadow.png", + priority = "extra-high", + width = 274, + height = 164, + scale = 0.5, + shift = util.by_pixel(20.5, 9), + draw_as_shadow = true, + } + } + }, + east = { + layers = { + { + filename = ENTITYPATH .. "boiler-E-idle.png", + priority = "extra-high", + width = 216, + height = 301, + shift = util.by_pixel(-3, 1.25), + scale = 0.5, + tint = bio_boiler_tint, + }, + { + filename = ENTITYPATH .. "boiler-E-shadow.png", + priority = "extra-high", + width = 184, + height = 194, + scale = 0.5, + shift = util.by_pixel(30, 9.5), + draw_as_shadow = true, + } + } + }, + south = { + layers = { + { + filename = ENTITYPATH .. "boiler-S-idle.png", + priority = "extra-high", + width = 260, + height = 192, + shift = util.by_pixel(4, 13), + scale = 0.5, + tint = bio_boiler_tint, + }, + { + filename = ENTITYPATH .. "boiler-S-shadow.png", + priority = "extra-high", + width = 311, + height = 131, + scale = 0.5, + shift = util.by_pixel(29.75, 15.75), + draw_as_shadow = true, + } + } + }, + west = { + layers = { + { + filename = ENTITYPATH .. "boiler-W-idle.png", + priority = "extra-high", + width = 196, + height = 273, + shift = util.by_pixel(1.5, 7.75), + scale = 0.5, + tint = bio_boiler_tint, + }, + { + filename = ENTITYPATH .. "boiler-W-shadow.png", + priority = "extra-high", + width = 206, + height = 218, + scale = 0.5, + shift = util.by_pixel(19.5, 6.5), + draw_as_shadow = true, + } + } + } + }, + patch = { + east = { + filename = ENTITYPATH .. "boiler-E-patch.png", + width = 6, + height = 36, + shift = util.by_pixel(33.5, -13.5), + scale = 0.5, + tint = bio_boiler_tint, + }, + }, + fire_flicker_enabled = true, + fire = { + north = { + filename = ENTITYPATH .. "boiler-N-fire.png", + priority = "extra-high", + frame_count = 64, + line_length = 8, + width = 26, + height = 26, + animation_speed = 0.5, + shift = util.by_pixel(0, -8.5), + scale = 0.5 + }, + east = { + filename = ENTITYPATH .. "boiler-E-fire.png", + priority = "extra-high", + frame_count = 64, + line_length = 8, + width = 28, + height = 28, + animation_speed = 0.5, + shift = util.by_pixel(-9.5, -22), + scale = 0.5 + }, + south = { + filename = ENTITYPATH .. "boiler-S-fire.png", + priority = "extra-high", + frame_count = 64, + line_length = 8, + width = 26, + height = 16, + animation_speed = 0.5, + shift = util.by_pixel(-1, -26.5), + scale = 0.5 + }, + west = { + filename = ENTITYPATH .. "boiler-W-fire.png", + priority = "extra-high", + frame_count = 64, + line_length = 8, + width = 30, + height = 29, + animation_speed = 0.5, + shift = util.by_pixel(13, -23.25), + scale = 0.5 + } + }, + fire_glow_flicker_enabled = true, + fire_glow = { + north = { + filename = ENTITYPATH .. "boiler-N-light.png", + priority = "extra-high", + frame_count = 1, + width = 200, + height = 173, + shift = util.by_pixel(-1, -6.75), + blend_mode = "additive", + scale = 0.5 + }, + east = { + filename = ENTITYPATH .. "boiler-E-light.png", + priority = "extra-high", + frame_count = 1, + width = 139, + height = 244, + shift = util.by_pixel(0.25, -13), + blend_mode = "additive", + scale = 0.5 + }, + south = { + filename = ENTITYPATH .. "boiler-S-light.png", + priority = "extra-high", + frame_count = 1, + width = 200, + height = 162, + shift = util.by_pixel(1, 5.5), + blend_mode = "additive", + scale = 0.5 + }, + west = { + filename = ENTITYPATH .. "boiler-W-light.png", + priority = "extra-high", + frame_count = 1, + width = 136, + height = 217, + shift = util.by_pixel(2, -6.25), + blend_mode = "additive", + scale = 0.5 + } + }, + burning_cooldown = 20 + }, - }) + }) end diff --git a/Bio_Industries_2/prototypes/Bio_Fuel/fluid.lua b/Bio_Industries_2/prototypes/Bio_Fuel/fluid.lua index 1abf26f..f40ed94 100644 --- a/Bio_Industries_2/prototypes/Bio_Fuel/fluid.lua +++ b/Bio_Industries_2/prototypes/Bio_Fuel/fluid.lua @@ -1,7 +1,6 @@ local BioInd = require('common')('Bio_Industries_2') local ICONPATH = BioInd.modRoot .. "/graphics/icons/" -local ICONPATH_E = BioInd.modRoot .. "/graphics/icons/entity/" data:extend({ { @@ -11,7 +10,7 @@ data:extend({ icon_size = 64, icons = { { - icon = ICONPATH_E .. "bio_boiler.png", + icon = ICONPATH .. "bio_boiler.png", icon_size = 64, } }, diff --git a/Bio_Industries_2/prototypes/Bio_Fuel/item.lua b/Bio_Industries_2/prototypes/Bio_Fuel/item.lua index fa8fb16..44e141f 100644 --- a/Bio_Industries_2/prototypes/Bio_Fuel/item.lua +++ b/Bio_Industries_2/prototypes/Bio_Fuel/item.lua @@ -1,7 +1,6 @@ local BioInd = require('common')('Bio_Industries_2') local ICONPATH = BioInd.modRoot .. "/graphics/icons/" -local ICONPATH_E = BioInd.modRoot .. "/graphics/icons/entity/" -- Changed for 0.18.29: We always want to make advanced fertilizer, so we need to @@ -12,11 +11,11 @@ data:extend({ { type = "item", name = "bi-bio-reactor", - icon = ICONPATH_E .. "bioreactor.png", + icon = ICONPATH .. "bioreactor.png", icon_size = 64, icons = { { - icon = ICONPATH_E .. "bioreactor.png", + icon = ICONPATH .. "bioreactor.png", icon_size = 64, } }, @@ -51,11 +50,11 @@ if BI.Settings.BI_Bio_Fuel then { type = "item", name = "bi-bio-boiler", - icon = ICONPATH_E .. "bio_boiler.png", + icon = ICONPATH .. "bio_boiler.png", icon_size = 64, icons = { { - icon = ICONPATH_E .. "bio_boiler.png", + icon = ICONPATH .. "bio_boiler.png", icon_size = 64, } }, diff --git a/Bio_Industries_2/prototypes/Bio_Fuel/recipe.lua b/Bio_Industries_2/prototypes/Bio_Fuel/recipe.lua index 63f8a2a..9f57080 100644 --- a/Bio_Industries_2/prototypes/Bio_Fuel/recipe.lua +++ b/Bio_Industries_2/prototypes/Bio_Fuel/recipe.lua @@ -1,7 +1,6 @@ local BioInd = require('common')('Bio_Industries_2') local ICONPATH = BioInd.modRoot .. "/graphics/icons/" -local ICONPATH_E = BioInd.modRoot .. "/graphics/icons/entity/" -- Changed for 0.18.29: We always want to make advanced fertilizer, so we need to -- unlock the bio-reactor and the most basic recipe for algae biomass even if @@ -13,11 +12,11 @@ data:extend({ name = "bi-bio-reactor", localised_name = {"entity-name.bi-bio-reactor"}, localised_description = {"entity-description.bi-bio-reactor"}, - icon = ICONPATH_E .. "bioreactor.png", + icon = ICONPATH .. "bioreactor.png", icon_size = 64, icons = { { - icon = ICONPATH_E .. "bioreactor.png", + icon = ICONPATH .. "bioreactor.png", icon_size = 64, } }, @@ -110,11 +109,11 @@ if BI.Settings.BI_Bio_Fuel then name = "bi-bio-boiler", localised_name = {"entity-name.bi-bio-boiler"}, localised_description = {"entity-description.bi-bio-boiler"}, - icon = ICONPATH_E .. "bio_boiler.png", + icon = ICONPATH .. "bio_boiler.png", icon_size = 64, icons = { { - icon = ICONPATH_E .. "bio_boiler.png", + icon = ICONPATH .. "bio_boiler.png", icon_size = 64, } }, diff --git a/Bio_Industries_2/prototypes/Bio_Fuel/technology.lua b/Bio_Industries_2/prototypes/Bio_Fuel/technology.lua index 67d17d6..abbde0c 100644 --- a/Bio_Industries_2/prototypes/Bio_Fuel/technology.lua +++ b/Bio_Industries_2/prototypes/Bio_Fuel/technology.lua @@ -8,12 +8,12 @@ if BI.Settings.BI_Bio_Fuel then { type = "technology", name = "bi-tech-organic-plastic", - icon_size = 256, - icon = ICONPATH .. "bi-tech-cellulose.png", + icon_size = 128, + icon = ICONPATH .. "Cellulose_128.png", icons = { { - icon = ICONPATH .. "bi-tech-cellulose.png", - icon_size = 256, + icon = ICONPATH .. "Cellulose_128.png", + icon_size = 128, } }, effects = { diff --git a/Bio_Industries_2/prototypes/Bio_Garden/entities.lua b/Bio_Industries_2/prototypes/Bio_Garden/entities.lua index 0c9125e..a64ef10 100644 --- a/Bio_Industries_2/prototypes/Bio_Garden/entities.lua +++ b/Bio_Industries_2/prototypes/Bio_Garden/entities.lua @@ -1,339 +1,79 @@ local BioInd = require('common')('Bio_Industries_2') local ICONPATH = BioInd.modRoot .. "/graphics/icons/" -local ICONPATH_E = BioInd.modRoot .. "/graphics/icons/entity/" -local ENTITYPATH_BIO = BioInd.modRoot .. "/graphics/entities/" -require("util") +require ("util") --- Bio Garden data:extend({ - { - type = "assembling-machine", - name = "bi-bio-garden", - icon = ICONPATH_E .. "bio_garden_icon.png", + { + type = "assembling-machine", + name = "bi-bio-garden", + icon = ICONPATH .. "bio_garden_icon.png", + icon_size = 64, + icons = { + { + icon = ICONPATH .. "bio_garden_icon.png", icon_size = 64, - icons = { - { - icon = ICONPATH_E .. "bio_garden_icon.png", - icon_size = 64, - } - }, - flags = { "placeable-neutral", "placeable-player", "player-creation" }, - minable = { hardness = 0.2, mining_time = 0.5, result = "bi-bio-garden" }, - fast_replaceable_group = "bi-bio-garden", - max_health = 150, - corpse = "medium-remnants", - collision_box = { { -1.2, -1.2 }, { 1.2, 1.2 } }, - selection_box = { { -1.5, -1.5 }, { 1.5, 1.5 } }, - fluid_boxes = { - { - production_type = "input", - pipe_picture = assembler3pipepictures(), - pipe_covers = pipecoverspictures(), - volume = 1000, - base_level = -1, - pipe_connections = { { flow_direction = "input", direction = defines.direction.north, position = { 0, -1 } } } - }, - }, - fluid_boxes_off_when_no_fluid_recipe = true, - graphics_set = { - animation = { - layers = { - { - filename = ENTITYPATH_BIO .. "bio_garden/bio_garden_anim_trees.png", - width = 256, height = 320, - frame_count = 20, line_length = 5, - animation_speed = 0.15, scale = 0.5, shift = {0, -0.75} - }, - { - filename = ENTITYPATH_BIO .. "bio_garden/bio_garden_shadow.png", - width = 384, height = 320, - frame_count = 1, repeat_count = 20, -- repeat to match - draw_as_shadow = true, scale = 0.5, shift = {1, -0.75} - } - } - } - }, - open_sound = { filename = "__base__/sound/machine-open.ogg", volume = 0.85 }, - close_sound = { filename = "__base__/sound/machine-close.ogg", volume = 0.75 }, - working_sound = { - sound = { { filename = "__Bio_Industries_2__/sound/rainforest_ambience.ogg", volume = 0.8 } }, - idle_sound = { filename = "__base__/sound/idle1.ogg", volume = 0.6 }, - apparent_volume = 1.5, - }, - crafting_categories = { "clean-air" }, - source_inventory_size = 1, - result_inventory_size = 1, - crafting_speed = 1.0, - energy_source = { - type = "electric", - usage_priority = "secondary-input", - emissions_per_minute = { pollution = -45 }, -- Negative value: pollution is absorbed! - }, - energy_usage = "200kW", - ingredient_count = 1, - -- Changed for 0.18.34/1.1.4 -- Modules don't make sense for the gardens! - -- (Efficiency modules are also meant to reduce pollution, but as the base value - -- is negative, the resulting value is greater than the base value! ) - module_specification = { - module_slots = 1 - }, - -- Changed for 0.18.34/1.1.4 -- We need to use an empty table here, so the gardens - -- won't be affected by beacons! - allowed_effects = { "consumption", "speed" }, + } }, - ----- Bio Garden Large - { - type = "assembling-machine", - name = "bi-bio-garden-large", - icon = ICONPATH_E .. "bio_garden_large_icon.png", - icon_size = 64, - icons = { - { - icon = ICONPATH_E .. "bio_garden_large_icon.png", - icon_size = 64, - } - }, - flags = { "placeable-neutral", "placeable-player", "player-creation" }, - minable = { hardness = 0.6, mining_time = 1, result = "bi-bio-garden-large" }, - fast_replaceable_group = "bi-bio-garden-large", - max_health = 1200, - corpse = "medium-remnants", - collision_box = {{-4.3, -4.3}, {4.3, 4.3}}, - selection_box = {{-4.5, -4.5}, {4.5, 4.5}}, - scale_entity_info_icon = true, - fluid_boxes = { - { - production_type = "input", - pipe_covers = pipecoverspictures(), - base_area = 1, - base_level = -1, - volume = 1000, - filter = "water", - pipe_connections = { { flow_direction = "input", direction = defines.direction.north, position = { 0, -4 } } }, - --pipe_connections = { { flow_direction = "input", direction = defines.direction.north, position = { 0, 4 } } }, - -- pipe_connections = { { flow_direction = "input", direction = defines.direction.north, position = { -4, 0 } } }, - -- pipe_connections = { { flow_direction = "input", direction = defines.direction.north, position = { 4, 0 } } }, - - - }, - }, - off_when_no_fluid_recipe = false, - graphics_set = { - animation = { - layers = { - { - filename = ENTITYPATH_BIO .. "bio_garden/bio_garden_large.png", - width = 640, - height = 704, - scale = 0.5, - shift = {0, -0.5}, - }, - { - filename = ENTITYPATH_BIO .. "bio_garden/bio_garden_large_shadow.png", - width = 704, - height = 640, - scale = 0.5, - shift = {0.5, 0}, - draw_as_shadow = true, - } - } - }, - - working_visualisations = { - { - light = {intensity = 1.2, size = 20 }, - draw_as_light = true, - effect = "flicker", - constant_speed = true, - fadeout = true, - animation = { - filename = ENTITYPATH_BIO .. "bio_garden/bio_garden_large_light.png", - width = 640, - height = 640, - scale = 0.5, - shift = {0, 0}, - }, - }, - }, - }, - open_sound = { filename = "__base__/sound/machine-open.ogg", volume = 0.85 }, - close_sound = { filename = "__base__/sound/machine-close.ogg", volume = 0.75 }, - working_sound = { - sound = { { filename = "__Bio_Industries_2__/sound/rainforest_ambience.ogg", volume = 1 } }, - idle_sound = { filename = "__base__/sound/idle1.ogg", volume = 0.8 }, - apparent_volume = 1.5, - }, - crafting_categories = { "clean-air" }, - source_inventory_size = 1, - result_inventory_size = 1, - crafting_speed = 4.0, - energy_source = { - type = "electric", - usage_priority = "secondary-input", - emissions_per_minute = { pollution = -360 }, -- Negative value: pollution is absorbed! - }, - energy_usage = "800kW", - ingredient_count = 1, - -- Changed for 0.18.34/1.1.4 -- Modules don't make sense for the gardens! - -- (Efficiency modules are also meant to reduce pollution, but as the base value - -- is negative, the resulting value is greater than the base value! ) - module_specification = { - module_slots = 2 - }, - -- Changed for 0.18.34/1.1.4 -- We need to use an empty table here, so the gardens - -- won't be affected by beacons! - allowed_effects = { "consumption", "speed" }, + flags = {"placeable-neutral", "placeable-player", "player-creation"}, + minable = {hardness = 0.2, mining_time = 0.5, result = "bi-bio-garden"}, + fast_replaceable_group = "bi-bio-garden", + max_health = 150, + corpse = "medium-remnants", + collision_box = {{-1.2, -1.2}, {1.2, 1.2}}, + selection_box = {{-1.5, -1.5}, {1.5, 1.5}}, + fluid_boxes = { + { + production_type = "input", + pipe_picture = assembler3pipepictures(), + pipe_covers = pipecoverspictures(), + volume = 1000, + base_level = -1, + pipe_connections = {{ flow_direction = "input", direction = defines.direction.north, position = {0, -1} }} + }, }, - ----- Bio Garden Huge - { - type = "assembling-machine", - name = "bi-bio-garden-huge", - icon = ICONPATH_E .. "bio_garden_huge_icon.png", - icon_size = 64, - icons = { - { - icon = ICONPATH_E .. "bio_garden_huge_icon.png", - icon_size = 64, - } - }, - flags = { "placeable-neutral", "placeable-player", "player-creation" }, - minable = { hardness = 1.2, mining_time = 2, result = "bi-bio-garden-huge" }, - fast_replaceable_group = "bi-bio-garden-huge", - max_health = 2000, - corpse = "medium-remnants", - collision_box = {{-13.3, -13.3}, {13.3, 13.3}}, - selection_box = {{-13.5, -13.5}, {13.5, 13.5}}, - scale_entity_info_icon = true, - fluid_boxes = { - { - production_type = "input", - pipe_covers = pipecoverspictures(), - base_area = 1, - base_level = -1, - volume = 1000, - filter = "water", - pipe_connections = { { flow_direction = "input", direction = defines.direction.north, position = { 0, -13 } } }, - -- pipe_connections = { { flow_direction = "input", direction = defines.direction.north, position = { 0, 13 } } }, - -- pipe_connections = { { flow_direction = "input", direction = defines.direction.north, position = { -13, 0 } } }, - -- pipe_connections = { { flow_direction = "input", direction = defines.direction.north, position = { 13, 0 } } }, - }, - }, - off_when_no_fluid_recipe = false, - graphics_set = { - animation = { - layers = { - { - filename = ENTITYPATH_BIO .. "bio_garden/bio_garden_huge.png", - width = 1792, - height = 1856, - scale = 0.5, - frame_count = 1, - line_length = 1, - repeat_count = 8, - animation_speed = 1, - shift = {0, -0.5}, - }, - { - filename = ENTITYPATH_BIO .. "bio_garden/bio_garden_huge_shadow.png", - width = 256, - height = 1856, - scale = 0.5, - frame_count = 1, - line_length = 1, - repeat_count = 8, - animation_speed = 1, - shift = {14, -0.5}, - draw_as_shadow = true, - }, - }, - }, - - working_visualisations = { - { - constant_speed = true, - fadeout = true, - animation = { - layers = { - { - filename = ENTITYPATH_BIO .. "bio_garden/bio_garden_huge_turbine_anim.png", - width = 128, - height = 96, - scale = 0.5, - frame_count = 8, - line_length = 8, - repeat_count = 1, - animation_speed = 1, - shift = {-4.5, -4.5}, - }, - { - filename = ENTITYPATH_BIO .. "bio_garden/bio_garden_huge_turbine_anim.png", - width = 128, - height = 96, - scale = 0.5, - frame_count = 8, - line_length = 8, - repeat_count = 1, - animation_speed = 1, - shift = {4.5, 4.5}, - }, - { - filename = ENTITYPATH_BIO .. "bio_garden/bio_garden_huge_turbine_anim.png", - width = 128, - height = 96, - scale = 0.5, - frame_count = 8, - line_length = 8, - repeat_count = 1, - animation_speed = 1, - shift = {4.5, -4.5}, - }, - { - filename = ENTITYPATH_BIO .. "bio_garden/bio_garden_huge_turbine_anim.png", - width = 128, - height = 96, - scale = 0.5, - frame_count = 8, - line_length = 8, - repeat_count = 1, - animation_speed = 1, - shift = {-4.5, 4.5}, - }, - }, - }, - }, - }, - }, - open_sound = { filename = "__base__/sound/machine-open.ogg", volume = 0.85 }, - close_sound = { filename = "__base__/sound/machine-close.ogg", volume = 0.75 }, - working_sound = { - sound = { { filename = "__Bio_Industries_2__/sound/rainforest_ambience.ogg", volume = 1.8 } }, - idle_sound = { filename = "__base__/sound/idle1.ogg", volume = 0.9 }, - apparent_volume = 2, - }, - crafting_categories = { "clean-air" }, - source_inventory_size = 1, - result_inventory_size = 1, - crafting_speed = 16, - energy_source = { - type = "electric", - usage_priority = "secondary-input", - emissions_per_minute = { pollution = -2880 }, -- Negative value: pollution is absorbed! - }, - energy_usage = "3200kW", - ingredient_count = 1, - -- Changed for 0.18.34/1.1.4 -- Modules don't make sense for the gardens! - -- (Efficiency modules are also meant to reduce pollution, but as the base value - -- is negative, the resulting value is greater than the base value! ) - module_specification = { - module_slots = 4 - }, - -- Changed for 0.18.34/1.1.4 -- We need to use an empty table here, so the gardens - -- won't be affected by beacons! - allowed_effects = { "consumption", "speed" }, + fluid_boxes_off_when_no_fluid_recipe = true, + animation = { + filename = "__Bio_Industries_2__/graphics/entities/biogarden/bio_garden_x.png", + width = 160, + height = 160, + frame_count = 12, + line_length = 4, + animation_speed = 0.025, + shift = {0.45, 0} }, + open_sound = { filename = "__base__/sound/machine-open.ogg", volume = 0.85 }, + close_sound = { filename = "__base__/sound/machine-close.ogg", volume = 0.75 }, + working_sound = { + sound = { { filename = "__Bio_Industries_2__/sound/rainforest_ambience.ogg", volume = 0.8 } }, + idle_sound = { filename = "__base__/sound/idle1.ogg", volume = 0.6 }, + apparent_volume = 1.5, + }, + crafting_categories = {"clean-air"}, + source_inventory_size = 1, + result_inventory_size = 1, + crafting_speed = 1.0, + energy_source = { + type = "electric", + usage_priority = "secondary-input", + emissions_per_minute = { pollution = -45 }, -- Negative value: pollution is absorbed! + }, + energy_usage = "200kW", + ingredient_count = 1, + -- Changed for 0.18.34/1.1.4 -- Modules don't make sense for the gardens! + -- (Efficiency modules are also meant to reduce pollution, but as the base value + -- is negative, the resulting value is greater than the base value! ) + module_specification = { + module_slots = 1 + }, + -- Changed for 0.18.34/1.1.4 -- We need to use an empty table here, so the gardens + -- won't be affected by beacons! + allowed_effects = {"consumption", "speed"}, + }, }) + + + diff --git a/Bio_Industries_2/prototypes/Bio_Garden/item.lua b/Bio_Industries_2/prototypes/Bio_Garden/item.lua index eb1b7f5..b71de06 100644 --- a/Bio_Industries_2/prototypes/Bio_Garden/item.lua +++ b/Bio_Industries_2/prototypes/Bio_Garden/item.lua @@ -1,7 +1,6 @@ local BioInd = require('common')('Bio_Industries_2') local ICONPATH = BioInd.modRoot .. "/graphics/icons/" -local ICONPATH_E = BioInd.modRoot .. "/graphics/icons/entity/" -------- Bio Garden @@ -10,11 +9,11 @@ data:extend({ { type = "item", name = "bi-bio-garden", - icon = ICONPATH_E .. "bio_garden_icon.png", + icon = ICONPATH .. "bio_garden_icon.png", icon_size = 64, icons = { { - icon = ICONPATH_E .. "bio_garden_icon.png", + icon = ICONPATH .. "bio_garden_icon.png", icon_size = 64, } }, @@ -24,40 +23,6 @@ data:extend({ stack_size = 10 }, - { - type = "item", - name = "bi-bio-garden-large", - icon = ICONPATH_E .. "bio_garden_large_icon.png", - icon_size = 64, - icons = { - { - icon = ICONPATH_E .. "bio_garden_large_icon.png", - icon_size = 64, - } - }, - subgroup = "production-machine", - order = "x[bi]-c[bi-bio-garden]", - place_result = "bi-bio-garden-large", - stack_size = 10 - }, - - { - type = "item", - name = "bi-bio-garden-huge", - icon = ICONPATH_E .. "bio_garden_huge_icon.png", - icon_size = 64, - icons = { - { - icon = ICONPATH_E .. "bio_garden_huge_icon.png", - icon_size = 64, - } - }, - subgroup = "production-machine", - order = "x[bi]-d[bi-bio-garden]", - place_result = "bi-bio-garden-huge", - stack_size = 10 - }, - { type = "item", name = "bi-purified-air", diff --git a/Bio_Industries_2/prototypes/Bio_Garden/recipe.lua b/Bio_Industries_2/prototypes/Bio_Garden/recipe.lua index 678ffc5..3613a20 100644 --- a/Bio_Industries_2/prototypes/Bio_Garden/recipe.lua +++ b/Bio_Industries_2/prototypes/Bio_Garden/recipe.lua @@ -1,7 +1,6 @@ local BioInd = require('common')('Bio_Industries_2') local ICONPATH = BioInd.modRoot .. "/graphics/icons/" -local ICONPATH_E = BioInd.modRoot .. "/graphics/icons/entity/" --- Bio Gardens data:extend({ @@ -12,11 +11,11 @@ data:extend({ name = "bi-bio-garden", localised_name = {"entity-name.bi-bio-garden"}, localised_description = {"entity-description.bi-bio-garden"}, - icon = ICONPATH_E .. "bio_garden_icon.png", + icon = ICONPATH .. "bio_garden_icon.png", icon_size = 64, icons = { { - icon = ICONPATH_E .. "bio_garden_icon.png", + icon = ICONPATH .. "bio_garden_icon.png", icon_size = 64, } }, @@ -30,77 +29,14 @@ data:extend({ results = {{type="item", name="bi-bio-garden", amount=1}}, main_product = "", subgroup = "bio-bio-gardens-fluid", - order = "a[bi-garden-1]", - allow_as_intermediate = false, -- Changed for 0.18.34/1.1.4 + order = "a[bi]", + allow_as_intermediate = false, -- Changed for 0.18.34/1.1.4 always_show_made_in = false, -- Changed for 0.18.34/1.1.4 allow_decomposition = true, -- Changed for 0.18.34/1.1.4 -- This is a custom property for use by "Krastorio 2" (it will change -- ingredients/results; used for wood/wood pulp) mod = "Bio_Industries_2", }, - --- Garden - Large(ENTITY) - { - type = "recipe", - name = "bi-bio-garden-lagre", - localised_name = {"entity-name.bi-bio-garden-lagre"}, - localised_description = {"entity-description.bi-bio-garden-lagre"}, - icon = ICONPATH_E .. "bio_garden_large_icon.png", - icon_size = 64, - icons = { - { - icon = ICONPATH_E .. "bio_garden_large_icon.png", - icon_size = 64, - } - }, - enabled = false, - energy_required = 15, - ingredients = { - {type="item", name="stone-wall", amount=48}, - {type="item", name="stone-crushed", amount=200}, - {type="item", name="bi-bio-garden", amount=4} - }, - results = {{type="item", name="bi-bio-garden-large", amount=1}}, - main_product = "", - subgroup = "bio-bio-gardens-fluid", - order = "a[bi-garden-2]", - allow_as_intermediate = false, -- Changed for 0.18.34/1.1.4 - always_show_made_in = false, -- Changed for 0.18.34/1.1.4 - allow_decomposition = true, -- Changed for 0.18.34/1.1.4 -- This is a custom property for use by "Krastorio 2" (it will change - -- ingredients/results; used for wood/wood pulp) - mod = "Bio_Industries_2", - }, - - --- Garden - Huge(ENTITY) - { - type = "recipe", - name = "bi-bio-garden-huge", - localised_name = {"entity-name.bi-bio-garden-huge"}, - localised_description = {"entity-description.bi-bio-garden-huge"}, - icon = ICONPATH_E .. "bio_garden_huge_icon.png", - icon_size = 64, - icons = { - { - icon = ICONPATH_E .. "bio_garden_huge_icon.png", - icon_size = 64, - } - }, - enabled = false, - energy_required = 15, - ingredients = { - {type="item", name="stone-wall", amount=192}, - {type="item", name="stone-crushed", amount=800}, - {type="item", name="bi-bio-garden-large", amount=4} - }, - results = {{type="item", name="bi-bio-garden-huge", amount=1}}, - main_product = "", - subgroup = "bio-bio-gardens-fluid", - order = "a[bi-garden-3]", - allow_as_intermediate = false, -- Changed for 0.18.34/1.1.4 - always_show_made_in = false, -- Changed for 0.18.34/1.1.4 - allow_decomposition = true, -- Changed for 0.18.34/1.1.4 -- This is a custom property for use by "Krastorio 2" (it will change - -- ingredients/results; used for wood/wood pulp) - mod = "Bio_Industries_2", - }, --- Clean Air 1 { diff --git a/Bio_Industries_2/prototypes/Bio_Solar_Farm/entities.lua b/Bio_Industries_2/prototypes/Bio_Solar_Farm/entities.lua index 5d7903a..76664ae 100644 --- a/Bio_Industries_2/prototypes/Bio_Solar_Farm/entities.lua +++ b/Bio_Industries_2/prototypes/Bio_Solar_Farm/entities.lua @@ -1,620 +1,450 @@ local tile_graphics = require("__base__/prototypes/tile/tile-graphics") local BioInd = require('common')('Bio_Industries_2') -require("util") +require ("util") local ICONPATH = BioInd.modRoot .. "/graphics/icons/" -local ICONPATH_E = BioInd.modRoot .. "/graphics/icons/entity/" -local ENTITYPATH_BIO = "__Bio_Industries_2__/graphics/entities/" - +local ENTITYPATH = "__Bio_Industries_2__/graphics/entities/bio_solar_farm/" if BI.Settings.BI_Solar_Additions then - local sounds = {} - sounds.walking_sound = {} - for i = 1, 11 do - sounds.walking_sound[i] = { - filename = "__base__/sound/walking/concrete-" .. i .. ".ogg", - volume = 1.2 - } + + +local sounds = {} +sounds.walking_sound = {} +for i = 1, 11 do + sounds.walking_sound[i] = { + filename = "__base__/sound/walking/concrete-" .. i ..".ogg", + volume = 1.2 + } end - -function big_accumulator_picture(tint, repeat_count) - return - { - layers = +data:extend({ + ------- Bio Farm Solar Panel + { + type = "solar-panel", + name = "bi-bio-solar-farm", + icon = ICONPATH .. "Bio_Solar_Farm_Icon.png", + icon_size = 64, + icons = { { - { - filename = ENTITYPATH_BIO .. "bio_accumulator/bi_large_accumulator.png", - priority = "extra-high", - width = 307, - height = 362, - scale = 0.5, - repeat_count = repeat_count, - tint = tint, - shift = {0, -0.6}, - }, - { - filename = ENTITYPATH_BIO .. "bio_accumulator/bi_large_accumulator_shadow.png", - priority = "extra-high", - width = 384, - height = 272, - repeat_count = repeat_count, - shift = {1, 0}, - scale = 0.5, - draw_as_shadow = true, - } + icon = ICONPATH .. "Bio_Solar_Farm_Icon.png", + icon_size = 64, } - } - end - - function big_accumulator_charge() - return - { - layers = - { - big_accumulator_picture({1, 1, 1, 1} , 24), - { - filename = ENTITYPATH_BIO .. "bio_accumulator/bi_large_accumulator_anim_charge.png", - priority = "extra-high", - width = 307, - height = 362, - line_length = 6, - frame_count = 12, - repeat_count = 2, - draw_as_glow = true, - shift = {0, -0.6}, - scale = 0.5, - animation_speed = 0.3, - } - } - } - end - - function big_accumulator_reflection() - return - { - pictures = - { - filename = ENTITYPATH_BIO .. "bio_accumulator/big-bi_large_accumulator_reflection.png", - priority = "extra-high", - width = 20, - height = 24, - shift = util.by_pixel(0, 50), - variation_count = 1, - scale = 5 - }, - rotate = false, - orientation_to_variation = false - } - end - - function big_accumulator_discharge() - return - { - layers = - { - big_accumulator_picture({1, 1, 1, 1} , 24), - { - filename = ENTITYPATH_BIO .. "bio_accumulator/bi_large_accumulator_anim_discharge.png", - priority = "extra-high", - width = 307, - height = 362, - line_length = 6, - frame_count = 24, - draw_as_glow = true, - shift = {0, -0.6}, - scale = 0.5, - animation_speed = 0.4, - } - } - } - end + }, + -- This is necessary for "Space Exploration" (if not true, the entity can only be + -- placed on Nauvis)! + se_allow_in_space = true, + flags = {"placeable-neutral", "player-creation"}, + minable = {hardness = 0.25, mining_time = 0.5, result = "bi-bio-solar-farm"}, + max_health = 600, + corpse = "big-remnants", + dying_explosion = "medium-explosion", + resistances = {{type = "fire", percent = 80}}, + collision_box = {{-4.2, -4.2}, {4.2, 4.2}}, + selection_box = {{-4.5, -4.5}, {4.5, 4.5}}, + energy_source = { + type = "electric", + usage_priority = "solar" + }, + picture = { + filename = ENTITYPATH .. "Bio_Solar_Farm_On.png", + priority = "low", + width = 312, + height = 289, + frame_count = 1, + direction_count = 1, + --scale = 3/2, + shift = {0.30, 0} + }, + production = "3600kW" + }, - data:extend({ - ------- Bio Farm Solar Panel - { - type = "solar-panel", - name = "bi-bio-solar-farm", - icon = ICONPATH_E .. "bio_Solar_Farm_Icon.png", - icon_size = 64, - icons = { - { - icon = ICONPATH_E .. "bio_Solar_Farm_Icon.png", - icon_size = 64, - } - }, - -- This is necessary for "Space Exploration" (if not true, the entity can only be - -- placed on Nauvis)! - se_allow_in_space = true, - flags = { "placeable-neutral", "player-creation" }, - minable = { hardness = 0.25, mining_time = 0.5, result = "bi-bio-solar-farm" }, - max_health = 600, - corpse = "big-remnants", - dying_explosion = "medium-explosion", - resistances = { { type = "fire", percent = 80 } }, - collision_box = { { -4.2, -4.2 }, { 4.2, 4.2 } }, - selection_box = { { -4.5, -4.5 }, { 4.5, 4.5 } }, - energy_source = { - type = "electric", - usage_priority = "solar" - }, - picture = - { - layers = - { - { - filename = ENTITYPATH_BIO .. "bio_solar_farm/bio_Solar_Farm.png", - priority = "high", - width = 624, - height = 578, - shift = { 0.30, 0 }, - scale = 0.5 - }, - { - filename = ENTITYPATH_BIO .. "bio_solar_farm/bio_Solar_Farm_shadow.png", - priority = "high", - width = 624, - height = 578, - shift = { 1.30, 0 }, - draw_as_shadow = true, - scale = 0.5 - } - } - }, - production = "3600kW" - }, - - - ---- BI Accumulator -{ + ---- BI Accumulator + { type = "accumulator", name = "bi-bio-accumulator", - icon = ICONPATH_E .. "bi_LargeAccumulator.png", + icon = ICONPATH .. "bi_LargeAccumulator.png", icon_size = 64, icons = { - { - icon = ICONPATH_E .. "bi_LargeAccumulator.png", - icon_size = 64, - } + { + icon = ICONPATH .. "bi_LargeAccumulator.png", + icon_size = 64, + } }, - -- This is necessary for "Space Exploration" + -- This is necessary for "Space Exploration" (if not true, the entity can only be + -- placed on Nauvis)! se_allow_in_space = true, - flags = { "placeable-neutral", "player-creation" }, - minable = { hardness = 0.2, mining_time = 0.5, result = "bi-bio-accumulator" }, + flags = {"placeable-neutral", "player-creation"}, + minable = {hardness = 0.2, mining_time = 0.5, result = "bi-bio-accumulator"}, max_health = 500, corpse = "big-remnants", - collision_box = { { -1.75, -1.75 }, { 1.75, 1.75 } }, - selection_box = { { -2, -2 }, { 2, 2 } }, - + collision_box = {{-1.75, -1.75}, {1.75, 1.75}}, + selection_box = {{-2, -2}, {2, 2}}, + --collision_box = {{-2, -2}, {2, 2}}, + --selection_box = {{-2.5, -2.5}, {2.5, 2.5}}, energy_source = { - type = "electric", - buffer_capacity = "300MJ", - usage_priority = "tertiary", - input_flow_limit = "25MW", - output_flow_limit = "25MW" + type = "electric", + buffer_capacity = "300MJ", + usage_priority = "tertiary", + input_flow_limit = "20MW", + output_flow_limit = "20MW" }, - - chargable_graphics = - { - picture = big_accumulator_picture(), - charge_animation = big_accumulator_charge(), - charge_cooldown = 30, - discharge_animation = big_accumulator_discharge(), - discharge_cooldown = 60 - --discharge_light = {intensity = 0.7, size = 7, color = {r = 1.0, g = 1.0, b = 1.0}}, + picture = { + filename = ENTITYPATH .. "bi_LargeAccumulator.png", + priority = "extra-high", + width = 245, + height = 245, + shift = {0.75, -0.5}, + scale = 0.75, }, - water_reflection = big_accumulator_reflection(), - impact_category = "metal", - open_sound = sounds.electric_large_open, - close_sound = sounds.electric_large_close, - working_sound = - { - main_sounds = - { - { - sound = {filename = "__base__/sound/accumulator-working.ogg", volume = 0.4, modifiers = volume_multiplier("main-menu", 1.44)}, - match_volume_to_activity = true, - activity_to_volume_modifiers = {offset = 2, inverted = true}, - fade_in_ticks = 4, - fade_out_ticks = 20 - }, - { - sound = {filename = "__base__/sound/accumulator-discharging.ogg", volume = 0.4, modifiers = volume_multiplier("main-menu", 1.44)}, - match_volume_to_activity = true, - activity_to_volume_modifiers = {offset = 1}, - fade_in_ticks = 4, - fade_out_ticks = 20 - } + charge_animation = { + filename = ENTITYPATH .. "bi_LargeAccumulatorAnimated.png", + width = 250, + height = 250, + line_length = 8, + frame_count = 24, + shift = {0.75, -0.5}, + scale = 0.75, + animation_speed = 0.5 + }, + charge_cooldown = 30, + charge_light = {intensity = 0.3, size = 7, color = {r = 1.0, g = 1.0, b = 1.0}}, + discharge_animation = { + filename = ENTITYPATH .. "bi_LargeAccumulatorAnimated.png", + width = 250, + height = 250, + line_length = 8, + frame_count = 24, + shift = {0.75, -0.5}, + scale = 0.75, + animation_speed = 0.5 + }, + discharge_cooldown = 60, + discharge_light = {intensity = 0.7, size = 7, color = {r = 1.0, g = 1.0, b = 1.0}}, + working_sound = { + sound = { + filename = "__base__/sound/accumulator-working.ogg", + volume = 1 }, - idle_sound = {filename = "__base__/sound/accumulator-idle.ogg", volume = 0.35}, - max_sounds_per_type = 3, - audible_distance_modifier = 0.5 + idle_sound = { + filename = "__base__/sound/accumulator-idle.ogg", + volume = 0.4 + }, + max_sounds_per_type = 5 }, - - circuit_connector = circuit_connector_definitions["accumulator"], + circuit_wire_connection_point = { + shadow = { + red = {0.984375, 1.10938}, + green = {0.890625, 1.10938} + }, + wire = { + red = {0.6875, 0.59375}, + green = {0.6875, 0.71875} + } + }, + --circuit_connector_sprites = get_circuit_connector_sprites({0.46875, 0.5}, {0.46875, 0.8125}, 26), circuit_wire_max_distance = 9, - - default_output_signal = {type = "virtual", name = "signal-A"}, - weight = 200 * kg -}, + default_output_signal = {type = "virtual", name = "signal-A"} + }, - ---- Large Substation - { - type = "electric-pole", - name = "bi-large-substation", - localised_name = { "entity-name.bi-large-substation" }, - localised_description = { "entity-description.bi-large-substation" }, - icon = ICONPATH_E .. "bi_LargeSubstation_icon.png", - icon_size = 64, - icons = { - { - icon = ICONPATH_E .. "bi_LargeSubstation_icon.png", - icon_size = 64, - } - }, - -- This is necessary for "Space Exploration" (if not true, the entity can only be - -- placed on Nauvis)! - se_allow_in_space = true, - flags = { "placeable-neutral", "player-creation" }, - minable = { hardness = 0.2, mining_time = 0.5, result = "bi-large-substation" }, - max_health = 600, - corpse = "big-remnants", - dying_explosion = "big-explosion", - track_coverage_during_build_by_moving = true, - resistances = { - { - type = "fire", - percent = 90 - } - }, - collision_box = { { -2.4, -2.4 }, { 2.4, 2.4 } }, - selection_box = { { -2.5, -2.5 }, { 2.5, 2.5 } }, - drawing_box = { { -2.5, -5 }, { 2.5, 2.5 } }, - maximum_wire_distance = 25, - -- Changed for 0.18.34/1.1.4 - supply_area_distance = 50.5, - pictures = { - layers = { - { - filename = ENTITYPATH_BIO .. "bio_substation/bio_substation.png", - priority = "high", - width = 384, - height = 384, - shift = { 0, 0 }, - direction_count = 1, - scale = 0.5, - }, - { - filename = ENTITYPATH_BIO .. "bio_substation/bio_substation_shadow.png", - priority = "high", - width = 384, - height = 384, - shift = { 1, 0 }, - direction_count = 1, - draw_as_shadow = true, - scale = 0.5, - }, - } - }, - working_sound = { - sound = { filename = "__base__/sound/substation.ogg" }, - apparent_volume = 1.8, - audible_distance_modifier = 0.5, - probability = 1 / (3 * 60) -- average pause between the sound is 3 seconds - }, - connection_points = { - { - shadow = { - copper = { 1.9, -0.6 }, - green = { 1.3, -0.6 }, - red = { 2.65, -0.6 } - }, - wire = { - copper = { -0.25, -2.71875 }, - green = { -0.84375, -2.71875 }, - red = { 0.34375, -2.71875 } - } - }, - }, - radius_visualisation_picture = { - filename = "__base__/graphics/entity/small-electric-pole/electric-pole-radius-visualization.png", - width = 12, - height = 12, - --scale = 3, - --shift = {0.6, -0.6}, - priority = "extra-high-no-scale" - }, - }, - - - ---- Solar Floor / Musk Floor - { - type = "tile", - name = "bi-solar-mat", - localised_name = { "entity-name.bi-solar-mat" }, - localised_description = { "entity-description.bi-solar-mat" }, - icon = ICONPATH_E .. "solar-mat.png", - icon_size = 64, - icons = { - { - icon = ICONPATH_E .. "solar-mat.png", - icon_size = 64, - } - }, - needs_correction = false, - minable = { hardness = 0.1, mining_time = 0.25, result = "bi-solar-mat" }, - mined_sound = { filename = "__base__/sound/deconstruct-bricks.ogg" }, - collision_mask = { layers = { ground_tile = true } }, - --collision_box = { { -0.5, -0.5 }, { 0.5, 0.5 } }, - walking_speed_modifier = 1.45, - layer = 13, - layer_group = "ground-artificial", - transition_overlay_layer_offset = 2, - decorative_removal_probability = 1, - variants = { - transition = tile_graphics.generic_masked_tile_transitions1, - main = { - { - picture = ENTITYPATH_BIO .. "bio_musk_floor/solarfloor.png", - count = 1, - size = 1, - scale = 0.5, - probability = 1, - }, - }, - inner_corner = { - picture = ENTITYPATH_BIO .. "bio_musk_floor/solarfloor_inner-corner.png", - count = 1, - scale = 0.5, - }, - inner_corner_mask = { - picture = ENTITYPATH_BIO .. "bio_musk_floor/solarfloor_inner-corner-mask.png", - count = 1, - scale = 0.5, - }, - outer_corner = { - picture = ENTITYPATH_BIO .. "bio_musk_floor/solarfloor_outer-corner.png", - count = 1, - scale = 0.5, - }, - outer_corner_mask = { - picture = ENTITYPATH_BIO .. "bio_musk_floor/solarfloor_outer-corner-mask.png", - count = 1, - scale = 0.5, - }, - side = { - picture = ENTITYPATH_BIO .. "bio_musk_floor/solarfloor_side.png", - count = 1, - scale = 0.5, - }, - side_mask = { - picture = ENTITYPATH_BIO .. "bio_musk_floor/solarfloor_side-mask.png", - count = 1, - scale = 0.5, - }, - u_transition = { - picture = ENTITYPATH_BIO .. "bio_musk_floor/solarfloor_u.png", - count = 1, - scale = 0.5, - }, - u_transition_mask = { - picture = ENTITYPATH_BIO .. "bio_musk_floor/solarfloor_u-mask.png", - count = 1, - scale = 0.5, - }, - o_transition = { - picture = ENTITYPATH_BIO .. "bio_musk_floor/solarfloor_o.png", - count = 1, - scale = 0.5, - }, - o_transition_mask = { - picture = ENTITYPATH_BIO .. "bio_musk_floor/solarfloor_o-mask.png", - count = 1, - scale = 0.5, - }, - material_background = { - picture = ENTITYPATH_BIO .. "bio_musk_floor/solarfloor.png", - count = 1, - scale = 0.5, - }, - - }, - walking_sound = sounds.walking_sound, - map_color = { r = 93, g = 138, b = 168 }, - vehicle_friction_modifier = dirt_vehicle_speed_modifer - }, - }) - - data:extend({ - ------- Boiler for Solar Plant / Boiler -{ - type = "boiler", - name = "bi-solar-boiler", - icon = ICONPATH_E .. "bio_Solar_Boiler_Icon.png", + ---- Large Substation + { + type = "electric-pole", + name = "bi-large-substation", + localised_name = {"entity-name.bi-large-substation"}, + localised_description = {"entity-description.bi-large-substation"}, + icon = ICONPATH .. "bi_LargeSubstation_icon.png", icon_size = 64, icons = { - { icon = ICONPATH_E .. "bio_Solar_Boiler_Icon.png", icon_size = 64 } + { + icon = ICONPATH .. "bi_LargeSubstation_icon.png", + icon_size = 64, + } }, + -- This is necessary for "Space Exploration" (if not true, the entity can only be + -- placed on Nauvis)! se_allow_in_space = true, - flags = { "placeable-neutral", "player-creation" }, - minable = { hardness = 0.2, mining_time = 1, result = "bi-solar-boiler" }, + flags = {"placeable-neutral", "player-creation"}, + minable = {hardness = 0.2, mining_time = 0.5, result = "bi-large-substation"}, + max_health = 600, + corpse = "big-remnants", + dying_explosion = "big-explosion", + track_coverage_during_build_by_moving = true, + resistances = { + { + type = "fire", + percent = 90 + } + }, + collision_box = {{-2.4, -2.4}, {2.4, 2.4}}, + selection_box = {{-2.5, -2.5}, {2.5, 2.5}}, + drawing_box = {{-2.5, -5}, {2.5, 2.5}}, + maximum_wire_distance = 25, + -- Changed for 0.18.34/1.1.4 + supply_area_distance = 50.5, + pictures = { + filename = ENTITYPATH .. "bi_LargeSubstation.png", + priority = "high", + width = 450, + height = 380, + shift = {1, -0.5}, + direction_count = 1, + scale = 0.5, + }, + working_sound = { + sound = { filename = "__base__/sound/substation.ogg" }, + apparent_volume = 1.8, + audible_distance_modifier = 0.5, + probability = 1 / (3 * 60) -- average pause between the sound is 3 seconds + }, + connection_points = { + { + shadow = { + copper = {1.9, -0.6}, + green = {1.3, -0.6}, + red = {2.65, -0.6} + }, + wire = { + copper = {-0.25, -2.71875}, + green = {-0.84375, -2.71875}, + red = {0.34375, -2.71875} + } + }, + }, + radius_visualisation_picture = { + filename = "__base__/graphics/entity/small-electric-pole/electric-pole-radius-visualization.png", + width = 12, + height = 12, + --scale = 3, + --shift = {0.6, -0.6}, + priority = "extra-high-no-scale" + }, + }, + + + ---- Solar Floor + { + type = "tile", + name = "bi-solar-mat", + localised_name = {"entity-name.bi-solar-mat"}, + localised_description = {"entity-description.bi-solar-mat"}, + icon = ICONPATH .. "solar-mat.png", + icon_size = 64, + icons = { + { + icon = ICONPATH .. "solar-mat.png", + icon_size = 64, + } + }, + needs_correction = false, + minable = {hardness = 0.1, mining_time = 0.25, result = "bi-solar-mat"}, + mined_sound = { filename = "__base__/sound/deconstruct-bricks.ogg" }, + collision_mask = { layers = { ground_tile = true }}, + collision_box = {{-0.5, -0.5}, {0.5, 0.5}}, + walking_speed_modifier = 1.45, + layer = 62, + decorative_removal_probability = 1, + variants = { + transition = tile_graphics.generic_masked_tile_transitions1, + main = { + { + picture = ENTITYPATH .. "solar1.png", + count = 1, + size = 1, + probability = 1, + }, + }, + inner_corner = { + picture = ENTITYPATH .. "solar-inner-corner.png", + count = 8 + }, + outer_corner = { + picture = ENTITYPATH .. "solar-outer-corner.png", + count = 8 + }, + side = { + picture = ENTITYPATH .. "solar-side.png", + count = 8 + }, + u_transition = { + picture = ENTITYPATH .. "solar-u.png", + count = 8 + }, + o_transition = { + picture = ENTITYPATH .. "solar-o.png", + count = 1 + } + }, + walking_sound = sounds.walking_sound, + map_color = {r = 93, g = 138, b = 168}, + vehicle_friction_modifier = dirt_vehicle_speed_modifer + }, +}) + +data:extend({ + ------- Boiler for Solar Plant / Boiler + { + type = "boiler", + name = "bi-solar-boiler", + icon = ICONPATH .. "Bio_Solar_Boiler_Boiler_Icon.png", + icon_size = 64, + icons = { + { + icon = ICONPATH .. "Bio_Solar_Boiler_Boiler_Icon.png", + icon_size = 64, + } + }, + -- This is necessary for "Space Exploration" (if not true, the entity can only be + -- placed on Nauvis)! + se_allow_in_space = true, + flags = {"placeable-neutral", "player-creation"}, + minable = {hardness = 0.2, mining_time = 1, result = "bi-solar-boiler"}, max_health = 400, corpse = "small-remnants", vehicle_impact_sound = sounds.generic_impact, mode = "output-to-separate-pipe", resistances = { - { type = "fire", percent = 100 }, - { type = "explosion", percent = 30 }, - { type = "impact", percent = 30 } + { + type = "fire", + percent = 100 + }, + { + type = "explosion", + percent = 30 + }, + { + type = "impact", + percent = 30 + } }, - collision_box = { { -4.2, -4.2 }, { 4.2, 4.2 } }, - selection_box = { { -4.5, -4.5 }, { 4.5, 4.5 } }, + collision_box = {{-4.2, -4.2}, {4.2, 4.2}}, + selection_box = {{-4.5, -4.5}, {4.5, 4.5}}, target_temperature = 235, fluid_box = { - volume = 200, - base_level = -1, - pipe_covers = pipecoverspictures(), - pipe_connections = { - { flow_direction = "input-output", direction = defines.direction.east, position = { 4, 0 } }, - { flow_direction = "input-output", direction = defines.direction.west, position = { -4, 0 } } - }, - production_type = "input-output", - filter = "water" + volume = 200, + base_level = -1, + pipe_covers = pipecoverspictures(), + pipe_connections = { + {flow_direction = "input-output", direction = defines.direction.north, position = {4, 0}}, + {flow_direction = "input-output", direction = defines.direction.north, position = {-4, 0}}, + }, + production_type = "input-output", + filter = "water" }, output_fluid_box = { - volume = 200, - base_level = 1, - pipe_covers = pipecoverspictures(), - pipe_connections = { - { flow_direction = "input-output", direction = defines.direction.south, position = { 0, 4 } }, - { flow_direction = "input-output", direction = defines.direction.north, position = { 0, -4 } } - }, - production_type = "output", - filter = "steam" + volume = 200, + base_level = 1, + pipe_covers = pipecoverspictures(), + pipe_connections = { + {flow_direction = "input-output", direction = defines.direction.north, position = {0, 4}}, + {flow_direction = "input-output", direction = defines.direction.north, position = {0, -4}}, + }, + production_type = "output", + filter = "steam" }, energy_consumption = "1.799MW", energy_source = { - type = "electric", - usage_priority = "primary-input", - emissions_per_minute = { pollution = -1 }, -- Negative value: pollution is absorbed! + type = "electric", + input_priority = "primary", + usage_priority = "primary-input", + --emissions_per_minute = 0 -- NO Emmisions }, working_sound = { - sound = { filename = "__base__/sound/boiler.ogg", volume = 0.9 }, - max_sounds_per_type = 3 + sound = { + filename = "__base__/sound/boiler.ogg", + volume = 0.9 + }, + max_sounds_per_type = 3 }, - pictures = { - north = { - structure = { - layers = { - { - filename = ENTITYPATH_BIO .. "bio_solar_boiler/bio_Solar_Boiler.png", - priority = "high", - width = 576, - height = 576, - scale = 0.5 - }, - { - filename = ENTITYPATH_BIO .. "bio_solar_boiler/bio_Solar_Boiler_shadow.png", - priority = "high", - width = 576, - height = 576, - scale = 0.5, - draw_as_shadow = true - } - } - }, - fire_glow = { - filename = ENTITYPATH_BIO .. "bio_solar_boiler/bio_Solar_Boiler_light.png", - priority = "extra-high", - frame_count = 1, - width = 576, - height = 576, - scale = 0.5, - blend_mode = "additive" - } - }, - - east = { - structure = { - layers = { - { - filename = ENTITYPATH_BIO .. "bio_solar_boiler/bio_Solar_Boiler.png", - priority = "high", - width = 576, - height = 576, - scale = 0.5 - }, - { - filename = ENTITYPATH_BIO .. "bio_solar_boiler/bio_Solar_Boiler_shadow.png", - priority = "high", - width = 576, - height = 576, - scale = 0.5, - draw_as_shadow = true - } - } - }, - fire_glow = { - filename = ENTITYPATH_BIO .. "bio_solar_boiler/bio_Solar_Boiler_light.png", - priority = "extra-high", - frame_count = 1, - width = 576, - height = 576, - scale = 0.5, - blend_mode = "additive" - } - }, - - south = { - structure = { - layers = { - { - filename = ENTITYPATH_BIO .. "bio_solar_boiler/bio_Solar_Boiler.png", - priority = "high", - width = 576, - height = 576, - scale = 0.5 - }, - { - filename = ENTITYPATH_BIO .. "bio_solar_boiler/bio_Solar_Boiler_shadow.png", - priority = "high", - width = 576, - height = 576, - scale = 0.5, - draw_as_shadow = true - } - } - }, - fire_glow = { - filename = ENTITYPATH_BIO .. "bio_solar_boiler/bio_Solar_Boiler_light.png", - priority = "extra-high", - frame_count = 1, - width = 576, - height = 576, - scale = 0.5, - blend_mode = "additive" - } - }, - - west = { - structure = { - layers = { - { - filename = ENTITYPATH_BIO .. "bio_solar_boiler/bio_Solar_Boiler.png", - priority = "high", - width = 576, - height = 576, - scale = 0.5 - }, - { - filename = ENTITYPATH_BIO .. "bio_solar_boiler/bio_Solar_Boiler_shadow.png", - priority = "high", - width = 576, - height = 576, - scale = 0.5, - draw_as_shadow = true - } - } - }, - fire_glow = { - filename = ENTITYPATH_BIO .. "bio_solar_boiler/bio_Solar_Boiler_light.png", - priority = "extra-high", - frame_count = 1, - width = 576, - height = 576, - scale = 0.5, - blend_mode = "additive" - } + structure = { + north = { + layers = { + { + filename = ENTITYPATH .. "Bio_Solar_Boiler.png", + priority = "high", + width = 288, + height = 288, + }, } + }, + east = { + layers = { + { + filename = ENTITYPATH .. "Bio_Solar_Boiler.png", + priority = "high", + width = 288, + height = 288, + }, + }, + }, + south = { + layers = { + { + filename = ENTITYPATH .. "Bio_Solar_Boiler.png", + priority = "high", + width = 288, + height = 288, + }, + } + }, + west = { + layers = { + { + filename = ENTITYPATH .. "Bio_Solar_Boiler.png", + priority = "high", + width = 288, + height = 288, + }, + } + } }, - fire_flicker_enabled = false, + fire = {}, fire_glow_flicker_enabled = false, + fire_glow = { + north = { + filename = "__Bio_Industries_2__/graphics/entities/small-lamp/light-on-patch.png", + priority = "extra-high", + frame_count = 1, + width = 62, + height = 62, + shift = {0.09, -2.8}, + scale = 1.5, + blend_mode = "additive", + }, + east = { + filename = "__Bio_Industries_2__/graphics/entities/small-lamp/light-on-patch.png", + priority = "extra-high", + frame_count = 1, + width = 62, + height = 62, + shift = {0, -3}, + blend_mode = "additive", + }, + south = { + filename = "__Bio_Industries_2__/graphics/entities/small-lamp/light-on-patch.png", + priority = "extra-high", + frame_count = 1, + width = 62, + height = 62, + shift = {0, -3}, + blend_mode = "additive", + }, + west = { + filename = "__Bio_Industries_2__/graphics/entities/small-lamp/light-on-patch.png", + priority = "extra-high", + frame_count = 1, + width = 62, + height = 62, + shift = {0, -3}, + blend_mode = "additive", + }, + }, burning_cooldown = 20 -}, - }) + }, +}) + end diff --git a/Bio_Industries_2/prototypes/Bio_Solar_Farm/item.lua b/Bio_Industries_2/prototypes/Bio_Solar_Farm/item.lua index d9a5431..5c4f03f 100644 --- a/Bio_Industries_2/prototypes/Bio_Solar_Farm/item.lua +++ b/Bio_Industries_2/prototypes/Bio_Solar_Farm/item.lua @@ -1,7 +1,6 @@ local BioInd = require('common')('Bio_Industries_2') local ICONPATH = BioInd.modRoot .. "/graphics/icons/" -local ICONPATH_E = BioInd.modRoot .. "/graphics/icons/entity/" if BI.Settings.BI_Solar_Additions then @@ -12,11 +11,11 @@ if BI.Settings.BI_Solar_Additions then name = "bi-bio-solar-farm", localised_name = {"entity-name.bi-bio-solar-farm"}, localised_description = {"entity-description.bi-bio-solar-farm"}, - icon = ICONPATH_E .. "bio_Solar_Farm_Icon.png", + icon = ICONPATH .. "Bio_Solar_Farm_Icon.png", icon_size = 64, icons = { { - icon = ICONPATH_E .. "bio_Solar_Farm_Icon.png", + icon = ICONPATH .. "Bio_Solar_Farm_Icon.png", icon_size = 64, } }, @@ -32,11 +31,11 @@ if BI.Settings.BI_Solar_Additions then name = "bi-solar-mat", localised_name = {"entity-name.bi-solar-mat"}, localised_description = {"entity-description.bi-solar-mat"}, - icon = ICONPATH_E .. "solar-mat.png", + icon = ICONPATH .. "solar-mat.png", icon_size = 64, icons = { { - icon = ICONPATH_E .. "solar-mat.png", + icon = ICONPATH .. "solar-mat.png", icon_size = 64, } }, @@ -57,11 +56,11 @@ if BI.Settings.BI_Solar_Additions then name = "bi-bio-accumulator", localised_name = {"entity-name.bi-bio-accumulator"}, localised_description = {"entity-description.bi-bio-accumulator"}, - icon = ICONPATH_E .. "bi_LargeAccumulator.png", + icon = ICONPATH .. "bi_LargeAccumulator.png", icon_size = 64, icons = { { - icon = ICONPATH_E .. "bi_LargeAccumulator.png", + icon = ICONPATH .. "bi_LargeAccumulator.png", icon_size = 64, } }, @@ -78,11 +77,11 @@ if BI.Settings.BI_Solar_Additions then name = "bi-large-substation", localised_name = {"entity-name.bi-large-substation"}, localised_description = {"entity-description.bi-large-substation"}, - icon = ICONPATH_E .. "bi_LargeSubstation_icon.png", + icon = ICONPATH .. "bi_LargeSubstation_icon.png", icon_size = 64, icons = { { - icon = ICONPATH_E .. "bi_LargeSubstation_icon.png", + icon = ICONPATH .. "bi_LargeSubstation_icon.png", icon_size = 64, } }, @@ -98,11 +97,11 @@ if BI.Settings.BI_Solar_Additions then name = "bi-solar-boiler", localised_name = {"entity-name.bi-solar-boiler"}, localised_description = {"entity-description.bi-solar-boiler"}, - icon = ICONPATH_E .. "bio_Solar_Boiler_Icon.png", + icon = ICONPATH .. "Bio_Solar_Boiler_Icon.png", icon_size = 64, icons = { { - icon = ICONPATH_E .. "bio_Solar_Boiler_Icon.png", + icon = ICONPATH .. "Bio_Solar_Boiler_Icon.png", icon_size = 64, } }, diff --git a/Bio_Industries_2/prototypes/Bio_Solar_Farm/recipe.lua b/Bio_Industries_2/prototypes/Bio_Solar_Farm/recipe.lua index 7966f88..c83b03d 100644 --- a/Bio_Industries_2/prototypes/Bio_Solar_Farm/recipe.lua +++ b/Bio_Industries_2/prototypes/Bio_Solar_Farm/recipe.lua @@ -1,7 +1,6 @@ local BioInd = require('common')('Bio_Industries_2') local ICONPATH = BioInd.modRoot .. "/graphics/icons/" -local ICONPATH_E = BioInd.modRoot .. "/graphics/icons/entity/" if BI.Settings.BI_Solar_Additions then @@ -13,11 +12,11 @@ if BI.Settings.BI_Solar_Additions then name = "bi-bio-solar-farm", localised_name = {"entity-name.bi-bio-solar-farm"}, localised_description = {"entity-description.bi-bio-solar-farm"}, - icon = ICONPATH_E .. "bio_Solar_Farm_Icon.png", + icon = ICONPATH .. "Bio_Solar_Farm_Icon.png", icon_size = 64, icons = { { - icon = ICONPATH_E .. "bio_Solar_Farm_Icon.png", + icon = ICONPATH .. "Bio_Solar_Farm_Icon.png", icon_size = 64, } }, @@ -43,11 +42,11 @@ if BI.Settings.BI_Solar_Additions then name = "bi-solar-boiler-hidden-panel", localised_name = {"entity-name.bi-solar-boiler"}, localised_description = {"entity-description.bi-solar-boiler"}, - icon = ICONPATH_E .. "bio_Solar_Boiler_Icon.png", + icon = ICONPATH .. "Bio_Solar_Boiler_Icon.png", icon_size = 64, icons = { { - icon = ICONPATH_E .. "bio_Solar_Boiler_Icon.png", + icon = ICONPATH .. "Bio_Solar_Boiler_Icon.png", icon_size = 64, } }, @@ -73,11 +72,11 @@ if BI.Settings.BI_Solar_Additions then name = "bi-solar-mat", localised_name = {"entity-name.bi-solar-mat"}, localised_description = {"entity-description.bi-solar-mat"}, - icon = ICONPATH_E .. "solar-mat.png", + icon = ICONPATH .. "solar-mat.png", icon_size = 64, icons = { { - icon = ICONPATH_E .. "solar-mat.png", + icon = ICONPATH .. "solar-mat.png", icon_size = 64, } }, @@ -103,11 +102,11 @@ if BI.Settings.BI_Solar_Additions then name = "bi-bio-accumulator", localised_name = {"entity-name.bi-bio-accumulator"}, localised_description = {"entity-description.bi-bio-accumulator"}, - icon = ICONPATH_E .. "bi_LargeAccumulator.png", + icon = ICONPATH .. "bi_LargeAccumulator.png", icon_size = 64, icons = { { - icon = ICONPATH_E .. "bi_LargeAccumulator.png", + icon = ICONPATH .. "bi_LargeAccumulator.png", icon_size = 64, } }, @@ -133,11 +132,11 @@ if BI.Settings.BI_Solar_Additions then name = "bi-large-substation", localised_name = {"entity-name.bi-large-substation"}, localised_description = {"entity-description.bi-large-substation"}, - icon = ICONPATH_E .. "bi_LargeSubstation_icon.png", + icon = ICONPATH .. "bi_LargeSubstation_icon.png", icon_size = 64, icons = { { - icon = ICONPATH_E .. "bi_LargeSubstation_icon.png", + icon = ICONPATH .. "bi_LargeSubstation_icon.png", icon_size = 64, } }, diff --git a/Bio_Industries_2/prototypes/Bio_Solar_Farm/tmp_bio-farm-panel.lua b/Bio_Industries_2/prototypes/Bio_Solar_Farm/tmp_bio-farm-panel.lua new file mode 100644 index 0000000..19bdec5 --- /dev/null +++ b/Bio_Industries_2/prototypes/Bio_Solar_Farm/tmp_bio-farm-panel.lua @@ -0,0 +1,36 @@ + ------- Bio Farm Solar Panel + { + type = "solar-panel", + name = "bi-bio-solar-farm", + icon = ICONPATH .. "Bio_Solar_Farm_Icon.png", + icon_size = 64, + icons = { + { + icon = ICONPATH .. "Bio_Solar_Farm_Icon.png", + icon_size = 64, + } + }, + flags = {"placeable-neutral", "player-creation"}, + minable = {hardness = 0.25, mining_time = 0.5, result = "bi-bio-solar-farm"}, + max_health = 600, + corpse = "big-remnants", + dying_explosion = "medium-explosion", + resistances = {{type = "fire", percent = 80}}, + collision_box = {{-4.2, -4.2}, {4.2, 4.2}}, + selection_box = {{-4.5, -4.5}, {4.5, 4.5}}, + energy_source = { + type = "electric", + usage_priority = "solar" + }, + picture = { + filename = ENTITYPATH .. "Bio_Solar_Farm_On.png", + priority = "low", + width = 312, + height = 289, + frame_count = 1, + direction_count = 1, + --scale = 3/2, + shift = {0.30, 0} + }, + production = "3600kW" + }, diff --git a/Bio_Industries_2/prototypes/Bio_Solar_Farm/tmp_solar-mat-panel.lua b/Bio_Industries_2/prototypes/Bio_Solar_Farm/tmp_solar-mat-panel.lua new file mode 100644 index 0000000..cbe6697 --- /dev/null +++ b/Bio_Industries_2/prototypes/Bio_Solar_Farm/tmp_solar-mat-panel.lua @@ -0,0 +1,31 @@ + ------- Hidden Solar Panel for Solar Mat + { + type = "solar-panel", + name = "bi-musk-mat-hidden-panel", + icon = ICONPATH .. "solar-mat.png", + icon_size = 64, + icons = { + { + icon = ICONPATH .. "solar-mat.png", + icon_size = 64, + } + }, + flags = {"not-blueprintable", "not-deconstructable", "placeable-off-grid", "not-on-map", "not-repairable"}, + selectable_in_game = false, + max_health = 1, + resistances = {{type = "fire", percent = 100}}, + collision_mask = { layers = { ground_tile = true }}, + collision_box = {{-0.0, -0.0}, {0.0, 0.0}}, + selection_box = {{0, 0}, {0, 0}}, + energy_source = { + type = "electric", + usage_priority = "solar" + }, + picture = { + filename = ICONPATH .. "empty.png", + priority = "low", + width = 1, + height = 1, + }, + production = "10kW" + }, diff --git a/Bio_Industries_2/prototypes/Bio_Turret/entity.lua b/Bio_Industries_2/prototypes/Bio_Turret/entity.lua index 638a3fb..cf87637 100644 --- a/Bio_Industries_2/prototypes/Bio_Turret/entity.lua +++ b/Bio_Industries_2/prototypes/Bio_Turret/entity.lua @@ -1,22 +1,21 @@ local BioInd = require('common')('Bio_Industries_2') + local ICONPATH = BioInd.modRoot .. "/graphics/icons/" -local ICONPATH_W = BioInd.modRoot .. "/graphics/icons/weapons/" -local ENTITYPATH_BIO = "__Bio_Industries_2__/graphics/entities/" data:extend({ --- Basic Dart { type = "ammo", name = "bi-dart-magazine-basic", - icon = ICONPATH_W .. "basic_dart_icon.png", + icon = ICONPATH .. "basic_dart_icon.png", icon_size = 64, icons = { { - icon = ICONPATH_W .. "basic_dart_icon.png", + icon = ICONPATH .. "basic_dart_icon.png", icon_size = 64, } }, - ammo_category = "Bio_Turret_Ammo", + ammo_category = "bullet", ammo_type = { category = "Bio_Turret_Ammo", action = { @@ -50,15 +49,15 @@ data:extend({ { type = "ammo", name = "bi-dart-magazine-standard", - icon = ICONPATH_W .. "standard_dart_icon.png", + icon = ICONPATH .. "standard_dart_icon.png", icon_size = 64, icons = { { - icon = ICONPATH_W .. "standard_dart_icon.png", + icon = ICONPATH .. "standard_dart_icon.png", icon_size = 64, } }, - ammo_category = "Bio_Turret_Ammo", + ammo_category = "bullet", ammo_type = { category = "Bio_Turret_Ammo", action = { @@ -97,15 +96,15 @@ data:extend({ { type = "ammo", name = "bi-dart-magazine-enhanced", - icon = ICONPATH_W .. "enhanced_dart_icon.png", + icon = ICONPATH .. "enhanced_dart_icon.png", icon_size = 64, icons = { { - icon = ICONPATH_W .. "enhanced_dart_icon.png", + icon = ICONPATH .. "enhanced_dart_icon.png", icon_size = 64, } }, - ammo_category = "Bio_Turret_Ammo", + ammo_category = "bullet", ammo_type = { category = "Bio_Turret_Ammo", action = { @@ -148,15 +147,15 @@ data:extend({ { type = "ammo", name = "bi-dart-magazine-poison", - icon = ICONPATH_W .. "poison_dart_icon.png", + icon = ICONPATH .. "poison_dart_icon.png", icon_size = 64, icons = { { - icon = ICONPATH_W .. "poison_dart_icon.png", + icon = ICONPATH .. "poison_dart_icon.png", icon_size = 64, } }, - ammo_category = "Bio_Turret_Ammo", + ammo_category = "bullet", ammo_type = { category = "Bio_Turret_Ammo", action = { @@ -208,7 +207,7 @@ return { layers = { { - filename = ENTITYPATH_BIO .. "bio_turret/bio_turret.png", + filename = "__Bio_Industries_2__/graphics/entities/bio_turret/bio_turret.png", priority = "medium", scale = 0.5, width = 224, @@ -230,11 +229,11 @@ data:extend({ { type = "ammo-turret", name = "bi-dart-turret", - icon = ICONPATH_W .. "bio_turret_icon.png", + icon = ICONPATH .. "bio_turret_icon.png", icon_size = 64, icons = { { - icon = ICONPATH_W .. "bio_turret_icon.png", + icon = ICONPATH .. "bio_turret_icon.png", icon_size = 64, } }, @@ -296,11 +295,11 @@ data:extend({ { type = "gun", name = "bi-dart-rifle", - icon = ICONPATH_W .. "bi_dart_rifle_icon.png", + icon = ICONPATH .. "bi_dart_rifle_icon.png", icon_size = 64, icons = { { - icon = ICONPATH_W .. "bi_dart_rifle_icon.png", + icon = ICONPATH .. "bi_dart_rifle_icon.png", icon_size = 64, } }, diff --git a/Bio_Industries_2/prototypes/Bio_Turret/item.lua b/Bio_Industries_2/prototypes/Bio_Turret/item.lua index 7c6ae68..8be0d11 100644 --- a/Bio_Industries_2/prototypes/Bio_Turret/item.lua +++ b/Bio_Industries_2/prototypes/Bio_Turret/item.lua @@ -1,7 +1,6 @@ local BioInd = require('common')('Bio_Industries_2') local ICONPATH = BioInd.modRoot .. "/graphics/icons/" -local ICONPATH_W = BioInd.modRoot .. "/graphics/icons/weapons/" data:extend({ @@ -9,11 +8,11 @@ data:extend({ { type = "item", name = "bi-dart-turret", - icon = ICONPATH_W .. "bio_turret_icon.png", + icon = ICONPATH .. "bio_turret_icon.png", icon_size = 64, icons = { { - icon = ICONPATH_W .. "bio_turret_icon.png", + icon = ICONPATH .. "bio_turret_icon.png", icon_size = 64, } }, diff --git a/Bio_Industries_2/prototypes/Bio_Turret/recipe.lua b/Bio_Industries_2/prototypes/Bio_Turret/recipe.lua index 8ca598f..08f82f8 100644 --- a/Bio_Industries_2/prototypes/Bio_Turret/recipe.lua +++ b/Bio_Industries_2/prototypes/Bio_Turret/recipe.lua @@ -1,7 +1,6 @@ local BioInd = require('common')('Bio_Industries_2') -local ICONPATH = BioInd.modRoot .. "/graphics/icons/weapons/" -local ICONPATH_W = BioInd.modRoot .. "/graphics/icons/weapons/" +local ICONPATH = BioInd.modRoot .. "/graphics/icons/" data:extend({ --- Basic Dart Ammo @@ -128,11 +127,11 @@ data:extend({ name = "bi-dart-turret", localised_name = {"entity-name.bi-dart-turret"}, localised_description = {"entity-description.bi-dart-turret"}, - icon = ICONPATH_W .. "bio_turret_icon.png", + icon = ICONPATH .. "bio_turret_icon.png", icon_size = 64, icons = { { - icon = ICONPATH_W .. "bio_turret_icon.png", + icon = ICONPATH .. "bio_turret_icon.png", icon_size = 64, } }, @@ -160,11 +159,11 @@ data:extend({ name = "bi-dart-rifle", localised_name = {"item-name.bi-dart-rifle"}, localised_description = {"item-description.bi-dart-rifle"}, - icon = ICONPATH_W .. "bi_dart_rifle_icon.png", + icon = ICONPATH .. "bi_dart_rifle_icon.png", icon_size = 64, icons = { { - icon = ICONPATH_W .. "bi_dart_rifle_icon.png", + icon = ICONPATH .. "bi_dart_rifle_icon.png", icon_size = 64, } }, diff --git a/Bio_Industries_2/prototypes/Industrial_Revolution.lua b/Bio_Industries_2/prototypes/Industrial_Revolution.lua new file mode 100644 index 0000000..f8b28b3 --- /dev/null +++ b/Bio_Industries_2/prototypes/Industrial_Revolution.lua @@ -0,0 +1,99 @@ +local BioInd = require('common')('Bio_Industries_2') + +if mods["IndustrialRevolution"] then + ------------------------------------------------------------------------------------ + -- Our large wooden poles are unlocked by the "Logistics" research and require small + -- electric poles, which are unlocked by IR2 after the Iron Age has been reached. So, + -- if IR2 is active, we won't unlock our poles and use IR2's large wooden poles for + -- our huge poles instead. + ------------------------------------------------------------------------------------ + local big_pole = "bi-wooden-pole-big" + thxbob.lib.tech.remove_recipe_unlock ("logistics", big_pole) + thxbob.lib.tech.add_recipe_unlock ("electric-energy-distribution-1", big_pole) + + -- Adjust localizations + for k, v in ipairs({"electric-pole", "item", "recipe"}) do +BioInd.show("Changing localization for", v) + data.raw[v][big_pole].localised_name = {"entity-name.bi-wooden-pole-bigger"} + data.raw[v][big_pole].localised_description = {"entity-description.bi-wooden-pole-bigger"} + end + + ------------------------------------------------------------------------------------ + -- IR2 disables the "solar-energy" technology, so our Solar boiler, Solar farm, and + -- Musk floor will never be unlocked. Move the unlocks to IR2's technologies! + ------------------------------------------------------------------------------------ + thxbob.lib.tech.add_recipe_unlock ("ir2-solar-energy-1", "bi-solar-boiler-hidden-panel") + thxbob.lib.tech.add_recipe_unlock ("ir2-solar-energy-2", "bi-bio-solar-farm") + thxbob.lib.tech.add_recipe_unlock ("ir2-solar-energy-2", "bi-solar-mat") + + ------------------------------------------------------------------------------------ + -- Put recipe for Bio stone bricks in the same subgroup as concrete! + ------------------------------------------------------------------------------------ + data.raw.recipe["bi-stone-brick"].subgroup = "ir2-tiles" + + ------------------------------------------------------------------------------------ + -- Replace "crushed stone" with "gravel"! + ------------------------------------------------------------------------------------ + local i_old = "stone-crushed" + local i_new = "gravel" + local replaced, recipe, add + + for recipe_name, recipe in pairs(data.raw.recipe) do + -- Ingredients + replaced = thxbob.lib.recipe.replace_ingredient(recipe_name, i_old, i_new) +BioInd.writeDebug("Replaced ingredient %s with %s in recipe %s: %s", {i_old, i_new, recipe_name, replaced}) + + -- Results + thxbob.lib.result_check(recipe) -- Make sure we have results! + for r, result in ipairs(recipe and recipe.results or {}) do + if result.name == i_old then + -- Store the properties of the original result + add = { + type = result.type, + name = i_new, + amount = result.amount + } + thxbob.lib.recipe.remove_result(recipe_name, i_old) + thxbob.lib.item.add(recipe.results, add) + else +BioInd.show("Skipping", result.name) + end + end + + -- Don't forget to change main_product as well! + if recipe and recipe.main_product and recipe.main_product == i_old then + recipe.main_product = i_new + end + end + + -- Add recipe unlocks + local crushing = { + ["bi-crushed-stone-1"] = "grinding-1", + ["bi-crushed-stone-2"] = "grinding-2", + ["bi-crushed-stone-3"] = "grinding-2", + ["bi-crushed-stone-4"] = "grinding-3", + ["bi-crushed-stone-5"] = "grinding-3", + } + local r + for recipe, category in pairs(crushing) do + r = data.raw.recipe[recipe] + r.category = category + r.localised_name = {"recipe-name." .. recipe .. "_IR"} + if recipe == "bi-crushed-stone-1" then + r.localised_description = {"recipe-description.bi-crushed-stone-1_IR"} + else + r.localised_description = {"recipe-description.bi-crushed-stone_IR"} + end + thxbob.lib.tech.add_recipe_unlock("ir2-" .. category, recipe) + end + + -- Our stone crusher should be able to craft the recipes that can be made by + -- IR2's Copper crusher ("grinding-1") and Electric crusher ("grinding-2")! + local crusher = data.raw.furnace["bi-stone-crusher"] + if crusher then + table.insert(crusher.crafting_categories, "grinding-1") + table.insert(crusher.crafting_categories, "grinding-2") + table.insert(crusher.crafting_categories, "powdering-1") + table.insert(crusher.crafting_categories, "powdering-2") + end +end diff --git a/Bio_Industries_2/prototypes/Wood_Products/containers-entities.lua b/Bio_Industries_2/prototypes/Wood_Products/containers-entities.lua index 6ed525e..195af25 100644 --- a/Bio_Industries_2/prototypes/Wood_Products/containers-entities.lua +++ b/Bio_Industries_2/prototypes/Wood_Products/containers-entities.lua @@ -9,7 +9,6 @@ BioInd.writeDebug("Creating bigger wooden chests!") local ICONPATH = BioInd.modRoot .. "/graphics/icons/" -local ICONPATH_E = BioInd.modRoot .. "/graphics/icons/entity/" local WOODPATH = BioInd.modRoot .. "/graphics/entities/wood_products/" local SNDPATH = "__base__/sound/" @@ -42,11 +41,11 @@ data:extend({ { type = "container", name = "bi-wooden-chest-large", - icon = ICONPATH_E .. "large_wooden_chest_icon.png", + icon = ICONPATH .. "large_wooden_chest_icon.png", icon_size = 64, icons = { { - icon = ICONPATH_E .. "large_wooden_chest_icon.png", + icon = ICONPATH .. "large_wooden_chest_icon.png", icon_size = 64, } }, @@ -65,26 +64,13 @@ data:extend({ close_sound = { filename = "__base__/sound/wooden-chest-close.ogg" }, impact_category = "wood", picture = { - layers = { - { filename = WOODPATH .. "large_wooden_chest.png", priority = "extra-high", - width = 128, - height = 128, - shift = {0, 0}, + width = 184, + height = 132, + shift = {0.5, 0}, scale = 0.5, }, - { - filename = WOODPATH .. "large_wooden_chest_shadow.png", - priority = "extra-high", - width = 128, - height = 128, - shift = {1, 0}, - draw_as_shadow = true, - scale = 0.5, - }, - }, - }, circuit_wire_connection_point = circuit_connector_definitions["chest"].points, circuit_connector_sprites = circuit_connector_definitions["chest"].sprites, circuit_wire_max_distance = default_circuit_wire_max_distance @@ -96,11 +82,11 @@ data:extend({ { type = "container", name = "bi-wooden-chest-huge", - icon = ICONPATH_E .. "huge_wooden_chest_icon.png", + icon = ICONPATH .. "huge_wooden_chest_icon.png", icon_size = 64, icons = { { - icon = ICONPATH_E .. "huge_wooden_chest_icon.png", + icon = ICONPATH .. "huge_wooden_chest_icon.png", icon_size = 64, } }, @@ -120,26 +106,13 @@ data:extend({ close_sound = { filename = "__base__/sound/wooden-chest-close.ogg" }, impact_category = "wood", picture = { - layers = { - { filename = WOODPATH .. "huge_wooden_chest.png", priority = "extra-high", - width = 224, - height = 224, - shift = {0, 0}, - scale = 0.5, + width = 184, + height = 132, + shift = {0.5, 0}, + scale = 0.75, }, - { - filename = WOODPATH .. "huge_wooden_chest_shadow.png", - priority = "extra-high", - width = 224, - height = 224, - shift = {1, 0}, - draw_as_shadow = true, - scale = 0.5, - }, - }, - }, circuit_wire_connection_point = circuit_connector_definitions["chest"].points, circuit_connector_sprites = circuit_connector_definitions["chest"].sprites, circuit_wire_max_distance = default_circuit_wire_max_distance @@ -151,11 +124,11 @@ data:extend({ { type = "container", name = "bi-wooden-chest-giga", - icon = ICONPATH_E .. "giga_wooden_chest_icon.png", + icon = ICONPATH .. "giga_wooden_chest_icon.png", icon_size = 64, icons = { { - icon = ICONPATH_E .. "giga_wooden_chest_icon.png", + icon = ICONPATH .. "giga_wooden_chest_icon.png", icon_size = 64, } }, @@ -175,26 +148,13 @@ data:extend({ close_sound = { filename = "__base__/sound/wooden-chest-close.ogg" }, impact_category = "wood", picture = { - layers = { - { filename = WOODPATH .. "giga_wooden_chest.png", priority = "extra-high", - width = 384, - height = 448, - shift = {0, -0.5}, + width = 501, + height = 366, + shift = {0.88, -0.170}, scale = 0.5, }, - { - filename = WOODPATH .. "giga_wooden_chest_shadow.png", - priority = "extra-high", - width = 192, - height = 384, - shift = {1, -0.5}, - draw_as_shadow = true, - scale = 0.5, - }, - }, - }, circuit_wire_connection_point = circuit_connector_definitions["chest"].points, circuit_connector_sprites = circuit_connector_definitions["chest"].sprites, circuit_wire_max_distance = default_circuit_wire_max_distance diff --git a/Bio_Industries_2/prototypes/Wood_Products/containers-item.lua b/Bio_Industries_2/prototypes/Wood_Products/containers-item.lua index e5dac25..41a6c59 100644 --- a/Bio_Industries_2/prototypes/Wood_Products/containers-item.lua +++ b/Bio_Industries_2/prototypes/Wood_Products/containers-item.lua @@ -4,7 +4,6 @@ end local BioInd = require('common')('Bio_Industries_2') local ICONPATH = BioInd.modRoot .. "/graphics/icons/" -local ICONPATH_E = BioInd.modRoot .. "/graphics/icons/entity/" BioInd.writeDebug("Creating items for bigger wooden chests!") @@ -16,11 +15,11 @@ data:extend({ name = "bi-wooden-chest-large", localised_name = {"entity-name.bi-wooden-chest-large"}, localised_description = {"entity-description.bi-wooden-chest-large"}, - icon = ICONPATH_E .. "large_wooden_chest_icon.png", + icon = ICONPATH .. "large_wooden_chest_icon.png", icon_size = 64, icons = { { - icon = ICONPATH_E .. "large_wooden_chest_icon.png", + icon = ICONPATH .. "large_wooden_chest_icon.png", icon_size = 64, } }, @@ -38,11 +37,11 @@ data:extend({ name = "bi-wooden-chest-huge", localised_name = {"entity-name.bi-wooden-chest-huge"}, localised_description = {"entity-description.bi-wooden-chest-huge"}, - icon = ICONPATH_E .. "huge_wooden_chest_icon.png", + icon = ICONPATH .. "huge_wooden_chest_icon.png", icon_size = 64, icons = { { - icon = ICONPATH_E .. "huge_wooden_chest_icon.png", + icon = ICONPATH .. "huge_wooden_chest_icon.png", icon_size = 64, } }, @@ -60,11 +59,11 @@ data:extend({ name = "bi-wooden-chest-giga", localised_name = {"entity-name.bi-wooden-chest-giga"}, localised_description = {"entity-description.bi-wooden-chest-giga"}, - icon = ICONPATH_E .. "giga_wooden_chest_icon.png", + icon = ICONPATH .. "giga_wooden_chest_icon.png", icon_size = 64, icons = { { - icon = ICONPATH_E .. "giga_wooden_chest_icon.png", + icon = ICONPATH .. "giga_wooden_chest_icon.png", icon_size = 64, } }, diff --git a/Bio_Industries_2/prototypes/Wood_Products/containers-recipe.lua b/Bio_Industries_2/prototypes/Wood_Products/containers-recipe.lua index 04e9bde..25d1185 100644 --- a/Bio_Industries_2/prototypes/Wood_Products/containers-recipe.lua +++ b/Bio_Industries_2/prototypes/Wood_Products/containers-recipe.lua @@ -4,7 +4,6 @@ end local BioInd = require('common')('Bio_Industries_2') local ICONPATH = BioInd.modRoot .. "/graphics/icons/" -local ICONPATH_E = BioInd.modRoot .. "/graphics/icons/entity/" BioInd.writeDebug("Creating recipes for bigger wooden chests!") @@ -15,11 +14,11 @@ data:extend({ name = "bi-wooden-chest-large", localised_name = {"entity-name.bi-wooden-chest-large"}, localised_description = {"entity-description.bi-wooden-chest-large"}, - icon = ICONPATH_E .. "large_wooden_chest_icon.png", + icon = ICONPATH .. "large_wooden_chest_icon.png", icon_size = 64, icons = { { - icon = ICONPATH_E .. "large_wooden_chest_icon.png", + icon = ICONPATH .. "large_wooden_chest_icon.png", icon_size = 64, } }, @@ -46,11 +45,11 @@ data:extend({ name = "bi-wooden-chest-huge", localised_name = {"entity-name.bi-wooden-chest-huge"}, localised_description = {"entity-description.bi-wooden-chest-huge"}, - icon = ICONPATH_E .. "huge_wooden_chest_icon.png", + icon = ICONPATH .. "huge_wooden_chest_icon.png", icon_size = 64, icons = { { - icon = ICONPATH_E .. "huge_wooden_chest_icon.png", + icon = ICONPATH .. "huge_wooden_chest_icon.png", icon_size = 64, } }, @@ -77,11 +76,11 @@ data:extend({ name = "bi-wooden-chest-giga", localised_name = {"entity-name.bi-wooden-chest-giga"}, localised_description = {"entity-description.bi-wooden-chest-giga"}, - icon = ICONPATH_E .. "giga_wooden_chest_icon.png", + icon = ICONPATH .. "giga_wooden_chest_icon.png", icon_size = 64, icons = { { - icon = ICONPATH_E .. "giga_wooden_chest_icon.png", + icon = ICONPATH .. "giga_wooden_chest_icon.png", icon_size = 64, } }, diff --git a/Bio_Industries_2/prototypes/Wood_Products/entities.lua b/Bio_Industries_2/prototypes/Wood_Products/entities.lua index c68e257..fd55327 100644 --- a/Bio_Industries_2/prototypes/Wood_Products/entities.lua +++ b/Bio_Industries_2/prototypes/Wood_Products/entities.lua @@ -3,7 +3,6 @@ local tile_graphics = require("__base__/prototypes/tile/tile-graphics") local BioInd = require('common')('Bio_Industries_2') local ICONPATH = BioInd.modRoot .. "/graphics/icons/" -local ICONPATH_E = BioInd.modRoot .. "/graphics/icons/entity/" local WOODPATH = BioInd.modRoot .. "/graphics/entities/wood_products/" local ENTITYPATH = "__base__/graphics/entity/" @@ -190,43 +189,44 @@ data:extend({ needs_correction = false, minable = {hardness = 0.2, mining_time = 0.25, result = "wood"}, mined_sound = { filename = "__base__/sound/deconstruct-bricks.ogg" }, - collision_mask = { layers = { ground_tile = true } }, + collision_mask = { layers = { ground_tile = true }}, walking_speed_modifier = 1.2, - layer = 13, - decorative_removal_probability = 1, + layer = 62, + decorative_removal_probability = 0.4, variants = { transition = tile_graphics.generic_masked_tile_transitions1, main = { { - picture = WOODPATH .. "wood_floor/woodfloor.png", + picture = WOODPATH .. "wood_floor/wood1.png", count = 4, - size = 1, - scale = 0.5 + size = 1 + }, + { + picture = WOODPATH .. "wood_floor/wood2.png", + count = 1, + size = 2, + probability = 1, }, }, inner_corner = { - picture = WOODPATH .. "wood_floor/woodfloor_inner-corner.png", - count = 4 + picture = WOODPATH .. "wood_floor/wood-inner-corner.png", + count = 8 }, outer_corner = { - picture = WOODPATH .. "wood_floor/woodfloor_outer-corner.png", - count = 4, - scale = 0.5 + picture = WOODPATH .. "wood_floor/wood-outer-corner.png", + count = 8 }, side = { - picture = WOODPATH .. "wood_floor/woodfloor_side.png", - count = 4, - scale = 0.5 + picture = WOODPATH .. "wood_floor/wood-side.png", + count = 8 }, u_transition = { - picture = WOODPATH .. "wood_floor/woodfloor_u.png", - count = 4, - scale = 0.5 + picture = WOODPATH .. "wood_floor/wood-u.png", + count = 8 }, o_transition = { - picture = WOODPATH .. "wood_floor/hr_woodfloor_o.png", - count = 1, - scale = 0.5 + picture = WOODPATH .. "wood_floor/wood-o.png", + count = 1 } }, walking_sound = sounds.walking_sound, @@ -240,11 +240,11 @@ data:extend({ { type = "electric-pole", name = "bi-wooden-pole-big", - icon = ICONPATH_E .. "big-wooden-pole.png", + icon = ICONPATH .. "big-wooden-pole.png", icon_size = 64, icons = { { - icon = ICONPATH_E .. "big-wooden-pole.png", + icon = ICONPATH .. "big-wooden-pole.png", icon_size = 64, } }, @@ -330,11 +330,11 @@ data:extend({ { type = "electric-pole", name = "bi-wooden-pole-huge", - icon = ICONPATH_E .. "huge-wooden-pole.png", + icon = ICONPATH .. "huge-wooden-pole.png", icon_size = 64, icons = { { - icon = ICONPATH_E .. "huge-wooden-pole.png", + icon = ICONPATH .. "huge-wooden-pole.png", icon_size = 64, } }, @@ -359,7 +359,7 @@ data:extend({ selection_box = {{-0.5, -0.5}, {0.5, 0.5}}, drawing_box = {{-1, -7}, {1, 0.5}}, maximum_wire_distance = 64, -- Factorio Max - supply_area_distance = 2, -- This is the radius, so the supply area is 4x4. + supply_area_distance = 1, -- This is the radius, so the supply area is 2x2. pictures = { filename = WOODPATH .. "huge-wooden-pole.png", priority = "high", @@ -433,11 +433,11 @@ data:extend({ { type = "wall", name = "bi-wooden-fence", - icon = ICONPATH_E .. "wooden-fence.png", + icon = ICONPATH .. "wooden-fence.png", icon_size = 64, icons = { { - icon = ICONPATH_E .. "wooden-fence.png", + icon = ICONPATH .. "wooden-fence.png", icon_size = 64, } }, @@ -709,11 +709,11 @@ data:extend({ { type = "pipe", name = "bi-wood-pipe", - icon = ICONPATH_E .. "wood_pipe.png", + icon = ICONPATH .. "wood_pipe.png", icon_size = 64, icons = { { - icon = ICONPATH_E .. "wood_pipe.png", + icon = ICONPATH .. "wood_pipe.png", icon_size = 64, } }, @@ -764,11 +764,11 @@ data:extend({ { type = "pipe-to-ground", name = "bi-wood-pipe-to-ground", - icon = ICONPATH_E .. "pipe-to-ground-wood.png", + icon = ICONPATH .. "pipe-to-ground-wood.png", icon_size = 64, icons = { { - icon = ICONPATH_E .. "pipe-to-ground-wood.png", + icon = ICONPATH .. "pipe-to-ground-wood.png", icon_size = 64, } }, diff --git a/Bio_Industries_2/prototypes/Wood_Products/item.lua b/Bio_Industries_2/prototypes/Wood_Products/item.lua index e30c1e8..d3ee6b4 100644 --- a/Bio_Industries_2/prototypes/Wood_Products/item.lua +++ b/Bio_Industries_2/prototypes/Wood_Products/item.lua @@ -1,7 +1,6 @@ local BioInd = require('common')('Bio_Industries_2') + local ICONPATH = BioInd.modRoot .. "/graphics/icons/" -local ICONPATH_E = BioInd.modRoot .. "/graphics/icons/entity/" -local item_sounds = require("__base__.prototypes.item_sounds") data:extend({ @@ -11,19 +10,19 @@ data:extend({ name = "bi-wooden-pole-big", localised_name = {"entity-name.bi-wooden-pole-big"}, localised_description = {"entity-description.bi-wooden-pole-big"}, - icon = ICONPATH_E .. "big-wooden-pole.png", + icon = ICONPATH .. "big-wooden-pole.png", icon_size = 64, icons = { { - icon = ICONPATH_E .. "big-wooden-pole.png", + icon = ICONPATH .. "big-wooden-pole.png", icon_size = 64, } }, subgroup = "energy-pipe-distribution", order = "a[energy]-b[small-electric-pole]", place_result = "bi-wooden-pole-big", - --fuel_value = "14MJ", - --fuel_category = "chemical", + fuel_value = "14MJ", + fuel_category = "chemical", stack_size = 50 }, @@ -33,19 +32,19 @@ data:extend({ name = "bi-wooden-pole-huge", localised_name = {"entity-name.bi-wooden-pole-huge"}, localised_description = {"entity-description.bi-wooden-pole-huge"}, - icon = ICONPATH_E .. "huge-wooden-pole.png", + icon = ICONPATH .. "huge-wooden-pole.png", icon_size = 64, icons = { { - icon = ICONPATH_E .. "huge-wooden-pole.png", + icon = ICONPATH .. "huge-wooden-pole.png", icon_size = 64, } }, subgroup = "energy-pipe-distribution", order = "a[energy]-d[big-electric-pole]", place_result = "bi-wooden-pole-huge", - --fuel_value = "90MJ", - --fuel_category = "chemical", + fuel_value = "90MJ", + fuel_category = "chemical", stack_size = 50 }, @@ -55,11 +54,11 @@ data:extend({ name = "bi-wooden-fence", localised_name = {"entity-name.bi-wooden-fence"}, localised_description = {"entity-description.bi-wooden-fence"}, - icon = ICONPATH_E .. "wooden-fence.png", + icon = ICONPATH .. "wooden-fence.png", icon_size = 64, icons = { { - icon = ICONPATH_E .. "wooden-fence.png", + icon = ICONPATH .. "wooden-fence.png", icon_size = 64, } }, @@ -77,11 +76,11 @@ data:extend({ name = "bi-wood-pipe", localised_name = {"entity-name.bi-wood-pipe"}, localised_description = {"entity-description.bi-wood-pipe"}, - icon = ICONPATH_E .. "wood_pipe.png", + icon = ICONPATH .. "wood_pipe.png", icon_size = 64, icons = { { - icon = ICONPATH_E .. "wood_pipe.png", + icon = ICONPATH .. "wood_pipe.png", icon_size = 64, } }, @@ -99,11 +98,11 @@ data:extend({ name = "bi-wood-pipe-to-ground", localised_name = {"entity-name.bi-wood-pipe-to-ground"}, localised_description = {"entity-description.bi-wood-pipe-to-ground"}, - icon = ICONPATH_E .. "pipe-to-ground-wood.png", + icon = ICONPATH .. "pipe-to-ground-wood.png", icon_size = 64, icons = { { - icon = ICONPATH_E .. "pipe-to-ground-wood.png", + icon = ICONPATH .. "pipe-to-ground-wood.png", icon_size = 64, } }, @@ -114,41 +113,4 @@ data:extend({ fuel_category = "chemical", stack_size = 50 }, - }) - - if BI.Settings.BI_Game_Tweaks_Recipe then - data:extend({ - { - type = "rail-planner", - name = "bi-rail-wood", - icon = ICONPATH_E .. "rail-wood.png", - icon_size = 64, - icons = { - { - icon = ICONPATH_E .. "rail-wood.png", - icon_size = 64, - } - }, - localised_name = {"item-name.bi-rail-wood"}, - subgroup = "train-transport", - order = "a[rail]-0[rail]", - inventory_move_sound = item_sounds.train_inventory_move, - pick_sound = item_sounds.train_inventory_pickup, - drop_sound = item_sounds.train_inventory_move, - place_result = "straight-rail", - stack_size = 100, - rails = - { - "straight-rail", - "curved-rail-a", - "curved-rail-b", - "half-diagonal-rail" - }, - manual_length_limit = 22.5 -- 2*(Curved-A) + 2*(Curved-B) + their planner penalty + margin - }, - - }) - end - - diff --git a/Bio_Industries_2/prototypes/Wood_Products/pipes.lua b/Bio_Industries_2/prototypes/Wood_Products/pipes.lua index 9497a38..682f189 100644 --- a/Bio_Industries_2/prototypes/Wood_Products/pipes.lua +++ b/Bio_Industries_2/prototypes/Wood_Products/pipes.lua @@ -185,7 +185,6 @@ for i, was_picture in pairs (pipe_pictures) do end --------------------------------underground pipes ---[[ local pipe_to_ground_pictures = data.raw["pipe-to-ground"]["bi-wood-pipe-to-ground"].pictures for i, was_picture in pairs (pipe_to_ground_pictures) do @@ -197,27 +196,3 @@ for i, was_picture in pairs (pipe_to_ground_pictures) do end end end -]] - ---------------------------------underground pipes -local pipe_to_ground_pictures = data.raw["pipe-to-ground"]["bi-wood-pipe-to-ground"].pictures --- map the pipe-to-ground picture keys (north/south/east/west) to our sheet keys (up/down/right/left) -local direction_map = { - north = "up", - south = "down", - west = "left", - east = "right", - -- keep backwards compatibility if somehow up/down/left/right already present - up = "up", - down = "down", - left = "left", - right = "right" -} - -for i, was_picture in pairs(pipe_to_ground_pictures) do - local sheet_key = direction_map[i] - if sheet_key and pipes_sheet[sheet_key] then - change_graphics(was_picture, pipes_sheet[sheet_key], "hq") - change_graphics(was_picture, pipes_sheet[sheet_key], "lq") - end -end \ No newline at end of file diff --git a/Bio_Industries_2/prototypes/Wood_Products/recipe.lua b/Bio_Industries_2/prototypes/Wood_Products/recipe.lua index c44948e..828b4aa 100644 --- a/Bio_Industries_2/prototypes/Wood_Products/recipe.lua +++ b/Bio_Industries_2/prototypes/Wood_Products/recipe.lua @@ -1,7 +1,6 @@ local BioInd = require('common')('Bio_Industries_2') local ICONPATH = BioInd.modRoot .. "/graphics/icons/" -local ICONPATH_E = BioInd.modRoot .. "/graphics/icons/entity/" data:extend({ @@ -11,11 +10,11 @@ data:extend({ name = "bi-wooden-pole-big", localised_name = {"entity-name.bi-wooden-pole-big"}, localised_description = {"entity-description.bi-wooden-pole-big"}, - icon = ICONPATH_E .. "big-wooden-pole.png", + icon = ICONPATH .. "big-wooden-pole.png", icon_size = 64, icons = { { - icon = ICONPATH_E .. "big-wooden-pole.png", + icon = ICONPATH .. "big-wooden-pole.png", icon_size = 64, } }, @@ -42,11 +41,11 @@ data:extend({ name = "bi-wooden-pole-huge", localised_name = {"entity-name.bi-wooden-pole-huge"}, localised_description = {"entity-description.bi-wooden-pole-huge"}, - icon = ICONPATH_E .. "huge-wooden-pole.png", + icon = ICONPATH .. "huge-wooden-pole.png", icon_size = 64, icons = { { - icon = ICONPATH_E .. "huge-wooden-pole.png", + icon = ICONPATH .. "huge-wooden-pole.png", icon_size = 64, } }, @@ -74,11 +73,11 @@ data:extend({ name = "bi-wooden-fence", localised_name = {"entity-name.bi-wooden-fence"}, localised_description = {"entity-description.bi-wooden-fence"}, - icon = ICONPATH_E .. "wooden-fence.png", + icon = ICONPATH .. "wooden-fence.png", icon_size = 64, icons = { { - icon = ICONPATH_E .. "wooden-fence.png", + icon = ICONPATH .. "wooden-fence.png", icon_size = 64, } }, @@ -103,11 +102,11 @@ data:extend({ name = "bi-wood-pipe", localised_name = {"entity-name.bi-wood-pipe"}, localised_description = {"entity-description.bi-wood-pipe"}, - icon = ICONPATH_E .. "wood_pipe.png", + icon = ICONPATH .. "wood_pipe.png", icon_size = 64, icons = { { - icon = ICONPATH_E .. "wood_pipe.png", + icon = ICONPATH .. "wood_pipe.png", icon_size = 64, } }, @@ -136,11 +135,11 @@ data:extend({ name = "bi-wood-pipe-to-ground", localised_name = {"entity-name.bi-wood-pipe-to-ground"}, localised_description = {"entity-description.bi-wood-pipe-to-ground"}, - icon = ICONPATH_E .. "pipe-to-ground-wood.png", + icon = ICONPATH .. "pipe-to-ground-wood.png", icon_size = 64, icons = { { - icon = ICONPATH_E .. "pipe-to-ground-wood.png", + icon = ICONPATH .. "pipe-to-ground-wood.png", icon_size = 64, } }, @@ -158,55 +157,4 @@ data:extend({ subgroup = "energy-pipe-distribution", order = "a[pipe]-1b[pipe-to-ground]", }, - - }) - - if BI.Settings.BI_Game_Tweaks_Recipe then - - data:extend({ - { - type = "recipe", - name = "bi-rail-wood", - icon = ICONPATH_E .. "rail-wood.png", - icon_size = 64, - icons = { - { - icon = ICONPATH_E .. "rail-wood.png", - icon_size = 64, - } - }, - localised_name = {"entity-name.bi-rail-wood"}, - localised_description = {"entity-description.bi-rail-wood"}, - enabled = false, - ingredients = - { - {type = "item", name = "stone-crushed", amount = 6}, - {type = "item", name = "wood", amount = 12}, - {type = "item", name = "steel-plate", amount = 2} - }, - results = {{type="item", name="rail", amount=1}} - }, - - { - type = "recipe", - name = "bi-rail-wood-to-concrete", - icon = ICONPATH_E .. "rail-wood-to-concrete.png", - icon_size = 64, - icons = { - { - icon = ICONPATH_E .. "rail-wood-to-concrete.png", - icon_size = 64, - } - }, - enabled = false, - ingredients = - { - {type = "item", name = "bi-rail-wood", amount = 2}, - {type = "item", name = "stone-brick", amount = 6}, - - }, - results = {{type="item", name="rail", amount=2}} - }, - }) - end \ No newline at end of file diff --git a/Bio_Industries_2/prototypes/category.lua b/Bio_Industries_2/prototypes/category.lua index 625ab3c..a4e50ba 100644 --- a/Bio_Industries_2/prototypes/category.lua +++ b/Bio_Industries_2/prototypes/category.lua @@ -7,12 +7,12 @@ data:extend( name = "bio-industries", order = "vaa-a", inventory_order = "v-a", - icon = "__Bio_Industries_2__/graphics/technology/BioIndustries_itemgroup.png", - icon_size = 128, + icon = "__Bio_Industries_2__/graphics/technology/BioIndustries_64.png", + icon_size = 64, icons = { { - icon = "__Bio_Industries_2__/graphics/technology/BioIndustries_itemgroup.png", - icon_size = 128, + icon = "__Bio_Industries_2__/graphics/technology/BioIndustries_64.png", + icon_size = 64, } }, }, diff --git a/Bio_Industries_2/prototypes/compound_entities/hidden_entities.lua b/Bio_Industries_2/prototypes/compound_entities/hidden_entities.lua index d64e75a..2643b5a 100644 --- a/Bio_Industries_2/prototypes/compound_entities/hidden_entities.lua +++ b/Bio_Industries_2/prototypes/compound_entities/hidden_entities.lua @@ -1,9 +1,8 @@ -- Add functions that are also used in other files (debugging output etc.) local BioInd = require('common')('Bio_Industries_2') local ICONPATH = "__core__/graphics/" -local ICONPATH_E = BioInd.modRoot .. "/graphics/icons/entity/" -local HIDDENPATH = BioInd.modRoot .. "/prototypes/compound_entities/" +local HIDDENPATH = BioInd.modRoot .. "/prototypes/compound_entities/" BioInd.writeDebug("Entered prototypes.hidden_entities.lua of \"%s\".", {BioInd.modName}) ------------------------------------------------------------------------------------ @@ -36,8 +35,7 @@ if not BioInd.is_debug then table.insert(BI.hidden_entities.flags, "not-selectable-in-game") end --- make hidden entities non-colliding by default -BI.hidden_entities.collision_mask = { layers = {} } +BI.hidden_entities.collision_mask = nil BI.hidden_entities.collision_box = {{0, 0}, {0, 0}} BI.hidden_entities.selection_box = BioInd.is_debug and {{-0.5, -0.5}, {0.5, 0.5}} or @@ -135,7 +133,6 @@ BI.set_common_properties = function(h_entity) h_entity.selectable_in_game = BI.hidden_entities.selectable_in_game h_entity.max_health = BI.hidden_entities.max_health - --h_entity.collision_mask = {} h_entity.collision_mask = BI.hidden_entities.collision_mask h_entity.collision_box = BI.hidden_entities.collision_box h_entity.selection_box = BI.hidden_entities.selection_box diff --git a/Bio_Industries_2/prototypes/compound_entities/hidden_lamps.lua b/Bio_Industries_2/prototypes/compound_entities/hidden_lamps.lua index 98449dc..9a9a4eb 100644 --- a/Bio_Industries_2/prototypes/compound_entities/hidden_lamps.lua +++ b/Bio_Industries_2/prototypes/compound_entities/hidden_lamps.lua @@ -3,7 +3,6 @@ local BioInd = require('common')('Bio_Industries_2') BioInd.writeDebug("Entered prototypes.hidden_lamps.lua of \"%s\".", {BioInd.modName}) local ICONPATH = BioInd.modRoot .. "/graphics/icons/" -local ICONPATH_E = BioInd.modRoot .. "/graphics/icons/entity/" ------------------------------------------------------------------------------------ -- Create the main prototype for hidden lamps. All others will be based on this! -- @@ -55,14 +54,12 @@ for lamp_name, locale_name in pairs(BI.hidden_entities.types[h_key]) do lamp.name = lamp_name lamp.localised_name = {"entity-name." .. locale_name} lamp.localised_description = {"entity-description." .. locale_name} - lamp.collision_mask = { layers = {} } - lamp.collision_box = {{0,0},{0,0}} -- Adjust properties for hidden lamp of Bio farm if c_entities["bi-bio-farm"] and lamp_name == c_entities["bi-bio-farm"].hidden[h_type].name then - lamp.icon = ICONPATH_E .. "bio_Farm_Lamp.png" + lamp.icon = ICONPATH .. "Bio_Farm_Lamp.png" lamp.icon_size = 64 lamp.BI_add_icon = true BioInd.show("Adjusted properties of", lamp_name) diff --git a/Bio_Industries_2/prototypes/compound_entities/hidden_panels.lua b/Bio_Industries_2/prototypes/compound_entities/hidden_panels.lua index 614b6bd..1725804 100644 --- a/Bio_Industries_2/prototypes/compound_entities/hidden_panels.lua +++ b/Bio_Industries_2/prototypes/compound_entities/hidden_panels.lua @@ -1,9 +1,8 @@ -- Add functions that are also used in other files (debugging output etc.) local BioInd = require('common')('Bio_Industries_2') -BioInd.writeDebug("Entered prototypes.hidden_panels.lua of \"%s\".", { BioInd.modName }) +BioInd.writeDebug("Entered prototypes.hidden_panels.lua of \"%s\".", {BioInd.modName}) local ICONPATH = BioInd.modRoot .. "/graphics/icons/" -local ICONPATH_E = BioInd.modRoot .. "/graphics/icons/entity/" ------------------------------------------------------------------------------------ -- Create the main prototype for hidden lamps. All others will be based on this! -- @@ -47,50 +46,56 @@ local tmp, panel local c_entities = BioInd.compound_entities for panel_name, locale_name in pairs(BI.hidden_entities.types[h_key]) do - panel = table.deepcopy(h_entity) - panel.name = panel_name - panel.localised_name = { "entity-name." .. locale_name } - panel.localised_description = { "entity-description." .. locale_name } - panel.collision_mask = { layers = {} } - panel.collision_box = {{0,0},{0,0}} + panel = table.deepcopy(h_entity) + panel.name = panel_name + panel.localised_name = {"entity-name." .. locale_name} + panel.localised_description = {"entity-description." .. locale_name} - -- Adjust properties for hidden panel of Solar boiler - if c_entities["bi-solar-boiler"] and - panel_name == c_entities["bi-solar-boiler"].hidden[h_key].name then - panel.icon = ICONPATH_E .. "bio_Solar_Boiler_Icon.png" - panel.icon_size = 64 - panel.BI_add_icon = true - panel.picture = nil - panel.overlay = nil - panel.max_health = 400 - panel.render_no_power_icon = true - panel.collision_box = { { -4.2, -4.2 }, { 4.2, 4.2 } } - panel.production = "1.8MW" - BioInd.show("Adjusted properties of", panel_name) + -- Adjust properties for hidden panel of Solar boiler + if c_entities["bi-solar-boiler"] and + panel_name == c_entities["bi-solar-boiler"].hidden[h_key].name then - -- Adjust properties for hidden panel of bio farms - elseif c_entities["bi-bio-farm"] and - c_entities["bi-bio-farm"].hidden[h_key] and - panel_name == c_entities["bi-bio-farm"].hidden[h_key].name then - panel.icon = ICONPATH_E .. "bio_Farm_Solar.png" - panel.icon_size = 64 - panel.BI_add_icon = true - panel.production = "100kW" - BioInd.show("Adjusted properties of", panel_name) + panel.icon = ICONPATH .. "Bio_Solar_Boiler_Icon.png" + panel.icon_size = 64 + panel.BI_add_icon = true - -- Adjust properties for hidden panel of Musk floor - elseif panel_name == Musk_name then - panel.icon = ICONPATH_E .. "solar-mat.png" - panel.icon_size = 64 - panel.BI_add_icon = true - panel.production = "10kW" - BioInd.show("Adjusted properties of", panel_name) - end + panel.picture = {} + panel.picture = BI.add_layer(panel.picture, { + name = BioInd.modRoot .. "/graphics/entities/bio_solar_farm/Bio_Solar_Boiler.png", + size = 288 + }) + panel.overlay = {} + panel.overlay = table.deepcopy(panel.picture) - data:extend({ panel }) + panel.max_health = 400 + panel.render_no_power_icon = true + panel.collision_box = {{-4.2, -4.2}, {4.2, 4.2}} + panel.production = "1.8MW" + BioInd.show("Adjusted properties of", panel_name) - BioInd.show("Created", panel_name) + -- Adjust properties for hidden panel of bio farms + elseif c_entities["bi-bio-farm"] and + c_entities["bi-bio-farm"].hidden[h_key] and + panel_name == c_entities["bi-bio-farm"].hidden[h_key].name then + panel.icon = ICONPATH .. "Bio_Farm_Solar.png" + panel.icon_size = 64 + panel.BI_add_icon = true + panel.production = "100kW" + BioInd.show("Adjusted properties of", panel_name) + + -- Adjust properties for hidden panel of Musk floor + elseif panel_name == Musk_name then + panel.icon = ICONPATH .. "solar-mat.png" + panel.icon_size = 64 + panel.BI_add_icon = true + panel.production = "10kW" + BioInd.show("Adjusted properties of", panel_name) + end + + data:extend({panel}) + + BioInd.show("Created", panel_name) end diff --git a/Bio_Industries_2/prototypes/compound_entities/hidden_poles.lua b/Bio_Industries_2/prototypes/compound_entities/hidden_poles.lua index 7818844..0a43e76 100644 --- a/Bio_Industries_2/prototypes/compound_entities/hidden_poles.lua +++ b/Bio_Industries_2/prototypes/compound_entities/hidden_poles.lua @@ -1,9 +1,8 @@ -- Add functions that are also used in other files (debugging output etc.) -local BioInd = require('common')('Bio_Industries_2') +local BioInd = require('common')('Bio_Industries') BioInd.writeDebug("Entered prototypes.hidden_poles.lua of \"%s\".", {BioInd.modName}) local ICONPATH = BioInd.modRoot .. "/graphics/icons/" -local ICONPATH_E = BioInd.modRoot .. "/graphics/icons/entity/" ------------------------------------------------------------------------------------ -- Create the main prototype for hidden poles. All others will be based on this! -- @@ -25,6 +24,16 @@ h_entity.draw_circuit_wires = BioInd.is_debug h_entity.maximum_wire_distance = 10 h_entity.supply_area_distance = 5 + +--~ hidden_pole.resistances = {} +--~ for damage, d in pairs(data.raw["damage-type"]) do + --~ hidden_pole.resistances[#hidden_pole.resistances +1] = { + --~ type = damage, + --~ percent = 100 + --~ } +--~ end +--~ BioInd.show("hidden_pole.resistances", hidden_pole.resistances) + h_entity.connection_points = BioInd.is_debug and h_entity.connection_points or { { @@ -32,6 +41,7 @@ h_entity.connection_points = BioInd.is_debug and wire = { copper_wire_tweak = {0, 0} } } } +--~ h_entity.connection_points = h_entity.connection_points h_entity.radius_visualisation_picture = BioInd.is_debug and h_entity.radius_visualisation_picture or BI.hidden_entities.picture @@ -82,8 +92,6 @@ BioInd.show("locale_name", locale_name) pole.localised_name = {"entity-name." .. locale_name} pole.localised_description = {"entity-description." .. locale_name} pole.icon_size = BioInd.is_debug and pole.icon_size or 64 - pole.collision_mask = { layers = {} } - pole.collision_box = {{0,0},{0,0}} ------------------------------------------------------------------------------------ -- Adjust properties for hidden biofarm poles @@ -174,7 +182,7 @@ BioInd.show("locale_name", locale_name) -- Adjust properties for hidden pole of Musk floor ------------------------------------------------------------------------------------ elseif pole_name == Musk_name then - pole.icon = ICONPATH_E .. "solar-mat.png" + pole.icon = ICONPATH .. "solar-mat.png" pole.icon_size = 64 pole.maximum_wire_distance = 1 pole.supply_area_distance = 3 diff --git a/Bio_Industries_2/prototypes/compound_entities/hidden_radars.lua b/Bio_Industries_2/prototypes/compound_entities/hidden_radars.lua index a529a22..a84121c 100644 --- a/Bio_Industries_2/prototypes/compound_entities/hidden_radars.lua +++ b/Bio_Industries_2/prototypes/compound_entities/hidden_radars.lua @@ -3,8 +3,6 @@ local BioInd = require('common')('Bio_Industries_2') BioInd.writeDebug("Entered prototypes.hidden_radars.lua of \"%s\".", {BioInd.modName}) local ICONPATH = BioInd.modRoot .. "/graphics/icons/" -local ICONPATH_W = BioInd.modRoot .. "/graphics/icons/weapons/" -local ICONPATH_E = BioInd.modRoot .. "/graphics/icons/entity/" require ("util") @@ -48,9 +46,6 @@ BioInd.show("locale_name", locale_name) radar.name = radar_name radar.localised_name = {"entity-name." .. locale_name} radar.localised_description = {"entity-description." .. locale_name} - radar.collision_mask = { layers = {} } - radar.collision_box = {{0,0},{0,0}} - BioInd.show("radar_name", radar_name) BioInd.show("radar.name", c_entities["bi-arboretum"].hidden[h_key].name) @@ -61,7 +56,7 @@ BioInd.show("radar.name", c_entities["bi-arboretum"].hidden[h_key].name) local base = c_entities["bi-bio-cannon"].base base = data.raw[base.type][base.name] - radar.icon = ICONPATH_W .. "biocannon_icon.png" + radar.icon = ICONPATH .. "biocannon_icon.png" radar.icon_size = 64 radar.BI_add_icon = true @@ -86,7 +81,7 @@ BioInd.show("radar.name", c_entities["bi-arboretum"].hidden[h_key].name) radar.localised_name = {"entity-name." .. radar.name} - radar.icon = ICONPATH_E .. "arboretum_radar_icon.png" + radar.icon = ICONPATH .. "Arboretum_Icon.png" radar.icon_size = 64 radar.BI_add_icon = true @@ -100,7 +95,7 @@ BioInd.show("radar.name", c_entities["bi-arboretum"].hidden[h_key].name) -- For some reason, the default collision_mask (unset properties will be -- set to the default value automatically at the end of the data stage) -- must be set to make the radar selectable! - radar.collision_mask = { layers = {} } + radar.collision_mask = nil radar.collision_box = {{-0.70, -0.70}, {0.70, 0.70}} radar.selection_box = {{-0.75, -0.75}, {0.75, 0.75}}