diff --git a/Bio_Industries_2/changelog.txt b/Bio_Industries_2/changelog.txt index d8926a0..852dde3 100644 --- a/Bio_Industries_2/changelog.txt +++ b/Bio_Industries_2/changelog.txt @@ -1,11 +1,4 @@ --------------------------------------------------------------------------------------------------- -Version: 2.0.23 -Date: 17.10.2025 - Bug Fixes: - - Fixed crash when placing bio gardens - - Match bio garden pollution reduction by the amount of trees equivalent the description states - - Correct typo in internal recipe name to fix the localisation ---------------------------------------------------------------------------------------------------- Version: 2.0.22 Date: 16.10.2025 Bug Fixes: diff --git a/Bio_Industries_2/common.lua b/Bio_Industries_2/common.lua index dbd8620..1bd793e 100644 --- a/Bio_Industries_2/common.lua +++ b/Bio_Industries_2/common.lua @@ -692,16 +692,12 @@ return function(mod_name) compound_entity.hidden.pole and compound_entity.hidden.pole.name then local wire_reach = prototypes.entity[compound_entity.hidden.pole.name] and - prototypes.entity[compound_entity.hidden.pole.name].get_max_wire_distance() + prototypes.entity[compound_entity.hidden.pole.name].max_wire_distance if not wire_reach then error("Prototype for hidden pole of Bio gardens doesn't exist!") end - local wire_connector - for _, connector in pairs(pole.get_wire_connectors()) do - wire_connector = connector - connector.disconnect_all() - end + pole.disconnect_neighbour() -- Each pole can only have 5 connections. Let's connect to other hidden -- poles first! @@ -716,7 +712,7 @@ return function(mod_name) for n, neighbour in pairs(neighbours or {}) do if pole ~= neighbour then - connected = wire_connector.connect_to(neighbour) + connected = pole.connect_neighbour(neighbour) common.writeDebug("Connected pole %g to %s %g: %s", { pole.unit_number, neighbour.name, neighbour.unit_number, connected }) end @@ -732,7 +728,7 @@ return function(mod_name) }) common.writeDebug("Pole %g has %s neighbours", { pole.unit_number, #neighbours }) for n, neighbour in pairs(neighbours or {}) do - connected = wire_connector.connect_to(neighbour) + connected = pole.connect_neighbour(neighbour) common.writeDebug("Connected pole %g to neighbour %s (%g): %s", { pole.unit_number, neighbour.name, neighbour.unit_number, connected }) end diff --git a/Bio_Industries_2/info.json b/Bio_Industries_2/info.json index 436305a..de2c3e8 100644 --- a/Bio_Industries_2/info.json +++ b/Bio_Industries_2/info.json @@ -1,6 +1,6 @@ { "name": "Bio_Industries_2", - "version": "2.0.23", + "version": "2.0.22", "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/de/entity-description.cfg b/Bio_Industries_2/locale/de/entity-description.cfg index b052e2c..9c7f50d 100644 --- a/Bio_Industries_2/locale/de/entity-description.cfg +++ b/Bio_Industries_2/locale/de/entity-description.cfg @@ -2,7 +2,7 @@ ## Produktion bi-arboretum=Ein __ENTITY__bi-arboretum__ kann die Bodenfertilität im Umkreis verbessern und Bäume anpflanzen. bi-bio-farm=In der __ENTITY__bi-bio-farm__ wachsen __ENTITY__seedling__e zu Bäumen heran und werden gleich zu __ITEM__wood__ und __ITEM__bi-woodpulp__ verarbeitet. Tagsüber deckt ein integriertes Solarpanel einen Teil des Strombedarfs. -bi-bio-garden=Der __ENTITY__bi-bio-garden__ reinigt die Luft und absorbiert Schadstoffe.\n(Ein __ENTITY__bi-bio-garden__ kann pro Sekunde 1.5 Schadstoffeinheiten absorbieren — etwa so viel wie 1500 Bäume!) +bi-bio-garden=Der __ENTITY__bi-bio-garden__ reinigt die Luft und absorbiert Schadstoffe.\n(Ein __ENTITY__bi-bio-garden__ kann pro Sekunde 45 Schadstoffeinheiten absorbieren — etwa so viel wie 1500 Bäume!) bi-bio-greenhouse=Im __ENTITY__bi-bio-greenhouse__ werden __ENTITY__seedling__e gezüchtet. seedling=Ein junger Baum, der in der __ENTITY__bi-bio-farm__ zu __ITEM__wood__ und __ITEM__bi-woodpulp__ verarbeitet wird, sobald er ausgewachsen ist. Du kannst ihn auch direkt in die Erde pflanzen und dabei zusehen, wie er in der freien Natur zu einem großen Baum heranwächst. \nHinweis: Die __ENTITY__seedling__e wachsen besser, wenn du vorher den Boden düngst! diff --git a/Bio_Industries_2/locale/en/entity-description.cfg b/Bio_Industries_2/locale/en/entity-description.cfg index 5ed3083..b364d8e 100644 --- a/Bio_Industries_2/locale/en/entity-description.cfg +++ b/Bio_Industries_2/locale/en/entity-description.cfg @@ -2,9 +2,9 @@ ## Production bi-arboretum=__ENTITY__bi-arboretum__s change the surrounding terrain with fertilizer or plant trees. bi-bio-farm=__ENTITY__bi-bio-farm__s are where __ENTITY__seedling__s grow into trees that are processed to __ITEM__wood__ and __ITEM__bi-woodpulp__. An integrated solar panel provides some of the energy during the day. -bi-bio-garden=The __ENTITY__bi-bio-garden__ scrubs pollution from the air. (One bio garden can absorb 1.5 pollution units per second — as much as 1500 trees!) -bi-bio-garden-large=The __ENTITY__bi-bio-garden__ scrubs pollution from the air. (One bio garden can absorb 12 pollution units per second — as much as 12,000 trees!) -bi-bio-garden-huge=The __ENTITY__bi-bio-garden__ scrubs pollution from the air. (One bio garden can absorb 96 pollution units per second — as much as 96,000 trees!) +bi-bio-garden=The __ENTITY__bi-bio-garden__ scrubs pollution from the air. (One bio garden can absorb 45 pollution units per second — as much as 1500 trees!) +bi-bio-garden-large=The __ENTITY__bi-bio-garden__ scrubs pollution from the air. (One bio garden can absorb 300 pollution units per second — as much as 12,000 trees!) +bi-bio-garden-huge=The __ENTITY__bi-bio-garden__ scrubs pollution from the air. (One bio garden can absorb 2880 pollution units per second — as much as 96,000 trees!) bi-bio-greenhouse=Just the right place to grow __ITEM__bi-seed__s and __ENTITY__seedling__s! seedling=A young tree, perfect for planting. You can also plant this in the ground and it will grow into a tree. Remember to first fertilize the ground to improve the chances of it growing! diff --git a/Bio_Industries_2/locale/ru/entity-description.cfg b/Bio_Industries_2/locale/ru/entity-description.cfg index 7fcf5af..49295cb 100644 --- a/Bio_Industries_2/locale/ru/entity-description.cfg +++ b/Bio_Industries_2/locale/ru/entity-description.cfg @@ -2,7 +2,7 @@ ## Production bi-arboretum=Терраформер изменяет местность или растущие деревья в радиусе вокруг строения bi-bio-farm=Биоферма, превращает саженцы в древесину. Потребляет больше электричества ночью -bi-bio-garden=Биосад собирает воздух и убирает загрязнение. (-1.5 PU) +bi-bio-garden=Биосад собирает воздух и убирает загрязнение. (-35 PU) bi-bio-greenhouse=Используйте теплицу для роста саженцев seedling=Молодое растение, идеально для посадки. Вы также можете посадить его в землю и оно вырастет в дерево. Помните, что сначала нужно удобрить землю, чтобы увеличить шанс роста. diff --git a/Bio_Industries_2/migrations/2.0.23.json b/Bio_Industries_2/migrations/2.0.23.json deleted file mode 100644 index 7b948c4..0000000 --- a/Bio_Industries_2/migrations/2.0.23.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "recipe": [ - ["bi-bio-garden-lagre", "bi-bio-garden-large"] - ] -} \ No newline at end of file diff --git a/Bio_Industries_2/prototypes/Bio_Farm/technology.lua b/Bio_Industries_2/prototypes/Bio_Farm/technology.lua index 303d06d..494408b 100644 --- a/Bio_Industries_2/prototypes/Bio_Farm/technology.lua +++ b/Bio_Industries_2/prototypes/Bio_Farm/technology.lua @@ -187,7 +187,7 @@ data:extend({ }, { type = "unlock-recipe", - recipe = "bi-bio-garden-large" + recipe = "bi-bio-garden-lagre" }, { type = "unlock-recipe", diff --git a/Bio_Industries_2/prototypes/Bio_Garden/entities.lua b/Bio_Industries_2/prototypes/Bio_Garden/entities.lua index c18e8e3..10aa244 100644 --- a/Bio_Industries_2/prototypes/Bio_Garden/entities.lua +++ b/Bio_Industries_2/prototypes/Bio_Garden/entities.lua @@ -71,7 +71,7 @@ data:extend({ energy_source = { type = "electric", usage_priority = "secondary-input", - emissions_per_minute = { pollution = -1.5 * 60 }, -- Negative value: pollution is absorbed! + emissions_per_minute = { pollution = -45 }, -- Negative value: pollution is absorbed! }, energy_usage = "200kW", ingredient_count = 1, @@ -212,7 +212,7 @@ data:extend({ energy_source = { type = "electric", usage_priority = "secondary-input", - emissions_per_minute = { pollution = -12 * 60 }, -- Negative value: pollution is absorbed! + emissions_per_minute = { pollution = -360 }, -- Negative value: pollution is absorbed! }, energy_usage = "800kW", ingredient_count = 1, @@ -394,7 +394,7 @@ data:extend({ energy_source = { type = "electric", usage_priority = "secondary-input", - emissions_per_minute = { pollution = -96 * 60 }, -- Negative value: pollution is absorbed! + emissions_per_minute = { pollution = -2880 }, -- Negative value: pollution is absorbed! }, energy_usage = "3200kW", ingredient_count = 1, diff --git a/Bio_Industries_2/prototypes/Bio_Garden/recipe.lua b/Bio_Industries_2/prototypes/Bio_Garden/recipe.lua index d399041..179b121 100644 --- a/Bio_Industries_2/prototypes/Bio_Garden/recipe.lua +++ b/Bio_Industries_2/prototypes/Bio_Garden/recipe.lua @@ -34,9 +34,9 @@ data:extend({ --- Garden - Large(ENTITY) { type = "recipe", - name = "bi-bio-garden-large", - localised_name = {"entity-name.bi-bio-garden-large"}, - localised_description = {"entity-description.bi-bio-garden-large"}, + 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, } }, enabled = false, energy_required = 15,