Andreas/tbamud
1
0
Fork 0
mirror of https://github.com/tbamud/tbamud.git synced 2026-04-03 02:47:19 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove bare hand damage in favor of unarmed skill proficiency

Browse source
This commit is contained in:
kinther 2025-10-18 06:38:15 -07:00
parent 3fd48b60f6
commit cc342ef45c
10 changed files with 138 additions and 121 deletions
Download patch file Download diff file Expand all files Collapse all files

34
src/fight.c
View file

@ -862,6 +862,32 @@ void hit(struct char_data *ch, struct char_data *victim, int type)
if (!IS_NPC(ch))
attack_mod += GET_PROFICIENCY(GET_SKILL(ch, skillnum));
/* --- UNARMED ATTACK HANDLING --- */
if (!wielded) {
int prof_bonus = (!IS_NPC(ch)) ? GET_PROFICIENCY(GET_SKILL(ch, SKILL_UNARMED)) : 0;
int str_mod = GET_ABILITY_MOD(GET_STR(ch));
int die_size;
/* Simple scaling by proficiency tier */
switch (prof_bonus) {
case 0: die_size = 4; break; /* untrained */
case 1: die_size = 6; break; /* trained */
case 2: die_size = 8; break; /* expert */
default: die_size = 10; break; /* master or above */
}
/* NPC fallback scaling */
if (IS_NPC(ch) && prof_bonus <= 0) {
prof_bonus = MIN(6, (GET_LEVEL(ch) / 4)); /* level scaling */
}
/* base damage roll for unarmed attacks */
dam = dice(1, die_size) + str_mod + prof_bonus;
/* mark attack type for damage() messaging */
w_type = SKILL_UNARMED + TYPE_HIT;
}
/* Weapon magic (cap +3) */
if (wielded && GET_OBJ_TYPE(wielded) == ITEM_WEAPON) {
int wmag = GET_OBJ_VAL(wielded, VAL_ARMOR_MAGIC_BONUS);
@ -886,8 +912,12 @@ void hit(struct char_data *ch, struct char_data *victim, int type)
/* Apply result */
if (hit_success) {
/* Roll damage up front (needed for shield durability) */
dam = roll_damage(ch, victim, wielded, w_type);
/* Roll damage up front (needed for shield durability)
* If we are unarmed, dam was already rolled above.
* If wielding a weapon, roll normally.
*/
if (wielded)
dam = roll_damage(ch, victim, wielded, w_type);
/* --- SHIELD BLOCK CHECK ---
* Only happens if an attack actually lands.