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.

Sign up for GitHub

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

Half Revert #31978 #33160

Merged
merged 5 commits into from
Nov 14, 2024
Merged

Half Revert #31978 #33160

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
69c0f87
we hate powergaming
cohanna Nov 4, 2024
18971f2
Reverted #31978
cohanna Nov 7, 2024
6c7336b
oops reverted too much
cohanna Nov 7, 2024
e9f6a02
un-reverted fixes
cohanna Nov 13, 2024
21074bd
oops
cohanna Nov 13, 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
2 changes: 1 addition & 1 deletion Resources/Prototypes/Entities/Structures/Windows/clockwork.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,4 +152,4 @@
sprite: Structures/Windows/cracks_diagonal.rsi
- type: Construction
graph: WindowDiagonal
node: clockworkWindowDiagonal
node: clockworkWindowDiagonal
2 changes: 1 addition & 1 deletion Resources/Prototypes/Entities/Structures/Windows/mining.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,4 +91,4 @@
- East
- type: DamageVisuals
damageOverlay:
sprite: Structures/Windows/cracks_diagonal.rsi
sprite: Structures/Windows/cracks_diagonal.rsi
2 changes: 1 addition & 1 deletion Resources/Prototypes/Entities/Structures/Windows/plasma.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,4 +152,4 @@
sprite: Structures/Windows/cracks_diagonal.rsi
- type: Construction
graph: WindowDiagonal
node: plasmaWindowDiagonal
node: plasmaWindowDiagonal
2 changes: 1 addition & 1 deletion Resources/Prototypes/Entities/Structures/Windows/plastitanium.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,4 +195,4 @@
doAfterDelay: 3
- type: Damageable
damageContainer: StructuralInorganic
damageModifierSet: RGlass
damageModifierSet: RGlass
2 changes: 1 addition & 1 deletion Resources/Prototypes/Entities/Structures/Windows/reinforced.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,4 +159,4 @@
sprite: Structures/Windows/cracks_diagonal.rsi
- type: Construction
graph: WindowDiagonal
node: reinforcedWindowDiagonal
node: reinforcedWindowDiagonal
2 changes: 1 addition & 1 deletion Resources/Prototypes/Entities/Structures/Windows/rplasma.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,4 +155,4 @@
sprite: Structures/Windows/cracks_diagonal.rsi
- type: Construction
graph: WindowDiagonal
node: reinforcedPlasmaWindowDiagonal
node: reinforcedPlasmaWindowDiagonal
2 changes: 1 addition & 1 deletion Resources/Prototypes/Entities/Structures/Windows/ruranium.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,4 +152,4 @@
sprite: Structures/Windows/cracks_diagonal.rsi
- type: Construction
graph: WindowDiagonal
node: reinforcedUraniumWindowDiagonal
node: reinforcedUraniumWindowDiagonal
2 changes: 1 addition & 1 deletion Resources/Prototypes/Entities/Structures/Windows/shuttle.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,4 +94,4 @@
- East
- type: DamageVisuals
damageOverlay:
sprite: Structures/Windows/cracks_diagonal.rsi
sprite: Structures/Windows/cracks_diagonal.rsi
2 changes: 1 addition & 1 deletion Resources/Prototypes/Entities/Structures/Windows/uranium.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,4 +147,4 @@
sprite: Structures/Windows/cracks_diagonal.rsi
- type: Construction
graph: WindowDiagonal
node: uraniumWindowDiagonal
node: uraniumWindowDiagonal
2 changes: 1 addition & 1 deletion Resources/Prototypes/Entities/Structures/Windows/window.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,4 +284,4 @@
sprite: Structures/Windows/cracks_diagonal.rsi
- type: Construction
graph: WindowDiagonal
node: windowDiagonal
node: windowDiagonal
173 changes: 61 additions & 112 deletions Resources/Prototypes/Recipes/Construction/Graphs/structures/window.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,63 +4,61 @@
graph:
- node: start
edges:
- to: window # 50 hp
- to: plasmaWindow
steps:
- material: Glass
- material: PlasmaGlass
amount: 2
doAfter: 2

- to: tintedWindow # 50 hp
- to: reinforcedWindow
steps:
- material: Glass
- material: ReinforcedGlass
amount: 2
- material: Plastic
doAfter: 2

- to: tintedWindow
steps:
- material: ReinforcedGlass
amount: 2
doAfter: 2

- to: plasmaWindow # 75 hp
- to: reinforcedPlasmaWindow
steps:
- material: PlasmaGlass
- material: ReinforcedPlasmaGlass
amount: 2
doAfter: 3

- to: uraniumWindow # 75 hp
- to: uraniumWindow
steps:
- material: UraniumGlass
amount: 2
doAfter: 3
doAfter: 2

- to: clockworkWindow # 75 hp reinforced damage mod
- to: reinforcedUraniumWindow
steps:
- material: ClockworkGlass
- material: ReinforcedUraniumGlass
amount: 2
doAfter: 3

- to: reinforcedWindow # 75 hp reinforced damage mod
- to: window
steps:
- material: ReinforcedGlass
- material: Glass
amount: 2
doAfter: 3

- to: reinforcedPlasmaWindow # 150 hp reinforced damage mod
- to: shuttleWindow
steps:
- material: ReinforcedPlasmaGlass
- material: Plasteel
amount: 2
doAfter: 4

- to: reinforcedUraniumWindow # 150 hp reinforced damage mod
steps:
- material: ReinforcedUraniumGlass
- material: ReinforcedGlass
amount: 2
doAfter: 4

- to: shuttleWindow # 500 hp reinforced damage mod (wow)
- to: clockworkWindow
steps:
- material: Plasteel
amount: 2
- material: ReinforcedGlass
- material: ClockworkGlass
amount: 2
doAfter: 6
doAfter: 3

- node: window
entity: Window
Expand All @@ -76,81 +74,56 @@
doAfter: 1
- tool: Anchoring
doAfter: 2
- to: tintedWindow
steps:
- material: Plastic
amount: 2
doAfter: 0.5
- to: plasmaWindow
steps:
- material: Plasma
amount: 2
doAfter: 1
- to: uraniumWindow
steps:
- material: Uranium
amount: 2
doAfter: 1
- to: clockworkWindow
steps:
- material: Brass
amount: 2
doAfter: 2
- to: reinforcedWindow
steps:
- material: MetalRod
amount: 2
doAfter: 2

- node: tintedWindow
entity: TintedWindow
- node: reinforcedWindow
entity: ReinforcedWindow
edges:
- to: start
completed:
- !type:SpawnPrototype
prototype: SheetGlass1
amount: 2
- !type:SpawnPrototype
prototype: SheetPlastic1
prototype: SheetRGlass1
amount: 2
- !type:DeleteEntity {}
steps:
- tool: Welding
doAfter: 5
- tool: Screwing
doAfter: 1
- tool: Prying
doAfter: 2
- tool: Welding
doAfter: 5
- tool: Screwing
doAfter: 1
- tool: Anchoring
doAfter: 2

- node: plasmaWindow
entity: PlasmaWindow
- node: tintedWindow
entity: TintedWindow
edges:
- to: start
completed:
- !type:SpawnPrototype
prototype: SheetPGlass1
prototype: SheetRGlass1
amount: 2
- !type:DeleteEntity {}
steps:
- tool: Screwing
doAfter: 2
doAfter: 1
- tool: Prying
doAfter: 3
- tool: Screwing
doAfter: 2
- tool: Anchoring
doAfter: 3
- to: reinforcedPlasmaWindow
steps:
- material: MetalRod
amount: 2
- tool: Screwing
doAfter: 1
- tool: Anchoring
doAfter: 2

- node: uraniumWindow
entity: UraniumWindow
- node: plasmaWindow
entity: PlasmaWindow
edges:
- to: start
completed:
- !type:SpawnPrototype
prototype: SheetUGlass1
prototype: SheetPGlass1
amount: 2
- !type:DeleteEntity {}
steps:
Expand All @@ -162,19 +135,14 @@
doAfter: 2
- tool: Anchoring
doAfter: 3
- to: reinforcedUraniumWindow
steps:
- material: MetalRod
amount: 2
doAfter: 1

- node: clockworkWindow
entity: ClockworkWindow
- node: reinforcedPlasmaWindow
entity: ReinforcedPlasmaWindow
edges:
- to: start
completed:
- !type:SpawnPrototype
prototype: SheetClockworkGlass1
prototype: SheetRPGlass1
amount: 2
- !type:DeleteEntity {}
steps:
Expand All @@ -191,51 +159,32 @@
- tool: Anchoring
doAfter: 3

- node: reinforcedWindow
entity: ReinforcedWindow
- node: uraniumWindow
entity: UraniumWindow
edges:
- to: start
completed:
- !type:SpawnPrototype
prototype: SheetRGlass1
prototype: SheetUGlass1
amount: 2
- !type:DeleteEntity {}
steps:
- tool: Welding
doAfter: 5
- tool: Screwing
doAfter: 1
- tool: Prying
doAfter: 2
- tool: Welding
doAfter: 5
- tool: Prying
doAfter: 3
- tool: Screwing
doAfter: 1
- tool: Anchoring
doAfter: 2
- to: reinforcedPlasmaWindow
steps:
- material: Plasma
amount: 2
doAfter: 1
- to: reinforcedUraniumWindow
steps:
- material: Uranium
amount: 2
doAfter: 1
- to: shuttleWindow
steps:
- material: Plasteel
amount: 2
- tool: Anchoring
doAfter: 3

- node: reinforcedPlasmaWindow
entity: ReinforcedPlasmaWindow
- node: reinforcedUraniumWindow
entity: ReinforcedUraniumWindow
edges:
- to: start
completed:
- !type:SpawnPrototype
prototype: SheetRPGlass1
prototype: SheetRUGlass1
amount: 2
- !type:DeleteEntity {}
steps:
Expand All @@ -252,13 +201,13 @@
- tool: Anchoring
doAfter: 3

- node: reinforcedUraniumWindow
entity: ReinforcedUraniumWindow
- node: clockworkWindow
entity: ClockworkWindow
edges:
- to: start
completed:
- !type:SpawnPrototype
prototype: SheetRUGlass1
prototype: SheetClockworkGlass1
amount: 2
- !type:DeleteEntity {}
steps:
Expand Down Expand Up @@ -304,4 +253,4 @@
- tool: Welding
doAfter: 4
- tool: Anchoring
doAfter: 1
doAfter: 1
Loading
Loading