From 3f6c5177020430fd4dbd0bcf85a676afd0905415 Mon Sep 17 00:00:00 2001 From: Chronophylos Date: Mon, 4 Dec 2023 13:57:29 +0100 Subject: [PATCH] localize damage type in armor examine description (#21807) * localize damage type in armor examine description * format * change translation * add missing strings --- Content.Shared/Armor/SharedArmorSystem.cs | 21 ++++++++++++------- .../Locale/en-US/armor/armor-examine.ftl | 13 ++++++++++++ 2 files changed, 26 insertions(+), 8 deletions(-) diff --git a/Content.Shared/Armor/SharedArmorSystem.cs b/Content.Shared/Armor/SharedArmorSystem.cs index 89141fcbd3..73cb6da2c2 100644 --- a/Content.Shared/Armor/SharedArmorSystem.cs +++ b/Content.Shared/Armor/SharedArmorSystem.cs @@ -8,13 +8,13 @@ using Robust.Shared.Utility; namespace Content.Shared.Armor; /// -/// This handles logic relating to +/// This handles logic relating to /// public abstract class SharedArmorSystem : EntitySystem { [Dependency] private readonly ExamineSystemShared _examine = default!; - /// + /// public override void Initialize() { base.Initialize(); @@ -29,7 +29,8 @@ public abstract class SharedArmorSystem : EntitySystem args.Args.Damage = DamageSpecifier.ApplyModifierSet(args.Args.Damage, component.Modifiers); } - private void OnBorgDamageModify(EntityUid uid, ArmorComponent component, ref BorgModuleRelayedEvent args) + private void OnBorgDamageModify(EntityUid uid, ArmorComponent component, + ref BorgModuleRelayedEvent args) { args.Args.Damage = DamageSpecifier.ApplyModifierSet(args.Args.Damage, component.Modifiers); } @@ -58,19 +59,23 @@ public abstract class SharedArmorSystem : EntitySystem foreach (var coefficientArmor in armorModifiers.Coefficients) { msg.PushNewline(); + + var armorType = Loc.GetString("armor-damage-type-" + coefficientArmor.Key.ToLower()); msg.AddMarkup(Loc.GetString("armor-coefficient-value", - ("type", coefficientArmor.Key), - ("value", MathF.Round((1f - coefficientArmor.Value) * 100,1)) - )); + ("type", armorType), + ("value", MathF.Round((1f - coefficientArmor.Value) * 100, 1)) + )); } foreach (var flatArmor in armorModifiers.FlatReduction) { msg.PushNewline(); + + var armorType = Loc.GetString("armor-damage-type-" + flatArmor.Key.ToLower()); msg.AddMarkup(Loc.GetString("armor-reduction-value", - ("type", flatArmor.Key), + ("type", armorType), ("value", flatArmor.Value) - )); + )); } return msg; diff --git a/Resources/Locale/en-US/armor/armor-examine.ftl b/Resources/Locale/en-US/armor/armor-examine.ftl index 376871fd81..d49a1373f2 100644 --- a/Resources/Locale/en-US/armor/armor-examine.ftl +++ b/Resources/Locale/en-US/armor/armor-examine.ftl @@ -4,3 +4,16 @@ armor-examinable-verb-message = Examine the armor values. armor-examine = It provides the following protection: armor-coefficient-value = - [color=yellow]{$type}[/color] damage reduced by [color=lightblue]{$value}%[/color]. armor-reduction-value = - [color=yellow]{$type}[/color] damage reduced by [color=lightblue]{$value}[/color]. +armor-damage-type-blunt = Blunt +armor-damage-type-slash = Slash +armor-damage-type-piercing = Piercing +armor-damage-type-heat = Heat +armor-damage-type-radiation = Radiation +armor-damage-type-caustic = Caustic +armor-damage-type-bloodloss = Bloodloss +armor-damage-type-asphyxiation = Asphyxiation +armor-damage-type-cellular = Cellular +armor-damage-type-cold = Cold +armor-damage-type-poison = Poison +armor-damage-type-shock = Shock +armor-damage-type-structural = Structural -- 2.51.2