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

Vampire Lurker Changes (TailStab/Armour/Speed) #6597

Closed
wants to merge 2 commits into from
Closed

Vampire Lurker Changes (TailStab/Armour/Speed) #6597

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
a86a0c5
ChangeGalore
Jun 30, 2024
a135f29
DescUpdate
Jun 30, 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
23 changes: 9 additions & 14 deletions code/modules/mob/living/carbon/xenomorph/abilities/lurker/lurker_powers.dm
View file
Open in desktop
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Keep existing behavior for a non-sprite click, otherwise apply WEAKEN for sprite click

Original file line number Diff line number Diff line change
Expand Up @@ -267,10 +267,10 @@

if(iscarbon(hit_target) && !xeno.can_not_harm(hit_target) && hit_target.stat != DEAD)
if(targeted_atom == hit_target) //reward for a direct hit
to_chat(xeno, SPAN_XENOHIGHDANGER("We attack [hit_target], with our tail, piercing their body!"))
to_chat(xeno, SPAN_XENOHIGHDANGER("We directly slam [hit_target] with our tail, throwing it back after impaling it on our tail!"))
hit_target.apply_armoured_damage(15, ARMOR_MELEE, BRUTE, "chest")
else
to_chat(xeno, SPAN_XENODANGER("We attack [hit_target], slashing them with our tail!"))
to_chat(xeno, SPAN_XENODANGER("We attack [hit_target] with our tail, throwing it back after stabbing it with our tail!"))
else
xeno.visible_message(SPAN_XENOWARNING("\The [xeno] swipes their tail through the air!"), SPAN_XENOWARNING("We swipe our tail through the air!"))
apply_cooldown(cooldown_modifier = 0.2)
Expand All @@ -282,18 +282,9 @@

stab_direction = turn(get_dir(xeno, targeted_atom), 180)
playsound(hit_target,'sound/weapons/alien_tail_attack.ogg', 50, TRUE)
if(hit_target.mob_size < MOB_SIZE_BIG)
step_away(hit_target, xeno)

var/direction = Get_Compass_Dir(xeno, targeted_atom) //More precise than get_dir.

if(!step(hit_target, direction))
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should only enter this block if hit_target.mob_size < MOB_SIZE_BIG and if not just slow them. (meaning the else slow should be tabbed out 1 level)

playsound(hit_target.loc, "punch", 25, 1)
hit_target.visible_message(SPAN_DANGER("[hit_target] slams into an obstacle!"),
isxeno(hit_target) ? SPAN_XENODANGER("We slam into an obstacle!") : SPAN_HIGHDANGER("You slam into an obstacle!"), null, 4, CHAT_TYPE_TAKING_HIT)
hit_target.apply_damage(MELEE_FORCE_TIER_2)
if (hit_target.mob_size < MOB_SIZE_BIG)
hit_target.KnockDown(0.5)
else
hit_target.Slow(0.5)
/// To reset the direction if they haven't moved since then in below callback.
var/last_dir = xeno.dir

Expand All @@ -305,7 +296,11 @@
addtimer(CALLBACK(src, PROC_REF(reset_direction), xeno, last_dir, new_dir), 0.5 SECONDS)

hit_target.apply_armoured_damage(get_xeno_damage_slash(hit_target, xeno.caste.melee_damage_upper), ARMOR_MELEE, BRUTE, "chest")
hit_target.Slow(0.5)

if(hit_target.mob_size < MOB_SIZE_BIG)
hit_target.apply_effect(0.5, WEAKEN)
else
hit_target.apply_effect(0.5, SLOW)

hit_target.last_damage_data = create_cause_data(xeno.caste_type, xeno)
log_attack("[key_name(xeno)] attacked [key_name(hit_target)] with Tail Jab")
Expand Down
5 changes: 2 additions & 3 deletions code/modules/mob/living/carbon/xenomorph/strains/castes/lurker/vampire.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/datum/xeno_strain/vampire
name = LURKER_VAMPIRE
description = "You lose all of your abilities and you forefeit a chunk of your health and damage in exchange for a large amount of armor, a little bit of movement speed, increased attack speed, and brand new abilities that make you an assassin. Rush on your opponent to disorient them and Flurry to unleash a forward cleave that can hit and slow three talls and heal you for every tall you hit. Use your special AoE Tail Jab to knock talls away, doing more damage with direct hits and even more damage and a stun if they smack into walls. Finally, execute unconscious talls with a headbite to heal your wounds."
description = "You lose all of your abilities and you forefeit a chunk of your health and damage in exchange for a small amount of armor, increased attack speed, and brand new abilities that make you an assassin. Rush on your opponent to disorient them and Flurry to unleash a forward cleave that can hit and slow three talls and heal you for every tall you hit. Use your special AoE Tail Jab to knock away talls and stun them, doing more damage with direct hits. Finally, execute unconscious talls with a headbite to heal your wounds."
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what about the tail jab is aoe?

flavor_description = "Show no mercy! Slaughter them all!"
icon_state_prefix = "Vampire"

Expand All @@ -20,8 +20,7 @@
/datum/xeno_strain/vampire/apply_strain(mob/living/carbon/xenomorph/lurker/lurker)
lurker.plasmapool_modifier = 0
lurker.health_modifier -= XENO_HEALTH_MOD_MED
lurker.speed_modifier += XENO_SPEED_FASTMOD_TIER_1
lurker.armor_modifier += XENO_ARMOR_MOD_LARGE
lurker.armor_modifier += XENO_ARMOR_MOD_SMALL
Comment on lines -24 to +23
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm skeptical this needs to change, especially with proposed changes.

lurker.damage_modifier -= XENO_DAMAGE_MOD_VERY_SMALL
lurker.attack_speed_modifier -= 2

Expand Down
Loading