tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updated serializer data fields (#2702)

Browse Source
This commit is contained in:
ColdAutumnRain
2020-12-04 11:06:53 +01:00
committed by GitHub
parent 87149e18b5
commit 216a47dddc
12 changed files with 37 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Content.Server/Atmos/GasMixture.cs
View File

@@ -536,10 +536,10 @@ namespace Content.Server.Atmos
public void ExposeData(ObjectSerializer serializer)
{
serializer.DataField(this, x => Immutable, "immutable", false);
serializer.DataField(this, x => Volume, "volume", 0f);
serializer.DataField(this, x => LastShare, "lastShare", 0f);
serializer.DataField(this, x => TemperatureArchived, "temperatureArchived", 0f);
serializer.DataField(this, x => x.Immutable, "immutable", false);
serializer.DataField(this, x => x.Volume, "volume", 0f);
serializer.DataField(this, x => x.LastShare, "lastShare", 0f);
serializer.DataField(this, x => x.TemperatureArchived, "temperatureArchived", 0f);
serializer.DataField(ref _moles, "moles", new float[Atmospherics.AdjustedNumberOfGases]);
serializer.DataField(ref _molesArchived, "molesArchived", new float[Atmospherics.AdjustedNumberOfGases]);
serializer.DataField(ref _temperature, "temperature", Atmospherics.TCMB);

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

@@ -58,11 +58,11 @@ namespace Content.Server.Atmos.Reactions
{
var serializer = YamlObjectSerializer.NewReader(mapping);
serializer.DataField(this, x => ID, "id", string.Empty);
serializer.DataField(this, x => Priority, "priority", 100);
serializer.DataField(this, x => MinimumRequirements, "minimumRequirements", new float[Atmospherics.TotalNumberOfGases]);
serializer.DataField(this, x => MinimumTemperatureRequirement, "minimumTemperature", Atmospherics.TCMB);
serializer.DataField(this, x => MinimumEnergyRequirement, "minimumEnergy", 0f);
serializer.DataField(this, x => x.ID, "id", string.Empty);
serializer.DataField(this, x => x.Priority, "priority", 100);
serializer.DataField(this, x => x.MinimumRequirements, "minimumRequirements", new float[Atmospherics.TotalNumberOfGases]);
serializer.DataField(this, x => x.MinimumTemperatureRequirement, "minimumTemperature", Atmospherics.TCMB);
serializer.DataField(this, x => x.MinimumEnergyRequirement, "minimumEnergy", 0f);
serializer.DataField(ref _effects, "effects", new List<IGasReactionEffect>());
}

4
Content.Server/GameObjects/Components/Atmos/PressureProtectionComponent.cs
View File

@@ -20,8 +20,8 @@ namespace Content.Server.GameObjects.Components.Atmos
{
base.ExposeData(serializer);
serializer.DataField(this, x => HighPressureMultiplier, "highPressureMultiplier", 1f);
serializer.DataField(this, x => LowPressureMultiplier, "lowPressureMultiplier", 1f);
serializer.DataField(this, x => x.HighPressureMultiplier, "highPressureMultiplier", 1f);
serializer.DataField(this, x => x.LowPressureMultiplier, "lowPressureMultiplier", 1f);
}
}
}

18
Content.Server/GameObjects/Components/Damage/DamageOnHighSpeedImpactComponent.cs
View File

@@ -39,15 +39,15 @@ namespace Content.Server.GameObjects.Components.Damage
{
base.ExposeData(serializer);
serializer.DataField(this, x => Damage, "damage", DamageType.Blunt);
serializer.DataField(this, x => MinimumSpeed, "minimumSpeed", 20f);
serializer.DataField(this, x => BaseDamage, "baseDamage", 5);
serializer.DataField(this, x => Factor, "factor", 1f);
serializer.DataField(this, x => SoundHit, "soundHit", "");
serializer.DataField(this, x => StunChance, "stunChance", 0.25f);
serializer.DataField(this, x => StunSeconds, "stunSeconds", 1f);
serializer.DataField(this, x => DamageCooldown, "damageCooldown", 2f);
serializer.DataField(this, x => StunMinimumDamage, "stunMinimumDamage", 10);
serializer.DataField(this, x => x.Damage, "damage", DamageType.Blunt);
serializer.DataField(this, x => x.MinimumSpeed, "minimumSpeed", 20f);
serializer.DataField(this, x => x.BaseDamage, "baseDamage", 5);
serializer.DataField(this, x => x.Factor, "factor", 1f);
serializer.DataField(this, x => x.SoundHit, "soundHit", "");
serializer.DataField(this, x => x.StunChance, "stunChance", 0.25f);
serializer.DataField(this, x => x.StunSeconds, "stunSeconds", 1f);
serializer.DataField(this, x => x.DamageCooldown, "damageCooldown", 2f);
serializer.DataField(this, x => x.StunMinimumDamage, "stunMinimumDamage", 10);
}
public void CollideWith(IEntity collidedWith)

2
Content.Server/GameObjects/Components/Interactable/MultitoolComponent.cs
View File

@@ -36,7 +36,7 @@ namespace Content.Server.GameObjects.Components.Interactable
public void ExposeData(ObjectSerializer serializer)
{
serializer.DataField(this, x => Behavior, "behavior", ToolQuality.None);
serializer.DataField(this, x => x.Behavior, "behavior", ToolQuality.None);
serializer.DataField(ref _state, "state", string.Empty);
serializer.DataField(ref _sprite, "sprite", string.Empty);
serializer.DataField(ref _texture, "texture", string.Empty);

4
Content.Server/GameObjects/Components/Items/Storage/EntityStorageComponent.cs
View File

@@ -152,8 +152,8 @@ namespace Content.Server.GameObjects.Components.Items.Storage
serializer.DataField(ref _open, "open", false);
serializer.DataField(this, a => a.IsWeldedShut, "IsWeldedShut", false);
serializer.DataField(this, a => a.CanWeldShut, "CanWeldShut", true);
serializer.DataField(this, x => _closeSound, "closeSound", "/Audio/Machines/closetclose.ogg");
serializer.DataField(this, x => _openSound, "openSound", "/Audio/Machines/closetopen.ogg");
serializer.DataField(this, x => x._closeSound, "closeSound", "/Audio/Machines/closetclose.ogg");
serializer.DataField(this, x => x._openSound, "openSound", "/Audio/Machines/closetopen.ogg");
}
public virtual void Activate(ActivateEventArgs eventArgs)

6
Content.Server/GameObjects/Components/Markers/ConditionalSpawnerComponent.cs
View File

@@ -46,9 +46,9 @@ namespace Content.Server.GameObjects.Components.Markers
public override void ExposeData(ObjectSerializer serializer)
{
base.ExposeData(serializer);
serializer.DataField(this, x => Prototypes, "prototypes", new List<string>());
serializer.DataField(this, x => Chance, "chance", 1.0f);
serializer.DataField(this, x => _gameRules, "gameRules", new List<string>());
serializer.DataField(this, x => x.Prototypes, "prototypes", new List<string>());
serializer.DataField(this, x => x.Chance, "chance", 1.0f);
serializer.DataField(this, x => x._gameRules, "gameRules", new List<string>());
}
private void RuleAdded(GameRuleAddedEventArgs obj)

10
Content.Server/GameObjects/Components/Markers/TimedSpawnerComponent.cs
View File

@@ -53,11 +53,11 @@ namespace Content.Server.GameObjects.Components.Markers
{
base.ExposeData(serializer);
serializer.DataField(this, x => Prototypes, "prototypes", new List<string>());
serializer.DataField(this, x => Chance, "chance", 1.0f);
serializer.DataField(this, x => IntervalSeconds, "intervalSeconds", 60);
serializer.DataField(this, x => MinimumEntitiesSpawned, "minimumEntitiesSpawned", 1);
serializer.DataField(this, x => MaximumEntitiesSpawned, "maximumEntitiesSpawned", 1);
serializer.DataField(this, x => x.Prototypes, "prototypes", new List<string>());
serializer.DataField(this, x => x.Chance, "chance", 1.0f);
serializer.DataField(this, x => x.IntervalSeconds, "intervalSeconds", 60);
serializer.DataField(this, x => x.MinimumEntitiesSpawned, "minimumEntitiesSpawned", 1);
serializer.DataField(this, x => x.MaximumEntitiesSpawned, "maximumEntitiesSpawned", 1);
if(MinimumEntitiesSpawned > MaximumEntitiesSpawned)
throw new ArgumentException("MaximumEntitiesSpawned can't be lower than MinimumEntitiesSpawned!");

6
Content.Server/GameObjects/Components/Markers/TrashSpawnerComponent.cs
View File

@@ -30,9 +30,9 @@ namespace Content.Server.GameObjects.Components.Markers
public override void ExposeData(ObjectSerializer serializer)
{
base.ExposeData(serializer);
serializer.DataField(this, x => RarePrototypes, "rarePrototypes", new List<string>());
serializer.DataField(this, x => RareChance, "rareChance", 0.05f);
serializer.DataField(this, x => Offset, "offset", 0.2f);
serializer.DataField(this, x => x.RarePrototypes, "rarePrototypes", new List<string>());
serializer.DataField(this, x => x.RareChance, "rareChance", 0.05f);
serializer.DataField(this, x => x.Offset, "offset", 0.2f);
}
public override void Spawn()
{

2
Content.Server/GameObjects/Components/Movement/SlipperyComponent.cs
View File

@@ -91,7 +91,7 @@ namespace Content.Server.GameObjects.Components.Movement
{
base.ExposeData(serializer);
serializer.DataField(this, x => SlipSound, "slipSound", "/Audio/Effects/slip.ogg");
serializer.DataField(this, x => x.SlipSound, "slipSound", "/Audio/Effects/slip.ogg");
}
protected override void OnSlip()

2
Content.Server/GameObjects/Components/NodeContainer/Nodes/Node.cs
View File

@@ -50,7 +50,7 @@ namespace Content.Server.GameObjects.Components.NodeContainer.Nodes
public virtual void ExposeData(ObjectSerializer serializer)
{
serializer.DataField(this, x => NodeGroupID, "nodeGroupID", NodeGroupID.Default);
serializer.DataField(this, x => x.NodeGroupID, "nodeGroupID", NodeGroupID.Default);
}
public virtual void Initialize(IEntity owner)

2
Content.Server/GameObjects/Components/NodeContainer/Nodes/PipeNode.cs
View File

@@ -70,7 +70,7 @@ namespace Content.Server.GameObjects.Components.NodeContainer.Nodes
{
base.ExposeData(serializer);
serializer.DataField(ref _pipeDirection, "pipeDirection", PipeDirection.None);
serializer.DataField(this, x => LocalAir, "gasMixture", new GasMixture(DefaultVolume));
serializer.DataField(this, x => x.LocalAir, "gasMixture", new GasMixture(DefaultVolume));
serializer.DataField(ref _conduitLayer, "conduitLayer", ConduitLayer.Two);
}