From b34777177ca2b379c67fb5d0d117f95b8809f43e Mon Sep 17 00:00:00 2001
From: Tayrtahn <tayrtahn@gmail.com>
Date: Wed, 20 Mar 2024 21:58:21 -0400
Subject: [PATCH] Fix some invalid damage types (#26295)

Fixed some invalid damage types
---
 Resources/Prototypes/Entities/Mobs/NPCs/space.yml             | 2 +-
 Resources/Prototypes/Entities/Objects/Tools/cowtools.yml      | 2 +-
 Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml | 2 +-
 Resources/Prototypes/NPCs/Combat/melee.yml                    | 4 ++--
 Resources/Prototypes/NPCs/utility_queries.yml                 | 2 +-
 Resources/Prototypes/Reagents/botany.yml                      | 2 +-
 Resources/Prototypes/Reagents/fun.yml                         | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/space.yml b/Resources/Prototypes/Entities/Mobs/NPCs/space.yml
index a08b46fb51..eeee640225 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/space.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/space.yml
@@ -52,7 +52,7 @@
     animation: WeaponArcClaw
     damage:
       types:
-        Brute: 5
+        Blunt: 5
         Slash: 10
   - type: Tag
     tags:
diff --git a/Resources/Prototypes/Entities/Objects/Tools/cowtools.yml b/Resources/Prototypes/Entities/Objects/Tools/cowtools.yml
index ddd3592d49..977a8a931b 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/cowtools.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/cowtools.yml
@@ -14,7 +14,7 @@
     wideAnimationRotation: -90
     damage:
       types:
-        Pierce: 0
+        Piercing: 0
     attackRate: 2
   - type: Tool
     qualities:
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml
index 05cac3ae7b..75b1b25916 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml
@@ -175,7 +175,7 @@
       attackRate: 10
       damage:
         types:
-          Structure: 150
+          Structural: 150
           Slash: 20 #Horror
           Blunt: 20
           Heat: 20
diff --git a/Resources/Prototypes/NPCs/Combat/melee.yml b/Resources/Prototypes/NPCs/Combat/melee.yml
index 282e794ee7..2facfaa542 100644
--- a/Resources/Prototypes/NPCs/Combat/melee.yml
+++ b/Resources/Prototypes/NPCs/Combat/melee.yml
@@ -11,7 +11,7 @@
           - type: MeleeWeapon
             damage:
               types:
-                Brute: 0
+                Blunt: 0
           invert: true
       tasks:
         - !type:HTNCompoundTask
@@ -34,7 +34,7 @@
             - type: MeleeWeapon
               damage:
                 types:
-                  Brute: 0
+                  Blunt: 0
           invert: true
       tasks:
         - !type:HTNCompoundTask
diff --git a/Resources/Prototypes/NPCs/utility_queries.yml b/Resources/Prototypes/NPCs/utility_queries.yml
index d62e1a7e8c..3d5385ecbc 100644
--- a/Resources/Prototypes/NPCs/utility_queries.yml
+++ b/Resources/Prototypes/NPCs/utility_queries.yml
@@ -129,7 +129,7 @@
         - type: MeleeWeapon
           damage:
             types:
-              Brute: 0
+              Blunt: 0
         - type: Item
   considerations:
     - !type:TargetMeleeCon
diff --git a/Resources/Prototypes/Reagents/botany.yml b/Resources/Prototypes/Reagents/botany.yml
index f6c55cf394..a03c3826a4 100644
--- a/Resources/Prototypes/Reagents/botany.yml
+++ b/Resources/Prototypes/Reagents/botany.yml
@@ -143,7 +143,7 @@
         damage:
           types:
             Asphyxiation: 1
-            Burn: 2
+            Heat: 2
             Poison: 1
     Medicine:
       effects:
diff --git a/Resources/Prototypes/Reagents/fun.yml b/Resources/Prototypes/Reagents/fun.yml
index 9597627e87..befa8d8296 100644
--- a/Resources/Prototypes/Reagents/fun.yml
+++ b/Resources/Prototypes/Reagents/fun.yml
@@ -249,7 +249,7 @@
         damage:
           types:
              Cold: 0.01 # slightly nips directly, other cold damage comes from the temp change
-             Burn: -3 # ghetto burn chem. i don't think anyone would use this intentionally but it's funny
+             Heat: -3 # ghetto burn chem. i don't think anyone would use this intentionally but it's funny
       - !type:PopupMessage
         conditions:
         - !type:ReagentThreshold
-- 
2.51.2