Updated Angels Storage Addons for 2.0

angelsaddons-storage/changelog.txt

@@ -1,6 +1,6 @@
 ---------------------------------------------------------------------------------------------------
 Version: 1.0.0
-Date: ???
+Date: 23.11.2024
   Changes:
     - Updated for Factorio 2.0 (994)
 ---------------------------------------------------------------------------------------------------

angelsaddons-storage/info.json

@@ -8,7 +8,7 @@
   "homepage": "https://forums.factorio.com/viewforum.php?f=185",
   "description": "Adds pressure tanks (extremely large tanks), warehouses and silos.",
   "dependencies": [
-    "base >= 1.2.0",
+    "base >= 2.0",
     "(?) angelsrefining",
     "? angelspetrochem >= 1.0.0"
   ]

angelsaddons-storage/prototypes/buildings/fluid-tanks.lua

@@ -23,26 +23,24 @@ if angelsmods.addons.storage.pressuretank then
       collision_box = { { -2.3, -2.3 }, { 2.3, 2.3 } },
       selection_box = { { -2.5, -2.5 }, { 2.5, 2.5 } },
       fluid_box = {
-        volume = 35000,
+        volume = 350000,
         pipe_covers = pipecoverspictures(),
         pipe_connections = {
-          { position = { 0, -2.3 }, direction = defines.direction.north },
-          { position = { 2.3, 0 }, direction = defines.direction.east },
-          { position = { -2.3, 0 }, direction = defines.direction.west },
-          { position = { 0, 2.3 }, direction = defines.direction.south },
+          { direction = defines.direction.north, position = { 0, -2 } },
+          { direction = defines.direction.east, position = { 2, 0 } },
+          { direction = defines.direction.west, position = { -2, 0 } },
+          { direction = defines.direction.south, position = { 0, 2 } },
         },
       },
       window_bounding_box = { { -0.125, 0.6875 }, { 0.1875, 1.1875 } },
       pictures = {
         picture = {
-          sheet = {
-            filename = "__angelsaddons-storage__/graphics/entity/pressure-tank-1.png",
-            priority = "extra-high",
-            frames = 1,
-            width = 224,
-            height = 224,
-            shift = { 0, 0 },
-          },
+          filename = "__angelsaddons-storage__/graphics/entity/pressure-tank-1.png",
+          priority = "extra-high",
+          frames = 1,
+          size = { 448, 448 },
+          scale = 0.5,
+          shift = { 0, 0 },
         },
         fluid_background = {
           filename = "__base__/graphics/entity/storage-tank/fluid-background.png",
@@ -70,12 +68,12 @@ if angelsmods.addons.storage.pressuretank then
           height = 30,
           frame_count = 60,
           axially_symmetrical = false,
-          animation_speed = 0.25,
           direction_count = 1,
+          animation_speed = 0.25,
         },
       },
       flow_length_in_ticks = 360,
-      vehicle_impact_sound = { filename = "__base__/sound/car-metal-impact.ogg", volume = 0.65 },
+      impact_category = "metal",
       working_sound = {
         sound = {
           filename = "__base__/sound/storage-tank.ogg",
@@ -120,8 +118,8 @@ if angelsmods.addons.storage.inlinetank and not mods["angelspetrochem"] then
         volume = 20000,
         pipe_covers = pipecoverspictures(),
         pipe_connections = {
-          { position = { 0.5, -0.9 }, direction = defines.direction.north },
-          { position = { 0.5, 0.9 }, direction = defines.direction.south },
+          { direction = defines.direction.north, position = { 0.5, -0.5 } },
+          { direction = defines.direction.south, position = { 0.5, 0.5 } },
         },
       },
       window_bounding_box = { { -0.125, 0.6875 }, { 0.1875, 1.1875 } },
@@ -164,10 +162,20 @@ if angelsmods.addons.storage.inlinetank and not mods["angelspetrochem"] then
           axially_symmetrical = false,
           direction_count = 1,
           animation_speed = 0.25,
+          hr_version = {
+            filename = "__angelsaddons-storage__/graphics/entity/blank.png",
+            priority = "extra-high",
+            width = 1,
+            height = 1,
+            frame_count = 1,
+            axially_symmetrical = false,
+            direction_count = 1,
+            animation_speed = 0.25,
+          },
         },
       },
       flow_length_in_ticks = 360,
-      vehicle_impact_sound = { filename = "__base__/sound/car-metal-impact.ogg", volume = 0.65 },
+      impact_category = "metal",
       working_sound = {
         sound = {
           filename = "__base__/sound/storage-tank.ogg",

angelsaddons-storage/prototypes/buildings/silos.lua

@@ -19,7 +19,7 @@ if angelsmods.addons.storage.silos or angelsmods.addons.storage.oresilos then
       icon = "__angelsaddons-storage__/graphics/icons/silo.png",
       icon_size = 32,
       flags = { "placeable-neutral", "player-creation" },
-      collision_mask = angelsmods.functions.set_building_collision_mask('container', {'elevated_rail'}),
+      collision_mask = {layers={item=true, meltable=true, object=true, player=true, water_tile=true, is_object=true, is_lower_object=true}},
       minable = { mining_time = 1, result = "silo" },
       max_health = 300,
       corpse = "small-remnants",
@@ -35,7 +35,7 @@ if angelsmods.addons.storage.silos or angelsmods.addons.storage.oresilos then
       selection_box = { { -2, -2 }, { 2, 2 } },
       fast_replaceable_group = "silo",
       inventory_size = 256,
-      vehicle_impact_sound = { filename = "__base__/sound/car-metal-impact.ogg", volume = 0.65 },
+      impact_category = "metal",
       picture = {
         filename = "__angelsaddons-storage__/graphics/entity/silo.png",
         priority = "extra-high",

angelsaddons-storage/prototypes/buildings/warehouses.lua

@@ -29,7 +29,7 @@ if angelsmods.addons.storage.warehouses then
       icon = "__angelsaddons-storage__/graphics/icons/warehouse.png",
       icon_size = 32,
       flags = { "placeable-neutral", "player-creation" },
-      collision_mask = angelsmods.functions.set_building_collision_mask('container', {'elevated_rail'}),
+      collision_mask = {layers={item=true, meltable=true, object=true, player=true, water_tile=true, is_object=true, is_lower_object=true, elevated_rail=true}},
       minable = { mining_time = 1, result = "angels-warehouse" },
       max_health = 300,
       corpse = "small-remnants",
@@ -45,12 +45,12 @@ if angelsmods.addons.storage.warehouses then
       selection_box = { { -3, -3 }, { 3, 3 } },
       fast_replaceable_group = "angels-warehouse",
       inventory_size = 768,
-      vehicle_impact_sound = { filename = "__base__/sound/car-metal-impact.ogg", volume = 0.65 },
+      impact_category = "metal",
       picture = {
         filename = "__angelsaddons-storage__/graphics/entity/warehouse.png",
+        size = { 512, 576 },
+        scale = 0.5,
         priority = "extra-high",
-        width = 256,
-        height = 288,
         shift = { 0, -0.5 },
       },
       circuit_wire_connection_point = circuit_connector_definitions["chest"].points,
@@ -77,6 +77,8 @@ if angelsmods.addons.storage.warehouses then
     cont_add.type = "logistic-container"
     cont_add.icon = "__angelsaddons-storage__/graphics/icons/warehouse-log-" .. name .. ".png"
     cont_add.picture.filename = "__angelsaddons-storage__/graphics/entity/warehouse-log-" .. name .. ".png"
+    cont_add.picture.size = { 512, 576 }
+    cont_add.picture.scale = 0.5
     cont_add.minable.result = "angels-warehouse-" .. stat.mode
     cont_add.logistic_mode = stat.mode
     cont_add.inventory_size = stat.stacks

angelsaddons-storage/prototypes/overrides/silos.lua

@@ -37,20 +37,20 @@ if angelsmods.addons.storage.oresilos and angelsmods.refining then
         {
           name = "silo-" .. ore_name,
           ingredients = {
-            { type = "item", name = "angels-" .. ore_name .. "-crushed", amount = 10 },
+            { "angels-" .. ore_name .. "-crushed", 10 },
           },
         },
       })
     else
-      angelsmods.functions.hide("silo-" .. ore_name)
+      data.raw.recipe["silo-" .. ore_name].hidden = true
       angelsmods.functions.OV.disable_recipe("silo-" .. ore_name)
     end
   end
   angelsmods.functions.OV.patch_recipes({
     {
       name = "silo-coal",
       ingredients = {
-        { type = "item", name = angelsmods.petrochem and "coal-crushed" or "coal", amount = 10 },
+        { angelsmods.petrochem and "coal-crushed" or "coal", 10 },
       },
     },
   })

angelsaddons-storage/prototypes/recipes/fluid-tanks.lua

@@ -11,7 +11,7 @@ if angelsmods.addons.storage.pressuretank then
         { type = "item", name = "stone-brick", amount = 20 },
         { type = "item", name = "pipe", amount = 50 },
       },
-      results = { { type = "item", name = "angels-pressure-tank-1", amount = 1 } },
+      results = {{type = "item", name = "angels-pressure-tank-1", amount = 1}},
       icon_size = 32,
     },
   })
@@ -23,13 +23,12 @@ if angelsmods.addons.storage.inlinetank and not mods["angelspetrochem"] then
     {
       type = "recipe",
       name = "angels-storage-tank-3",
-      localised_name = { "item-name.angels-storage-tank-3" },
       energy_required = 5,
       enabled = false,
       ingredients = {
         { type = "item", name = "steel-plate", amount = 10 },
       },
-      results = { { type = "item", name = "angels-storage-tank-3", amount = 1 } },
+      results = {{type = "item", name = "angels-storage-tank-3", amount = 1}},
     },
   })
 end

angelsaddons-storage/prototypes/recipes/silos.lua

@@ -13,7 +13,9 @@ if angelsmods.addons.storage.silos or angelsmods.addons.storage.oresilos then
         { type = "item", name = "steel-plate", amount = 10 },
         { type = "item", name = "stone-brick", amount = 20 },
       },
-      results = {{ type = "item", name = "silo", amount = 1 }},
+      results = {
+        {type = "item", name = "silo", amount = 1}
+      },
     },
   })
 end
@@ -31,7 +33,9 @@ if angelsmods.addons.storage.oresilos then
       ingredients = {
         { type = "item", name = "silo", amount = 1 },
       },
-      results = {{ type = "item", name = "silo-ore1", amount = 1 }},
+      results = {
+        {type = "item", name = "silo-ore1", amount = 1}
+      },
     },
     {
       type = "recipe",
@@ -41,7 +45,9 @@ if angelsmods.addons.storage.oresilos then
       ingredients = {
         { type = "item", name = "silo", amount = 1 },
       },
-      results = {{ type = "item", name = "silo-ore2", amount = 1 }},
+      results = {
+        {type = "item", name = "silo-ore2", amount = 1}
+      },
     },
     {
       type = "recipe",
@@ -51,7 +57,9 @@ if angelsmods.addons.storage.oresilos then
       ingredients = {
         { type = "item", name = "silo", amount = 1 },
       },
-      results = {{ type = "item", name = "silo-ore3", amount = 1 }},
+      results = {
+        {type = "item", name = "silo-ore3", amount = 1}
+      },
     },
     {
       type = "recipe",
@@ -61,7 +69,9 @@ if angelsmods.addons.storage.oresilos then
       ingredients = {
         { type = "item", name = "silo", amount = 1 },
       },
-      results = {{ type = "item", name = "silo-ore4", amount = 1 }},
+      results = {
+        {type = "item", name = "silo-ore4", amount = 1}
+      },
     },
     {
       type = "recipe",
@@ -71,7 +81,9 @@ if angelsmods.addons.storage.oresilos then
       ingredients = {
         { type = "item", name = "silo", amount = 1 },
       },
-      results = {{ type = "item", name = "silo-ore5", amount = 1 }},
+      results = {
+        {type = "item", name = "silo-ore5", amount = 1}
+      },
     },
     {
       type = "recipe",
@@ -81,7 +93,9 @@ if angelsmods.addons.storage.oresilos then
       ingredients = {
         { type = "item", name = "silo", amount = 1 },
       },
-      results = {{ type = "item", name = "silo-ore6", amount = 1 }},
+      results = {
+        {type = "item", name = "silo-ore6", amount = 1}
+      },
     },
     {
       type = "recipe",
@@ -91,7 +105,9 @@ if angelsmods.addons.storage.oresilos then
       ingredients = {
         { type = "item", name = "silo", amount = 1 },
       },
-      results = {{ type = "item", name = "silo-coal", amount = 1 }},
+      results = {
+        {type = "item", name = "silo-coal", amount = 1}
+      },
     },
   })
 end
@@ -111,7 +127,9 @@ if angelsmods.addons.storage.silos then
         { type = "item", name = "steel-plate", amount = 10 },
         { type = "item", name = mods["angelsindustries"] and "electronic-circuit" or "advanced-circuit", amount = 10 },
       },
-      results = {{ type = "item", name = "silo-passive-provider", amount = 1 }},
+      results = {
+        {type = "item", name = "silo-passive-provider", amount = 1}
+      },
     },
     {
       type = "recipe",
@@ -123,7 +141,9 @@ if angelsmods.addons.storage.silos then
         { type = "item", name = "steel-plate", amount = 10 },
         { type = "item", name = "advanced-circuit", amount = 10 },
       },
-      results = {{ type = "item", name = "silo-active-provider", amount = 1 }},
+      results = {
+        {type = "item", name = "silo-active-provider", amount = 1}
+      },
     },
     {
       type = "recipe",
@@ -135,7 +155,9 @@ if angelsmods.addons.storage.silos then
         { type = "item", name = "steel-plate", amount = 10 },
         { type = "item", name = mods["angelsindustries"] and "electronic-circuit" or "advanced-circuit", amount = 10 },
       },
-      results = {{ type = "item", name = "silo-requester", amount = 1 }},
+      results = {
+        {type = "item", name = "silo-requester", amount = 1}
+      },
     },
     {
       type = "recipe",
@@ -147,7 +169,9 @@ if angelsmods.addons.storage.silos then
         { type = "item", name = "steel-plate", amount = 10 },
         { type = "item", name = mods["angelsindustries"] and "electronic-circuit" or "advanced-circuit", amount = 10 },
       },
-      results = {{ type = "item", name = "silo-storage", amount = 1 }},
+      results = {
+        {type = "item", name = "silo-storage", amount = 1}
+      },
     },
     {
       type = "recipe",
@@ -159,7 +183,9 @@ if angelsmods.addons.storage.silos then
         { type = "item", name = "steel-plate", amount = 10 },
         { type = "item", name = "advanced-circuit", amount = 10 },
       },
-      results = {{ type = "item", name = "silo-buffer", amount = 1 }},
+      results = {
+        {type = "item", name = "silo-buffer", amount = 1}
+      },
     },
   })
 end