Большой ребаланс милишки (#681)

* MeleeThrowOnHit rework * buff baseball bat * better mjolnir * telebaton system unhardcode + refactor + transform TelescopicBatonComponent to KnockDownOnHitComponent * fix telebaton prototype * darova * fix KnockDownOnHitSystem * chaplain weapons rebalance * fix nullrod hit sound * BloodstreamSystem cleanup * bleeding rebalance * damage rebalance * small baseball bat fix
2024-09-12 21:52:04 +03:00
parent 52fdb873d9
commit 724e4e0e3c
28 changed files with 466 additions and 246 deletions
--- a/Resources/Locale/ru-RU/_white/object/telebaton.ftl
+++ b/Resources/Locale/ru-RU/_white/object/telebaton.ftl
@@ -3,3 +3,6 @@ ent-TelescopicBaton = телескопическая дубинка

 comp-telebaton-examined-on = Дубинка в боевом положении.
 comp-telebaton-examined-off = Дубинка сложена.
+
+comp-item-toggle-on = Активировано
+comp-item-toggle-off = Деактивировано
--- a/Resources/Prototypes/Damage/modifier_sets.yml
+++ b/Resources/Prototypes/Damage/modifier_sets.yml
@@ -241,10 +241,10 @@
 # in relation to how they cause bleed rate.
 - type: damageModifierSet
  id: BloodlossHuman
-  coefficients:
-    Blunt: 0.05
-    Slash: 0.25
-    Piercing: 0.2
+  coefficients: # WD edit alert!! Weapons rebalanced - only slash and piercing damage should cast bleeding
+    Blunt: 0.0
+    Slash: 0.45 # WD
+    Piercing: 0.3 # WD
    Shock: 0.0
    Cold: 0.0
    Heat: -0.5 # heat damage cauterizes wounds, but will still hurt obviously.
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/baseball_bat.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/baseball_bat.yml
@@ -11,15 +11,16 @@
    wideAnimationRotation: -135
    damage:
      types:
-        Blunt: 10
+        Blunt: 8 # WD
        Structural: 5
    soundHit:
      path: "/Audio/Weapons/smash.ogg"
+    canHeavyAttack: false
  - type: Wieldable
  - type: IncreaseDamageOnWield
    damage:
      types:
-        Blunt: 5
+        Blunt: 4 # WD
        Structural: 10
  - type: Item
    size: Normal
@@ -42,6 +43,14 @@
  - type: Tag
    tags:
    - BaseballBat
+  - type: MeleeThrowOnHit # WD
+    lifetime: 0.2
+    speed: 5
+    requireWield: true
+  - type: KnockDownOnHit
+    knockDownBehavior: NoDrop
+    knockdownTime: 0.5
+    requireWield: true

 - type: entity
  name: incomplete baseball bat
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/cane.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/cane.yml
@@ -41,7 +41,7 @@
    attackRate: 1.5
    damage:
      types:
-        Slash: 14
+        Slash: 12 # WD
    soundHit:
        path: /Audio/Weapons/bladeslice.ogg
  - type: Item
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/cult.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/cult.yml
@@ -13,7 +13,7 @@
    attackRate: 1.5
    damage:
      types:
-        Slash: 12
+        Slash: 9 # WD
    soundHit:
      path: /Audio/Weapons/bladeslice.ogg
  - type: Item
@@ -66,7 +66,7 @@
    attackRate: 0.75
    damage:
      types:
-        Slash: 33
+        Slash: 27 # WD
    soundHit:
      path: /Audio/Weapons/bladeslice.ogg
  - type: Item
@@ -104,7 +104,7 @@
    damage:
      types:
        Blunt: 10
-        Slash: 20
+        Slash: 18 # WD
        Structural: 5
    soundHit:
      path: "/Audio/Weapons/smash.ogg"
@@ -113,7 +113,7 @@
    damage:
      types:
        Blunt: 4
-        Slash: 12
+        Slash: 10 # WD
        Structural: 10
  - type: Item
    size: Ginormous
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/daggers.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/daggers.yml
@@ -13,7 +13,7 @@
      attackRate: 1.3
      damage:
        types:
-          Slash: 10.5
+          Slash: 10.5 # WD
      soundHit:
        path: /Audio/Weapons/bladeslice.ogg
    - type: Item
@@ -45,7 +45,7 @@
      attackRate: 1.5
      damage:
        types:
-          Slash: 17.5
+          Slash: 15 # WD
      soundHit:
        path: /Audio/Weapons/bladeslice.ogg
    - type: EmbeddableProjectile
@@ -55,7 +55,7 @@
    - type: DamageOtherOnHit
      damage:
        types:
-          Slash: 20
+          Slash: 44 # WD
    - type: Item
      size: Small
    - type: DisarmMalus
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
@@ -36,8 +36,7 @@
        variation: 0.125
    activatedDamage:
        types:
-            Slash: 15
-            Heat: 15
+            Slash: 41 # WD
            Structural: 20
  - type: Sprite
    sprite: Objects/Weapons/Melee/e_sword.rsi
@@ -131,8 +130,7 @@
        variation: 0.250
    activatedDamage:
        types:
-            Slash: 10
-            Heat: 10
+            Slash: 23 # WD
    deactivatedSecret: true
  - type: ItemToggleActiveSound
    activeSound:
@@ -263,8 +261,7 @@
    - type: IncreaseDamageOnWield
      damage:
        types:
-          Slash: 15
-          Heat: 15
+          Slash: 30 # WD
    - type: Reflect
      reflectProb: 1
      enabled: false
@@ -299,8 +296,7 @@
          variation: 0.125
      activatedDamage:
        types:
-          Slash: 15
-          Heat: 15
+          Slash: 33 # WD
          Structural: 20
    - type: Reflect
      reflectProb: 0.8
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml
@@ -18,8 +18,8 @@
    damage:
      types:
        # axes are kinda like sharp hammers, you know?
-        Blunt: 5
-        Slash: 13
+        Blunt: 3 # WD
+        Slash: 10 # WD
        Structural: 10
    soundHit:
      path: "/Audio/Weapons/smash.ogg"
@@ -28,7 +28,7 @@
    damage:
      types:
        Blunt: 2.5
-        Slash: 10.5
+        Slash: 8 # WD
        Structural: 60
  - type: Item
    size: Ginormous
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml
@@ -14,7 +14,7 @@
    wideAnimationRotation: -135
    damage:
      types:
-        Slash: 12
+        Slash: 10 # WD
    soundHit:
      path: /Audio/Weapons/bladeslice.ogg
  - type: Sprite
@@ -42,6 +42,10 @@
  - type: Item
    sprite: Objects/Weapons/Melee/kitchen_knife.rsi
    storedRotation: -45
+  - type: DamageOtherOnHit # WD
+    damage:
+      types:
+        Piercing: 20
  - type: GuideHelp
    guides:
    - Chef
@@ -68,7 +72,7 @@
    attackRate: 1.5
    damage:
      types:
-        Slash: 12
+        Slash: 13 # WD
  - type: Item
    size: Normal
    sprite: Objects/Weapons/Melee/cleaver.rsi
@@ -100,7 +104,7 @@
  - type: DamageOtherOnHit
    damage:
      types:
-        Slash: 10
+        Piercing: 27 # WD
  - type: Item
    sprite: Objects/Weapons/Melee/combat_knife.rsi
    storedRotation: -45
@@ -136,7 +140,11 @@
    attackRate: 1.0
    damage:
      types:
-        Slash: 18 # Same DPS as combat knife
+        Slash: 12 # WD
+  - type: DamageOtherOnHit # WD
+    damage:
+      types:
+        Piercing: 44
  - type: Item
    sprite: Objects/Weapons/Melee/kukri_knife.rsi

@@ -159,7 +167,7 @@
  - type: DamageOtherOnHit
    damage:
      types:
-        Slash: 10
+        Piercing: 10 # WD
  - type: Sprite
    sprite: Clothing/Head/Hats/greyflatcap.rsi
  - type: Clothing
@@ -289,7 +297,7 @@
    damage:
      types:
        Slash: 10
-        Piercing: 15
+        Piercing: 35 # WD
  - type: Item
    sprite: Objects/Weapons/Melee/throwing_knife.rsi
    storedRotation: -45
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml
@@ -13,7 +13,7 @@
    attackRate: 1.5
    damage:
      types:
-        Slash: 19
+        Slash: 14 # WD
  # WD edit sounds start
    soundHit:
        path: /Audio/White/Items/hit/sabre_hit2.ogg
@@ -27,12 +27,12 @@
    storedRotation: 44 # It just works
    shape:
    - 0, 0, 4, 0
-  - type: Tag
-    tags:
-    - CaptainSabre
  - type: DisarmMalus
  - type: MeleeBlock
    delay: 6.1
+  - type: Tag
+    tags:
+    - CaptainSabre

 - type: entity
  name: katana
@@ -51,7 +51,7 @@
    wideAnimationRotation: -135
    damage:
      types:
-        Slash: 24
+        Slash: 20 # WD
    soundHit:
        path: /Audio/Weapons/bladeslice.ogg
  - type: Item
@@ -80,7 +80,7 @@
    wideAnimationRotation: -60
    damage:
      types:
-        Slash: 30
+        Slash: 33 # WD
  - type: Item
    size: Huge
    sprite: Objects/Weapons/Melee/energykatana.rsi
@@ -123,7 +123,7 @@
    wideAnimationRotation: -135
    damage:
      types:
-        Slash: 20
+        Slash: 17 # WD
    soundHit:
        path: /Audio/Weapons/bladeslice.ogg
  - type: Item
@@ -155,7 +155,7 @@
    attackRate: 0.75
    damage:
      types:
-        Slash: 30
+        Slash: 21 # WD
    soundHit:
        path: /Audio/Weapons/bladeslice.ogg
  - type: Item
@@ -191,7 +191,7 @@
    wideAnimationRotation: -135
    damage:
      types:
-        Slash: 20
+        Slash: 20 # WD
    soundHit:
        path: /Audio/Weapons/bladeslice.ogg
  - type: Item
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/tagilla_hammer.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/tagilla_hammer.yml
@@ -14,8 +14,7 @@
      attackRate: 0.75
      damage:
        types:
-          Blunt: 5
-          Slash: 5
+          Blunt: 10
          Structural: 10
      soundHit:
        path: "/Audio/Weapons/sledgehammer_hit_1.ogg"
@@ -23,8 +22,7 @@
    - type: IncreaseDamageOnWield
      damage:
        types:
-          Blunt: 10
-          Slash: 5
+          Blunt: 15
          Structural: 40
    - type: Item
      size: Ginormous
--- a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/throwing_stars.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/throwing_stars.yml
@@ -77,7 +77,7 @@
      damage:
        types:
          Slash: 8
-          Piercing: 10
+          Piercing: 16 # WD
    - type: StaminaDamageOnCollide
      damage: 45
    - type: StaminaDamageOnEmbed
--- a/Resources/Prototypes/_White/Entities/Objects/Weapons/chaplain_weapons.yml
+++ b/Resources/Prototypes/_White/Entities/Objects/Weapons/chaplain_weapons.yml
@@ -1,5 +1,21 @@
+# Так как мечей много, а смысла в них не очень - я буду писать в комментариях геймдизайнерских прикол каждого из них
+
 - type: entity
  parent: BaseItem
+  id: BaseHolyWeapon
+  abstract: true
+  components:
+  - type: HolyWeapon
+  - type: Sprite
+    sprite: White/Objects/Weapons/Chaplain/forceweapon.rsi
+    state: icon
+  - type: MeleeWeapon
+    soundHit:
+      path: /Audio/Weapons/bladeslice.ogg
+
+# Базовая палка, чтобы как можно быстрее сменить ее.
+- type: entity
+  parent: BaseHolyWeapon
  id: NullRod
  name: жезл нулификации
  description: Жезл из чистого обсидиана. Само его присутствие разрушает и ослабляет "магические силы". Во всяком случае так написано в путеводителе.
@@ -11,6 +27,8 @@
    damage:
      types:
        Blunt: 18
+    soundHit:
+      collection: MetalThud
  - type: Item
    size: Normal
    sprite: White/Objects/Weapons/Chaplain/nullrod.rsi
@@ -43,10 +61,10 @@
    - UnholyPitchfork
    - WarHammer
    - HyperTool
-  - type: HolyWeapon

+# Прикольно выглядящая рука, нельзя снять и бьет ожогами.
 - type: entity
-  parent: BaseItem
+  parent: BaseHolyWeapon
  id: GodHand
  name: божья длань
  description: Эта рука сияет с потрясающей силой!
@@ -63,26 +81,22 @@
    wideAnimationRotation: 180
    damage:
      types:
-        Heat: 18
+        Heat: 15
  - type: Item
    size: Ginormous
    sprite: White/Objects/Weapons/Chaplain/godhand.rsi
  - type: Unremoveable
    deleteOnDrop: true
-  - type: HolyWeapon

+# Типичный меч, база базовая. Может блокировать, острый.
 - type: entity
-  parent: Claymore
+  parent: BaseHolyWeapon
  id: HolyClaymore
  name: священный клеймор
  description: Оружие, подходящее для крестового похода!
  components:
  - type: Sprite
    sprite: White/Objects/Weapons/Chaplain/claymore.rsi
-  - type: MeleeWeapon
-    damage:
-      types:
-        Slash: 33
  - type: Clothing
    sprite: White/Objects/Weapons/Chaplain/claymore.rsi
    slots:
@@ -91,29 +105,45 @@
    - suitStorage
  - type: Item
    sprite: White/Objects/Weapons/Chaplain/claymore.rsi
-  - type: HolyWeapon
+  - type: MeleeWeapon
+    damage:
+      types:
+        Slash: 15
+  - type: Sharp
+  - type: MeleeBlock
+    delay: 12.1

+# Отсылка на вархаммер, больше всего урона, так как не может блокировать
 - type: entity
-  parent: HolyClaymore
+  parent: BaseHolyWeapon
  id: Chainsword
  name: цепной меч
  description: Не позволь еретику жить.
  components:
  - type: Sprite
    sprite: White/Objects/Weapons/Chaplain/chainsword.rsi
+    state: icon
+  - type: Clothing
+    sprite: White/Objects/Weapons/Chaplain/chainsword.rsi
+    slots:
+    - back
+    - belt
+    - suitStorage
+  - type: Item
+    sprite: White/Objects/Weapons/Chaplain/chainsword.rsi
  - type: MeleeWeapon
    soundHit:
      path: /Audio/Weapons/chainsaw.ogg
-  - type: Clothing
-    sprite: White/Objects/Weapons/Chaplain/chainsword.rsi
-  - type: Item
-    sprite: White/Objects/Weapons/Chaplain/chainsword.rsi
+    damage:
+      types:
+        Slash: 21
  - type: Tool
    qualities:
      - Sawing
    speed: 0.5
-  - type: HolyWeapon
+  - type: Sharp

+# Он светится
 - type: entity
  parent: HolyClaymore
  id: SwordGlowing
@@ -130,10 +160,10 @@
    color: lightblue
  - type: Item
    sprite: White/Objects/Weapons/Chaplain/forceweapon.rsi
-  - type: HolyWeapon

+# Позволяет блокировать быстрее, средненький урон.
 - type: entity
-  parent: Katana
+  parent: BaseHolyWeapon
  id: HolyKatana
  name: лезвие ханзо
  description: Способен прорезать святой клеймор.
@@ -148,10 +178,24 @@
    - suitStorage
  - type: Item
    sprite: White/Objects/Weapons/Chaplain/katana.rsi
-  - type: HolyWeapon
+  - type: MeleeWeapon
+    wideAnimationRotation: -135
+    damage:
+      types:
+        Slash: 13
+    soundHit:
+      path: /Audio/Weapons/bladeslice.ogg
+  - type: DisarmMalus
+  - type: MeleeBlock
+    delay: 8.1
+  - type: Sharp
+  - type: Tag
+    tags:
+    - Katana

+# Смешной меч с разбросом дамага
 - type: entity
-  parent: HolyKatana
+  parent: BaseHolyWeapon
  id: MultiverseBlade
  name: внепространственный клинок
  description: Будучи когда-то предвестником межпространственной войны, его острота сильно колеблется. Наносит от 1 до 50 урона.
@@ -170,10 +214,11 @@
  - type: Item
    sprite: White/Objects/Weapons/Chaplain/multiverse.rsi
  - type: RandomDamage
-  - type: HolyWeapon
+  - type: Sharp

+# Пробивает броню
 - type: entity
-  parent: HolyClaymore
+  parent: BaseHolyWeapon
  id: VorpalScythe
  name: коса жнеца
  description: И жрец, и жнец, и на дуде игрец! Коса способна пробить броню противника.
@@ -184,7 +229,7 @@
    ignoreResistances: true
    damage:
      types:
-        Slash: 24
+        Slash: 14
  - type: Clothing
    sprite: White/Objects/Weapons/Chaplain/scythe.rsi
    slots:
@@ -192,8 +237,9 @@
    - suitStorage
  - type: Item
    sprite: White/Objects/Weapons/Chaplain/scythe-inhands.rsi
-  - type: HolyWeapon
+  - type: Sharp

+# Может пиздеть
 - type: entity
  parent: HolyKatana
  id: PossessedBlade
@@ -218,10 +264,10 @@
  - type: Examiner
  - type: Item
    sprite: White/Objects/Weapons/Chaplain/possessed.rsi
-  - type: HolyWeapon

+# Приклеен к руке, быстро и громко бьет
 - type: entity
-  parent: BaseItem
+  parent: BaseHolyWeapon
  id: ChainsawHand
  name: рука-бензопила
  description: Добро? Зло? Ты парень с бензопилой в руке.
@@ -251,10 +297,10 @@
    qualities:
      - Sawing
    speed: 0.5
-  - type: HolyWeapon

+# Нокдаунит при ударе
 - type: entity
-  parent: BaseItem
+  parent: BaseHolyWeapon
  id: HolyWhip
  name: священная плеть
  description: Какая ужасная ночь на космической станции 14.
@@ -265,10 +311,11 @@
  - type: MeleeWeapon
    soundHit:
      path: /Audio/White/Items/hit/chainhit.ogg
-    range: 2.5
+    range: 1.5
+    attackRate: 0.5
    damage:
      types:
-        Blunt: 18
+        Blunt: 10
  - type: Item
    size: Normal
    sprite: White/Objects/Weapons/Chaplain/whip.rsi
@@ -277,10 +324,13 @@
    slots:
    - belt
  - type: DisarmMalus
-  - type: HolyWeapon
+  - type: KnockDownOnHit
+    knockDownBehavior: NoDrop
+    knockdownTime: 0.4

+# Отбрасывает при ударе и может блокировать, требует держать себя в двух руках для отброса
 - type: entity
-  parent: BaseItem
+  parent: BaseHolyWeapon
  id: HolyStaff
  name: посох монаха
  description: Длинный высокий посох из полированного дерева. Традиционно используемый в боевых искусствах древней Земли, теперь он используется для преследования клоуна.
@@ -288,11 +338,6 @@
  - type: Sprite
    sprite: White/Objects/Weapons/Chaplain/staff.rsi
    state: icon
-  - type: MeleeWeapon
-    wideAnimationRotation: 135
-    damage:
-      types:
-        Blunt: 10
  - type: Item
    size: Huge
    sprite: White/Objects/Weapons/Chaplain/staff.rsi
@@ -301,23 +346,64 @@
    slots:
    - back
    - suitStorage
+  - type: MeleeWeapon
+    wideAnimationRotation: 135
+    damage:
+      types:
+        Blunt: 6
+    soundHit:
+      collection: MetalThud
  - type: Wieldable
  - type: IncreaseDamageOnWield
    damage:
      types:
        Blunt: 8
+  - type: MeleeThrowOnHit
+    lifetime: 0.2
+    speed: 5
+    fallAfterHit: true
+    requireWield: true
  - type: UseDelay
-  - type: DisarmMalus
  - type: MeleeBlock
-    delay: 6.1
-  - type: HolyWeapon
+    delay: 8.1

+# Можно кинуть, если попасть нанесет ебать как много, не попадет - ты проебал ее. Далеко бьет
 - type: entity
-  parent: BaseItem
+  parent: BaseHolyWeapon
  id: UnholyPitchfork
  name: нечестивые вилы
  description: Держа это, ты выглядишь абсолютно по дьявольски.
  components:
+  - type: Sprite
+    sprite: White/Objects/Weapons/Chaplain/pitchfork.rsi
+    state: icon
+  - type: Item
+    sprite: White/Objects/Weapons/Chaplain/pitchfork.rsi
+    size: Huge
+  - type: Clothing
+    sprite: White/Objects/Weapons/Chaplain/pitchfork.rsi
+    slots:
+    - back
+    - suitStorage
+  - type: MeleeWeapon
+    range: 2
+    wideAnimationRotation: -135
+    damage:
+      types:
+        Piercing: 8
+    angle: 0
+    animation: WeaponArcThrust
+    soundHit:
+      path: /Audio/Weapons/bladeslice.ogg
+  - type: DamageOtherOnHit
+    damage:
+      types:
+        Piercing: 77
+  - type: Wieldable
+  - type: IncreaseDamageOnWield
+    damage:
+      types:
+        Piercing: 4
  - type: EmbeddableProjectile
    offset: 0.15,0.15
  - type: ThrowingAngle
@@ -337,42 +423,12 @@
        restitution: 0.3
        friction: 0.2
  - type: Sharp
-  - type: Sprite
-    sprite: White/Objects/Weapons/Chaplain/pitchfork.rsi
-    state: icon
-  - type: MeleeWeapon
-    range: 2
-    wideAnimationRotation: -135
-    damage:
-      types:
-        Piercing: 15
-    angle: 0
-    animation: WeaponArcThrust
-    soundHit:
-      path: /Audio/Weapons/bladeslice.ogg
-  - type: DamageOtherOnHit
-    damage:
-      types:
-        Piercing: 25
-  - type: Item
-    sprite: White/Objects/Weapons/Chaplain/pitchfork.rsi
-    size: Huge
-  - type: Clothing
-    sprite: White/Objects/Weapons/Chaplain/pitchfork.rsi
-    slots:
-    - back
-    - suitStorage
-  - type: Wieldable
-  - type: IncreaseDamageOnWield
-    damage:
-      types:
-        Piercing: 9
  - type: UseDelay
  - type: DisarmMalus
-  - type: HolyWeapon

+# Высокий структурный урон
 - type: entity
-  parent: BaseItem
+  parent: BaseHolyWeapon
  id: WarHammer
  name: реликтовый боевой молот
  description: Этот боевой молот обошелся священнику в сорок тысяч кредитов.
@@ -380,17 +436,6 @@
  - type: Sprite
    sprite: White/Objects/Weapons/Chaplain/hammer.rsi
    state: icon
-  - type: MeleeWeapon
-    wideAnimationRotation: -135
-    attackRate: 0.75
-    damage:
-      types:
-        Blunt: 24
-        Structural: 40
-    soundHit:
-      collection: HammerHit
-    soundSwing:
-      collection: HammerMiss
  - type: Item
    size: Huge
    sprite: White/Objects/Weapons/Chaplain/hammer.rsi
@@ -400,14 +445,25 @@
    - belt
    - back
    - suitStorage
+  - type: MeleeWeapon
+    wideAnimationRotation: -135
+    attackRate: 0.75
+    damage:
+      types:
+        Blunt: 16
+        Structural: 40
+    soundHit:
+      collection: HammerHit
+    soundSwing:
+      collection: HammerMiss
  - type: DisarmMalus
-  - type: HolyWeapon

+# Имеет все инструменты в себе, но работает медленно и почти не наносит урона
 - type: entity
-  parent: BaseItem
+  parent: BaseHolyWeapon
  id: HyperTool
  name: гиперинструмент
-  description: Инструмент настолько мощный, что даже вы не можете им идеально пользоваться.
+  description: Кто-то додумался склеить все инструменты вместе и вот, что вышло. Настолько продуманный, что вы не понимаете, как этим адекватно пользоваться
  components:
  - type: Sprite
    sprite: White/Objects/Weapons/Chaplain/hypertool.rsi
@@ -417,9 +473,9 @@
    canHeavyAttack: false
    damage:
      types:
-        Blunt: 0
-  - type: StaminaDamageOnHit
-    damage: 40
+        Blunt: 4
+    soundHit:
+      collection: HyperToolUsing
  - type: Item
    size: Normal
    sprite: White/Objects/Weapons/Chaplain/hypertool.rsi
@@ -428,4 +484,29 @@
    slots:
    - belt
  - type: DisarmMalus
-  - type: HolyWeapon
+  - type: Tool
+    qualities:
+    - Screwing
+    - Prying
+    - Anchoring
+    - Cutting
+    - Pulsing
+    speed: 0.7
+    useSound:
+      collection: HyperToolUsing
+
+- type: soundCollection
+  id: HyperToolUsing
+  files:
+  - /Audio/Effects/RingtoneNotes/a.ogg
+  - /Audio/Effects/RingtoneNotes/asharp.ogg
+  - /Audio/Effects/RingtoneNotes/b.ogg
+  - /Audio/Effects/RingtoneNotes/c.ogg
+  - /Audio/Effects/RingtoneNotes/csharp.ogg
+  - /Audio/Effects/RingtoneNotes/d.ogg
+  - /Audio/Effects/RingtoneNotes/dsharp.ogg
+  - /Audio/Effects/RingtoneNotes/e.ogg
+  - /Audio/Effects/RingtoneNotes/f.ogg
+  - /Audio/Effects/RingtoneNotes/fsharp.ogg
+  - /Audio/Effects/RingtoneNotes/g.ogg
+  - /Audio/Effects/RingtoneNotes/gsharp.ogg
--- a/Resources/Prototypes/_White/Entities/Objects/Weapons/telescopic_baton.yml
+++ b/Resources/Prototypes/_White/Entities/Objects/Weapons/telescopic_baton.yml
@@ -4,7 +4,6 @@
  name: telescopic baton
  description: A compact yet robust personal defense weapon. Can be concealed when folded.
  components:
-  - type: TelescopicBaton
  - type: Sprite
    sprite: White/Objects/Weapons/telebaton.rsi
    layers:
@@ -23,6 +22,8 @@
      path: /Audio/Weapons/telescopicoff.ogg
      params:
        volume: -5
+    activatedDescription: comp-telebaton-examined-on
+    deactivatedDescription: comp-telebaton-examined-off
  - type: Appearance
  - type: GenericVisualizer
    visuals:
@@ -64,3 +65,4 @@
      - Belt
  - type: StaticPrice
    price: 150
+  - type: KnockDownOnHit
--- a/Resources/Prototypes/_White/Fluff/fluff.yml
+++ b/Resources/Prototypes/_White/Fluff/fluff.yml
@@ -824,7 +824,7 @@
    wideAnimationRotation: -135
    damage:
      types:
-        Slash: 18
+        Slash: 14
    soundHit:
      path: /Audio/Weapons/bladeslice.ogg
  - type: HolyWeapon
--- a/Resources/Prototypes/_White/Wizard/magic_items.yml
+++ b/Resources/Prototypes/_White/Wizard/magic_items.yml
@@ -11,7 +11,7 @@
    attackRate: 5
    damage:
      types:
-        Slash: 10
+        Slash: 25
  - type: Clothing
    sprite: White/Objects/Weapons/Chaplain/hfrequency.rsi
    slots:
@@ -101,6 +101,7 @@
    minLifetime: 0.01
    speed: 20
    stunTime: 1.5
+    fallAfterHit: true
    throwOnThrowHit: true
  - type: DamageOtherOnHit
    sound: