From 77c428479e85134805511b9fca6cd3af5b005023 Mon Sep 17 00:00:00 2001 From: Ghom <42542238+Ghommie@users.noreply.github.com> Date: Sat, 13 Jun 2020 02:08:10 +0200 Subject: [PATCH] changes the inefficient attack message string and threshold. (#12498) --- code/__DEFINES/combat.dm | 2 +- code/_onclick/item_attack.dm | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/__DEFINES/combat.dm b/code/__DEFINES/combat.dm index e348781bcc..e7f79596b5 100644 --- a/code/__DEFINES/combat.dm +++ b/code/__DEFINES/combat.dm @@ -272,7 +272,7 @@ GLOBAL_LIST_INIT(shove_disarming_types, typecacheof(list( * should the current-attack-damage be lower than the item force multiplied by this value, * a "inefficiently" prefix will be added to the message. */ -#define INEFFICIENT_ATTACK_MSG_THRESHOLD 0.7 +#define FEEBLE_ATTACK_MSG_THRESHOLD 0.5 //bullet_act() return values diff --git a/code/_onclick/item_attack.dm b/code/_onclick/item_attack.dm index 9386564adb..106db7f40a 100644 --- a/code/_onclick/item_attack.dm +++ b/code/_onclick/item_attack.dm @@ -213,8 +213,8 @@ var/message_verb = "attacked" if(I.attack_verb && I.attack_verb.len) message_verb = "[pick(I.attack_verb)]" - if(current_force < I.force * INEFFICIENT_ATTACK_MSG_THRESHOLD) - message_verb = "inefficiently [message_verb]" + if(current_force < I.force * FEEBLE_ATTACK_MSG_THRESHOLD) + message_verb = "[pick("feebly", "limply", "saplessly")] [message_verb]" else if(!I.force) return var/message_hit_area = ""