From 9f24f8efd61974b4c4b6a2f0712a3274aa6a5b4c Mon Sep 17 00:00:00 2001 From: Fox-McCloud Date: Fri, 9 Jan 2015 22:26:21 -0500 Subject: [PATCH] Movement Speed --- code/modules/mob/living/carbon/alien/humanoid/humanoid.dm | 8 ++++---- code/modules/mob/living/carbon/human/human_movement.dm | 7 ++++--- code/modules/mob/mob_movement.dm | 6 +++--- code/setup.dm | 2 +- config/example/config.txt | 4 ++-- config/example/game_options.txt | 6 +++--- 6 files changed, 17 insertions(+), 16 deletions(-) diff --git a/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm b/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm index 0eb6fe764ee..6926fa1c29c 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm @@ -53,13 +53,13 @@ /mob/living/carbon/alien/humanoid/movement_delay() var/tally = 0 if (istype(src, /mob/living/carbon/alien/humanoid/queen)) - tally += 4 + tally += 5 if (istype(src, /mob/living/carbon/alien/humanoid/drone)) - tally += 0 + tally += 1 if (istype(src, /mob/living/carbon/alien/humanoid/sentinel)) - tally += 0 + tally += 1 if (istype(src, /mob/living/carbon/alien/humanoid/hunter)) - tally = -2 // hunters go supersuperfast + tally = -1 // hunters go supersuperfast return (tally + move_delay_add + config.alien_delay) /mob/living/carbon/alien/humanoid/Process_Spacemove(var/check_drift = 0) diff --git a/code/modules/mob/living/carbon/human/human_movement.dm b/code/modules/mob/living/carbon/human/human_movement.dm index 0f7e7ee1ce2..01bbfe7f5f3 100644 --- a/code/modules/mob/living/carbon/human/human_movement.dm +++ b/code/modules/mob/living/carbon/human/human_movement.dm @@ -14,13 +14,14 @@ if((M_RUN in mutations)) return -1 var/health_deficiency = (100 - health + staminaloss) - - if(health_deficiency >= 40) tally += (health_deficiency / 25) + if(health_deficiency >= 40) + tally += (health_deficiency / 25) if(halloss >= 10) tally += (halloss / 10) var/hungry = (500 - nutrition)/5 // So overeat would be 100 and default level would be 80 - if (hungry >= 70) tally += hungry/50 + if (hungry >= 70) + tally += hungry/50 if(wear_suit) tally += wear_suit.slowdown diff --git a/code/modules/mob/mob_movement.dm b/code/modules/mob/mob_movement.dm index 1e695cc2f1c..65a6ef220cd 100644 --- a/code/modules/mob/mob_movement.dm +++ b/code/modules/mob/mob_movement.dm @@ -245,14 +245,14 @@ if("run") if(mob.drowsyness > 0) move_delay += 6 - move_delay += 1+config.run_speed + move_delay += config.run_speed if("walk") - move_delay += 7+config.walk_speed + move_delay += config.walk_speed move_delay += mob.movement_delay() if(config.Tickcomp) move_delay -= 1.3 - var/tickcomp = ((1/(world.tick_lag))*1.3) + var/tickcomp = (1 / (world.tick_lag)) * 1.3 move_delay = move_delay + tickcomp if(istype(mob.buckled, /obj/vehicle) || istype(mob.buckled, /obj/structure/stool/bed/chair/cart)) diff --git a/code/setup.dm b/code/setup.dm index 84677e51c42..a506e6b5060 100644 --- a/code/setup.dm +++ b/code/setup.dm @@ -167,7 +167,7 @@ var/MAX_EXPLOSION_RANGE = 14 #define FLOWFRAC 0.99 // fraction of gas transfered per process -#define SHOES_SLOWDOWN -1.0 // How much shoes slow you down by default. Negative values speed you up +#define SHOES_SLOWDOWN 0 // How much shoes slow you down by default. Negative values speed you up //ITEM INVENTORY SLOT BITMASKS diff --git a/config/example/config.txt b/config/example/config.txt index 0e37f61e307..8f305573c67 100644 --- a/config/example/config.txt +++ b/config/example/config.txt @@ -185,10 +185,10 @@ LOAD_JOBS_FROM_TXT ## Remove the # to allow special 'Easter-egg' events on special holidays such as seasonal holidays and stuff like 'Talk Like a Pirate Day' :3 YAARRR ALLOW_HOLIDAYS ##Defines the ticklag for the world. 0.9 is the normal one, 0.5 is smoother. -TICKLAG 0.5 +TICKLAG 0.9 ## Defines if Tick Compensation is used. It results in a minor slowdown of movement of all mobs, but attempts to result in a level movement speed across all ticks. Recommended if tickrate is lowered. -TICKCOMP 1 +TICKCOMP 0 ## Whether the server will talk to other processes through socket_talk SOCKET_TALK 0 diff --git a/config/example/game_options.txt b/config/example/game_options.txt index 2b3cf1dded2..4040f7b1e27 100644 --- a/config/example/game_options.txt +++ b/config/example/game_options.txt @@ -1,7 +1,7 @@ ### HEALTH ### ## level of health at which a mob becomes unconscious (crit) -HEALTH_THRESHOLD_CRIT -0 +HEALTH_THRESHOLD_CRIT -50 ## level of health at which a mob becomes dead HEALTH_THRESHOLD_DEAD -100 @@ -19,7 +19,7 @@ ORGAN_HEALTH_MULTIPLIER 100 ## multiplier which influences how fast organs regenerate naturally ## 100 means normal, 50 means half -ORGAN_REGENERATION_MULTIPLIER 100 +ORGAN_REGENERATION_MULTIPLIER 0 ### REVIVAL ### @@ -43,7 +43,7 @@ REVIVAL_BRAIN_LIFE -1 ## These modify the run/walk speed of all mobs before the mob-specific modifiers are applied. RUN_SPEED 1 -WALK_SPEED 3 +WALK_SPEED 4 ## The variables below affect the movement of specific mob types.