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

Adds a "Healed amount" to warden and makes the ability organization less messy #5615

Merged
merged 4 commits into from
Feb 5, 2024
Merged

Adds a "Healed amount" to warden and makes the ability organization less messy #5615

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e7c1160
behavior delegates and stuff the calculation
Jan 31, 2024
1d4ed6c
ability rearranging
Feb 1, 2024
430646c
Update code/modules/mob/living/carbon/xenomorph/mutators/strains/prae…
Red-byte3D Feb 1, 2024
a6b137b
Update code/modules/mob/living/carbon/xenomorph/abilities/praetorian/…
Red-byte3D Feb 1, 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
3 changes: 3 additions & 0 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 @@ -868,6 +868,9 @@
targetXeno.visible_message(SPAN_BOLDNOTICE("[X] places its claws on [targetXeno], and its wounds are quickly sealed!")) //marines probably should know if a xeno gets healed
X.gain_health(heal_amount*0.5 + bonus_heal*0.5)
X.flick_heal_overlay(3 SECONDS, "#00B800")
if(X.mutation_type == PRAETORIAN_WARDEN)
var/datum/behavior_delegate/praetorian_warden/warden_delegate = X.behavior_delegate
warden_delegate.transferred_healing += heal_amount
use_plasma = TRUE //it's already hard enough to gauge health without hp showing on the mob
targetXeno.flick_heal_overlay(3 SECONDS, "#00B800")//so the visible_message and recovery overlay will warn marines and possibly predators that the xenomorph has been healed!

Expand Down
10 changes: 9 additions & 1 deletion code/modules/mob/living/carbon/xenomorph/mutators/strains/praetorian/warden.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,20 @@
individual_only = TRUE
caste_whitelist = list(XENO_CASTE_PRAETORIAN) // Only bae
mutator_actions_to_remove = list(
/datum/action/xeno_action/activable/xeno_spit,
/datum/action/xeno_action/activable/pounce/base_prae_dash,
/datum/action/xeno_action/activable/prae_acid_ball,
/datum/action/xeno_action/activable/spray_acid/base_prae_spray_acid,
/datum/action/xeno_action/onclick/tacmap,
)
mutator_actions_to_add = list(
/datum/action/xeno_action/onclick/emit_pheromones,
/datum/action/xeno_action/activable/xeno_spit,
/datum/action/xeno_action/activable/spray_acid/prae_warden,
/datum/action/xeno_action/activable/warden_heal,
/datum/action/xeno_action/activable/prae_retrieve,
/datum/action/xeno_action/onclick/prae_switch_heal_type,
/datum/action/xeno_action/onclick/emit_pheromones,
/datum/action/xeno_action/onclick/tacmap,
)
behavior_delegate_type = /datum/behavior_delegate/praetorian_warden
keystone = TRUE
Expand Down Expand Up @@ -49,12 +53,16 @@
var/internal_hitpoints_per_attack = 50
var/internal_hp_per_life = 5


// State
var/internal_hitpoints = 0
var/transferred_healing = 0


/datum/behavior_delegate/praetorian_warden/append_to_stat()
. = list()
. += "Energy Reserves: [internal_hitpoints]/[internal_hitpoints_max]"
. += "Healing Done: [transferred_healing]"

/datum/behavior_delegate/praetorian_warden/on_life()
internal_hitpoints = min(internal_hitpoints_max, internal_hitpoints + internal_hp_per_life)
Expand Down
Loading