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

Ravager balance 2 #352

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Ravager balance 2 #352

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
6861362
initial
Waselon Oct 26, 2023
f0ed158
.
Waselon Oct 26, 2023
f43c96a
Update abilities_ravager.dm
Waselon Oct 27, 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
2 changes: 1 addition & 1 deletion code/__DEFINES/mobs.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -591,7 +591,7 @@ GLOBAL_LIST_INIT(xenoupgradetiers, list(XENO_UPGRADE_BASETYPE, XENO_UPGRADE_INVA

#define RAVAGER_ENDURE_DURATION 10 SECONDS
#define RAVAGER_ENDURE_DURATION_WARNING 0.7
#define RAVAGER_ENDURE_HP_LIMIT -100
#define RAVAGER_ENDURE_HP_LIMIT -150

#define RAVAGER_RAGE_DURATION 10 SECONDS
#define RAVAGER_RAGE_WARNING 0.7
Expand Down
18 changes: 9 additions & 9 deletions code/modules/mob/living/carbon/xenomorph/castes/ravager/abilities_ravager.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,7 +336,7 @@
if(X.health < 0) //If we're at less than 0 HP, it's time to max rage.
rage_power = 1

var/rage_power_radius = CEILING(rage_power * 7, 1) //Define radius of the SFX
var/rage_power_radius = CEILING(rage_power * 3, 1) //Define radius of the SFX

X.visible_message(span_danger("\The [X] becomes frenzied, bellowing with a shuddering roar!"), \
span_highdanger("We bellow as our fury overtakes us! RIP AND TEAR!"))
Expand All @@ -354,7 +354,7 @@
X.overlay_fullscreen("xeno_feast", /atom/movable/screen/fullscreen/bloodlust)

if(endure_ability.endure_duration) //Check if Endure is active
endure_ability.endure_threshold = RAVAGER_ENDURE_HP_LIMIT * (1 + rage_power) //Endure crit threshold scales with Rage Power; min -100, max -200
endure_ability.endure_threshold = RAVAGER_ENDURE_HP_LIMIT * (1 + rage_power / 2) //Endure crit threshold scales with Rage Power; min -100, max -200

if(charge)
charge.clear_cooldown() //Reset charge cooldown
Expand All @@ -363,19 +363,19 @@
RegisterSignal(X, COMSIG_XENOMORPH_ATTACK_LIVING, PROC_REF(drain_slash))

for(var/turf/affected_tiles AS in RANGE_TURFS(rage_power_radius, X.loc))
affected_tiles.Shake(4, 4, 1 SECONDS) //SFX
affected_tiles.Shake(duration = 1 SECONDS) //SFX

for(var/mob/living/L AS in GLOB.mob_living_list) //Roar that applies cool SFX
if(L.stat == DEAD || !L.hud_used || (get_dist(L, X) > rage_power_radius || X)) //We don't care about the dead
for(var/mob/living/affected_mob in cheap_get_humans_near(X, rage_power_radius) + cheap_get_xenos_near(X, rage_power_radius)) //Roar that applies cool SFX
if(affected_mob.stat || X) //We don't care about the dead/unconsious
continue

shake_camera(L, 1 SECONDS, 1)
L.Shake(4, 4, 1 SECONDS) //SFX
shake_camera(affected_mob, 1 SECONDS, 1)
affected_mob.Shake(duration = 1 SECONDS) //SFX

if(rage_power >= RAVAGER_RAGE_SUPER_RAGE_THRESHOLD) //If we're super pissed it's time to get crazy

var/atom/movable/screen/plane_master/floor/OT = L.hud_used.plane_masters["[FLOOR_PLANE]"]
var/atom/movable/screen/plane_master/game_world/GW = L.hud_used.plane_masters["[GAME_PLANE]"]
var/atom/movable/screen/plane_master/floor/OT = affected_mob.hud_used.plane_masters["[FLOOR_PLANE]"]
var/atom/movable/screen/plane_master/game_world/GW = affected_mob.hud_used.plane_masters["[GAME_PLANE]"]

addtimer(CALLBACK(OT, TYPE_PROC_REF(/atom, remove_filter), "rage_outcry"), 1 SECONDS)
GW.add_filter("rage_outcry", 2, radial_blur_filter(0.07))
Expand Down