Skip to content

Commit

Permalink
bugfix: Hardmode grenades do not work on enemies with less than 80% HP (
Browse files Browse the repository at this point in the history
#6080)

* bugfix: Hardmode grenades do not work on enemies with less than 80% HP

* Made initial enrage() return true if enraged successfully
  • Loading branch information
Vladisvell authored Oct 26, 2024
1 parent 426672a commit 3c329d2
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,9 @@ Difficulty: Very Hard

/mob/living/simple_animal/hostile/megafauna/ancient_robot/enrage()
. = ..()
if(!.)
return

armour_penetration = 66
TL.armour_penetration = 66
TR.armour_penetration = 66
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -288,6 +288,9 @@ Difficulty: Medium

/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner/enrage()
. = ..()
if(!.)
return

miner_saw = new /obj/item/melee/energy/cleaving_saw(src) //Real saw for real men.
dash_cooldown_to_use = 0.5 SECONDS //Becomes a teleporting shit.
ranged_cooldown_time = 5 //They got some cooldown mods.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,9 @@ Difficulty: Hard

/mob/living/simple_animal/hostile/megafauna/bubblegum/enrage()
. = ..()
if(!.)
return

maxHealth = 2000 //Less health, as a phase 2
health = 2000
rapid_melee = 12 //Don't stand still
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,9 @@ Difficulty: Very Hard

/mob/living/simple_animal/hostile/megafauna/colossus/enrage()
. = ..()
if(!.)
return

move_to_delay = 5

/mob/living/simple_animal/hostile/megafauna/colossus/unrage()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,9 @@ Difficulty: Hard

/mob/living/simple_animal/hostile/megafauna/hierophant/enrage()
. = ..()
if(!.)
return

move_to_delay = 5

/mob/living/simple_animal/hostile/megafauna/hierophant/unrage()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -219,8 +219,10 @@
/// This proc is called by the HRD-MDE grenade to enrage the megafauna. This should increase the megafaunas attack speed if possible, give it new moves, or disable weak moves. This should be reverseable, and reverses on zlvl change.
/mob/living/simple_animal/hostile/megafauna/proc/enrage()
if(enraged || ((health / maxHealth) * 100 <= 80))
return
return FALSE

enraged = TRUE
return TRUE

/mob/living/simple_animal/hostile/megafauna/proc/unrage()
enraged = FALSE

0 comments on commit 3c329d2

Please sign in to comment.