Martial Artist Rework + Fix MeleeWeapon Wizmerge Bugs

[angelofallars]

Description

Reworks the Martial Artist trait, making it a more impactful and visually distinct trait.

• Left-clicks are now single-target power attacks, requiring less aim than before.
• 50% damage bonus reduced to 20% damage bonus (same overall DPS with next change).
• Gain 25% attack rate bonus.
  • The attack rate bonus helps make the trait feel and look distinct from non-Martial Artist melee attacks.
• 50% range bonus reduced to 10% range bonus.
• The damage bonus is now also applied to Asphyxiation and Poison damage, which Lamia unarmed attacks deal.
• Trait cost increased from -3 points to -5 points.
• Striking Calluses (which requires Martial Artist) cost reduced from -4 points to -3 points to prevent the Martial Artist/Striking Calluses combo from being too expensive. The combo used to cost -7 points, now it is -8 points.

The reworked Martial Artist trait is also given to the Boxers, Martial Artists and Gladiators.

Also reverted some wizmerge messery that messed up the melee attack rate again, and messed up pistol whipping by making the cooldowns of gunshots and melee attacks intertwined.

Also while we're at it, Natural Weapons Removal has been disabled for all species whose damage is pure Blunt, including Diona, Dwarf, Arachne and IPC. (IPC have 6 blunt so the trait would literally be a 0-point negative trait for them)

Technical Details

A new trait function has been added for Martial Artist: TraitModifyUnarmed, which modifies the player entity's MeleeWeaponComponent.

The Claws, Talons, Natural Weapon Removal, and Striking Calluses traits have also been refactored under the hood to use TraitModifyUnarmed, instead of replacing MeleeWeaponComponent which would wipe out all the changes made by the Martial Artist trait.

Media

New Description

Martial Artist In Action

video-2025-01-16_14.57.mp4

Striking Calluses New Description

Natural Weapons Removal New Description

Changelog

🆑 Skubman

• add: Martial Artist Rework: Martial Artist now costs 5 points, but it turns all unarmed melee attacks into single-target power attacks, with 20% bonus damage, 25% bonus attack rate and 10% bonus attack range.
• tweak: The reworked Martial Artist trait is now given for free to Boxers, Martial Artists, and Gladiators.
• tweak: Martial Artists (the job) and Gladiators can now select the Striking Calluses trait.
• tweak: The Martial Artist trait now applies bonus damage to the Lamiae's unarmed Asphyxiation and Poison damage.
• tweak: The cost of Striking Calluses has been reduced from 4 points to 3 points.
• fix: Fixed a bug where slow weapons were fast and fast weapons were slow.
• fix: You can pistol whip (right-click melee) immediately after firing a gun again, and the cooldown on firing the gun after pistol whipping is always 0.528 seconds again.
• fix: Prevented Dionas, Arachnae and IPCs, who all have pure Blunt damage from selecting the redundant Natural Weapons Removal trait.

[BlueHNT]

I wonder if I could do something similar to security where they can incapacitate with their fists inheriting aggressive grab from changeling PR.