From f81f7a836e980362774676beafa0b78e29a23217 Mon Sep 17 00:00:00 2001 From: ArZarLordOfMango <96249677+ArZarLordOfMango@users.noreply.github.com> Date: Sat, 29 Mar 2025 14:57:13 +0100 Subject: [PATCH] mana-fix (#1082) --- .../_CP14/Chemistry/ReagentEffect/CP14ManaChange.cs | 5 ++++- .../Prototypes/_CP14/Reagents/target_effects.yml | 12 ++++++------ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/Content.Server/_CP14/Chemistry/ReagentEffect/CP14ManaChange.cs b/Content.Server/_CP14/Chemistry/ReagentEffect/CP14ManaChange.cs index 1e10d7bf9a..a35eff0575 100644 --- a/Content.Server/_CP14/Chemistry/ReagentEffect/CP14ManaChange.cs +++ b/Content.Server/_CP14/Chemistry/ReagentEffect/CP14ManaChange.cs @@ -17,6 +17,9 @@ public sealed partial class CP14ManaChange : EntityEffect [DataField] public bool Safe = false; + [DataField] + public bool ScaleByQuantity; + protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) { return Loc.GetString(ManaDelta >= 0 ? "cp14-reagent-effect-guidebook-mana-add" : "cp14-reagent-effect-guidebook-mana-remove", @@ -30,7 +33,7 @@ public sealed partial class CP14ManaChange : EntityEffect if (args is EntityEffectReagentArgs reagentArgs) { - scale = reagentArgs.Quantity * reagentArgs.Scale; + scale = ScaleByQuantity ? reagentArgs.Quantity * reagentArgs.Scale : reagentArgs.Scale; } var magicSystem = args.EntityManager.System(); diff --git a/Resources/Prototypes/_CP14/Reagents/target_effects.yml b/Resources/Prototypes/_CP14/Reagents/target_effects.yml index 1baf36e23a..edb8d16ca2 100644 --- a/Resources/Prototypes/_CP14/Reagents/target_effects.yml +++ b/Resources/Prototypes/_CP14/Reagents/target_effects.yml @@ -8,7 +8,7 @@ physicalDesc: cp14-reagent-physical-desc-colorless # T1 / Simple or Basic solutions -# Have simple effects, shouldn't be able to replace their occupational +# Have simple effects, shouldn't be able to replace their occupational - type: reagent id: CP14BasicEffectHealBrute @@ -275,7 +275,7 @@ metabolismRate: 0.05 effects: - !type:CP14ManaChange - manaDelta: 30 + manaDelta: 1.5 safe: true - type: reagent @@ -291,7 +291,7 @@ metabolismRate: 0.05 effects: - !type:CP14ManaChange - manaDelta: -30 + manaDelta: -1.5 safe: false - type: reagent @@ -333,7 +333,7 @@ - !type:GenericStatusEffect key: Stutter component: StutteringAccent - + - type: reagent id: CP14BasicEffectSleep name: cp14-reagent-name-basic-sleep @@ -354,7 +354,7 @@ key: ForcedSleep component: ForcedSleeping type: Add - + - type: reagent id: CP14BasicEffectUnsleep name: cp14-reagent-name-basic-unsleep @@ -389,7 +389,7 @@ amount: -10 # Gimmick solutions, otherwise doesn't give a mechanical benefit - + - type: reagent id: CP14BasicEffectRainbow name: cp14-reagent-name-see-rainbow