diff --git a/Bio_Industries_2/changelog.txt b/Bio_Industries_2/changelog.txt index 0270327..5df0365 100644 --- a/Bio_Industries_2/changelog.txt +++ b/Bio_Industries_2/changelog.txt @@ -1,8 +1,27 @@ --------------------------------------------------------------------------------------------------- +Version: 2.0.17 +Date: 10.09.2025 + Changes: + - More Updates to Bob's Compatibility +--------------------------------------------------------------------------------------------------- +Version: 2.0.16 +Date: 09.09.2025 + Bug Fixes: + - Fixed missing fertilizer icon, attempt 2 +--------------------------------------------------------------------------------------------------- +Version: 2.0.15 +Date: 09.09.2025 + Bug Fixes: + - Fixed missing icon "Bio_Industries_2/graphics/icons/fluid_advanced_fertilizer_recipe_64.png not found" +--------------------------------------------------------------------------------------------------- +Version: 2.0.14 +Date: 09.09.2025 + Bug Fixes: + - Fixed missing 'liquid-air' in not playing with Bob's +--------------------------------------------------------------------------------------------------- Version: 2.0.13 Date: 09.09.2025 Changes: - - Updated Rail to remove Decorative when placed - Updated Bob's Compatibility --------------------------------------------------------------------------------------------------- diff --git a/Bio_Industries_2/data-updates.lua b/Bio_Industries_2/data-updates.lua index 16a353f..f7c9bfc 100644 --- a/Bio_Industries_2/data-updates.lua +++ b/Bio_Industries_2/data-updates.lua @@ -22,6 +22,7 @@ local ICONPATH = "__Bio_Industries_2__/graphics/icons/" local ICONPATH = BioInd.modRoot .. "/graphics/icons/" local ICONPATH_E = BioInd.modRoot .. "/graphics/icons/entity/" local ICONPATH_PY = "__Bio_Industries_2__/graphics/icons/mod_py/" +local ICONPATH_BA = BioInd.modRoot .. "/graphics/icons/mod_bobangels/" ----Update the Wood Pipe Images require("prototypes.Wood_Products.pipes") @@ -427,7 +428,7 @@ end -- We only want to create nitrogen if it doesn't exist yet. We then also need to create -- liquid air. ---[[ Removing this for now + if not data.raw.fluid["nitrogen"] then data:extend({ { @@ -510,7 +511,7 @@ else BioInd.writeDebug("Removed recipes for \"nitrogen\" and \"liquid air\".") end -]] + -- Replace nitrogen (BI) with bob-nitrogen (Bob's) in recipe "bi-nitrogen" @@ -552,20 +553,20 @@ end -- Replace bob-fertiliser (Bob's) with fertilizer (BI) in recipe "bob-fertiliser" if data.raw["item"]["bob-greenhouse"] then - data.raw["item"]["bob-fertiliser"].icon = ICONPATH .. "fertilizer.png" - data.raw["item"]["bob-fertiliser"].icon_size = 64 - data.raw["recipe"]["bob-fertiliser"].icon = ICONPATH .. "fertilizer.png" - data.raw["recipe"]["bob-fertiliser"].icon_size = 64 + data.raw["item"]["bob-fertiliser"].icon = ICONPATH .. "fertilizer.png" + data.raw["item"]["bob-fertiliser"].icon_size = 64 + data.raw["recipe"]["bob-fertiliser"].icon = ICONPATH .. "fertilizer.png" + data.raw["recipe"]["bob-fertiliser"].icon_size = 64 - thxbob.lib.recipe.remove_result("bob-fertiliser", "bob-fertiliser") - thxbob.lib.recipe.add_result("bob-fertiliser", { + thxbob.lib.recipe.remove_result("bob-fertiliser", "bob-fertiliser") + thxbob.lib.recipe.add_result("bob-fertiliser", { type = "item", name = "fertilizer", amount = 1 - }) + }) - thxbob.lib.recipe.replace_ingredient("bob-advanced-greenhouse-cycle", "bob-fertiliser", "fertilizer") + thxbob.lib.recipe.replace_ingredient("bob-advanced-greenhouse-cycle", "bob-fertiliser", "fertilizer") data.raw["item"]["bob-fertiliser"].place_as_tile = { result = BioInd.AB_tiles() and "vegetation-green-grass-3" or "grass-3", @@ -602,36 +603,50 @@ end 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", { type = "item", 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 -end - -if data.raw.recipe["bob-resin-oil"] then - - thxbob.lib.recipe.remove_result("bob-resin-oil", "bob-resin") - thxbob.lib.recipe.add_result("bob-resin-oil", { - type = "item", - name = "resin", - amount = 2 + if data.raw.recipe["bob-resin-oil"] then + thxbob.lib.recipe.remove_result("bob-resin-oil", "bob-resin") + thxbob.lib.recipe.add_result("bob-resin-oil", { + type = "item", + name = "resin", + amount = 1 }) + BioInd.writeDebug("Replace Bob's Resin with BI Resin in Recipe 'bob-resin-oil'") + end - BioInd.writeDebug("Replace Bob's Resin with BI Resin in Recipe 'bob-resin-oil'") + 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.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 -end + if data.raw.recipe["bob-phenolic-board"] then + thxbob.lib.recipe.replace_ingredient("bob-phenolic-board", "bob-resin", "resin") + BioInd.writeDebug("Replace Bob's Resin with BI Resin in Recipe 'bob-phenolic-board'") + end -if data.raw.recipe["bob-rubber"] then - - thxbob.lib.recipe.replace_ingredient("bob-rubber", "bob-resin", "resin") - - BioInd.writeDebug("Replace Bob's Resin with BI Resin in Recipe 'bob-rubber'") + if data.raw.recipe["bob-solder"] then + thxbob.lib.recipe.replace_ingredient("bob-solder", "bob-resin", "resin") + BioInd.writeDebug("Replace Bob's Resin with BI Resin in Recipe 'bob-solder'") + end + end --- Updaet seeds to work with Space Age if present. diff --git a/Bio_Industries_2/graphics/icons/advanced_fertilizer.png b/Bio_Industries_2/graphics/icons/advanced_fertilizer.png deleted file mode 100644 index 5f8dfc7..0000000 Binary files a/Bio_Industries_2/graphics/icons/advanced_fertilizer.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/icons/advanced_fertilizer_64.png b/Bio_Industries_2/graphics/icons/advanced_fertilizer_64.png deleted file mode 100644 index d57b6d9..0000000 Binary files a/Bio_Industries_2/graphics/icons/advanced_fertilizer_64.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/icons/cokery_alt.png b/Bio_Industries_2/graphics/icons/cokery_alt.png deleted file mode 100644 index 32fabed..0000000 Binary files a/Bio_Industries_2/graphics/icons/cokery_alt.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/icons/fertilizer_64.png b/Bio_Industries_2/graphics/icons/fertilizer_64.png deleted file mode 100644 index 13e0a53..0000000 Binary files a/Bio_Industries_2/graphics/icons/fertilizer_64.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/icons/fluid_advanced_fertilizer_recipe_64.png b/Bio_Industries_2/graphics/icons/fluid_advanced_fertilizer.png similarity index 100% rename from Bio_Industries_2/graphics/icons/fluid_advanced_fertilizer_recipe_64.png rename to Bio_Industries_2/graphics/icons/fluid_advanced_fertilizer.png diff --git a/Bio_Industries_2/graphics/icons/fluid_advanced_fertilizer_64.png b/Bio_Industries_2/graphics/icons/fluid_advanced_fertilizer_64.png index 76ff8e4..a2c61c5 100644 Binary files a/Bio_Industries_2/graphics/icons/fluid_advanced_fertilizer_64.png and b/Bio_Industries_2/graphics/icons/fluid_advanced_fertilizer_64.png differ diff --git a/Bio_Industries_2/graphics/icons/fluid_fertilizer_recipe_64.png b/Bio_Industries_2/graphics/icons/fluid_fertilizer_recipe_64.png deleted file mode 100644 index 995dee8..0000000 Binary files a/Bio_Industries_2/graphics/icons/fluid_fertilizer_recipe_64.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/icons/mod_bobangels/rubber.png b/Bio_Industries_2/graphics/icons/mod_bobangels/rubber.png new file mode 100644 index 0000000..560e775 Binary files /dev/null and b/Bio_Industries_2/graphics/icons/mod_bobangels/rubber.png differ diff --git a/Bio_Industries_2/info.json b/Bio_Industries_2/info.json index 70a0d6d..7779027 100644 --- a/Bio_Industries_2/info.json +++ b/Bio_Industries_2/info.json @@ -1,6 +1,6 @@ { "name": "Bio_Industries_2", - "version": "2.0.13", + "version": "2.0.17", "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", diff --git a/Bio_Industries_2/locale/en/recipe-description.cfg b/Bio_Industries_2/locale/en/recipe-description.cfg index c31a3a6..7c3747e 100644 --- a/Bio_Industries_2/locale/en/recipe-description.cfg +++ b/Bio_Industries_2/locale/en/recipe-description.cfg @@ -4,6 +4,7 @@ bi-adv-fertilizer-1=Use __ITEM__bi-adv-fertilizer__ for a super production — i bi-adv-fertilizer-2=Use __ITEM__bi-adv-fertilizer__ for a super production — it's far better than __ITEM__fertilizer__! bi-fertilizer-1=__ITEM__fertilizer__ lets your stuff grow faster, it really does! bi-fertilizer-2=__ITEM__fertilizer__ lets your stuff grow faster, it really does! (Made with Sodium hydroxide) +bob-fertiliser=__ITEM__fertilizer__ lets your stuff grow faster, it really does! # Added for 0.18.32/1.1.2 bi-adv-fertilizer-fluid=__ITEM__bi-adv-fertilizer__ dissolved in water bi-fertilizer-fluid=__ITEM__fertilizer__ dissolved in water diff --git a/Bio_Industries_2/locale/en/recipe-name.cfg b/Bio_Industries_2/locale/en/recipe-name.cfg index 1c61fb8..fec772c 100644 --- a/Bio_Industries_2/locale/en/recipe-name.cfg +++ b/Bio_Industries_2/locale/en/recipe-name.cfg @@ -8,6 +8,7 @@ bi-adv-fertilizer-2=__ITEM__bi-adv-fertilizer__ bi-adv-fertilizer-fluid=Liquid __ITEM__bi-adv-fertilizer__ bi-fertilizer-1=__ITEM__fertilizer__ bi-fertilizer-2=__ITEM__fertilizer__ (with sodium hydroxide) +bob-fertiliser=__ITEM__fertilizer__ # Added for 0.18.32/1.1.2 bi-fertilizer-fluid=Liquid __ITEM__fertilizer__ diff --git a/Bio_Industries_2/prototypes/Bio_Cannon/damage-type.lua b/Bio_Industries_2/prototypes/Bio_Cannon/damage-type.lua index c02ca04..740a6b9 100644 --- a/Bio_Industries_2/prototypes/Bio_Cannon/damage-type.lua +++ b/Bio_Industries_2/prototypes/Bio_Cannon/damage-type.lua @@ -4,7 +4,7 @@ data:extend({ --- Bio Damage for new Ammo { type = "damage-type", - name = "Biological" + name = "biological" }, }) diff --git a/Bio_Industries_2/prototypes/Bio_Cannon/entity.lua b/Bio_Industries_2/prototypes/Bio_Cannon/entity.lua index 0a53a8f..f87b9bd 100644 --- a/Bio_Industries_2/prototypes/Bio_Cannon/entity.lua +++ b/Bio_Industries_2/prototypes/Bio_Cannon/entity.lua @@ -120,8 +120,6 @@ if BI.Settings.Bio_Cannon then { type = "ammo-turret", name = "bi-bio-cannon", - icon = ICONPATH_W .. "biocannon_icon.png", - icon_size = 64, icons = {{icon = ICONPATH_W .. "biocannon_icon.png", icon_size = 64}}, flags = {"placeable-neutral", "placeable-player", "player-creation"}, -- makes cannon blueprintable diff --git a/Bio_Industries_2/prototypes/Bio_Cannon/item.lua b/Bio_Industries_2/prototypes/Bio_Cannon/item.lua index 8efafe6..9840e30 100644 --- a/Bio_Industries_2/prototypes/Bio_Cannon/item.lua +++ b/Bio_Industries_2/prototypes/Bio_Cannon/item.lua @@ -13,18 +13,11 @@ if BI.Settings.Bio_Cannon then localised_description = {"entity-description.bi-bio-cannon"}, icon = ICONPATH_W .. "biocannon_icon.png", icon_size = 64, - icon_mipmaps = 1, - icons = { - { - icon = ICONPATH_W .. "biocannon_icon.png", - icon_size = 64, - } - }, subgroup = "defensive-structure", order = "x[turret]-x[gun-turret]", place_result = "bi-bio-cannon", stack_size = 1, - weight = 750*kg, + weight = 750000, }, }) end diff --git a/Bio_Industries_2/prototypes/Bio_Cannon/projectiles-entity.lua b/Bio_Industries_2/prototypes/Bio_Cannon/projectiles-entity.lua index 2591354..5cd3cb3 100644 --- a/Bio_Industries_2/prototypes/Bio_Cannon/projectiles-entity.lua +++ b/Bio_Industries_2/prototypes/Bio_Cannon/projectiles-entity.lua @@ -281,32 +281,24 @@ if BI.Settings.Bio_Cannon then --- Bio Cannon Explosion { - type = "smoke-with-trigger", - name = "bio-cannon-explosion", - flags = {"not-on-map"}, - show_when_smoke_off = true, - animation = { - filename = ICONPATH .. "explosion.png", - priority = "low", - width = 256, - height = 128, - frame_count = 12, - animation_speed = 0.2, - line_length = 3, - scale = 2, - }, - sound = { - { - filename = "__Bio_Industries_2__/sound/boom.ogg", - volume = 4.0 - }, - }, - slow_down_factor = 0, - affected_by_wind = false, - cyclic = false, - duration = 60 * 5, - spread_duration = 10, - }, + type = "explosion", + name = "bio-cannon-explosion", + flags = {"not-on-map"}, + animations = {{ + filename = ICONPATH .. "explosion.png", + priority = "low", + width = 256, + height = 128, + frame_count = 12, + animation_speed = 0.2, + line_length = 3, + scale = 2 + }}, + light = {intensity = 1, size = 30}, + sound = { + variations = {{filename = "__Bio_Industries_2__/sound/boom.ogg", volume = 1.0}} + } + }, --- Napalm Small { diff --git a/Bio_Industries_2/prototypes/Bio_Cannon/projectiles-item.lua b/Bio_Industries_2/prototypes/Bio_Cannon/projectiles-item.lua index cdfd9c8..d43f04e 100644 --- a/Bio_Industries_2/prototypes/Bio_Cannon/projectiles-item.lua +++ b/Bio_Industries_2/prototypes/Bio_Cannon/projectiles-item.lua @@ -12,12 +12,6 @@ if BI.Settings.Bio_Cannon then name = "bi-bio-cannon-proto-ammo", icon = ICONPATH_W .. "bio_cannon_proto_ammo_icon.png", icon_size = 64, - icons = { - { - icon = ICONPATH_W .. "bio_cannon_proto_ammo_icon.png", - icon_size = 64, - } - }, ammo_category = "Bio_Cannon_Ammo", ammo_type = { category = "Bio_Cannon_Ammo", diff --git a/Bio_Industries_2/prototypes/Bio_Farm/compatible_recipes.lua b/Bio_Industries_2/prototypes/Bio_Farm/compatible_recipes.lua index a172683..89e09f3 100644 --- a/Bio_Industries_2/prototypes/Bio_Farm/compatible_recipes.lua +++ b/Bio_Industries_2/prototypes/Bio_Farm/compatible_recipes.lua @@ -84,7 +84,19 @@ if not data.raw.item["resin"] then }, subgroup = "bio-bio-farm-raw", order = "a[bi]-a-bb[bi-resin]", - stack_size = 200 + stack_size = 200, + drop_sound = { + filename = "__base__/sound/item/solid-fuel-inventory-move.ogg", + volume = 0.7, + }, + inventory_move_sound = { + filename = "__base__/sound/item/solid-fuel-inventory-move.ogg", + volume = 0.7, + }, + pick_sound = { + filename = "__base__/sound/item/solid-fuel-inventory-pickup.ogg", + volume = 0.7, + }, }, --- Resin recipe - Wood @@ -236,8 +248,8 @@ end --- Make Bio Farm use glass if Bob's -if data.raw.item.glass then - thxbob.lib.recipe.replace_ingredient("bi-bio-farm", "copper-cable", "glass") +if data.raw.item["bob-glass"] then + thxbob.lib.recipe.replace_ingredient("bi-bio-farm", "copper-cable", "bob-glass") end @@ -311,7 +323,7 @@ end --- Alternative Wooden-Board Recipe for Bob's Electronics -if data.raw.item["wooden-board"] and mods["bobelectronics"] then +if data.raw.item["bob-wooden-board"] and mods["bobelectronics"] then data:extend({ -- Wood - Press Wood { @@ -334,12 +346,13 @@ if data.raw.item["wooden-board"] and mods["bobelectronics"] then always_show_made_in = true, allow_decomposition = false, allow_as_intermediate = false, + allow_productivity = true, ingredients = { {type = "item", name = "bi-woodpulp", amount = 3}, {type = "item", name = "resin", amount = 1}, }, results = { - {type = "item", name = "wooden-board", amount = 6} + {type = "item", name = "bob-wooden-board", amount = 6} }, -- This is a custom property for use by "Krastorio 2" (it will change -- ingredients/results; used for wood/wood pulp) diff --git a/Bio_Industries_2/prototypes/Bio_Farm/recipe.lua b/Bio_Industries_2/prototypes/Bio_Farm/recipe.lua index 12c997b..33bc7c8 100644 --- a/Bio_Industries_2/prototypes/Bio_Farm/recipe.lua +++ b/Bio_Industries_2/prototypes/Bio_Farm/recipe.lua @@ -509,6 +509,7 @@ data:extend({ results = { { type = "item", name = "bi-woodpulp", amount = 4 } }, main_product = "", allow_as_intermediate = true, -- Added for 0.18.34/1.1.4 + allow_productivity = true, allow_intermediates = true, -- Added for 0.18.35/1.1.5 always_show_made_in = false, -- Added for 0.18.34/1.1.4 allow_decomposition = false, -- Added for 0.18.34/1.1.4 @@ -542,6 +543,7 @@ data:extend({ allow_as_intermediate = true, -- Added for 0.18.34/1.1.4 always_show_made_in = false, -- Added for 0.18.34/1.1.4 allow_decomposition = false, -- Added for 0.18.34/1.1.4 + allow_productivity = true, -- This is a custom property for use by "Krastorio 2" (it will change -- ingredients/results; used for wood/wood pulp) mod = "Bio_Industries_2", @@ -574,6 +576,7 @@ data:extend({ allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 always_show_made_in = false, -- Added for 0.18.34/1.1.4 allow_decomposition = false, -- Added for 0.18.34/1.1.4 + allow_productivity = true, -- This is a custom property for use by "Krastorio 2" (it will change -- ingredients/results; used for wood/wood pulp) mod = "Bio_Industries_2", @@ -603,6 +606,7 @@ data:extend({ allow_as_intermediate = true, -- Changed for 0.18.34/1.1.4 always_show_made_in = false, -- Changed for 0.18.34/1.1.4 allow_decomposition = true, -- Changed for 0.18.34/1.1.4 + allow_productivity = true, -- This is a custom property for use by "Krastorio 2" (it will change -- ingredients/results; used for wood/wood pulp) mod = "Bio_Industries_2", @@ -632,7 +636,7 @@ data:extend({ allow_as_intermediate = true, -- Changed for 0.18.34/1.1.4 always_show_made_in = false, -- Changed for 0.18.34/1.1.4 allow_decomposition = true, -- Changed for 0.18.34/1.1.4 - + allow_productivity = true, -- This is a custom property for use by "Krastorio 2" (it will change -- ingredients/results; used for wood/wood pulp) mod = "Bio_Industries_2", @@ -658,7 +662,7 @@ data:extend({ allow_as_intermediate = true, -- Added for 0.18.34/1.1.4 always_show_made_in = false, -- Changed for 0.18.34/1.1.4 allow_decomposition = true, -- Changed for 0.18.34/1.1.4 - + allow_productivity = true, energy_required = 2.5, ingredients = { { type = "item", name = "bi-woodpulp", amount = 12 } }, results = { { type = "item", name = "bi-ash", amount = 6 } }, @@ -692,6 +696,7 @@ data:extend({ always_show_made_in = true, allow_decomposition = false, allow_as_intermediate = false, + allow_productivity = true, -- This is a custom property for use by "Krastorio 2" (it will change -- ingredients/results; used for wood/wood pulp) mod = "Bio_Industries_2", @@ -721,6 +726,7 @@ data:extend({ always_show_made_in = true, allow_decomposition = false, allow_as_intermediate = false, + allow_productivity = true, -- This is a custom property for use by "Krastorio 2" (it will change -- ingredients/results; used for wood/wood pulp) mod = "Bio_Industries_2", @@ -750,7 +756,7 @@ data:extend({ allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 always_show_made_in = true, -- Changed for 0.18.34/1.1.4 allow_decomposition = true, -- Changed for 0.18.34/1.1.4 - + allow_productivity = true, }, @@ -777,7 +783,7 @@ data:extend({ allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 always_show_made_in = true, -- Changed for 0.18.34/1.1.4 allow_decomposition = true, -- Changed for 0.18.34/1.1.4 - + allow_productivity = true, }, @@ -804,7 +810,7 @@ data:extend({ allow_as_intermediate = true, -- Changed for 0.18.34/1.1.4 always_show_made_in = true, -- Changed for 0.18.34/1.1.4 allow_decomposition = true, -- Changed for 0.18.34/1.1.4 - + allow_productivity = true, }, @@ -831,7 +837,7 @@ data:extend({ allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 always_show_made_in = true, -- Changed for 0.18.34/1.1.4 allow_decomposition = true, -- Changed for 0.18.34/1.1.4 - + allow_productivity = true, }, @@ -840,7 +846,6 @@ data:extend({ type = "recipe", name = "bi-pellet-coke", icon = ICONPATH .. "pellet_coke_solid.png", - --icon = "__Bio_Industries_2__/graphics/icons/pellet_coke_c.png", icon_size = 64, icons = { { @@ -859,6 +864,7 @@ data:extend({ allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 always_show_made_in = true, -- Changed for 0.18.34/1.1.4 allow_decomposition = true, -- Changed for 0.18.34/1.1.4 + allow_productivity = true, }, -- CRUSHED STONE from stone -- @@ -884,7 +890,7 @@ data:extend({ allow_as_intermediate = true, -- Added for 0.18.34/1.1.4 always_show_made_in = true, -- Changed for 0.18.34/1.1.4 allow_decomposition = true, -- Changed for 0.18.34/1.1.4 - + allow_productivity = true, }, -- CRUSHED STONE from concrete -- @@ -911,6 +917,7 @@ data:extend({ allow_as_intermediate = true, -- Added for 0.18.34/1.1.4 always_show_made_in = true, -- Changed for 0.18.34/1.1.4 allow_decomposition = true, -- Changed for 0.18.34/1.1.4 + allow_productivity = true, }, -- CRUSHED STONE from hazard concrete -- @@ -937,6 +944,7 @@ data:extend({ allow_as_intermediate = true, -- Added for 0.18.34/1.1.4 always_show_made_in = true, -- Changed for 0.18.34/1.1.4 allow_decomposition = true, -- Changed for 0.18.34/1.1.4 + allow_productivity = true, }, @@ -964,6 +972,7 @@ data:extend({ allow_as_intermediate = true, -- Added for 0.18.34/1.1.4 always_show_made_in = true, -- Changed for 0.18.34/1.1.4 allow_decomposition = true, -- Changed for 0.18.34/1.1.4 + allow_productivity = true, }, -- CRUSHED STONE from refined hazard concrete -- @@ -990,6 +999,7 @@ data:extend({ allow_as_intermediate = true, -- Added for 0.18.34/1.1.4 always_show_made_in = true, -- Changed for 0.18.34/1.1.4 allow_decomposition = true, -- Changed for 0.18.34/1.1.4 + allow_productivity = true, }, -- STONE Brick-- @@ -1021,6 +1031,7 @@ data:extend({ allow_as_intermediate = true, -- Added for 0.18.34/1.1.4 always_show_made_in = true, -- Changed for 0.18.34/1.1.4 allow_decomposition = true, -- Changed for 0.18.34/1.1.4 + allow_productivity = true, }, -- COKERY (ENTITY)-- @@ -1079,6 +1090,7 @@ data:extend({ 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 + allow_productivity = true, subgroup = "bio-bio-farm-raw-entity", order = "b[bi]", }, @@ -1172,6 +1184,7 @@ data:extend({ allow_as_intermediate = true, -- Changed for 0.18.34/1.1.4 always_show_made_in = true, -- Changed for 0.18.34/1.1.4 allow_decomposition = true, -- Changed for 0.18.34/1.1.4 + allow_productivity = true, subgroup = "bio-bio-farm-intermediate-product", order = "b[bi-fertilizer]", }, @@ -1204,6 +1217,7 @@ data:extend({ allow_as_intermediate = true, -- Changed for 0.18.34/1.1.4 always_show_made_in = true, -- Changed for 0.18.34/1.1.4 allow_decomposition = true, -- Changed for 0.18.34/1.1.4 + allow_productivity = true, subgroup = "bio-bio-farm-intermediate-product", order = "b[bi-fertilizer]-b[bi-adv-fertilizer-1]", }, @@ -1236,6 +1250,7 @@ data:extend({ allow_as_intermediate = true, -- Changed for 0.18.34/1.1.4 always_show_made_in = true, -- Changed for 0.18.34/1.1.4 allow_decomposition = true, -- Changed for 0.18.34/1.1.4 + allow_productivity = true, subgroup = "bio-bio-farm-intermediate-product", order = "b[bi-fertilizer]-b[bi-adv-fertilizer-2]", -- This is a custom property for use by "Krastorio 2" (it will change diff --git a/Bio_Industries_2/prototypes/Bio_Fuel/recipe.lua b/Bio_Industries_2/prototypes/Bio_Fuel/recipe.lua index 63f8a2a..22b0c67 100644 --- a/Bio_Industries_2/prototypes/Bio_Fuel/recipe.lua +++ b/Bio_Industries_2/prototypes/Bio_Fuel/recipe.lua @@ -63,6 +63,7 @@ data:extend({ enabled = false, always_show_made_in = true, allow_decomposition = true, + allow_productivity = true, subgroup = "bio-bio-fuel-fluid", order = "x[oil-processing]-z1[bi-biomass]" }, @@ -102,6 +103,7 @@ if BI.Settings.BI_Bio_Fuel then allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 always_show_made_in = true, -- Added for 0.18.34/1.1.4 allow_decomposition = true, -- Added for 0.18.34/1.1.4 + allow_productivity = true, }, --- Bio Boiler (ENTITY) --- @@ -162,6 +164,7 @@ if BI.Settings.BI_Bio_Fuel then enabled = false, always_show_made_in = true, allow_decomposition = false, + allow_productivity = true, subgroup = "bio-bio-fuel-other", order = "[bi-cellulose-1]", }, @@ -194,6 +197,7 @@ if BI.Settings.BI_Bio_Fuel then enabled = false, always_show_made_in = true, allow_decomposition = false, + allow_productivity = true, subgroup = "bio-bio-fuel-other", order = "[bi-cellulose-2]", -- This is a custom property for use by "Krastorio 2" (it will change @@ -233,6 +237,7 @@ if BI.Settings.BI_Bio_Fuel then enabled = false, always_show_made_in = true, allow_decomposition = false, + 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 @@ -267,6 +272,7 @@ if BI.Settings.BI_Bio_Fuel then enabled = false, always_show_made_in = true, allow_decomposition = false, + allow_productivity = true, subgroup = "bio-bio-fuel-solid", order = "g[plastic-bar-2]", }, @@ -299,7 +305,8 @@ if BI.Settings.BI_Bio_Fuel then enabled = false, always_show_made_in = true, allow_decomposition = false, - subgroup = "bio-bio-fuel-fluid", + allow_productivity = true, + subgroup = "bio-bio-fuel-fluid", order = "x[oil-processing]-z2[bi-biomass]" -- This recipe is not as good as bi_biomass_2! }, @@ -332,7 +339,8 @@ if BI.Settings.BI_Bio_Fuel then enabled = false, always_show_made_in = true, allow_decomposition = false, - subgroup = "bio-bio-fuel-fluid", + allow_productivity = true, + subgroup = "bio-bio-fuel-fluid", order = "x[oil-processing]-z3[bi-biomass]" -- This recipe is more powerful than bi_biomass_3! }, @@ -386,6 +394,7 @@ if BI.Settings.BI_Bio_Fuel then enabled = false, always_show_made_in = true, allow_decomposition = false, + allow_productivity = true, energy_required = 5, ingredients = { {type = "fluid", name = "bi-biomass", amount = 10}, @@ -417,6 +426,7 @@ if BI.Settings.BI_Bio_Fuel then enabled = false, always_show_made_in = true, allow_decomposition = false, + allow_productivity = true, energy_required = 2.5, ingredients = { {type = "fluid", name = "bi-biomass", amount = 10}, @@ -453,6 +463,7 @@ if BI.Settings.BI_Bio_Fuel then enabled = false, always_show_made_in = true, allow_decomposition = false, + allow_productivity = true, energy_required = 10, ingredients = { {type = "item", name = "coal", amount = 20}, @@ -499,9 +510,10 @@ if BI.Settings.BI_Bio_Fuel then }, main_product = "", enabled = false, - allow_as_intermediate = false, -- Changed for 0.18.34/1.1.4 + allow_as_intermediate = false, -- Changed for 0.18.34/1.1.4 always_show_made_in = true, -- Added for 0.18.34/1.1.4 allow_decomposition = true, -- Added for 0.18.34/1.1.4 + allow_productivity = true, crafting_machine_tint = { primary = {r = 0.970, g = 0.611, b = 0.000, a = 0.000}, -- #f79b0000 secondary = {r = 0.000, g = 0.680, b = 0.894, a = 0.357}, -- #00ade45b @@ -537,6 +549,7 @@ if BI.Settings.BI_Bio_Fuel then enabled = false, always_show_made_in = true, allow_decomposition = false, + allow_productivity = true, crafting_machine_tint = { primary = {r = 0.875, g = 0.735, b = 0.000, a = 0.000}, -- #dfbb0000 secondary = {r = 0.103, g = 0.940, b = 0.000, a = 0.000}, -- #1aef0000 @@ -571,6 +584,7 @@ if BI.Settings.BI_Bio_Fuel then enabled = false, always_show_made_in = true, allow_decomposition = false, + allow_productivity = true, subgroup = "bio-bio-fuel-solid", order = "i1", }, @@ -600,6 +614,7 @@ if BI.Settings.BI_Bio_Fuel then enabled = false, always_show_made_in = true, allow_decomposition = false, + allow_productivity = true, subgroup = "bio-bio-fuel-solid", order = "i2", }, diff --git a/Bio_Industries_2/prototypes/Bio_Garden/fluid_fertilizer.lua b/Bio_Industries_2/prototypes/Bio_Garden/fluid_fertilizer.lua index 11f5b4c..29cc817 100644 --- a/Bio_Industries_2/prototypes/Bio_Garden/fluid_fertilizer.lua +++ b/Bio_Industries_2/prototypes/Bio_Garden/fluid_fertilizer.lua @@ -36,12 +36,12 @@ data:extend({ { type = "fluid", name = "bi-fertilizer-fluid", - icon = ICONPATH .. "fluid_fertilizer_64.png", + icon = ICONPATH .. "fluid_fertilizer.png", icon_size = 64, icon_mipmaps = 1, icons = { { - icon = ICONPATH .. "fluid_fertilizer_64.png", + icon = ICONPATH .. "fluid_fertilizer.png", icon_size = 64, icon_mipmaps = 1, } @@ -61,12 +61,12 @@ data:extend({ { type = "fluid", name = "bi-adv-fertilizer-fluid", - icon = ICONPATH .. "fluid_advanced_fertilizer_recipe", + icon = ICONPATH .. "fluid_advanced_fertilizer.png", icon_size = 64, icon_mipmaps = 1, icons = { { - icon = ICONPATH .. "fluid_advanced_fertilizer_recipe.png", + icon = ICONPATH .. "fluid_advanced_fertilizer.png", icon_size = 64, icon_mipmaps = 1, } @@ -129,11 +129,11 @@ data:extend({ { type = "recipe", name = "bi-adv-fertilizer-fluid", - icon = ICONPATH .. "fluid_advanced_fertilizer_recipe_64.png", + icon = ICONPATH .. "fluid_advanced_fertilizer.png", icon_size = 64, icons = { { - icon = ICONPATH .. "fluid_advanced_fertilizer_recipe_64.png", + icon = ICONPATH .. "fluid_advanced_fertilizer.png", icon_size = 64, } },