juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Wall YAML cleanup (#3864)

Browse Source 
* Code Quality

* IDs and mapping

* Construction Recipes
This commit is contained in:
Swept
2021-04-16 06:47:18 +00:00
committed by GitHub
parent 930e1e2acb
commit 682b36ae23
5 changed files with 1060 additions and 1061 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Resources/Maps/Test/Breathing/3by3-20oxy-80nit.yml
View File

@@ -111,56 +111,56 @@ entities:
"1, -1": 1
type: GridAtmosphere
- uid: 1
type: reinforced_wall
type: WallReinforced
components:
- parent: 0
pos: -0.5,-0.5
rot: -1.5707963267948966 rad
type: Transform
- uid: 2
type: reinforced_wall
type: WallReinforced
components:
- parent: 0
pos: -0.5,-1.5
rot: -1.5707963267948966 rad
type: Transform
- uid: 3
type: reinforced_wall
type: WallReinforced
components:
- parent: 0
pos: -0.5,-2.5
rot: -1.5707963267948966 rad
type: Transform
- uid: 4
type: reinforced_wall
type: WallReinforced
components:
- parent: 0
pos: 0.5,-2.5
rot: -1.5707963267948966 rad
type: Transform
- uid: 5
type: reinforced_wall
type: WallReinforced
components:
- parent: 0
pos: 1.5,-2.5
rot: -1.5707963267948966 rad
type: Transform
- uid: 6
type: reinforced_wall
type: WallReinforced
components:
- parent: 0
pos: 1.5,-1.5
rot: -1.5707963267948966 rad
type: Transform
- uid: 7
type: reinforced_wall
type: WallReinforced
components:
- parent: 0
pos: 1.5,-0.5
rot: -1.5707963267948966 rad
type: Transform
- uid: 8
type: reinforced_wall
type: WallReinforced
components:
- parent: 0
pos: 0.5,-0.5

50
Resources/Maps/Test/singularity.yml
View File

@@ -1656,7 +1656,7 @@ entities:
rot: -1.5707963267948966 rad
type: Transform
- uid: 190
type: reinforced_wall
type: WallReinforced
components:
- parent: 0
pos: 3.5,17.5
@@ -1698,168 +1698,168 @@ entities:
rot: -1.5707963267948966 rad
type: Transform
- uid: 196
type: reinforced_wall
type: WallReinforced
components:
- parent: 0
pos: 4.5,17.5
rot: -1.5707963267948966 rad
type: Transform
- uid: 197
type: reinforced_wall
type: WallReinforced
components:
- parent: 0
pos: 5.5,17.5
rot: -1.5707963267948966 rad
type: Transform
- uid: 198
type: reinforced_wall
type: WallReinforced
components:
- parent: 0
pos: 6.5,17.5
rot: -1.5707963267948966 rad
type: Transform
- uid: 199
type: reinforced_wall
type: WallReinforced
components:
- parent: 0
pos: 7.5,17.5
rot: -1.5707963267948966 rad
type: Transform
- uid: 200
type: reinforced_wall
type: WallReinforced
components:
- parent: 0
pos: 7.5,16.5
rot: -1.5707963267948966 rad
type: Transform
- uid: 201
type: reinforced_wall
type: WallReinforced
components:
- parent: 0
pos: 7.5,15.5
rot: -1.5707963267948966 rad
type: Transform
- uid: 202
type: reinforced_wall
type: WallReinforced
components:
- parent: 0
pos: 7.5,14.5
rot: -1.5707963267948966 rad
type: Transform
- uid: 203
type: reinforced_wall
type: WallReinforced
components:
- parent: 0
pos: 7.5,13.5
rot: -1.5707963267948966 rad
type: Transform
- uid: 204
type: reinforced_wall
type: WallReinforced
components:
- parent: 0
pos: 7.5,12.5
rot: -1.5707963267948966 rad
type: Transform
- uid: 205
type: reinforced_wall
type: WallReinforced
components:
- parent: 0
pos: 7.5,11.5
rot: -1.5707963267948966 rad
type: Transform
- uid: 206
type: reinforced_wall
type: WallReinforced
components:
- parent: 0
pos: 7.5,10.5
rot: -1.5707963267948966 rad
type: Transform
- uid: 207
type: reinforced_wall
type: WallReinforced
components:
- parent: 0
pos: 7.5,9.5
rot: -1.5707963267948966 rad
type: Transform
- uid: 208
type: reinforced_wall
type: WallReinforced
components:
- parent: 0
pos: 1.5,17.5
rot: -1.5707963267948966 rad
type: Transform
- uid: 209
type: reinforced_wall
type: WallReinforced
components:
- parent: 0
pos: 2.5,17.5
rot: -1.5707963267948966 rad
type: Transform
- uid: 210
type: reinforced_wall
type: WallReinforced
components:
- parent: 0
pos: -0.5,9.5
rot: -1.5707963267948966 rad
type: Transform
- uid: 211
type: reinforced_wall
type: WallReinforced
components:
- parent: 0
pos: -0.5,10.5
rot: -1.5707963267948966 rad
type: Transform
- uid: 212
type: reinforced_wall
type: WallReinforced
components:
- parent: 0
pos: -0.5,11.5
rot: -1.5707963267948966 rad
type: Transform
- uid: 213
type: reinforced_wall
type: WallReinforced
components:
- parent: 0
pos: -0.5,12.5
rot: -1.5707963267948966 rad
type: Transform
- uid: 214
type: reinforced_wall
type: WallReinforced
components:
- parent: 0
pos: -0.5,13.5
rot: -1.5707963267948966 rad
type: Transform
- uid: 215
type: reinforced_wall
type: WallReinforced
components:
- parent: 0
pos: -0.5,14.5
rot: -1.5707963267948966 rad
type: Transform
- uid: 216
type: reinforced_wall
type: WallReinforced
components:
- parent: 0
pos: -0.5,15.5
rot: -1.5707963267948966 rad
type: Transform
- uid: 217
type: reinforced_wall
type: WallReinforced
components:
- parent: 0
pos: -0.5,16.5
rot: -1.5707963267948966 rad
type: Transform
- uid: 218
type: reinforced_wall
type: WallReinforced
components:
- parent: 0
pos: -0.5,17.5
rot: -1.5707963267948966 rad
type: Transform
- uid: 219
type: reinforced_wall
type: WallReinforced
components:
- parent: 0
pos: 0.5,17.5

1974
Resources/Maps/saltern.yml
View File

File diff suppressed because it is too large Load Diff

77
Resources/Prototypes/Entities/Constructible/Walls/walls.yml
View File

@@ -1,9 +1,9 @@
- type: entity
id: base_wall
abstract: true
parent: BaseConstructible
id: WallBase
name: basewall
description: Keeps the air in and the greytide out.
abstract: true
placement:
mode: SnapgridCenter
snap:
@@ -42,9 +42,9 @@
base: solid
- type: entity
id: brick_wall
parent: WallBase
id: WallBrick
name: brick wall
parent: base_wall
components:
- type: Sprite
sprite: Constructible/Structures/Walls/brick.rsi
@@ -68,9 +68,9 @@
base: brick
- type: entity
id: clock_wall
parent: WallBase
id: WallClock
name: clock wall
parent: base_wall
components:
- type: Sprite
sprite: Constructible/Structures/Walls/clock.rsi
@@ -94,9 +94,9 @@
base: clock
- type: entity
id: clown_wall
parent: WallBase
id: WallClown
name: clown wall
parent: base_wall
components:
- type: Sprite
sprite: Constructible/Structures/Walls/clown.rsi
@@ -121,9 +121,9 @@
- type: entity
id: cult_wall
parent: WallBase
id: WallCult
name: cult wall
parent: base_wall
components:
- type: Sprite
sprite: Constructible/Structures/Walls/cult.rsi
@@ -147,9 +147,9 @@
base: cult
- type: entity
id: debug_wall
parent: WallBase
id: WallDebug
name: debug wall
parent: base_wall
components:
- type: Sprite
sprite: Constructible/Structures/Walls/debug.rsi
@@ -173,9 +173,9 @@
base: debug
- type: entity
id: diamond_wall
parent: WallBase
id: WallDiamond
name: diamond wall
parent: base_wall
components:
- type: Sprite
sprite: Constructible/Structures/Walls/diamond.rsi
@@ -198,11 +198,10 @@
key: walls
base: diamond
- type: entity
id: gold_wall
parent: WallBase
id: WallGold
name: gold wall
parent: base_wall
components:
- type: Sprite
sprite: Constructible/Structures/Walls/gold.rsi
@@ -226,9 +225,9 @@
base: gold
- type: entity
id: ice_wall
parent: WallBase
id: WallIce
name: ice wall
parent: base_wall
components:
- type: Sprite
sprite: Constructible/Structures/Walls/ice.rsi
@@ -252,9 +251,9 @@
base: ice
- type: entity
id: metal_wall
parent: WallBase
id: WallMetal
name: metal wall
parent: base_wall
components:
- type: Sprite
sprite: Constructible/Structures/Walls/metal.rsi
@@ -278,9 +277,9 @@
base: metal
- type: entity
id: plasma_wall
parent: WallBase
id: WallPlasma
name: plasma wall
parent: base_wall
components:
- type: Sprite
sprite: Constructible/Structures/Walls/plasma.rsi
@@ -304,9 +303,9 @@
base: plasma
- type: entity
id: plastic_wall
parent: WallBase
id: WallPlastic
name: plastic wall
parent: base_wall
components:
- type: Sprite
sprite: Constructible/Structures/Walls/plastic.rsi
@@ -330,9 +329,9 @@
base: plastic
- type: entity
id: reinforced_wall
parent: WallBase
id: WallReinforced
name: reinforced wall
parent: base_wall
components:
- type: Sprite
color: "#889192"
@@ -363,9 +362,9 @@
# Riveting
- type: entity
id: riveted_wall
parent: WallBase
id: WallRiveted
name: riveted wall
parent: base_wall
components:
- type: Sprite
sprite: Constructible/Structures/Walls/riveted.rsi
@@ -389,9 +388,9 @@
base: riveted
- type: entity
id: sandstone_wall
parent: WallBase
id: WallSandstone
name: sandstone wall
parent: base_wall
components:
- type: Sprite
sprite: Constructible/Structures/Walls/sandstone.rsi
@@ -415,9 +414,9 @@
base: sandstone
- type: entity
id: silver_wall
parent: WallBase
id: WallSilver
name: silver wall
parent: base_wall
components:
- type: Sprite
sprite: Constructible/Structures/Walls/silver.rsi
@@ -441,9 +440,9 @@
base: silver
- type: entity
id: solid_wall
parent: WallBase
id: WallSolid
name: solid wall
parent: base_wall
components:
- type: Sprite
color: "#889192"
@@ -471,9 +470,9 @@
base: solid
- type: entity
id: uranium_wall
parent: WallBase
id: WallUranium
name: uranium wall
parent: base_wall
components:
- type: Sprite
sprite: Constructible/Structures/Walls/uranium.rsi
@@ -497,9 +496,9 @@
base: uranium
- type: entity
id: wood_wall
parent: WallBase
id: WallWood
name: wood wall
parent: base_wall
components:
- type: Sprite
sprite: Constructible/Structures/Walls/wood.rsi

4
Resources/Prototypes/Recipes/Construction/Graphs/girder.yml
View File

@@ -55,7 +55,7 @@
amount: 2
- node: wall
entity: solid_wall
entity: WallSolid
edges:
- to: girder
completed:
@@ -95,7 +95,7 @@
doAfter: 2
- node: reinforcedWall
entity: reinforced_wall
entity: WallReinforced
edges:
- to: girder
steps: