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

Jump to bottom

Tweaks lightning flow #22275

Merged
merged 3 commits into from
Jul 5, 2024
Merged

Tweaks lightning flow #22275

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dfa7961
Update lightning_flow.dm
Moltijoe Jul 2, 2024
f43f0c6
Update lightning_flow.dm
Moltijoe Jul 3, 2024
94d5cd2
Update lightning_flow.dm
Moltijoe Jul 4, 2024
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
25 changes: 17 additions & 8 deletions code/datums/martial/lightning_flow.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,17 @@
/datum/martial_art/lightning_flow/harm_act(mob/living/carbon/human/A, mob/living/carbon/human/D)
if(dashing)
return TRUE
damage(D, A, 5, zone=A.zone_selected)
damage(D, A, 5, A.zone_selected)
return FALSE

/datum/martial_art/lightning_flow/proc/damage(mob/living/target, mob/living/carbon/human/user, amount = 5, stun = FALSE, zone = null)
target.electrocute_act(amount, user, stun = stun, zone = zone)
/datum/martial_art/lightning_flow/proc/damage(mob/living/target, mob/living/carbon/human/user, amount = 5, zone = null)
var/electric_armour = target.run_armor_check(zone, ELECTRIC)
var/melee_armour = target.run_armor_check(zone, MELEE)
var/final_armour = (electric_armour + melee_armour) / 2
target.apply_damage(amount, BURN, zone, final_armour)
if(ishuman(target))
var/mob/living/carbon/human/flicker = target
flicker.electrocution_animation(4 SECONDS)

/datum/martial_art/lightning_flow/proc/on_click(mob/living/carbon/human/H, atom/target, params)
var/list/modifiers = params2list(params)
Expand Down Expand Up @@ -91,7 +97,6 @@
var/mob/living/carbon/human/victim = target
if(victim.check_shields(src, 0, "[H]", attack_type = LEAP_ATTACK))
return FALSE
H.SetKnockdown(0) //remove the self knockdown from the dropkick
dropkick(target, H, throwingdatum)
else if(action_modifiers[CTRL_CLICK])
target.grabbedby(H)
Expand All @@ -105,13 +110,17 @@
/////////////////////////////////////////////////////////////////
/datum/martial_art/lightning_flow/proc/dropkick(mob/living/target, mob/living/carbon/human/H, datum/thrownthing/throwingdatum)
target.visible_message(span_danger("[H] dropkicks [target]!"), span_userdanger("[H] dropkicks you!"))
do_sparks(4, FALSE, target)

target.Knockdown(5 SECONDS)
damage(target, H, 15, TRUE, BODY_ZONE_CHEST)
H.SetKnockdown(0) //remove the self knockdown from the dropkick
H.set_resting(FALSE)
damage(target, H, 15, BODY_ZONE_CHEST)

var/destination = throwingdatum.target
if(get_dist(target, destination) < 5)
destination = get_ranged_target_turf(get_turf(H), throwingdatum.init_dir, 5)
target.throw_at(destination, 5, 3, H)
do_sparks(4, FALSE, target)

/////////////////////////////////////////////////////////////////
//-----------------training related section--------------------//
Expand All @@ -138,15 +147,15 @@
var/mob/living/carbon/human/user = H
user.physiology.punchdamagelow_bonus += 5
user.physiology.punchdamagehigh_bonus += 5
user.physiology.punchstunthreshold_bonus += 5
user.physiology.punchstunthreshold_bonus += 6 //no knockdowns

/datum/martial_art/lightning_flow/on_remove(mob/living/carbon/human/H)
UnregisterSignal(H, COMSIG_MOB_CLICKON)
if(ishuman(H))//it's already a human, but it won't let me access physiology for some reason
var/mob/living/carbon/human/user = H
user.physiology.punchdamagelow_bonus -= 5
user.physiology.punchdamagehigh_bonus -= 5
user.physiology.punchstunthreshold_bonus -= 5
user.physiology.punchstunthreshold_bonus -= 6
return ..()

#undef ACTION_DELAY
Expand Down
Loading