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

Reverts all recent nerfs to Warrior #4595

Closed
wants to merge 3 commits into from
Closed

Reverts all recent nerfs to Warrior #4595

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c8d3752
Update warrior_abilities.dm
usnpeepoo Oct 7, 2023
b5cb1d3
Update Warrior.dm
usnpeepoo Oct 7, 2023
6252a15
Update Warrior.dm
usnpeepoo Oct 7, 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
8 changes: 4 additions & 4 deletions code/modules/mob/living/carbon/xenomorph/abilities/warrior/warrior_abilities.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@

// Configurables
var/fling_distance = 4
var/stun_power = 0
var/weaken_power = 0.5
var/slowdown = 2
var/stun_power = 1
var/weaken_power = 1
var/slowdown = FALSE


// Warrior Lunge
Expand All @@ -40,7 +40,7 @@
xeno_cooldown = 100

// Configurables
var/grab_range = 4
var/grab_range = 6
var/click_miss_cooldown = 15
var/twitch_message_cooldown = 0 //apparently this is necessary for a tiny code that makes the lunge message on cooldown not be spammable, doesn't need to be big so 5 will do.

Expand Down
19 changes: 16 additions & 3 deletions code/modules/mob/living/carbon/xenomorph/castes/Warrior.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,18 +113,31 @@
/datum/behavior_delegate/warrior_base
name = "Base Warrior Behavior Delegate"

var/slash_charge_cdr = 0.20 SECONDS // Amount to reduce charge cooldown by per slash
var/lifesteal_percent = 7
var/max_lifesteal = 9
var/lifesteal_range = 3 // Marines within 3 tiles of range will give the warrior extra health
var/lifesteal_lock_duration = 20 // This will remove the glow effect on warrior after 2 seconds
var/color = "#6c6f24"
var/emote_cooldown = 0

/datum/behavior_delegate/warrior_base/melee_attack_additional_effects_target(mob/living/carbon/A)
/datum/behavior_delegate/warrior_base/melee_attack_additional_effects_self()
..()

if(SEND_SIGNAL(bound_xeno, COMSIG_XENO_PRE_HEAL) & COMPONENT_CANCEL_XENO_HEAL)
return
var/datum/action/xeno_action/activable/lunge/cAction1 = get_xeno_action_by_type(bound_xeno, /datum/action/xeno_action/activable/lunge)
if (!cAction1.action_cooldown_check())
cAction1.reduce_cooldown(slash_charge_cdr)

var/datum/action/xeno_action/activable/fling/cAction2 = get_xeno_action_by_type(bound_xeno, /datum/action/xeno_action/activable/fling)
if (!cAction2.action_cooldown_check())
cAction2.reduce_cooldown(slash_charge_cdr)

var/datum/action/xeno_action/activable/warrior_punch/cAction3 = get_xeno_action_by_type(bound_xeno, /datum/action/xeno_action/activable/warrior_punch)
if (!cAction3.action_cooldown_check())
cAction3.reduce_cooldown(slash_charge_cdr)

/datum/behavior_delegate/warrior_base/melee_attack_additional_effects_target(mob/living/carbon/A)
..()

var/final_lifesteal = lifesteal_percent
var/list/mobs_in_range = oviewers(lifesteal_range, bound_xeno)
Expand Down
Loading