From 17fdfc15c60ffb92bf02a1b9be1ec141b78fffbd Mon Sep 17 00:00:00 2001 From: Fikou <23585223+Fikou@users.noreply.github.com> Date: Thu, 12 Aug 2021 07:47:20 +0200 Subject: [PATCH] fixes some megafauna shooting too fast (#60797) --- .../hostile/megafauna/blood_drunk_miner.dm | 2 +- .../simple_animal/hostile/megafauna/bubblegum.dm | 2 +- .../living/simple_animal/hostile/megafauna/colossus.dm | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm index 348ebf313ab..ed3fb305d15 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm @@ -200,7 +200,7 @@ Difficulty: Medium /mob/living/simple_animal/hostile/megafauna/blood_drunk_miner/proc/shoot_ka() if(ranged_cooldown <= world.time && get_dist(src, target) <= MINER_DASH_RANGE && !Adjacent(target)) - update_cooldowns(list(COOLDOWN_UPDATE_ADD_RANGED = ranged_cooldown_time), ignore_staggered = TRUE) + update_cooldowns(list(COOLDOWN_UPDATE_SET_RANGED = ranged_cooldown_time), ignore_staggered = TRUE) visible_message(span_danger("[src] fires the proto-kinetic accelerator!")) face_atom(target) new /obj/effect/temp_visual/dir_setting/firing_effect(loc, dir) diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm index a760685c0b0..f3004c8b6de 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm @@ -118,7 +118,7 @@ Difficulty: Hard anger_modifier = clamp(((maxHealth - health)/60),0,20) enrage_time = initial(enrage_time) * clamp(anger_modifier / 20, 0.5, 1) - update_cooldowns(list(COOLDOWN_UPDATE_ADD_RANGED = 5 SECONDS)) + update_cooldowns(list(COOLDOWN_UPDATE_SET_RANGED = 5 SECONDS)) if(client) switch(chosen_attack) diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm index 68bb23e8198..33c316f9089 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm @@ -91,7 +91,7 @@ /mob/living/simple_animal/hostile/megafauna/colossus/OpenFire() anger_modifier = clamp(((maxHealth - health)/50),0,20) - update_cooldowns(list(COOLDOWN_UPDATE_ADD_RANGED = 12 SECONDS)) + update_cooldowns(list(COOLDOWN_UPDATE_SET_RANGED = 12 SECONDS)) if(client) switch(chosen_attack) @@ -108,7 +108,7 @@ if(enrage(target)) if(move_to_delay == initial(move_to_delay)) visible_message(span_colossus("\"You can't dodge.\"")) - update_cooldowns(list(COOLDOWN_UPDATE_ADD_RANGED = 3 SECONDS)) + update_cooldowns(list(COOLDOWN_UPDATE_SET_RANGED = 3 SECONDS)) telegraph() dir_shots(GLOB.alldirs) move_to_delay = 3 @@ -136,7 +136,7 @@ . = TRUE /mob/living/simple_animal/hostile/megafauna/colossus/proc/alternating_dir_shots() - update_cooldowns(list(COOLDOWN_UPDATE_ADD_RANGED = 4 SECONDS)) + update_cooldowns(list(COOLDOWN_UPDATE_SET_RANGED = 4 SECONDS)) dir_shots(GLOB.diagonals) SLEEP_CHECK_DEATH(10) dir_shots(GLOB.cardinals) @@ -189,7 +189,7 @@ P.fire(set_angle) /mob/living/simple_animal/hostile/megafauna/colossus/proc/random_shots() - update_cooldowns(list(COOLDOWN_UPDATE_ADD_RANGED = 3 SECONDS)) + update_cooldowns(list(COOLDOWN_UPDATE_SET_RANGED = 3 SECONDS)) var/turf/U = get_turf(src) playsound(U, 'sound/magic/clockwork/invoke_general.ogg', 300, TRUE, 5) for(var/T in RANGE_TURFS(12, U) - U) @@ -197,7 +197,7 @@ shoot_projectile(T) /mob/living/simple_animal/hostile/megafauna/colossus/proc/blast(set_angle) - update_cooldowns(list(COOLDOWN_UPDATE_ADD_RANGED = 2 SECONDS)) + update_cooldowns(list(COOLDOWN_UPDATE_SET_RANGED = 2 SECONDS)) var/turf/target_turf = get_turf(target) playsound(src, 'sound/magic/clockwork/invoke_general.ogg', 200, TRUE, 2) newtonian_move(get_dir(target_turf, src))