From 3cd740c32bb1db33f21de5ee34cb54ef7cdd6821 Mon Sep 17 00:00:00 2001 From: Zonespace <41448081+Zonespace27@users.noreply.github.com> Date: Sat, 15 Jun 2024 04:43:36 +0200 Subject: [PATCH] Replaces reagent-effect-guidebook-missing with more descriptive guidebook entries (#28817) removes `reagent-effect-guidebook-missing` Co-authored-by: John Doe --- .../Chemistry/ReactionEffects/AreaReactionEffect.cs | 4 +++- .../ReagentEffects/AddToSolutionReaction.cs | 2 +- Content.Shared/Chemistry/Reagent/ReagentEffect.cs | 4 ++-- .../Locale/en-US/guidebook/chemistry/effects.ftl | 12 +++++++++--- 4 files changed, 15 insertions(+), 7 deletions(-) diff --git a/Content.Server/Chemistry/ReactionEffects/AreaReactionEffect.cs b/Content.Server/Chemistry/ReactionEffects/AreaReactionEffect.cs index ebbf4e0341..56509a0953 100644 --- a/Content.Server/Chemistry/ReactionEffects/AreaReactionEffect.cs +++ b/Content.Server/Chemistry/ReactionEffects/AreaReactionEffect.cs @@ -46,7 +46,9 @@ namespace Content.Server.Chemistry.ReactionEffects public override bool ShouldLog => true; protected override string ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) - => Loc.GetString("reagent-effect-guidebook-missing"); + => Loc.GetString("reagent-effect-guidebook-area-reaction", + ("duration", _duration) + ); public override LogImpact LogImpact => LogImpact.High; diff --git a/Content.Server/Chemistry/ReagentEffects/AddToSolutionReaction.cs b/Content.Server/Chemistry/ReagentEffects/AddToSolutionReaction.cs index 6a43739b0e..2447814f94 100644 --- a/Content.Server/Chemistry/ReagentEffects/AddToSolutionReaction.cs +++ b/Content.Server/Chemistry/ReagentEffects/AddToSolutionReaction.cs @@ -26,6 +26,6 @@ namespace Content.Server.Chemistry.ReagentEffects } protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) => - Loc.GetString("reagent-effect-guidebook-missing", ("chance", Probability)); + Loc.GetString("reagent-effect-guidebook-add-to-solution-reaction", ("chance", Probability)); } } diff --git a/Content.Shared/Chemistry/Reagent/ReagentEffect.cs b/Content.Shared/Chemistry/Reagent/ReagentEffect.cs index 5bcb21fedb..6d0e85df37 100644 --- a/Content.Shared/Chemistry/Reagent/ReagentEffect.cs +++ b/Content.Shared/Chemistry/Reagent/ReagentEffect.cs @@ -1,4 +1,4 @@ -using System.Linq; +using System.Linq; using System.Text.Json.Serialization; using Content.Shared.Chemistry.Components; using Content.Shared.Database; @@ -28,7 +28,7 @@ namespace Content.Shared.Chemistry.Reagent public virtual string ReagentEffectFormat => "guidebook-reagent-effect-description"; - protected abstract string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys); // => Loc.GetString("reagent-effect-guidebook-missing", ("chance", Probability)); + protected abstract string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys); /// /// What's the chance, from 0 to 1, that this effect will occur? diff --git a/Resources/Locale/en-US/guidebook/chemistry/effects.ftl b/Resources/Locale/en-US/guidebook/chemistry/effects.ftl index ba005e6bf9..c60e690d26 100644 --- a/Resources/Locale/en-US/guidebook/chemistry/effects.ftl +++ b/Resources/Locale/en-US/guidebook/chemistry/effects.ftl @@ -1,4 +1,4 @@ --create-3rd-person = +-create-3rd-person = { $chance -> [1] Creates *[other] create @@ -345,11 +345,17 @@ reagent-effect-guidebook-reduce-rotting = *[other] regenerate } {NATURALFIXED($time, 3)} {MANY("second", $time)} of rotting -reagent-effect-guidebook-missing = +reagent-effect-guidebook-area-reaction = { $chance -> [1] Causes *[other] cause - } an unknown effect as nobody has written this effect yet + } a smoke or foam reaction for {NATURALFIXED($duration, 3)} {MANY("second", $duration)} + +reagent-effect-guidebook-add-to-solution-reaction = + { $chance -> + [1] Causes + *[other] cause + } chemicals applied to an object to be added to its internal solution container reagent-effect-guidebook-plant-attribute = { $chance -> -- 2.51.2