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

Tabletop computer deconstruct fix #1090

Merged
merged 2 commits into from
Mar 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 @@ -31,7 +31,7 @@ public sealed partial class BoardNodeEntity : IGraphNodeEntity

// Frontier - adds tabletop variants
if (args.EntityManager.TryGetComponent(container.Owner, out ConstructionComponent? constructionComponent)
&& constructionComponent.Graph == "GraphComputerTabletop"
&& constructionComponent.Graph == "ComputerTabletop"
&& args.EntityManager.TryGetComponent(board, out ComputerTabletopBoardComponent? tabletopComputer))
{
return tabletopComputer.Prototype;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,39 +1,3 @@
# Base structures
- type: entity
id: BaseStructureComputerTabletop
suffix: Tabletop
abstract: true
components:
- type: Sprite
sprite: _NF/Structures/Machines/computer_tabletop.rsi
drawdepth: SmallObjects
layers:
- map: ["computerLayerBody"]
sprite: _NF/Structures/Machines/computer_tabletop.rsi
state: computer_tabletop
- map: ["computerLayerKeyboard"]
sprite: _NF/Structures/Machines/computer_tabletop.rsi
state: generic_keyboard_tabletop
- map: ["computerLayerScreen"]
sprite: Structures/Machines/computers.rsi
state: generic
- map: ["computerLayerKeys"]
sprite: Structures/Machines/computers.rsi
state: generic_keys
- type: Fixtures
fixtures:
fix1:
shape:
!type:PhysShapeAabb
bounds: "-0.45,-0.45,0.45,0.45"
density: 60
mask:
- Impassable
- LowImpassable
# - TabletopMachineMask
# layer:
# - TabletopMachineLayer

# Computers: Base Game
- type: entity
parent: [BaseStructureComputerTabletop, ComputerAlert]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,69 @@
- type: entity
parent: ComputerFrame
id: BaseStructureComputerTabletop
parent: BaseStructure
suffix: Tabletop
abstract: true
components:
- type: Physics
- type: Fixtures
fixtures:
fix1:
shape:
!type:PhysShapeAabb
bounds: "-0.25,-0.35,0.25,0.35"
density: 190
mask:
- TabletopMachineMask
layer:
- TabletopMachineLayer
- type: InteractionOutline
- type: Rotatable
- type: Anchorable
- type: Construction
graph: ComputerTabletop
node: frameUnsecured
- type: Sprite
sprite: _NF/Structures/Machines/computer_tabletop.rsi
drawdepth: Objects
layers:
- map: [ "computerLayerBody" ]
sprite: _NF/Structures/Machines/computer_tabletop.rsi
state: computer_tabletop
- map: [ "computerLayerKeyboard" ]
sprite: _NF/Structures/Machines/computer_tabletop.rsi
state: generic_keyboard_tabletop
- map: [ "computerLayerScreen" ]
sprite: Structures/Machines/computers.rsi
state: generic
- map: [ "computerLayerKeys" ]
sprite: Structures/Machines/computers.rsi
state: generic_keys
- type: Damageable
damageContainer: Inorganic
damageModifierSet: Electronic
- type: Destructible
thresholds:
- trigger:
!type:DamageTrigger
damage: 100
behaviors:
- !type:PlaySoundBehavior
sound:
collection: GlassBreak
- !type:ChangeConstructionNodeBehavior
node: monitorBroken
- !type:DoActsBehavior
acts: ["Destruction"]
- type: StaticPrice
price: 100

- type: entity
parent: BaseStructureComputerTabletop
name: computer
id: ComputerTabletopFrame
components:
- type: Construction
graph: GraphComputerTabletop
graph: ComputerTabletop
node: frameUnsecured
containers:
- board
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
- type: constructionGraph
id: GraphComputerTabletop
id: ComputerTabletop
start: start
graph:
- node: start
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/_NF/Recipes/Construction/machines.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
- type: construction
name: computer (tabletop)
id: ConstructionComputerTabletop
graph: GraphComputerTabletop
graph: ComputerTabletop
startNode: start
targetNode: tabletop computer
category: construction-category-machines
Expand Down
Loading