Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rebalances Krav Maga for Stamina Combat #18404

Merged
merged 2 commits into from
Jul 19, 2022
Merged

Rebalances Krav Maga for Stamina Combat #18404

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aa935e6
STOMPS YOU STOMPS YOU STOMPS YOU
Inadvizable Jul 16, 2022
abfea4c
i forgor
Inadvizable Jul 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions code/modules/martial_arts/combos/krav_maga/leg_sweep.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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())
Expand All @@ -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
4 changes: 2 additions & 2 deletions code/modules/martial_arts/combos/krav_maga/lung_punch.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
/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)
target.visible_message("<span class='warning'>[user] pounds [target] on the chest!</span>", \
"<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
2 changes: 1 addition & 1 deletion code/modules/martial_arts/krav_maga.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down