Merge pull request #112 from O5MO/master

New texture for coal tile
pyanodon · Jan 2, 2025 · 10ac840 · 10ac840
2 parents 064637d + a682804
commit 10ac840
Show file tree

Hide file tree

Showing 20 changed files with 30 additions and 21 deletions.
diff --git a/changelog.txt b/changelog.txt
@@ -8,6 +8,7 @@ Version: 3.0.10
 Date: ???
   Changes:
     - Fixed radars not being connectable to the circuit network
+	- Added new textures for asphalt and coal tile
 ---------------------------------------------------------------------------------------------------
 Version: 3.0.9
 Date: 2024-11-29

diff --git a/graphics/tiles/py-asphalt/concrete-inner-corner.png b/graphics/tiles/py-asphalt/concrete-inner-corner.png
diff --git a/graphics/tiles/py-asphalt/concrete-o.png b/graphics/tiles/py-asphalt/concrete-o.png
diff --git a/graphics/tiles/py-asphalt/concrete-outer-corner.png b/graphics/tiles/py-asphalt/concrete-outer-corner.png
diff --git a/graphics/tiles/py-asphalt/concrete-side.png b/graphics/tiles/py-asphalt/concrete-side.png
diff --git a/graphics/tiles/py-asphalt/concrete-u.png b/graphics/tiles/py-asphalt/concrete-u.png
diff --git a/.../py-asphalt/asphalt-inner-corner-mask.png → ...-asphalt/py-asphalt-inner-corner-mask.png b/.../py-asphalt/asphalt-inner-corner-mask.png → ...-asphalt/py-asphalt-inner-corner-mask.png
diff --git a/graphics/tiles/py-asphalt/asphalt-o-mask.png → ...cs/tiles/py-asphalt/py-asphalt-o-mask.png b/graphics/tiles/py-asphalt/asphalt-o-mask.png → ...cs/tiles/py-asphalt/py-asphalt-o-mask.png
diff --git a/.../py-asphalt/asphalt-outer-corner-mask.png → ...-asphalt/py-asphalt-outer-corner-mask.png b/.../py-asphalt/asphalt-outer-corner-mask.png → ...-asphalt/py-asphalt-outer-corner-mask.png
diff --git a/...cs/tiles/py-asphalt/asphalt-side-mask.png → ...tiles/py-asphalt/py-asphalt-side-mask.png b/...cs/tiles/py-asphalt/asphalt-side-mask.png → ...tiles/py-asphalt/py-asphalt-side-mask.png
diff --git a/graphics/tiles/py-asphalt/asphalt-u-mask.png → ...cs/tiles/py-asphalt/py-asphalt-u-mask.png b/graphics/tiles/py-asphalt/asphalt-u-mask.png → ...cs/tiles/py-asphalt/py-asphalt-u-mask.png
diff --git a/graphics/tiles/py-asphalt/asphalt.png → graphics/tiles/py-asphalt/py-asphalt.png b/graphics/tiles/py-asphalt/asphalt.png → graphics/tiles/py-asphalt/py-asphalt.png
diff --git a/graphics/tiles/py-coal-tile/py-coal-tile-inner-corner-mask.png b/graphics/tiles/py-coal-tile/py-coal-tile-inner-corner-mask.png
diff --git a/graphics/tiles/py-coal-tile/py-coal-tile-o-mask.png b/graphics/tiles/py-coal-tile/py-coal-tile-o-mask.png
diff --git a/graphics/tiles/py-coal-tile/py-coal-tile-outer-corner-mask.png b/graphics/tiles/py-coal-tile/py-coal-tile-outer-corner-mask.png
diff --git a/graphics/tiles/py-coal-tile/py-coal-tile-side-mask.png b/graphics/tiles/py-coal-tile/py-coal-tile-side-mask.png
diff --git a/graphics/tiles/py-coal-tile/py-coal-tile-u-mask.png b/graphics/tiles/py-coal-tile/py-coal-tile-u-mask.png
diff --git a/graphics/tiles/py-coal-tile/py-coal-tile.png b/graphics/tiles/py-coal-tile/py-coal-tile.png
diff --git a/prototypes/tiles/py-asphalt.lua b/prototypes/tiles/py-asphalt.lua
@@ -36,38 +36,38 @@ TILE {
     collision_mask = {layers = {ground_tile = true}},
     walking_speed_modifier = 3.25,
     decorative_removal_probability = 1,
-    layer = 10,
+    layer = 9,
     layer_group = "ground-artificial",
     variants = {
         material_background = {
-			picture = "__pyindustry__/graphics/tiles/py-asphalt/asphalt.png",
+			picture = "__pyindustry__/graphics/tiles/py-asphalt/py-asphalt.png",
 			count = 8,
 			scale = 0.5
 		},
         transition = {
             mask_layout = {
                 inner_corner = {
-                    spritesheet = "__pyindustry__/graphics/tiles/py-asphalt/asphalt-inner-corner-mask.png",
+                    spritesheet = "__pyindustry__/graphics/tiles/py-asphalt/py-asphalt-inner-corner-mask.png",
                     count = 8,
 					scale = 0.5
                 },
                 outer_corner = {
-                    spritesheet = "__pyindustry__/graphics/tiles/py-asphalt/asphalt-outer-corner-mask.png",
+                    spritesheet = "__pyindustry__/graphics/tiles/py-asphalt/py-asphalt-outer-corner-mask.png",
                     count = 8,
 					scale = 0.5
                 },
                 side = {
-                    spritesheet = "__pyindustry__/graphics/tiles/py-asphalt/asphalt-side-mask.png",
+                    spritesheet = "__pyindustry__/graphics/tiles/py-asphalt/py-asphalt-side-mask.png",
                     count = 8,
 					scale = 0.5
                 },
                 u_transition = {
-                    spritesheet = "__pyindustry__/graphics/tiles/py-asphalt/asphalt-u-mask.png",
+                    spritesheet = "__pyindustry__/graphics/tiles/py-asphalt/py-asphalt-u-mask.png",
                     count = 8,
 					scale = 0.5
                 },
                 o_transition = {
-                    spritesheet = "__pyindustry__/graphics/tiles/py-asphalt/asphalt-o-mask.png",
+                    spritesheet = "__pyindustry__/graphics/tiles/py-asphalt/py-asphalt-o-mask.png",
                     count = 4,
 					scale = 0.5
                 }

diff --git a/prototypes/tiles/py-coal-tile.lua b/prototypes/tiles/py-coal-tile.lua
@@ -41,31 +41,40 @@ TILE {
     collision_mask = {layers = {ground_tile = true}},
     walking_speed_modifier = 3.25,
     decorative_removal_probability = 1,
-    layer = 101,
+    layer = 10,
     layer_group = "ground-artificial",
     variants = {
-        main = data.raw.tile["lab-dark-1"].variants.main,
+        material_background = {
+			picture = "__pyindustry__/graphics/tiles/py-coal-tile/py-coal-tile.png",
+			count = 8,
+			scale = 0.5
+		},
         transition = {
-            overlay_layout = {
+            mask_layout = {
                 inner_corner = {
-                    spritesheet = "__pyindustry__/graphics/tiles/py-asphalt/concrete-inner-corner.png",
-                    count = 8
+                    spritesheet = "__pyindustry__/graphics/tiles/py-coal-tile/py-coal-tile-inner-corner-mask.png",
+                    count = 8,
+					scale = 0.5
                 },
                 outer_corner = {
-                    spritesheet = "__pyindustry__/graphics/tiles/py-asphalt/concrete-outer-corner.png",
-                    count = 8
+                    spritesheet = "__pyindustry__/graphics/tiles/py-coal-tile/py-coal-tile-outer-corner-mask.png",
+                    count = 8,
+					scale = 0.5
                 },
                 side = {
-                    spritesheet = "__pyindustry__/graphics/tiles/py-asphalt/concrete-side.png",
-                    count = 8
+                    spritesheet = "__pyindustry__/graphics/tiles/py-coal-tile/py-coal-tile-side-mask.png",
+                    count = 8,
+					scale = 0.5
                 },
                 u_transition = {
-                    spritesheet = "__pyindustry__/graphics/tiles/py-asphalt/concrete-u.png",
-                    count = 8
+                    spritesheet = "__pyindustry__/graphics/tiles/py-coal-tile/py-coal-tile-u-mask.png",
+                    count = 8,
+					scale = 0.5
                 },
                 o_transition = {
-                    spritesheet = "__pyindustry__/graphics/tiles/py-asphalt/concrete-o.png",
-                    count = 1
+                    spritesheet = "__pyindustry__/graphics/tiles/py-coal-tile/py-coal-tile-o-mask.png",
+                    count = 4,
+					scale = 0.5
                 }
             }
         }
@@ -74,5 +83,4 @@ TILE {
     map_color = {r = 50, g = 50, b = 50, a = 1},
     absorptions_per_second = {pollution = 0},
     vehicle_friction_modifier = 0.6,
-    tint = {0.2, 0.2, 0.2}
 }