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.

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

Watcher nerf #6237

Merged
merged 5 commits into from
May 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,10 @@
client.pixel_x = -viewoffset
client.pixel_y = 0

for (var/datum/action/xeno_action/onclick/toggle_long_range/action in actions)
Copy link
Contributor

Choose a reason for hiding this comment

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

This is a weird way to do this, but using get_xeno_action_by_type isn't much better so its whatever.

action.on_zoom_in()
return

/mob/living/carbon/xenomorph/proc/zoom_out()
if(!client)
return
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,8 @@
freeze_time = 5
freeze_play_sound = FALSE
can_be_shield_blocked = TRUE

/datum/action/xeno_action/onclick/toggle_long_range/facehugger
handles_movement = FALSE
should_delay = FALSE
ability_primacy = XENO_PRIMARY_ACTION_3
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,22 @@
if(current_airlock.density) //if its CLOSED YOU'RE SCUTTLING AND CANNOT POUNCE!!!
to_chat(owner, SPAN_WARNING("We cannot do that while squeezing and scuttling!"))
return FALSE

if(HAS_TRAIT(owner, TRAIT_IMMOBILIZED))
to_chat(owner, SPAN_WARNING("We cannot do that while immobilized!"))
return FALSE

return ..()

/datum/action/xeno_action/onclick/toggle_long_range/facehugger/on_zoom_out()
. = ..()

var/mob/living/carbon/xenomorph/facehugger/facehugger = owner
REMOVE_TRAIT(facehugger, TRAIT_IMMOBILIZED, TRAIT_SOURCE_ABILITY("Long-Range Sight"))

/datum/action/xeno_action/onclick/toggle_long_range/facehugger/on_zoom_in()
. = ..()

var/mob/living/carbon/xenomorph/facehugger/facehugger = owner
ADD_TRAIT(facehugger, TRAIT_IMMOBILIZED, TRAIT_SOURCE_ABILITY("Long-Range Sight"))

Original file line number Diff line number Diff line change
Expand Up @@ -329,6 +329,9 @@
xeno.recalculate_speed()
button.icon_state = "template"

/datum/action/xeno_action/onclick/toggle_long_range/proc/on_zoom_in()
return

/datum/action/xeno_action/onclick/toggle_long_range/proc/handle_mob_move_or_look(mob/living/carbon/xenomorph/xeno, actually_moving, direction, specific_direction)
SIGNAL_HANDLER
movement_buffer--
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
/datum/xeno_strain/watcher
name = FACEHUGGER_WATCHER
description = "You lose your ability to hide in exchange to see further and the ability to no longer take damage outside of weeds. This enables you to stalk your host from a distance and wait for the perfect oppertunity to strike."
description = "You lose your ability to hide in exchange to see further. This enables you to stalk your host from a distance and wait for the perfect oppertunity to strike."
flavor_description = "No need to hide when you can see the danger."

actions_to_remove = list(
/datum/action/xeno_action/onclick/xenohide,
)
actions_to_add = list(
/datum/action/xeno_action/onclick/toggle_long_range/runner,
/datum/action/xeno_action/onclick/toggle_long_range/facehugger,
)

behavior_delegate_type = /datum/behavior_delegate/facehugger_watcher
Expand All @@ -19,3 +19,13 @@
// This has no special effects, it's just here to skip `/datum/behavior_delegate/facehugger_base/on_life()`.
/datum/behavior_delegate/facehugger_watcher
name = "Watcher Facehugger Behavior Delegate"

/datum/behavior_delegate/facehugger_watcher/on_life()
// Sap health if we're standing, not on weeds, and not zoomed out
if(bound_xeno.body_position != STANDING_UP)
return
if(bound_xeno.is_zoomed)
return
if(locate(/obj/effect/alien/weeds) in get_turf(bound_xeno))
return
bound_xeno.adjustBruteLoss(1)
Loading