Version 1.1.2 Patch 1 #905

angelsaddons-nilaus/changelog.txt

@@ -1,4 +1,9 @@
 ---------------------------------------------------------------------------------------------------
+Version: 0.3.13
+Date: xx.xx.xxxx
+  Changes:
+    - Fixed incorrect ordening of truck mk1 and mk2
+---------------------------------------------------------------------------------------------------
 Version: 0.3.12
 Date: 27.11.2020
   Changes:

angelsaddons-nilaus/data-updates.lua

@@ -35,8 +35,8 @@ if has_vehicle_equipment() then
 
   if angelsmods and angelsmods.industries then
     data.raw["item-with-entity-data"]["nilaus-truck"].subgroup = "angels-vehicle-car"
-    data.raw["item-with-entity-data"]["nilaus-truck"].order = "a[car]-b[nilaus-truck]"
+    data.raw["item-with-entity-data"]["nilaus-truck"].order = "a[car]-b[nilaus-truck]-a"
     data.raw["item-with-entity-data"]["nilaus-truck-2"].subgroup = "angels-vehicle-car"
-    data.raw["item-with-entity-data"]["nilaus-truck-2"].order = "a[car]-b[nilaus-truck-mk2]"
+    data.raw["item-with-entity-data"]["nilaus-truck-2"].order = "a[car]-b[nilaus-truck]-b"
   end
 end

angelsaddons-nilaus/info.json

@@ -1,6 +1,6 @@
 {
   "name": "angelsaddons-nilaus",
-  "version": "0.3.12",
+  "version": "0.3.13",
   "factorio_version": "1.1",
   "title": "Angel's Addons - Decorations - Nilaus",
   "author": "Arch666Angel",

angelsaddons-nilaus/prototypes/buildings/truck.lua

@@ -24,7 +24,7 @@ data:extend({
     },
     icon_size = 64,
     subgroup = "transport",
-    order = "b[nilaus-truck]",
+    order = "b[nilaus-truck]-a",
     place_result = "nilaus-truck",
     stack_size = 1,
   },
@@ -384,7 +384,7 @@ data:extend({
     },
     icon_size = 64,
     subgroup = "transport",
-    order = "b[nilaus-truck-mk2]",
+    order = "b[nilaus-truck]-b",
     place_result = "nilaus-truck-2",
     stack_size = 1,
   },

angelsbioprocessing/changelog.txt

@@ -1,4 +1,10 @@
 ---------------------------------------------------------------------------------------------------
+Version: 0.7.24
+Date: xx.xx.2023
+  Bugfixes:
+    - Fixed info about pollution absorbtion rate was incorrect for the biologically active tile.
+    - Fixed production statistics of garden duplication.
+---------------------------------------------------------------------------------------------------
 Version: 0.7.23
 Date: 01.01.2023
   Changes:

angelsbioprocessing/info.json

@@ -1,6 +1,6 @@
 {
   "name": "angelsbioprocessing",
-  "version": "0.7.23",
+  "version": "0.7.24",
   "factorio_version": "1.1",
   "title": "Angel's Bioprocessing",
   "author": "Arch666Angel",

angelsbioprocessing/prototypes/buildings/bio-tile.lua

@@ -1,5 +1,5 @@
 local pollution_absorption_per_second = data.raw["tile"]["out-of-map"].pollution_absorption_per_second
-  * settings.startup["angels-bio-tile-pollution-absorbtion-multiplier"].value
+  * (2 ^ (settings.startup["angels-bio-tile-pollution-absorbtion-multiplier"].value - 1))
 data:extend({
   {
     type = "item",
@@ -26,8 +26,7 @@ data:extend({
     walking_speed_modifier = 1.3,
     layer = 80,
     decorative_removal_probability = 1,
-    pollution_absorption_per_second = data.raw["tile"]["out-of-map"].pollution_absorption_per_second
-      * (2 ^ (settings.startup["angels-bio-tile-pollution-absorbtion-multiplier"].value - 1)),
+    pollution_absorption_per_second = pollution_absorption_per_second,
     variants = {
       main = {
         {

angelsbioprocessing/prototypes/recipes/crop-farming-gardens.lua

@@ -40,7 +40,7 @@ data:extend({
     enabled = false,
     energy_required = 60,
     ingredients = {
-      { type = "item", name = "temperate-garden", amount = 1 },
+      { type = "item", name = "temperate-garden", amount = 1, catalyst_amount = 1 },
       { type = "item", name = "solid-alienated-fertilizer", amount = 2 },
       { type = "item", name = "token-bio", amount = 30 },
       { type = "fluid", name = "water-mineralized", amount = 50 },
@@ -202,7 +202,7 @@ data:extend({
     enabled = false,
     energy_required = 60,
     ingredients = {
-      { type = "item", name = "desert-garden", amount = 1 },
+      { type = "item", name = "desert-garden", amount = 1, catalyst_amount = 1 },
       { type = "item", name = "solid-alienated-fertilizer", amount = 2 },
       { type = "item", name = "token-bio", amount = 30 },
       { type = "fluid", name = "water-mineralized", amount = 50 },
@@ -364,7 +364,7 @@ data:extend({
     enabled = false,
     energy_required = 60,
     ingredients = {
-      { type = "item", name = "swamp-garden", amount = 1 },
+      { type = "item", name = "swamp-garden", amount = 1, catalyst_amount = 1 },
       { type = "item", name = "solid-alienated-fertilizer", amount = 2 },
       { type = "item", name = "token-bio", amount = 30 },
       { type = "fluid", name = "water-mineralized", amount = 50 },

angelsbioprocessing/prototypes/technology/bio-processing-alien.lua

@@ -289,6 +289,7 @@ data:extend({
       "bio-processing-crystal-splinter-1",
       "ore-powderizer",
       "geode-processing-2",
+      "slag-processing-2",
     },
     effects = {
       {

angelsbioprocessing/prototypes/technology/bio-processing-wood-paper.lua

@@ -13,10 +13,6 @@ data:extend({
         type = "unlock-recipe",
         recipe = "wood-pellets",
       },
-      {
-        type = "unlock-recipe",
-        recipe = "bio-resin-wood-reprocessing",
-      },
     },
     unit = {
       count = 50,
@@ -132,6 +128,10 @@ data:extend({
         type = "unlock-recipe",
         recipe = "solid-saw",
       },
+      {
+        type = "unlock-recipe",
+        recipe = "bio-resin-wood-reprocessing",
+      },
     },
     unit = {
       count = 50,
@@ -375,10 +375,6 @@ data:extend({
         type = "unlock-recipe",
         recipe = "bio-plastic",
       },
-      {
-        type = "unlock-recipe",
-        recipe = "solid-plastic",
-      },
     },
     unit = {
       count = 50,

angelsdev-unit-test/unit-tests/unit-test-009.lua

@@ -95,7 +95,42 @@ local function try_find_entity_for(recipe)
       (not entity.fixed_recipe or (entity.fixed_recipe == recipe.name))
       and (entity.ingredient_count >= item_ingredient_count)
     then
-      return true
+      if (fluid_ingredient_count == 0) and (fluid_product_count == 0) then
+        return true
+      end
+
+      local fluid_ingredient_capacity = 0
+      local fluid_product_capacity = 0
+      local fluid_input_product_capacity = 0
+      for _, fluidbox_prototype in pairs(entity.fluidbox_prototypes) do
+        if fluidbox_prototype.production_type == "input" then
+          fluid_ingredient_capacity = fluid_ingredient_capacity + 1
+        elseif fluidbox_prototype.production_type == "output" then
+          fluid_product_capacity = fluid_product_capacity + 1
+        elseif fluidbox_prototype.production_type == "input-output" then
+          fluid_input_product_capacity = fluid_input_product_capacity + 1
+        end
+      end
+
+      if (fluid_ingredient_count <= fluid_ingredient_capacity) and (fluid_product_count <= fluid_product_capacity) then
+        return true
+      end
+
+      local fluid_input_product_capacity_ingredient_required = 0
+      local fluid_input_product_capacity_product_required = 0
+      if fluid_ingredient_count > fluid_ingredient_capacity then
+        fluid_input_product_capacity_ingredient_required = fluid_ingredient_count - fluid_ingredient_capacity
+      end
+      if fluid_product_count > fluid_product_capacity then
+        fluid_input_product_capacity_product_required = fluid_product_count - fluid_product_capacity
+      end
+
+      if
+        fluid_input_product_capacity_ingredient_required + fluid_input_product_capacity_ingredient_required
+        <= fluid_input_product_capacity
+      then
+        return true
+      end
     end
   end