From dcb84c12eb1a592b04786ef33343d8b070845bbd Mon Sep 17 00:00:00 2001
From: Simon Brodtmann <github@accounts.brodtmann.info>
Date: Sat, 5 Jul 2025 17:40:46 +0200
Subject: [PATCH] Fix tiles

---
 .../prototypes/Bio_Solar_Farm/entities.lua    |  6 ++---
 .../Bio_Solar_Farm/tmp_solar-mat-panel.lua    |  2 +-
 .../prototypes/Wood_Products/entities.lua     | 27 +++----------------
 3 files changed, 8 insertions(+), 27 deletions(-)

diff --git a/Bio_Industries_2/prototypes/Bio_Solar_Farm/entities.lua b/Bio_Industries_2/prototypes/Bio_Solar_Farm/entities.lua
index 575bb12..10064bb 100644
--- a/Bio_Industries_2/prototypes/Bio_Solar_Farm/entities.lua
+++ b/Bio_Industries_2/prototypes/Bio_Solar_Farm/entities.lua
@@ -1,3 +1,4 @@
+local tile_graphics = require("__base__/prototypes/tile/tile-graphics")
 local BioInd = require('common')('Bio_Industries_2')
 require ("util")
 
@@ -243,13 +244,13 @@ data:extend({
     needs_correction = false,
     minable = {hardness = 0.1, mining_time = 0.25, result = "bi-solar-mat"},
     mined_sound = { filename = "__base__/sound/deconstruct-bricks.ogg" },
-    --collision_mask = {"ground-tile", "not-colliding-with-itself"},
-    collision_mask = {"ground-tile"},
+    collision_mask = { layers = { ground_tile = true }},
     collision_box = {{-0.5, -0.5}, {0.5, 0.5}},
     walking_speed_modifier = 1.45,
     layer = 62,
     decorative_removal_probability = 1,
     variants = {
+      transition = tile_graphics.generic_masked_tile_transitions1,
       main = {
         {
           picture = ENTITYPATH .. "solar1.png",
@@ -281,7 +282,6 @@ data:extend({
     },
     walking_sound = sounds.walking_sound,
     map_color = {r = 93, g = 138, b = 168},
-    pollution_absorption_per_second = 0,
     vehicle_friction_modifier = dirt_vehicle_speed_modifer
   },
 })
diff --git a/Bio_Industries_2/prototypes/Bio_Solar_Farm/tmp_solar-mat-panel.lua b/Bio_Industries_2/prototypes/Bio_Solar_Farm/tmp_solar-mat-panel.lua
index ac69a28..17b2837 100644
--- a/Bio_Industries_2/prototypes/Bio_Solar_Farm/tmp_solar-mat-panel.lua
+++ b/Bio_Industries_2/prototypes/Bio_Solar_Farm/tmp_solar-mat-panel.lua
@@ -14,7 +14,7 @@
     selectable_in_game = false,
     max_health = 1,
     resistances = {{type = "fire", percent = 100}},
-    collision_mask = {"ground-tile"},
+    collision_mask = { layers = { ground_tile = true }},
     collision_box = {{-0.0, -0.0}, {0.0, 0.0}},
     selection_box = {{0, 0}, {0, 0}},
     energy_source = {
diff --git a/Bio_Industries_2/prototypes/Wood_Products/entities.lua b/Bio_Industries_2/prototypes/Wood_Products/entities.lua
index 071e4c7..8ef5eb9 100644
--- a/Bio_Industries_2/prototypes/Wood_Products/entities.lua
+++ b/Bio_Industries_2/prototypes/Wood_Products/entities.lua
@@ -1,3 +1,5 @@
+local tile_graphics = require("__base__/prototypes/tile/tile-graphics")
+
 local BioInd = require('common')('Bio_Industries_2')
 
 local ICONPATH = BioInd.modRoot .. "/graphics/icons/"
@@ -7,10 +9,7 @@ local ENTITYPATH = "__base__/graphics/entity/"
 local PIPEPATH = ENTITYPATH .. "pipe/"
 
 local SNDPATH = "__base__/sound/"
---~ local BIGICONS = BioInd.check_base_version("0.18.0")
 
-
--- demo-sounds has been removed in Factorio 1.1, so we need to check the game version!
 local sounds = {}
 sounds.walking_sound = {}
 for i = 1, 11 do
@@ -191,11 +190,12 @@ data:extend({
     --~ minable = {hardness = 0.2, mining_time = 0.5, result = "wood"},
     minable = {hardness = 0.2, mining_time = 0.25, result = "wood"},
     mined_sound = { filename = "__base__/sound/deconstruct-bricks.ogg" },
-    collision_mask = {"ground-tile"},
+    collision_mask = { layers = { ground_tile = true }},
     walking_speed_modifier = 1.2,
     layer = 62,
     decorative_removal_probability = 0.4,
     variants = {
+      transition = tile_graphics.generic_masked_tile_transitions1,
       main = {
         {
           picture = WOODPATH .. "wood_floor/wood1.png",
@@ -230,27 +230,8 @@ data:extend({
         count = 1
       }
     },
-    --~ walking_sound = {
-      --~ {
-        --~ filename = "__base__/sound/walking/concrete-01.ogg",
-        --~ volume = 1.2
-      --~ },
-      --~ {
-        --~ filename = "__base__/sound/walking/concrete-02.ogg",
-        --~ volume = 1.2
-      --~ },
-      --~ {
-        --~ filename = "__base__/sound/walking/concrete-03.ogg",
-        --~ volume = 1.2
-      --~ },
-      --~ {
-        --~ filename = "__base__/sound/walking/concrete-04.ogg",
-        --~ volume = 1.2
-      --~ }
-    --~ },
     walking_sound = sounds.walking_sound,
     map_color = {r = 139, g = 115, b = 85},
-    pollution_absorption_per_second = 0,
     vehicle_friction_modifier = dirt_vehicle_speed_modifer
   },
 })