Fixed that caravans had no collision with most entities in the game.

pyanodon · Nov 9, 2024 · e0f826c · e0f826c
1 parent 30450e8
commit e0f826c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 12 deletions.
diff --git a/changelog.txt b/changelog.txt
@@ -14,6 +14,7 @@ Date: ?
     - The "transfer all items" and "wait until N" caravan actions now sort and merge both the output and input inventories after delivery. Resolves https://github.com/pyanodon/pybugreports/issues/670
     - Deleted duplicate recipe for soil seperation from the pycodex.
     - Fixed a bug in the caravan GUI causing the "play" and "pause" buttons to show different information than the actual internal state.
+    - Fixed that caravans had no collision with most entities in the game.
 ---------------------------------------------------------------------------------------------------
 Version: 3.0.18
 Date: 2024-11-7

diff --git a/data-updates.lua b/data-updates.lua
@@ -305,12 +305,6 @@ local walkable_types = {
     ["inserter"] = true
 }
 
-local vessel_placeable_entities = {
-    ["pipe"] = true,
-    ["pipe-to-ground"] = true,
-    ["inserter"] = true
-}
-
 for _, prototype in pairs(collision_mask_util.collect_prototypes_with_layer("object")) do
     local mask = collision_mask_util.get_mask(prototype)
     if mask.layers["water_tile"] then
@@ -320,6 +314,7 @@ for _, prototype in pairs(collision_mask_util.collect_prototypes_with_layer("obj
             end
         end
     end
+    prototype.collision_mask = mask
 end
 
 for _, tile in pairs(data.raw.tile) do
@@ -330,11 +325,6 @@ for _, tile in pairs(data.raw.tile) do
     end
 end
 
-if register_cache_file ~= nil then
-    register_cache_file({"pycoalprocessing", "pyfusionenergy", "pyindustry", "pyrawores", "pypetroleumhandling", "pyalienlife"}, "__pyalienlife__/cached-configs/pyalienlife+pycoalprocessing+pyfusionenergy+pyindustry+pypetroleumhandling+pyrawores")
-    register_cache_file({"pycoalprocessing", "pyfusionenergy", "pyindustry", "pyrawores", "pyhightech", "pypetroleumhandling", "pyalienlife"}, "__pyalienlife__/cached-configs/pyalienlife+pycoalprocessing+pyfusionenergy+pyhightech+pyindustry+pypetroleumhandling+pyrawores")
-end
-
 -- make players flammable
 for _, character in pairs(data.raw.character) do
     if character.flags then
@@ -355,7 +345,7 @@ local dingrido_nonwalkable_prototypes = {
     "simple-entity",
     "cliff",
     "unit",
-    "turret",
+    "turret", -- this exists in order to allow killing worms
 }
 for _, prototype in pairs(dingrido_nonwalkable_prototypes) do
     for _, entity in pairs(data.raw[prototype]) do
@@ -366,3 +356,8 @@ for _, prototype in pairs(dingrido_nonwalkable_prototypes) do
         end
     end
 end
+
+if register_cache_file ~= nil then
+    register_cache_file({"pycoalprocessing", "pyfusionenergy", "pyindustry", "pyrawores", "pypetroleumhandling", "pyalienlife"}, "__pyalienlife__/cached-configs/pyalienlife+pycoalprocessing+pyfusionenergy+pyindustry+pypetroleumhandling+pyrawores")
+    register_cache_file({"pycoalprocessing", "pyfusionenergy", "pyindustry", "pyrawores", "pyhightech", "pypetroleumhandling", "pyalienlife"}, "__pyalienlife__/cached-configs/pyalienlife+pycoalprocessing+pyfusionenergy+pyhightech+pyindustry+pypetroleumhandling+pyrawores")
+end