Slicing food with Swords (#29005)

* added utensil component

* BaseSword added

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml
index 7cc33b715501cf4907fb7d6a2cf4221dbb65f453..d0d85beb6f591d4bc715b7b5326fb381f8217f62 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml
@@ -1,15 +1,28 @@
 - type: entity
-  name: captain's sabre
   parent: BaseItem
+  id: BaseSword
+  abstract: true
+  components:
+  - type: Sharp
+  - type: MeleeWeapon
+    wideAnimationRotation: -135
+  - type: Sprite
+    state: icon
+  - type: Item
+    size: Normal
+  - type: Utensil
+    types:
+      - Knife
+
+- type: entity
+  name: captain's sabre
+  parent: BaseSword
   id: CaptainSabre
   description: A ceremonial weapon belonging to the captain of the station.
   components:
-  - type: Sharp
   - type: Sprite
     sprite: Objects/Weapons/Melee/captain_sabre.rsi
-    state: icon
   - type: MeleeWeapon
-    wideAnimationRotation: -135
     attackRate: 1.5
     damage:
       types:
@@ -21,7 +34,6 @@
     reflectProb: .1
     spread: 90
   - type: Item
-    size: Normal
     sprite: Objects/Weapons/Melee/captain_sabre.rsi
   - type: Tag
     tags:
@@ -30,26 +42,22 @@
 
 - type: entity
   name: katana
-  parent: BaseItem
+  parent: BaseSword
   id: Katana
   description: Ancient craftwork made with not so ancient plasteel.
   components:
-  - type: Sharp
   - type: Tag
     tags:
     - Katana
   - type: Sprite
     sprite: Objects/Weapons/Melee/katana.rsi
-    state: icon
   - type: MeleeWeapon
-    wideAnimationRotation: -135
     damage:
       types:
         Slash: 15
     soundHit:
         path: /Audio/Weapons/bladeslice.ogg
   - type: Item
-    size: Normal
     sprite: Objects/Weapons/Melee/katana.rsi
   - type: DisarmMalus
 
@@ -61,14 +69,12 @@
   components:
   - type: Sprite
     sprite: Objects/Weapons/Melee/energykatana.rsi
-    state: icon
   - type: MeleeWeapon
     wideAnimationRotation: -60
     damage:
       types:
         Slash: 30
   - type: Item
-    size: Normal
     sprite: Objects/Weapons/Melee/energykatana.rsi
   - type: EnergyKatana
   - type: DashAbility
@@ -86,41 +92,34 @@
 
 - type: entity
   name: machete
-  parent: BaseItem
+  parent: BaseSword
   id: Machete
   description: A large, vicious looking blade.
   components:
-  - type: Sharp
   - type: Tag
     tags:
     - Machete
   - type: Sprite
     sprite: Objects/Weapons/Melee/machete.rsi
-    state: icon
   - type: MeleeWeapon
-    wideAnimationRotation: -135
     damage:
       types:
         Slash: 15
     soundHit:
         path: /Audio/Weapons/bladeslice.ogg
   - type: Item
-    size: Normal
     sprite: Objects/Weapons/Melee/machete.rsi
   - type: DisarmMalus
 
 - type: entity
   name: claymore
-  parent: BaseItem
+  parent: BaseSword
   id: Claymore
   description: An ancient war blade.
   components:
-  - type: Sharp
   - type: Sprite
     sprite: Objects/Weapons/Melee/claymore.rsi
-    state: icon
   - type: MeleeWeapon
-    wideAnimationRotation: -135
     attackRate: 0.75
     damage:
       types:
@@ -128,7 +127,6 @@
     soundHit:
         path: /Audio/Weapons/bladeslice.ogg
   - type: Item
-    size: Normal
   - type: Clothing
     sprite: Objects/Weapons/Melee/claymore.rsi
     slots:
@@ -137,41 +135,34 @@
 
 - type: entity
   name: cutlass
-  parent: BaseItem
+  parent: BaseSword
   id: Cutlass
   description: A wickedly curved blade, often seen in the hands of space pirates.
   components:
-  - type: Sharp
   - type: Tag
     tags:
     - Machete
   - type: Sprite
     sprite: Objects/Weapons/Melee/cutlass.rsi
-    state: icon
   - type: MeleeWeapon
-    wideAnimationRotation: -135
     damage:
       types:
         Slash: 16
     soundHit:
         path: /Audio/Weapons/bladeslice.ogg
   - type: Item
-    size: Normal
     sprite: Objects/Weapons/Melee/cutlass.rsi
   - type: DisarmMalus
 
 - type: entity
   name: The Throngler
-  parent: BaseItem
+  parent: BaseSword
   id: Throngler
   description: Why would you make this?
   components:
-    - type: Sharp
     - type: Sprite
       sprite: Objects/Weapons/Melee/Throngler2.rsi
-      state: icon
     - type: MeleeWeapon
-      wideAnimationRotation: -135
       attackRate: 10
       damage:
         types: