Merge pull request #5590 from ARF-SS13/mob-adjustification

Mob Adjustments
ARF-SS13 · Jan 15, 2025 · 2467e25 · 2467e25
2 parents b12f82f + 4d7537d
commit 2467e25
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 65 deletions.
diff --git a/code/modules/mob/living/simple_animal/hostile/f13/geckotribe.dm b/code/modules/mob/living/simple_animal/hostile/f13/geckotribe.dm
@@ -100,8 +100,6 @@
 
 	variation_list = list(
 		MOB_COLOR_VARIATION(50, 50, 50, 255, 255, 255),
-		MOB_SPEED_LIST(3, 3.2, 3.4, 3.6),
-		MOB_SPEED_CHANGE_PER_TURN_CHANCE(50),
 		MOB_HEALTH_LIST(30, 35, 40, 45),
 		MOB_RETREAT_DISTANCE_LIST(3, 5, 7),
 		MOB_RETREAT_DISTANCE_CHANGE_PER_TURN_CHANCE(100),
@@ -166,8 +164,6 @@
 
 	variation_list = list(
 		MOB_COLOR_VARIATION(50, 50, 50, 255, 255, 255),
-		MOB_SPEED_LIST(3, 3.2, 3.4, 3.6),
-		MOB_SPEED_CHANGE_PER_TURN_CHANCE(50),
 		MOB_HEALTH_LIST(10, 15, 20),
 		MOB_RETREAT_DISTANCE_LIST(3, 5, 7),
 		MOB_RETREAT_DISTANCE_CHANGE_PER_TURN_CHANCE(100),
@@ -284,8 +280,6 @@
 
 	variation_list = list(
 		MOB_COLOR_VARIATION(50, 50, 50, 255, 255, 255),
-		MOB_SPEED_LIST(3, 3.2, 3.4, 3.6),
-		MOB_SPEED_CHANGE_PER_TURN_CHANCE(50),
 		MOB_HEALTH_LIST(30, 35, 40, 45),
 		MOB_RETREAT_DISTANCE_LIST(0, 1, 3, 5, 7, 9),
 		MOB_RETREAT_DISTANCE_CHANGE_PER_TURN_CHANCE(100),
@@ -401,8 +395,6 @@
 
 	variation_list = list(
 		MOB_COLOR_VARIATION(50, 50, 50, 255, 255, 255),
-		MOB_SPEED_LIST(3, 3.2, 3.4, 3.6),
-		MOB_SPEED_CHANGE_PER_TURN_CHANCE(50),
 		MOB_HEALTH_LIST(30, 35, 40, 45),
 		MOB_RETREAT_DISTANCE_LIST(0, 1, 3, 5, 7, 9),
 		MOB_RETREAT_DISTANCE_CHANGE_PER_TURN_CHANCE(80),
@@ -536,8 +528,6 @@
 
 	variation_list = list(
 		MOB_COLOR_VARIATION(50, 50, 50, 255, 255, 255),
-		MOB_SPEED_LIST(3, 3.2, 3.4, 3.6),
-		MOB_SPEED_CHANGE_PER_TURN_CHANCE(50),
 		MOB_HEALTH_LIST(30, 35, 40, 45),
 		MOB_RETREAT_DISTANCE_LIST(3, 5, 7),
 		MOB_RETREAT_DISTANCE_CHANGE_PER_TURN_CHANCE(100),
@@ -668,8 +658,6 @@
 
 	variation_list = list(
 		//MOB_COLOR_VARIATION(50, 50, 50, 255, 255, 255),
-		MOB_SPEED_LIST(3, 3.2, 3.4, 3.6),
-		MOB_SPEED_CHANGE_PER_TURN_CHANCE(50),
 		MOB_HEALTH_LIST(200),
 		MOB_RETREAT_DISTANCE_LIST(3, 5, 7),
 		MOB_RETREAT_DISTANCE_CHANGE_PER_TURN_CHANCE(100),
@@ -829,8 +817,6 @@
 
 	variation_list = list(
 		//MOB_COLOR_VARIATION(50, 50, 50, 255, 255, 255),
-		MOB_SPEED_LIST(3, 3.2, 3.4, 3.6),
-		MOB_SPEED_CHANGE_PER_TURN_CHANCE(50),
 		MOB_HEALTH_LIST(3000),
 		MOB_RETREAT_DISTANCE_LIST(0, 0, 0, 3, 3),
 		MOB_RETREAT_DISTANCE_CHANGE_PER_TURN_CHANCE(65),
@@ -992,8 +978,6 @@
 
 	variation_list = list(
 		//MOB_COLOR_VARIATION(50, 50, 50, 255, 255, 255),
-		MOB_SPEED_LIST(3, 3.2, 3.4, 3.6),
-		MOB_SPEED_CHANGE_PER_TURN_CHANCE(50),
 		MOB_HEALTH_LIST(75),
 		MOB_RETREAT_DISTANCE_LIST(3, 5, 7),
 		MOB_RETREAT_DISTANCE_CHANGE_PER_TURN_CHANCE(100),

diff --git a/code/modules/mob/living/simple_animal/hostile/f13/ghoul.dm b/code/modules/mob/living/simple_animal/hostile/f13/ghoul.dm
@@ -121,8 +121,6 @@
 
 	variation_list = list(
 		MOB_COLOR_VARIATION(150, 150, 150, 255, 255, 255),
-		MOB_SPEED_LIST(3.0, 3.2, 3.6, 3.8, 4),
-		MOB_SPEED_CHANGE_PER_TURN_CHANCE(10),
 		MOB_HEALTH_LIST(30, 35, 40, 40, 40, 40, 41),
 		MOB_RETREAT_DISTANCE_LIST(0, 0, 1),
 		MOB_RETREAT_DISTANCE_CHANGE_PER_TURN_CHANCE(5),
@@ -186,8 +184,6 @@
 
 	variation_list = list(
 		MOB_COLOR_VARIATION(200, 200, 200, 255, 255, 255),
-		MOB_SPEED_LIST(3.6, 3.8, 4, 4.2, 4.4),
-		MOB_SPEED_CHANGE_PER_TURN_CHANCE(10),
 		MOB_HEALTH_LIST(41, 45, 50, 50, 50, 50, 51),
 		MOB_RETREAT_DISTANCE_LIST(0, 1, 1),
 		MOB_RETREAT_DISTANCE_CHANGE_PER_TURN_CHANCE(5),
@@ -333,8 +329,6 @@
 
 	variation_list = list(
 		MOB_COLOR_VARIATION(150, 150, 150, 255, 255, 255),
-		MOB_SPEED_LIST(3.0, 3.2, 3.6, 3.8, 4, 4.2),
-		MOB_SPEED_CHANGE_PER_TURN_CHANCE(10),
 		MOB_HEALTH_LIST(38, 40, 42, 44),
 		MOB_RETREAT_DISTANCE_LIST(0, 2, 4),
 		MOB_RETREAT_DISTANCE_CHANGE_PER_TURN_CHANCE(50),
@@ -440,8 +434,6 @@
 	loot_drop_amount = 4
 	variation_list = list(
 		MOB_COLOR_VARIATION(150, 150, 150, 255, 255, 255),
-		MOB_SPEED_LIST(3.6, 3.8, 4, 4.2, 4.4),
-		MOB_SPEED_CHANGE_PER_TURN_CHANCE(10),
 		MOB_HEALTH_LIST(30, 35, 40, 40, 40, 40, 41),
 		MOB_RETREAT_DISTANCE_LIST(0, 0, 1),
 		MOB_RETREAT_DISTANCE_CHANGE_PER_TURN_CHANCE(5),
@@ -480,8 +472,6 @@
 	loot_drop_amount = 5
 	variation_list = list(
 		MOB_COLOR_VARIATION(150, 150, 150, 255, 255, 255),
-		MOB_SPEED_LIST(3.6, 3.8, 4, 4.2, 4.4),
-		MOB_SPEED_CHANGE_PER_TURN_CHANCE(10),
 		MOB_HEALTH_LIST(30, 35, 40, 40, 40, 40, 41),
 		MOB_RETREAT_DISTANCE_LIST(0, 0, 1),
 		MOB_RETREAT_DISTANCE_CHANGE_PER_TURN_CHANCE(5),

diff --git a/code/modules/mob/living/simple_animal/hostile/f13/insects.dm b/code/modules/mob/living/simple_animal/hostile/f13/insects.dm
@@ -17,7 +17,7 @@
 	mob_biotypes = MOB_ORGANIC|MOB_BEAST
 	mob_armor = ARMOR_VALUE_ANTS
 	speak_chance = 0
-	move_to_delay = 3
+	move_to_delay = 4
 	// m2d 3 = standard, less is fast, more is slower.
 
 	retreat_distance = 0
@@ -232,7 +232,7 @@
 	waddle_amount = 3
 	waddle_up_time = 1
 	waddle_side_time = 1
-	move_to_delay = 3
+	move_to_delay = 4
 	// m2d 3 = standard, less is fast, more is slower.
 
 	retreat_distance = 0
@@ -477,7 +477,7 @@
 	icon_dead = "bloatfly_dead"
 	icon_gib = null
 	ranged = TRUE
-
+	move_to_delay = 4.5
 	speed = 1
 	maxHealth = 20
 	health = 20
@@ -489,8 +489,8 @@
 	waddle_up_time = 3
 	waddle_side_time = 2
 	can_ghost_into = TRUE
-	retreat_distance = 3
-	minimum_distance = 2
+	retreat_distance = 2
+	minimum_distance = 1
 
 	mob_biotypes = MOB_ORGANIC|MOB_BEAST
 	speak_chance = 0

diff --git a/code/modules/mob/living/simple_animal/hostile/f13/mirelurks.dm b/code/modules/mob/living/simple_animal/hostile/f13/mirelurks.dm
@@ -52,8 +52,6 @@
 	pop_required_to_jump_into = MED_MOB_MIN_PLAYERS
 	variation_list = list(
 		MOB_COLOR_VARIATION(100, 100, 100, 255, 255, 255),
-		MOB_SPEED_LIST(3.3, 3.4, 3.5),
-		MOB_SPEED_CHANGE_PER_TURN_CHANCE(100),
 		MOB_HEALTH_LIST(110, 115, 120, 130),
 		MOB_RETREAT_DISTANCE_LIST(0, 1, 2),
 		MOB_RETREAT_DISTANCE_CHANGE_PER_TURN_CHANCE(70),
@@ -87,8 +85,6 @@
 	pop_required_to_jump_into = BIG_MOB_MIN_PLAYERS
 	variation_list = list(
 		MOB_COLOR_VARIATION(100, 100, 100, 255, 255, 255),
-		MOB_SPEED_LIST(3, 3.1, 3.2),
-		MOB_SPEED_CHANGE_PER_TURN_CHANCE(100),
 		MOB_HEALTH_LIST(140, 150, 160, 170),
 		MOB_RETREAT_DISTANCE_LIST(0, 1, 2),
 		MOB_RETREAT_DISTANCE_CHANGE_PER_TURN_CHANCE(70),
@@ -122,8 +118,6 @@
 	pop_required_to_jump_into = 0
 	variation_list = list(
 		MOB_COLOR_VARIATION(100, 100, 100, 255, 255, 255),
-		MOB_SPEED_LIST(2.2, 2.3, 2.4, 2.5, 2.6, 2.7, 2.8),
-		MOB_SPEED_CHANGE_PER_TURN_CHANCE(100),
 		MOB_HEALTH_LIST(35, 39, 40, 41),
 		MOB_RETREAT_DISTANCE_LIST(15, 16),
 		MOB_RETREAT_DISTANCE_CHANGE_PER_TURN_CHANCE(100),

diff --git a/code/modules/mob/living/simple_animal/hostile/f13/wasteanimals.dm b/code/modules/mob/living/simple_animal/hostile/f13/wasteanimals.dm
@@ -108,8 +108,6 @@
 
 	variation_list = list(
 		MOB_COLOR_VARIATION(50, 50, 50, 255, 255, 255),
-		MOB_SPEED_LIST(3.8, 3.9, 4),
-		MOB_SPEED_CHANGE_PER_TURN_CHANCE(50),
 		MOB_HEALTH_LIST(30, 35, 40,),
 		MOB_RETREAT_DISTANCE_LIST(0, 1, 3, 5, 7, 9),
 		MOB_RETREAT_DISTANCE_CHANGE_PER_TURN_CHANCE(100),
@@ -265,8 +263,6 @@
 
 	variation_list = list(
 		MOB_COLOR_VARIATION(200, 40, 40, 255, 45, 45),
-		MOB_SPEED_LIST(3.8, 3.9, 4),
-		MOB_SPEED_CHANGE_PER_TURN_CHANCE(50),
 		MOB_HEALTH_LIST(28, 30, 32),
 		MOB_RETREAT_DISTANCE_LIST(0, 1, 3),
 		MOB_RETREAT_DISTANCE_CHANGE_PER_TURN_CHANCE(100),
@@ -373,8 +369,6 @@
 
 	variation_list = list(
 		MOB_COLOR_VARIATION(40, 40, 200, 45, 45, 255),
-		MOB_SPEED_LIST(3.8, 3.9, 4),
-		MOB_SPEED_CHANGE_PER_TURN_CHANCE(50),
 		MOB_HEALTH_LIST(28, 30, 32),
 		MOB_RETREAT_DISTANCE_LIST(0, 1, 3),
 		MOB_RETREAT_DISTANCE_CHANGE_PER_TURN_CHANCE(100),
@@ -523,7 +517,7 @@
 
 
 /mob/living/simple_animal/hostile/gecko/legacy/alpha
-	bounty = 15
+	bounty = 10
 	name = "alpha newt"
 	desc = "A large dog sized amphibious biped with an oddly large mouth for its size. Probably related to geckos in some way. This one's drooling a lot and looks sort of tired."
 	icon = 'icons/fallout/mobs/legacymobs.dmi'
@@ -570,8 +564,6 @@
 
 	variation_list = list(
 		MOB_COLOR_VARIATION(180, 255, 255, 255, 255, 255), //Rmin, Gmin, Bmin, Rmax, Gmax, Bmax
-		MOB_SPEED_LIST(3.8, 3.9, 4),
-		MOB_SPEED_CHANGE_PER_TURN_CHANCE(80),
 		MOB_HEALTH_LIST(30, 35, 38),
 		MOB_RETREAT_DISTANCE_LIST(0, 1),
 		MOB_RETREAT_DISTANCE_CHANGE_PER_TURN_CHANCE(50),
@@ -639,8 +631,6 @@
 
 	variation_list = list(
 		MOB_COLOR_VARIATION(120, 80, 80, 250, 100, 100), //Rmin, Gmin, Bmin, Rmax, Gmax, Bmax
-		MOB_SPEED_LIST(3.8, 3.9, 4),
-		MOB_SPEED_CHANGE_PER_TURN_CHANCE(80),
 		MOB_HEALTH_LIST(100, 110, 120),
 		MOB_RETREAT_DISTANCE_LIST(0, 1),
 		MOB_RETREAT_DISTANCE_CHANGE_PER_TURN_CHANCE(50),
@@ -679,8 +669,6 @@
 			MOB_RANDOM_NAME(MOB_NAME_RANDOM_ALL_OF_THEM, 5)\
 		),
 		MOB_COLOR_VARIATION(20, 190, 0, 255, 2, 0),
-		MOB_SPEED_LIST(3.8, 3.9, 4),
-		MOB_SPEED_CHANGE_PER_TURN_CHANCE(100),
 		MOB_HEALTH_LIST(2, 3, 5, 7, 30, 35, 37, 38, 40, 45, 48, 49, 49, 49, 49, 2000),
 		MOB_RETREAT_DISTANCE_LIST(0, 1, 3, 5, 7, 9),
 		MOB_RETREAT_DISTANCE_CHANGE_PER_TURN_CHANCE(100),
@@ -993,8 +981,6 @@
 
 	variation_list = list(
 		MOB_COLOR_VARIATION(50, 50, 50, 255, 255, 255),
-		MOB_SPEED_LIST(3.8, 3.9, 4),
-		MOB_SPEED_CHANGE_PER_TURN_CHANCE(25),
 		MOB_HEALTH_LIST(15, 20, 25, 26),
 		MOB_RETREAT_DISTANCE_LIST(0, 1),
 		MOB_RETREAT_DISTANCE_CHANGE_PER_TURN_CHANCE(100),
@@ -1029,8 +1015,6 @@
 	melee_damage_upper = 6
 	variation_list = list(
 		MOB_COLOR_VARIATION(200, 200, 200, 250, 250, 250), //Rmin, Gmin, Bmin, Rmax, Gmax, Bmax
-		MOB_SPEED_LIST(3.8, 3.9, 4),
-		MOB_SPEED_CHANGE_PER_TURN_CHANCE(80),
 		MOB_HEALTH_LIST(10, 13, 15),
 		MOB_RETREAT_DISTANCE_LIST(0, 1),
 		MOB_RETREAT_DISTANCE_CHANGE_PER_TURN_CHANCE(50),
@@ -1058,8 +1042,7 @@
 	can_glow_revive = FALSE
 	variation_list = list(
 		MOB_COLOR_VARIATION(245, 215, 0, 255, 220, 5), //Rmin, Gmin, Bmin, Rmax, Gmax, Bmax
-		MOB_SPEED_LIST(3.8, 3.9, 4),
-		MOB_SPEED_CHANGE_PER_TURN_CHANCE(80),
+
 		MOB_HEALTH_LIST(70, 75, 80),
 		MOB_RETREAT_DISTANCE_LIST(0, 1),
 		MOB_RETREAT_DISTANCE_CHANGE_PER_TURN_CHANCE(50),
@@ -1256,8 +1239,6 @@
 
 	variation_list = list(
 		MOB_COLOR_VARIATION(50, 50, 50, 255, 255, 255),
-		MOB_SPEED_LIST(3.8, 3.9, 4),
-		MOB_SPEED_CHANGE_PER_TURN_CHANCE(50),
 		MOB_HEALTH_LIST(80, 90, 100, 110),
 		MOB_RETREAT_DISTANCE_LIST(0, 0, 1),
 		MOB_RETREAT_DISTANCE_CHANGE_PER_TURN_CHANCE(90),

diff --git a/code/modules/mob/living/simple_animal/hostile/regalrat.dm b/code/modules/mob/living/simple_animal/hostile/regalrat.dm
@@ -202,8 +202,6 @@
 	var/cheesy = FALSE
 
 	variation_list = list(
-		MOB_SPEED_LIST(1.5, 1.8, 2.0),
-		MOB_SPEED_CHANGE_PER_TURN_CHANCE(50),
 		MOB_HEALTH_LIST(5, 10, 15, 20, 24),
 		MOB_RETREAT_DISTANCE_LIST(0, 1, 3),
 		MOB_RETREAT_DISTANCE_CHANGE_PER_TURN_CHANCE(100),
@@ -238,8 +236,6 @@
 	is_smol = TRUE
 
 	variation_list = list(
-		MOB_SPEED_LIST(0.2, 1.5, 1.8, 2.0, 5.0),
-		MOB_SPEED_CHANGE_PER_TURN_CHANCE(50),
 		MOB_HEALTH_LIST(5, 10, 15, 20, 24),
 		MOB_RETREAT_DISTANCE_LIST(3, 5, 7),
 		MOB_RETREAT_DISTANCE_CHANGE_PER_TURN_CHANCE(100),
@@ -289,8 +285,6 @@
 	is_smol = TRUE
 
 	variation_list = list(
-		MOB_SPEED_LIST(0.2, 1.5, 1.8, 2.0, 5.0),
-		MOB_SPEED_CHANGE_PER_TURN_CHANCE(50),
 		MOB_HEALTH_LIST(30, 35, 40, 45, 50),
 		MOB_RETREAT_DISTANCE_LIST(3, 5, 7),
 		MOB_RETREAT_DISTANCE_CHANGE_PER_TURN_CHANCE(100),

diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm
@@ -145,7 +145,7 @@ GLOBAL_LIST_EMPTY(playmob_cooldowns)
 	var/death_sound = null
 
 	var/allow_movement_on_non_turfs = FALSE
-	var/move_to_delay = 3.5
+	var/move_to_delay = 4
 	var/minimum_distance = 0
 	var/target_coords
 	var/RTS_move_target_range = 2