Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Adds temperature to solutions (#5834)

Browse Source
This commit is contained in:
TemporalOroboros
2021-12-24 01:22:34 -08:00
committed by GitHub
parent c94f93732b
commit 201952e618
18 changed files with 858 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Content.Shared/Chemistry/Reaction/ReactionPrototype.cs
View File

@@ -30,6 +30,18 @@ namespace Content.Shared.Chemistry.Reaction
[DataField("reactants", customTypeSerializer:typeof(PrototypeIdDictionarySerializer<ReactantPrototype, ReagentPrototype>))]
public Dictionary<string, ReactantPrototype> Reactants = new();
/// <summary>
/// The minimum temperature the reaction can occur at.
/// </summary>
[DataField("minTemp")]
public float MinimumTemperature = 0.0f;
/// <summary>
/// The maximum temperature the reaction can occur at.
/// </summary>
[DataField("maxTemp")]
public float MaximumTemperature = float.PositiveInfinity;
/// <summary>
/// Reagents created when the reaction occurs.
/// </summary>

13
Content.Shared/Chemistry/Reaction/SharedChemicalReactionSystem.cs
View File

@@ -109,6 +109,15 @@ namespace Content.Shared.Chemistry.Reaction
private static bool CanReact(Solution solution, ReactionPrototype reaction, out FixedPoint2 lowestUnitReactions)
{
lowestUnitReactions = FixedPoint2.MaxValue;
if (solution.Temperature < reaction.MinimumTemperature)
{
lowestUnitReactions = FixedPoint2.Zero;
return false;
} else if(solution.Temperature > reaction.MaximumTemperature)
{
lowestUnitReactions = FixedPoint2.Zero;
return false;
}
foreach (var reactantData in reaction.Reactants)
{
@@ -202,7 +211,7 @@ namespace Content.Shared.Chemistry.Reaction
/// Removes the reactants from the solution, then returns a solution with all products.
/// WARNING: Does not trigger reactions between solution and new products.
/// </summary>
private bool ProcessReactions(Solution solution, EntityUid Owner, [MaybeNullWhen(false)] out Solution productSolution)
private bool ProcessReactions(Solution solution, EntityUid owner, [MaybeNullWhen(false)] out Solution productSolution)
{
foreach(var reactant in solution.Contents)
{
@@ -214,7 +223,7 @@ namespace Content.Shared.Chemistry.Reaction
if (!CanReact(solution, reaction, out var unitReactions))
continue;
productSolution = PerformReaction(solution, Owner, reaction, unitReactions);
productSolution = PerformReaction(solution, owner, reaction, unitReactions);
return true;
}
}