From d4a32ce50292540e8024664aed44065f4369c149 Mon Sep 17 00:00:00 2001 From: Princess Cheeseballs <66055347+Princess-Cheeseballs@users.noreply.github.com> Date: Thu, 23 Oct 2025 16:35:59 -0700 Subject: [PATCH] Mild Entity Effect/Condition Cleanup (#41059) * Commit * ploop * borger --------- Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com> --- .../Effects/ExplodeEntityEffectSystem.cs | 6 ++-- .../Transform/ExplosionEntityEffectSystem.cs | 2 +- .../Body/BreathingEntityCondition.cs | 2 +- .../Body/HungerEntityConditionSystem.cs | 2 +- .../Body/InternalsEntityConditionSystem.cs | 2 +- .../Body/MetabolizerTypeEntityCondition.cs | 2 +- .../Body/MobStateEntityConditionSystem.cs | 2 +- .../DamageGroupEntityConditionSystem.cs | 2 +- .../DamageTypeEntityConditionSystem.cs | 2 +- .../Conditions/JobEntityConditionSystem.cs | 2 +- .../ReagentEntityConditionSystem.cs | 4 +-- .../Tags/HasAllTagsEntityConditionSystem.cs | 2 +- .../Tags/HasAnyTagEntityConditionSystem.cs | 2 +- .../Tags/HasTagEntityConditionSystem.cs | 2 +- .../TemperatureEntityConditionSystem.cs | 2 +- .../TotalDamageEntityConditionSystem.cs | 2 +- .../Effects/ExplodeEntityEffect.cs | 7 +++-- .../Transform/ExplosionEntityEffect.cs | 4 +-- .../guidebook/entity-effects/conditions.ftl | 28 +++++++++---------- .../Recipes/Reactions/chemicals.yml | 2 +- .../Prototypes/Recipes/Reactions/fun.yml | 2 +- .../Recipes/Reactions/pyrotechnic.yml | 2 +- 22 files changed, 42 insertions(+), 41 deletions(-) diff --git a/Content.Server/EntityEffects/Effects/ExplodeEntityEffectSystem.cs b/Content.Server/EntityEffects/Effects/ExplodeEntityEffectSystem.cs index 497fec3409..2e2fadff32 100644 --- a/Content.Server/EntityEffects/Effects/ExplodeEntityEffectSystem.cs +++ b/Content.Server/EntityEffects/Effects/ExplodeEntityEffectSystem.cs @@ -1,6 +1,6 @@ using Content.Server.Explosion.EntitySystems; using Content.Shared.EntityEffects; -using Content.Shared.EntityEffects.Effects.Transform; +using Content.Shared.EntityEffects.Effects; using Content.Shared.Explosion.Components; namespace Content.Server.EntityEffects.Effects; @@ -9,11 +9,11 @@ namespace Content.Server.EntityEffects.Effects; /// Makes this entity explode using its . /// /// -public sealed partial class ExplodeEntityEffectSystem : EntityEffectSystem +public sealed partial class ExplodeEntityEffectSystem : EntityEffectSystem { [Dependency] private readonly ExplosionSystem _explosion = default!; - protected override void Effect(Entity entity, ref EntityEffectEvent args) + protected override void Effect(Entity entity, ref EntityEffectEvent args) { _explosion.TriggerExplosive(entity, entity, args.Effect.Delete, args.Effect.Intensity, args.Effect.Radius, args.User); } diff --git a/Content.Server/EntityEffects/Effects/Transform/ExplosionEntityEffectSystem.cs b/Content.Server/EntityEffects/Effects/Transform/ExplosionEntityEffectSystem.cs index 55fc120051..fec56aa2d3 100644 --- a/Content.Server/EntityEffects/Effects/Transform/ExplosionEntityEffectSystem.cs +++ b/Content.Server/EntityEffects/Effects/Transform/ExplosionEntityEffectSystem.cs @@ -1,6 +1,6 @@ using Content.Server.Explosion.EntitySystems; using Content.Shared.EntityEffects; -using Content.Shared.EntityEffects.Effects.Transform; +using ExplosionEffect = Content.Shared.EntityEffects.Effects.Transform.Explosion; namespace Content.Server.EntityEffects.Effects.Transform; diff --git a/Content.Shared/EntityConditions/Conditions/Body/BreathingEntityCondition.cs b/Content.Shared/EntityConditions/Conditions/Body/BreathingEntityCondition.cs index d19d326e26..ece979a6a8 100644 --- a/Content.Shared/EntityConditions/Conditions/Body/BreathingEntityCondition.cs +++ b/Content.Shared/EntityConditions/Conditions/Body/BreathingEntityCondition.cs @@ -6,5 +6,5 @@ namespace Content.Shared.EntityConditions.Conditions.Body; public sealed partial class BreathingCondition : EntityConditionBase { public override string EntityConditionGuidebookText(IPrototypeManager prototype) => - Loc.GetString("reagent-effect-condition-guidebook-breathing", ("isBreathing", !Inverted)); + Loc.GetString("entity-condition-guidebook-breathing", ("isBreathing", !Inverted)); } diff --git a/Content.Shared/EntityConditions/Conditions/Body/HungerEntityConditionSystem.cs b/Content.Shared/EntityConditions/Conditions/Body/HungerEntityConditionSystem.cs index f9867b28b0..f00707f907 100644 --- a/Content.Shared/EntityConditions/Conditions/Body/HungerEntityConditionSystem.cs +++ b/Content.Shared/EntityConditions/Conditions/Body/HungerEntityConditionSystem.cs @@ -29,5 +29,5 @@ public sealed partial class HungerCondition : EntityConditionBase - Loc.GetString("reagent-effect-condition-guidebook-total-hunger", ("max", float.IsPositiveInfinity(Max) ? int.MaxValue : Max), ("min", Min)); + Loc.GetString("entity-condition-guidebook-total-hunger", ("max", float.IsPositiveInfinity(Max) ? int.MaxValue : Max), ("min", Min)); } diff --git a/Content.Shared/EntityConditions/Conditions/Body/InternalsEntityConditionSystem.cs b/Content.Shared/EntityConditions/Conditions/Body/InternalsEntityConditionSystem.cs index e87c54a761..cabf731939 100644 --- a/Content.Shared/EntityConditions/Conditions/Body/InternalsEntityConditionSystem.cs +++ b/Content.Shared/EntityConditions/Conditions/Body/InternalsEntityConditionSystem.cs @@ -19,5 +19,5 @@ public sealed partial class InternalsOnEntityConditionSystem : EntityConditionSy public sealed partial class InternalsCondition : EntityConditionBase { public override string EntityConditionGuidebookText(IPrototypeManager prototype) => - Loc.GetString("reagent-effect-condition-guidebook-internals", ("usingInternals", !Inverted)); + Loc.GetString("entity-condition-guidebook-internals", ("usingInternals", !Inverted)); } diff --git a/Content.Shared/EntityConditions/Conditions/Body/MetabolizerTypeEntityCondition.cs b/Content.Shared/EntityConditions/Conditions/Body/MetabolizerTypeEntityCondition.cs index 2196d271ff..5fb63d008f 100644 --- a/Content.Shared/EntityConditions/Conditions/Body/MetabolizerTypeEntityCondition.cs +++ b/Content.Shared/EntityConditions/Conditions/Body/MetabolizerTypeEntityCondition.cs @@ -24,7 +24,7 @@ public sealed partial class MetabolizerTypeCondition : EntityConditionBase - Loc.GetString("reagent-effect-condition-guidebook-mob-state-condition", ("state", Mobstate)); + Loc.GetString("entity-condition-guidebook-mob-state-condition", ("state", Mobstate)); } diff --git a/Content.Shared/EntityConditions/Conditions/DamageGroupEntityConditionSystem.cs b/Content.Shared/EntityConditions/Conditions/DamageGroupEntityConditionSystem.cs index 4fb0cdf43f..dd877140d6 100644 --- a/Content.Shared/EntityConditions/Conditions/DamageGroupEntityConditionSystem.cs +++ b/Content.Shared/EntityConditions/Conditions/DamageGroupEntityConditionSystem.cs @@ -31,7 +31,7 @@ public sealed partial class DamageGroupCondition : EntityConditionBase DamageGroup; public override string EntityConditionGuidebookText(IPrototypeManager prototype) => - Loc.GetString("reagent-effect-condition-guidebook-group-damage", + Loc.GetString("entity-condition-guidebook-group-damage", ("max", Max == FixedPoint2.MaxValue ? int.MaxValue : Max.Float()), ("min", Min.Float()), ("type", prototype.Index(DamageGroup).LocalizedName)); diff --git a/Content.Shared/EntityConditions/Conditions/DamageTypeEntityConditionSystem.cs b/Content.Shared/EntityConditions/Conditions/DamageTypeEntityConditionSystem.cs index b451f5d258..30490c72e8 100644 --- a/Content.Shared/EntityConditions/Conditions/DamageTypeEntityConditionSystem.cs +++ b/Content.Shared/EntityConditions/Conditions/DamageTypeEntityConditionSystem.cs @@ -31,7 +31,7 @@ public sealed partial class DamageTypeCondition : EntityConditionBase DamageType; public override string EntityConditionGuidebookText(IPrototypeManager prototype) => - Loc.GetString("reagent-effect-condition-guidebook-type-damage", + Loc.GetString("entity-condition-guidebook-type-damage", ("max", Max == FixedPoint2.MaxValue ? int.MaxValue : Max.Float()), ("min", Min.Float()), ("type", prototype.Index(DamageType).LocalizedName)); diff --git a/Content.Shared/EntityConditions/Conditions/JobEntityConditionSystem.cs b/Content.Shared/EntityConditions/Conditions/JobEntityConditionSystem.cs index e07989da36..a698efa032 100644 --- a/Content.Shared/EntityConditions/Conditions/JobEntityConditionSystem.cs +++ b/Content.Shared/EntityConditions/Conditions/JobEntityConditionSystem.cs @@ -54,6 +54,6 @@ public sealed partial class JobCondition : EntityConditionBase public override string EntityConditionGuidebookText(IPrototypeManager prototype) { var localizedNames = Jobs.Select(jobId => prototype.Index(jobId).LocalizedName).ToList(); - return Loc.GetString("reagent-effect-condition-guidebook-job-condition", ("job", ContentLocalizationManager.FormatListToOr(localizedNames))); + return Loc.GetString("entity-condition-guidebook-job-condition", ("job", ContentLocalizationManager.FormatListToOr(localizedNames))); } } diff --git a/Content.Shared/EntityConditions/Conditions/ReagentEntityConditionSystem.cs b/Content.Shared/EntityConditions/Conditions/ReagentEntityConditionSystem.cs index c49c9a3d02..dbe585e631 100644 --- a/Content.Shared/EntityConditions/Conditions/ReagentEntityConditionSystem.cs +++ b/Content.Shared/EntityConditions/Conditions/ReagentEntityConditionSystem.cs @@ -36,8 +36,8 @@ public sealed partial class ReagentCondition : EntityConditionBase public ProtoId Tag; public override string EntityConditionGuidebookText(IPrototypeManager prototype) => - Loc.GetString("reagent-effect-condition-guidebook-has-tag", ("tag", Tag), ("invert", Inverted)); + Loc.GetString("entity-condition-guidebook-has-tag", ("tag", Tag), ("invert", Inverted)); } diff --git a/Content.Shared/EntityConditions/Conditions/TemperatureEntityConditionSystem.cs b/Content.Shared/EntityConditions/Conditions/TemperatureEntityConditionSystem.cs index 6585f3bf44..f87bbecf8c 100644 --- a/Content.Shared/EntityConditions/Conditions/TemperatureEntityConditionSystem.cs +++ b/Content.Shared/EntityConditions/Conditions/TemperatureEntityConditionSystem.cs @@ -46,7 +46,7 @@ public sealed partial class TemperatureCondition : EntityConditionBase - Loc.GetString("reagent-effect-condition-guidebook-body-temperature", + Loc.GetString("entity-condition-guidebook-body-temperature", ("max", float.IsPositiveInfinity(Max) ? (float) int.MaxValue : Max), ("min", Min)); } diff --git a/Content.Shared/EntityConditions/Conditions/TotalDamageEntityConditionSystem.cs b/Content.Shared/EntityConditions/Conditions/TotalDamageEntityConditionSystem.cs index e710e07b17..16f4a946f3 100644 --- a/Content.Shared/EntityConditions/Conditions/TotalDamageEntityConditionSystem.cs +++ b/Content.Shared/EntityConditions/Conditions/TotalDamageEntityConditionSystem.cs @@ -27,7 +27,7 @@ public sealed partial class TotalDamageCondition : EntityConditionBase - Loc.GetString("reagent-effect-condition-guidebook-total-damage", + Loc.GetString("entity-condition-guidebook-total-damage", ("max", Max == FixedPoint2.MaxValue ? int.MaxValue : Max.Float()), ("min", Min.Float())); } diff --git a/Content.Shared/EntityEffects/Effects/ExplodeEntityEffect.cs b/Content.Shared/EntityEffects/Effects/ExplodeEntityEffect.cs index 0a99ef90f1..ecad4e47ad 100644 --- a/Content.Shared/EntityEffects/Effects/ExplodeEntityEffect.cs +++ b/Content.Shared/EntityEffects/Effects/ExplodeEntityEffect.cs @@ -1,11 +1,12 @@ using Content.Shared.Database; +using Content.Shared.EntityEffects.Effects.Transform; using Robust.Shared.Prototypes; -namespace Content.Shared.EntityEffects.Effects.Transform; +namespace Content.Shared.EntityEffects.Effects; /// -/// -public sealed partial class ExplodeEffect : EntityEffectBase +/// +public sealed partial class Explode : EntityEffectBase { /// /// Optional override for the explosion intensity. diff --git a/Content.Shared/EntityEffects/Effects/Transform/ExplosionEntityEffect.cs b/Content.Shared/EntityEffects/Effects/Transform/ExplosionEntityEffect.cs index 3cb4d3aac0..907c4e321f 100644 --- a/Content.Shared/EntityEffects/Effects/Transform/ExplosionEntityEffect.cs +++ b/Content.Shared/EntityEffects/Effects/Transform/ExplosionEntityEffect.cs @@ -5,8 +5,8 @@ using Robust.Shared.Prototypes; namespace Content.Shared.EntityEffects.Effects.Transform; /// -/// -public sealed partial class ExplosionEffect : EntityEffectBase +/// +public sealed partial class Explosion : EntityEffectBase { /// /// The type of explosion. Determines damage types and tile break chance scaling. diff --git a/Resources/Locale/en-US/guidebook/entity-effects/conditions.ftl b/Resources/Locale/en-US/guidebook/entity-effects/conditions.ftl index 63654ab08b..1d017423d3 100644 --- a/Resources/Locale/en-US/guidebook/entity-effects/conditions.ftl +++ b/Resources/Locale/en-US/guidebook/entity-effects/conditions.ftl @@ -1,4 +1,4 @@ -reagent-effect-condition-guidebook-total-damage = +entity-condition-guidebook-total-damage = { $max -> [2147483648] it has at least {NATURALFIXED($min, 2)} total damage *[other] { $min -> @@ -7,7 +7,7 @@ reagent-effect-condition-guidebook-total-damage = } } -reagent-effect-condition-guidebook-type-damage = +entity-condition-guidebook-type-damage = { $max -> [2147483648] it has at least {NATURALFIXED($min, 2)} of {$type} damage *[other] { $min -> @@ -16,7 +16,7 @@ reagent-effect-condition-guidebook-type-damage = } } -reagent-effect-condition-guidebook-group-damage = +entity-condition-guidebook-group-damage = { $max -> [2147483648] it has at least {NATURALFIXED($min, 2)} of {$type} damage. *[other] { $min -> @@ -25,7 +25,7 @@ reagent-effect-condition-guidebook-group-damage = } } -reagent-effect-condition-guidebook-total-hunger = +entity-condition-guidebook-total-hunger = { $max -> [2147483648] the target has at least {NATURALFIXED($min, 2)} total hunger *[other] { $min -> @@ -34,7 +34,7 @@ reagent-effect-condition-guidebook-total-hunger = } } -reagent-effect-condition-guidebook-reagent-threshold = +entity-condition-guidebook-reagent-threshold = { $max -> [2147483648] there's at least {NATURALFIXED($min, 2)}u of {$reagent} *[other] { $min -> @@ -43,13 +43,13 @@ reagent-effect-condition-guidebook-reagent-threshold = } } -reagent-effect-condition-guidebook-mob-state-condition = +entity-condition-guidebook-mob-state-condition = the mob is { $state } -reagent-effect-condition-guidebook-job-condition = +entity-condition-guidebook-job-condition = the target's job is { $job } -reagent-effect-condition-guidebook-solution-temperature = +entity-condition-guidebook-solution-temperature = the solution's temperature is { $max -> [2147483648] at least {NATURALFIXED($min, 2)}k *[other] { $min -> @@ -58,7 +58,7 @@ reagent-effect-condition-guidebook-solution-temperature = } } -reagent-effect-condition-guidebook-body-temperature = +entity-condition-guidebook-body-temperature = the body's temperature is { $max -> [2147483648] at least {NATURALFIXED($min, 2)}k *[other] { $min -> @@ -67,27 +67,27 @@ reagent-effect-condition-guidebook-body-temperature = } } -reagent-effect-condition-guidebook-organ-type = +entity-condition-guidebook-organ-type = the metabolizing organ { $shouldhave -> [true] is *[false] is not } {INDEFINITE($name)} {$name} organ -reagent-effect-condition-guidebook-has-tag = +entity-condition-guidebook-has-tag = the target { $invert -> [true] does not have *[false] has } the tag {$tag} -reagent-effect-condition-guidebook-this-reagent = this reagent +entity-condition-guidebook-this-reagent = this reagent -reagent-effect-condition-guidebook-breathing = +entity-condition-guidebook-breathing = the metabolizer is { $isBreathing -> [true] breathing normally *[false] suffocating } -reagent-effect-condition-guidebook-internals = +entity-condition-guidebook-internals = the metabolizer is { $usingInternals -> [true] using internals *[false] breathing atmospheric air diff --git a/Resources/Prototypes/Recipes/Reactions/chemicals.yml b/Resources/Prototypes/Recipes/Reactions/chemicals.yml index b2a09a1b7f..08221c6f1a 100644 --- a/Resources/Prototypes/Recipes/Reactions/chemicals.yml +++ b/Resources/Prototypes/Recipes/Reactions/chemicals.yml @@ -111,7 +111,7 @@ Potassium: amount: 1 effects: - - !type:ExplosionEffect + - !type:Explosion explosionType: Default intensityPerUnit: 0.25 maxTotalIntensity: 100 diff --git a/Resources/Prototypes/Recipes/Reactions/fun.yml b/Resources/Prototypes/Recipes/Reactions/fun.yml index 9b335a2aca..9245f36a36 100644 --- a/Resources/Prototypes/Recipes/Reactions/fun.yml +++ b/Resources/Prototypes/Recipes/Reactions/fun.yml @@ -208,7 +208,7 @@ JuiceThatMakesYouHew: amount: 1 effects: - - !type:ExplosionEffect + - !type:Explosion explosionType: Radioactive maxIntensity: 200 intensityPerUnit: 2 diff --git a/Resources/Prototypes/Recipes/Reactions/pyrotechnic.yml b/Resources/Prototypes/Recipes/Reactions/pyrotechnic.yml index 21bea1ff2b..b3b01ab515 100644 --- a/Resources/Prototypes/Recipes/Reactions/pyrotechnic.yml +++ b/Resources/Prototypes/Recipes/Reactions/pyrotechnic.yml @@ -39,7 +39,7 @@ Fluorine: amount: 3 effects: - - !type:ExplosionEffect + - !type:Explosion explosionType: Default # 15 damage per intensity. maxIntensity: 200 intensityPerUnit: 5 -- 2.51.2