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 8 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
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
DrinkVacuumFlask: 15
DrinkFlaskBar: 15
DrinkShaker: 15
DrinkKegSteel: 5 # Frontier: kegs
DrinkKegWood: 5 # Frontier: kegs
dvir001 marked this conversation as resolved.
Show resolved Hide resolved
DrinkAbsintheBottleFull: 4
DrinkAleBottleFull: 15
DrinkBeerBottleFull: 15
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,92 @@
- type: entity
parent: BaseItem
id: DrinkKegSteel
dvir001 marked this conversation as resolved.
Show resolved Hide resolved
name: keg
suffix: Steel
description: I don't have a drinking problem - the keg solved it.
components:
- type: Sprite
sprite: _NF/Objects/Consumable/Drinks/keg_steel.rsi
state: icon
- type: Item
size: 100
- type: Clothing
sprite: _NF/Objects/Consumable/Drinks/keg_steel.rsi
quickEquip: false
slots:
- Back
- type: StaticPrice
price: 30
- type: SolutionContainerManager
solutions:
drink:
maxVol: 600
- type: Drink
- type: DrawableSolution
solution: drink
- type: RefillableSolution
solution: drink
- type: DrainableSolution
solution: drink
- type: SolutionTransfer
transferAmount: 50
maxTransferAmount: 100
minTransferAmount: 10
canChangeTransferAmount: true
# - type: Spillable
# solution: drink
- type: UserInterface
interfaces:
- key: enum.TransferAmountUiKey.Key
type: TransferAmountBoundUserInterface
- type: PhysicalComposition
materialComposition:
Steel: 50
- type: ItemSlots
slots:
label_slot:
insertVerbText: Attach Label
ejectVerbText: Remove Label
name: Keg Label
startingItem: null
whitelist:
tags:
- Document
insertOnInteract: true
priority: 5
- type: ContainerContainer
containers:
storagebase: !type:Container
ents: []
label_slot: !type:ContainerSlot {}
- type: Appearance
- type: ItemMapper
mapLayers:
label:
whitelist:
tags:
- Document
sprite: _NF/Objects/Consumable/Drinks/keg_steel.rsi

- type: entity
parent: DrinkKegSteel
id: DrinkKegWood
name: keg
suffix: Wood
components:
- type: Sprite
sprite: _NF/Objects/Consumable/Drinks/keg_wood.rsi
state: icon
- type: Clothing
sprite: _NF/Objects/Consumable/Drinks/keg_wood.rsi
- type: PhysicalComposition
materialComposition:
Wood: 50
- type: Appearance
- type: ItemMapper
mapLayers:
label:
whitelist:
tags:
- Document
sprite: _NF/Objects/Consumable/Drinks/keg_wood.rsi
dvir001 marked this conversation as resolved.
Show resolved Hide resolved
132 changes: 132 additions & 0 deletions Resources/Prototypes/_NF/Entities/Structures/Doors/secret_door.yml
dvir001 marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
@@ -0,0 +1,132 @@
#reinforced secret door
- type: entity
id: ReinforcedSecretDoorAssembly
name: secret reinforced door assembly
parent: BaseSecretDoorAssembly
components:
- type: Construction
graph: ReinforcedSecretDoorGraph
node: assembly
- type: Sprite
sprite: _NF/Structures/Doors/secret_door_reinforced.rsi
state: assembly
- type: Damageable
damageContainer: Inorganic
damageModifierSet: Metallic
- type: Destructible
thresholds:
- trigger:
!type:DamageTrigger
damage: 1200 #excess damage (nuke?). avoid computational cost of spawning entities.
behaviors:
- !type:DoActsBehavior
acts: ["Destruction"]
- trigger:
!type:DamageTrigger
damage: 600
behaviors:
- !type:ChangeConstructionNodeBehavior
node: girder
- !type:DoActsBehavior
acts: ["Destruction"]

- 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
layers:
- state: closed
map: ["enum.DoorVisualLayers.Base"]
- type: AnimationPlayer
- type: Physics
- type: Fixtures
fixtures:
fix1:
shape:
!type:PhysShapeAabb
bounds: "-0.49,-0.49,0.49,0.49"
density: 100
mask:
- FullTileMask
layer:
- WallLayer
- type: Destructible
thresholds:
- trigger:
!type:DamageTrigger
damage: 1200 #excess damage (nuke?). avoid computational cost of spawning entities.
behaviors:
- !type:DoActsBehavior
acts: ["Destruction"]
- trigger:
!type:DamageTrigger
damage: 600
behaviors:
- !type:ChangeConstructionNodeBehavior
node: girder
- !type:DoActsBehavior
acts: ["Destruction"]

#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: Construction
graph: WoodSecretDoorGraph
node: WoodSecretDoorNode
containers:
- battery-container
- type: Sprite
sprite: _NF/Structures/Doors/secret_door_wood.rsi

#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: Construction
graph: UraniumSecretDoorGraph
node: UraniumSecretDoorNode
containers:
- battery-container
- type: Sprite
sprite: _NF/Structures/Doors/secret_door_uranium.rsi
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
- type: entity
id: NoticeBoard
name: notice board
description: You wear this on your back and put items into it.
placement:
mode: SnapgridCenter
components:
- type: WallMount
- type: Clickable
- type: InteractionOutline
- type: Rotatable
- type: Physics
bodyType: Static
canCollide: false
- type: Fixtures
fixtures:
fix1:
shape:
!type:PhysShapeAabb {}
- type: Damageable
damageContainer: Inorganic
damageModifierSet: Wood
- type: Destructible
thresholds:
- trigger:
!type:DamageTrigger
damage: 75
behaviors:
- !type:DoActsBehavior
acts: ["Destruction"]
- !type:PlaySoundBehavior
sound:
path: /Audio/Effects/woodhit.ogg
- !type:SpawnEntitiesBehavior
spawn:
MaterialWoodPlank:
min: 1
max: 2
- type: Sprite
drawdepth: WallTops
sprite: _NF/Structures/Wallmounts/notice_board.rsi
snapCardinals: true
state: base
layers:
- state: base
- map: [ "enum.StorageContainerVisualLayers.Fill" ]
visible: false
- type: Icon
sprite: _NF/Structures/Wallmounts/notice_board.rsi
state: icon
- type: StaticPrice
price: 20
- type: Storage
capacity: 16
whitelist:
tags:
- Document
- type: ContainerContainer
containers:
storagebase: !type:Container
ents: []
- type: UserInterface
interfaces:
- key: enum.StorageUiKey.Key
type: StorageBoundUserInterface
- type: Appearance
- type: StorageContainerVisuals
maxFillLevels: 8
fillBaseName: notices-
- type: Construction
graph: NoticeBoardGraph
node: NoticeBoardNode
dvir001 marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
# entities list: WallReinforcedDiagonal, WallWoodDiagona, GrilleDiagona, WindowReinforcedDiagonal
- type: entity
parent: WallShuttleDiagonal
id: WallReinforcedDiagonal
name: reinforced wall
suffix: diagonal
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: Destructible
thresholds:
- trigger:
!type:DamageTrigger
damage: 1200 #excess damage (nuke?). avoid computational cost of spawning entities.
behaviors:
- !type:DoActsBehavior
acts: ["Destruction"]
- trigger:
!type:DamageTrigger
damage: 600
behaviors:
- !type:ChangeConstructionNodeBehavior
node: girder
- !type:DoActsBehavior
acts: ["Destruction"]

- type: entity
parent: WallShuttleDiagonal
id: WallWoodDiagonal
name: wood wall
suffix: diagonal
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: entity
parent: WallShuttleDiagonal
id: WallUraniumDiagonal
name: uranium wall
suffix: diagonal
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
Loading
Loading