Skip to content

Commit

Permalink
hunter
Browse files Browse the repository at this point in the history
  • Loading branch information
homexp13 committed Aug 27, 2024
1 parent e0694d8 commit b2850f5
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 8 deletions.
6 changes: 3 additions & 3 deletions code/__DEFINES/mobs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -579,13 +579,13 @@ GLOBAL_LIST_INIT(xenoupgradetiers, list(XENO_UPGRADE_BASETYPE, XENO_UPGRADE_INVA
#define HUNTER_STEALTH_COOLDOWN 50 //5 seconds
#define HUNTER_STEALTH_WALK_PLASMADRAIN 2
#define HUNTER_STEALTH_RUN_PLASMADRAIN 5
#define HUNTER_STEALTH_STILL_ALPHA 25 //90% transparency
#define HUNTER_STEALTH_WALK_ALPHA 38 //85% transparency
#define HUNTER_STEALTH_STILL_ALPHA 12 //95% transparency
#define HUNTER_STEALTH_WALK_ALPHA 25 //90% transparency
#define HUNTER_STEALTH_RUN_ALPHA 128 //50% transparency
#define HUNTER_STEALTH_STEALTH_DELAY 30 //3 seconds before 95% stealth
#define HUNTER_STEALTH_INITIAL_DELAY 20 //2 seconds before we can increase stealth
#define HUNTER_POUNCE_SNEAKATTACK_DELAY 30 //3 seconds before we can sneak attack
#define HUNTER_SNEAK_SLASH_ARMOR_PEN 20 //bonus AP
#define HUNTER_SNEAK_SLASH_ARMOR_PEN 15 //bonus AP
#define HUNTER_SNEAK_ATTACK_RUN_DELAY 2 SECONDS
#define HUNTER_PSYCHIC_TRACE_COOLDOWN 5 SECONDS //Cooldown of the Hunter's Psychic Trace, and duration of its arrow
#define HUNTER_SILENCE_STAGGER_STACKS 1 //Silence imposes this many stagger stacks
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@
// TODO: attack_alien() overrides are a mess and need a lot of work to make them require parentcalling
RegisterSignals(owner, list(
COMSIG_XENOMORPH_GRAB,
COMSIG_XENOMORPH_LEAP_BUMP,
COMSIG_LIVING_IGNITED,
COMSIG_LIVING_ADD_VENTCRAWL), PROC_REF(cancel_stealth))

Expand All @@ -83,6 +82,7 @@
UnregisterSignal(owner, list(
COMSIG_MOVABLE_MOVED,
COMSIG_XENOMORPH_POUNCE_END,
COMSIG_XENOMORPH_LEAP_BUMP,
COMSIG_XENO_LIVING_THROW_HIT,
COMSIG_XENOMORPH_ATTACK_LIVING,
COMSIG_XENOMORPH_DISARM_HUMAN,
Expand Down Expand Up @@ -168,13 +168,17 @@
return
if(!can_sneak_attack)
return
living_target.adjust_stagger(3 SECONDS)
living_target.add_slowdown(1)

var/mob/living/carbon/xenomorph/xeno = owner
living_target.attack_alien_harm(xeno, xeno.xeno_caste.melee_damage * xeno.xeno_melee_damage_modifier)
var/damage = xeno.xeno_caste.melee_damage * xeno.xeno_melee_damage_modifier

living_target.adjust_stagger(3 SECONDS)
living_target.add_slowdown(1)
living_target.apply_damage(damage, BRUTE, xeno.zone_selected, MELEE, , penetration = HUNTER_SNEAK_SLASH_ARMOR_PEN) // additional damage
to_chat(owner, span_xenodanger("Pouncing from the shadows, we stagger our victim."))

cancel_stealth()

/datum/action/ability/xeno_action/stealth/proc/sneak_attack_slash(datum/source, mob/living/target, damage, list/damage_mod, list/armor_mod)
SIGNAL_HANDLER
if(!can_sneak_attack)
Expand All @@ -188,7 +192,7 @@
target.adjust_stagger(2 SECONDS)
target.add_slowdown(1)
target.ParalyzeNoChain(1 SECONDS)
target.apply_damage(damage, BRUTE, xeno.zone_selected, MELEE, , penetration = 15) // additional damage
target.apply_damage(damage, BRUTE, xeno.zone_selected, MELEE, , penetration = HUNTER_SNEAK_SLASH_ARMOR_PEN) // additional damage

cancel_stealth()

Expand Down Expand Up @@ -718,3 +722,13 @@
return ..()

#undef DISGUISE_SLOWDOWN

// ***************************************
// *********** Crippling strike
// ***************************************

/datum/action/ability/xeno_action/crippling_strike/hunter
additional_damage = 1
heal_amount = 20
plasma_gain = 20
decay_time = 15 SECONDS
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@
/datum/action/ability/activable/xeno/hunter_mark,
/datum/action/ability/xeno_action/psychic_trace,
/datum/action/ability/xeno_action/mirage,
/datum/action/ability/xeno_action/crippling_strike/hunter,
)

// *** Vent Crawl Parameters *** //
Expand Down Expand Up @@ -84,6 +85,7 @@
/datum/action/ability/activable/xeno/hunter_mark,
/datum/action/ability/xeno_action/psychic_trace,
/datum/action/ability/xeno_action/mirage,
/datum/action/ability/xeno_action/crippling_strike/hunter,
)


Expand Down

0 comments on commit b2850f5

Please sign in to comment.