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

Use DataField for tool quality enum

Browse Source
This commit is contained in:
zumorica
2020-05-23 14:20:26 +02:00
parent 0242083883
commit eb3660b9cb
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

8
Resources/Prototypes/Entities/Items/tools.yml
View File

@@ -170,11 +170,11 @@
statusShowBehavior: true statusShowBehavior: true
- type: MultiTool - type: MultiTool
tools: tools:
- behavior: enum.ToolQuality.Prying - behavior: Prying
state: jaws_pry state: jaws_pry
useSound: /Audio/items/jaws_pry.ogg useSound: /Audio/items/jaws_pry.ogg
changeSound: /Audio/items/change_jaws.ogg changeSound: /Audio/items/change_jaws.ogg
- behavior: enum.ToolQuality.Cutting - behavior: Cutting
state: jaws_cutter state: jaws_cutter
useSound: /Audio/items/jaws_cut.ogg useSound: /Audio/items/jaws_cut.ogg
changeSound: /Audio/items/change_jaws.ogg changeSound: /Audio/items/change_jaws.ogg
@@ -199,11 +199,11 @@
statusShowBehavior: true statusShowBehavior: true
- type: MultiTool - type: MultiTool
tools: tools:
- behavior: enum.ToolQuality.Screwing - behavior: Screwing
state: drill_screw state: drill_screw
useSound: /Audio/items/drill_use.ogg useSound: /Audio/items/drill_use.ogg
changeSound: /Audio/items/change_drill.ogg changeSound: /Audio/items/change_drill.ogg
- behavior: enum.ToolQuality.Anchoring - behavior: Anchoring
state: drill_bolt state: drill_bolt
useSound: /Audio/items/drill_use.ogg useSound: /Audio/items/drill_use.ogg
changeSound: /Audio/items/change_drill.ogg changeSound: /Audio/items/change_drill.ogg