Glass resistances rejig (#7735)

2022-04-23 16:46:25 -07:00
parent 65a8eb8677
commit cc51ac6737
3 changed files with 13 additions and 7 deletions
--- a/Resources/Prototypes/Damage/modifier_sets.yml
+++ b/Resources/Prototypes/Damage/modifier_sets.yml
@@ -45,24 +45,27 @@
 - type: damageModifierSet
  id: Glass
  coefficients:
-    Blunt: 1
+    Blunt: 1.2
    Slash: 0.5
-    Piercing: 1.1
+    Piercing: 1.0
    Heat: 0
    Shock: 0
  flatReductions:
    Blunt: 5
+    Slash: 5

 - type: damageModifierSet
  id: RGlass
  coefficients:
-    Blunt: 0.8
-    Slash: 0.5
-    Piercing: 0.7
+    Blunt: 1.0
+    Slash: 0.3
+    Piercing: 0.6
    Heat: 0
    Shock: 0
  flatReductions:
    Blunt: 5
+    Slash: 10
+    Piercing: 5

 - type: damageModifierSet
  id: Wood
--- a/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml
@@ -54,8 +54,9 @@
    hitSound:
      path: /Audio/Effects/bite.ogg
    damage:
-      groups:
-        Brute: 16
+      types:
+        Piercing: 5
+        Slash: 10
  - type: CombatMode
    disarmAction:
      enabled: false
--- a/Resources/Prototypes/Entities/Structures/Windows/reinforced.yml
+++ b/Resources/Prototypes/Entities/Structures/Windows/reinforced.yml
@@ -89,6 +89,8 @@
  - type: Construction
    graph: WindowDirectional
    node: windowReinforcedDirectional
+  - type: Damageable
+    damageModifierSet: RGlass
  - type: Destructible
    thresholds:
    - trigger: