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

Oppressor XvX nerf #4981

Merged
merged 6 commits into from
Nov 22, 2023
Merged

Oppressor XvX nerf #4981

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
119dc22
init
ihatethisengine Nov 20, 2023
8713666
no 1 letter vars
ihatethisengine Nov 20, 2023
c8d995e
LOL
ihatethisengine Nov 20, 2023
8fd163e
no 2 letter vars
ihatethisengine Nov 20, 2023
19eed64
next time use case sensitive
ihatethisengine Nov 20, 2023
19a62b7
a
ihatethisengine Nov 20, 2023
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
120 changes: 60 additions & 60 deletions code/modules/mob/living/carbon/xenomorph/abilities/praetorian/praetorian_powers.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,16 +234,16 @@
xeno_attack_delay(stabbing_xeno)
return ..()

/datum/action/xeno_action/activable/prae_abduct/use_ability(atom/A)
var/mob/living/carbon/xenomorph/X = owner
/datum/action/xeno_action/activable/prae_abduct/use_ability(atom/atom)
var/mob/living/carbon/xenomorph/xeno = owner

if(!A || A.layer >= FLY_LAYER || !isturf(X.loc))
if(!atom || atom.layer >= FLY_LAYER || !isturf(xeno.loc))
return

if(!action_cooldown_check() || X.action_busy)
if(!action_cooldown_check() || xeno.action_busy)
return

if(!X.check_state())
if(!xeno.check_state())
return

if(!check_plasma_owner())
Expand All @@ -252,11 +252,11 @@
// Build our turflist
var/list/turf/turflist = list()
var/list/telegraph_atom_list = list()
var/facing = get_dir(X, A)
var/turf/T = X.loc
var/turf/temp = X.loc
for(var/x in 0 to max_distance)
temp = get_step(T, facing)
var/facing = get_dir(xeno, atom)
var/turf/turf = xeno.loc
var/turf/temp = xeno.loc
for(var/distance in 0 to max_distance)
temp = get_step(turf, facing)
if(facing in diagonals) // check if it goes through corners
var/reverse_face = reverse_dir[facing]
var/turf/back_left = get_step(temp, turn(reverse_face, 45))
Expand All @@ -267,103 +267,103 @@
break

var/blocked = FALSE
for(var/obj/structure/S in temp)
if(S.opacity || ((istype(S, /obj/structure/barricade) || istype(S, /obj/structure/girder) && S.density || istype(S, /obj/structure/machinery/door)) && S.density))
for(var/obj/structure/structure in temp)
if(structure.opacity || ((istype(structure, /obj/structure/barricade) || istype(structure, /obj/structure/girder) && structure.density || istype(structure, /obj/structure/machinery/door)) && structure.density))
blocked = TRUE
break
if(blocked)
break

T = temp
turf = temp

if (T in turflist)
if (turf in turflist)
break

turflist += T
facing = get_dir(T, A)
telegraph_atom_list += new /obj/effect/xenomorph/xeno_telegraph/brown/abduct_hook(T, windup)
turflist += turf
facing = get_dir(turf, atom)
telegraph_atom_list += new /obj/effect/xenomorph/xeno_telegraph/brown/abduct_hook(turf, windup)

if(!length(turflist))
to_chat(X, SPAN_XENOWARNING("You don't have any room to do your abduction!"))
to_chat(xeno, SPAN_XENOWARNING("You don't have any room to do your abduction!"))
return

X.visible_message(SPAN_XENODANGER("\The [X]'s segmented tail starts coiling..."), SPAN_XENODANGER("You begin coiling your tail, aiming towards \the [A]..."))
X.emote("roar")
xeno.visible_message(SPAN_XENODANGER("\The [xeno]'s segmented tail starts coiling..."), SPAN_XENODANGER("You begin coiling your tail, aiming towards \the [atom]..."))
xeno.emote("roar")

var/throw_target_turf = get_step(X.loc, facing)
var/throw_target_turf = get_step(xeno.loc, facing)

ADD_TRAIT(X, TRAIT_IMMOBILIZED, TRAIT_SOURCE_ABILITY("Abduct"))
X.update_canmove()
if(!do_after(X, windup, INTERRUPT_NO_NEEDHAND, BUSY_ICON_HOSTILE, numticks = 1))
to_chat(X, SPAN_XENOWARNING("You relax your tail."))
ADD_TRAIT(xeno, TRAIT_IMMOBILIZED, TRAIT_SOURCE_ABILITY("Abduct"))
xeno.update_canmove()
if(!do_after(xeno, windup, INTERRUPT_NO_NEEDHAND, BUSY_ICON_HOSTILE, numticks = 1))
to_chat(xeno, SPAN_XENOWARNING("You relax your tail."))
apply_cooldown()

for (var/obj/effect/xenomorph/xeno_telegraph/XT in telegraph_atom_list)
telegraph_atom_list -= XT
qdel(XT)
for (var/obj/effect/xenomorph/xeno_telegraph/xenotelegraph in telegraph_atom_list)
telegraph_atom_list -= xenotelegraph
qdel(xenotelegraph)

REMOVE_TRAIT(X, TRAIT_IMMOBILIZED, TRAIT_SOURCE_ABILITY("Abduct"))
X.update_canmove()
REMOVE_TRAIT(xeno, TRAIT_IMMOBILIZED, TRAIT_SOURCE_ABILITY("Abduct"))
xeno.update_canmove()

return

if(!check_and_use_plasma_owner())
return

REMOVE_TRAIT(X, TRAIT_IMMOBILIZED, TRAIT_SOURCE_ABILITY("Abduct"))
X.update_canmove()
REMOVE_TRAIT(xeno, TRAIT_IMMOBILIZED, TRAIT_SOURCE_ABILITY("Abduct"))
xeno.update_canmove()

playsound(get_turf(X), 'sound/effects/bang.ogg', 25, 0)
X.visible_message(SPAN_XENODANGER("\The [X] suddenly uncoils its tail, firing it towards [A]!"), SPAN_XENODANGER("You uncoil your tail, sending it out towards \the [A]!"))
playsound(get_turf(xeno), 'sound/effects/bang.ogg', 25, 0)
xeno.visible_message(SPAN_XENODANGER("\The [xeno] suddenly uncoils its tail, firing it towards [atom]!"), SPAN_XENODANGER("You uncoil your tail, sending it out towards \the [atom]!"))

var/list/targets = list()
for (var/turf/target_turf in turflist)
for (var/mob/living/carbon/H in target_turf)
if(!isxeno_human(H) || X.can_not_harm(H) || H.is_dead() || H.is_mob_incapacitated(TRUE))
for (var/mob/living/carbon/target in target_turf)
if(!isxeno_human(target) || xeno.can_not_harm(target) || target.is_dead() || target.is_mob_incapacitated(TRUE) || target.mob_size >= MOB_SIZE_BIG)
continue

targets += H
targets += target
if (LAZYLEN(targets) == 1)
X.balloon_alert(X, "your tail catches and slows one target!", text_color = "#51a16c")
xeno.balloon_alert(xeno, "your tail catches and slows one target!", text_color = "#51a16c")
else if (LAZYLEN(targets) == 2)
X.balloon_alert(X, "your tail catches and roots two targets!", text_color = "#51a16c")
xeno.balloon_alert(xeno, "your tail catches and roots two targets!", text_color = "#51a16c")
else if (LAZYLEN(targets) >= 3)
X.balloon_alert(X, "your tail catches and stuns [LAZYLEN(targets)] targets!", text_color = "#51a16c")
xeno.balloon_alert(xeno, "your tail catches and stuns [LAZYLEN(targets)] targets!", text_color = "#51a16c")

for (var/mob/living/carbon/H in targets)
X.visible_message(SPAN_XENODANGER("\The [X]'s hooked tail coils itself around [H]!"), SPAN_XENODANGER("Your hooked tail coils itself around [H]!"))
for (var/mob/living/carbon/target in targets)
xeno.visible_message(SPAN_XENODANGER("\The [xeno]'s hooked tail coils itself around [target]!"), SPAN_XENODANGER("Your hooked tail coils itself around [target]!"))

H.apply_effect(0.2, WEAKEN)
target.apply_effect(0.2, WEAKEN)

if (LAZYLEN(targets) == 1)
new /datum/effects/xeno_slow(H, X, , ,25)
H.apply_effect(1, SLOW)
new /datum/effects/xeno_slow(target, xeno, , ,25)
target.apply_effect(1, SLOW)
else if (LAZYLEN(targets) == 2)

ADD_TRAIT(H, TRAIT_IMMOBILIZED, TRAIT_SOURCE_ABILITY("Abduct"))
H.update_canmove()
if (ishuman(H))
var/mob/living/carbon/human/Hu = H
Hu.update_xeno_hostile_hud()
addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(unroot_human), H), get_xeno_stun_duration(H, 25))
to_chat(H, SPAN_XENOHIGHDANGER("[X] has pinned you to the ground! You cannot move!"))
ADD_TRAIT(target, TRAIT_IMMOBILIZED, TRAIT_SOURCE_ABILITY("Abduct"))
target.update_canmove()
if (ishuman(target))
var/mob/living/carbon/human/human = target
human.update_xeno_hostile_hud()
addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(unroot_human), target), get_xeno_stun_duration(target, 25))
to_chat(target, SPAN_XENOHIGHDANGER("[xeno] has pinned you to the ground! You cannot move!"))

H.set_effect(2, DAZE)
target.set_effect(2, DAZE)
else if (LAZYLEN(targets) >= 3)
H.apply_effect(get_xeno_stun_duration(H, 1.3), WEAKEN)
to_chat(H, SPAN_XENOHIGHDANGER("You are slammed into the other victims of [X]!"))
target.apply_effect(get_xeno_stun_duration(target, 1.3), WEAKEN)
to_chat(target, SPAN_XENOHIGHDANGER("You are slammed into the other victims of [xeno]!"))


shake_camera(H, 10, 1)
shake_camera(target, 10, 1)

var/obj/effect/beam/tail_beam = X.beam(H, "oppressor_tail", 'icons/effects/beam.dmi', 0.5 SECONDS, 8)
var/obj/effect/beam/tail_beam = xeno.beam(target, "oppressor_tail", 'icons/effects/beam.dmi', 0.5 SECONDS, 8)
var/image/tail_image = image('icons/effects/status_effects.dmi', "hooked")
H.overlays += tail_image
target.overlays += tail_image

H.throw_atom(throw_target_turf, get_dist(throw_target_turf, H)-1, SPEED_VERY_FAST)
target.throw_atom(throw_target_turf, get_dist(throw_target_turf, target)-1, SPEED_VERY_FAST)

qdel(tail_beam) // hook beam catches target, throws them back, is deleted (throw_atom has sleeps), then hook beam catches another target, repeat
addtimer(CALLBACK(src, /datum/action/xeno_action/activable/prae_abduct/proc/remove_tail_overlay, H, tail_image), 0.5 SECONDS) //needed so it can actually be seen as it gets deleted too quickly otherwise.
addtimer(CALLBACK(src, /datum/action/xeno_action/activable/prae_abduct/proc/remove_tail_overlay, target, tail_image), 0.5 SECONDS) //needed so it can actually be seen as it gets deleted too quickly otherwise.

apply_cooldown()
return ..()
Expand Down