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

Data Rework Content Edition (#82)

Browse Source 
* WiP Data Rework.

* Convert stationstation to new map format.

* stationstation.yml v2

* Update submodule
This commit is contained in:
Pieter-Jan Briers
2018-07-26 23:38:16 +02:00
committed by GitHub
parent 8c874c76dc
commit b34591ab59
19 changed files with 1280 additions and 2906 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Content.Server/GameObjects/Components/Damage/DamageableComponent.cs
View File

@@ -7,6 +7,7 @@ using SS14.Shared.Utility;
using YamlDotNet.RepresentationModel;
using Content.Server.Interfaces;
using Content.Shared.GameObjects;
using SS14.Shared.Serialization;
namespace Content.Server.GameObjects
{
@@ -35,13 +36,16 @@ namespace Content.Server.GameObjects
public event EventHandler<DamageThresholdPassedEventArgs> DamageThresholdPassed;
/// <inheritdoc />
public override void LoadParameters(YamlMappingNode mapping)
public override void ExposeData(ObjectSerializer serializer)
{
if (mapping.TryGetNode("resistanceset", out YamlNode node))
base.ExposeData(serializer);
// TODO: Writing.
serializer.DataReadFunction("resistanceset", "honk", name =>
{
Resistances = ResistanceSet.GetResistanceSet(node.AsString());
}
Resistances = ResistanceSet.GetResistanceSet(name);
});
}
/// <inheritdoc />

30
Content.Server/GameObjects/Components/Damage/DestructibleComponent.cs
View File

@@ -6,7 +6,7 @@ using SS14.Shared.Utility;
using YamlDotNet.RepresentationModel;
using Content.Server.Interfaces;
using Content.Shared.GameObjects;
using SS14.Shared.Serialization;
namespace Content.Server.GameObjects
{
@@ -27,26 +27,22 @@ namespace Content.Server.GameObjects
/// </summary>
public DamageThreshold Threshold { get; private set; }
/// <inheritdoc />
public override void LoadParameters(YamlMappingNode mapping)
public override void ExposeData(ObjectSerializer serializer)
{
//TODO currently only supports one threshold pair; gotta figure out YAML better
base.ExposeData(serializer);
YamlNode node;
DamageType damageType = DamageType.Total;
int damageValue = 0;
if (mapping.TryGetNode("thresholdtype", out node))
// TODO: Writing
if (serializer.Reading)
{
damageType = node.AsEnum<DamageType>();
}
if (mapping.TryGetNode("thresholdvalue", out node))
{
damageValue = node.AsInt();
}
DamageType damageType = DamageType.Total;
int damageValue = 0;
Threshold = new DamageThreshold(damageType, damageValue);
serializer.DataReadFunction("thresholdtype", DamageType.Total, type => damageType = type);
serializer.DataReadFunction("thresholdvalue", 0, val => damageValue = val);
Threshold = new DamageThreshold(damageType, damageValue);
}
}
/// <inheritdoc />