From 0da6c99dc86e9ea57a283ceb82f10d2f81a0179e Mon Sep 17 00:00:00 2001
From: Viz <107632879+Inadvizable@users.noreply.github.com>
Date: Tue, 19 Jul 2022 13:01:29 +0200
Subject: [PATCH] Rebalances Krav Maga for Stamina Combat (#18404)

* STOMPS YOU STOMPS YOU STOMPS YOU

* i forgor
---
 code/modules/martial_arts/combos/krav_maga/leg_sweep.dm  | 4 ++--
 code/modules/martial_arts/combos/krav_maga/lung_punch.dm | 4 ++--
 code/modules/martial_arts/krav_maga.dm                   | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/code/modules/martial_arts/combos/krav_maga/leg_sweep.dm b/code/modules/martial_arts/combos/krav_maga/leg_sweep.dm
index 8f64719b7a4..3b285379595 100644
--- a/code/modules/martial_arts/combos/krav_maga/leg_sweep.dm
+++ b/code/modules/martial_arts/combos/krav_maga/leg_sweep.dm
@@ -1,6 +1,6 @@
 /datum/martial_combo/krav_maga/leg_sweep
 	name = "Leg Sweep"
-	explaination_text = "Trips the victim, rendering them prone and unable to move for a short time."
+	explaination_text = "Trips the victim, rendering them prone for a short time."
 
 /datum/martial_combo/krav_maga/leg_sweep/perform_combo(mob/living/carbon/human/user, mob/living/target, datum/martial_art/MA)
 	if(target.stat || target.IsWeakened())
@@ -16,7 +16,7 @@
 					  	"<span class='userdanger'>[user] leg sweeps you!</span>")
 	playsound(get_turf(user), 'sound/effects/hit_kick.ogg', 50, 1, -1)
 	target.apply_damage(5, BRUTE)
-	target.Weaken(4 SECONDS)
+	target.KnockDown(4 SECONDS)
 	add_attack_logs(user, target, "Melee attacked with martial-art [src] :  Leg Sweep", ATKLOG_ALL)
 	user.mind.martial_art.in_stance = FALSE
 	return MARTIAL_COMBO_DONE_CLEAR_COMBOS
diff --git a/code/modules/martial_arts/combos/krav_maga/lung_punch.dm b/code/modules/martial_arts/combos/krav_maga/lung_punch.dm
index cbfb7062ad1..bc545546f95 100644
--- a/code/modules/martial_arts/combos/krav_maga/lung_punch.dm
+++ b/code/modules/martial_arts/combos/krav_maga/lung_punch.dm
@@ -1,6 +1,6 @@
 /datum/martial_combo/krav_maga/lung_punch
 	name = "Lung Punch"
-	explaination_text = "Delivers a strong punch just above the victim's abdomen, constraining the lungs. The victim will be unable to breathe for a short time."
+	explaination_text = "Delivers a strong punch just above the victim's abdomen, constraining the lungs. The victim will be unable to breathe for a short time, and can be incapacitated with a few more punches."
 
 /datum/martial_combo/krav_maga/lung_punch/perform_combo(mob/living/carbon/human/user, mob/living/target, datum/martial_art/MA)
 	user.do_attack_animation(target, ATTACK_EFFECT_PUNCH)
@@ -8,7 +8,7 @@
 				  	"<span class='userdanger'>[user] slams your chest! You can't breathe!</span>")
 	playsound(get_turf(user), 'sound/effects/hit_punch.ogg', 50, 1, -1)
 	target.AdjustLoseBreath(10 SECONDS)
-	target.adjustOxyLoss(10)
+	target.adjustStaminaLoss(30)
 	add_attack_logs(user, target, "Melee attacked with martial-art [src] :  Lung Punch", ATKLOG_ALL)
 	user.mind.martial_art.in_stance = FALSE
 	return MARTIAL_COMBO_DONE_CLEAR_COMBOS
diff --git a/code/modules/martial_arts/krav_maga.dm b/code/modules/martial_arts/krav_maga.dm
index 7c3411d99e5..f184a4fa40a 100644
--- a/code/modules/martial_arts/krav_maga.dm
+++ b/code/modules/martial_arts/krav_maga.dm
@@ -94,7 +94,7 @@
 	add_attack_logs(A, D, "Melee attacked with [src]")
 	var/picked_hit_type = pick("punches", "kicks")
 	var/bonus_damage = 10
-	if(D.IsWeakened() || IS_HORIZONTAL(D))
+	if(IS_HORIZONTAL(D))
 		bonus_damage += 5
 		picked_hit_type = "stomps on"
 	D.apply_damage(bonus_damage, BRUTE)