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

Content PR for YAML hot reloading (#3319)

Browse Source 
* Content PR for YAML hot reloading

* Add CanAdminReloadPrototypes (host permission)

* IndexedPrototype fixes
This commit is contained in:
DrSmugleaf
2021-02-20 00:05:24 +01:00
committed by GitHub
parent 0ae4a6792f
commit 3e702723fd
42 changed files with 95 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Shared/GameObjects/Components/Body/Preset/BodyPresetPrototype.cs
View File

@@ -13,7 +13,7 @@ namespace Content.Shared.GameObjects.Components.Body.Preset
/// </summary>
[Prototype("bodyPreset")]
[Serializable, NetSerializable]
public class BodyPresetPrototype : IPrototype, IIndexedPrototype
public class BodyPresetPrototype : IPrototype
{
private string _id;
private string _name;

2
Content.Shared/GameObjects/Components/Body/Template/BodyTemplatePrototype.cs
View File

@@ -14,7 +14,7 @@ namespace Content.Shared.GameObjects.Components.Body.Template
/// </summary>
[Prototype("bodyTemplate")]
[Serializable, NetSerializable]
public class BodyTemplatePrototype : IPrototype, IIndexedPrototype
public class BodyTemplatePrototype : IPrototype
{
private string _id;
private string _name;

2
Content.Shared/GameObjects/Components/Chemistry/ReagentDispenser/ReagentDispenserInventoryPrototype.cs
View File

@@ -13,7 +13,7 @@ namespace Content.Shared.GameObjects.Components.Chemistry.ReagentDispenser
/// machines define their inventory.
/// </summary>
[Serializable, NetSerializable, Prototype("reagentDispenserInventory")]
public class ReagentDispenserInventoryPrototype : IPrototype, IIndexedPrototype
public class ReagentDispenserInventoryPrototype : IPrototype
{
private string _id;
private List<string> _inventory;

3
Content.Shared/GameObjects/Components/SharedCrayonComponent.cs
View File

@@ -73,6 +73,8 @@ namespace Content.Shared.GameObjects.Components
[Serializable, NetSerializable, Prototype("crayonDecal")]
public class CrayonDecalPrototype : IPrototype
{
public string ID { get; private set; }
private string _spritePath;
public string SpritePath => _spritePath;
@@ -83,6 +85,7 @@ namespace Content.Shared.GameObjects.Components
{
var serializer = YamlObjectSerializer.NewReader(mapping);
serializer.DataField(this, x => x.ID, "id", string.Empty);
serializer.DataField(ref _spritePath, "spritePath", "");
serializer.DataField(ref _decals, "decals", new List<string>());
}

4
Content.Shared/GameObjects/Components/Weapons/Melee/MeleeWeaponAnimationPrototype.cs
View File

@@ -8,7 +8,7 @@ using YamlDotNet.RepresentationModel;
namespace Content.Shared.GameObjects.Components.Weapons.Melee
{
[Prototype("MeleeWeaponAnimation")]
public sealed class MeleeWeaponAnimationPrototype : IPrototype, IIndexedPrototype
public sealed class MeleeWeaponAnimationPrototype : IPrototype
{
private string _prototype;
private string _state;
@@ -19,7 +19,7 @@ namespace Content.Shared.GameObjects.Components.Weapons.Melee
private float _speed;
private float _width;
private WeaponArcType _arcType;
[ViewVariables] public string ID => _id;
[ViewVariables] public string State => _state;
[ViewVariables] public string Prototype => _prototype;