Scale other needed metabolism reagents (#12005)

Closes https://github.com/space-wizards/space-station-14/issues/7434
This commit is contained in:
Rane
2022-12-21 09:51:49 -05:00
committed by GitHub
parent 571802f75d
commit 8613d40aa1
23 changed files with 82 additions and 26 deletions

View File

@@ -200,7 +200,7 @@ namespace Content.Shared.Chemistry.Reaction
{
var args = new ReagentEffectArgs(owner, null, solution,
randomReagent,
unitReactions, EntityManager, null, null);
unitReactions, EntityManager, null, 1f);
foreach (var effect in reaction.Effects)
{

View File

@@ -47,7 +47,7 @@ namespace Content.Shared.Chemistry
// If we have a source solution, use the reagent quantity we have left. Otherwise, use the reaction volume specified.
var args = new ReagentEffectArgs(uid, null, source, reagent,
source?.GetReagentQuantity(reagent.ID) ?? reactVolume, EntityManager, method, null);
source?.GetReagentQuantity(reagent.ID) ?? reactVolume, EntityManager, method, 1f);
// First, check if the reagent wants to apply any effects.
if (reagent.ReactiveEffects != null && reactive.ReactiveGroups != null)

View File

@@ -83,6 +83,6 @@ namespace Content.Shared.Chemistry.Reagent
FixedPoint2 Quantity,
IEntityManager EntityManager,
ReactionMethod? Method,
ReagentEffectsEntry? MetabolismEffects
float Scale
);
}

View File

@@ -133,7 +133,7 @@ namespace Content.Shared.Chemistry.Reagent
var entMan = IoCManager.Resolve<IEntityManager>();
var random = IoCManager.Resolve<IRobustRandom>();
var args = new ReagentEffectArgs(plantHolder.Value, null, solution, this, amount.Quantity, entMan, null, null);
var args = new ReagentEffectArgs(plantHolder.Value, null, solution, this, amount.Quantity, entMan, null, 1f);
foreach (var plantMetabolizable in PlantMetabolisms)
{
if (!plantMetabolizable.ShouldApply(args, random))