From 96681cd44889f580ca6ff73b7f8d7d7e7962199e Mon Sep 17 00:00:00 2001
From: juliancoffee <lightdarkdaughter@gmail.com>
Date: Fri, 2 Feb 2024 22:31:41 +0200
Subject: [PATCH] Remove/Deprecate KillSource::Environment

---
 assets/voxygen/i18n/en/hud/chat.ftl | 1 -
 client/src/lib.rs                   | 1 -
 common/src/comp/chat.rs             | 5 ++++-
 server/src/chat.rs                  | 6 ++++--
 voxygen/i18n-helpers/src/lib.rs     | 7 -------
 5 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/assets/voxygen/i18n/en/hud/chat.ftl b/assets/voxygen/i18n/en/hud/chat.ftl
index 1f74f3d932..f122c4fbfb 100644
--- a/assets/voxygen/i18n/en/hud/chat.ftl
+++ b/assets/voxygen/i18n/en/hud/chat.ftl
@@ -47,7 +47,6 @@ hud-chat-npc_other_kill_msg = { $attacker } killed [{ $victim }]
 
 ## Other deaths
 
-hud-chat-environmental_kill_msg = [{ $name }] died in { $environment }
 hud-chat-fall_kill_msg = [{ $name }] died from fall damage
 hud-chat-suicide_msg = [{ $name }] died from self-inflicted wounds
 hud-chat-default_death_msg = [{ $name }] died
diff --git a/client/src/lib.rs b/client/src/lib.rs
index 96f2308845..c5dbc2301a 100644
--- a/client/src/lib.rs
+++ b/client/src/lib.rs
@@ -2940,7 +2940,6 @@ impl Client {
                         add_data_of(attacker_uid);
                     },
                     KillSource::NonPlayer(_, _)
-                    | KillSource::Environment(_)
                     | KillSource::FallDamage
                     | KillSource::Suicide
                     | KillSource::NonExistent(_)
diff --git a/common/src/comp/chat.rs b/common/src/comp/chat.rs
index 6feaa82d17..d8017cabda 100644
--- a/common/src/comp/chat.rs
+++ b/common/src/comp/chat.rs
@@ -73,7 +73,10 @@ pub enum KillSource {
     Player(Uid, KillType),
     NonPlayer(String, KillType),
     NonExistent(KillType),
-    Environment(String),
+    // #[deprecated = "if you use it, please expose enum for translators"]
+    //
+    // when I say 'enum' I mean it, not just arg to Content.
+    // Environment(String),
     FallDamage,
     Suicide,
     Other,
diff --git a/server/src/chat.rs b/server/src/chat.rs
index aa7d8d4be8..747c7b56b1 100644
--- a/server/src/chat.rs
+++ b/server/src/chat.rs
@@ -22,7 +22,10 @@ pub enum KillSource {
     Player(PlayerInfo, KillType),
     NonPlayer(String, KillType),
     NonExistent(KillType),
-    Environment(String),
+    // #[deprecated = "if you use it, please expose enum for translators"]
+    //
+    // when I say 'enum' I mean it, not just arg to Content.
+    // Environment(String),
     FallDamage,
     Suicide,
     Other,
@@ -160,7 +163,6 @@ impl ChatExporter {
                     },
                     comp::chat::KillSource::NonPlayer(str, t) => KillSource::NonPlayer(str, t),
                     comp::chat::KillSource::NonExistent(t) => KillSource::NonExistent(t),
-                    comp::chat::KillSource::Environment(str) => KillSource::Environment(str),
                     comp::chat::KillSource::FallDamage => KillSource::FallDamage,
                     comp::chat::KillSource::Suicide => KillSource::Suicide,
                     comp::chat::KillSource::Other => KillSource::Other,
diff --git a/voxygen/i18n-helpers/src/lib.rs b/voxygen/i18n-helpers/src/lib.rs
index e4c3013505..c23cbdf613 100644
--- a/voxygen/i18n-helpers/src/lib.rs
+++ b/voxygen/i18n-helpers/src/lib.rs
@@ -207,13 +207,6 @@ fn localize_kill_message(
             })
         },
         // Other deaths
-        KillSource::Environment(environment) => {
-            localization.get_msg_ctx("hud-chat-environment_kill_msg", &i18n::fluent_args! {
-                "name" => name_format(victim),
-                "victim_gender" => gender_str(victim),
-                "environment" => environment,
-            })
-        },
         KillSource::FallDamage => {
             localization.get_msg_ctx("hud-chat-fall_kill_msg", &i18n::fluent_args! {
                 "name" => name_format(victim),