Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Modify movedelay for mecha #564

Merged
merged 2 commits into from
Oct 13, 2024
Merged

Modify movedelay for mecha #564

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e5a1290
edit speed
larentoun Oct 13, 2024
847b64a
modify cooldown declares, not base speed
larentoun Oct 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion code/datums/components/riding/riding.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@
/datum/component/riding/proc/driver_move(atom/movable/movable_parent, mob/living/user, direction)
SIGNAL_HANDLER
SHOULD_CALL_PARENT(TRUE)
movable_parent.set_glide_size(DELAY_TO_GLIDE_SIZE(vehicle_move_delay))
movable_parent.set_glide_size(DELAY_TO_GLIDE_SIZE(modified_move_delay(vehicle_move_delay))) // BANDASTATION EDIT - Vehicle speed

/// So we can check all occupants when we bump a door to see if anyone has access
/datum/component/riding/proc/vehicle_bump(atom/movable/movable_parent, obj/machinery/door/possible_bumped_door)
Expand Down
2 changes: 1 addition & 1 deletion code/datums/components/riding/riding_mob.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@
var/mob/living/living_parent = parent
step(living_parent, direction)
var/modified_move_cooldown = vehicle_move_cooldown
var/modified_move_delay = vehicle_move_delay
var/modified_move_delay = modified_move_delay(vehicle_move_delay)
if(ishuman(user) && HAS_TRAIT(user, TRAIT_ROUGHRIDER)) // YEEHAW!
var/mob/living/carbon/human/rough_rider = user
var/ride_benefit = null
Expand Down
2 changes: 1 addition & 1 deletion code/datums/components/riding/riding_vehicle.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@
return

step(movable_parent, direction)
COOLDOWN_START(src, vehicle_move_cooldown, vehicle_move_delay)
COOLDOWN_START(src, vehicle_move_cooldown, modified_move_delay(vehicle_move_delay)) // BANDASTATION EDIT - Vehicle speed

if(QDELETED(src))
return
Expand Down
2 changes: 1 addition & 1 deletion code/datums/elements/ridable.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@
return
var/speed_limit = round(CONFIG_GET(number/movedelay/run_delay) * 0.85, 0.01)
var/datum/component/riding/theoretical_riding_component = riding_component_type
var/theoretical_speed = initial(theoretical_riding_component.vehicle_move_delay)
var/theoretical_speed = modified_move_delay(initial(theoretical_riding_component.vehicle_move_delay)) // BANDASTATION EDIT - Vehicle speed
if(theoretical_speed <= speed_limit) // i say speed but this is actually move delay, so you have to be ABOVE the speed limit to pass
to_chat(user, span_warning("[ridable_atom] can't be made any faster!"))
return
Expand Down
2 changes: 1 addition & 1 deletion code/modules/vehicles/cars/car.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@
/obj/vehicle/sealed/car/vehicle_move(direction)
if(!COOLDOWN_FINISHED(src, cooldown_vehicle_move))
return FALSE
COOLDOWN_START(src, cooldown_vehicle_move, vehicle_move_delay)
COOLDOWN_START(src, cooldown_vehicle_move, modified_move_delay(vehicle_move_delay)) // BANDASTATION EDIT - Vehicle speed

if(COOLDOWN_FINISHED(src, enginesound_cooldown))
COOLDOWN_START(src, enginesound_cooldown, engine_sound_length)
Expand Down
4 changes: 2 additions & 2 deletions code/modules/vehicles/mecha/mecha_movement.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
/obj/vehicle/sealed/mecha/vehicle_move(direction, forcerotate = FALSE)
if(!COOLDOWN_FINISHED(src, cooldown_vehicle_move))
return FALSE
COOLDOWN_START(src, cooldown_vehicle_move, movedelay)
COOLDOWN_START(src, cooldown_vehicle_move, modified_move_delay(movedelay)) // BANDASTATION EDIT - Vehicle speed
if(completely_disabled)
return FALSE
if(!direction)
Expand Down Expand Up @@ -138,7 +138,7 @@
if(keyheld || !pivot_step) //If we pivot step, we don't return here so we don't just come to a stop
return TRUE

set_glide_size(DELAY_TO_GLIDE_SIZE(movedelay))
set_glide_size(DELAY_TO_GLIDE_SIZE(modified_move_delay(movedelay))) // BANDASTATION EDIT - Vehicle speed
//Otherwise just walk normally
. = try_step_multiz(direction)
if(phasing)
Expand Down
12 changes: 4 additions & 8 deletions modular_bandastation/balance/code/balance_riding.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,10 @@
#define TG_SPEED 1.5
#define RP_SPEED CONFIG_GET(number/movedelay/run_delay)

/datum/component/riding/Initialize(mob/living/riding_mob, force, buckle_mob_flags, potion_boost)
. = ..()
if(. == COMPONENT_INCOMPATIBLE)
return
if(vehicle_move_delay == 0)
vehicle_move_delay = round(max(RP_SPEED - TG_SPEED, 0) * TG_SPEED, 0.01)
return
vehicle_move_delay = round(RP_SPEED / TG_SPEED * vehicle_move_delay, 0.01)
/proc/modified_move_delay(move_delay)
if(move_delay == 0)
return round(max(RP_SPEED - TG_SPEED, 0) * TG_SPEED, 0.01)
return round(RP_SPEED / TG_SPEED * move_delay, 0.01)

#undef TG_SPEED
#undef RP_SPEED
Loading