diff --git a/code/modules/martial_arts/combos/sleeping_carp/crashing_kick.dm b/code/modules/martial_arts/combos/sleeping_carp/crashing_kick.dm index 80765922114..edd850baa1d 100644 --- a/code/modules/martial_arts/combos/sleeping_carp/crashing_kick.dm +++ b/code/modules/martial_arts/combos/sleeping_carp/crashing_kick.dm @@ -1,18 +1,15 @@ /datum/martial_combo/sleeping_carp/crashing_kick name = "Crashing Waves Kick" - steps = list(MARTIAL_COMBO_STEP_HARM, MARTIAL_COMBO_STEP_GRAB) - explaination_text = "Kicks the target square in the chest. Knocks down." + steps = list(MARTIAL_COMBO_STEP_HARM, MARTIAL_COMBO_STEP_DISARM) + explaination_text = "Kicks the target square in the chest, sending them flying." /datum/martial_combo/sleeping_carp/crashing_kick/perform_combo(mob/living/carbon/human/user, mob/living/target, datum/martial_art/MA) - if(!target.stat && !target.IsWeakened()) - user.do_attack_animation(target, ATTACK_EFFECT_KICK) - target.visible_message("[user] kicks [target] in the chest!", - "[user] kicks you in the chest, making you stumble and fall!") - step_to(target, get_step (target, target.dir), 1) - target.Weaken(4) - playsound(target, 'sound/weapons/punch1.ogg', 50, TRUE, -1) - add_attack_logs(user, target, "Melee attacked with martial-art [src] : Crashing Kick", ATKLOG_ALL) - if(prob(80)) - user.say(pick("SURRPRIZU!", "WOPAH!", "WATAAH", "ZOTA!", "SOLE STRIKE!")) - return MARTIAL_COMBO_DONE - return MARTIAL_COMBO_DONE_BASIC_HIT + user.do_attack_animation(target, ATTACK_EFFECT_KICK) + target.visible_message("[user] kicks [target] square in the chest, sending them flying!", + "You are kicked square in the chest by [user], sending you flying!",) + playsound(get_turf(target), 'sound/effects/hit_kick.ogg', 50, TRUE, -1) + var/atom/throw_target = get_edge_target_turf(target, user.dir) + target.throw_at(throw_target, 7, 14, user) + target.apply_damage(15, BRUTE, BODY_ZONE_CHEST) + add_attack_logs(user, target, "Melee attacked with martial-art [src] : Crashing Waves Kick", ATKLOG_ALL) + return MARTIAL_COMBO_DONE diff --git a/code/modules/martial_arts/combos/sleeping_carp/elbow_drop.dm b/code/modules/martial_arts/combos/sleeping_carp/elbow_drop.dm deleted file mode 100644 index 61dc8759f39..00000000000 --- a/code/modules/martial_arts/combos/sleeping_carp/elbow_drop.dm +++ /dev/null @@ -1,19 +0,0 @@ -/datum/martial_combo/sleeping_carp/elbow_drop - name = "Elbow Drop" - steps = list(MARTIAL_COMBO_STEP_HARM, MARTIAL_COMBO_STEP_DISARM, MARTIAL_COMBO_STEP_HARM, MARTIAL_COMBO_STEP_DISARM, MARTIAL_COMBO_STEP_HARM) - explaination_text = "Opponent must be on the ground. Deals huge damage, instantly kills anyone in critical condition." - -/datum/martial_combo/sleeping_carp/elbow_drop/perform_combo(mob/living/carbon/human/user, mob/living/target, datum/martial_art/MA) - if(target.IsWeakened() || target.resting || target.stat) - user.do_attack_animation(target, ATTACK_EFFECT_PUNCH) - target.visible_message("[user] elbow drops [target]!", \ - "[user] piledrives you with [user.p_their()] elbow!") - if(target.health <= 0) //so it actually checks for crit now - target.death() //FINISH HIM! - target.apply_damage(50, BRUTE, "chest") - playsound(get_turf(target), 'sound/weapons/punch1.ogg', 75, 1, -1) - add_attack_logs(user, target, "Melee attacked with martial-art [src] : Elbow Drop", ATKLOG_ALL) - if(prob(80)) - user.say(pick("BANZAIII!", "KIYAAAA!", "OMAE WA MOU SHINDEIRU!", "YOU CAN'T SEE ME!", "MY TIME IS NOW!", "COWABUNGA")) - return MARTIAL_COMBO_DONE - return MARTIAL_COMBO_DONE_BASIC_HIT diff --git a/code/modules/martial_arts/combos/sleeping_carp/gnashing_teeth.dm b/code/modules/martial_arts/combos/sleeping_carp/gnashing_teeth.dm new file mode 100644 index 00000000000..e1a95f2ba35 --- /dev/null +++ b/code/modules/martial_arts/combos/sleeping_carp/gnashing_teeth.dm @@ -0,0 +1,18 @@ +/datum/martial_combo/sleeping_carp/gnashing_teeth + name = "Gnashing Teeth" + steps = list(MARTIAL_COMBO_STEP_HARM, MARTIAL_COMBO_STEP_HARM) + explaination_text = "Every second, concequtive, punch will deal extra damage and you will shout to send fear into your opponents heart" + +/datum/martial_combo/sleeping_carp/gnashing_teeth/perform_combo(mob/living/carbon/human/user, mob/living/target, datum/martial_art/MA) + user.do_attack_animation(target, ATTACK_EFFECT_PUNCH) + var/atk_verb = pick("precisely kick", "brutally chop", "cleanly hit", "viciously slam") + target.visible_message("[user] [atk_verb]s [target]!", + "[user] [atk_verb]s you!") + playsound(get_turf(target), 'sound/weapons/punch1.ogg', 35, TRUE, -1) + add_attack_logs(user, target, "Melee attacked with martial-art [src] : Gnashing Teeth", ATKLOG_ALL) + target.apply_damage(20, BRUTE) + if(target.stat) + user.say(pick("HUAH!", "HYA!", "CHOO!", "WUO!", "KYA!", "HUH!", "HIYOH!", "CARP STRIKE!", "CARP BITE!")) + else + user.say(pick("BANZAIII!", "KIYAAAA!", "OMAE WA MOU SHINDEIRU!", "YOU CAN'T SEE ME!", "MY TIME IS NOW!", "COWABUNGA")) // COWABUNGA + return MARTIAL_COMBO_DONE diff --git a/code/modules/martial_arts/combos/sleeping_carp/head_kick.dm b/code/modules/martial_arts/combos/sleeping_carp/head_kick.dm deleted file mode 100644 index b45e10e73ce..00000000000 --- a/code/modules/martial_arts/combos/sleeping_carp/head_kick.dm +++ /dev/null @@ -1,19 +0,0 @@ -/datum/martial_combo/sleeping_carp/head_kick - name = "Head Kick" - steps = list(MARTIAL_COMBO_STEP_DISARM, MARTIAL_COMBO_STEP_HARM, MARTIAL_COMBO_STEP_HARM) - explaination_text = "Decent damage, forces opponent to drop item in hand." - -/datum/martial_combo/sleeping_carp/head_kick/perform_combo(mob/living/carbon/human/user, mob/living/target, datum/martial_art/MA) - if(!target.stat && !target.IsWeakened()) - user.do_attack_animation(target, ATTACK_EFFECT_KICK) - target.visible_message("[user] kicks [target] in the head!", \ - "[user] kicks you in the jaw!") - target.apply_damage(20, BRUTE, "head") - target.drop_item() - playsound(get_turf(target), 'sound/weapons/punch1.ogg', 50, 1, -1) - add_attack_logs(user, target, "Melee attacked with martial-art [src] : Head Kick", ATKLOG_ALL) - if(prob(60)) - user.say(pick("OOHYOO!", "OOPYAH!", "HYOOAA!", "WOOAAA!", "SHURYUKICK!", "HIYAH!")) - target.Stun(4) - return MARTIAL_COMBO_DONE - return MARTIAL_COMBO_DONE_BASIC_HIT diff --git a/code/modules/martial_arts/combos/sleeping_carp/kneehaul.dm b/code/modules/martial_arts/combos/sleeping_carp/kneehaul.dm new file mode 100644 index 00000000000..27791aa0796 --- /dev/null +++ b/code/modules/martial_arts/combos/sleeping_carp/kneehaul.dm @@ -0,0 +1,15 @@ +/datum/martial_combo/sleeping_carp/kneehaul + name = "Kneehaul" + steps = list(MARTIAL_COMBO_STEP_HARM, MARTIAL_COMBO_STEP_GRAB) + explaination_text = "Kick an opponent to the floor, knocking them down and dealing stamina damage to them! " + +/datum/martial_combo/sleeping_carp/kneehaul/perform_combo(mob/living/carbon/human/user, mob/living/target, datum/martial_art/MA) + user.do_attack_animation(target, ATTACK_EFFECT_KICK) + playsound(get_turf(target), 'sound/effects/hit_kick.ogg', 50, TRUE, -1) + target.apply_damage(10, BRUTE, BODY_ZONE_HEAD) + target.apply_damage(40, STAMINA) + target.Weaken(2) + target.visible_message("[user] kicks [target] in the head, sending them face first into the floor!", + "You are kicked in the head by [user], sending you crashing to the floor!",) + add_attack_logs(user, target, "Melee attacked with martial-art [src] : Kneehaul", ATKLOG_ALL) + return MARTIAL_COMBO_DONE diff --git a/code/modules/martial_arts/combos/sleeping_carp/stomach_knee.dm b/code/modules/martial_arts/combos/sleeping_carp/stomach_knee.dm deleted file mode 100644 index b3fbd1cfaab..00000000000 --- a/code/modules/martial_arts/combos/sleeping_carp/stomach_knee.dm +++ /dev/null @@ -1,20 +0,0 @@ -/datum/martial_combo/sleeping_carp/stomach_knee - name = "Stomach Knee" - steps = list(MARTIAL_COMBO_STEP_GRAB, MARTIAL_COMBO_STEP_HARM) - explaination_text = "Knocks the wind out of opponent and stuns." - combo_text_override = "Grab, switch hands, Harm" - -/datum/martial_combo/sleeping_carp/stomach_knee/perform_combo(mob/living/carbon/human/user, mob/living/target, datum/martial_art/MA) - if(!target.stat && !target.IsWeakened()) - user.do_attack_animation(target, ATTACK_EFFECT_KICK) - target.visible_message("[user] knees [target] in the stomach!", \ - "[user] winds you with a knee in the stomach!") - target.audible_message("[target] gags!") - target.AdjustLoseBreath(4) - target.Stun(2) - playsound(get_turf(target), 'sound/weapons/punch1.ogg', 50, 1, -1) - add_attack_logs(user, target, "Melee attacked with martial-art [src] : Stomach Knee", ATKLOG_ALL) - if(prob(80)) - user.say(pick("HWOP!", "KUH!", "YAKUUH!", "KYUH!", "KNEESTRIKE!")) - return MARTIAL_COMBO_DONE - return MARTIAL_COMBO_DONE_BASIC_HIT diff --git a/code/modules/martial_arts/combos/sleeping_carp/wrist_wrench.dm b/code/modules/martial_arts/combos/sleeping_carp/wrist_wrench.dm deleted file mode 100644 index 38c21e7309e..00000000000 --- a/code/modules/martial_arts/combos/sleeping_carp/wrist_wrench.dm +++ /dev/null @@ -1,20 +0,0 @@ -/datum/martial_combo/sleeping_carp/wrist_wrench - name = "Wrist Wrench" - steps = list(MARTIAL_COMBO_STEP_DISARM, MARTIAL_COMBO_STEP_DISARM) - explaination_text = "Forces opponent to drop item in hand." - -/datum/martial_combo/sleeping_carp/wrist_wrench/perform_combo(mob/living/carbon/human/user, mob/living/target, datum/martial_art/MA) - if(!target.stat && !target.stunned && !target.IsWeakened()) - user.do_attack_animation(target, ATTACK_EFFECT_PUNCH) - target.visible_message("[user] grabs [target]'s wrist and wrenches it sideways!", \ - "[user] grabs your wrist and violently wrenches it to the side!") - playsound(get_turf(user), 'sound/weapons/thudswoosh.ogg', 50, 1, -1) - add_attack_logs(user, target, "Melee attacked with martial-art [src] : Wrist Wrench", ATKLOG_ALL) - if(prob(60)) - user.say(pick("WRISTY TWIRLY!", "WE FIGHT LIKE MEN!", "YOU DISHONOR YOURSELF!", "POHYAH!", "WHERE IS YOUR BATON NOW?", "SAY UNCLE!")) - target.emote("scream") - target.drop_item() - target.apply_damage(5, BRUTE, pick("l_arm", "r_arm")) - target.Stun(3) - return MARTIAL_COMBO_DONE - return MARTIAL_COMBO_DONE_BASIC_HIT diff --git a/code/modules/martial_arts/sleeping_carp.dm b/code/modules/martial_arts/sleeping_carp.dm index 59bfcef6bbe..3d3e5e8b135 100644 --- a/code/modules/martial_arts/sleeping_carp.dm +++ b/code/modules/martial_arts/sleeping_carp.dm @@ -6,7 +6,7 @@ no_guns = TRUE no_guns_message = "Use of ranged weaponry would bring dishonor to the clan." has_explaination_verb = TRUE - combos = list(/datum/martial_combo/sleeping_carp/wrist_wrench, /datum/martial_combo/sleeping_carp/crashing_kick, /datum/martial_combo/sleeping_carp/stomach_knee, /datum/martial_combo/sleeping_carp/head_kick, /datum/martial_combo/sleeping_carp/elbow_drop) + combos = list(/datum/martial_combo/sleeping_carp/crashing_kick, /datum/martial_combo/sleeping_carp/kneehaul, /datum/martial_combo/sleeping_carp/gnashing_teeth) /datum/martial_art/the_sleeping_carp/grab_act(mob/living/carbon/human/A, mob/living/carbon/human/D) MARTIAL_ARTS_ACT_CHECK @@ -19,16 +19,19 @@ MARTIAL_ARTS_ACT_CHECK A.do_attack_animation(D, ATTACK_EFFECT_PUNCH) var/atk_verb = pick("punches", "kicks", "chops", "hits", "slams") - D.visible_message("[A] [atk_verb] [D]!", \ + D.visible_message("[A] [atk_verb] [D]!", "[A] [atk_verb] you!") D.apply_damage(rand(10,15), BRUTE) - playsound(get_turf(D), 'sound/weapons/punch1.ogg', 25, 1, -1) - if(prob(50)) - A.say(pick("HUAH!", "HYA!", "CHOO!", "WUO!", "KYA!", "HUH!", "HIYOH!", "CARP STRIKE!", "CARP BITE!")) - if(prob(D.getBruteLoss()) && !D.lying) - D.visible_message("[D] stumbles and falls!", "The blow sends you to the ground!") - D.Weaken(4) + playsound(get_turf(D), 'sound/weapons/punch1.ogg', 25, TRUE, -1) return TRUE /datum/martial_art/the_sleeping_carp/explaination_header(user) to_chat(usr, "You retreat inward and recall the teachings of the Sleeping Carp...") + +/datum/martial_art/the_sleeping_carp/teach(mob/living/carbon/human/H, make_temporary) + . = ..() + H.faction |= "carp"// :D + +/datum/martial_art/the_sleeping_carp/remove(mob/living/carbon/human/H) + . = ..() + H.faction -= "carp"// :C diff --git a/paradise.dme b/paradise.dme index c77c887ccf7..f9d0e893bbd 100644 --- a/paradise.dme +++ b/paradise.dme @@ -1705,10 +1705,8 @@ #include "code\modules\martial_arts\combos\plasma_fist\throwback.dm" #include "code\modules\martial_arts\combos\plasma_fist\tornado_sweep.dm" #include "code\modules\martial_arts\combos\sleeping_carp\crashing_kick.dm" -#include "code\modules\martial_arts\combos\sleeping_carp\elbow_drop.dm" -#include "code\modules\martial_arts\combos\sleeping_carp\head_kick.dm" -#include "code\modules\martial_arts\combos\sleeping_carp\stomach_knee.dm" -#include "code\modules\martial_arts\combos\sleeping_carp\wrist_wrench.dm" +#include "code\modules\martial_arts\combos\sleeping_carp\kneehaul.dm" +#include "code\modules\martial_arts\combos\sleeping_carp\gnashing_teeth.dm" #include "code\modules\maze_generation\maze_generator.dm" #include "code\modules\maze_generation\maze_generator_blockwise.dm" #include "code\modules\maze_generation\maze_helper_atoms.dm"