Fix crashes related to ninja trees and pollution tiles.

pyanodon · Oct 21, 2024 · 532cda9 · 532cda9
1 parent 2a3965e
commit 532cda9
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 44 deletions.
diff --git a/changelog.txt b/changelog.txt
@@ -1,4 +1,9 @@
 ---------------------------------------------------------------------------------------------------
+Version: 3.0.5
+Date: 2024-10-21
+  Changes:
+    - Fix crashes related to ninja trees and pollution tiles.
+---------------------------------------------------------------------------------------------------
 Version: 3.0.4
 Date: 2024-10-21
   Changes:

diff --git a/data.lua b/data.lua
@@ -94,8 +94,7 @@ require "prototypes/items/items"
 require "prototypes/items/canister"
 
 -- (( TILES )) --
---TODO: sort out tile transistions
---require 'prototypes/tiles/polluted-ground'
+require 'prototypes/tiles/polluted-ground'
 
 -- (( FLUIDS )) --
 require "prototypes/fluids/acidgas"

diff --git a/info.json b/info.json
@@ -1,6 +1,6 @@
 {
   "name": "pycoalprocessing",
-  "version": "3.0.4",
+  "version": "3.0.5",
   "factorio_version": "2.0",
   "title": "Pyanodons Coal Processing",
   "author": "Pyanodon, Nexela, Kingarthur, notnotmelon, Mootykins, ShadowGlass, Archezekiel, Quintuple",

diff --git a/prototypes/tiles/polluted-ground.lua b/prototypes/tiles/polluted-ground.lua
@@ -1,5 +1,7 @@
 local sand_vehicle_speed_modifier = _G.sand_vehicle_speed_modifier
 
+local sand_sounds = sound_variations("__base__/sound/walking/sand", 9, 0.8, volume_multiplier("main-menu", 2.9))
+
 local variants = {
     main = {
         {
@@ -42,7 +44,8 @@ local variants = {
     u_transition = {
         picture = "__pycoalprocessinggraphics__/graphics/tiles/polluted-ground/polluted-ground-u.png",
         count = 8
-    }
+    },
+    empty_transitions = true, -- TODO: fix tile transitions
 }
 
 data:extend {{
@@ -55,29 +58,12 @@ data:extend {{
     autoplace = nil,
     layer = 35,
     variants = variants,
-    walking_sound = {
-        {
-            filename = "__base__/sound/walking/sand-01.ogg",
-            volume = 0.8
-        },
-        {
-            filename = "__base__/sound/walking/sand-02.ogg",
-            volume = 0.8
-        },
-        {
-            filename = "__base__/sound/walking/sand-03.ogg",
-            volume = 0.8
-        },
-        {
-            filename = "__base__/sound/walking/sand-04.ogg",
-            volume = 0.8
-        }
-    },
+    walking_sound = sand_sounds,
     map_color = defines.color.brown,
     absorptions_per_second = {pollution = 0.0002},
     vehicle_friction_modifier = sand_vehicle_speed_modifier,
-    transitions = data.raw.tile["dirt-4"].transitions,
-    transitions_between_transitions = data.raw.tile["dirt-4"].transitions_between_transitions,
+    transitions = data.raw.tile["dirt-4"].variants.transitions,
+    transitions_between_transitions = data.raw.tile["dirt-4"].variants.transitions_between_transitions,
 }}
 
 data:extend {{
@@ -91,29 +77,12 @@ data:extend {{
     layer = 36,
     tint = {0.25, 0.25, 0.25, 0.25},
     variants = variants,
-    walking_sound = {
-        {
-            filename = "__base__/sound/walking/sand-01.ogg",
-            volume = 0.8
-        },
-        {
-            filename = "__base__/sound/walking/sand-02.ogg",
-            volume = 0.8
-        },
-        {
-            filename = "__base__/sound/walking/sand-03.ogg",
-            volume = 0.8
-        },
-        {
-            filename = "__base__/sound/walking/sand-04.ogg",
-            volume = 0.8
-        }
-    },
+    walking_sound = sand_sounds,
     map_color = defines.color.brown,
     absorptions_per_second = {pollution = 0.0002},
     vehicle_friction_modifier = sand_vehicle_speed_modifier,
-    transitions = data.raw.tile["dirt-4"].transitions,
-    transitions_between_transitions = data.raw.tile["dirt-4"].transitions_between_transitions,
+    transitions = data.raw.tile["dirt-4"].variants.transitions,
+    transitions_between_transitions = data.raw.tile["dirt-4"].variants.transitions_between_transitions,
 }}
 
 data:extend {{