From 6a7f06b4183f7d74449a181941db99c90c9b1a84 Mon Sep 17 00:00:00 2001 From: necromanceranne Date: Sat, 4 Apr 2020 23:21:55 +1100 Subject: [PATCH 1/4] Just fixes some funky shit --- code/datums/martial/sleeping_carp.dm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/code/datums/martial/sleeping_carp.dm b/code/datums/martial/sleeping_carp.dm index 90e1627a249..f238f5d6fc0 100644 --- a/code/datums/martial/sleeping_carp.dm +++ b/code/datums/martial/sleeping_carp.dm @@ -28,7 +28,7 @@ ///this var is so that the strong punch is always aiming for the body part the user is targeting and not trying to apply to the chest before deviating var/obj/item/bodypart/affecting = D.get_bodypart(ran_zone(A.zone_selected)) A.do_attack_animation(D, ATTACK_EFFECT_PUNCH) - var/atk_verb = pick("kick", "chop", "hit", "slam") + var/atk_verb = pick("precisely kick", "brutally chop", "cleanly hit", "viciously slam") ///this is the critical hit damage added to the attack if it rolls, it starts at 0 because it'll be changed when rolled var/crit_damage = 0 D.visible_message("[A] [atk_verb]s [D]!", \ @@ -37,7 +37,7 @@ if(prob(10)) crit_damage += 20 playsound(get_turf(D), 'sound/weapons/bite.ogg', 50, TRUE, -1) - D.visible_message("[D] sputters blood as the blow strikes them with inhuman force!", "You are struck with incredible precision by [A]!") + D.visible_message("[D] is sent reeling as the blow strikes them with inhuman force!", "You are struck with incredible precision by [A]!") log_combat(A, D, "critcal strong punched (Sleeping Carp)")//log it here because a critical can swing for 40 force and it's important for the sake of how hard they hit else playsound(get_turf(D), 'sound/weapons/punch1.ogg', 25, TRUE, -1) @@ -63,12 +63,13 @@ playsound(get_turf(A), 'sound/effects/hit_kick.ogg', 50, TRUE, -1) if((D.mobility_flags & MOBILITY_STAND)) D.apply_damage(10, A.dna.species.attack_type, BODY_ZONE_HEAD) + D.apply_damage(40, A.dna.species.attack_type, BODY_ZONE_HEAD) D.Knockdown(40) D.visible_message("[A] kicks [D] in the head, sending them face first into the floor!", \ "You are kicked in the head by [A], sending you crashing to the floor!", "You hear a sickening sound of flesh hitting flesh!", COMBAT_MESSAGE_RANGE, A) - if(!(D.mobility_flags & MOBILITY_STAND)) + else if(!(D.mobility_flags & MOBILITY_STAND)) D.apply_damage(5, A.dna.species.attack_type, BODY_ZONE_HEAD) - D.adjustStaminaLoss(40) + D.apply_damage(40, A.dna.species.attack_type, BODY_ZONE_HEAD) D.drop_all_held_items() D.visible_message("[A] kicks [D] in the head!", \ "You are kicked in the head by [A]!", "You hear a sickening sound of flesh hitting flesh!", COMBAT_MESSAGE_RANGE, A) From 2fe521e99b6d8cee3880aec3eb9096bd5f002e2a Mon Sep 17 00:00:00 2001 From: necromanceranne Date: Sat, 4 Apr 2020 23:26:38 +1100 Subject: [PATCH 2/4] "You chops Mcgreyshit" --- code/datums/martial/sleeping_carp.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/datums/martial/sleeping_carp.dm b/code/datums/martial/sleeping_carp.dm index f238f5d6fc0..2f3852b61f4 100644 --- a/code/datums/martial/sleeping_carp.dm +++ b/code/datums/martial/sleeping_carp.dm @@ -89,8 +89,8 @@ return TRUE var/obj/item/bodypart/affecting = D.get_bodypart(ran_zone(A.zone_selected)) A.do_attack_animation(D, ATTACK_EFFECT_PUNCH) - var/atk_verb = pick("kicks", "chops", "hits", "slams") - D.visible_message("[A] [atk_verb] [D]!", \ + var/atk_verb = pick("kick", "chop", "hit", "slam") + D.visible_message("[A] [atk_verb]s [D]!", \ "[A] [atk_verb]s you!", null, null, A) to_chat(A, "You [atk_verb] [D]!") D.apply_damage(rand(10,15), BRUTE, affecting) From 3fedf555b416fb7181e4898aac67d9c0be6dcee1 Mon Sep 17 00:00:00 2001 From: necromanceranne Date: Sat, 4 Apr 2020 23:29:18 +1100 Subject: [PATCH 3/4] Sorry, what kind of damage? --- code/datums/martial/sleeping_carp.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/datums/martial/sleeping_carp.dm b/code/datums/martial/sleeping_carp.dm index 2f3852b61f4..22216f2984c 100644 --- a/code/datums/martial/sleeping_carp.dm +++ b/code/datums/martial/sleeping_carp.dm @@ -63,13 +63,13 @@ playsound(get_turf(A), 'sound/effects/hit_kick.ogg', 50, TRUE, -1) if((D.mobility_flags & MOBILITY_STAND)) D.apply_damage(10, A.dna.species.attack_type, BODY_ZONE_HEAD) - D.apply_damage(40, A.dna.species.attack_type, BODY_ZONE_HEAD) + D.apply_damage(40, STAMINA, BODY_ZONE_HEAD) D.Knockdown(40) D.visible_message("[A] kicks [D] in the head, sending them face first into the floor!", \ "You are kicked in the head by [A], sending you crashing to the floor!", "You hear a sickening sound of flesh hitting flesh!", COMBAT_MESSAGE_RANGE, A) else if(!(D.mobility_flags & MOBILITY_STAND)) D.apply_damage(5, A.dna.species.attack_type, BODY_ZONE_HEAD) - D.apply_damage(40, A.dna.species.attack_type, BODY_ZONE_HEAD) + D.apply_damage(40, STAMINA, BODY_ZONE_HEAD) D.drop_all_held_items() D.visible_message("[A] kicks [D] in the head!", \ "You are kicked in the head by [A]!", "You hear a sickening sound of flesh hitting flesh!", COMBAT_MESSAGE_RANGE, A) From 587edddf8274b37ff1f743be7d5c80f45abe97f4 Mon Sep 17 00:00:00 2001 From: necromanceranne <40847847+necromanceranne@users.noreply.github.com> Date: Mon, 6 Apr 2020 19:42:07 +1000 Subject: [PATCH 4/4] yeeeeep Co-Authored-By: spookydonut --- code/datums/martial/sleeping_carp.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/martial/sleeping_carp.dm b/code/datums/martial/sleeping_carp.dm index 22216f2984c..0734aaaf31f 100644 --- a/code/datums/martial/sleeping_carp.dm +++ b/code/datums/martial/sleeping_carp.dm @@ -67,7 +67,7 @@ D.Knockdown(40) D.visible_message("[A] kicks [D] in the head, sending them face first into the floor!", \ "You are kicked in the head by [A], sending you crashing to the floor!", "You hear a sickening sound of flesh hitting flesh!", COMBAT_MESSAGE_RANGE, A) - else if(!(D.mobility_flags & MOBILITY_STAND)) + else D.apply_damage(5, A.dna.species.attack_type, BODY_ZONE_HEAD) D.apply_damage(40, STAMINA, BODY_ZONE_HEAD) D.drop_all_held_items()