From d7b4df70ccf9b6658d5a40e908f0eae337b88d04 Mon Sep 17 00:00:00 2001
From: Standing-Storm <120433252+Standing-Storm@users.noreply.github.com>
Date: Thu, 12 Dec 2024 16:18:04 -0600
Subject: [PATCH] [Magiclysm] Rock trolls actually turn to stone (#78510)

* Initial commit

* Add rock troll stone statue
---
 .../effect_on_conditions/death_effects.json   |  7 ++++++
 .../furniture_stone.json                      | 22 +++++++++++++++++++
 data/mods/Magiclysm/monsters/monsters.json    |  2 +-
 .../ter_fur_transform/death_effects.json      |  7 ++++++
 4 files changed, 37 insertions(+), 1 deletion(-)
 create mode 100644 data/mods/Magiclysm/effect_on_conditions/death_effects.json
 create mode 100644 data/mods/Magiclysm/furniture_and_terrain/furniture_stone.json
 create mode 100644 data/mods/Magiclysm/ter_fur_transform/death_effects.json

diff --git a/data/mods/Magiclysm/effect_on_conditions/death_effects.json b/data/mods/Magiclysm/effect_on_conditions/death_effects.json
new file mode 100644
index 0000000000000..8eeccbe4d9679
--- /dev/null
+++ b/data/mods/Magiclysm/effect_on_conditions/death_effects.json
@@ -0,0 +1,7 @@
+[
+  {
+    "type": "effect_on_condition",
+    "id": "EOC_ROCK_TROLL_TURN_TO_STONE",
+    "effect": [ { "npc_transform_radius": 0, "ter_furn_transform": "ter_rock_troll_death" } ]
+  }
+]
diff --git a/data/mods/Magiclysm/furniture_and_terrain/furniture_stone.json b/data/mods/Magiclysm/furniture_and_terrain/furniture_stone.json
new file mode 100644
index 0000000000000..52b4718f6fec7
--- /dev/null
+++ b/data/mods/Magiclysm/furniture_and_terrain/furniture_stone.json
@@ -0,0 +1,22 @@
+[
+  {
+    "type": "furniture",
+    "id": "f_rock_troll_statue",
+    "name": "rock troll statue",
+    "description": "A massive block of stone in the shape of a rock troll, because it used to be a rock troll.",
+    "looks_like": "f_statue",
+    "symbol": "T",
+    "color": "dark_gray",
+    "move_cost_mod": -1,
+    "coverage": 50,
+    "required_str": 10,
+    "flags": [ "PLACE_ITEM", "BLOCKSDOOR", "MINEABLE", "SIGN" ],
+    "bash": {
+      "str_min": 16,
+      "str_max": 40,
+      "sound": "smash!",
+      "sound_fail": "thump.",
+      "items": [ { "item": "rock", "count": [ 2, 12 ] } ]
+    }
+  }
+]
diff --git a/data/mods/Magiclysm/monsters/monsters.json b/data/mods/Magiclysm/monsters/monsters.json
index 1d717c5bfcd58..ee39325a4a1a5 100644
--- a/data/mods/Magiclysm/monsters/monsters.json
+++ b/data/mods/Magiclysm/monsters/monsters.json
@@ -366,7 +366,7 @@
     "melee_damage": [ { "damage_type": "bash", "amount": 18 } ],
     "armor": { "bash": 15, "stab": 40, "cut": 35, "bullet": 13, "heat": -30, "acid": -30 },
     "extend": { "flags": [ "SUNDEATH" ] },
-    "death_function": { "corpse_type": "NO_CORPSE", "message": "The %s turns to stone." }
+    "death_function": { "eoc": "EOC_ROCK_TROLL_TURN_TO_STONE", "corpse_type": "NO_CORPSE", "message": "The %s turns to stone." }
   },
   {
     "id": "mon_troll_water",
diff --git a/data/mods/Magiclysm/ter_fur_transform/death_effects.json b/data/mods/Magiclysm/ter_fur_transform/death_effects.json
new file mode 100644
index 0000000000000..49347521690d1
--- /dev/null
+++ b/data/mods/Magiclysm/ter_fur_transform/death_effects.json
@@ -0,0 +1,7 @@
+[
+  {
+    "type": "ter_furn_transform",
+    "id": "ter_rock_troll_death",
+    "furniture": [ { "result": "f_rock_troll_statue", "valid_furniture": [ "f_null", "f_straw_bed" ] } ]
+  }
+]