Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Diagonal walls and secret doors #757

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
faa3998
Diagonal walls and window
ErhardSteinhauer Dec 11, 2023
cc4f8b1
added notice board and diagonal window
ErhardSteinhauer Dec 24, 2023
6610ebb
diagonal plasma windows
ErhardSteinhauer Dec 24, 2023
5f3be5b
secret door
ErhardSteinhauer Dec 24, 2023
87395eb
notice boards are craftable
ErhardSteinhauer Dec 25, 2023
ea82fa7
kegs
ErhardSteinhauer Dec 25, 2023
e3c8932
keggers
ErhardSteinhauer Dec 25, 2023
1e63fc5
added kegs to boozeomat inventory
ErhardSteinhauer Dec 25, 2023
3dbf0e9
Adressing the issues
ErhardSteinhauer Dec 27, 2023
0c2218e
Delete Resources/Prototypes/_NF/Recipes/Construction/Graphs/structure…
ErhardSteinhauer Dec 27, 2023
b9b1e7b
Delete Resources/Prototypes/_NF/Recipes/Construction/wallmount_notice…
ErhardSteinhauer Dec 27, 2023
cca7bef
Update boozeomat.yml
ErhardSteinhauer Dec 27, 2023
0bac671
window parenting fixes
ErhardSteinhauer Dec 27, 2023
609ead3
Cleanup
dvir001 Jan 8, 2024
d7e30c9
Fixing
dvir001 Jan 8, 2024
db57f45
added new entity to use as a parent instead of WallSolidDiagonal (whi…
ErhardSteinhauer Jan 8, 2024
757eca1
Update diagonal_walls.yml
ErhardSteinhauer Jan 8, 2024
2874a34
Merge branch 'new-frontiers-14:master' into Diagonal-Walls&Windows
ErhardSteinhauer Jan 10, 2024
b229cec
moving diagonal windows and grille to separate PR
ErhardSteinhauer Jan 10, 2024
e3c6ba4
Merge remote-tracking branch 'origin/master' into pr/757
dvir001 Feb 10, 2024
4f441ef
Merge branch 'new-frontiers-14:master' into Diagonal-Walls&Windows
ErhardSteinhauer Feb 12, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
81 changes: 81 additions & 0 deletions Resources/Prototypes/_NF/Entities/Structures/Doors/secret_door.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
#reinforced secret door
- type: entity
id: ReinforcedSecretDoorAssembly
name: secret reinforced door assembly
parent: BaseSecretDoorAssembly
components:
- type: Sprite
sprite: _NF/Structures/Doors/secret_door_reinforced.rsi
state: assembly
- type: Construction
graph: ReinforcedSecretDoorGraph
node: assembly

- type: entity
id: SolidReinforcedSecretDoor
name: reinforced wall
parent: BaseSecretDoor
components:
- type: Construction
graph: ReinforcedSecretDoorGraph
node: ReinforcedSecretDoorNode
containers:
- battery-container
- type: Sprite
sprite: _NF/Structures/Doors/secret_door_reinforced.rsi

#wood secret door
- type: entity
id: WoodSecretDoorAssembly
name: secret wood door assembly
parent: BaseSecretDoorAssembly
components:
- type: Sprite
sprite: _NF/Structures/Doors/secret_door_wood.rsi
state: assembly
- type: Construction
graph: WoodSecretDoorGraph
node: assembly
placement:
mode: SnapgridCenter

- type: entity
id: WoodSecretDoor
name: wood wall
parent: BaseSecretDoor
components:
- type: Sprite
sprite: _NF/Structures/Doors/secret_door_wood.rsi
- type: Construction
graph: WoodSecretDoorGraph
node: WoodSecretDoorNode
containers:
- battery-container

#uranium secret door
- type: entity
id: UraniumSecretDoorAssembly
name: secret uranium door assembly
parent: BaseSecretDoorAssembly
components:
- type: Sprite
sprite: _NF/Structures/Doors/secret_door_uranium.rsi
state: assembly
- type: Construction
graph: UraniumSecretDoorGraph
node: assembly
placement:
mode: SnapgridCenter

- type: entity
id: UraniumSecretDoor
name: uranium wall
parent: BaseSecretDoor
components:
- type: Sprite
sprite: _NF/Structures/Doors/secret_door_uranium.rsi
- type: Construction
graph: UraniumSecretDoorGraph
node: UraniumSecretDoorNode
containers:
- battery-container
154 changes: 154 additions & 0 deletions Resources/Prototypes/_NF/Entities/Structures/Walls/diagonal_walls.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,154 @@
# Base Diagonal Wall
- type: entity
abstract: true
parent: BaseStructure
id: BaseWallDiagonal
name: basewall
suffix: diagonal
placement:
mode: SnapgridCenter
snap:
- Wall
components:
- type: Transform
anchored: true
- type: Clickable
- type: Tag
tags:
- Wall
- type: Sprite
drawdepth: Walls
state: state0
- type: IconSmooth
mode: Diagonal
key: walls
base: state
- type: Icon
state: state0
- type: Airtight
noAirWhenFullyAirBlocked: false
airBlockedDirection:
- South
- East
- type: Fixtures
fixtures:
fix1:
shape:
!type:PolygonShape
vertices:
- "-0.5,-0.5"
- "0.5,0.5"
- "0.5,-0.5"
mask:
- FullTileMask
layer:
- WallLayer

# Wall variations
- type: entity
parent: [ WallReinforced, BaseWallDiagonal ]
id: WallReinforcedDiagonal
name: reinforced wall
placement:
mode: SnapgridCenter
snap:
- Wall
components:
- type: Sprite
drawdepth: Walls
sprite: _NF/Structures/Walls/solid_reinforced_diagonal.rsi
state: state0
- type: IconSmooth
mode: Diagonal
key: walls
base: state
- type: Icon
sprite: _NF/Structures/Walls/solid_reinforced_diagonal.rsi
state: state0
- type: Fixtures
fixtures:
fix1:
shape:
!type:PolygonShape
vertices:
- "-0.5,-0.5"
- "0.5,0.5"
- "0.5,-0.5"
mask:
- FullTileMask
layer:
- WallLayer
- type: Occluder
enabled: false

- type: entity
parent: [ WallWood, BaseWallDiagonal ]
id: WallWoodDiagonal
name: wood wall
placement:
mode: SnapgridCenter
snap:
- Wall
components:
- type: Sprite
drawdepth: Walls
sprite: _NF/Structures/Walls/wood_diagonal.rsi
state: state0
- type: IconSmooth
mode: Diagonal
key: walls
base: state
- type: Icon
sprite: _NF/Structures/Walls/wood_diagonal.rsi
state: state0
- type: Fixtures
fixtures:
fix1:
shape:
!type:PolygonShape
vertices:
- "-0.5,-0.5"
- "0.5,0.5"
- "0.5,-0.5"
mask:
- FullTileMask
layer:
- WallLayer
- type: Occluder
enabled: false

- type: entity
parent: [ WallUranium, BaseWallDiagonal ]
id: WallUraniumDiagonal
name: uranium wall
placement:
mode: SnapgridCenter
snap:
- Wall
components:
- type: Sprite
drawdepth: Walls
sprite: _NF/Structures/Walls/uranium_diagonal.rsi
state: state0
- type: IconSmooth
mode: Diagonal
key: walls
base: state
- type: Icon
sprite: _NF/Structures/Walls/uranium_diagonal.rsi
state: state0
- type: Fixtures
fixtures:
fix1:
shape:
!type:PolygonShape
vertices:
- "-0.5,-0.5"
- "0.5,0.5"
- "0.5,-0.5"
mask:
- FullTileMask
layer:
- WallLayer
- type: Occluder
enabled: false
Loading
Loading