diff --git a/Bio_Industries_2/changelog.txt b/Bio_Industries_2/changelog.txt index 61df087..3e26f12 100644 --- a/Bio_Industries_2/changelog.txt +++ b/Bio_Industries_2/changelog.txt @@ -1,16 +1,4 @@ --------------------------------------------------------------------------------------------------- -Version: 2.0.20 -Date: 12.09.2025 - Changes: - - Code Clean up - - More Updates to Bob's Compatibility - - Added a few milestones ---------------------------------------------------------------------------------------------------- -Version: 2.0.19 -Date: 11.09.2025 - Bug Fixes: - - Fix Bio Reactor graphic shift when selecting a recipe with 3 fluid inputs. ---------------------------------------------------------------------------------------------------- Version: 2.0.18 Date: 10.09.2025 Bug Fixes: diff --git a/Bio_Industries_2/control.lua b/Bio_Industries_2/control.lua index c9237e1..fb3669f 100644 --- a/Bio_Industries_2/control.lua +++ b/Bio_Industries_2/control.lua @@ -18,9 +18,12 @@ require("util") require("libs/util_ext") require("control_tree") require("control_arboretum") -require("remote") -- milestones +---************** Used for Testing ----- +--require ("Test_Spawn") +---************* + local function Create_dummy_force() -- Create dummy force for musk floor if electric grid overlay should NOT be shown in map view diff --git a/Bio_Industries_2/data-updates.lua b/Bio_Industries_2/data-updates.lua index 3dbb334..f7c9bfc 100644 --- a/Bio_Industries_2/data-updates.lua +++ b/Bio_Industries_2/data-updates.lua @@ -495,8 +495,8 @@ else -- Replace liquid air with oxygen (from Krastorio/K2) in recipes for Algae Biomass 2 and 3 if data.raw.fluid.oxygen then - thxbob.lib.recipe.replace_ingredient("bi-biomass-2", "liquid-air", "kr-oxygen") - thxbob.lib.recipe.replace_ingredient("bi-biomass-3", "liquid-air", "kr-oxygen") + thxbob.lib.recipe.replace_ingredient("bi-biomass-2", "liquid-air", "oxygen") + thxbob.lib.recipe.replace_ingredient("bi-biomass-3", "liquid-air", "oxygen") BioInd.writeDebug("Replaced \"liquid-air\" with \"oxygen\" in recipes \"bi-biomass-2\" and \"bi-biomass-3\"") -- Perhaps there is no oxygen? But there's nitrogen for sure, so we fall back to that! elseif data.raw.fluid.nitrogen then @@ -602,6 +602,8 @@ end -- Replace Bob's Resin with BI Resin if data.raw.item["bob-resin"] then + --data.raw.item["bob-resin"] = nil -- Remove Bob's resin + if data.raw.recipe["bob-resin-wood"] then thxbob.lib.recipe.remove_result("bob-resin-wood", "bob-resin") thxbob.lib.recipe.add_result("bob-resin-wood", { @@ -609,7 +611,7 @@ if data.raw.item["bob-resin"] then name = "resin", amount = 1 }) - BioInd.writeDebug("Replace Bob's Resin with BI Resin in Recipe 'bob-resin-wood'") + BioInd.writeDebug("Replace Bob's Resin with BI Resin in Recipe 'bob-resin-wood'") end if data.raw.recipe["bob-resin-oil"] then @@ -619,14 +621,19 @@ if data.raw.item["bob-resin"] then name = "resin", amount = 1 }) - BioInd.writeDebug("Replace Bob's Resin with BI Resin in Recipe 'bob-resin-oil'") + BioInd.writeDebug("Replace Bob's Resin with BI Resin in Recipe 'bob-resin-oil'") end if data.raw.recipe["bob-rubber"] then data.raw.recipe["bob-rubber"].icon = ICONPATH_BA .. "rubber.png" data.raw.recipe["bob-rubber"].icon_size = 32 - thxbob.lib.recipe.replace_ingredient("bob-rubber", "bob-resin", "resin") - BioInd.writeDebug("Replace Bob's Resin with BI Resin in Recipe 'bob-rubber'") + thxbob.lib.recipe.remove_result("bob-rubber", "bob-resin") + thxbob.lib.recipe.add_result("bob-rubber", { + type = "item", + name = "resin", + amount = 1 + }) + BioInd.writeDebug("Replace Bob's Resin with BI Resin in Recipe 'bob-rubber'") end if data.raw.recipe["bob-phenolic-board"] then diff --git a/Bio_Industries_2/data.lua b/Bio_Industries_2/data.lua index 9ca4147..3762d4e 100644 --- a/Bio_Industries_2/data.lua +++ b/Bio_Industries_2/data.lua @@ -46,6 +46,7 @@ require("prototypes.Bio_Farm.item") require("prototypes.Bio_Farm.recipe") require("prototypes.Bio_Farm.liquids") require("prototypes.Bio_Farm.recipe-categories") +require("prototypes.Bio_Farm.pipeConnectors") require("prototypes.Bio_Farm.technology") require("prototypes.Bio_Farm.tree_entities") diff --git a/Bio_Industries_2/graphics/entities/bio_farm/biofarm_pipes/Bio_Farm-pipe-E_l.png b/Bio_Industries_2/graphics/entities/bio_farm/biofarm_pipes/Bio_Farm-pipe-E_l.png new file mode 100644 index 0000000..b88fcdf Binary files /dev/null and b/Bio_Industries_2/graphics/entities/bio_farm/biofarm_pipes/Bio_Farm-pipe-E_l.png differ diff --git a/Bio_Industries_2/graphics/entities/bio_farm/biofarm_pipes/Bio_Farm-pipe-E_r.png b/Bio_Industries_2/graphics/entities/bio_farm/biofarm_pipes/Bio_Farm-pipe-E_r.png new file mode 100644 index 0000000..befc747 Binary files /dev/null and b/Bio_Industries_2/graphics/entities/bio_farm/biofarm_pipes/Bio_Farm-pipe-E_r.png differ diff --git a/Bio_Industries_2/graphics/entities/bio_farm/biofarm_pipes/Bio_Farm-pipe-N_l.png b/Bio_Industries_2/graphics/entities/bio_farm/biofarm_pipes/Bio_Farm-pipe-N_l.png new file mode 100644 index 0000000..fc348f0 Binary files /dev/null and b/Bio_Industries_2/graphics/entities/bio_farm/biofarm_pipes/Bio_Farm-pipe-N_l.png differ diff --git a/Bio_Industries_2/graphics/entities/bio_farm/biofarm_pipes/Bio_Farm-pipe-N_r.png b/Bio_Industries_2/graphics/entities/bio_farm/biofarm_pipes/Bio_Farm-pipe-N_r.png new file mode 100644 index 0000000..42f3876 Binary files /dev/null and b/Bio_Industries_2/graphics/entities/bio_farm/biofarm_pipes/Bio_Farm-pipe-N_r.png differ diff --git a/Bio_Industries_2/graphics/entities/bio_farm/biofarm_pipes/Bio_Farm-pipe-S_l.png b/Bio_Industries_2/graphics/entities/bio_farm/biofarm_pipes/Bio_Farm-pipe-S_l.png new file mode 100644 index 0000000..278aa54 Binary files /dev/null and b/Bio_Industries_2/graphics/entities/bio_farm/biofarm_pipes/Bio_Farm-pipe-S_l.png differ diff --git a/Bio_Industries_2/graphics/entities/bio_farm/biofarm_pipes/Bio_Farm-pipe-S_r.png b/Bio_Industries_2/graphics/entities/bio_farm/biofarm_pipes/Bio_Farm-pipe-S_r.png new file mode 100644 index 0000000..af3491c Binary files /dev/null and b/Bio_Industries_2/graphics/entities/bio_farm/biofarm_pipes/Bio_Farm-pipe-S_r.png differ diff --git a/Bio_Industries_2/graphics/entities/bio_farm/biofarm_pipes/Bio_Farm-pipe-W_l.png b/Bio_Industries_2/graphics/entities/bio_farm/biofarm_pipes/Bio_Farm-pipe-W_l.png new file mode 100644 index 0000000..3b246d3 Binary files /dev/null and b/Bio_Industries_2/graphics/entities/bio_farm/biofarm_pipes/Bio_Farm-pipe-W_l.png differ diff --git a/Bio_Industries_2/graphics/entities/bio_farm/biofarm_pipes/Bio_Farm-pipe-W_r.png b/Bio_Industries_2/graphics/entities/bio_farm/biofarm_pipes/Bio_Farm-pipe-W_r.png new file mode 100644 index 0000000..e6e00ed Binary files /dev/null and b/Bio_Industries_2/graphics/entities/bio_farm/biofarm_pipes/Bio_Farm-pipe-W_r.png 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 new file mode 100644 index 0000000..8275572 Binary files /dev/null and b/Bio_Industries_2/graphics/entities/bio_greenhouse/pipe/assembling-machine-3-pipe-E.png 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 new file mode 100644 index 0000000..58f4c75 Binary files /dev/null and b/Bio_Industries_2/graphics/entities/bio_greenhouse/pipe/assembling-machine-3-pipe-N.png 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 new file mode 100644 index 0000000..ea31edf Binary files /dev/null and b/Bio_Industries_2/graphics/entities/bio_greenhouse/pipe/assembling-machine-3-pipe-S.png 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 new file mode 100644 index 0000000..5312d0f Binary files /dev/null and b/Bio_Industries_2/graphics/entities/bio_greenhouse/pipe/assembling-machine-3-pipe-W.png differ diff --git a/Bio_Industries_2/graphics/entities/bio_greenhouse/biogreenhouse_pipes/assembling-machine-3-pipe-E.png b/Bio_Industries_2/graphics/entities/bio_greenhouse/pipe/hr-assembling-machine-3-pipe-E.png similarity index 100% rename from Bio_Industries_2/graphics/entities/bio_greenhouse/biogreenhouse_pipes/assembling-machine-3-pipe-E.png rename to Bio_Industries_2/graphics/entities/bio_greenhouse/pipe/hr-assembling-machine-3-pipe-E.png diff --git a/Bio_Industries_2/graphics/entities/bio_greenhouse/biogreenhouse_pipes/assembling-machine-3-pipe-N-exp.png b/Bio_Industries_2/graphics/entities/bio_greenhouse/pipe/hr-assembling-machine-3-pipe-N-exp.png similarity index 100% rename from Bio_Industries_2/graphics/entities/bio_greenhouse/biogreenhouse_pipes/assembling-machine-3-pipe-N-exp.png rename to Bio_Industries_2/graphics/entities/bio_greenhouse/pipe/hr-assembling-machine-3-pipe-N-exp.png diff --git a/Bio_Industries_2/graphics/entities/bio_greenhouse/biogreenhouse_pipes/assembling-machine-3-pipe-S.png b/Bio_Industries_2/graphics/entities/bio_greenhouse/pipe/hr-assembling-machine-3-pipe-S.png similarity index 100% rename from Bio_Industries_2/graphics/entities/bio_greenhouse/biogreenhouse_pipes/assembling-machine-3-pipe-S.png rename to Bio_Industries_2/graphics/entities/bio_greenhouse/pipe/hr-assembling-machine-3-pipe-S.png diff --git a/Bio_Industries_2/graphics/entities/bio_greenhouse/biogreenhouse_pipes/assembling-machine-3-pipe-W.png b/Bio_Industries_2/graphics/entities/bio_greenhouse/pipe/hr-assembling-machine-3-pipe-W.png similarity index 100% rename from Bio_Industries_2/graphics/entities/bio_greenhouse/biogreenhouse_pipes/assembling-machine-3-pipe-W.png rename to Bio_Industries_2/graphics/entities/bio_greenhouse/pipe/hr-assembling-machine-3-pipe-W.png 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 index 53a6e38..6111448 100644 Binary files a/Bio_Industries_2/graphics/entities/bio_reactor/pipes/bioreactor-pipe-e.png and b/Bio_Industries_2/graphics/entities/bio_reactor/pipes/bioreactor-pipe-e.png 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 index df32b61..46d9864 100644 Binary files a/Bio_Industries_2/graphics/entities/bio_reactor/pipes/bioreactor-pipe-s.png and b/Bio_Industries_2/graphics/entities/bio_reactor/pipes/bioreactor-pipe-s.png 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 index 8c72efb..6239713 100644 Binary files a/Bio_Industries_2/graphics/entities/bio_reactor/pipes/bioreactor-pipe-w.png and b/Bio_Industries_2/graphics/entities/bio_reactor/pipes/bioreactor-pipe-w.png 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 new file mode 100644 index 0000000..53a6e38 Binary files /dev/null and b/Bio_Industries_2/graphics/entities/bio_reactor/pipes/hr_bioreactor-pipe-e.png 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 new file mode 100644 index 0000000..df32b61 Binary files /dev/null and b/Bio_Industries_2/graphics/entities/bio_reactor/pipes/hr_bioreactor-pipe-s.png 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 new file mode 100644 index 0000000..8c72efb Binary files /dev/null and b/Bio_Industries_2/graphics/entities/bio_reactor/pipes/hr_bioreactor-pipe-w.png differ diff --git a/Bio_Industries_2/graphics/icons/old/bi_wood_resin_pulp.png b/Bio_Industries_2/graphics/icons/bi_wood_resin_pulp.png similarity index 100% rename from Bio_Industries_2/graphics/icons/old/bi_wood_resin_pulp.png rename to Bio_Industries_2/graphics/icons/bi_wood_resin_pulp.png diff --git a/Bio_Industries_2/graphics/icons/fertilizer_sulfur.png b/Bio_Industries_2/graphics/icons/fertilizer_sulfur.png index 470e5d5..14ab8fa 100644 Binary files a/Bio_Industries_2/graphics/icons/fertilizer_sulfur.png and b/Bio_Industries_2/graphics/icons/fertilizer_sulfur.png differ diff --git a/Bio_Industries_2/graphics/icons/old/fertilizer_sulfur.png b/Bio_Industries_2/graphics/icons/old/fertilizer_sulfur.png deleted file mode 100644 index 14ab8fa..0000000 Binary files a/Bio_Industries_2/graphics/icons/old/fertilizer_sulfur.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/icons/old/plastic_bar_1.png b/Bio_Industries_2/graphics/icons/old/plastic_bar_1.png deleted file mode 100644 index 0e41055..0000000 Binary files a/Bio_Industries_2/graphics/icons/old/plastic_bar_1.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/icons/plastic_bar_1.png b/Bio_Industries_2/graphics/icons/plastic_bar_1.png index 8119eac..0e41055 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/info.json b/Bio_Industries_2/info.json index 6f7376f..cae8420 100644 --- a/Bio_Industries_2/info.json +++ b/Bio_Industries_2/info.json @@ -1,11 +1,10 @@ { "name": "Bio_Industries_2", - "version": "2.0.20", + "version": "2.0.18", "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", + "homepage": "https://discord.gg/ufvFUJtVwk", "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/recipe-name.cfg b/Bio_Industries_2/locale/en/recipe-name.cfg index 7563a82..fec772c 100644 --- a/Bio_Industries_2/locale/en/recipe-name.cfg +++ b/Bio_Industries_2/locale/en/recipe-name.cfg @@ -116,7 +116,7 @@ bi-sulfur-angels=Bio-__ITEM__sulfur__ ## angelsrefining, BioTech, Krastorio/Krastorio2 bi-sand=__ITEM__sand__ from __ITEM__stone-crushed__ ## bobelectronics -bi-press-wood=Wooden board +bi-press-wood=Pressed wood ## Industrial Revolution bi-crushed-stone-1_IR=__ITEM__gravel__ from __ITEM__stone__ bi-crushed-stone-2_IR=__ITEM__gravel__ from __ITEM__concrete__ diff --git a/Bio_Industries_2/prototypes/Bio_Farm/compatible_recipes.lua b/Bio_Industries_2/prototypes/Bio_Farm/compatible_recipes.lua index c04abec..89e09f3 100644 --- a/Bio_Industries_2/prototypes/Bio_Farm/compatible_recipes.lua +++ b/Bio_Industries_2/prototypes/Bio_Farm/compatible_recipes.lua @@ -242,8 +242,8 @@ end -- Krastorio2 if mods["Krastorio2"] or mods["Krastorio2-spaced-out"] then -- Replace liquid air with oxygen in Algae Biomass conversion 2 and 3 - thxbob.lib.recipe.replace_ingredient("bi-biomass-2", "liquid-air", "kr-oxygen") - thxbob.lib.recipe.replace_ingredient("bi-biomass-3", "liquid-air", "kr-oxygen") + thxbob.lib.recipe.replace_ingredient("bi-biomass-2", "liquid-air", "oxygen") + thxbob.lib.recipe.replace_ingredient("bi-biomass-3", "liquid-air", "oxygen") end @@ -330,11 +330,11 @@ if data.raw.item["bob-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_shiny.png", + icon = ICONPATH_BA .. "bi_wooden_board.png", icon_size = 64, icons = { { - icon = ICONPATH_BA .. "bi_wooden_board_shiny.png", + icon = ICONPATH_BA .. "bi_wooden_board.png", icon_size = 64, } }, @@ -361,7 +361,10 @@ if data.raw.item["bob-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_size = 64 + end end @@ -379,7 +382,7 @@ end -- Add recipe for sand from crushed stone if any other mod provides sand -if data.raw.item[mods["Krastorio2"] and "kr-sand" or "sand"] or +if data.raw.item["sand"] or data.raw.item["biotech-sand"] or data.raw.item["solid-sand"] then @@ -401,7 +404,7 @@ if data.raw.item[mods["Krastorio2"] and "kr-sand" or "sand"] or order = "a[bi]-a-z[bi-9-sand]", energy_required = 1, ingredients = {{type="item", name="stone-crushed", amount=2}}, - results = {{type="item", name=mods["Krastorio2"] and "kr-sand" or "sand", amount=5}}, + results = {{type="item", name="sand", amount=5}}, main_product = "", enabled = false, allow_as_intermediate = true, -- Changed for 0.18.34/1.1.4 diff --git a/Bio_Industries_2/prototypes/Bio_Farm/entities.lua b/Bio_Industries_2/prototypes/Bio_Farm/entities.lua index fd8ee4e..069bfcf 100644 --- a/Bio_Industries_2/prototypes/Bio_Farm/entities.lua +++ b/Bio_Industries_2/prototypes/Bio_Farm/entities.lua @@ -4,107 +4,10 @@ local ICONPATH_E = BioInd.modRoot .. "/graphics/icons/entity/" local ENTITYPATH_BIO = BioInd.modRoot .. "/graphics/entities/" local REMNANTSPATH = BioInd.modRoot .. "/graphics/entities/remnants/" - +require("prototypes.Bio_Farm.pipeConnectors") require("util") --- Pipes ------------------------------------------------------------------------------------- --- Bio farm -- ------------------------------------------------------------------------------------- - -function biofarmpipepictures() - return - { - north = { - filename = "__core__/graphics/empty.png", - priority = "low", - width = 1, - height = 1, - }, - east = - { - filename = ENTITYPATH_BIO .. "bio_farm/biofarm_pipes/bio_farm-pipe-E.png", - priority = "extra-high", - width = 42, - height = 76, - shift = util.by_pixel(-24.5, 1), - scale = 0.5 - - }, - south = - { - filename = ENTITYPATH_BIO .. "bio_farm/biofarm_pipes/bio_farm-pipe-S.png", - priority = "extra-high", - width = 88, - height = 61, - shift = util.by_pixel(0, -31.25), - scale = 0.5 - - }, - west = - { - filename = ENTITYPATH_BIO .. "bio_farm/biofarm_pipes/bio_farm-pipe-W.png", - priority = "extra-high", - width = 39, - height = 73, - shift = util.by_pixel(25.75, 1.25), - scale = 0.5 - - } - } -end - ------------------------------------------------------------------------------------- --- Bio Greenhouse -- ------------------------------------------------------------------------------------- - -function biogreenhousepipepictures() - return - { - north = { - filename = ENTITYPATH_BIO .. "bio_greenhouse/biogreenhouse_pipes/assembling-machine-3-pipe-N-exp.png", - priority = "extra-high", - width = 171, - height = 152, - shift = util.by_pixel(2.25, 13.5), - scale = 0.5 - }, - east = - { - filename = ENTITYPATH_BIO .. "bio_greenhouse/biogreenhouse_pipes/assembling-machine-3-pipe-E.png", - priority = "extra-high", - width = 42, - height = 76, - shift = util.by_pixel(-24.5, 1), - scale = 0.5 - - }, - south = - { - filename = ENTITYPATH_BIO .. "bio_greenhouse/biogreenhouse_pipes/assembling-machine-3-pipe-S.png", - priority = "extra-high", - width = 88, - height = 61, - shift = util.by_pixel(0, -31.25), - scale = 0.5 - - }, - west = - { - filename = ENTITYPATH_BIO .. "bio_greenhouse/biogreenhouse_pipes/assembling-machine-3-pipe-W.png", - priority = "extra-high", - width = 39, - height = 73, - shift = util.by_pixel(25.75, 1.25), - scale = 0.5 - - } - } -end - - - inv_extension2 = { filename = ENTITYPATH_BIO .. "bio_terraformer/arboretum.png", priority = "high", @@ -243,17 +146,24 @@ data:extend({ { type = "assembling-machine", name = "bi-bio-farm", - icons = {{ icon = ICONPATH_E .. "bio_Farm_Icon.png", icon_size = 64, }}, + icon = ICONPATH_E .. "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 = 350, + max_health = 250, corpse = "bi-bio-farm-remnant", dying_explosion = "medium-explosion", resistances = { { type = "fire", percent = 70 } }, fluid_boxes = { { production_type = "input", - pipe_picture = biofarmpipepictures(), + pipe_picture = assembler3pipepictures(), pipe_covers = pipecoverspictures(), volume = 1000, base_level = -1, @@ -261,7 +171,7 @@ data:extend({ }, { production_type = "input", - pipe_picture = biofarmpipepictures(), + pipe_picture = assembler3pipepictures(), pipe_covers = pipecoverspictures(), volume = 1000, base_level = -1, @@ -269,8 +179,10 @@ data:extend({ }, }, 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 } }, + graphics_set = { animation = { layers = { @@ -297,9 +209,8 @@ data:extend({ }, working_visualisations = { { - light = { intensity = 1.4, size = 10 }, + light = { intensity = 1.2, size = 9 }, effect = "flicker", - apply_recipe_tint = "primary", constant_speed = true, fadeout = true, animation = { @@ -315,6 +226,7 @@ data:extend({ } } }, + crafting_categories = { "biofarm-mod-farm" }, crafting_speed = 1, energy_source = { @@ -378,7 +290,14 @@ data:extend({ { type = "assembling-machine", name = "bi-bio-greenhouse", - icons = { { icon = ICONPATH_E .. "bio_greenhouse.png", icon_size = 64, } }, + icon = ICONPATH_E .. "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 } }, @@ -405,7 +324,7 @@ data:extend({ fluid_boxes = { { production_type = "input", - pipe_picture = biogreenhousepipepictures(), + pipe_picture = assembler3pipepictures(), pipe_covers = pipecoverspictures(), volume = 1000, base_level = -1, @@ -439,9 +358,6 @@ data:extend({ working_visualisations = { { light = { intensity = 1, size = 6 }, - draw_as_light = true, - effect = "flicker", - apply_recipe_tint = "primary", animation = { filename = ENTITYPATH_BIO .. "bio_greenhouse/bio_greenhouse_light_anim.png", width = 192, @@ -450,6 +366,7 @@ data:extend({ scale = 0.5, animation_speed = 0.1, shift = { 0, -0.5 }, + draw_as_light = true } } } @@ -496,7 +413,14 @@ data:extend({ { type = "assembling-machine", name = "bi-cokery", - icons = { { icon = ICONPATH_E .. "cokery.png", icon_size = 64, } }, + icon = ICONPATH_E .. "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, @@ -511,6 +435,33 @@ data:extend({ 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 = { @@ -989,7 +940,14 @@ data:extend({ name = "bi-arboretum-area", localised_name = { "entity-name.bi-arboretum" }, localised_description = { "entity-description.bi-arboretum" }, - icons = { { icon = ICONPATH_E .. "arboretum_Icon.png", icon_size = 64, }}, + 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 }, @@ -1033,7 +991,14 @@ data:extend({ { type = "assembling-machine", name = "bi-arboretum", - icons = { { icon = ICONPATH_E .. "arboretum_Icon.png", icon_size = 64, }}, + icon = ICONPATH_E .. "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" }, @@ -1044,7 +1009,7 @@ data:extend({ fluid_boxes = { { production_type = "input", - --pipe_picture = assembler3pipepictures(), + pipe_picture = assembler3pipepictures(), pipe_covers = pipecoverspictures(), volume = 1000, base_level = -1, @@ -1052,7 +1017,7 @@ data:extend({ }, { production_type = "input", - --pipe_picture = assembler3pipepictures(), + pipe_picture = assembler3pipepictures(), pipe_covers = pipecoverspictures(), volume = 1000, base_level = -1, @@ -1112,7 +1077,6 @@ data:extend({ close_sound = { filename = "__base__/sound/machine-close.ogg", volume = 0.75 }, module_specification = {}, }, - --- Corpse { type = "corpse", diff --git a/Bio_Industries_2/prototypes/Bio_Farm/item.lua b/Bio_Industries_2/prototypes/Bio_Farm/item.lua index 23f3026..94417fd 100644 --- a/Bio_Industries_2/prototypes/Bio_Farm/item.lua +++ b/Bio_Industries_2/prototypes/Bio_Farm/item.lua @@ -11,12 +11,20 @@ data:extend( { type = "item", name = "bi-seed", - icons = { {icon = ICONPATH .. "bio_seed.png", icon_size = 64, }}, + icon = ICONPATH .. "bio_seed.png", + icon_size = 64, + icons = { + { + icon = ICONPATH .. "bio_seed.png", + icon_size = 64, + } + }, + icon_mipmaps = 4, pictures = { - { size = 64, filename = ICONPATHMIPS.."bio_seed_1.png", scale = 0.25, mipmap_count = 4 }, - { size = 64, filename = ICONPATHMIPS.."bio_seed_2.png", scale = 0.25, mipmap_count = 4 }, - { size = 64, filename = ICONPATHMIPS.."bio_seed_3.png", scale = 0.25, mipmap_count = 4 }, - { size = 64, filename = ICONPATHMIPS.."bio_seed_4.png", scale = 0.25, mipmap_count = 4 } + { size = 64, filename = ICONPATHMIPS.."bio_seed_1.png", scale = 0.25 }, + { size = 64, filename = ICONPATHMIPS.."bio_seed_2.png", scale = 0.25 }, + { size = 64, filename = ICONPATHMIPS.."bio_seed_3.png", scale = 0.25 }, + { size = 64, filename = ICONPATHMIPS.."bio_seed_4.png", scale = 0.25 } }, category = "biofarm-mod-greenhouse", subgroup = "bio-bio-farm", @@ -24,7 +32,7 @@ data:extend( fuel_value = "0.5MJ", fuel_category = "chemical", stack_size= 800, - weight = 10 * kg, + weight = 0.1 * kg, }, ---- Seedling @@ -33,17 +41,25 @@ data:extend( name = "seedling", localised_name = {"entity-name.seedling"}, localised_description = {"entity-description.seedling"}, - icons = { {icon = ICONPATH .. "Seedling.png", icon_size = 64, }}, + icon = ICONPATH .. "Seedling.png", + icon_size = 64, + icons = { + { + icon = ICONPATH .. "Seedling.png", + icon_size = 64, + } + }, + icon_mipmaps = 9, pictures = { - { size = 64, filename = ICONPATHMIPS.."seedling_1.png", scale = 0.25, mipmap_count = 9 }, - { size = 64, filename = ICONPATHMIPS.."seedling_2.png", scale = 0.25, mipmap_count = 9 }, - { size = 64, filename = ICONPATHMIPS.."seedling_3.png", scale = 0.25, mipmap_count = 9 }, - { size = 64, filename = ICONPATHMIPS.."seedling_4.png", scale = 0.25, mipmap_count = 9 }, - { size = 64, filename = ICONPATHMIPS.."seedling_5.png", scale = 0.25, mipmap_count = 9 }, - { size = 64, filename = ICONPATHMIPS.."seedling_6.png", scale = 0.25, mipmap_count = 9 }, - { size = 64, filename = ICONPATHMIPS.."seedling_7.png", scale = 0.25, mipmap_count = 9 }, - { size = 64, filename = ICONPATHMIPS.."seedling_8.png", scale = 0.25, mipmap_count = 9 }, - { size = 64, filename = ICONPATHMIPS.."seedling_9.png", scale = 0.25, mipmap_count = 9 } + { 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]", @@ -51,7 +67,7 @@ data:extend( fuel_value = "0.5MJ", fuel_category = "chemical", stack_size= 400, - weight = 20 * kg, + weight = 0.2 * kg, }, ----Bio Farm @@ -60,7 +76,14 @@ data:extend( name= "bi-bio-farm", localised_name = {"entity-name.bi-bio-farm"}, localised_description = {"entity-description.bi-bio-farm"}, - icons = { {icon = ICONPATH_E .. "bio_Farm_Icon.png", icon_size = 64, }}, + icon = ICONPATH_E .. "bio_Farm_Icon.png", + icon_size = 64, + icons = { + { + icon = ICONPATH_E .. "bio_Farm_Icon.png", + icon_size = 64, + } + }, subgroup = "production-machine", order = "x[bi]-ab[bi-bio-farm]", place_result = "bi-bio-farm", @@ -74,7 +97,14 @@ data:extend( name= "bi-bio-greenhouse", localised_name = {"entity-name.bi-bio-greenhouse"}, localised_description = {"entity-description.bi-bio-greenhouse"}, - icons = { {icon = ICONPATH_E .. "bio_greenhouse.png", icon_size = 64, }}, + icon = ICONPATH_E .. "bio_greenhouse.png", + icon_size = 64, + icons = { + { + icon = ICONPATH_E .. "bio_greenhouse.png", + icon_size = 64, + } + }, subgroup = "production-machine", order = "x[bi]-aa[bi-bio-greenhouse]", place_result = "bi-bio-greenhouse", @@ -86,12 +116,19 @@ data:extend( { type = "item", name = "bi-cokery", - icons = { {icon = ICONPATH_E .. "cokery.png", icon_size = 64, }}, + icon = ICONPATH_E .. "cokery.png", + icon_size = 64, + icons = { + { + icon = ICONPATH_E .. "cokery.png", + icon_size = 64, + } + }, subgroup = "production-machine", order = "x[bi]-b[bi-cokery]", place_result = "bi-cokery", stack_size = 10, - weight = 100 * kg, + weight = 1 * kg, }, --- Stone Crusher @@ -100,7 +137,14 @@ data:extend( name = "bi-stone-crusher", localised_name = {"entity-name.bi-stone-crusher"}, localised_description = {"entity-description.bi-stone-crusher"}, - icons = { {icon = ICONPATH_E .. "stone_crusher.png", icon_size = 64, }}, + icon = ICONPATH_E .. "stone_crusher.png", + icon_size = 64, + icons = { + { + icon = ICONPATH_E .. "stone_crusher.png", + icon_size = 64, + } + }, subgroup = "production-machine", order = "x[bi]-c[bi-stone-crusher]", place_result = "bi-stone-crusher", @@ -112,32 +156,47 @@ data:extend( { type = "item", name = "bi-woodpulp", - icons = { {icon = ICONPATH .. "woodpulp_64.png", icon_size = 64, }}, + icon = ICONPATH .. "woodpulp_64.png", + icon_size = 64, + icons = { + { + icon = ICONPATH .. "woodpulp_64.png", + icon_size = 64, + } + }, + icon_mipmaps = 4, pictures = { - { size = 64, filename = ICONPATHMIPS.."woodpulp_1.png", scale = 0.2, mipmap_count = 4 }, - { size = 64, filename = ICONPATHMIPS.."woodpulp_2.png", scale = 0.2, mipmap_count = 4 }, - { size = 64, filename = ICONPATHMIPS.."woodpulp_3.png", scale = 0.2, mipmap_count = 4 }, - { size = 64, filename = ICONPATHMIPS.."woodpulp_4.png", scale = 0.2, mipmap_count = 4 } + { 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 = 15 * kg, + weight = 0.15 * kg, }, --- Wood Bricks { type = "item", name = "wood-bricks", - icons = { {icon = ICONPATH .. "Fuel_Brick.png", icon_size = 64, }}, + 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-woodbrick]", fuel_category = "chemical", fuel_value = "160MJ", stack_size = 200, - weight = 40 * kg, + weight = 4 * kg, }, @@ -145,43 +204,66 @@ data:extend( { type = "item", name = "bi-ash", - icons = { {icon = ICONPATH .. "ash.png", icon_size = 64, }}, + icon = ICONPATH .. "ash.png", + icon_size = 64, + icons = { + { + icon = ICONPATH .. "ash.png", + icon_size = 64, + } + }, + icon_mipmaps = 4, pictures = { - { size = 64, filename = ICONPATHMIPS.."ash_1.png", scale = 0.2, mipmap_count = 4 }, - { size = 64, filename = ICONPATHMIPS.."ash_2.png", scale = 0.2, mipmap_count = 4 }, - { size = 64, filename = ICONPATHMIPS.."ash_3.png", scale = 0.2, mipmap_count = 4 }, - { size = 64, filename = ICONPATHMIPS.."ash_4.png", scale = 0.2, mipmap_count = 4 } + { 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 = 12 * kg, + weight = 0.125 * kg, }, --- Charcoal { type = "item", name = "wood-charcoal", - icons = { {icon = ICONPATH .. "charcoal.png", icon_size = 64, }}, + icon = ICONPATH .. "charcoal.png", + icon_size = 64, + icons = { + { + icon = ICONPATH .. "charcoal.png", + icon_size = 64, + } + }, + icon_mipmaps = 4, pictures = { - { size = 64, filename = ICONPATHMIPS.."charcoal_1.png", scale = 0.2, mipmap_count = 4 }, - { size = 64, filename = ICONPATHMIPS.."charcoal_2.png", scale = 0.2, mipmap_count = 4 }, - { size = 64, filename = ICONPATHMIPS.."charcoal_3.png", scale = 0.2, mipmap_count = 4 }, - { size = 64, filename = ICONPATHMIPS.."charcoal_4.png", scale = 0.2, mipmap_count = 4 } + { 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 = 10 * kg, + weight = 1 * kg, }, --- Coke Coal / Pellet Coke for Angels { type = "item", name = "pellet-coke", - icons = { {icon = ICONPATH .. "coke-coal.png", icon_size = 64, }}, + icon = ICONPATH .. "coke-coal.png", + icon_size = 64, + icons = { + { + icon = ICONPATH .. "coke-coal.png", + icon_size = 64, + } + }, fuel_value = "28MJ", fuel_category = "chemical", fuel_acceleration_multiplier = 1.2, @@ -189,7 +271,7 @@ data:extend( subgroup = "raw-material", order = "a[bi]-a-g[bi-coke-coal]", stack_size = 400, - weight = 25 * kg, + weight = 2.5 * kg, }, @@ -197,17 +279,25 @@ data:extend( { type = "item", name = "stone-crushed", - icons = { {icon = ICONPATH .. "crushed-stone.png", icon_size = 64, }}, + icon = ICONPATH .. "crushed-stone.png", + icon_size = 64, + icons = { + { + icon = ICONPATH .. "crushed-stone.png", + icon_size = 64, + } + }, + icon_mipmaps = 4, pictures = { - { size = 64, filename = ICONPATHMIPS.."crush_1.png", scale = 0.2, mipmap_count = 4 }, - { size = 64, filename = ICONPATHMIPS.."crush_2.png", scale = 0.2, mipmap_count = 4 }, - { size = 64, filename = ICONPATHMIPS.."crush_3.png", scale = 0.2, mipmap_count = 4 }, - { size = 64, filename = ICONPATHMIPS.."crush_4.png", scale = 0.2, mipmap_count = 4 } + { 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 = 20 * kg, + weight = 1 * kg, }, @@ -215,14 +305,21 @@ data:extend( { type = "ammo", name = "bi-seed-bomb-basic", - icons = { {icon = ICONPATH_W .. "seed_bomb_icon_b.png", icon_size = 64, }}, + icon = ICONPATH_W .. "seed_bomb_icon_b.png", + icon_size = 64, + icons = { + { + icon = ICONPATH_W .. "seed_bomb_icon_b.png", + icon_size = 64, + } + }, ammo_category = "rocket", ammo_type = { - range_modifier = 3, - cooldown_modifier = 3, - target_type = "position", - category = "rocket", - action = { + range_modifier = 3, + cooldown_modifier = 3, + target_type = "position", + category = "rocket", + action = { type = "direct", action_delivery = { type = "projectile", @@ -234,7 +331,7 @@ data:extend( subgroup = "ammo", order = "a[rocket-launcher]-x[seed-bomb]-a", stack_size = 10, - weight = 50 * kg, + weight = 5 * kg, }, @@ -242,14 +339,21 @@ data:extend( { type = "ammo", name = "bi-seed-bomb-standard", - icons = { {icon = ICONPATH_W .. "seed_bomb_icon_s.png", icon_size = 64, }}, + icon = ICONPATH_W .. "seed_bomb_icon_s.png", + icon_size = 64, + icons = { + { + icon = ICONPATH_W .. "seed_bomb_icon_s.png", + icon_size = 64, + } + }, ammo_category = "rocket", ammo_type = { - range_modifier = 4, - cooldown_modifier = 3, - target_type = "position", - category = "rocket", - action = { + range_modifier = 3, + cooldown_modifier = 3, + target_type = "position", + category = "rocket", + action = { type = "direct", action_delivery = { type = "projectile", @@ -261,7 +365,7 @@ data:extend( subgroup = "ammo", order = "a[rocket-launcher]-x[seed-bomb]-b", stack_size = 10, - weight = 50 * kg, + weight = 5 * kg, }, @@ -269,14 +373,21 @@ data:extend( { type = "ammo", name = "bi-seed-bomb-advanced", - icons = { {icon = ICONPATH_W .. "seed_bomb_icon_a.png", icon_size = 64, }}, + icon = ICONPATH_W .. "seed_bomb_icon_a.png", + icon_size = 64, + icons = { + { + icon = ICONPATH_W .. "seed_bomb_icon_a.png", + icon_size = 64, + } + }, ammo_category = "rocket", ammo_type = { - range_modifier = 5, - cooldown_modifier = 3, - target_type = "position", - category = "rocket", - action = { + range_modifier = 3, + cooldown_modifier = 3, + target_type = "position", + category = "rocket", + action = { type = "direct", action_delivery = { type = "projectile", @@ -288,26 +399,40 @@ data:extend( subgroup = "ammo", order = "a[rocket-launcher]-x[seed-bomb]-c", stack_size = 10, - weight = 50 * kg, + weight = 5 * kg, }, --- Arboretum (Entity) { type= "item", name= "bi-arboretum-area", - icons = { {icon = ICONPATH_E .. "arboretum_Icon.png", icon_size = 64, }}, + icon = ICONPATH_E .. "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]", place_result = "bi-arboretum-area", stack_size= 10, - weight = 500 * kg, + weight = 400 * kg, }, --- Arboretum Hidden Recipe { type = "item", name = "bi-arboretum-r1", - icons = { {icon = ICONPATH .. "Seedling_b.png", icon_size = 64, }}, + icon = ICONPATH .. "Seedling_b.png", + icon_size = 64, + icons = { + { + icon = ICONPATH .. "Seedling_b.png", + icon_size = 64, + } + }, hidden = true, subgroup = "terrain", order = "bi-arboretum-r1", @@ -318,7 +443,14 @@ data:extend( { type = "item", name = "bi-arboretum-r2", - icons = { {icon = ICONPATH .. "bi_change_1.png", icon_size = 64, }}, + icon = ICONPATH .. "bi_change_1.png", + icon_size = 64, + icons = { + { + icon = ICONPATH .. "bi_change_1.png", + icon_size = 64, + } + }, hidden = true, subgroup = "terrain", order = "bi-arboretum-r2", @@ -329,7 +461,14 @@ data:extend( { type = "item", name = "bi-arboretum-r3", - icons = { {icon = ICONPATH .. "bi_change_2.png", icon_size = 64, }}, + icon = ICONPATH .. "bi_change_2.png", + icon_size = 64, + icons = { + { + icon = ICONPATH .. "bi_change_2.png", + icon_size = 64, + } + }, hidden = true, subgroup = "terrain", order = "bi-arboretum-r3", @@ -340,7 +479,14 @@ data:extend( { type = "item", name = "bi-arboretum-r4", - icons = { {icon = ICONPATH .. "bi_change_plant_1.png", icon_size = 64, }}, + icon = ICONPATH .. "bi_change_plant_1.png", + icon_size = 64, + icons = { + { + icon = ICONPATH .. "bi_change_plant_1.png", + icon_size = 64, + } + }, hidden = true, subgroup = "terrain", order = "bi-arboretum-r4", @@ -351,8 +497,15 @@ data:extend( { type = "item", name = "bi-arboretum-r5", - icons = { {icon = ICONPATH .. "bi_change_plant_2.png", icon_size = 64, }}, - hidden = true, + icon = ICONPATH .. "bi_change_plant_2.png", + icon_size = 64, + icons = { + { + icon = ICONPATH .. "bi_change_plant_2.png", + icon_size = 64, + } + }, + hidden = true, subgroup = "terrain", order = "bi-arboretum-r5", stack_size = 1 @@ -366,22 +519,36 @@ data:extend( { type = "item", name = "fertilizer", - icons = { {icon = ICONPATH .. "fertilizer.png", icon_size = 64, }}, + icon = ICONPATH .. "fertilizer.png", + icon_size = 64, + icons = { + { + icon = ICONPATH .. "fertilizer.png", + icon_size = 64, + } + }, subgroup = "intermediate-product", order = "b[fertilizer]", stack_size = 200, - weight = 40 * kg, + weight = 5 * kg, }, --- Adv fertilizer { type = "item", name = "bi-adv-fertilizer", - icons = { {icon = ICONPATH .. "fertilizer_advanced.png", icon_size = 64, }}, + icon = ICONPATH .. "fertilizer_advanced.png", + icon_size = 64, + icons = { + { + icon = ICONPATH .. "fertilizer_advanced.png", + icon_size = 64, + } + }, subgroup = "intermediate-product", order = "b[fertilizer]-b[bi-adv-fertilizer]", stack_size = 200, - weight = 40 * kg, + weight = 5 * kg, }, }) diff --git a/Bio_Industries_2/prototypes/Bio_Farm/pipeConnectors.lua b/Bio_Industries_2/prototypes/Bio_Farm/pipeConnectors.lua new file mode 100644 index 0000000..92a79bd --- /dev/null +++ b/Bio_Industries_2/prototypes/Bio_Farm/pipeConnectors.lua @@ -0,0 +1,342 @@ +local BioInd = require('common')('Bio_Industries_2') + +local ICONPATH = BioInd.modRoot .. "/graphics/icons/" +local ENTITYPATH_BIO = "__Bio_Industries_2__/graphics/entities/" + + +function assembler2pipepicturesCokery() + return + { + north = { + filename = ICONPATH .. "empty.png", + priority = "extra-high", + width = 1, + height = 1, + shift = util.by_pixel(2.25, 13.5), + scale = 0.5, + }, + east = { + filename = "__base__/graphics/entity/assembling-machine-2/assembling-machine-2-pipe-E.png", + priority = "extra-high", + width = 42, + height = 76, + shift = util.by_pixel(-24.5, 1), + scale = 0.5, + }, + south = { + filename = ICONPATH .. "empty.png", + priority = "extra-high", + width = 1, + height = 1, + shift = util.by_pixel(0, -31.25), + scale = 0.5, + }, + west = { + filename = "__base__/graphics/entity/assembling-machine-2/assembling-machine-2-pipe-W.png", + priority = "extra-high", + width = 39, + height = 73, + shift = util.by_pixel(25.75, 1.25), + scale = 0.5, + } + } +end + + +function assembler2pipepicturesCokery() + return + { + north = { + filename = ICONPATH .. "empty.png", + priority = "extra-high", + width = 1, + height = 1, + shift = {0.09375, 0.4375} + }, + east = { + filename = "__base__/graphics/entity/assembling-machine-2/pipe-east.png", + priority = "extra-high", + width = 41, + height = 40, + shift = {-0.71875, 0} + }, + south = { + filename = ICONPATH .. "empty.png", + priority = "extra-high", + width = 1, + height = 1, + shift = {0.0625, -1} + }, + west = { + filename = "__base__/graphics/entity/assembling-machine-2/pipe-west.png", + priority = "extra-high", + width = 41, + height = 40, + shift = {0.78125, 0.03125} + } + } +end + + +function pipecoverspicturesCokery() + return { + north = { + filename = ICONPATH .. "empty.png", + priority = "extra-high", + width = 1, + height = 1, + scale = 0.5 + }, + east = { + filename = "__base__/graphics/entity/pipe-covers/hr-pipe-cover-east.png", + priority = "extra-high", + width = 128, + height = 128, + scale = 0.5 + }, + south = { + filename = ICONPATH .. "empty.png", + priority = "extra-high", + width = 1, + height = 1, + scale = 0.5 + }, + west = { + filename = "__base__/graphics/entity/pipe-covers/hr-pipe-cover-west.png", + priority = "extra-high", + width = 128, + height = 128, + scale = 0.5 + } + } +end + + +function assembler2pipepicturesBioreactor() + return + { + north = { + filename = ICONPATH .. "empty.png", + priority = "extra-high", + width = 71, + height = 38, + shift = util.by_pixel(2.25, 13.5), + scale = 0.5, + }, + east = { + filename = "__base__/graphics/entity/assembling-machine-2/assembling-machine-2-pipe-E.png", + priority = "extra-high", + width = 42, + height = 76, + shift = util.by_pixel(-24.5, 1), + scale = 0.5, + }, + south = { + filename = "__base__/graphics/entity/assembling-machine-2/assembling-machine-2-pipe-S.png", + priority = "extra-high", + width = 88, + height = 61, + shift = util.by_pixel(0, -31.25), + scale = 0.5, + }, + west = { + filename = "__base__/graphics/entity/assembling-machine-2/assembling-machine-2-pipe-W.png", + priority = "extra-high", + width = 39, + height = 73, + shift = util.by_pixel(25.75, 1.25), + scale = 0.5, + } + } +end + + + +function pipecoverspicturesBioreactor() + return { + north = { + filename = ICONPATH .. "empty.png", + priority = "extra-high", + width = 1, + height = 1, + scale = 0.5 + }, + east = { + filename = "__base__/graphics/entity/pipe-covers/hr-pipe-cover-east.png", + priority = "extra-high", + width = 128, + height = 128, + scale = 0.5 + }, + south = { + filename = "__base__/graphics/entity/pipe-covers/hr-pipe-cover-south.png", + priority = "extra-high", + width = 128, + height = 128, + scale = 0.5 + }, + west = { + filename = "__base__/graphics/entity/pipe-covers/hr-pipe-cover-west.png", + priority = "extra-high", + width = 128, + height = 128, + scale = 0.5 + } + } + +end + + +function BioFarm_Pipe_Connectors_Left() + return + { + north = { + filename = ENTITYPATH_BIO .. "bio_farm/biofarm_pipes/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", + 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", + 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", + priority = "extra-high", + width = 16, + height = 51, + shift = {0.5, 0.5}, + } + } +end + + +function bio_farm_pipe_pictures() + return + { + north = { + filename = "__base__/graphics/entity/assembling-machine-3/hr-assembling-machine-3-pipe-N.png", + priority = "extra-high", + width = 71, + height = 38, + shift = util.by_pixel(2.25, 13.5), + scale = 0.5, + }, + east = { + filename = ICONPATH .. "empty.png", + priority = "extra-high", + width = 1, + height = 1, + }, + south = { + filename = "__base__/graphics/entity/assembling-machine-3/hr-assembling-machine-3-pipe-S.png", + priority = "extra-high", + width = 88, + height = 61, + shift = util.by_pixel(0, -31.25), + scale = 0.5, + }, + west = { + filename = ICONPATH .. "empty.png", + priority = "extra-high", + width = 1, + height = 1, + } + } +end + +bio_farm_pipe_covers_pictures = function() + return { + north = { + layers = { + { + filename = "__base__/graphics/entity/pipe-covers/hr-pipe-cover-north.png", + priority = "extra-high", + width = 128, + height = 128, + scale = 0.5 + }, + { + filename = "__base__/graphics/entity/pipe-covers/hr-pipe-cover-north-shadow.png", + priority = "extra-high", + width = 128, + height = 128, + scale = 0.5, + draw_as_shadow = true + }, + }, + }, + east = { + layers = { + { + filename = "__base__/graphics/entity/pipe-covers/hr-pipe-cover-east.png", + priority = "extra-high", + width = 128, + height = 128, + shift = {-0.22, 0}, + scale = 0.5 + }, + { + filename = "__base__/graphics/entity/pipe-covers/hr-pipe-cover-east-shadow.png", + priority = "extra-high", + width = 128, + height = 128, + scale = 0.5, + shift = {-0.22, 0}, + draw_as_shadow = true + }, + }, + }, + south = { + layers = { + { + filename = "__base__/graphics/entity/pipe-covers/hr-pipe-cover-south.png", + priority = "extra-high", + width = 128, + height = 128, + scale = 0.5 + }, + { + filename = "__base__/graphics/entity/pipe-covers/hr-pipe-cover-south-shadow.png", + priority = "extra-high", + width = 128, + height = 128, + scale = 0.5, + draw_as_shadow = true + }, + }, + }, + west = { + layers = { + { + filename = "__base__/graphics/entity/pipe-covers/hr-pipe-cover-west.png", + priority = "extra-high", + width = 128, + height = 128, + shift = {0.2, 0}, + scale = 0.5 + }, + { + filename = "__base__/graphics/entity/pipe-covers/hr-pipe-cover-west-shadow.png", + priority = "extra-high", + width = 128, + height = 128, + scale = 0.5, + shift = {0.2, 0}, + draw_as_shadow = true + }, + }, + } + } +end \ No newline at end of file diff --git a/Bio_Industries_2/prototypes/Bio_Fuel/entities.lua b/Bio_Industries_2/prototypes/Bio_Fuel/entities.lua index b35cb7b..1cb969a 100644 --- a/Bio_Industries_2/prototypes/Bio_Fuel/entities.lua +++ b/Bio_Industries_2/prototypes/Bio_Fuel/entities.lua @@ -8,63 +8,26 @@ local REMNANTSPATH = BioInd.modRoot .. "/graphics/entities/remnants/" require("util") ---require("prototypes.Bio_Fuel.pipeConnectors") +require("prototypes.Bio_Fuel.pipeConnectors") +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! - - ------------------------------------------------------------------------------------- --- Bio reactor -- ------------------------------------------------------------------------------------- --- Pipes -function assembler2pipepicturesBioreactor() - return { - north = { - filename = "__core__/graphics/empty.png", - priority = "low", - width = 1, - height = 1, - shift = util.by_pixel(2.5, 14), - }, - east = { - filename = ENTITYPATH_BIO .. "bio_reactor/pipes/bioreactor-pipe-e.png", - priority = "low", - width = 42, - height = 76, - shift = util.by_pixel(-24.5, 1), - scale = 0.5, - }, - south = { - filename = ENTITYPATH_BIO .. "bio_reactor/pipes/bioreactor-pipe-s.png", - priority = "low", - width = 88, - height = 61, - shift = util.by_pixel(0, -31.25), - scale = 0.5, - }, - west = { - filename = ENTITYPATH_BIO .. "bio_reactor/pipes/bioreactor-pipe-w.png", - priority = "low", - width = 39, - height = 73, - shift = util.by_pixel(25.75, 1.25), - scale = 0.5, - }, - } -end - - - - data:extend({ -- BIO_REACTOR { type = "assembling-machine", name = "bi-bio-reactor", - icons = {{ icon = ICONPATH_E .. "bioreactor.png", icon_size = 64 }}, + icon = ICONPATH_E .. "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, @@ -72,121 +35,105 @@ data:extend({ minable = { hardness = 0.2, mining_time = 0.5, result = "bi-bio-reactor" }, max_health = 100, corpse = "bi-bio-reactor-remnant", - fluid_boxes = { - { - production_type = "input", - pipe_picture = assembler2pipepicturesBioreactor(), - pipe_covers = pipecoverspictures(), - volume = 1000, - base_area = 10, - base_level = -1, - pipe_connections = { { flow_direction = "input", direction = defines.direction.north, position = { 0, -1 } } }, - -- pipe_connections = {{ type = "input", position = {0, -2} }}, - render_layer = "higher-object-under", - }, - { - production_type = "input", - pipe_picture = assembler2pipepicturesBioreactor(), - pipe_covers = pipecoverspictures(), - volume = 1000, - base_area = 10, - base_level = -1, - pipe_connections = { { flow_direction = "input", direction = defines.direction.east, position = { 1, 0 } } }, - -- pipe_connections = {{ type = "input", position = {2, 0} }}, - render_layer = "higher-object-under", - }, - { - production_type = "input", - pipe_picture = assembler2pipepicturesBioreactor(), - pipe_covers = pipecoverspictures(), - volume = 1000, - base_area = 10, - base_level = -1, - pipe_connections = { { flow_direction = "input", direction = defines.direction.south, position = { 0, 1 } } }, - --pipe_connections = {{ type = "input", position = {0, 2} }}, - render_layer = "higher-object-under", - }, - { - production_type = "output", - pipe_picture = assembler2pipepicturesBioreactor(), - pipe_covers = pipecoverspictures(), - volume = 1000, - base_area = 10, - base_level = 1, - pipe_connections = { { flow_direction = "output", direction = defines.direction.west, position = { -1, -1 } } }, - --pipe_connections = {{ type = "output", position = {-2, -1} }}, - render_layer = "higher-object-under", - }, - { - production_type = "output", - pipe_picture = assembler2pipepicturesBioreactor(), - pipe_covers = pipecoverspictures(), - volume = 1000, - base_area = 10, - base_level = 1, - pipe_connections = { { flow_direction = "output", direction = defines.direction.west, position = { -1, 1 } } }, - --pipe_connections = {{ type = "output", position = {-2, 1} }}, - render_layer = "higher-object-under", - }, - - }, + 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 = { - -- Base animation (idle state) - Factorio 2.0 syntax - 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 frame count - shift = { 0, -0.125 }, -- Consistent shift (converted from -0.5 to tiles) - scale = 0.5 - }, - { - filename = ENTITYPATH_BIO .. "bio_reactor/bioreactor_shadow.png", - width = 270, - height = 256, - frame_count = 1, - repeat_count = 18, -- match working animation frame count - draw_as_shadow = true, - shift = { 0.5, -0.125 }, -- Consistent shift with main sprite - scale = 0.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 }, - - -- Working visualizations - triggers when recipe is active - working_visualisations = { - { - -- Main working animation - 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.125 }, -- FIXED: Same shift as idle animation - scale = 0.5 - } - } - }, - -- This ensures the working animation plays over the idle animation - always_draw = false, -- Only draw when working - apply_recipe_tint = "primary", -- Optional: tint based on recipe - } + { + 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" @@ -246,16 +193,21 @@ 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" }, - icons = { {icon = ICONPATH_E .. "bio_boiler.png", icon_size = 64,} }, + 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 = "boiler-remnants", - dying_explosion = "boiler-explosion", - impact_category = "metal-large", + corpse = "small-remnants", mode = "output-to-separate-pipe", resistances = { { @@ -333,6 +285,7 @@ if BI.Settings.BI_Bio_Fuel then height = 221, shift = util.by_pixel(-1.25, 5.25), scale = 0.5, + --tint = bio_boiler_tint, }, { filename = ENTITYPATH .. "boiler-N-shadow.png", @@ -356,6 +309,7 @@ if BI.Settings.BI_Bio_Fuel then height = 301, shift = util.by_pixel(-3, 1.25), scale = 0.5, + --tint = bio_boiler_tint, }, { filename = ENTITYPATH .. "boiler-E-shadow.png", @@ -379,6 +333,7 @@ if BI.Settings.BI_Bio_Fuel then height = 192, shift = util.by_pixel(4, 13), scale = 0.5, + --tint = bio_boiler_tint, }, { filename = ENTITYPATH .. "boiler-S-shadow.png", @@ -402,6 +357,7 @@ if BI.Settings.BI_Bio_Fuel then height = 273, shift = util.by_pixel(1.5, 7.75), scale = 0.5, + --tint = bio_boiler_tint, }, { filename = ENTITYPATH .. "boiler-W-shadow.png", @@ -423,6 +379,7 @@ if BI.Settings.BI_Bio_Fuel then height = 36, shift = util.by_pixel(33.5, -13.5), scale = 0.5, + tint = bio_boiler_tint, }, }, fire_flicker_enabled = true, diff --git a/Bio_Industries_2/prototypes/Bio_Fuel/pipeConnectors.lua b/Bio_Industries_2/prototypes/Bio_Fuel/pipeConnectors.lua new file mode 100644 index 0000000..57f06b6 --- /dev/null +++ b/Bio_Industries_2/prototypes/Bio_Fuel/pipeConnectors.lua @@ -0,0 +1,76 @@ +local BioInd = require('common')('Bio_Industries_2') + +local ICONPATH = BioInd.modRoot .. "/graphics/icons/" +local ENTITYPATH = "__base__/graphics/entity/assembling-machine-2/" +local PIPEPATH = "__base__/graphics/entity/pipe-covers/" + +function assembler2pipepicturesBioreactor() + return { + north = { + filename = ICONPATH .. "empty.png", + priority = "extra-high", + width = 1, + height = 1, + shift = util.by_pixel(2.25, 13.5), + scale = 0.5, + }, + east = { + filename = ENTITYPATH .. "assembling-machine-2-pipe-E.png", + priority = "extra-high", + width = 42, + height = 76, + shift = util.by_pixel(-24.5, 1), + scale = 0.5, + }, + south = { + filename = ENTITYPATH .. "assembling-machine-2-pipe-S.png", + priority = "extra-high", + width = 88, + height = 61, + shift = util.by_pixel(0, -31.25), + scale = 0.5, + }, + west = { + filename = ENTITYPATH .. "assembling-machine-2-pipe-W.png", + priority = "extra-high", + width = 39, + height = 73, + shift = util.by_pixel(25.75, 1.25), + scale = 0.5, + } + } +end + + +function pipecoverspicturesBioreactor() + return { + north = { + filename = ICONPATH .. "empty.png", + priority = "extra-high", + width = 1, + height = 1, + scale = 0.5 + }, + east = { + filename = PIPEPATH .. "pipe-cover-east.png", + priority = "extra-high", + width = 128, + height = 128, + scale = 0.5 + }, + south = { + filename = PIPEPATH .. "pipe-cover-south.png", + priority = "extra-high", + width = 128, + height = 128, + scale = 0.5 + }, + west = { + filename = PIPEPATH .. "pipe-cover-west.png", + priority = "extra-high", + width = 128, + height = 128, + scale = 0.5 + } + } +end diff --git a/Bio_Industries_2/prototypes/Bio_Fuel/recipe.lua b/Bio_Industries_2/prototypes/Bio_Fuel/recipe.lua index 13f368a..22b0c67 100644 --- a/Bio_Industries_2/prototypes/Bio_Fuel/recipe.lua +++ b/Bio_Industries_2/prototypes/Bio_Fuel/recipe.lua @@ -6,7 +6,6 @@ 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 -- BI.Settings.BI_Bio_Fuel has been turned off! - data:extend({ -- BIO Reactor (ENTITY)-- { @@ -14,7 +13,14 @@ data:extend({ name = "bi-bio-reactor", localised_name = {"entity-name.bi-bio-reactor"}, localised_description = {"entity-description.bi-bio-reactor"}, - icons = { {icon = ICONPATH_E .. "bioreactor.png", icon_size = 64, } }, + icon = ICONPATH_E .. "bioreactor.png", + icon_size = 64, + icons = { + { + icon = ICONPATH_E .. "bioreactor.png", + icon_size = 64, + } + }, enabled = false, energy_required = 20, ingredients = { @@ -30,14 +36,20 @@ data:extend({ subgroup = "bio-bio-fuel-fluid", order = "a", }, - -- BIOMASS 1 -- { type = "recipe", name = "bi-biomass-1", localised_name = {"recipe-name.bi-biomass-1"}, localised_description = {"recipe-description.bi-biomass-1"}, - icons = { {icon = ICONPATH .. "biomass_1.png", icon_size = 64, } }, + icon = ICONPATH .. "biomass_1.png", + icon_size = 64, + icons = { + { + icon = ICONPATH .. "biomass_1.png", + icon_size = 64, + } + }, category = "biofarm-mod-bioreactor", energy_required = 10, ingredients = { @@ -65,7 +77,14 @@ if BI.Settings.BI_Bio_Fuel then { type = "recipe", name = "bi-basic-gas-processing", - icons = { {icon = ICONPATH .. "bi_basic_gas_processing.png", icon_size = 64, } }, + icon = ICONPATH .. "bi_basic_gas_processing.png", + icon_size = 64, + icons = { + { + icon = ICONPATH .. "bi_basic_gas_processing.png", + icon_size = 64, + } + }, category = "chemistry", enabled = false, energy_required = 5, @@ -93,7 +112,14 @@ 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"}, - icons = { {icon = ICONPATH_E .. "bio_boiler.png", icon_size = 64, } }, + icon = ICONPATH_E .. "bio_boiler.png", + icon_size = 64, + icons = { + { + icon = ICONPATH_E .. "bio_boiler.png", + icon_size = 64, + } + }, enabled = false, energy_required = 10, ingredients = { @@ -117,7 +143,14 @@ if BI.Settings.BI_Bio_Fuel then name = "bi-cellulose-1", localised_name = {"recipe-name.bi-cellulose-1"}, localised_description = {"recipe-description.bi-cellulose-1"}, - icons = { {icon = ICONPATH .. "cellulose.png", icon_size = 64, } }, + icon = ICONPATH .. "cellulose.png", + icon_size = 64, + icons = { + { + icon = ICONPATH .. "cellulose.png", + icon_size = 64, + } + }, category = "chemistry", energy_required = 20, ingredients = { @@ -142,7 +175,14 @@ if BI.Settings.BI_Bio_Fuel then name = "bi-cellulose-2", localised_name = {"recipe-name.bi-cellulose-2"}, localised_description = {"recipe-description.bi-cellulose-2"}, - icons = { {icon = ICONPATH .. "cellulose_2.png", icon_size = 64, } }, + icon = ICONPATH .. "cellulose_2.png", + icon_size = 64, + icons = { + { + icon = ICONPATH .. "cellulose_2.png", + icon_size = 64, + } + }, category = "chemistry", energy_required = 5, ingredients = { @@ -171,12 +211,23 @@ if BI.Settings.BI_Bio_Fuel then name = "bi-plastic-1", localised_name = {"recipe-name.bi-plastic-1"}, localised_description = {"recipe-description.bi-plastic-1"}, - icons = { {icon = ICONPATH .. "plastic_bar_1.png", icon_size = 64, } }, + icon = ICONPATH .. "plastic_bar_1.png", + icon_size = 64, + icons = { + { + icon = ICONPATH .. "plastic_bar_1.png", + icon_size = 64, + } + }, category = "chemistry", + --subgroup = "raw-material", energy_required = 1, ingredients = { {type = "fluid", name = "steam", amount = 10}, - {type = "item", name = "bi-woodpulp", amount = 20}, + -- Let's use woodpulp instead of wood for the new version! Not changing this + -- for 0.18.34/1.1.4 to avoid an additional (potentially factory-breaking) + -- change shortly before the new release will change so many things anyway! + {type = "item", name = "wood", amount = 10}, {type = "fluid", name = "light-oil", amount = 20}, }, results = { @@ -189,7 +240,7 @@ if BI.Settings.BI_Bio_Fuel then allow_productivity = true, subgroup = "bio-bio-fuel-solid", order = "g[plastic-bar-1]", - -- This is a custom property for use by "Krastorio 2" (it will change + -- This is a custom property for use by "Krastorio 2" (it will change -- ingredients/results; used for wood/wood pulp) mod = "Bio_Industries_2", }, @@ -200,7 +251,14 @@ if BI.Settings.BI_Bio_Fuel then name = "bi-plastic-2", localised_name = {"recipe-name.bi-plastic-2"}, localised_description = {"recipe-description.bi-plastic-2"}, - icons = { {icon = ICONPATH .. "plastic_bar_2.png", icon_size = 64, } }, + icon = ICONPATH .. "plastic_bar_2.png", + icon_size = 64, + icons = { + { + icon = ICONPATH .. "plastic_bar_2.png", + icon_size = 64, + } + }, category = "chemistry", energy_required = 1, ingredients = { @@ -225,7 +283,14 @@ if BI.Settings.BI_Bio_Fuel then name = "bi-biomass-2", localised_name = {"recipe-name.bi-biomass-2"}, localised_description = {"recipe-description.bi-biomass-2"}, - icons = { {icon = ICONPATH .. "biomass_2.png", icon_size = 64, } }, + icon = ICONPATH .. "biomass_2.png", + icon_size = 64, + icons = { + { + icon = ICONPATH .. "biomass_2.png", + icon_size = 64, + } + }, category = "biofarm-mod-bioreactor", energy_required = 60, ingredients = { @@ -251,7 +316,14 @@ if BI.Settings.BI_Bio_Fuel then name = "bi-biomass-3", localised_name = {"recipe-name.bi-biomass-3"}, localised_description = {"recipe-description.bi-biomass-3"}, - icons = { {icon = ICONPATH .. "biomass_3.png", icon_size = 64, } }, + icon = ICONPATH .. "biomass_3.png", + icon_size = 64, + icons = { + { + icon = ICONPATH .. "biomass_3.png", + icon_size = 64, + } + }, category = "biofarm-mod-bioreactor", energy_required = 10, ingredients = { @@ -278,7 +350,14 @@ if BI.Settings.BI_Bio_Fuel then name = "bi-biomass-conversion-1", localised_name = {"recipe-name.bi-biomass-conversion-1"}, localised_description = {"recipe-description.bi-biomass-conversion-1"}, - icons = { {icon = ICONPATH .. "bio_conversion_1.png", icon_size = 64, } }, + icon = ICONPATH .. "bio_conversion_1.png", + icon_size = 64, + icons = { + { + icon = ICONPATH .. "bio_conversion_1.png", + icon_size = 64, + } + }, category = "oil-processing", enabled = false, always_show_made_in = true, @@ -303,7 +382,14 @@ if BI.Settings.BI_Bio_Fuel then name = "bi-biomass-conversion-2", localised_name = {"recipe-name.bi-biomass-conversion-2"}, localised_description = {"recipe-description.bi-biomass-conversion-2"}, - icons = { {icon = ICONPATH .. "bio_conversion_2.png", icon_size = 64, } }, + icon = ICONPATH .. "bio_conversion_2.png", + icon_size = 64, + icons = { + { + icon = ICONPATH .. "bio_conversion_2.png", + icon_size = 64, + } + }, category = "oil-processing", enabled = false, always_show_made_in = true, @@ -328,7 +414,14 @@ if BI.Settings.BI_Bio_Fuel then name = "bi-biomass-conversion-3", localised_name = {"recipe-name.bi-biomass-conversion-3"}, localised_description = {"recipe-description.bi-biomass-conversion-3"}, - icons = { {icon = ICONPATH .. "bio_conversion_3.png", icon_size = 64, } }, + icon = ICONPATH .. "bio_conversion_3.png", + icon_size = 64, + icons = { + { + icon = ICONPATH .. "bio_conversion_3.png", + icon_size = 64, + } + }, category = "oil-processing", enabled = false, always_show_made_in = true, @@ -358,7 +451,14 @@ if BI.Settings.BI_Bio_Fuel then name = "bi-biomass-conversion-4", localised_name = {"recipe-name.bi-biomass-conversion-4"}, localised_description = {"recipe-description.bi-biomass-conversion-4"}, - icons = { {icon = ICONPATH .. "bio_conversion_4.png", icon_size = 64, } }, + icon = ICONPATH .. "bio_conversion_4.png", + icon_size = 64, + icons = { + { + icon = ICONPATH .. "bio_conversion_4.png", + icon_size = 64, + } + }, category = "oil-processing", enabled = false, always_show_made_in = true, @@ -388,7 +488,16 @@ if BI.Settings.BI_Bio_Fuel then { type = "recipe", name = "bi-battery", - icons = { {icon = ICONPATH .. "bio_battery.png", icon_size = 64, } }, + icon = ICONPATH .. "bio_battery.png", + icon_size = 64, + icon_mipmaps = 4, + icons = { + { + icon = ICONPATH .. "bio_battery.png", + icon_size = 64, + icon_mipmaps = 4, + } + }, category = "chemistry", energy_required = 5, ingredients = { @@ -418,7 +527,14 @@ if BI.Settings.BI_Bio_Fuel then { type = "recipe", name = "bi-acid", - icons = { {icon = ICONPATH .. "bio_acid.png", icon_size = 64, } }, + icon = ICONPATH .. "bio_acid.png", + icon_size = 64, + icons = { + { + icon = ICONPATH .. "bio_acid.png", + icon_size = 64, + } + }, category = "chemistry", energy_required = 10, ingredients = { @@ -441,13 +557,20 @@ if BI.Settings.BI_Bio_Fuel then }, subgroup = "bio-bio-fuel-other", order = "a", - }, + }, -- Sulfuric acid to Sulfur -- { type = "recipe", name = "bi-sulfur", - icons = { {icon = ICONPATH .. "bio_sulfur.png", icon_size = 64, } }, + icon = ICONPATH .. "bio_sulfur.png", + icon_size = 64, + icons = { + { + icon = ICONPATH .. "bio_sulfur.png", + icon_size = 64, + } + }, category = "chemistry", energy_required = 10, ingredients = { @@ -464,13 +587,20 @@ if BI.Settings.BI_Bio_Fuel then allow_productivity = true, subgroup = "bio-bio-fuel-solid", order = "i1", - }, + }, -- Sulfuric acid to Sulfur --IF ANGELS INSTALLED (More Expensice) { type = "recipe", name = "bi-sulfur-angels", - icons = { {icon = ICONPATH .. "bio_sulfur.png", icon_size = 64, } }, + icon = ICONPATH .. "bio_sulfur.png", + icon_size = 64, + icons = { + { + icon = ICONPATH .. "bio_sulfur.png", + icon_size = 64, + } + }, category = "chemistry", energy_required = 10, ingredients = { diff --git a/Bio_Industries_2/prototypes/Bio_Garden/entities.lua b/Bio_Industries_2/prototypes/Bio_Garden/entities.lua index 10aa244..791a747 100644 --- a/Bio_Industries_2/prototypes/Bio_Garden/entities.lua +++ b/Bio_Industries_2/prototypes/Bio_Garden/entities.lua @@ -62,7 +62,6 @@ data:extend({ 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, - max_sounds_per_type = 3, }, crafting_categories = { "clean-air" }, source_inventory_size = 1, @@ -85,7 +84,6 @@ data:extend({ -- won't be affected by beacons! allowed_effects = { "consumption", "speed" }, }, - ---- corpse { type = "corpse", @@ -203,7 +201,6 @@ data:extend({ 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, - max_sounds_per_type = 3, }, crafting_categories = { "clean-air" }, source_inventory_size = 1, @@ -227,7 +224,6 @@ data:extend({ allowed_effects = { "consumption", "speed" }, }, - --- corpse { type = "corpse", name = "bi-bio-garden-large-remnant", @@ -385,7 +381,6 @@ data:extend({ 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, - max_sounds_per_type = 3, }, crafting_categories = { "clean-air" }, source_inventory_size = 1, diff --git a/Bio_Industries_2/prototypes/Bio_Garden/recipe.lua b/Bio_Industries_2/prototypes/Bio_Garden/recipe.lua index 179b121..678ffc5 100644 --- a/Bio_Industries_2/prototypes/Bio_Garden/recipe.lua +++ b/Bio_Industries_2/prototypes/Bio_Garden/recipe.lua @@ -12,7 +12,14 @@ data:extend({ name = "bi-bio-garden", localised_name = {"entity-name.bi-bio-garden"}, localised_description = {"entity-description.bi-bio-garden"}, - icons = { {icon = ICONPATH_E .. "bio_garden_icon.png", icon_size = 64, } }, + icon = ICONPATH_E .. "bio_garden_icon.png", + icon_size = 64, + icons = { + { + icon = ICONPATH_E .. "bio_garden_icon.png", + icon_size = 64, + } + }, enabled = false, energy_required = 10, ingredients = { @@ -37,7 +44,14 @@ data:extend({ name = "bi-bio-garden-lagre", localised_name = {"entity-name.bi-bio-garden-lagre"}, localised_description = {"entity-description.bi-bio-garden-lagre"}, - icons = { {icon = ICONPATH_E .. "bio_garden_large_icon.png", icon_size = 64, } }, + 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 = { @@ -62,7 +76,14 @@ data:extend({ name = "bi-bio-garden-huge", localised_name = {"entity-name.bi-bio-garden-huge"}, localised_description = {"entity-description.bi-bio-garden-huge"}, - icons = { {icon = ICONPATH_E .. "bio_garden_huge_icon.png", icon_size = 64, } }, + 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 = { @@ -85,7 +106,14 @@ data:extend({ { type = "recipe", name = "bi-purified-air-1", - icons = { {icon = ICONPATH .. "clean-air_mk1.png", icon_size = 64, } }, + icon = ICONPATH .. "clean-air_mk1.png", + icon_size = 64, + icons = { + { + icon = ICONPATH .. "clean-air_mk1.png", + icon_size = 64, + } + }, order = "zzz-clean-air", category = "clean-air", subgroup = "bio-bio-gardens-fluid", @@ -109,7 +137,14 @@ data:extend({ { type = "recipe", name = "bi-purified-air-2", - icons = { {icon = ICONPATH .. "clean-air_mk2.png", icon_size = 64, } }, + icon = ICONPATH .. "clean-air_mk2.png", + icon_size = 64, + icons = { + { + icon = ICONPATH .. "clean-air_mk2.png", + icon_size = 64, + } + }, order = "zzz-clean-air2", category = "clean-air", subgroup = "bio-bio-gardens-fluid", diff --git a/Bio_Industries_2/prototypes/Bio_Solar_Farm/recipe.lua b/Bio_Industries_2/prototypes/Bio_Solar_Farm/recipe.lua index 749a4ef..7966f88 100644 --- a/Bio_Industries_2/prototypes/Bio_Solar_Farm/recipe.lua +++ b/Bio_Industries_2/prototypes/Bio_Solar_Farm/recipe.lua @@ -13,7 +13,14 @@ 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"}, - icons = { {icon = ICONPATH_E .. "bio_Solar_Farm_Icon.png", icon_size = 64, } }, + icon = ICONPATH_E .. "bio_Solar_Farm_Icon.png", + icon_size = 64, + icons = { + { + icon = ICONPATH_E .. "bio_Solar_Farm_Icon.png", + icon_size = 64, + } + }, enabled = false, energy_required = 60, ingredients = { @@ -34,9 +41,16 @@ if BI.Settings.BI_Solar_Additions then { type = "recipe", name = "bi-solar-boiler-hidden-panel", - localised_name = {"entity-name.bi-solar-boiler"}, + localised_name = {"entity-name.bi-solar-boiler"}, localised_description = {"entity-description.bi-solar-boiler"}, - icons = { {icon = ICONPATH_E .. "bio_Solar_Boiler_Icon.png", icon_size = 64, } }, + icon = ICONPATH_E .. "bio_Solar_Boiler_Icon.png", + icon_size = 64, + icons = { + { + icon = ICONPATH_E .. "bio_Solar_Boiler_Icon.png", + icon_size = 64, + } + }, enabled = false, energy_required = 15, ingredients = { @@ -59,7 +73,14 @@ 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"}, - icons = { {icon = ICONPATH_E .. "solar-mat.png", icon_size = 64, } }, + icon = ICONPATH_E .. "solar-mat.png", + icon_size = 64, + icons = { + { + icon = ICONPATH_E .. "solar-mat.png", + icon_size = 64, + } + }, enabled = false, energy_required = 5, ingredients = { @@ -82,7 +103,14 @@ 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"}, - icons = { {icon = ICONPATH_E .. "bi_LargeAccumulator.png", icon_size = 64, } }, + icon = ICONPATH_E .. "bi_LargeAccumulator.png", + icon_size = 64, + icons = { + { + icon = ICONPATH_E .. "bi_LargeAccumulator.png", + icon_size = 64, + } + }, energy_required = 60, enabled = false, ingredients = { @@ -92,9 +120,9 @@ if BI.Settings.BI_Solar_Additions then }, results = {{type="item", name="bi-bio-accumulator", amount=1}}, main_product = "", - subgroup = "energy", + subgroup = "energy", order = "e[accumulator]-a[bi-accumulator]", - allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 + allow_as_intermediate = false, -- 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 }, @@ -102,10 +130,17 @@ if BI.Settings.BI_Solar_Additions then -- Large Substation { type = "recipe", - name = "bi-large-substation", + name = "bi-large-substation", localised_name = {"entity-name.bi-large-substation"}, localised_description = {"entity-description.bi-large-substation"}, - icons = { {icon = ICONPATH_E .. "bi_LargeSubstation_icon.png", icon_size = 64, } }, + icon = ICONPATH_E .. "bi_LargeSubstation_icon.png", + icon_size = 64, + icons = { + { + icon = ICONPATH_E .. "bi_LargeSubstation_icon.png", + icon_size = 64, + } + }, enabled = false, ingredients = { {type="item", name="steel-plate", amount=10}, diff --git a/Bio_Industries_2/prototypes/Bio_Turret/entity.lua b/Bio_Industries_2/prototypes/Bio_Turret/entity.lua index 1a247d3..0255355 100644 --- a/Bio_Industries_2/prototypes/Bio_Turret/entity.lua +++ b/Bio_Industries_2/prototypes/Bio_Turret/entity.lua @@ -9,8 +9,15 @@ data:extend({ { type = "ammo", name = "bi-dart-magazine-basic", - icons = { { icon = ICONPATH_W .. "basic_dart_icon.png", icon_size = 64, } }, - ammo_category = "Bio_Turret_Ammo", + icon = ICONPATH_W .. "basic_dart_icon.png", + icon_size = 64, + icons = { + { + icon = ICONPATH_W .. "basic_dart_icon.png", + icon_size = 64, + } + }, + ammo_category = "Bio_Turret_Ammo", ammo_type = { category = "Bio_Turret_Ammo", action = { @@ -44,7 +51,14 @@ data:extend({ { type = "ammo", name = "bi-dart-magazine-standard", - icons = { { icon = ICONPATH_W .. "standard_dart_icon.png", icon_size = 64, } }, + icon = ICONPATH_W .. "standard_dart_icon.png", + icon_size = 64, + icons = { + { + icon = ICONPATH_W .. "standard_dart_icon.png", + icon_size = 64, + } + }, ammo_category = "Bio_Turret_Ammo", ammo_type = { category = "Bio_Turret_Ammo", @@ -84,7 +98,14 @@ data:extend({ { type = "ammo", name = "bi-dart-magazine-enhanced", - icons = { { icon = ICONPATH_W .. "enhanced_dart_icon.png", icon_size = 64, } }, + icon = ICONPATH_W .. "enhanced_dart_icon.png", + icon_size = 64, + icons = { + { + icon = ICONPATH_W .. "enhanced_dart_icon.png", + icon_size = 64, + } + }, ammo_category = "Bio_Turret_Ammo", ammo_type = { category = "Bio_Turret_Ammo", @@ -128,7 +149,14 @@ data:extend({ { type = "ammo", name = "bi-dart-magazine-poison", - icons = { { icon = ICONPATH_W .. "poison_dart_icon.png", icon_size = 64, } }, + icon = ICONPATH_W .. "poison_dart_icon.png", + icon_size = 64, + icons = { + { + icon = ICONPATH_W .. "poison_dart_icon.png", + icon_size = 64, + } + }, ammo_category = "Bio_Turret_Ammo", ammo_type = { category = "Bio_Turret_Ammo", @@ -203,7 +231,14 @@ data:extend({ { type = "ammo-turret", name = "bi-dart-turret", - icons = { { icon = ICONPATH_W .. "bio_turret_icon.png", icon_size = 64, } }, + icon = ICONPATH_W .. "bio_turret_icon.png", + icon_size = 64, + icons = { + { + icon = ICONPATH_W .. "bio_turret_icon.png", + icon_size = 64, + } + }, flags = {"placeable-player", "player-creation"}, minable = {mining_time = 0.25, result = "bi-dart-turret"}, max_health = 300, @@ -217,11 +252,13 @@ data:extend({ inventory_size = 1, automated_ammo_count = 14, attacking_speed = 1, -- makes nothing, it's animation's parameter + folded_animation = turret_pic{direction_count = 8, line_length = 1}, preparing_animation = turret_pic{direction_count = 8, line_length = 1}, prepared_animation = turret_pic{}, attacking_animation = turret_pic{}, folding_animation = turret_pic{direction_count = 8, line_length = 1, run_mode = "backward"}, + -- darkfrei: wood impact sound for woods! impact_category = "wood", attack_parameters = { @@ -230,6 +267,7 @@ data:extend({ cooldown = 3.6, -- cooldown = 6 -- darkfrei: means cooldown 6/60 sec or 10 shoots at second; = 60 is one shoot/sec projectile_creation_distance = 1.41, projectile_center = {-0.0625, 0.55}, + range = 20, sound = { filename = "__Bio_Industries_2__/sound/dart-turret.ogg", @@ -283,7 +321,14 @@ data:extend({ { type = "gun", name = "bi-dart-rifle", - icons = { { icon = ICONPATH_W .. "bi_dart_rifle_icon.png", icon_size = 64, } }, + icon = ICONPATH_W .. "bi_dart_rifle_icon.png", + icon_size = 64, + icons = { + { + icon = ICONPATH_W .. "bi_dart_rifle_icon.png", + icon_size = 64, + } + }, subgroup = "gun", order = "a[basic-clips]-ab[submachine-gun]", attack_parameters = { diff --git a/Bio_Industries_2/prototypes/Bio_Turret/item.lua b/Bio_Industries_2/prototypes/Bio_Turret/item.lua index 17a2c2d..7c6ae68 100644 --- a/Bio_Industries_2/prototypes/Bio_Turret/item.lua +++ b/Bio_Industries_2/prototypes/Bio_Turret/item.lua @@ -5,11 +5,18 @@ local ICONPATH_W = BioInd.modRoot .. "/graphics/icons/weapons/" data:extend({ - --- Dart Turret + --- Conversion Turret { type = "item", name = "bi-dart-turret", - icons = { {icon = ICONPATH_W .. "bio_turret_icon.png", icon_size = 64, } }, + icon = ICONPATH_W .. "bio_turret_icon.png", + icon_size = 64, + icons = { + { + icon = ICONPATH_W .. "bio_turret_icon.png", + icon_size = 64, + } + }, subgroup = "defensive-structure", order = "aa[turret]-a[gun-turret]", place_result = "bi-dart-turret", diff --git a/Bio_Industries_2/prototypes/Bio_Turret/recipe.lua b/Bio_Industries_2/prototypes/Bio_Turret/recipe.lua index 4fa0c14..8ca598f 100644 --- a/Bio_Industries_2/prototypes/Bio_Turret/recipe.lua +++ b/Bio_Industries_2/prototypes/Bio_Turret/recipe.lua @@ -10,17 +10,24 @@ data:extend({ name = "bi-dart-magazine-basic", localised_name = {"item-name.bi-dart-magazine-basic"}, localised_description = {"item-description.bi-dart-magazine-basic"}, - icons = { {icon = ICONPATH .. "basic_dart_icon.png", icon_size = 64, } }, - enabled = true, - energy_required = 4, - ingredients = { - {type="item", name="wood", amount=10}, + icon = ICONPATH .. "basic_dart_icon.png", + icon_size = 64, + icons = { + { + icon = ICONPATH .. "basic_dart_icon.png", + icon_size = 64, + } }, - results = {{type="item", name="bi-dart-magazine-basic", amount=10}}, - 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 = true, + energy_required = 4, + ingredients = { + {type="item", name="wood", amount=10}, + }, + results = {{type="item", name="bi-dart-magazine-basic", amount=10}}, + 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 = "[bio-ammo]-a-[darts]-1", -- This is a custom property for use by "Krastorio 2" (it will change @@ -34,18 +41,25 @@ data:extend({ name = "bi-dart-magazine-standard", localised_name = {"item-name.bi-dart-magazine-standard"}, localised_description = {"item-description.bi-dart-magazine-standard"}, - icons = { {icon = ICONPATH .. "standard_dart_icon.png", icon_size = 64, } }, - enabled = false, - energy_required = 5, - ingredients = { + icon = ICONPATH .. "standard_dart_icon.png", + icon_size = 64, + icons = { + { + icon = ICONPATH .. "standard_dart_icon.png", + icon_size = 64, + } + }, + enabled = false, + energy_required = 5, + ingredients = { {type="item", name="bi-dart-magazine-basic", amount=10}, {type="item", name="copper-plate", amount=5}, }, - results = {{type="item", name="bi-dart-magazine-standard", amount=10}}, - 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 + results = {{type="item", name="bi-dart-magazine-standard", amount=10}}, + 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 = "[bio-ammo]-a-[darts]-2", }, @@ -56,18 +70,25 @@ data:extend({ name = "bi-dart-magazine-enhanced", localised_name = {"item-name.bi-dart-magazine-enhanced"}, localised_description = {"item-description.bi-dart-magazine-enhanced"}, - icons = { {icon = ICONPATH .. "enhanced_dart_icon.png", icon_size = 64, } }, - enabled = false, - energy_required = 6, - ingredients = { + icon = ICONPATH .. "enhanced_dart_icon.png", + icon_size = 64, + icons = { + { + icon = ICONPATH .. "enhanced_dart_icon.png", + icon_size = 64, + } + }, + enabled = false, + energy_required = 6, + ingredients = { {type="item", name="bi-dart-magazine-standard", amount=10}, {type="item", name="plastic-bar", amount=5}, }, - results = {{type="item", name="bi-dart-magazine-enhanced", amount=10}}, - 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 + results = {{type="item", name="bi-dart-magazine-enhanced", amount=10}}, + 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 = "[bio-ammo]-a-[darts]-3", }, @@ -78,18 +99,25 @@ data:extend({ name = "bi-dart-magazine-poison", localised_name = {"item-name.bi-dart-magazine-poison"}, localised_description = {"item-description.bi-dart-magazine-poison"}, - icons = { {icon = ICONPATH .. "poison_dart_icon.png", icon_size = 64, } }, - enabled = false, - energy_required = 8, - ingredients = { + icon = ICONPATH .. "poison_dart_icon.png", + icon_size = 64, + icons = { + { + icon = ICONPATH .. "poison_dart_icon.png", + icon_size = 64, + } + }, + enabled = false, + energy_required = 8, + ingredients = { {type="item", name="bi-dart-magazine-enhanced", amount=10}, {type="item", name="poison-capsule", amount=5}, }, - results = {{type="item", name="bi-dart-magazine-poison", amount=10}}, - 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 + results = {{type="item", name="bi-dart-magazine-poison", amount=10}}, + 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 = "[bio-ammo]-a-[darts]-4", }, @@ -100,18 +128,25 @@ data:extend({ name = "bi-dart-turret", localised_name = {"entity-name.bi-dart-turret"}, localised_description = {"entity-description.bi-dart-turret"}, - icons = { {icon = ICONPATH .. "bio_turret_icon.png", icon_size = 64, } }, - enabled = true, - energy_required = 8, - ingredients = { + icon = ICONPATH_W .. "bio_turret_icon.png", + icon_size = 64, + icons = { + { + icon = ICONPATH_W .. "bio_turret_icon.png", + icon_size = 64, + } + }, + enabled = true, + energy_required = 8, + ingredients = { {type="item", name="iron-gear-wheel", amount=5}, {type="item", name="wood", amount=20}, }, - results = {{type="item", name="bi-dart-turret", 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 + results = {{type="item", name="bi-dart-turret", 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 = "defensive-structure", order = "b[turret]-e[bi-dart-turret]", -- This is a custom property for use by "Krastorio 2" (it will change @@ -125,24 +160,29 @@ data:extend({ name = "bi-dart-rifle", localised_name = {"item-name.bi-dart-rifle"}, localised_description = {"item-description.bi-dart-rifle"}, - icons = { {icon = ICONPATH .. "bi_dart_rifle_icon.png", icon_size = 64, } }, - enabled = true, - energy_required = 8, - ingredients = { + icon = ICONPATH_W .. "bi_dart_rifle_icon.png", + icon_size = 64, + icons = { + { + icon = ICONPATH_W .. "bi_dart_rifle_icon.png", + icon_size = 64, + } + }, + enabled = true, + energy_required = 8, + ingredients = { {type="item", name="copper-plate", amount=5}, {type="item", name="wood", amount=15}, }, - results = {{type="item", name="bi-dart-rifle", 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 + results = {{type="item", name="bi-dart-rifle", 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 = "gun", - order = "a[basic-clips]-b[bi-dart-rifle]", + order = "a[basic-clips]-b[bi-dart-rifle]" + }, -- This is a custom property for use by "Krastorio 2" (it will change -- ingredients/results; used for wood/wood pulp) - mod = "Bio_Industries_2", - }, - - + mod = "Bio_Industries_2", }) diff --git a/Bio_Industries_2/prototypes/Bio_Tweaks/recipe.lua b/Bio_Industries_2/prototypes/Bio_Tweaks/recipe.lua index bc3cef5..f3b1366 100644 --- a/Bio_Industries_2/prototypes/Bio_Tweaks/recipe.lua +++ b/Bio_Industries_2/prototypes/Bio_Tweaks/recipe.lua @@ -21,7 +21,14 @@ log("Enabling disassemble recipes!") type = "recipe", name = "bi-burner-mining-drill-disassemble", localised_description = {"recipe-description.bi-disassemble-recipes"}, - icons = { {icon = ICONPATH .. "burner-mining-drill_disassemble.png", icon_size = 64, } }, + icon = ICONPATH .. "burner-mining-drill_disassemble.png", + icon_size = 64, + icons = { + { + icon = ICONPATH .. "burner-mining-drill_disassemble.png", + icon_size = 64, + } + }, category = "advanced-crafting", subgroup = "bio-disassemble", order = "a[Disassemble]-a[bi-burner-mining-drill-disassemble]", @@ -39,12 +46,19 @@ log("Enabling disassemble recipes!") }, main_product = "", }, ----- + { type = "recipe", name = "bi-burner-inserter-disassemble", localised_description = {"recipe-description.bi-disassemble-recipes"}, - icons = { {icon = ICONPATH .. "burner_inserter_disassemble.png", icon_size = 64, } }, + icon = ICONPATH .. "burner_inserter_disassemble.png", + icon_size = 64, + icons = { + { + icon = ICONPATH .. "burner_inserter_disassemble.png", + icon_size = 64, + } + }, category = "advanced-crafting", subgroup = "bio-disassemble", order = "a[Disassemble]-b[bi-burner-inserter-disassemble]", @@ -61,12 +75,19 @@ log("Enabling disassemble recipes!") }, main_product = "", }, ----- + { type = "recipe", name = "bi-long-handed-inserter-disassemble", localised_description = {"recipe-description.bi-disassemble-recipes"}, - icons = { {icon = ICONPATH .. "long_handed_inserter_disassemble.png", icon_size = 64, } }, + icon = ICONPATH .. "long_handed_inserter_disassemble.png", + icon_size = 64, + icons = { + { + icon = ICONPATH .. "long_handed_inserter_disassemble.png", + icon_size = 64, + } + }, category = "advanced-crafting", subgroup = "bio-disassemble", order = "a[Disassemble]-c[bi-long-handed-inserter-disassemble]", @@ -85,12 +106,19 @@ log("Enabling disassemble recipes!") }, main_product = "", }, ---- + { type = "recipe", name = "bi-stone-furnace-disassemble", localised_description = {"recipe-description.bi-disassemble-recipes"}, - icons = { {icon = ICONPATH .. "stone_furnace_disassemble.png", icon_size = 64, } }, + icon = ICONPATH .. "stone_furnace_disassemble.png", + icon_size = 64, + icons = { + { + icon = ICONPATH .. "stone_furnace_disassemble.png", + icon_size = 64, + } + }, category = "advanced-crafting", subgroup = "bio-disassemble", order = "a[Disassemble]-d[bi-stone-furnace-disassemble]", @@ -107,12 +135,19 @@ log("Enabling disassemble recipes!") }, main_product = "", }, ---- + { type = "recipe", name = "bi-steel-furnace-disassemble", localised_description = {"recipe-description.bi-disassemble-recipes"}, - icons = { {icon = ICONPATH .. "steel-furnace_disassemble.png", icon_size = 64, } }, + icon = ICONPATH .. "steel-furnace_disassemble.png", + icon_size = 64, + icons = { + { + icon = ICONPATH .. "steel-furnace_disassemble.png", + icon_size = 64, + } + }, category = "advanced-crafting", subgroup = "bio-disassemble", order = "a[Disassemble]-e[bi-steel-furnace-disassemble]", @@ -130,6 +165,5 @@ log("Enabling disassemble recipes!") }, main_product = "", }, - }) end \ No newline at end of file diff --git a/Bio_Industries_2/prototypes/Wood_Products/containers-entities.lua b/Bio_Industries_2/prototypes/Wood_Products/containers-entities.lua index ee3d137..0074fa8 100644 --- a/Bio_Industries_2/prototypes/Wood_Products/containers-entities.lua +++ b/Bio_Industries_2/prototypes/Wood_Products/containers-entities.lua @@ -10,6 +10,7 @@ local ICONPATH = BioInd.modRoot .. "/graphics/icons/" local ICONPATH_E = BioInd.modRoot .. "/graphics/icons/entity/" local WOODPATH = BioInd.modRoot .. "/graphics/entities/wood_products/" local REMNANTSPATH = BioInd.modRoot .. "/graphics/entities/remnants/" + local SNDPATH = "__base__/sound/" local sounds = {} sounds.open_sound = { filename = "__base__/sound/wooden-chest-open.ogg" } @@ -38,7 +39,14 @@ data:extend({ { type = "container", name = "bi-wooden-chest-large", - icons = { {icon = ICONPATH_E .. "large_wooden_chest_icon.png", icon_size = 64, } }, + icon = ICONPATH_E .. "large_wooden_chest_icon.png", + icon_size = 64, + icons = { + { + icon = ICONPATH_E .. "large_wooden_chest_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, @@ -120,7 +128,14 @@ data:extend({ { type = "container", name = "bi-wooden-chest-huge", - icons = { {icon = ICONPATH_E .. "huge_wooden_chest_icon.png", icon_size = 64, } }, + icon = ICONPATH_E .. "huge_wooden_chest_icon.png", + icon_size = 64, + icons = { + { + icon = ICONPATH_E .. "huge_wooden_chest_icon.png", + icon_size = 64, + } + }, scale_info_icons = true, -- This is necessary for "Space Exploration" (if not true, the entity can only be -- placed on Nauvis)! @@ -135,7 +150,7 @@ data:extend({ inventory_size = 432, --144 open_sound = { filename = "__base__/sound/wooden-chest-open.ogg" }, close_sound = { filename = "__base__/sound/wooden-chest-close.ogg" }, - impact_category = "wood", + impact_category = "wood", picture = { layers = { { @@ -203,7 +218,14 @@ data:extend({ { type = "container", name = "bi-wooden-chest-giga", - icons = { {icon = ICONPATH_E .. "giga_wooden_chest_icon.png", icon_size = 64, } }, + icon = ICONPATH_E .. "giga_wooden_chest_icon.png", + icon_size = 64, + icons = { + { + icon = ICONPATH_E .. "giga_wooden_chest_icon.png", + icon_size = 64, + } + }, scale_info_icons = true, -- This is necessary for "Space Exploration" (if not true, the entity can only be -- placed on Nauvis)! @@ -218,7 +240,7 @@ data:extend({ inventory_size = 1728, --576 open_sound = { filename = "__base__/sound/wooden-chest-open.ogg" }, close_sound = { filename = "__base__/sound/wooden-chest-close.ogg" }, - impact_category = "wood", + impact_category = "wood", picture = { layers = { { diff --git a/Bio_Industries_2/prototypes/Wood_Products/containers-item.lua b/Bio_Industries_2/prototypes/Wood_Products/containers-item.lua index ae5f8df..e5dac25 100644 --- a/Bio_Industries_2/prototypes/Wood_Products/containers-item.lua +++ b/Bio_Industries_2/prototypes/Wood_Products/containers-item.lua @@ -16,7 +16,14 @@ data:extend({ name = "bi-wooden-chest-large", localised_name = {"entity-name.bi-wooden-chest-large"}, localised_description = {"entity-description.bi-wooden-chest-large"}, - icons = { {icon = ICONPATH_E .. "large_wooden_chest_icon.png", icon_size = 64, } }, + icon = ICONPATH_E .. "large_wooden_chest_icon.png", + icon_size = 64, + icons = { + { + icon = ICONPATH_E .. "large_wooden_chest_icon.png", + icon_size = 64, + } + }, fuel_category = "chemical", fuel_value = "32MJ", subgroup = "storage", @@ -31,7 +38,14 @@ data:extend({ name = "bi-wooden-chest-huge", localised_name = {"entity-name.bi-wooden-chest-huge"}, localised_description = {"entity-description.bi-wooden-chest-huge"}, - icons = { {icon = ICONPATH_E .. "huge_wooden_chest_icon.png", icon_size = 64, } }, + icon = ICONPATH_E .. "huge_wooden_chest_icon.png", + icon_size = 64, + icons = { + { + icon = ICONPATH_E .. "huge_wooden_chest_icon.png", + icon_size = 64, + } + }, fuel_category = "chemical", fuel_value = "200MJ", subgroup = "storage", @@ -46,7 +60,14 @@ data:extend({ name = "bi-wooden-chest-giga", localised_name = {"entity-name.bi-wooden-chest-giga"}, localised_description = {"entity-description.bi-wooden-chest-giga"}, - icons = { {icon = ICONPATH_E .. "giga_wooden_chest_icon.png", icon_size = 64, } }, + icon = ICONPATH_E .. "giga_wooden_chest_icon.png", + icon_size = 64, + icons = { + { + icon = ICONPATH_E .. "giga_wooden_chest_icon.png", + icon_size = 64, + } + }, fuel_category = "chemical", fuel_value = "400MJ", subgroup = "storage", diff --git a/Bio_Industries_2/prototypes/Wood_Products/containers-recipe.lua b/Bio_Industries_2/prototypes/Wood_Products/containers-recipe.lua index fc88fc7..04e9bde 100644 --- a/Bio_Industries_2/prototypes/Wood_Products/containers-recipe.lua +++ b/Bio_Industries_2/prototypes/Wood_Products/containers-recipe.lua @@ -15,20 +15,27 @@ data:extend({ name = "bi-wooden-chest-large", localised_name = {"entity-name.bi-wooden-chest-large"}, localised_description = {"entity-description.bi-wooden-chest-large"}, - icons = { {icon = ICONPATH_E .. "large_wooden_chest_icon.png", icon_size = 64, } }, - energy_required = 2, - enabled = false, - ingredients = { + icon = ICONPATH_E .. "large_wooden_chest_icon.png", + icon_size = 64, + icons = { + { + icon = ICONPATH_E .. "large_wooden_chest_icon.png", + icon_size = 64, + } + }, + energy_required = 2, + enabled = false, + ingredients = { {type="item", name="copper-plate", amount=16}, {type="item", name="resin", amount=24}, {type="item", name="wooden-chest", amount=8} }, - results = {{type="item", name="bi-wooden-chest-large", amount=1}}, - main_product = "", - requester_paste_multiplier = 4, - 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 + results = {{type="item", name="bi-wooden-chest-large", amount=1}}, + main_product = "", + requester_paste_multiplier = 4, + 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 = "storage", order = "a[items]-aa[wooden-chest]", }, @@ -39,20 +46,27 @@ data:extend({ name = "bi-wooden-chest-huge", localised_name = {"entity-name.bi-wooden-chest-huge"}, localised_description = {"entity-description.bi-wooden-chest-huge"}, - icons = { {icon = ICONPATH_E .. "huge_wooden_chest_icon.png", icon_size = 64, } }, - energy_required = 2, - enabled = false, - ingredients = { + icon = ICONPATH_E .. "huge_wooden_chest_icon.png", + icon_size = 64, + icons = { + { + icon = ICONPATH_E .. "huge_wooden_chest_icon.png", + icon_size = 64, + } + }, + energy_required = 2, + enabled = false, + ingredients = { {type="item", name="iron-stick", amount=32}, {type="item", name="stone-brick", amount=32}, {type="item", name="bi-wooden-chest-large", amount=16} }, - results = {{type="item", name="bi-wooden-chest-huge", amount=1}}, - main_product = "", - requester_paste_multiplier = 4, - 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 + results = {{type="item", name="bi-wooden-chest-huge", amount=1}}, + main_product = "", + requester_paste_multiplier = 4, + 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 = "storage", order = "a[items]-ab[wooden-chest]", }, @@ -63,20 +77,27 @@ data:extend({ name = "bi-wooden-chest-giga", localised_name = {"entity-name.bi-wooden-chest-giga"}, localised_description = {"entity-description.bi-wooden-chest-giga"}, - icons = { {icon = ICONPATH_E .. "giga_wooden_chest_icon.png", icon_size = 64, } }, - energy_required = 4, - enabled = false, - ingredients = { + icon = ICONPATH_E .. "giga_wooden_chest_icon.png", + icon_size = 64, + icons = { + { + icon = ICONPATH_E .. "giga_wooden_chest_icon.png", + icon_size = 64, + } + }, + energy_required = 4, + enabled = false, + ingredients = { {type="item", name="steel-plate", amount=32}, {type="item", name="concrete", amount=32}, {type="item", name="bi-wooden-chest-huge", amount=16} }, - results = {{type="item", name="bi-wooden-chest-giga", amount=1}}, - main_product = "", - requester_paste_multiplier = 4, - 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 + results = {{type="item", name="bi-wooden-chest-giga", amount=1}}, + main_product = "", + requester_paste_multiplier = 4, + 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 = "storage", order = "a[items]-ac[wooden-chest]", }, diff --git a/Bio_Industries_2/prototypes/Wood_Products/entities.lua b/Bio_Industries_2/prototypes/Wood_Products/entities.lua index a76a204..10d23af 100644 --- a/Bio_Industries_2/prototypes/Wood_Products/entities.lua +++ b/Bio_Industries_2/prototypes/Wood_Products/entities.lua @@ -185,15 +185,15 @@ data:extend({ type = "tile", name = "bi-wood-floor", needs_correction = false, - minable = {hardness = 0.2, mining_time = 0.25, result = "wood"}, + minable = {hardness = 0.2, mining_time = 0.25, result = "wood"}, mined_sound = { filename = "__base__/sound/deconstruct-bricks.ogg" }, collision_mask = { layers = { ground_tile = true } }, walking_speed_modifier = 1.2, layer = 13, decorative_removal_probability = 1, variants = { - transition = tile_graphics.generic_masked_tile_transitions1, - main = { + transition = tile_graphics.generic_masked_tile_transitions1, + main = { { picture = WOODPATH .. "wood_floor/woodfloor.png", count = 4, @@ -201,26 +201,26 @@ data:extend({ scale = 0.5 }, }, - inner_corner = { + inner_corner = { picture = WOODPATH .. "wood_floor/woodfloor_inner-corner.png", count = 4 }, - outer_corner = { + outer_corner = { picture = WOODPATH .. "wood_floor/woodfloor_outer-corner.png", count = 4, scale = 0.5 }, - side = { + side = { picture = WOODPATH .. "wood_floor/woodfloor_side.png", count = 4, scale = 0.5 }, - u_transition = { + u_transition = { picture = WOODPATH .. "wood_floor/woodfloor_u.png", count = 4, scale = 0.5 }, - o_transition = { + o_transition = { picture = WOODPATH .. "wood_floor/hr_woodfloor_o.png", count = 1, scale = 0.5 @@ -237,7 +237,14 @@ data:extend({ { type = "electric-pole", name = "bi-wooden-pole-big", - icons = { {icon = ICONPATH_E .. "big-wooden-pole.png", icon_size = 64, } }, + icon = ICONPATH_E .. "big-wooden-pole.png", + icon_size = 64, + icons = { + { + icon = ICONPATH_E .. "big-wooden-pole.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, @@ -321,6 +328,7 @@ data:extend({ localised_name = {"entity-name.bi-wooden-pole-big-remnant"}, icon = "__base__/graphics/icons/remnants.png", icon_size = 64, + icon_mipmaps = 4, BI_add_icon = true, flags = {"placeable-neutral", "building-direction-8-way", "not-on-map"}, subgroup = "remnants", @@ -354,7 +362,14 @@ data:extend({ { type = "electric-pole", name = "bi-wooden-pole-huge", - icons = { {icon = ICONPATH_E .. "huge-wooden-pole.png", icon_size = 64, } }, + icon = ICONPATH_E .. "huge-wooden-pole.png", + icon_size = 64, + icons = { + { + icon = ICONPATH_E .. "huge-wooden-pole.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, @@ -451,6 +466,7 @@ data:extend({ localised_name = {"entity-name.bi-wooden-pole-huge-remnant"}, icon = "__base__/graphics/icons/remnants.png", icon_size = 64, + icon_mipmaps = 4, BI_add_icon = true, flags = {"placeable-neutral", "building-direction-8-way", "not-on-map"}, subgroup = "remnants", @@ -484,7 +500,14 @@ data:extend({ { type = "wall", name = "bi-wooden-fence", - icons = { {icon = ICONPATH_E .. "wooden-fence.png", icon_size = 64, } }, + icon = ICONPATH_E .. "wooden-fence.png", + icon_size = 64, + icons = { + { + icon = ICONPATH_E .. "wooden-fence.png", + icon_size = 64, + } + }, flags = {"placeable-neutral", "player-creation"}, collision_box = {{-0.29, -0.09}, {0.29, 0.49}}, selection_box = {{-0.5, -0.5}, {0.5, 0.5}}, @@ -494,7 +517,7 @@ data:extend({ repair_speed_modifier = 2, corpse = "wall-remnants", repair_sound = { filename = "__base__/sound/manual-repair-simple.ogg" }, - impact_category = "wood", + impact_category = "wood", resistances = { { type = "physical", @@ -787,7 +810,14 @@ data:extend({ { type = "pipe", name = "bi-wood-pipe", - icons = { {icon = ICONPATH_E .. "wood_pipe.png", icon_size = 64, } }, + icon = ICONPATH_E .. "wood_pipe.png", + icon_size = 64, + icons = { + { + icon = ICONPATH_E .. "wood_pipe.png", + icon_size = 64, + } + }, flags = {"placeable-neutral", "player-creation"}, minable = {mining_time = 0.075, result = "bi-wood-pipe"}, max_health = 100, @@ -806,8 +836,8 @@ data:extend({ collision_box = {{-0.29, -0.29}, {0.29, 0.29}}, selection_box = {{-0.5, -0.5}, {0.5, 0.5}}, fluid_box = { - volume = 100, - pipe_connections = { + volume = 100, + pipe_connections = { { direction = defines.direction.north, position = {0, 0} }, { direction = defines.direction.east, position = {0, 0} }, { direction = defines.direction.south, position = {0, 0} }, @@ -828,7 +858,6 @@ data:extend({ horizontal_window_bounding_box = {{-0.25, -0.28125}, {0.25, 0.15625}}, vertical_window_bounding_box = {{-0.28125, -0.5}, {0.03125, 0.125}} }, - ---- corpse { type = "corpse", diff --git a/Bio_Industries_2/prototypes/Wood_Products/item.lua b/Bio_Industries_2/prototypes/Wood_Products/item.lua index c858d96..e7e3ffa 100644 --- a/Bio_Industries_2/prototypes/Wood_Products/item.lua +++ b/Bio_Industries_2/prototypes/Wood_Products/item.lua @@ -11,10 +11,19 @@ data:extend({ name = "bi-wooden-pole-big", localised_name = {"entity-name.bi-wooden-pole-big"}, localised_description = {"entity-description.bi-wooden-pole-big"}, - icons = { {icon = ICONPATH_E .. "big-wooden-pole.png", icon_size = 64, } }, + icon = ICONPATH_E .. "big-wooden-pole.png", + icon_size = 64, + icons = { + { + icon = ICONPATH_E .. "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", stack_size = 50 }, @@ -24,10 +33,19 @@ data:extend({ name = "bi-wooden-pole-huge", localised_name = {"entity-name.bi-wooden-pole-huge"}, localised_description = {"entity-description.bi-wooden-pole-huge"}, - icons = { {icon = ICONPATH_E .. "huge-wooden-pole.png", icon_size = 64, } }, + icon = ICONPATH_E .. "huge-wooden-pole.png", + icon_size = 64, + icons = { + { + icon = ICONPATH_E .. "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", stack_size = 50 }, @@ -37,7 +55,14 @@ data:extend({ name = "bi-wooden-fence", localised_name = {"entity-name.bi-wooden-fence"}, localised_description = {"entity-description.bi-wooden-fence"}, - icons = { {icon = ICONPATH_E .. "wooden-fence.png", icon_size = 64, } }, + icon = ICONPATH_E .. "wooden-fence.png", + icon_size = 64, + icons = { + { + icon = ICONPATH_E .. "wooden-fence.png", + icon_size = 64, + } + }, subgroup = "defensive-structure", order = "a-a[stone-wall]-a[wooden-fence]", place_result = "bi-wooden-fence", @@ -52,7 +77,14 @@ data:extend({ name = "bi-wood-pipe", localised_name = {"entity-name.bi-wood-pipe"}, localised_description = {"entity-description.bi-wood-pipe"}, - icons = { {icon = ICONPATH_E .. "wood_pipe.png", icon_size = 64, } }, + icon = ICONPATH_E .. "wood_pipe.png", + icon_size = 64, + icons = { + { + icon = ICONPATH_E .. "wood_pipe.png", + icon_size = 64, + } + }, subgroup = "energy-pipe-distribution", order = "a[pipe]-1a[pipe]", place_result = "bi-wood-pipe", @@ -67,7 +99,14 @@ 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"}, - icons = { {icon = ICONPATH_E .. "pipe-to-ground-wood.png", icon_size = 64, } }, + icon = ICONPATH_E .. "pipe-to-ground-wood.png", + icon_size = 64, + icons = { + { + icon = ICONPATH_E .. "pipe-to-ground-wood.png", + icon_size = 64, + } + }, subgroup = "energy-pipe-distribution", order = "a[pipe]-1b[pipe-to-ground]", place_result = "bi-wood-pipe-to-ground", diff --git a/Bio_Industries_2/prototypes/Wood_Products/rail.lua b/Bio_Industries_2/prototypes/Wood_Products/rail.lua index 97c7da1..496749d 100644 --- a/Bio_Industries_2/prototypes/Wood_Products/rail.lua +++ b/Bio_Industries_2/prototypes/Wood_Products/rail.lua @@ -20,7 +20,14 @@ local simulations = require("__base__.prototypes.factoriopedia-simulations") { type = "rail-planner", name = "bi-rail-wood", - icons = { {icon = ICONPATH_E .. "rail-wood.png", icon_size = 64, } }, + 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]", @@ -43,7 +50,14 @@ local simulations = require("__base__.prototypes.factoriopedia-simulations") { type = "recipe", name = "bi-rail-wood-to-concrete", - icons = { {icon = ICONPATH_E .. "rail-wood-to-concrete.png", icon_size = 64, } }, + 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 = { diff --git a/Bio_Industries_2/prototypes/Wood_Products/recipe.lua b/Bio_Industries_2/prototypes/Wood_Products/recipe.lua index 84f7cf3..4111e31 100644 --- a/Bio_Industries_2/prototypes/Wood_Products/recipe.lua +++ b/Bio_Industries_2/prototypes/Wood_Products/recipe.lua @@ -11,17 +11,24 @@ data:extend({ name = "bi-wooden-pole-big", localised_name = {"entity-name.bi-wooden-pole-big"}, localised_description = {"entity-description.bi-wooden-pole-big"}, - icons = { {icon = ICONPATH_E .. "big-wooden-pole.png", icon_size = 64, } }, - enabled = false, - ingredients = { + icon = ICONPATH_E .. "big-wooden-pole.png", + icon_size = 64, + icons = { + { + icon = ICONPATH_E .. "big-wooden-pole.png", + icon_size = 64, + } + }, + enabled = false, + ingredients = { {type="item", name="wood", amount=5}, {type="item", name="small-electric-pole", amount=2}, }, - results = {{type="item", name="bi-wooden-pole-big", 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 + results = {{type="item", name="bi-wooden-pole-big", 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 = "energy-pipe-distribution", order = "a[energy]-b[small-electric-pole]", -- This is a custom property for use by "Krastorio 2" (it will change @@ -35,18 +42,25 @@ data:extend({ name = "bi-wooden-pole-huge", localised_name = {"entity-name.bi-wooden-pole-huge"}, localised_description = {"entity-description.bi-wooden-pole-huge"}, - icons = { {icon = ICONPATH_E .. "huge-wooden-pole.png", icon_size = 64, } }, - enabled = false, - ingredients = { + icon = ICONPATH_E .. "huge-wooden-pole.png", + icon_size = 64, + icons = { + { + icon = ICONPATH_E .. "huge-wooden-pole.png", + icon_size = 64, + } + }, + enabled = false, + ingredients = { {type="item", name="wood", amount=5}, {type="item", name="concrete", amount=100}, {type="item", name="bi-wooden-pole-big", amount=6}, }, - results = {{type="item", name="bi-wooden-pole-huge", 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 + results = {{type="item", name="bi-wooden-pole-huge", 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 = "energy-pipe-distribution", order = "a[energy]-d[big-electric-pole]", -- This is a custom property for use by "Krastorio 2" (it will change @@ -60,16 +74,23 @@ data:extend({ name = "bi-wooden-fence", localised_name = {"entity-name.bi-wooden-fence"}, localised_description = {"entity-description.bi-wooden-fence"}, - icons = { {icon = ICONPATH_E .. "wooden-fence.png", icon_size = 64, } }, - enabled = true, - ingredients = { + icon = ICONPATH_E .. "wooden-fence.png", + icon_size = 64, + icons = { + { + icon = ICONPATH_E .. "wooden-fence.png", + icon_size = 64, + } + }, + enabled = true, + ingredients = { {type="item", name="wood", amount=2}, }, - results = {{type="item", name="bi-wooden-fence", 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 + results = {{type="item", name="bi-wooden-fence", 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 = "defensive-structure", -- This is a custom property for use by "Krastorio 2" (it will change -- ingredients/results; used for wood/wood pulp) @@ -82,19 +103,26 @@ data:extend({ name = "bi-wood-pipe", localised_name = {"entity-name.bi-wood-pipe"}, localised_description = {"entity-description.bi-wood-pipe"}, - icons = { {icon = ICONPATH_E .. "wood_pipe.png", icon_size = 64, } }, - energy_required = 1, - enabled = true, + icon = ICONPATH_E .. "wood_pipe.png", + icon_size = 64, + icons = { + { + icon = ICONPATH_E .. "wood_pipe.png", + icon_size = 64, + } + }, + energy_required = 1, + enabled = true, ingredients = { {type="item", name="copper-plate", amount=1}, {type="item", name="wood", amount=8} }, - results = {{type="item", name="bi-wood-pipe", amount=4}}, - main_product = "", - requester_paste_multiplier = 15, - 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 + results = {{type="item", name="bi-wood-pipe", amount=4}}, + main_product = "", + requester_paste_multiplier = 15, + 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 = "energy-pipe-distribution", order = "a[pipe]-1a[pipe]", -- This is a custom property for use by "Krastorio 2" (it will change @@ -108,20 +136,27 @@ 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"}, - icons = { {icon = ICONPATH_E .. "pipe-to-ground-wood.png", icon_size = 64, } }, - energy_required = 2, - enabled = true, - ingredients = { + icon = ICONPATH_E .. "pipe-to-ground-wood.png", + icon_size = 64, + icons = { + { + icon = ICONPATH_E .. "pipe-to-ground-wood.png", + icon_size = 64, + } + }, + energy_required = 2, + enabled = true, + ingredients = { {type="item", name="copper-plate", amount=4}, {type="item", name="bi-wood-pipe", amount=5} }, - results = {{type="item", name="bi-wood-pipe-to-ground", amount=2}}, - 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 + results = {{type="item", name="bi-wood-pipe-to-ground", amount=2}}, + 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 = "energy-pipe-distribution", order = "a[pipe]-1b[pipe-to-ground]", }, -}) + }) diff --git a/Bio_Industries_2/remote.lua b/Bio_Industries_2/remote.lua deleted file mode 100644 index 6df4b5c..0000000 --- a/Bio_Industries_2/remote.lua +++ /dev/null @@ -1,73 +0,0 @@ -BioInd = require("__" .. script.mod_name .. "__.common")(script.mod_name) --- Presets for Milestones mod -local function milestones_preset_addons() -local grouped_milestones = {} - - - grouped_milestones["resorces"] = { - { type = "group", name = "Resources" }, - { type = "item", name = "bi-woodpulp", quantity = 1 }, - { type = "item", name = "bi-woodpulp", quantity = 1000, next = "x10", hidden = true }, - { type = "item", name = "bi-ash", quantity = 1, next = "x10" }, - { type = "item", name = "bi-ash", quantity = 1000, next = "x10", hidden = true }, - { type = "item", name = "stone-crushed", quantity = 1 }, - { type = "item", name = "stone-crushed", quantity = 1000, next = "x10", hidden = true }, - { type = "item", name = "fertilizer", quantity = 1 }, - { type = "item", name = "fertilizer", quantity = 1000, next = "x10", hidden = true }, - { type = "item", name = "bi-adv-fertilizer", quantity = 1 }, - { type = "item", name = "bi-adv-fertilizer", quantity = 1000, next = "x10", hidden = true }, - } - -grouped_milestones["progress"] = { - {type = "group", name = "Progress" }, - {type="item", name="bi-bio-farm", quantity=1}, - {type="item", name="bi-bio-greenhouse", quantity=1}, - {type="item", name="bi-bio-garden", quantity=1}, - {type="item", name="bi-bio-garden-large", quantity=1}, - {type="item", name="bi-bio-garden-huge", quantity=1}, - - - } - - --script.active_mods["Bio_Industries_2"] and { type = "item", name = "bob-beacon-2", quantity = 1 } or nil, - - -if BioInd.get_startup_setting("BI_Bio_Cannon") then -grouped_milestones["Bio_Cannon"] = { - {type = "group", name = "Bio Cannon" }, - {type="item", name="bi-bio-cannon", quantity=1}, - -- {type="ammo", name="bi-bio-cannon-proto-ammo", quantity=1}, --- {type = "ammo", name = "bi-bio-cannon-proto-ammo", quantity = 1000, next = "x10", hidden = true }, - } -end - -if BioInd.get_startup_setting("BI_Bio_Fuel") then -grouped_milestones["Bio_Fuel"] = { - {type = "group", name = "Bio Fuel" }, - {type="item", name="bi-bio-reactor", quantity=1}, - {type="item", name="bi-bio-boiler", quantity=1}, - } -end - - - - local milestones = {} - for group_name, group_milestones in pairs(grouped_milestones) do - for _, milestone in pairs(group_milestones) do - table.insert(milestones, milestone) - end - end - - - return { - ["Bio Industries"] = { - required_mods = { "Bio_Industries_2" }, - forbidden_mods = {}, - milestones = milestones, - }, - } -end - -remote.add_interface("Bio_Industries_2", { - milestones_preset_addons = milestones_preset_addons, -})