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

Add easy window upgrading, fix some other window issues. #31978

Merged
merged 5 commits into from
Sep 9, 2024
Merged

Add easy window upgrading, fix some other window issues. #31978

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
eadfde6
uhhh a lot of window stuff, mainly easy upgrades
Blackern5000 Sep 8, 2024
f76fcbb
buff plasma/uranium rwindows so you actually want them
Blackern5000 Sep 8, 2024
40e0c3b
fix uranium number, correct construction descriptions
Blackern5000 Sep 8, 2024
3584424
fix tinted window price
Blackern5000 Sep 8, 2024
e97d413
frosted windo
Blackern5000 Sep 8, 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
19 changes: 14 additions & 5 deletions Resources/Prototypes/Entities/Structures/Windows/clockwork.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@
node: clockworkWindow
- type: Appearance
- type: DamageVisuals
thresholds: [4, 8, 12]
damageDivisor: 4
thresholds: [5, 10, 20]
damageDivisor: 3
trackAllDamage: true
damageOverlay:
sprite: Structures/Windows/cracks.rsi
Expand All @@ -74,8 +74,8 @@
node: windowClockworkDirectional
- type: Appearance
- type: DamageVisuals
thresholds: [4, 8, 12]
damageDivisor: 10
thresholds: [5, 10, 20]
damageDivisor: 1.5
trackAllDamage: true
damageOverlay:
sprite: Structures/Windows/cracks_directional.rsi
Expand All @@ -85,7 +85,16 @@
thresholds:
- trigger:
!type:DamageTrigger
damage: 150
damage: 75
behaviors:
- !type:DoActsBehavior
acts: [ "Destruction" ]
- !type:PlaySoundBehavior
sound:
collection: WindowShatter
- trigger:
!type:DamageTrigger
damage: 37
behaviors:
- !type:PlaySoundBehavior
sound:
Expand Down
4 changes: 2 additions & 2 deletions Resources/Prototypes/Entities/Structures/Windows/mining.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@
base: mwindow
- type: Appearance
- type: DamageVisuals
thresholds: [4, 8, 12]
damageDivisor: 6
thresholds: [5, 10, 20]
damageDivisor: 4
trackAllDamage: true
damageOverlay:
sprite: Structures/Windows/cracks.rsi
Expand Down
25 changes: 17 additions & 8 deletions Resources/Prototypes/Entities/Structures/Windows/plasma.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@
sprite: Structures/Windows/plasma_window.rsi
- type: Damageable
damageContainer: StructuralInorganic
damageModifierSet: RGlass
damageModifierSet: Glass
- type: Destructible
thresholds:
- trigger:
!type:DamageTrigger
damage: 120
damage: 150
behaviors:
- !type:DoActsBehavior
acts: [ "Destruction" ]
Expand All @@ -24,7 +24,7 @@
collection: WindowShatter
- trigger:
!type:DamageTrigger
damage: 60
damage: 75
behaviors:
- !type:PlaySoundBehavior
sound:
Expand All @@ -43,8 +43,8 @@
node: plasmaWindow
- type: Appearance
- type: DamageVisuals
thresholds: [4, 8, 12]
damageDivisor: 3.333
thresholds: [5, 10, 20]
damageDivisor: 3
trackAllDamage: true
damageOverlay:
sprite: Structures/Windows/cracks.rsi
Expand Down Expand Up @@ -74,16 +74,25 @@
node: plasmaWindowDirectional
- type: Appearance
- type: DamageVisuals
thresholds: [4, 8, 12]
damageDivisor: 3.333
thresholds: [5, 10, 20]
damageDivisor: 1.5
trackAllDamage: true
damageOverlay:
sprite: Structures/Windows/cracks_directional.rsi
- type: Destructible
thresholds:
- trigger:
!type:DamageTrigger
damage: 200
damage: 75
behaviors:
- !type:DoActsBehavior
acts: [ "Destruction" ]
- !type:PlaySoundBehavior
sound:
collection: WindowShatter
- trigger:
!type:DamageTrigger
damage: 37
behaviors:
- !type:PlaySoundBehavior
sound:
Expand Down
8 changes: 4 additions & 4 deletions Resources/Prototypes/Entities/Structures/Windows/plastitanium.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,8 +98,8 @@
- !type:DoActsBehavior
acts: [ "Destruction" ]
- type: DamageVisuals
thresholds: [4, 8, 12]
damageDivisor: 28
thresholds: [5, 10, 20]
damageDivisor: 20
trackAllDamage: true
damageOverlay:
sprite: Structures/Windows/cracks.rsi
Expand Down Expand Up @@ -185,8 +185,8 @@
- !type:DoActsBehavior
acts: [ "Destruction" ]
- type: DamageVisuals
thresholds: [4, 8, 12]
damageDivisor: 28
thresholds: [5, 10, 20]
damageDivisor: 20
trackAllDamage: true
damageOverlay:
sprite: Structures/Windows/cracks_diagonal.rsi
Expand Down
35 changes: 8 additions & 27 deletions Resources/Prototypes/Entities/Structures/Windows/reinforced.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,31 +50,12 @@
node: reinforcedWindow
- type: Appearance
- type: DamageVisuals
thresholds: [4, 8, 12]
damageDivisor: 4
thresholds: [5, 10, 20]
damageDivisor: 3
trackAllDamage: true
damageOverlay:
sprite: Structures/Windows/cracks.rsi

- type: entity
parent: ReinforcedWindow
id: TintedWindow
name: tinted window
components:
- type: Sprite
drawdepth: WallTops
sprite: Structures/Windows/tinted_window.rsi
- type: Icon
sprite: Structures/Windows/tinted_window.rsi
- type: IconSmooth
base: twindow
- type: Construction
graph: Window
node: tintedWindow
- type: Occluder
- type: StaticPrice
price: 45

- type: entity
id: WindowReinforcedDirectional
parent: WindowDirectional
Expand All @@ -96,8 +77,8 @@
node: windowReinforcedDirectional
- type: Appearance
- type: DamageVisuals
thresholds: [4, 8, 12]
damageDivisor: 10
thresholds: [5, 10, 20]
damageDivisor: 1.5
trackAllDamage: true
damageOverlay:
sprite: Structures/Windows/cracks_directional.rsi
Expand All @@ -111,16 +92,16 @@
thresholds:
- trigger:
!type:DamageTrigger
damage: 150 #excess damage (nuke?). avoid computational cost of spawning entities.
damage: 75
behaviors:
- !type:DoActsBehavior
acts: [ "Destruction" ]
- !type:PlaySoundBehavior
sound:
collection: WindowShatter
- !type:DoActsBehavior
acts: [ "Destruction" ]
- trigger:
!type:DamageTrigger
damage: 50
damage: 37
behaviors:
- !type:PlaySoundBehavior
sound:
Expand Down
14 changes: 7 additions & 7 deletions Resources/Prototypes/Entities/Structures/Windows/rplasma.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
thresholds:
- trigger:
!type:DamageTrigger
damage: 200
damage: 300
behaviors: #excess damage, don't spawn entities.
- !type:DoActsBehavior
acts: [ "Destruction" ]
Expand All @@ -26,7 +26,7 @@
collection: WindowShatter
- trigger:
!type:DamageTrigger
damage: 100
damage: 150
behaviors:
- !type:PlaySoundBehavior
sound:
Expand All @@ -48,7 +48,7 @@
node: reinforcedPlasmaWindow
- type: Appearance
- type: DamageVisuals
thresholds: [4, 8, 12]
thresholds: [5, 10, 20]
damageDivisor: 6
trackAllDamage: true
damageOverlay:
Expand Down Expand Up @@ -77,22 +77,22 @@
node: plasmaReinforcedWindowDirectional
- type: Appearance
- type: DamageVisuals
thresholds: [4, 8, 12]
damageDivisor: 36
thresholds: [5, 10, 20]
damageDivisor: 3
trackAllDamage: true
damageOverlay:
sprite: Structures/Windows/cracks_directional.rsi
- type: Destructible
thresholds:
- trigger:
!type:DamageTrigger
damage: 1000
damage: 150
behaviors: #excess damage, don't spawn entities.
- !type:DoActsBehavior
acts: [ "Destruction" ]
- trigger:
!type:DamageTrigger
damage: 600
damage: 75
behaviors:
- !type:PlaySoundBehavior
sound:
Expand Down
20 changes: 13 additions & 7 deletions Resources/Prototypes/Entities/Structures/Windows/ruranium.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@
thresholds:
- trigger:
!type:DamageTrigger
damage: 200
damage: 300
behaviors:
- !type:DoActsBehavior
acts: [ "Destruction" ]
- trigger:
!type:DamageTrigger
damage: 100
damage: 150
behaviors:
- !type:PlaySoundBehavior
sound:
Expand All @@ -43,7 +43,7 @@
node: reinforcedUraniumWindow
- type: Appearance
- type: DamageVisuals
thresholds: [4, 8, 12]
thresholds: [5, 10, 20]
damageDivisor: 6
trackAllDamage: true
damageOverlay:
Expand Down Expand Up @@ -74,16 +74,22 @@
node: uraniumReinforcedWindowDirectional
- type: Appearance
- type: DamageVisuals
thresholds: [4, 8, 12]
damageDivisor: 3.333
thresholds: [5, 10, 20]
damageDivisor: 3
trackAllDamage: true
damageOverlay:
sprite: Structures/Windows/cracks_directional.rsi
- type: Destructible
thresholds:
- trigger:
!type:DamageTrigger
damage: 200
damage: 150
behaviors:
- !type:DoActsBehavior
acts: [ "Destruction" ]
- trigger:
!type:DamageTrigger
damage: 75
behaviors:
- !type:PlaySoundBehavior
sound:
Expand All @@ -93,7 +99,7 @@
ShardGlassUranium:
min: 1
max: 2
PartRodMetal1:
PartRodMetal:
min: 1
max: 2
- !type:DoActsBehavior
Expand Down
4 changes: 2 additions & 2 deletions Resources/Prototypes/Entities/Structures/Windows/shuttle.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@
node: shuttleWindow
- type: Appearance
- type: DamageVisuals
thresholds: [4, 8, 12]
damageDivisor: 28
thresholds: [5, 10, 20]
damageDivisor: 20
trackAllDamage: true
damageOverlay:
sprite: Structures/Windows/cracks.rsi
Expand Down
24 changes: 15 additions & 9 deletions Resources/Prototypes/Entities/Structures/Windows/uranium.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,18 @@
state: full
- type: Damageable
damageContainer: StructuralInorganic
damageModifierSet: RGlass
damageModifierSet: Glass
- type: Destructible
thresholds:
- trigger:
!type:DamageTrigger
damage: 100
damage: 150
behaviors:
- !type:DoActsBehavior
acts: [ "Destruction" ]
- trigger:
!type:DamageTrigger
damage: 60
damage: 75
behaviors:
- !type:PlaySoundBehavior
sound:
Expand All @@ -41,8 +41,8 @@
node: uraniumWindow
- type: Appearance
- type: DamageVisuals
thresholds: [4, 8, 12]
damageDivisor: 3.333
thresholds: [5, 10, 20]
damageDivisor: 3
trackAllDamage: true
damageOverlay:
sprite: Structures/Windows/cracks.rsi
Expand Down Expand Up @@ -72,16 +72,22 @@
node: uraniumWindowDirectional
- type: Appearance
- type: DamageVisuals
thresholds: [4, 8, 12]
damageDivisor: 3.333
thresholds: [5, 10, 20]
damageDivisor: 1.5
trackAllDamage: true
damageOverlay:
sprite: Structures/Windows/cracks_directional.rsi
- type: Destructible
thresholds:
- trigger:
!type:DamageTrigger
damage: 200
damage: 75
behaviors:
- !type:DoActsBehavior
acts: [ "Destruction" ]
- trigger:
!type:DamageTrigger
damage: 37
behaviors:
- !type:PlaySoundBehavior
sound:
Expand All @@ -90,7 +96,7 @@
spawn:
ShardGlassUranium:
min: 1
max: 2
max: 1
- !type:DoActsBehavior
acts: [ "Destruction" ]
- type: StaticPrice
Expand Down
Loading
Loading