]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Fixes the glass damage overlay (#23128)
authorFlareguy <78941145+Flareguy@users.noreply.github.com>
Thu, 28 Dec 2023 19:42:44 +0000 (13:42 -0600)
committerGitHub <noreply@github.com>
Thu, 28 Dec 2023 19:42:44 +0000 (14:42 -0500)
* fixes the glass damage overlay

* fix diagonal window

Resources/Prototypes/Entities/Structures/Windows/mining.yml
Resources/Prototypes/Entities/Structures/Windows/plasma.yml
Resources/Prototypes/Entities/Structures/Windows/reinforced.yml
Resources/Prototypes/Entities/Structures/Windows/rplasma.yml
Resources/Prototypes/Entities/Structures/Windows/ruranium.yml
Resources/Prototypes/Entities/Structures/Windows/shuttle.yml
Resources/Prototypes/Entities/Structures/Windows/uranium.yml
Resources/Prototypes/Entities/Structures/Windows/window.yml

index 286cb895daac5782f126895ef137a55f971dc51d..0004cf4ec074e91be867de1cc3eb36466faffee7 100644 (file)
@@ -44,7 +44,7 @@
   - type: Appearance
   - type: DamageVisuals
     thresholds: [4, 8, 12]
-    damageDivisor: 36
+    damageDivisor: 6
     trackAllDamage: true
     damageOverlay:
       sprite: Structures/Windows/cracks.rsi
@@ -54,7 +54,6 @@
 - type: entity
   parent: ShuttleWindow
   id: MiningWindowDiagonal
-  name: diagonal mining window
   suffix: diagonal
   placement:
     mode: SnapgridCenter
index 4e128c46e14d21b6bedaf69190e7de95e4533036..d69545f8d2f6e3cc725c8d75990b6cc7956959b0 100644 (file)
@@ -41,7 +41,7 @@
   - type: Appearance
   - type: DamageVisuals
     thresholds: [4, 8, 12]
-    damageDivisor: 12
+    damageDivisor: 3.333
     trackAllDamage: true
     damageOverlay:
       sprite: Structures/Windows/cracks.rsi
@@ -72,7 +72,7 @@
   - type: Appearance
   - type: DamageVisuals
     thresholds: [4, 8, 12]
-    damageDivisor: 12
+    damageDivisor: 3.333
     trackAllDamage: true
     damageOverlay:
       sprite: Structures/Windows/cracks_directional.rsi
@@ -98,7 +98,6 @@
 - type: entity
   parent: PlasmaWindow
   id: PlasmaWindowDiagonal
-  name: diagonal plasma window
   suffix: diagonal
   placement:
     mode: SnapgridCenter
index a4d423acfec5fef1d9aa03b8abdea85616c4cb19..c7837a5c6c7a6f6ea595fe27507937ae6697998e 100644 (file)
@@ -44,7 +44,7 @@
   - type: Appearance
   - type: DamageVisuals
     thresholds: [4, 8, 12]
-    damageDivisor: 10
+    damageDivisor: 4
     trackAllDamage: true
     damageOverlay:
       sprite: Structures/Windows/cracks.rsi
 - type: entity
   parent: ReinforcedWindow
   id: ReinforcedWindowDiagonal
-  name: reinforced window diagonal
   suffix: diagonal
   placement:
     mode: SnapgridCenter
index 97f77b8d8f88a9d31494142f6b6159544fa99bea..bdc75b14a939be343c9cc103f05afcf6fb99b4d9 100644 (file)
@@ -46,7 +46,7 @@
   - type: Appearance
   - type: DamageVisuals
     thresholds: [4, 8, 12]
-    damageDivisor: 36
+    damageDivisor: 6
     trackAllDamage: true
     damageOverlay:
       sprite: Structures/Windows/cracks.rsi
 - type: entity
   parent: ReinforcedPlasmaWindow
   id: ReinforcedPlasmaWindowDiagonal
-  name: diagonal reinforced plasma window
   suffix: diagonal
   placement:
     mode: SnapgridCenter
index 00aeade04c10cefc63b8fc095b55cdf179ae9102..84c978fff01fbf594d1691df2d60cece0c67dd65 100644 (file)
@@ -44,7 +44,7 @@
   - type: Appearance
   - type: DamageVisuals
     thresholds: [4, 8, 12]
-    damageDivisor: 36
+    damageDivisor: 6
     trackAllDamage: true
     damageOverlay:
       sprite: Structures/Windows/cracks.rsi
@@ -56,7 +56,6 @@
 - type: entity
   parent: ReinforcedUraniumWindow
   id: ReinforcedUraniumWindowDiagonal
-  name: diagonal reinforced uranium window
   suffix: diagonal
   placement:
     mode: SnapgridCenter
index 7522d5b6e90c96a835ebde025e4c5b82fc62aaa2..835f5ce528a1467fae7de2cfae3ef0b2dc96a07c 100644 (file)
@@ -47,7 +47,7 @@
   - type: Appearance
   - type: DamageVisuals
     thresholds: [4, 8, 12]
-    damageDivisor: 36
+    damageDivisor: 28
     trackAllDamage: true
     damageOverlay:
       sprite: Structures/Windows/cracks.rsi
@@ -57,7 +57,6 @@
 - type: entity
   parent: ShuttleWindow
   id: ShuttleWindowDiagonal
-  name: diagonal shuttle window
   suffix: diagonal
   placement:
     mode: SnapgridCenter
index b4801e3a28078561b81c9d402de526fd704b7f7e..a11ca625865d7c4f5ccf6ce93808f95d59fe407a 100644 (file)
@@ -22,7 +22,7 @@
         acts: [ "Destruction" ]
     - trigger:
         !type:DamageTrigger
-        damage: 50
+        damage: 60
       behaviors:
       - !type:PlaySoundBehavior
         sound:
@@ -42,7 +42,7 @@
   - type: Appearance
   - type: DamageVisuals
     thresholds: [4, 8, 12]
-    damageDivisor: 12
+    damageDivisor: 3.333
     trackAllDamage: true
     damageOverlay:
       sprite: Structures/Windows/cracks.rsi
@@ -54,7 +54,6 @@
 - type: entity
   parent: UraniumWindow
   id: UraniumWindowDiagonal
-  name: diagonal uranium window
   suffix: diagonal
   placement:
     mode: SnapgridCenter
index 3192c7260677ae11a4c465dc1e6894f617ec82c8..12552dbf4fd3c4bda38f2f6fd5a50aae7ca99c9d 100644 (file)
@@ -80,7 +80,7 @@
   - type: Appearance
   - type: DamageVisuals
     thresholds: [4, 8, 12]
-    damageDivisor: 2
+    damageDivisor: 3.333
     trackAllDamage: true
     damageOverlay:
       sprite: Structures/Windows/cracks.rsi
   - type: Appearance
   - type: DamageVisuals
     thresholds: [4, 8, 12]
-    damageDivisor: 2
+    damageDivisor: 3.333
     trackAllDamage: true
     damageOverlay:
       sprite: Structures/Windows/cracks_directional.rsi
 - type: entity
   parent: Window
   id: WindowDiagonal
-  name: window diagonal
   suffix: diagonal
   placement:
     mode: SnapgridCenter