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

Remove field: from DataField attributes (#3932)

Browse Source
This commit is contained in:
DrSmugleaf
2021-05-04 15:37:16 +02:00
committed by GitHub
parent 85f3871536
commit ad3b7fe97d
84 changed files with 228 additions and 242 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Content.Server/Atmos/Reactions/GasReactionPrototype.cs
View File

@@ -27,38 +27,38 @@ namespace Content.Server.Atmos.Reactions
public class GasReactionPrototype : IPrototype
{
[ViewVariables]
[field: DataField("id", required: true)]
[DataField("id", required: true)]
public string ID { get; } = default!;
/// <summary>
/// Minimum gas amount requirements.
/// </summary>
[field: DataField("minimumRequirements")]
[DataField("minimumRequirements")]
public float[] MinimumRequirements { get; } = new float[Atmospherics.TotalNumberOfGases];
/// <summary>
/// Maximum temperature requirement.
/// </summary>
[field: DataField("maximumTemperature")]
[DataField("maximumTemperature")]
public float MaximumTemperatureRequirement { get; } = float.MaxValue;
/// <summary>
/// Minimum temperature requirement.
/// </summary>
[field: DataField("minimumTemperature")]
[DataField("minimumTemperature")]
public float MinimumTemperatureRequirement { get; } = Atmospherics.TCMB;
/// <summary>
/// Minimum energy requirement.
/// </summary>
[field: DataField("minimumEnergy")]
[DataField("minimumEnergy")]
public float MinimumEnergyRequirement { get; } = 0f;
/// <summary>
/// Lower numbers are checked/react later than higher numbers.
/// If two reactions have the same priority, they may happen in either order.
/// </summary>
[field: DataField("priority")]
[DataField("priority")]
public int Priority { get; } = int.MinValue;
/// <summary>

9
Content.Server/Atmos/Reactions/WaterVaporReaction.cs
View File

@@ -5,7 +5,6 @@ using Content.Shared.Chemistry;
using Content.Shared.Maps;
using JetBrains.Annotations;
using Robust.Server.GameObjects;
using Robust.Shared.Serialization;
using Robust.Shared.Serialization.Manager.Attributes;
namespace Content.Server.Atmos.Reactions
@@ -14,13 +13,13 @@ namespace Content.Server.Atmos.Reactions
[DataDefinition]
public class WaterVaporReaction : IGasReactionEffect
{
[field: DataField("reagent")] public string? Reagent { get; } = null;
[DataField("reagent")] public string? Reagent { get; } = null;
[field: DataField("gas")] public int GasId { get; } = 0;
[DataField("gas")] public int GasId { get; } = 0;
[field: DataField("molesPerUnit")] public float MolesPerUnit { get; } = 1;
[DataField("molesPerUnit")] public float MolesPerUnit { get; } = 1;
[field: DataField("puddlePrototype")] public string? PuddlePrototype { get; } = "PuddleSmear";
[DataField("puddlePrototype")] public string? PuddlePrototype { get; } = "PuddleSmear";
public ReactionResult React(GasMixture mixture, IGasMixtureHolder? holder, GridTileLookupSystem gridTileLookup)
{