diff --git a/code/modules/mob/living/simple_animal/hostile/alien.dm b/code/modules/mob/living/simple_animal/hostile/alien.dm index 7d0ef52ad09..95eb9d312b1 100644 --- a/code/modules/mob/living/simple_animal/hostile/alien.dm +++ b/code/modules/mob/living/simple_animal/hostile/alien.dm @@ -7,10 +7,9 @@ icon_living = "samak" icon_dead = "samak_dead" icon = 'icons/jungle.dmi' - move_to_delay = 2 + speed = 2 maxHealth = 125 health = 125 - speed = 2 melee_damage_lower = 5 melee_damage_upper = 15 attacktext = "mauled" @@ -29,10 +28,9 @@ icon_living = "diyaab" icon_dead = "diyaab_dead" icon = 'icons/jungle.dmi' - move_to_delay = 1 + speed = 1 maxHealth = 25 health = 25 - speed = 1 melee_damage_lower = 1 melee_damage_upper = 8 attacktext = "gouged" @@ -55,10 +53,9 @@ icon_living = "shantak" icon_dead = "shantak_dead" icon = 'icons/jungle.dmi' - move_to_delay = 1 + speed = 1 maxHealth = 75 health = 75 - speed = 1 melee_damage_lower = 3 melee_damage_upper = 12 attacktext = "gouged" diff --git a/code/modules/mob/living/simple_animal/hostile/commanded/commanded.dm b/code/modules/mob/living/simple_animal/hostile/commanded/commanded.dm index 2a2ad0fdd00..bd062f28468 100644 --- a/code/modules/mob/living/simple_animal/hostile/commanded/commanded.dm +++ b/code/modules/mob/living/simple_animal/hostile/commanded/commanded.dm @@ -125,7 +125,7 @@ ABSTRACT_TYPE(/mob/living/simple_animal/hostile/commanded) stop_automated_movement = 1 var/mob/mob_to_follow = following_mob_ref?.resolve() if(mob_to_follow && get_dist(src, mob_to_follow) <= 10) - walk_to(src,mob_to_follow,1,move_to_delay) + walk_to(src, mob_to_follow, 1, speed) /mob/living/simple_animal/hostile/commanded/proc/commanded_stop() //basically a proc that runs whenever we are asked to stay put. Probably going to remain unused. return diff --git a/code/modules/mob/living/simple_animal/hostile/giant_spider.dm b/code/modules/mob/living/simple_animal/hostile/giant_spider.dm index 8602d248c24..42d34711f74 100644 --- a/code/modules/mob/living/simple_animal/hostile/giant_spider.dm +++ b/code/modules/mob/living/simple_animal/hostile/giant_spider.dm @@ -41,8 +41,7 @@ faction = "spiders" var/busy = 0 pass_flags = PASSTABLE - move_to_delay = 6 - speed = 3 + speed = 6 mob_size = 6 smart_melee = FALSE @@ -113,7 +112,7 @@ melee_damage_upper = 20 armor_penetration = 15 poison_per_bite = 5 - move_to_delay = 4 + speed = 4 sample_data = list("Genetic markers identified as being linked with stem cell differentiaton", "Cellular biochemistry shows high metabolic capacity") smart_melee = TRUE @@ -130,7 +129,7 @@ armor_penetration = 15 poison_type = /singleton/reagent/perconol // mildly beneficial for organics poison_per_bite = 2 - move_to_delay = 5 + speed = 5 sample_data = list("Genetic markers identified as being linked with stem cell differentiaton", "Cellular biochemistry geared towards creating strong electrical potential differences") smart_melee = TRUE @@ -149,7 +148,7 @@ ranged_attack_range = 4 poison_type = /singleton/reagent/capsaicin/condensed poison_per_bite = 2 - move_to_delay = 5 + speed = 5 sample_data = list("Genetic markers identified as being linked with stem cell differentiaton", "Exocrinic caspaicin synthesis detected") smart_melee = TRUE @@ -232,7 +231,7 @@ for(var/turf/T in orange(20, src)) move_targets.Add(T)*/ stop_automated_movement = 1 - GLOB.move_manager.move_to(src, pick(orange(20, src)), 1, move_to_delay) + GLOB.move_manager.move_to(src, pick(orange(20, src)), 1, speed) addtimer(CALLBACK(src, PROC_REF(stop_walking)), 50, TIMER_UNIQUE) /mob/living/simple_animal/hostile/giant_spider/proc/stop_walking() @@ -250,7 +249,7 @@ if(C.stat && !istype(C, /mob/living/simple_animal/hostile/giant_spider)) cocoon_target = C busy = MOVING_TO_TARGET - GLOB.move_manager.move_to(src, C, 1, move_to_delay) + GLOB.move_manager.move_to(src, C, 1, speed) //give up if we can't reach them after 10 seconds addtimer(CALLBACK(src, PROC_REF(GiveUp), C), 100, TIMER_UNIQUE) return @@ -279,7 +278,7 @@ cocoon_target = O busy = MOVING_TO_TARGET stop_automated_movement = 1 - GLOB.move_manager.move_to(src, O, 1, move_to_delay) + GLOB.move_manager.move_to(src, O, 1, speed) //give up if we can't reach them after 10 seconds GiveUp(O) diff --git a/code/modules/mob/living/simple_animal/hostile/hivebots/hivebot.dm b/code/modules/mob/living/simple_animal/hostile/hivebots/hivebot.dm index 737046955a0..81e9e16d058 100644 --- a/code/modules/mob/living/simple_animal/hostile/hivebots/hivebot.dm +++ b/code/modules/mob/living/simple_animal/hostile/hivebots/hivebot.dm @@ -180,7 +180,7 @@ icon_state = "hivebotbomber" organ_names = list("head", "core", "bottom thruster") attacktext = "bumped" - move_to_delay = 8 + speed = 8 var/has_exploded = FALSE /mob/living/simple_animal/hostile/hivebot/bomber/AttackingTarget() diff --git a/code/modules/mob/living/simple_animal/hostile/hostile.dm b/code/modules/mob/living/simple_animal/hostile/hostile.dm index 0e456c4b40a..527d0a97ec2 100644 --- a/code/modules/mob/living/simple_animal/hostile/hostile.dm +++ b/code/modules/mob/living/simple_animal/hostile/hostile.dm @@ -20,7 +20,6 @@ ABSTRACT_TYPE(/mob/living/simple_animal/hostile) var/projectiletype var/projectilesound var/casingtype - var/move_to_delay = 4 //delay for the automated movement. var/attack_delay = DEFAULT_ATTACK_COOLDOWN var/list/friends = list() var/break_stuff_probability = 10 @@ -191,10 +190,10 @@ ABSTRACT_TYPE(/mob/living/simple_animal/hostile) GLOB.move_manager.stop_looping(src) OpenFire(last_found_target) else - GLOB.move_manager.move_to(src, last_found_target, 6, move_to_delay) + GLOB.move_manager.move_to(src, last_found_target, 6, speed) else change_stance(HOSTILE_STANCE_ATTACKING) - GLOB.move_manager.move_to(src, last_found_target, 1, move_to_delay) + GLOB.move_manager.move_to(src, last_found_target, 1, speed) /** * Attack the mob set in `target_mob` diff --git a/code/modules/mob/living/simple_animal/hostile/krampus.dm b/code/modules/mob/living/simple_animal/hostile/krampus.dm index a186b3072e3..0117abe17ca 100644 --- a/code/modules/mob/living/simple_animal/hostile/krampus.dm +++ b/code/modules/mob/living/simple_animal/hostile/krampus.dm @@ -154,7 +154,7 @@ minbodytemp = 0 faction = "Krampus" - move_to_delay = 4 + speed = 4 tameable = FALSE diff --git a/code/modules/mob/living/simple_animal/hostile/mimic.dm b/code/modules/mob/living/simple_animal/hostile/mimic.dm index 95d531953b1..7c8b29e2efa 100644 --- a/code/modules/mob/living/simple_animal/hostile/mimic.dm +++ b/code/modules/mob/living/simple_animal/hostile/mimic.dm @@ -35,7 +35,7 @@ minbodytemp = 0 faction = "mimic" - move_to_delay = 8 + speed = 8 tameable = FALSE sample_data = null @@ -163,7 +163,7 @@ var/global/list/protected_objects = list(/obj/structure/table, /obj/structure/ca health = 15 * I.w_class melee_damage_lower = 2 + I.force melee_damage_upper = 2 + I.force - move_to_delay = 2 * I.w_class + speed = 2 * I.w_class maxHealth = health if(creator) diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/cavern.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/cavern.dm index 28357adeac2..4e727f9e1be 100644 --- a/code/modules/mob/living/simple_animal/hostile/retaliate/cavern.dm +++ b/code/modules/mob/living/simple_animal/hostile/retaliate/cavern.dm @@ -82,7 +82,7 @@ icon_state = "sadrone" icon_living = "sadrone" icon_dead = "sadrone_dead" - move_to_delay = 5 + speed = 5 health = 60 maxHealth = 60 harm_intent_damage = 5 @@ -177,7 +177,7 @@ break if(target_ore) - GLOB.move_manager.move_to(src, target_ore, 1, move_to_delay) + GLOB.move_manager.move_to(src, target_ore, 1, speed) else if(found_turfs.len) for(var/turf/simulated/mineral/M in found_turfs) if(!QDELETED(M) || !M.mineral) diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/exoplanet.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/exoplanet.dm index 5700373afdd..230c08b5143 100644 --- a/code/modules/mob/living/simple_animal/hostile/retaliate/exoplanet.dm +++ b/code/modules/mob/living/simple_animal/hostile/retaliate/exoplanet.dm @@ -17,10 +17,9 @@ icon_state = "royalcrab" icon_living = "royalcrab" icon_dead = "royalcrab_dead" - move_to_delay = 3 maxHealth = 150 health = 150 - speed = 1 + speed = 3 melee_damage_lower = 10 melee_damage_upper = 15 natural_armor = list( diff --git a/code/modules/mob/living/simple_animal/hostile/space_fauna.dm b/code/modules/mob/living/simple_animal/hostile/space_fauna.dm index 5690265cb64..902ab7f4150 100644 --- a/code/modules/mob/living/simple_animal/hostile/space_fauna.dm +++ b/code/modules/mob/living/simple_animal/hostile/space_fauna.dm @@ -73,7 +73,7 @@ stop_automated_movement = 1 if(istype(last_found_target, /obj/effect/energy_field) && !QDELETED(last_found_target) && (last_found_target in targets)) change_stance(HOSTILE_STANCE_ATTACKING) - GLOB.move_manager.move_to(src, last_found_target, 1, move_to_delay) + GLOB.move_manager.move_to(src, last_found_target, 1, speed) return 1 ..() @@ -152,6 +152,8 @@ maxHealth = 100 health = 100 + speed = 10 + mob_size = 15 melee_damage_lower = 30 diff --git a/code/modules/mob/living/simple_animal/hostile/spider_queen.dm b/code/modules/mob/living/simple_animal/hostile/spider_queen.dm index de383bec31a..d88802c07b7 100644 --- a/code/modules/mob/living/simple_animal/hostile/spider_queen.dm +++ b/code/modules/mob/living/simple_animal/hostile/spider_queen.dm @@ -46,8 +46,7 @@ attack_sound = 'sound/weapons/bite.ogg' pass_flags = PASSTABLE|PASSRAILING - move_to_delay = 6 - speed = -1 + speed = 6 mob_size = 15 environment_smash = 2 diff --git a/html/changelogs/geeves-simple_mob_slowdown.yml b/html/changelogs/geeves-simple_mob_slowdown.yml new file mode 100644 index 00000000000..76ed59f74e2 --- /dev/null +++ b/html/changelogs/geeves-simple_mob_slowdown.yml @@ -0,0 +1,7 @@ +author: Geeves + +delete-after: True + +changes: + - balance: "Tweaked mobs to use the universal speed variable when chasing after a target." + - balance: "Made Reavers move much slower when pursuing a target."