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

Serv3 rework content changes (#7145)

Browse Source
This commit is contained in:
Paul Ritter
2022-04-03 02:01:22 +02:00
committed by GitHub
parent 6b01ab17a6
commit 2ff40d5a1f
133 changed files with 476 additions and 324 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Shared/Chemistry/Dispenser/ReagentDispenserInventoryPrototype.cs
View File

@@ -22,7 +22,7 @@ namespace Content.Shared.Chemistry.Dispenser
private List<string> _inventory = new();
[ViewVariables]
[DataField("id", required: true)]
[IdDataFieldAttribute]
public string ID { get; } = default!;
public List<string> Inventory => _inventory;

2
Content.Shared/Chemistry/Reaction/ReactionPrototype.cs
View File

@@ -18,7 +18,7 @@ namespace Content.Shared.Chemistry.Reaction
public sealed class ReactionPrototype : IPrototype, IComparable<ReactionPrototype>
{
[ViewVariables]
[DataField("id", required: true)]
[IdDataFieldAttribute]
public string ID { get; } = default!;
[DataField("name")]

3
Content.Shared/Chemistry/Reaction/ReactiveComponent.cs
View File

@@ -37,7 +37,8 @@ public sealed class ReactiveReagentEffectEntry
[DataField("effects", required: true)]
public List<ReagentEffect> Effects = default!;
[DataField("groups", required: true, readOnly: true, serverOnly: true,
[DataField("groups", readOnly: true, serverOnly: true,
customTypeSerializer:typeof(PrototypeIdDictionarySerializer<HashSet<ReactionMethod>, ReactiveGroupPrototype>))]
public Dictionary<string, HashSet<ReactionMethod>> ReactiveGroups { get; } = default!;
}

2
Content.Shared/Chemistry/Reaction/ReactiveGroupPrototype.cs
View File

@@ -6,6 +6,6 @@ namespace Content.Shared.Chemistry.Reaction;
[Prototype("reactiveGroup")]
public sealed class ReactiveGroupPrototype : IPrototype
{
[DataField("id", required: true)]
[IdDataFieldAttribute]
public string ID { get; } = default!;
}

6
Content.Shared/Chemistry/Reagent/ReagentPrototype.cs
View File

@@ -25,7 +25,7 @@ namespace Content.Shared.Chemistry.Reagent
public sealed class ReagentPrototype : IPrototype, IInheritingPrototype
{
[ViewVariables]
[DataField("id", required: true)]
[IdDataFieldAttribute]
public string ID { get; } = default!;
[DataField("name", required: true)]
@@ -34,11 +34,11 @@ namespace Content.Shared.Chemistry.Reagent
[DataField("group")]
public string Group { get; } = "Unknown";
[DataField("parent", customTypeSerializer: typeof(PrototypeIdSerializer<ReagentPrototype>))]
[ParentDataFieldAttribute(typeof(PrototypeIdSerializer<ReagentPrototype>))]
public string? Parent { get; private set; }
[NeverPushInheritance]
[DataField("abstract")]
[AbstractDataFieldAttribute]
public bool Abstract { get; private set; }
[DataField("desc", required: true)]