From 5ffa0e639758584541b7ed1eb18a72931baf7b18 Mon Sep 17 00:00:00 2001 From: Hubblenaut Date: Mon, 16 Feb 2015 19:53:12 +0100 Subject: [PATCH] fixes curbstomp, adjusts texts --- .../living/carbon/human/human_attackhand.dm | 1 + .../mob/living/carbon/human/unarmed_attack.dm | 31 +++++++++++-------- 2 files changed, 19 insertions(+), 13 deletions(-) diff --git a/code/modules/mob/living/carbon/human/human_attackhand.dm b/code/modules/mob/living/carbon/human/human_attackhand.dm index bb02aee5e0b..5029c283ecd 100644 --- a/code/modules/mob/living/carbon/human/human_attackhand.dm +++ b/code/modules/mob/living/carbon/human/human_attackhand.dm @@ -116,6 +116,7 @@ if(src.grabbed_by.len || src.buckled || !src.canmove || src==H) accurate = 1 // certain circumstances make it impossible for us to evade punches + rand_damage = 5 // Process evasion and blocking var/miss_type = 0 diff --git a/code/modules/mob/living/carbon/human/unarmed_attack.dm b/code/modules/mob/living/carbon/human/unarmed_attack.dm index c98e3788c00..d033e70610d 100644 --- a/code/modules/mob/living/carbon/human/unarmed_attack.dm +++ b/code/modules/mob/living/carbon/human/unarmed_attack.dm @@ -64,7 +64,7 @@ target.apply_effects(stutter = attack_damage * 2, agony = attack_damage* 3, blocked = armour) if("l_leg", "l_foot", "r_leg", "r_foot") if(!target.lying) - target.visible_message("[src] gives way slightly.") + target.visible_message("[target] gives way slightly.") target.apply_effect(attack_damage*3, AGONY, armour) else if(attack_damage >= 5 && !(target == user) && (stun_chance + attack_damage * 5 >= 100) && armour < 2) // Chance to get the usual throwdown as well (25% standard chance) if(!target.lying) @@ -118,22 +118,28 @@ user.visible_message("[user] slapped [target] across \his cheek!") if(3 to 4) user.visible_message(pick( - 80; "[user] [pick(attack_verb)] [target] in the head!", //striking someone with a 'closed fist' is called punching them. - 20; "[user] struck [target] in the head[pick("", " with a closed fist")]!" + 40; "[user] [pick(attack_verb)] [target] in the head!", + 30; "[user] struck [target] in the head[pick("", " with a closed fist")]!", + 30; "[user] threw a hook against [target]'s head!" )) if(5) user.visible_message(pick( - 10; "[user] gave [target] a resounding slap to the face!", - 90; "[user] smashed \his [pick(attack_noun)] into [target]'s [organ]!" + 30; "[user] gave [target] a resounding [pick("slap", "punch")] to the face!", + 40; "[user] smashed \his [pick(attack_noun)] into [target]'s face!", + 30; "[user] gave a strong blow against [target]'s jaw!" )) else // ----- BODY ----- // switch(attack_damage) - if(1 to 2) user.visible_message("[user] slapped [target]'s [organ]!") - if(3 to 4) user.visible_message("[user] [pick(attack_verb)] [target] in \his [organ]!") - if(5) user.visible_message("[user] smashed \his [pick(attack_noun)] into [target]'s [organ]!") + if(1 to 2) user.visible_message("[user] threw a glancing punch at [target]'s [organ]!") + if(1 to 4) user.visible_message("[user] [pick(attack_verb)] [target] in \his [organ]!") + if(5) + user.visible_message(pick( + 50; "[user] smashed \his [pick(attack_noun)] into [target]'s [organ]!", + 50; "[user] landed a striking [pick(attack_noun)] on [target]'s [organ]!" + )) else - user.visible_message("[user] [pick("punched", "threw a punch", "struck", "slapped", "slammed their [pick(attack_noun)] into")] [target]'s [organ]!") //why do we have a separate set of verbs for lying targets? + user.visible_message("[user] [pick("punched", "threw a punch against", "struck", "slammed their [pick(attack_noun)] into")] [target]'s [organ]!") //why do we have a separate set of verbs for lying targets? /datum/unarmed_attack/kick attack_verb = list("kicked", "kicked", "kicked", "kneed") @@ -177,7 +183,7 @@ /datum/unarmed_attack/stomp attack_verb = null - attack_noun = list("kick") + attack_noun = list("stomp") attack_sound = "swing_hit" damage = 0 @@ -189,7 +195,7 @@ if(!istype(target)) return 0 - if (!user.lying && (target.lying || zone in list("l_foot", "r_foot"))) + if (!user.lying && (target.lying || (zone in list("l_foot", "r_foot")))) if(target.grabbed_by == user && target.lying) return 0 var/datum/organ/external/E = user.organs_by_name["l_foot"] @@ -214,6 +220,5 @@ attack_damage = Clamp(attack_damage, 1, 5) switch(attack_damage) - if(1 to 2) user.visible_message("[user] [pick("stepped on", "treaded on")] [target]'s [organ]!") //stepped on conveys the same meaning and is more recognizable as an actual word than "clomped" - if(3 to 4) user.visible_message("[pick("[user] stomped on", "[user] slammed \his [shoes ? copytext(shoes.name, 1, -1) : "foot"] down onto")] [target]'s [organ]!") + if(1 to 4) user.visible_message("[pick("[user] stomped on", "[user] slammed \his [shoes ? copytext(shoes.name, 1, -1) : "foot"] down onto")] [target]'s [organ]!") if(5) user.visible_message("[pick("[user] landed a powerful stomp on", "[user] stomped down hard on", "[user] slammed \his [shoes ? copytext(shoes.name, 1, -1) : "foot"] down hard onto")] [target]'s [organ]!") //Devastated lol. No. We want to say that the stomp was powerful or forceful, not that it /wrought devastation/ \ No newline at end of file