Wood walls from barricades (#33902)

* Wood wall is now built from barricade congraph and on top of a barricade instead of using rods

* Fixed construction instructions for wooden wall

* Wood wall is now built from barricade congraph and on top of a barricade instead of using rods

* Fixed construction instructions for wooden wall

* fixed linter error

* Update Resources/Prototypes/Entities/Structures/Walls/walls.yml

Reasonable suggestion

Co-authored-by: Thomas <87614336+Aeshus@users.noreply.github.com>

* Update Resources/Prototypes/Entities/Structures/Walls/walls.yml

spelling error

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* removed ability to build wall from 'junk' wood barrier'

* fixed ability to pry overlay barricades and not allow them to extend to full wood walls

* renamed incorrectly named entity

* fixed default entity graph so as to not complain for unit tests

* corrected my incorrect assumptions and fixed destroy cost

---------

Co-authored-by: Thomas <87614336+Aeshus@users.noreply.github.com>
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
This commit is contained in:
JustinWinningham
2024-12-20 19:28:46 -08:00
committed by GitHub
parent 00f12e092a
commit 12c5c7e91b
5 changed files with 56 additions and 29 deletions

View File

@@ -1106,13 +1106,14 @@
parent: BaseWall parent: BaseWall
id: WallWood id: WallWood
name: wood wall name: wood wall
description: The traditional greytide defense.
components: components:
- type: Sprite - type: Sprite
sprite: Structures/Walls/wood.rsi sprite: Structures/Walls/wood.rsi
- type: Icon - type: Icon
sprite: Structures/Walls/wood.rsi sprite: Structures/Walls/wood.rsi
- type: Construction - type: Construction
graph: Girder graph: Barricade
node: woodWall node: woodWall
- type: Destructible - type: Destructible
thresholds: thresholds:
@@ -1133,7 +1134,7 @@
sound: sound:
collection: WoodDestroyHeavy collection: WoodDestroyHeavy
- !type:ChangeConstructionNodeBehavior - !type:ChangeConstructionNodeBehavior
node: girder node: Barricade
- !type:DoActsBehavior - !type:DoActsBehavior
acts: ["Destruction"] acts: ["Destruction"]
- type: IconSmooth - type: IconSmooth

View File

@@ -38,8 +38,8 @@
- !type:SpawnEntitiesBehavior - !type:SpawnEntitiesBehavior
spawn: spawn:
MaterialWoodPlank1: MaterialWoodPlank1:
min: 3 min: 1
max: 3 max: 1
- !type:DoActsBehavior - !type:DoActsBehavior
acts: [ "Destruction" ] acts: [ "Destruction" ]
- type: AtmosExposed - type: AtmosExposed
@@ -73,6 +73,9 @@
- type: Sprite - type: Sprite
sprite: Structures/barricades.rsi sprite: Structures/barricades.rsi
state: barricade state: barricade
- type: Construction
graph: BarricadeCovering
node: barricadecover
#Directional Barricade #Directional Barricade
- type: entity - type: entity

View File

@@ -26,6 +26,25 @@
steps: steps:
- tool: Prying - tool: Prying
doAfter: 5 doAfter: 5
- to: woodWall
completed:
- !type:SnapToGrid
southRotation: true
steps:
- material: WoodPlank
amount: 2
doAfter: 2
- node: woodWall
entity: WallWood
edges:
- to: barricadefull
completed:
- !type:GivePrototype
prototype: MaterialWoodPlank1
amount: 2
steps:
- tool: Prying
doAfter: 10
- type: constructionGraph - type: constructionGraph
id: BarricadeDirectional id: BarricadeDirectional
@@ -53,3 +72,30 @@
steps: steps:
- tool: Prying - tool: Prying
doAfter: 5 doAfter: 5
- type: constructionGraph
id: BarricadeCovering
start: start
graph:
- node: start
edges:
- to: barricadecover
steps:
- material: WoodPlank
amount: 2
doAfter: 3
- node: barricadecover
entity: BarricadeBlock
edges:
- to: start
completed:
- !type:SpawnPrototype
prototype: MaterialWoodPlank1
amount: 2 #returns 1 less as one breaks
- !type:DeleteEntity { }
conditions:
- !type:EntityAnchored
anchored: true
steps:
- tool: Prying
doAfter: 2

View File

@@ -51,17 +51,6 @@
amount: 2 amount: 2
doAfter: 1 doAfter: 1
- to: woodWall
completed:
- !type:SnapToGrid
southRotation: true
conditions:
- !type:EntityAnchored {}
steps:
- material: WoodPlank
amount: 2
doAfter: 2
- to: uraniumWall - to: uraniumWall
completed: completed:
- !type:SnapToGrid - !type:SnapToGrid
@@ -173,18 +162,6 @@
- tool: Welding - tool: Welding
doAfter: 10 doAfter: 10
- node: woodWall
entity: WallWood
edges:
- to: girder
completed:
- !type:GivePrototype
prototype: MaterialWoodPlank1
amount: 2
steps:
- tool: Prying
doAfter: 10
- node: uraniumWall - node: uraniumWall
entity: WallUranium entity: WallUranium
edges: edges:

View File

@@ -105,11 +105,11 @@
canBuildInImpassable: false canBuildInImpassable: false
conditions: conditions:
- !type:TileNotBlocked - !type:TileNotBlocked
# here
- type: construction - type: construction
name: wood wall name: wood wall
id: WoodWall id: WoodWall
graph: Girder graph: Barricade
startNode: start startNode: start
targetNode: woodWall targetNode: woodWall
category: construction-category-structures category: construction-category-structures