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 97dede3d2f..899e901827 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 @@ -33,7 +33,7 @@ Difficulty: Medium movement_type = GROUND speak_emote = list("roars") speed = 1 - move_to_delay = 3 + move_to_delay = 2 projectiletype = /obj/item/projectile/kinetic/miner projectilesound = 'sound/weapons/kenetic_accel.ogg' ranged = 1 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 1784405f30..c60dae6a35 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm @@ -41,6 +41,7 @@ Difficulty: Hard melee_damage_upper = 40 speed = 1 move_to_delay = 10 + ranged_cooldown_time = 10 ranged = 1 pixel_x = -32 del_on_death = 1 @@ -62,7 +63,7 @@ Difficulty: Hard /mob/living/simple_animal/hostile/megafauna/bubblegum/Life() ..() - move_to_delay = CLAMP(round((health/maxHealth) * 10), 5, 10) + move_to_delay = CLAMP(round((health/maxHealth) * 10), 3, 10) /mob/living/simple_animal/hostile/megafauna/bubblegum/OpenFire() anger_modifier = CLAMP(((maxHealth - health)/50),0,20) @@ -235,4 +236,4 @@ Difficulty: Hard return 1 return 0 -#undef MEDAL_PREFIX \ No newline at end of file +#undef MEDAL_PREFIX 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 2c5d004054..c491b3e78d 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm @@ -79,14 +79,14 @@ Difficulty: Very Hard INVOKE_ASYNC(src, .proc/spiral_shoot, pick(TRUE, FALSE)) else if(prob(20)) - ranged_cooldown = world.time + 30 + ranged_cooldown = world.time + 2 random_shots() else if(prob(70)) - ranged_cooldown = world.time + 20 + ranged_cooldown = world.time + 10 blast() else - ranged_cooldown = world.time + 40 + ranged_cooldown = world.time + 20 INVOKE_ASYNC(src, .proc/alternating_dir_shots) diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm index fac14eeb0e..b1694a6172 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm @@ -48,7 +48,7 @@ Difficulty: Medium melee_damage_lower = 40 melee_damage_upper = 40 speed = 1 - move_to_delay = 10 + move_to_delay = 5 ranged = 1 pixel_x = -16 crusher_loot = list(/obj/structure/closet/crate/necropolis/dragon/crusher) diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm index 99d13cab24..293e3e21fd 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm @@ -65,9 +65,9 @@ Difficulty: Hard var/burst_range = 3 //range on burst aoe var/beam_range = 5 //range on cross blast beams - var/chaser_speed = 3 //how fast chasers are currently - var/chaser_cooldown = 101 //base cooldown/cooldown var between spawning chasers - var/major_attack_cooldown = 60 //base cooldown for major attacks + var/chaser_speed = 2 //how fast chasers are currently + var/chaser_cooldown = 50 //base cooldown/cooldown var between spawning chasers + var/major_attack_cooldown = 40 //base cooldown for major attacks var/arena_cooldown = 200 //base cooldown/cooldown var for creating an arena var/blinking = FALSE //if we're doing something that requires us to stand still and not attack var/obj/effect/hierophant/spawned_beacon //the beacon we teleport back to @@ -204,7 +204,7 @@ Difficulty: Hard return target_slowness += L.movement_delay() target_slowness = max(target_slowness, 1) - chaser_speed = max(1, (3 - anger_modifier * 0.04) + ((target_slowness - 1) * 0.5)) + chaser_speed = max(1, (2 - anger_modifier * 0.04) + ((target_slowness - 1) * 0.5)) arena_trap(target) ranged_cooldown = world.time + max(5, ranged_cooldown_time - anger_modifier * 0.75) //scale cooldown lower with high anger. diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/legion.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/legion.dm index 2710d58a67..5bfabe376e 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/legion.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/legion.dm @@ -31,12 +31,13 @@ Difficulty: Medium armour_penetration = 50 melee_damage_lower = 25 melee_damage_upper = 25 - speed = 2 + speed = 1 + move_to_delay = 2 ranged = 1 del_on_death = 1 retreat_distance = 5 minimum_distance = 5 - ranged_cooldown_time = 20 + ranged_cooldown_time = 10 var/size = 5 var/charging = 0 medal_type = BOSS_MEDAL_LEGION @@ -44,7 +45,7 @@ Difficulty: Medium pixel_y = -90 pixel_x = -75 loot = list(/obj/item/stack/sheet/bone = 3) - vision_range = 13 + vision_range = 10 wander = FALSE elimination = 1 appearance_flags = 0 @@ -87,6 +88,7 @@ Difficulty: Medium retreat_distance = 0 minimum_distance = 0 speed = 0 + move_to_delay = 1 charging = 1 addtimer(CALLBACK(src, .proc/reset_charge), 50) @@ -94,7 +96,8 @@ Difficulty: Medium ranged = 1 retreat_distance = 5 minimum_distance = 5 - speed = 2 + speed = 1 + move_to_delay = 2 charging = 0 /mob/living/simple_animal/hostile/megafauna/legion/death() diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm index 6af5174ec5..43bc2c26f8 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm @@ -19,8 +19,8 @@ damage_coeff = list(BRUTE = 1, BURN = 0.5, TOX = 1, CLONE = 1, STAMINA = 0, OXY = 1) minbodytemp = 0 maxbodytemp = INFINITY - vision_range = 5 - aggro_vision_range = 18 + vision_range = 4 + aggro_vision_range = 15 anchored = TRUE mob_size = MOB_SIZE_LARGE layer = LARGE_MOB_LAYER //Looks weird with them slipping under mineral walls and cameras and shit otherwise diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/goliath.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/goliath.dm index 2e8f6bc70f..23f08ab234 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/goliath.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/goliath.dm @@ -10,24 +10,23 @@ icon_gib = "syndicate_gib" mob_biotypes = list(MOB_ORGANIC, MOB_BEAST) mouse_opacity = MOUSE_OPACITY_OPAQUE - move_to_delay = 40 + move_to_delay = 10 ranged = 1 - ranged_cooldown_time = 120 + ranged_cooldown_time = 60 friendly = "wails at" speak_emote = list("bellows") - vision_range = 4 speed = 3 maxHealth = 300 health = 300 harm_intent_damage = 0 obj_damage = 100 - melee_damage_lower = 25 - melee_damage_upper = 25 + melee_damage_lower = 18 + melee_damage_upper = 18 attacktext = "pulverizes" attack_sound = 'sound/weapons/punch1.ogg' throw_message = "does nothing to the rocky hide of the" - vision_range = 5 - aggro_vision_range = 9 + vision_range = 4 + aggro_vision_range = 7 anchored = TRUE //Stays anchored until death as to be unpullable var/pre_attack = 0 var/pre_attack_icon = "Goliath_preattack" @@ -67,7 +66,7 @@ pre_attack = 0 /mob/living/simple_animal/hostile/asteroid/goliath/adjustHealth(amount, updating_health = TRUE, forced = FALSE) - ranged_cooldown -= 10 + ranged_cooldown -= 5 handle_preattack() . = ..() @@ -111,6 +110,7 @@ maxHealth = 400 health = 400 speed = 4 + ranged_cooldown_time = 80 pre_attack_icon = "Goliath_preattack" throw_message = "does nothing to the rocky hide of the" loot = list(/obj/item/stack/sheet/animalhide/goliath_hide) //A throwback to the asteroid days diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm index 065f67808e..cf4401c68a 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm @@ -11,8 +11,8 @@ mouse_opacity = MOUSE_OPACITY_OPAQUE move_to_delay = 14 ranged = 1 - vision_range = 5 - aggro_vision_range = 9 + vision_range = 4 + aggro_vision_range = 7 speed = 3 maxHealth = 75 health = 75 @@ -24,7 +24,7 @@ attack_sound = 'sound/weapons/pierce.ogg' throw_message = "falls right through the strange body of the" ranged_cooldown = 0 - ranged_cooldown_time = 20 + ranged_cooldown_time = 15 obj_damage = 0 environment_smash = ENVIRONMENT_SMASH_NONE retreat_distance = 3 @@ -131,6 +131,7 @@ maxHealth = 60 health = 60 speed = 2 //faster! + move_to_delay = 10 //actually faster! crusher_drop_mod = 20 dwarf_mob = TRUE @@ -377,7 +378,3 @@ id = /obj/item/card/id/knight //END OF CIT CHANGE id_job = "Knight" . = ..() - - - -