From 545b915a79771ca5c5bb4a80f8b46d8572eaca5a Mon Sep 17 00:00:00 2001
From: Simon Brodtmann <github@accounts.brodtmann.info>
Date: Tue, 4 Feb 2025 14:45:53 +0100
Subject: [PATCH] Use mod pollution-as-surface-property

---
 lignumis/info.json                                        | 1 +
 lignumis/locale/en/strings.cfg                            | 6 ------
 lignumis/locale/zh-CN/strings.cfg                         | 6 ------
 .../prototypes/content/active-noise-cancelling-tower.lua  | 4 ++--
 lignumis/prototypes/content/lignumis/planet.lua           | 8 +-------
 lignumis/prototypes/integrations/vanilla.lua              | 6 ------
 6 files changed, 4 insertions(+), 27 deletions(-)

diff --git a/lignumis/info.json b/lignumis/info.json
index e55ad0c..1feccd4 100644
--- a/lignumis/info.json
+++ b/lignumis/info.json
@@ -17,6 +17,7 @@
         "mf-buildings >= 1.0.7",
         "mf-logistics >= 1.0.1",
         "Wood-Walls >= 1.2.0",
+        "pollution-as-surface-property",
         "?hot-metals >= 1.1.0",
         "?wood-military >= 2.3.3",
         "?metal-and-stars",
diff --git a/lignumis/locale/en/strings.cfg b/lignumis/locale/en/strings.cfg
index 9cc39c1..18eaf5e 100644
--- a/lignumis/locale/en/strings.cfg
+++ b/lignumis/locale/en/strings.cfg
@@ -156,12 +156,6 @@ lignumis-belt-progression=Yellow belts will require wood belts to craft.
 lignumis-inserter-progression=Yellow electric inserter will require burner inserter to craft.
 lignumis-ammo-progression=Firearm magazines will require wooden darts magazines to craft.
 
-[surface-property-name]
-pollution-type=Pollution type
-
-[surface-property-unit]
-pollution-type=__plural_for_parameter__1__{1=Pollution|2=Spores|3=Noise|rest=-}__
-
 [entity-status]
 no-quality-catalyst=No quality catalyst
 
diff --git a/lignumis/locale/zh-CN/strings.cfg b/lignumis/locale/zh-CN/strings.cfg
index 8542905..54a2640 100644
--- a/lignumis/locale/zh-CN/strings.cfg
+++ b/lignumis/locale/zh-CN/strings.cfg
@@ -154,12 +154,6 @@ lignumis-belt-progression=基础传送带需要木制传送带制作。
 lignumis-inserter-progression=电力机械臂需要热能机械臂制作。
 lignumis-ammo-progression=标准弹匣需要木镖弹匣制作。
 
-[surface-property-name]
-pollution-type=污染物类型
-
-[surface-property-unit]
-pollution-type=__plural_for_parameter__1__{1=污染|2=孢子|3=噪音|rest=-}__
-
 [entity-status]
 no-quality-catalyst=无品质催化剂
 
diff --git a/lignumis/prototypes/content/active-noise-cancelling-tower.lua b/lignumis/prototypes/content/active-noise-cancelling-tower.lua
index 63cebfd..fa60a6f 100644
--- a/lignumis/prototypes/content/active-noise-cancelling-tower.lua
+++ b/lignumis/prototypes/content/active-noise-cancelling-tower.lua
@@ -77,7 +77,7 @@ data:extend({
             rotate = false,
             orientation_to_variation = false
         },
-        surface_conditions = { { property = "pollution-type", min = 3, max = 3 } }
+        surface_conditions = { { property = "pollutant-type", min = 3, max = 3 } }
     },
     {
         type = "item",
@@ -119,7 +119,7 @@ data:extend({
         category = "active-noise-cancelling",
         hide_from_stats = true,
         hide_from_player_crafting = true,
-        surface_conditions = { { property = "pollution-type", min = 3, max = 3 } }
+        surface_conditions = { { property = "pollutant-type", min = 3, max = 3 } }
     },
     {
         type = "technology",
diff --git a/lignumis/prototypes/content/lignumis/planet.lua b/lignumis/prototypes/content/lignumis/planet.lua
index 3ccda40..90448a1 100644
--- a/lignumis/prototypes/content/lignumis/planet.lua
+++ b/lignumis/prototypes/content/lignumis/planet.lua
@@ -49,8 +49,7 @@ PlanetsLib:extend({
             departure = { "default-rocket-a" }
         },
         surface_properties = {
-            ["day-night-cycle"] = 2 * minute,
-            ["pollution-type"] = 3
+            ["day-night-cycle"] = 2 * minute
         },
         asteroid_spawn_influence = 1,
         asteroid_spawn_definitions = asteroid_util.spawn_definitions(nauvis_lignumis, 0.9),
@@ -111,11 +110,6 @@ PlanetsLib:extend({
 PlanetsLib.borrow_music(data.raw.planet["nauvis"], data.raw.planet["lignumis"])
 
 data:extend({
-    {
-        type = "surface-property",
-        name = "pollution-type",
-        default_value = 0
-    },
     {
         type = "space-connection",
         name = "nauvis-lignumis",
diff --git a/lignumis/prototypes/integrations/vanilla.lua b/lignumis/prototypes/integrations/vanilla.lua
index e5dfc73..15ab920 100644
--- a/lignumis/prototypes/integrations/vanilla.lua
+++ b/lignumis/prototypes/integrations/vanilla.lua
@@ -304,12 +304,6 @@ data.raw["equipment-grid"]["medium-equipment-grid"].width = 8
 data.raw["equipment-grid"]["medium-equipment-grid"].height = 8
 
 
--- Add pollution as surface property
-
-data.raw["planet"]["nauvis"].surface_properties["pollution-type"] = 1
-data.raw["planet"]["gleba"].surface_properties["pollution-type"] = 2
-
-
 -- Always show Nauvis icon
 
 local nauvis = data.raw.planet["nauvis"]