Skip to content

Commit

Permalink
Makes tonfa usable (minor buff) (#10982)
Browse files Browse the repository at this point in the history 
* changes value

* replaces static numbers with % based to reflect stamina_damage changes better
  • Loading branch information
@BlueHNT
BlueHNT authored May 22, 2024
1 parent 03e92ce commit 77ce041
Showing 1 changed file with 18 additions and 18 deletions.
36 changes: 18 additions & 18 deletions code/game/objects/items/melee/misc.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -350,7 +350,7 @@
force = 8
throwforce = 7
cooldown = 0
stamina_damage = 25 // 4 hits to stamcrit
stamina_damage = 30 // 4 hits to stamcrit < that was a lie
stun_animation = TRUE
/// Per-mob sleep cooldowns.
/// [mob] = [world.time where the cooldown ends]
Expand Down Expand Up @@ -414,7 +414,7 @@
target.visible_message(desc["visiblestun"], desc["localstun"])

else if(user.is_zone_selected(BODY_ZONE_HEAD) || user.is_zone_selected(BODY_ZONE_PRECISE_EYES) || user.is_zone_selected(BODY_ZONE_PRECISE_MOUTH))
target.apply_damage(18, STAMINA, BODY_ZONE_HEAD, def_check) // 90 : 5 = 18 , 5 hits to KnockOut
target.apply_damage(stamina_damage*0.8, STAMINA, BODY_ZONE_HEAD, def_check) // 90 : 5 = 18 , 5 hits to KnockOut

if(target.staminaloss > 89 && !target.has_status_effect(STATUS_EFFECT_SLEEPING) && (!sleep_cooldowns[target] || COOLDOWN_FINISHED(src, sleep_cooldowns[target])))
T.force_say(user)
Expand All @@ -437,13 +437,13 @@
log_combat(user, target, "stunned", src)
target.visible_message(desc["visibleleg"], desc["localleg"])
if (Rl.get_staminaloss() < 26 && Ra.get_staminaloss() < 26 && La.get_staminaloss() < 26)
target.apply_damage(25, STAMINA, BODY_ZONE_L_LEG, def_check)
target.apply_damage(stamina_damage, STAMINA, BODY_ZONE_L_LEG, def_check)
else
target.apply_damage(10, STAMINA, BODY_ZONE_L_LEG, def_check)
target.apply_damage(stamina_damage*0.5, STAMINA, BODY_ZONE_L_LEG, def_check)
if (Ll.get_staminaloss() == 50)
target.apply_damage(10, STAMINA, BODY_ZONE_CHEST, def_check)
target.apply_damage(stamina_damage*0.5, STAMINA, BODY_ZONE_CHEST, def_check)
else
target.apply_damage(5, STAMINA, BODY_ZONE_CHEST, def_check)
target.apply_damage(stamina_damage*0.2, STAMINA, BODY_ZONE_CHEST, def_check)

if(Ll.get_staminaloss() == 50 && CHECK_BITFIELD(target.mobility_flags, MOBILITY_STAND) && (!trip_cooldowns[target] || COOLDOWN_FINISHED(src, trip_cooldowns[target])))
target.visible_message("<span class='emote'><b>[T]</b> [pick(list("falls down.","falls face first into the floor.","gets viciously tripped.","got clumsy."))]</span>")
Expand All @@ -458,13 +458,13 @@
log_combat(user, target, "stunned", src)
target.visible_message(desc["visibleleg"], desc["localleg"])
if (Ll.get_staminaloss() < 26 && Ra.get_staminaloss() < 26 && La.get_staminaloss() < 26)
target.apply_damage(25, STAMINA, BODY_ZONE_R_LEG, def_check)
target.apply_damage(stamina_damage, STAMINA, BODY_ZONE_R_LEG, def_check)
else
target.apply_damage(10, STAMINA, BODY_ZONE_R_LEG, def_check)
target.apply_damage(stamina_damage*0.5, STAMINA, BODY_ZONE_R_LEG, def_check)
if (Rl.get_staminaloss() == 50)
target.apply_damage(10, STAMINA, BODY_ZONE_CHEST, def_check)
target.apply_damage(stamina_damage*0.5, STAMINA, BODY_ZONE_CHEST, def_check)
else
target.apply_damage(5, STAMINA, BODY_ZONE_CHEST, def_check)
target.apply_damage(stamina_damage*0.2, STAMINA, BODY_ZONE_CHEST, def_check)

if(Rl.get_staminaloss() == 50 && CHECK_BITFIELD(target.mobility_flags, MOBILITY_STAND) && (!trip_cooldowns[target] || COOLDOWN_FINISHED(src, trip_cooldowns[target])))
target.visible_message("<span class='emote'><b>[T]</b> [pick(list("falls down.","falls face first into the floor.","gets viciously tripped.","got clumsy."))]</span>")
Expand All @@ -483,13 +483,13 @@
log_combat(user, target, "disarmed", src)
target.visible_message(desc["visibledisarm"], desc["localdisarm"])
if (Ra.get_staminaloss() < 26 && Ll.get_staminaloss() < 26 && Rl.get_staminaloss() < 26)
target.apply_damage(20, STAMINA, BODY_ZONE_L_ARM, def_check)
target.apply_damage(stamina_damage*0.8, STAMINA, BODY_ZONE_L_ARM, def_check)
else
target.apply_damage(5, STAMINA, BODY_ZONE_L_ARM, def_check)
target.apply_damage(stamina_damage*0.2, STAMINA, BODY_ZONE_L_ARM, def_check)
if (La.get_staminaloss() == 50)
target.apply_damage(10, STAMINA, BODY_ZONE_CHEST, def_check)
target.apply_damage(stamina_damage*0.5, STAMINA, BODY_ZONE_CHEST, def_check)
else
target.apply_damage(4, STAMINA, BODY_ZONE_CHEST, def_check)
target.apply_damage(stamina_damage*0.2, STAMINA, BODY_ZONE_CHEST, def_check)

else if(user.is_zone_selected(BODY_ZONE_R_ARM))
if(!Ra.get_staminaloss() == 50)
Expand All @@ -499,13 +499,13 @@
log_combat(user, target, "disarmed", src)
target.visible_message(desc["visibledisarm"], desc["localdisarm"])
if (La.get_staminaloss() < 26 && Ll.get_staminaloss() < 26 && Rl.get_staminaloss() < 26)
target.apply_damage(20, STAMINA, BODY_ZONE_R_ARM, def_check)
target.apply_damage(stamina_damage*0.8, STAMINA, BODY_ZONE_R_ARM, def_check)
else
target.apply_damage(5, STAMINA, BODY_ZONE_R_ARM, def_check)
target.apply_damage(stamina_damage*0.2, STAMINA, BODY_ZONE_R_ARM, def_check)
if (Ra.get_staminaloss() == 50)
target.apply_damage(10, STAMINA, BODY_ZONE_CHEST, def_check)
target.apply_damage(stamina_damage*0.5, STAMINA, BODY_ZONE_CHEST, def_check)
else
target.apply_damage(4, STAMINA, BODY_ZONE_CHEST, def_check)
target.apply_damage(stamina_damage*0.2, STAMINA, BODY_ZONE_CHEST, def_check)

add_fingerprint(user)

Expand Down

0 comments on commit 77ce041

Please sign in to comment.