From fb5fa92438357b6a22ffd478cfce9114172e9400 Mon Sep 17 00:00:00 2001 From: Aviu00 Date: Mon, 5 Aug 2024 16:21:45 +0300 Subject: [PATCH] - add: Blocking for melee weapons. --- .../Prototypes/Entities/Objects/Weapons/Melee/armblade.yml | 2 ++ .../Prototypes/Entities/Objects/Weapons/Melee/cult.yml | 4 ++++ .../Prototypes/Entities/Objects/Weapons/Melee/sword.yml | 6 ++++++ .../_White/Entities/Objects/Weapons/chaplain_weapons.yml | 1 + 4 files changed, 13 insertions(+) diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/armblade.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/armblade.yml index 13f89950a3..9b6e5a7686 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/armblade.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/armblade.yml @@ -28,3 +28,5 @@ deleteOnDrop: true - type: ToolForcePowered - type: DeleteOnChangelingRefund + - type: MeleeBlock + delay: 12.1 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/cult.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/cult.yml index 7961c3af43..0cbf04eb7b 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/cult.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/cult.yml @@ -82,6 +82,8 @@ - suitStorage - type: DisarmMalus - type: CultItem + - type: MeleeBlock + delay: 12.1 - type: entity name: unholy halberd @@ -123,3 +125,5 @@ - type: UseDelay delay: 1 - type: CultItem + - type: MeleeBlock + delay: 12.1 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml index 9ec4e93469..3f54cf7b19 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml @@ -64,6 +64,8 @@ - Belt - SuitStorage - type: DisarmMalus + - type: MeleeBlock + delay: 12.1 - type: entity name: energy katana @@ -164,6 +166,8 @@ deconstructionTarget: null graph: SwordGraph node: sword + - type: MeleeBlock + delay: 12.1 - type: entity name: cutlass @@ -189,6 +193,8 @@ size: Large sprite: Objects/Weapons/Melee/cutlass.rsi - type: DisarmMalus + - type: MeleeBlock + delay: 12.1 - type: entity name: The Throngler diff --git a/Resources/Prototypes/_White/Entities/Objects/Weapons/chaplain_weapons.yml b/Resources/Prototypes/_White/Entities/Objects/Weapons/chaplain_weapons.yml index 3e0ab8c74b..0e2b6f7a68 100644 --- a/Resources/Prototypes/_White/Entities/Objects/Weapons/chaplain_weapons.yml +++ b/Resources/Prototypes/_White/Entities/Objects/Weapons/chaplain_weapons.yml @@ -341,6 +341,7 @@ sprite: White/Objects/Weapons/Chaplain/pitchfork.rsi state: icon - type: MeleeWeapon + range: 2 wideAnimationRotation: -135 damage: types: