Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated serializer data fields #2702

Merged
merged 1 commit into from
Dec 4, 2020
Merged

Updated serializer data fields #2702

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Content.Server/Atmos/GasMixture.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -536,10 +536,10 @@ public void Multiply(float multiplier)

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);
Expand Down
10 changes: 5 additions & 5 deletions Content.Server/Atmos/Reactions/GasReactionPrototype.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,11 @@ public void LoadFrom(YamlMappingNode mapping)
{
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>());
}

Expand Down
4 changes: 2 additions & 2 deletions Content.Server/GameObjects/Components/Atmos/PressureProtectionComponent.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ public override void ExposeData(ObjectSerializer serializer)
{
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 changes: 9 additions & 9 deletions Content.Server/GameObjects/Components/Damage/DamageOnHighSpeedImpactComponent.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,15 +39,15 @@ public override void ExposeData(ObjectSerializer serializer)
{
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)
Expand Down
2 changes: 1 addition & 1 deletion Content.Server/GameObjects/Components/Interactable/MultitoolComponent.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public class ToolEntry : IExposeData

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);
Expand Down
4 changes: 2 additions & 2 deletions Content.Server/GameObjects/Components/Items/Storage/EntityStorageComponent.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,8 +152,8 @@ public override void ExposeData(ObjectSerializer serializer)
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)
Expand Down
6 changes: 3 additions & 3 deletions Content.Server/GameObjects/Components/Markers/ConditionalSpawnerComponent.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,9 @@ public IEnumerable<Type> GameRules
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)
Expand Down
10 changes: 5 additions & 5 deletions Content.Server/GameObjects/Components/Markers/TimedSpawnerComponent.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,11 @@ 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 => 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!");
Expand Down
6 changes: 3 additions & 3 deletions Content.Server/GameObjects/Components/Markers/TrashSpawnerComponent.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ public class TrashSpawnerComponent : ConditionalSpawnerComponent
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()
{
Expand Down
2 changes: 1 addition & 1 deletion Content.Server/GameObjects/Components/Movement/SlipperyComponent.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ public override void ExposeData(ObjectSerializer serializer)
{
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()
Expand Down
2 changes: 1 addition & 1 deletion Content.Server/GameObjects/Components/NodeContainer/Nodes/Node.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ public abstract class Node : IExposeData

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)
Expand Down
2 changes: 1 addition & 1 deletion Content.Server/GameObjects/Components/NodeContainer/Nodes/PipeNode.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ public override void ExposeData(ObjectSerializer serializer)
{
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);
}

Expand Down