]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Glass shards damage (#26783)
authorSoulFN <164462467+SoulFN@users.noreply.github.com>
Sat, 20 Apr 2024 06:21:12 +0000 (14:21 +0800)
committerGitHub <noreply@github.com>
Sat, 20 Apr 2024 06:21:12 +0000 (16:21 +1000)
* Update shards.yml

Changed glass shards damage depends on their type, each tier of glass gains 1 more damage, also changed attack rate to 1, because you cant fast swing with weapon that can hurt you

* Oops

Forgot about base shard

* Update shards.yml

Cleanup

* Update shards.yml

Changed damage on step (Attack damage + 1)

Resources/Prototypes/Entities/Objects/Materials/shards.yml

index 621a3b1c389f4f4d66706fe3b0dbc4350fdca57d..834a2e7ff0a093f9cbcbd3539dc5c93fdb01333b 100644 (file)
@@ -17,7 +17,7 @@
           shard2: ""
           shard3: ""
   - type: MeleeWeapon
-    attackRate: 1.5
+    attackRate: 1
     damage:
       types:
         Slash: 3.5
@@ -91,7 +91,7 @@
   - type: DamageUserOnTrigger
     damage:
       types:
-        Piercing: 5
+        Piercing: 4.5
   - type: Tag
     tags:
       - GlassShard
   components:
   - type: Sprite
     color: "#96cdef"
+  - type: MeleeWeapon
+    damage:
+      types:
+        Slash: 4.5
   - type: WelderRefinable
     refineResult:
     - SheetGlass1
   - type: DamageUserOnTrigger
     damage:
       types:
-        Piercing: 5
+        Piercing: 5.5
   - type: Tag
     tags:
       - ReinforcedGlassShard
   components:
   - type: Sprite
     color: "#FF72E7"
+  - type: MeleeWeapon
+    damage:
+      types:
+        Slash: 5.5
   - type: WelderRefinable
     refineResult:
     - SheetGlass1
   - type: DamageUserOnTrigger
     damage:
       types:
-        Piercing: 5
+        Piercing: 6.5
   - type: Tag
     tags:
       - PlasmaGlassShard
   components:
   - type: Sprite
     color: "#8eff7a"
+  - type: MeleeWeapon
+    damage:
+      types:
+        Slash: 4.5
+        Radiation: 2
   - type: WelderRefinable
     refineResult:
     - SheetGlass1
   - type: DamageUserOnTrigger
     damage:
       types:
-        Piercing: 3
-        Radiation: 2
+        Piercing: 5
+        Radiation: 2.5
   - type: Tag
     tags:
       - UraniumGlassShard