cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-28 15:47:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Smooths the gliding of moving trams and its passengers. [MDB IGNORE] (#9488)

Browse Source 
* Smooths the gliding of moving trams and its passengers. (#62587)

This makes the glide size of movables inside a tram match that of the platform they are on when the tram is moving (which should in turn match the tramprocess substystem wait).

This will stop slower mobs from looking all jittery when moving on a tram at the cost of a blockier movement while moving inside a moving tram*. This is a small price to pay also considering there's not much space to move around inside the tram anyway and it isn't as annoying.

*Byond/our code doesn't support concurrent glide sizes ( basically if you try to change it midmovement, it'll also update the speed of the current movement step). There's no efficient and universal solution to this.

* Smooths the gliding of moving trams and its passengers.

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
This commit is contained in:
SkyratBot
2021-11-16 08:33:09 -05:00
committed by GitHub
co-authored by Ghom
parent 863101aab4
commit af127f47b1
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/industrial_lift.dm
+11 -8
View File
@@ -70,7 +70,7 @@
* This is a SAFE proc, ensuring every part of the lift moves SANELY.
* It also locks controls for the (miniscule) duration of the movement, so the elevator cannot be broken by spamming.
*/
/datum/lift_master/proc/MoveLiftHorizontal(going, z)
/datum/lift_master/proc/MoveLiftHorizontal(going, z, gliding_amount = 8)
var/max_x = 1
var/max_y = 1
var/min_x = world.maxx
@@ -93,12 +93,12 @@
//Go along the Y axis from max to min, from up to down
for(var/y in max_y to min_y step -1)
var/obj/structure/industrial_lift/lift_platform = locate(/obj/structure/industrial_lift, locate(x, y, z))
lift_platform?.travel(going)
lift_platform?.travel(going, gliding_amount)
else
//Go along the Y axis from min to max, from down to up
for(var/y in min_y to max_y)
var/obj/structure/industrial_lift/lift_platform = locate(/obj/structure/industrial_lift, locate(x, y, z))
lift_platform?.travel(going)
lift_platform?.travel(going, gliding_amount)
else
//Go along the X axis from max to min, from right to left
for(var/x in max_x to min_x step -1)
@@ -106,12 +106,12 @@
//Go along the Y axis from max to min, from up to down
for(var/y in max_y to min_y step -1)
var/obj/structure/industrial_lift/lift_platform = locate(/obj/structure/industrial_lift, locate(x, y, z))
lift_platform?.travel(going)
lift_platform?.travel(going, gliding_amount)
else
//Go along the Y axis from min to max, from down to up
for(var/y in min_y to max_y)
var/obj/structure/industrial_lift/lift_platform = locate(/obj/structure/industrial_lift, locate(x, y, z))
lift_platform?.travel(going)
lift_platform?.travel(going, gliding_amount)
set_controls(UNLOCKED)
///Check destination turfs
@@ -220,7 +220,7 @@ GLOBAL_LIST_EMPTY(lifts)
continue
. += neighbor
/obj/structure/industrial_lift/proc/travel(going)
/obj/structure/industrial_lift/proc/travel(going, gliding_amount = 8)
var/list/things2move = LAZYCOPY(lift_load)
var/turf/destination
if(!isturf(going))
@@ -285,8 +285,11 @@ GLOBAL_LIST_EMPTY(lifts)
//if going EAST, will turn to the NORTHEAST or SOUTHEAST and throw the ran over guy away
var/datum/callback/land_slam = new(collided, /mob/living/.proc/tram_slam_land)
collided.throw_at(throw_target, 200, 4, callback = land_slam)
set_glide_size(gliding_amount)
forceMove(destination)
for(var/atom/movable/thing as anything in things2move)
thing.set_glide_size(gliding_amount) //matches the glide size of the moving platform to stop them from jittering on it.
thing.forceMove(destination)
/obj/structure/industrial_lift/proc/use(mob/living/user)
@@ -496,7 +499,7 @@ GLOBAL_DATUM(central_tram, /obj/structure/industrial_lift/tram/central)
return PROCESS_KILL
else
travel_distance--
lift_master_datum.MoveLiftHorizontal(travel_direction, z)
lift_master_datum.MoveLiftHorizontal(travel_direction, z, DELAY_TO_GLIDE_SIZE(SStramprocess.wait))
/**
* Handles moving the tram
@@ -522,7 +525,7 @@ GLOBAL_DATUM(central_tram, /obj/structure/industrial_lift/tram/central)
SEND_SIGNAL(src, COMSIG_TRAM_TRAVEL, from_where, to_where)
other_tram_part.set_travelling(TRUE)
other_tram_part.from_where = to_where
lift_master_datum.MoveLiftHorizontal(travel_direction, z)
lift_master_datum.MoveLiftHorizontal(travel_direction, z, DELAY_TO_GLIDE_SIZE(SStramprocess.wait))
travel_distance--
START_PROCESSING(SStramprocess, src)