Melee refactor (#10897)

Co-authored-by: metalgearsloth <metalgearsloth@gmail.com>
2022-09-29 15:51:59 +10:00
parent c583b7b361
commit f51248ecaa
140 changed files with 2440 additions and 1824 deletions
--- a/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml
+++ b/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml
@@ -20,9 +20,10 @@
  - type: Clothing
    sprite: Clothing/Eyes/Glasses/gar.rsi
  - type: MeleeWeapon
+    attackRate: 1.5
    damage:
      types:
-        Blunt: 10
+        Blunt: 7

 - type: entity
  parent: ClothingEyesBase
--- a/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml
+++ b/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml
@@ -11,14 +11,16 @@
  - type: BoxingGloves
  - type: StaminaDamageOnHit
    damage: 8 #Stam damage values seem a bit higher than regular damage because of the decay, etc
-    knockdownSound: /Audio/Weapons/boxingbell.ogg
+    # This needs to be moved to boxinggloves
+    #knockdownSound: /Audio/Weapons/boxingbell.ogg
  - type: MeleeWeapon
+    attackRate: 1.5
    damage:
      types:
-        Blunt: 0.6
-    hitSound:
+        Blunt: 0.4
+    soundHit:
      collection: BoxingHit
-    arc: fist
+    animation: WeaponArcFist
  - type: Fiber
    fiberMaterial: fibers-leather
    fiberColor: fibers-red
--- a/Resources/Prototypes/Entities/Effects/weapon_arc.yml
+++ b/Resources/Prototypes/Entities/Effects/weapon_arc.yml
@@ -1,12 +1,66 @@
 - type: entity
-  id: WeaponArc
-  save: false
+  # Just fades out with no movement animation
+  id: WeaponArcStatic
  noSpawn: true
  components:
-  - type: Sprite
-    sprite: Effects/arcs.rsi
-    netsync: false
-    noRot: false
-    offset: 0, -0.85
-    drawdepth: Effects
-  - type: MeleeWeaponArcAnimation
+    - type: Sprite
+      sprite: Effects/arcs.rsi
+      state: spear
+      netsync: false
+      drawdepth: Effects
+    - type: EffectVisuals
+    - type: WeaponArcVisuals
+
+# TODO: Camera recoil (try it as a shake, i.e. zoom out and then rotate slightly maybe)
+# See https://github.com/gasgiant/Camera-Shake
+
+- type: entity
+  id: WeaponArcThrust
+  parent: WeaponArcStatic
+  noSpawn: true
+  components:
+    - type: WeaponArcVisuals
+      animation: Thrust
+
+  # TODO: Hold for 0.1, thrust out n distance, then fade out
+
+- type: entity
+  id: WeaponArcSlash
+  parent: WeaponArcStatic
+  noSpawn: true
+  components:
+    - type: WeaponArcVisuals
+      animation: Slash
+
+
+- type: entity
+  id: WeaponArcBite
+  parent: WeaponArcStatic
+  noSpawn: true
+  components:
+    - type: Sprite
+      state: bite
+
+- type: entity
+  id: WeaponArcClaw
+  parent: WeaponArcStatic
+  noSpawn: true
+  components:
+    - type: Sprite
+      state: claw
+
+- type: entity
+  id: WeaponArcDisarm
+  parent: WeaponArcStatic
+  noSpawn: true
+  components:
+    - type: Sprite
+      state: disarm
+
+- type: entity
+  id: WeaponArcFist
+  parent: WeaponArcStatic
+  noSpawn: true
+  components:
+    - type: Sprite
+      state: fist
--- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
@@ -56,8 +56,8 @@
  - type: MeleeWeapon
    hidden: true
    range: 1.5
-    arcwidth: 0
-    arc: bite
+    angle: 0
+    animation: WeaponArcBite
    damage:
      types:
        Piercing: 5
@@ -133,8 +133,8 @@
  - type: MeleeWeapon
    hidden: true
    range: 0.3
-    arcwidth: 0
-    arc: bite
+    angle: 0
+    animation: WeaponArcBite
    damage:
      types:
        Poison: 2
@@ -640,7 +640,7 @@
  description: A large marsupial herbivore. It has powerful hind legs and... boxing gloves?
  components:
  - type: CombatMode
-    canDisarm: true
+    disarm: null
  - type: Sprite
    drawdepth: Mobs
    layers:
@@ -659,8 +659,8 @@
  - type: MeleeWeapon
    hidden: true
    range: 1.5
-    arcwidth: 0
-    arc: claw
+    angle: 0
+    animation: WeaponArcClaw
    damage:
      types:
        Blunt: 10
@@ -679,7 +679,7 @@
  description: New church of neo-darwinists actually believe that EVERY animal evolved from a monkey. Tastes like pork, and killing them is both fun and relaxing.
  components:
  - type: CombatMode
-    canDisarm: true
+    disarm: null
  - type: NameIdentifier
    group: Monkey
  - type: SentienceTarget
@@ -1187,8 +1187,8 @@
  - type: MeleeWeapon
    hidden: true
    range: 0.5
-    arcwidth: 0
-    arc: bite
+    angle: 0
+    animation: WeaponArcBite
    damage:
      groups:
        Brute: 5
--- a/Resources/Prototypes/Entities/Mobs/NPCs/bear.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/bear.yml
@@ -59,8 +59,8 @@
  - type: MeleeWeapon
    hidden: true
    range: 0.5
-    arcwidth: 0
-    arc: claw
+    angle: 0
+    animation: WeaponArcClaw
    damage:
      groups:
        Brute: 15
--- a/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml
@@ -57,9 +57,9 @@
    - type: MeleeWeapon
      hidden: true
      range: 1.5
-      arcwidth: 0
-      arc: bite
-      hitSound:
+      angle: 0
+      animation: WeaponArcBite
+      soundHit:
        path: /Audio/Effects/bite.ogg
      damage:
        types:
--- a/Resources/Prototypes/Entities/Mobs/NPCs/mimic.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/mimic.yml
@@ -38,8 +38,8 @@
  - type: MeleeWeapon
    hidden: true
    range: 1.5
-    arcwidth: 0
-    arc: fist
+    angle: 0
+    animation: WeaponArcFist
    damage:
      types:
        Blunt: 20
--- a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
@@ -77,8 +77,8 @@
  - type: MeleeWeapon
    hidden: true
    range: 1.5
-    arcwidth: 0
-    arc: bite
+    angle: 0
+    animation: WeaponArcBite
    damage:
      types:
        Piercing: 5
--- a/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml
@@ -43,8 +43,8 @@
  - type: MeleeWeapon
    hidden: true
    range: 1
-    arcwidth: 0
-    arc: claw
+    angle: 0
+    animation: WeaponArcClaw
    damage:
      types:
        Slash: 12
@@ -135,11 +135,12 @@
  - type: MeleeWeapon
    hidden: true
    range: 1.5
-    arcwidth: 0
-    arc: fist
+    angle: 0
+    attackRate: 0.75
+    animation: WeaponArcFist
    damage:
      types:
-        Blunt: 50 #oof ouch owie my bones
+        Blunt: 66 #oof ouch owie my bones
  - type: Fixtures
    fixtures:
    - shape:
@@ -202,8 +203,8 @@
  - type: MeleeWeapon
    hidden: true
    range: 1
-    arcwidth: 0
-    arc: claw
+    angle: 0
+    animation: WeaponArcClaw
    damage:
      types:
        Slash: 5
--- a/Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml
@@ -118,8 +118,8 @@
  - type: MeleeWeapon
    hidden: true
    range: 1.5
-    arcwidth: 0
-    arc: bite
+    angle: 0
+    animation: WeaponArcBite
    damage:
      groups:
        Brute: 5
--- a/Resources/Prototypes/Entities/Mobs/NPCs/spacetick.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/spacetick.yml
@@ -56,8 +56,8 @@
  - type: MeleeWeapon
    hidden: true
    range: 0.5
-    arcwidth: 0
-    arc: bite
+    angle: 0
+    animation: WeaponArcBite
    damage:
      groups:
        Brute: 2
--- a/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml
@@ -9,7 +9,7 @@
  - type: DiseaseProtection
    protection: 1
  - type: CombatMode
-    canDisarm: true
+    disarm: null
  - type: InputMover
  - type: MobMover
  - type: HTN
@@ -63,10 +63,10 @@
  - type: MeleeWeapon
    hidden: true
    range: 1.5
-    arcwidth: 0
-    hitSound:
+    angle: 0
+    soundHit:
     collection: AlienClaw
-    arc:
+    animation: WeaponArcClaw
    damage:
      groups:
        Brute: 20
@@ -195,7 +195,6 @@
    damage:
     groups:
       Brute: 40
-    cooldownTime: 2
  - type: SlowOnDamage
    speedModifierThresholds:
      1000: 0.7
@@ -234,7 +233,6 @@
    damage:
     groups:
       Brute: 35
-    cooldownTime: 1.5
  - type: SlowOnDamage
    speedModifierThresholds:
      450: 0.7
@@ -273,7 +271,6 @@
    damage:
     groups:
       Brute: 15
-    cooldownTime: 0.5
  - type: SlowOnDamage
    speedModifierThresholds:
      200: 0.7
@@ -363,8 +360,8 @@
  - type: MeleeWeapon
    hidden: true
    range: 1.5
-    arcwidth: 0
-    arc: bite
+    angle: 0
+    animation: WeaponArcBite
    damage:
      types:
        Piercing: 5
--- a/Resources/Prototypes/Entities/Mobs/Player/dragon.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/dragon.yml
@@ -92,7 +92,7 @@
      soundPerceivedByOthers: false # A 75% chance for a loud roar would get old fast.
    - type: MeleeWeapon
      hidden: true
-      hitSound:
+      soundHit:
        path: /Audio/Effects/bite.ogg
      damage:
        types:
--- a/Resources/Prototypes/Entities/Mobs/Player/dwarf.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/dwarf.yml
@@ -6,7 +6,7 @@
  description: A miserable pile of secrets.
  components:
    - type: CombatMode
-      canDisarm: true
+      disarm: null
    - type: InteractionPopup
      successChance: 1
      interactSuccessString: hugging-success-generic
--- a/Resources/Prototypes/Entities/Mobs/Player/familiars.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/familiars.yml
@@ -42,8 +42,8 @@
  - type: MeleeWeapon
    hidden: true
    range: 1.5
-    arcwidth: 0
-    arc: bite
+    angle: 0
+    animation: WeaponArcBite
    damage:
      types:
        Piercing: 8
--- a/Resources/Prototypes/Entities/Mobs/Player/guardian.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/guardian.yml
@@ -81,13 +81,12 @@
    - type: MeleeWeapon
      hidden: true
      range: 2
-      arcwidth: 30
-      arc: fist
-      cooldownTime: 0.7
-      arcCooldownTime: 0.7
+      angle: 30
+      animation: WeaponArcFist
+      attackRate: 1.5
      damage:
        types:
-          Blunt: 22
+          Blunt: 20
    - type: Actions
    - type: Guardian
    - type: InteractionPopup
--- a/Resources/Prototypes/Entities/Mobs/Player/human.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/human.yml
@@ -5,7 +5,7 @@
  id: MobHuman
  components:
  - type: CombatMode
-    canDisarm: true
+    disarm: null
  - type: InteractionPopup
    successChance: 1
    interactSuccessString: hugging-success-generic
--- a/Resources/Prototypes/Entities/Mobs/Player/reptilian.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/reptilian.yml
@@ -5,7 +5,7 @@
  id: MobReptilian
  components:
    - type: CombatMode
-      canDisarm: true
+      disarm: null
    - type: InteractionPopup
      successChance: 1
      interactSuccessString: hugging-success-generic
--- a/Resources/Prototypes/Entities/Mobs/Player/slime.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/slime.yml
@@ -4,7 +4,7 @@
  id: MobSlimePerson
  components:
    - type: CombatMode
-      canDisarm: true
+      disarm: null
    - type: InteractionPopup
      successChance: 1
      interactSuccessString: hugging-success-generic
--- a/Resources/Prototypes/Entities/Mobs/Player/vox.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/vox.yml
@@ -5,7 +5,7 @@
  id: MobVox
  components:
    - type: CombatMode
-      canDisarm: true
+      disarm: null
    - type: InteractionPopup
      successChance: 1
      interactSuccessString: hugging-success-generic
--- a/Resources/Prototypes/Entities/Mobs/Species/base.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/base.yml
@@ -233,6 +233,7 @@
    fireStackAlternateState: 3
  - type: EnsnareableVisualizer
  - type: CombatMode
+    disarm: true
  - type: Climbing
  - type: Cuffable
  - type: Ensnareable
@@ -243,11 +244,12 @@
  - type: Buckle
  - type: MeleeWeapon
    hidden: true
-    hitSound:
+    soundHit:
      collection: Punch
-    range: 0.8
-    arcwidth: 30
-    arc: fist
+    range: 1.5
+    angle: 30
+    animation: WeaponArcFist
+    attackRate: 1
    damage:
      types:
        Blunt: 5
--- a/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml
@@ -25,11 +25,11 @@
    damageModifierSet: Scale
  - type: MeleeWeapon
    hidden: true
-    hitSound:
+    soundHit:
      path: /Audio/Weapons/pierce.ogg
    range: 0.8
-    arcwidth: 30
-    arc: fist
+    angle: 30
+    animation: WeaponArcFist
    damage:
      types:
        Piercing: 5
--- a/Resources/Prototypes/Entities/Objects/Fun/bike_horn.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/bike_horn.yml
@@ -31,7 +31,7 @@
    tags:
    - Payload # yes, you can make re-usable prank grenades
  - type: MeleeWeapon
-    hitSound:
+    soundHit:
      collection: BikeHorn
      params:
        variation: 0.125
--- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml
@@ -21,7 +21,7 @@
  - type: UseDelay
    delay: 1.0
  - type: MeleeWeapon
-    hitSound:
+    soundHit:
      collection: ToySqueak
    damage:
      types:
@@ -105,7 +105,7 @@
    sound:
      path: /Audio/Items/Toys/weh.ogg
  - type: MeleeWeapon
-    hitSound:
+    soundHit:
      path: /Audio/Items/Toys/weh.ogg

 - type: entity
@@ -126,7 +126,7 @@
    sound:
      path: /Audio/Items/Toys/muffled_weh.ogg
  - type: MeleeWeapon
-    hitSound:
+    soundHit:
      path: /Audio/Items/Toys/muffled_weh.ogg

 - type: entity
@@ -168,7 +168,7 @@
    sound:
      path: /Audio/Effects/bite.ogg
  - type: MeleeWeapon
-    hitSound:
+    soundHit:
      path: /Audio/Effects/bite.ogg

 - type: entity
@@ -192,7 +192,7 @@
    sound:
      path: /Audio/Items/Toys/rattle.ogg
  - type: MeleeWeapon
-    hitSound:
+    soundHit:
      path: /Audio/Items/Toys/rattle.ogg

 - type: entity
@@ -207,7 +207,7 @@
    sound:
      path: /Audio/Items/Toys/mousesqueek.ogg
  - type: MeleeWeapon
-    hitSound:
+    soundHit:
      path: /Audio/Items/Toys/mousesqueek.ogg

 - type: entity
@@ -244,7 +244,7 @@
    sound:
      path: /Audio/Voice/Vox/shriek1.ogg
  - type: MeleeWeapon
-    hitSound:
+    soundHit:
      path: /Audio/Voice/Vox/shriek1.ogg
 ## Figurines

@@ -313,7 +313,7 @@
    sound:
      path: /Audio/Items/Toys/ian.ogg
  - type: MeleeWeapon
-    hitSound:
+    soundHit:
      path: /Audio/Items/Toys/ian.ogg

 - type: entity
@@ -549,9 +549,10 @@
    sprite: Objects/Fun/toys.rsi
    state: foamblade
  - type: MeleeWeapon
+    attackRate: 1.5
    range: 2.0
-    arcwidth: 0
-    arc: spear
+    angle: 0
+    animation: WeaponArcThrust
    damage:
      types:
        Blunt: 0
--- a/Resources/Prototypes/Entities/Objects/Materials/shards.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/shards.yml
@@ -20,9 +20,10 @@
          shard3: ""
  - type: ItemCooldown
  - type: MeleeWeapon
+    attackRate: 1.5
    damage:
      types:
-        Slash: 5
+        Slash: 3.5
  - type: Item
    sprite: Objects/Materials/Shards/shard.rsi
  - type: CollisionWake
--- a/Resources/Prototypes/Entities/Objects/Misc/broken_bottle.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/broken_bottle.yml
@@ -6,10 +6,11 @@
  components:
  - type: ItemCooldown
  - type: MeleeWeapon
+    attackRate: 1.5
    damage:
      types:
-        Slash: 7
-    hitSound:
+        Slash: 5
+    soundHit:
      path: /Audio/Weapons/bladeslice.ogg
  - type: Sprite
    sprite: Objects/Consumable/TrashDrinks/broken_bottle.rsi
--- a/Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml
@@ -41,7 +41,7 @@
    damage:
      types:
        Blunt: 10
-    hitSound:
+    soundHit:
      path: /Audio/Weapons/smash.ogg
  - type: Appearance
  - type: GenericVisualizer
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/surgery.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/surgery.yml
@@ -43,7 +43,7 @@
    damage:
      types:
        Piercing: 10
-    hitSound:
+    soundHit:
      path: /Audio/Items/drill_hit.ogg

 # Scalpel
@@ -64,10 +64,11 @@
    sprite: Objects/Specific/Medical/Surgery/scalpel.rsi
  - type: ItemCooldown
  - type: MeleeWeapon
+    attackRate: 1.5
    damage:
      types:
-        Slash: 12
-    hitSound:
+        Slash: 8
+    soundHit:
      path: /Audio/Weapons/bladeslice.ogg

 - type: entity
@@ -173,7 +174,7 @@
    damage:
      groups:
        Brute: 10
-    hitSound:
+    soundHit:
      path: /Audio/Weapons/bladeslice.ogg
  - type: Tool
    qualities:
@@ -194,7 +195,7 @@
    damage:
      groups:
        Brute: 15
-    hitSound:
+    soundHit:
      path: /Audio/Items/drill_hit.ogg
  - type: Tool
    qualities:
@@ -212,10 +213,11 @@
  - type: Item
    heldPrefix: advanced
  - type: MeleeWeapon
+    attackRate: 1.5
    damage:
      groups:
-        Brute: 20
-    hitSound:
+        Brute: 10
+    soundHit:
      path: /Audio/Items/drill_hit.ogg
  - type: Tool
    qualities:
--- a/Resources/Prototypes/Entities/Objects/Tools/toolbox.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/toolbox.yml
@@ -17,7 +17,7 @@
    damage:
      types:
        Blunt: 10
-    hitSound:
+    soundHit:
      path: "/Audio/Weapons/smash.ogg"
  - type: Tag
    tags:
--- a/Resources/Prototypes/Entities/Objects/Tools/tools.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/tools.yml
@@ -61,9 +61,10 @@
    sprite: Objects/Tools/screwdriver.rsi
  - type: ItemCooldown
  - type: MeleeWeapon
+    attackRate: 1.5
    damage:
      types:
-        Piercing: 10
+        Piercing: 7
  - type: Tool
    qualities:
      - Screwing
@@ -96,9 +97,10 @@
    sprite: Objects/Tools/wrench.rsi
  - type: ItemCooldown
  - type: MeleeWeapon
+    attackRate: 1.5
    damage:
      types:
-        Blunt: 10
+        Blunt: 6.5
  - type: Tool
    qualities:
      - Anchoring
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/armblade.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/armblade.yml
@@ -9,10 +9,11 @@
    sprite: Objects/Weapons/Melee/armblade.rsi
    state: icon
  - type: MeleeWeapon
+    attackRate: 0.75
    damage:
      types:
-        Slash: 20
-        Piercing: 10
+        Slash: 25
+        Piercing: 15
  - type: Item
    size: 15
    sprite: Objects/Weapons/Melee/armblade.rsi
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
@@ -7,9 +7,9 @@
  - type: EnergySword
    litDamageBonus:
        types:
-            Slash: 12.5
-            Heat: 12.5
-            Blunt: -7
+            Slash: 8.5
+            Heat: 8.5
+            Blunt: -4.5
    litDisarmMalus: 0.6
  - type: Sprite
    sprite: Objects/Weapons/Melee/e_sword.rsi
@@ -21,11 +21,12 @@
        shader: unshaded
        map: [ "blade" ]
  - type: MeleeWeapon
-    hitSound:
+    attackRate: 1.5
+    soundHit:
      path: /Audio/Weapons/genhit1.ogg
    damage:
      types:
-        Blunt: 7
+        Blunt: 4.5
  - type: Item
    size: 5
    sprite: Objects/Weapons/Melee/e_sword.rsi
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml
@@ -12,19 +12,20 @@
    sprite: Objects/Weapons/Melee/fireaxe.rsi
    state: icon
  - type: MeleeWeapon
+    attackRate: 0.75
    damage:
      types:
        # axes are kinda like sharp hammers, you know?
-        Blunt: 4
-        Slash: 10
-        Structural: 5
+        Blunt: 5
+        Slash: 13
+        Structural: 7
  - type: Wieldable
  - type: IncreaseDamageOnWield
    damage:
      types:
-        Blunt: 2
-        Slash: 8
-        Structural: 45
+        Blunt: 2.5
+        Slash: 10.5
+        Structural: 60
  - type: Item
    size: 150
  - type: Clothing
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml
@@ -15,7 +15,7 @@
    damage:
      types:
        Slash: 12
-    hitSound:
+    soundHit:
      path: /Audio/Weapons/bladeslice.ogg
  - type: Sprite
    netsync: false
@@ -57,9 +57,10 @@
    size: 4
    state: butch
  - type: MeleeWeapon
+    attackRate: 1.5
    damage:
      types:
-        Slash: 15
+        Slash: 10
  - type: Item
    size: 10
    sprite: Objects/Weapons/Melee/cleaver.rsi
@@ -79,9 +80,10 @@
    size: 2
    state: icon
  - type: MeleeWeapon
+    attackRate: 1.5
    damage:
      types:
-        Slash: 15
+        Slash: 10
  - type: Item
    size: 10
    sprite: Objects/Weapons/Melee/combat_knife.rsi
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/pickaxe.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/pickaxe.yml
@@ -20,7 +20,6 @@
      types:
        Piercing: 10
        Blunt: 4
-    arcCooldownTime: 3
  - type: Item
    size: 24
    sprite: Objects/Weapons/Melee/pickaxe.rsi
@@ -48,4 +47,3 @@
      types:
        Piercing: 10
        Blunt: 4
-    arcCooldownTime: 3
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml
@@ -10,14 +10,15 @@
  - type: Sharp
  - type: Sprite
    sprite: Objects/Weapons/Melee/spear.rsi
+    netsync: false
    state: spear
  - type: MeleeWeapon
    damage:
      types:
        Piercing: 10
    range: 1.5
-    arcwidth: 0
-    arc: spear
+    angle: 0
+    animation: WeaponArcThrust
  - type: DamageOtherOnHit
    damage:
      types:
@@ -76,10 +77,3 @@
    damage:
      types:
        Blunt: 5
-
- type: MeleeWeaponAnimation
-  id: spear
-  state: spear
-  length: 0.10
-  speed: 6
-  arcType: Poke
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml
@@ -9,9 +9,10 @@
    sprite: Objects/Weapons/Melee/captain_sabre.rsi
    state: icon
  - type: MeleeWeapon
+    attackRate: 1.5
    damage:
      types:
-        Slash: 26 #cmon, it has to be at least BETTER than the rest.
+        Slash: 17 #cmon, it has to be at least BETTER than the rest.
  - type: Item
    size: 15
    sprite: Objects/Weapons/Melee/captain_sabre.rsi
@@ -75,9 +76,10 @@
    sprite: Objects/Weapons/Melee/claymore.rsi
    state: icon
  - type: MeleeWeapon
+    attackRate: 0.75
    damage:
      types:
-        Slash: 25
+        Slash: 33
  - type: Item
    size: 20
  - type: Clothing
--- a/Resources/Prototypes/Entities/Objects/Weapons/security.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/security.yml
@@ -15,13 +15,11 @@
  - type: MeleeWeapon
    damage:
      types:
-        Blunt: 5
+        Blunt: 7
    bluntStaminaDamageFactor: 2.0
    range: 1.5
-    arcwidth: 60
-    arc: default
-    cooldownTime: 1.5
-    arcCooldownTime: 1.5
+    angle: 60
+    animation: WeaponArcSlash
  - type: StaminaDamageOnHit
    damage: 55
  - type: Battery
@@ -64,8 +62,7 @@
        types:
          Blunt: 0 # why is this classed as a melee weapon? Is it needed for some interaction?
      range: 1
-      arcWidth: 10
-      arc: default
+      angle: 10
    - type: Item
      size: 5
      sprite: Objects/Weapons/Melee/flash.rsi
--- a/Resources/Prototypes/Entities/Structures/Windows/window.yml
+++ b/Resources/Prototypes/Entities/Structures/Windows/window.yml
@@ -104,6 +104,11 @@
  - type: Tag
    tags:
      - Window
+  - type: MeleeSound
+    soundGroups:
+      Brute:
+        path:
+          "/Audio/Effects/glass_hit.ogg"
  - type: Sprite
    drawdepth: Mobs
    netsync: false