From e8daca35393bcfc3d691c94fa175541ace1df197 Mon Sep 17 00:00:00 2001 From: py01 Date: Sat, 18 Jul 2020 20:51:39 -0600 Subject: [PATCH] Construction prototype camelCase --- .../Construction/ConstructionPrototype.cs | 6 +++--- .../Prototypes/Construction/machines.yml | 6 +++--- Resources/Prototypes/Construction/misc.yml | 4 ++-- Resources/Prototypes/Construction/power.yml | 8 ++++---- .../Prototypes/Construction/structures.yml | 20 +++++++++---------- Resources/Prototypes/Construction/weapons.yml | 4 ++-- 6 files changed, 24 insertions(+), 24 deletions(-) diff --git a/Content.Shared/Construction/ConstructionPrototype.cs b/Content.Shared/Construction/ConstructionPrototype.cs index 7f2db7b7e6..04dd6829df 100644 --- a/Content.Shared/Construction/ConstructionPrototype.cs +++ b/Content.Shared/Construction/ConstructionPrototype.cs @@ -85,10 +85,10 @@ namespace Content.Shared.Construction ser.DataField(ref _id, "id", string.Empty); ser.DataField(ref _description, "description", string.Empty); ser.DataField(ref _icon, "icon", SpriteSpecifier.Invalid); - ser.DataField(ref _type, "objecttype", ConstructionType.Structure); + ser.DataField(ref _type, "objectType", ConstructionType.Structure); ser.DataField(ref _result, "result", null); - ser.DataField(ref _placementMode, "placementmode", "PlaceFree"); - ser.DataField(ref _canBuildInImpassable, "canbuildinimpassable", false); + ser.DataField(ref _placementMode, "placementMode", "PlaceFree"); + ser.DataField(ref _canBuildInImpassable, "canBuildInImpassable", false); _keywords = ser.ReadDataField>("keywords", new List()); { diff --git a/Resources/Prototypes/Construction/machines.yml b/Resources/Prototypes/Construction/machines.yml index 5e599c2b5a..2a281e1ae3 100644 --- a/Resources/Prototypes/Construction/machines.yml +++ b/Resources/Prototypes/Construction/machines.yml @@ -1,11 +1,11 @@ -- type: construction +- type: construction name: wall light id: WallLight keywords: [fixture, lamp] category: Machines description: A simple wall-mounted light fixture. - placementmode: SnapgridBorder - canbuildinimpassable: true + placementMode: SnapgridBorder + canBuildInImpassable: true icon: sprite: Constructible/Lighting/lighting.rsi state: on diff --git a/Resources/Prototypes/Construction/misc.yml b/Resources/Prototypes/Construction/misc.yml index 3e3aa9d16a..d8e96ea00a 100644 --- a/Resources/Prototypes/Construction/misc.yml +++ b/Resources/Prototypes/Construction/misc.yml @@ -1,4 +1,4 @@ -- type: construction +- type: construction name: skub id: skub category: Items/Misc @@ -6,7 +6,7 @@ description: In the end, there is only Skub. icon: Objects/Misc/skub.rsi/icon.png result: Skub - objecttype: Item + objectType: Item steps: - material: Metal amount: 1 diff --git a/Resources/Prototypes/Construction/power.yml b/Resources/Prototypes/Construction/power.yml index 8709d3e7d2..d28789b046 100644 --- a/Resources/Prototypes/Construction/power.yml +++ b/Resources/Prototypes/Construction/power.yml @@ -3,7 +3,7 @@ id: smes category: Machines/Power keywords: [battery, cell, storage] - placementmode: SnapgridCenter + placementMode: SnapgridCenter description: A SMES is a large battery capable of connecting directly to a power grid. icon: sprite: Constructible/Power/smes.rsi @@ -23,7 +23,7 @@ name: generator id: generator category: Machines/Power - placementmode: SnapgridCenter + placementMode: SnapgridCenter description: A portable generator capable of producing power from thin air. icon: Constructible/Power/generator.png result: Generator @@ -39,9 +39,9 @@ name: APC id: APC category: Machines/Power - placementmode: SnapgridCenter + placementMode: SnapgridCenter description: Provides power from the grid wirelessly to other machines in the area. - canbuildinimpassable: true + canBuildInImpassable: true icon: sprite: Constructible/Power/apc.rsi state: apc0 diff --git a/Resources/Prototypes/Construction/structures.yml b/Resources/Prototypes/Construction/structures.yml index 7992012921..e555d83e01 100644 --- a/Resources/Prototypes/Construction/structures.yml +++ b/Resources/Prototypes/Construction/structures.yml @@ -1,4 +1,4 @@ -- type: construction +- type: construction name: wall id: wall category: Structures @@ -6,9 +6,9 @@ icon: sprite: Constructible/Structures/Walls/solid.rsi state: full - objecttype: Structure + objectType: Structure result: solid_wall - placementmode: SnapgridCenter + placementMode: SnapgridCenter steps: - material: Metal amount: 2 @@ -29,7 +29,7 @@ sprite: Constructible/Structures/Tables/generic.rsi state: plain_preview result: Table - placementmode: SnapgridCenter + placementMode: SnapgridCenter steps: - material: Metal amount: 2 @@ -42,9 +42,9 @@ icon: sprite: Constructible/Structures/Windows/window.rsi state: full - objecttype: Structure + objectType: Structure result: Window - placementmode: SnapgridCenter + placementMode: SnapgridCenter steps: - material: Glass amount: 2 @@ -59,9 +59,9 @@ icon: sprite: Constructible/Structures/Walls/low_wall.rsi state: metal - objecttype: Structure + objectType: Structure result: LowWall - placementmode: SnapgridCenter + placementMode: SnapgridCenter steps: - material: Metal amount: 2 @@ -82,9 +82,9 @@ icon: sprite: Constructible/Structures/Windows/reinforced_window.rsi state: full - objecttype: Structure + objectType: Structure result: ReinforcedWindow - placementmode: SnapgridCenter + placementMode: SnapgridCenter steps: - material: Glass amount: 2 diff --git a/Resources/Prototypes/Construction/weapons.yml b/Resources/Prototypes/Construction/weapons.yml index c984327c2a..fcdf4bfd50 100644 --- a/Resources/Prototypes/Construction/weapons.yml +++ b/Resources/Prototypes/Construction/weapons.yml @@ -1,4 +1,4 @@ -- type: construction +- type: construction name: crude spear id: spear category: Items/Weapons @@ -6,7 +6,7 @@ description: A crude spear for when you need to put holes in somebody. icon: Objects/Weapons/Melee/spear.rsi/spear.png result: Spear - objecttype: Item + objectType: Item steps: - material: Metal amount: 1