Update destructible threshold property casing to follow the rest of the project (#2797)

* Update casing

* Update casing for min/max
This commit is contained in:
DrSmugleaf
2020-12-21 12:11:56 +01:00
committed by GitHub
parent 38dcc058c7
commit fd258a54d3
44 changed files with 244 additions and 236 deletions

View File

@@ -29,15 +29,15 @@ namespace Content.IntegrationTests.Tests.Destructible
- type: Destructible
thresholds:
20:
TriggersOnce: false
triggersOnce: false
50:
Sound: /Audio/Effects/woodhit.ogg
Spawn:
sound: /Audio/Effects/woodhit.ogg
spawn:
WoodPlank:
Min: 1
Max: 1
Acts: [""Breakage""]
TriggersOnce: false
min: 1
max: 1
acts: [""Breakage""]
triggersOnce: false
- type: TestThresholdListener
";

View File

@@ -1,13 +1,21 @@
using Robust.Shared.ViewVariables;
using Robust.Shared.Interfaces.Serialization;
using Robust.Shared.Serialization;
using Robust.Shared.ViewVariables;
namespace Content.Server.GameObjects.Components.Destructible
{
public struct MinMax
public struct MinMax : IExposeData
{
[ViewVariables]
public int Min;
[ViewVariables]
public int Max;
public void ExposeData(ObjectSerializer serializer)
{
serializer.DataField(ref Min, "min", 0);
serializer.DataField(ref Max, "max", 0);
}
}
}

View File

@@ -52,12 +52,12 @@ namespace Content.Server.GameObjects.Components.Destructible
public void ExposeData(ObjectSerializer serializer)
{
serializer.DataField(ref Spawn, "Spawn", null);
serializer.DataField(ref Sound, "Sound", string.Empty);
serializer.DataField(ref SoundCollection, "SoundCollection", string.Empty);
serializer.DataField(ref Acts, "Acts", 0, WithFormat.Flags<ActsFlags>());
serializer.DataField(ref Triggered, "Triggered", false);
serializer.DataField(ref TriggersOnce, "TriggersOnce", false);
serializer.DataField(ref Spawn, "spawn", null);
serializer.DataField(ref Sound, "sound", string.Empty);
serializer.DataField(ref SoundCollection, "soundCollection", string.Empty);
serializer.DataField(ref Acts, "acts", 0, WithFormat.Flags<ActsFlags>());
serializer.DataField(ref Triggered, "triggered", false);
serializer.DataField(ref TriggersOnce, "triggersOnce", false);
}
/// <summary>

View File

@@ -61,7 +61,7 @@
- type: Destructible
thresholds:
500:
Acts: ["Destruction"]
acts: ["Destruction"]
placement:
mode: SnapgridCenter

View File

@@ -32,6 +32,6 @@
- type: Destructible
thresholds:
75:
Acts: ["Destruction"]
acts: ["Destruction"]
placement:
mode: SnapgridCenter

View File

@@ -24,12 +24,12 @@
- type: Destructible
thresholds:
30:
Sound: /Audio/Effects/woodhit.ogg
Spawn:
sound: /Audio/Effects/woodhit.ogg
spawn:
WoodPlank:
Min: 1
Max: 1
Acts: ["Destruction"]
min: 1
max: 1
acts: ["Destruction"]
- type: Occluder
sizeX: 32
sizeY: 32

View File

@@ -25,7 +25,7 @@
- type: Destructible
thresholds:
50:
Acts: ["Destruction"]
acts: ["Destruction"]
- type: UserInterface
interfaces:
- key: enum.InstrumentUiKey.Key

View File

@@ -16,7 +16,7 @@
- type: Destructible
thresholds:
100:
Acts: ["Destruction"]
acts: ["Destruction"]
- type: ShuttleController
- type: Strap
position: Stand

View File

@@ -35,7 +35,7 @@
- type: Destructible
thresholds:
50:
Acts: ["Destruction"]
acts: ["Destruction"]
- type: entity
name: chair

View File

@@ -32,12 +32,12 @@
- type: Destructible
thresholds:
30:
Sound: /Audio/Effects/metalbreak.ogg
Spawn:
sound: /Audio/Effects/metalbreak.ogg
spawn:
SteelSheet1:
Min: 1
Max: 1
Acts: ["Destruction"]
min: 1
max: 1
acts: ["Destruction"]
- type: entity
id: Shelf
@@ -73,9 +73,9 @@
- type: Destructible
thresholds:
30:
Sound: /Audio/Effects/metalbreak.ogg
Spawn:
sound: /Audio/Effects/metalbreak.ogg
spawn:
SteelSheet1:
Min: 1
Max: 1
Acts: ["Destruction"]
min: 1
max: 1
acts: ["Destruction"]

View File

@@ -40,12 +40,12 @@
- type: Destructible
thresholds:
15:
Sound: /Audio/Effects/metalbreak.ogg
Spawn:
sound: /Audio/Effects/metalbreak.ogg
spawn:
SteelSheet1:
Min: 1
Max: 1
Acts: ["Destruction"]
min: 1
max: 1
acts: ["Destruction"]
- type: entity
id: TableFrame
@@ -62,12 +62,12 @@
- type: Destructible
thresholds:
1:
Sound: /Audio/Effects/metalbreak.ogg
Spawn:
sound: /Audio/Effects/metalbreak.ogg
spawn:
SteelSheet1:
Min: 1
Max: 1
Acts: ["Destruction"]
min: 1
max: 1
acts: ["Destruction"]
- type: Construction
graph: Tables
node: TableFrame
@@ -87,12 +87,12 @@
- type: Destructible
thresholds:
1:
Sound: /Audio/Effects/metalbreak.ogg
Spawn:
sound: /Audio/Effects/metalbreak.ogg
spawn:
SteelSheet1:
Min: 1
Max: 1
Acts: ["Destruction"]
min: 1
max: 1
acts: ["Destruction"]
- type: entity
id: TableMetal
@@ -109,12 +109,12 @@
- type: Destructible
thresholds:
15:
Sound: /Audio/Effects/metalbreak.ogg
Spawn:
sound: /Audio/Effects/metalbreak.ogg
spawn:
SteelSheet1:
Min: 1
Max: 1
Acts: ["Destruction"]
min: 1
max: 1
acts: ["Destruction"]
- type: Construction
graph: Tables
node: MetalTable
@@ -134,12 +134,12 @@
- type: Destructible
thresholds:
75:
Sound: /Audio/Effects/metalbreak.ogg
Spawn:
sound: /Audio/Effects/metalbreak.ogg
spawn:
SteelSheet1:
Min: 1
Max: 1
Acts: ["Destruction"]
min: 1
max: 1
acts: ["Destruction"]
- type: Construction
graph: Tables
node: ReinforcedTable
@@ -159,12 +159,12 @@
- type: Destructible
thresholds:
5:
Sound: /Audio/Effects/glass_break2.ogg
Spawn:
sound: /Audio/Effects/glass_break2.ogg
spawn:
ShardGlass:
Min: 1
Max: 1
Acts: ["Destruction"]
min: 1
max: 1
acts: ["Destruction"]
- type: Construction
graph: Tables
node: GlassTable
@@ -184,12 +184,12 @@
- type: Destructible
thresholds:
20:
Sound: /Audio/Effects/glass_break2.ogg
Spawn:
sound: /Audio/Effects/glass_break2.ogg
spawn:
ShardGlass:
Min: 1
Max: 1
Acts: ["Destruction"]
min: 1
max: 1
acts: ["Destruction"]
- type: Construction
graph: Tables
node: RGlassTable
@@ -209,12 +209,12 @@
- type: Destructible
thresholds:
15:
Sound: /Audio/Effects/woodhit.ogg
Spawn:
sound: /Audio/Effects/woodhit.ogg
spawn:
WoodPlank:
Min: 1
Max: 1
Acts: ["Destruction"]
min: 1
max: 1
acts: ["Destruction"]
- type: Construction
graph: Tables
node: WoodTable
@@ -234,12 +234,12 @@
- type: Destructible
thresholds:
15:
Sound: /Audio/Effects/woodhit.ogg
Spawn:
sound: /Audio/Effects/woodhit.ogg
spawn:
WoodPlank:
Min: 1
Max: 1
Acts: ["Destruction"]
min: 1
max: 1
acts: ["Destruction"]
- type: Construction
graph: Tables
node: PokerTable
@@ -259,8 +259,8 @@
- type: Destructible
thresholds:
50:
Sound: /Audio/Effects/picaxe2.ogg
Acts: ["Destruction"]
sound: /Audio/Effects/picaxe2.ogg
acts: ["Destruction"]
- type: entity
id: TableDebug
@@ -277,4 +277,4 @@
- type: Destructible
thresholds:
1:
Acts: ["Destruction"]
acts: ["Destruction"]

View File

@@ -14,7 +14,7 @@
- type: Destructible
thresholds:
100:
Acts: ["Destruction"]
acts: ["Destruction"]
- type: GasCanisterPort
- type: entity

View File

@@ -14,7 +14,7 @@
- type: Destructible
thresholds:
100:
Acts: ["Destruction"]
acts: ["Destruction"]
- type: GasCanister
- type: Anchorable
- type: Pullable

View File

@@ -24,5 +24,5 @@
- type: Destructible
thresholds:
50:
Acts: ["Destruction"]
acts: ["Destruction"]
- type: KitchenSpike

View File

@@ -15,7 +15,7 @@
- type: Destructible
thresholds:
100:
Acts: ["Destruction"]
acts: ["Destruction"]
- type: Sprite
- type: Appearance
visuals:

View File

@@ -14,7 +14,7 @@
- type: Destructible
thresholds:
100:
Acts: ["Destruction"]
acts: ["Destruction"]
- type: Sprite
sprite: Constructible/Atmos/pump.rsi
- type: Icon

View File

@@ -24,7 +24,7 @@
- type: Destructible
thresholds:
100:
Acts: ["Destruction"]
acts: ["Destruction"]
- type: entity
parent: ScrubberBase

View File

@@ -24,7 +24,7 @@
- type: Destructible
thresholds:
100:
Acts: ["Destruction"]
acts: ["Destruction"]
- type: entity
parent: VentBase

View File

@@ -35,7 +35,7 @@
- type: Destructible
thresholds:
100:
Acts: ["Destruction"]
acts: ["Destruction"]
- type: Appearance
visuals:
- type: CloningPodVisualizer

View File

@@ -99,7 +99,7 @@
- type: Destructible
thresholds:
100:
Acts: ["Destruction"]
acts: ["Destruction"]
- type: BreakableConstruction
node: monitorBroken
- type: Sprite

View File

@@ -32,7 +32,7 @@
- type: Destructible
thresholds:
100:
Acts: ["Breakage"]
acts: ["Breakage"]
- type: Anchorable
- type: entity

View File

@@ -36,7 +36,7 @@
- type: Destructible
thresholds:
100:
Acts: ["Destruction"]
acts: ["Destruction"]
- type: Appearance
visuals:
- type: MedicalScannerVisualizer

View File

@@ -237,6 +237,6 @@
- type: Destructible
thresholds:
100:
Acts: ["Breakage"]
acts: ["Breakage"]
- type: Anchorable
- type: Pullable

View File

@@ -33,7 +33,7 @@
- type: Destructible
thresholds:
50:
Acts: ["Breakage"]
acts: ["Breakage"]
- type: UserInterface
interfaces:
- key: enum.VendingMachineUiKey.Key

View File

@@ -23,7 +23,7 @@
- type: Destructible
thresholds:
100:
Acts: ["Destruction"]
acts: ["Destruction"]
- type: SubFloorHide
- type: entity
@@ -52,11 +52,11 @@
- type: Destructible
thresholds:
100:
Spawn:
spawn:
HVWireStack1:
Min: 1
Max: 1
Acts: ["Destruction"]
min: 1
max: 1
acts: ["Destruction"]
- type: entity
parent: WireBase
@@ -86,11 +86,11 @@
- type: Destructible
thresholds:
100:
Spawn:
spawn:
MVWireStack1:
Min: 1
Max: 1
Acts: ["Destruction"]
min: 1
max: 1
acts: ["Destruction"]
- type: entity
parent: WireBase
@@ -122,8 +122,8 @@
- type: Destructible
thresholds:
100:
Spawn:
spawn:
ApcExtensionCableStack1:
Min: 1
Max: 1
Acts: ["Destruction"]
min: 1
max: 1
acts: ["Destruction"]

View File

@@ -26,7 +26,7 @@
- type: Destructible
thresholds:
500:
Acts: ["Destruction"]
acts: ["Destruction"]
- type: SnapGrid
offset: Center
- type: Anchorable

View File

@@ -26,11 +26,11 @@
- type: Destructible
thresholds:
500:
Spawn:
spawn:
AMEPart:
Min: 1
Max: 1
Acts: ["Destruction"]
min: 1
max: 1
acts: ["Destruction"]
- type: SnapGrid
offset: Center
- type: Airtight

View File

@@ -22,7 +22,7 @@
- type: Destructible
thresholds:
75:
Acts: ["Destruction"]
acts: ["Destruction"]
- type: Anchorable
- type: Pullable
- type: PowerReceiver

View File

@@ -36,11 +36,11 @@
- type: Destructible
thresholds:
50:
Spawn:
spawn:
chem_master_broken:
Min: 1
Max: 1
Acts: ["Destruction"]
min: 1
max: 1
acts: ["Destruction"]
- type: UserInterface
interfaces:
- key: enum.ChemMasterUiKey.Key
@@ -82,11 +82,11 @@
- type: Destructible
thresholds:
25:
Spawn:
spawn:
SteelSheet1:
Min: 1
Max: 1
Acts: ["Destruction"]
min: 1
max: 1
acts: ["Destruction"]
- type: UserInterface
interfaces:
- key: enum.ChemMasterUiKey.Key

View File

@@ -18,7 +18,7 @@
- type: Destructible
thresholds:
100:
Acts: ["Breakage"]
acts: ["Breakage"]
- type: Rotatable
- type: Pullable
@@ -150,7 +150,7 @@
- type: Destructible
thresholds:
100:
Acts: ["Destruction"]
acts: ["Destruction"]
- type: Appearance
visuals:
- type: DisposalUnitVisualizer
@@ -389,7 +389,7 @@
- type: Destructible
thresholds:
100:
Acts: ["Destruction"]
acts: ["Destruction"]
- type: Appearance
visuals:
- type: DisposalUnitVisualizer

View File

@@ -34,7 +34,7 @@
- type: Destructible
thresholds:
150:
Acts: ["Breakage"]
acts: ["Breakage"]
- type: GravityGenerator
- type: UserInterface
interfaces:

View File

@@ -28,7 +28,7 @@
- type: Destructible
thresholds:
50:
Acts: ["Destruction"]
acts: ["Destruction"]
- type: Sprite
sprite: Constructible/Hydroponics/hydro_tools.rsi
state: soil

View File

@@ -43,7 +43,7 @@
- type: Destructible
thresholds:
100:
Acts: ["Destruction"]
acts: ["Destruction"]
- type: Appearance
visuals:
- type: StorageVisualizer

View File

@@ -40,7 +40,7 @@
- type: Destructible
thresholds:
100:
Acts: ["Destruction"]
acts: ["Destruction"]
- type: Appearance
visuals:
- type: StorageVisualizer

View File

@@ -28,7 +28,7 @@
- type: Destructible
thresholds:
10:
Acts: ["Destruction"]
acts: ["Destruction"]
- type: SolutionContainer
maxVol: 1500
caps: RemoveFrom

View File

@@ -19,7 +19,7 @@
- type: Destructible
thresholds:
100:
Acts: [ "Destruction" ]
acts: [ "Destruction" ]
- type: Occluder
sizeX: 32
sizeY: 32

View File

@@ -30,11 +30,11 @@
- type: Destructible
thresholds:
50:
Spawn:
spawn:
SteelSheet1:
Min: 1
Max: 1
Acts: ["Destruction"]
min: 1
max: 1
acts: ["Destruction"]
- type: SnapGrid
offset: Edge
placement:

View File

@@ -41,7 +41,7 @@
- type: Destructible
thresholds:
50:
Acts: [ "Destruction" ]
acts: [ "Destruction" ]
- type: entity
name: small light
@@ -68,7 +68,7 @@
- type: Destructible
thresholds:
25:
Acts: [ "Destruction" ]
acts: [ "Destruction" ]
- type: entity
name: unpowered small light
@@ -87,4 +87,4 @@
- type: Destructible
thresholds:
25:
Acts: [ "Destruction" ]
acts: [ "Destruction" ]

View File

@@ -30,7 +30,7 @@
- type: Destructible
thresholds:
100:
Acts: [ "Destruction" ]
acts: [ "Destruction" ]
- type: BreakableConstruction
node: start
- type: SnapGrid

View File

@@ -13,7 +13,7 @@
- type: Destructible
thresholds:
5:
Acts: [ "Destruction" ]
acts: [ "Destruction" ]
- type: Sprite
drawdepth: WallTops
sprite: Constructible/Misc/decals.rsi

View File

@@ -49,11 +49,11 @@
- type: Destructible
thresholds:
300:
Spawn:
spawn:
Girder:
Min: 1
Max: 1
Acts: [ "Destruction" ]
min: 1
max: 1
acts: [ "Destruction" ]
- type: IconSmooth
key: walls
base: brick
@@ -72,11 +72,11 @@
- type: Destructible
thresholds:
300:
Spawn:
spawn:
Girder:
Min: 1
Max: 1
Acts: ["Destruction"]
min: 1
max: 1
acts: ["Destruction"]
- type: IconSmooth
key: walls
base: clock
@@ -95,11 +95,11 @@
- type: Destructible
thresholds:
300:
Spawn:
spawn:
Girder:
Min: 1
Max: 1
Acts: ["Destruction"]
min: 1
max: 1
acts: ["Destruction"]
- type: IconSmooth
key: walls
base: clown
@@ -119,11 +119,11 @@
- type: Destructible
thresholds:
300:
Spawn:
spawn:
Girder:
Min: 1
Max: 1
Acts: ["Destruction"]
min: 1
max: 1
acts: ["Destruction"]
- type: IconSmooth
key: walls
base: cult
@@ -142,11 +142,11 @@
- type: Destructible
thresholds:
300:
Spawn:
spawn:
Girder:
Min: 1
Max: 1
Acts: ["Destruction"]
min: 1
max: 1
acts: ["Destruction"]
- type: IconSmooth
key: walls
base: debug
@@ -165,11 +165,11 @@
- type: Destructible
thresholds:
300:
Spawn:
spawn:
Girder:
Min: 1
Max: 1
Acts: ["Destruction"]
min: 1
max: 1
acts: ["Destruction"]
- type: IconSmooth
key: walls
base: diamond
@@ -189,11 +189,11 @@
- type: Destructible
thresholds:
300:
Spawn:
spawn:
Girder:
Min: 1
Max: 1
Acts: ["Destruction"]
min: 1
max: 1
acts: ["Destruction"]
- type: IconSmooth
key: walls
base: gold
@@ -212,11 +212,11 @@
- type: Destructible
thresholds:
300:
Spawn:
spawn:
Girder:
Min: 1
Max: 1
Acts: ["Destruction"]
min: 1
max: 1
acts: ["Destruction"]
- type: IconSmooth
key: walls
base: ice
@@ -235,11 +235,11 @@
- type: Destructible
thresholds:
300:
Spawn:
spawn:
Girder:
Min: 1
Max: 1
Acts: ["Destruction"]
min: 1
max: 1
acts: ["Destruction"]
- type: IconSmooth
key: walls
base: metal
@@ -258,11 +258,11 @@
- type: Destructible
thresholds:
300:
Spawn:
spawn:
Girder:
Min: 1
Max: 1
Acts: ["Destruction"]
min: 1
max: 1
acts: ["Destruction"]
- type: IconSmooth
key: walls
base: plasma
@@ -281,11 +281,11 @@
- type: Destructible
thresholds:
300:
Spawn:
spawn:
Girder:
Min: 1
Max: 1
Acts: ["Destruction"]
min: 1
max: 1
acts: ["Destruction"]
- type: IconSmooth
key: walls
base: plastic
@@ -309,7 +309,7 @@
- type: Destructible
thresholds:
600:
Acts: ["Destruction"]
acts: ["Destruction"]
- type: BreakableConstruction
node: girder
- type: ReinforcedWall
@@ -335,11 +335,11 @@
- type: Destructible
thresholds:
1000:
Spawn:
spawn:
Girder:
Min: 1
Max: 1
Acts: ["Destruction"]
min: 1
max: 1
acts: ["Destruction"]
- type: IconSmooth
key: walls
base: riveted
@@ -358,11 +358,11 @@
- type: Destructible
thresholds:
300:
Spawn:
spawn:
Girder:
Min: 1
Max: 1
Acts: [ "Destruction" ]
min: 1
max: 1
acts: ["Destruction"]
- type: IconSmooth
key: walls
base: sandstone
@@ -381,11 +381,11 @@
- type: Destructible
thresholds:
300:
Spawn:
spawn:
Girder:
Min: 1
Max: 1
Acts: [ "Destruction" ]
min: 1
max: 1
acts: ["Destruction"]
- type: IconSmooth
key: walls
base: silver
@@ -408,7 +408,7 @@
- type: Destructible
thresholds:
300:
Acts: [ "Destruction" ]
acts: [ "Destruction" ]
- type: BreakableConstruction
node: girder
destroySound: /Audio/Effects/metalbreak.ogg
@@ -430,11 +430,11 @@
- type: Destructible
thresholds:
300:
Spawn:
spawn:
Girder:
Min: 1
Max: 1
Acts: [ "Destruction" ]
min: 1
max: 1
acts: ["Destruction"]
- type: IconSmooth
key: walls
base: uranium
@@ -453,11 +453,11 @@
- type: Destructible
thresholds:
300:
Spawn:
spawn:
Girder:
Min: 1
Max: 1
Acts: [ "Destruction" ]
min: 1
max: 1
acts: ["Destruction"]
- type: IconSmooth
key: walls
base: wood

View File

@@ -31,12 +31,12 @@
- type: Destructible
thresholds:
15:
SoundCollection: WindowBreak
Spawn:
soundCollection: WindowBreak
spawn:
ShardGlass:
Min: 1
Max: 2
Acts: ["Destruction"]
min: 1
max: 2
acts: ["Destruction"]
- type: SnapGrid
offset: Center
- type: Airtight
@@ -65,12 +65,12 @@
- type: Destructible
thresholds:
75:
SoundCollection: WindowBreak
Spawn:
soundCollection: WindowBreak
spawn:
ShardGlassReinforced:
Min: 1
Max: 2
Acts: ["Destruction"]
min: 1
max: 2
acts: ["Destruction"]
- type: Window
base: rwindow
maxDamage: 75
@@ -93,12 +93,12 @@
- type: Destructible
thresholds:
100:
SoundCollection: WindowBreak
Spawn:
soundCollection: WindowBreak
spawn:
ShardGlassPhoron:
Min: 1
Max: 2
Acts: ["Destruction"]
min: 1
max: 2
acts: ["Destruction"]
resistances: metallicResistances
- type: Window
base: pwindow

View File

@@ -132,12 +132,12 @@
- type: Destructible
thresholds:
10:
Sound: /Audio/Effects/glass_break1.ogg
Spawn:
sound: /Audio/Effects/glass_break1.ogg
spawn:
FloodlightBroken:
Min: 1
Max: 1
Acts: ["Destruction"]
min: 1
max: 1
acts: ["Destruction"]
- type: Appearance
visuals:
- type: FlashLightVisualizer
@@ -157,12 +157,12 @@
- type: Destructible
thresholds:
20:
Spawn:
spawn:
SteelSheet1:
Min: 1
Max: 1
Sound: /Audio/Effects/metalbreak.ogg
Acts: ["Destruction"]
min: 1
max: 1
sound: /Audio/Effects/metalbreak.ogg
acts: ["Destruction"]
- type: Physics
shapes:
- !type:PhysShapeAabb

View File

@@ -22,7 +22,7 @@
- type: Destructible
thresholds:
10:
Acts: ["Destruction"]
acts: ["Destruction"]
- type: Appearance
visuals:
- type: TimerTriggerVisualizer
@@ -48,7 +48,7 @@
- type: Destructible
thresholds:
10:
Acts: ["Destruction"]
acts: ["Destruction"]
- type: Appearance
visuals:
- type: TimerTriggerVisualizer
@@ -78,7 +78,7 @@
- type: Destructible
thresholds:
10:
Acts: ["Destruction"]
acts: ["Destruction"]
- type: Appearance
visuals:
- type: TimerTriggerVisualizer
@@ -107,7 +107,7 @@
- type: Destructible
thresholds:
50:
Acts: ["Destruction"]
acts: ["Destruction"]
- type: Appearance
visuals:
- type: TimerTriggerVisualizer