Merge pull request #8790 from Spookerton/spkrtn/cng/move-it-move-it

unuses DS2NEARESTTICK, fixes a diagonal snafu
This commit is contained in:
Atermonera
2022-10-24 21:15:26 -08:00
committed by GitHub
2 changed files with 3 additions and 3 deletions

View File

@@ -155,7 +155,7 @@ default behaviour is:
now_pushing = 0
return
var/move_time = movement_delay(loc, t) * SQRT_TWO
move_time = DS2NEARESTTICK(move_time)
//move_time = DS2NEARESTTICK(move_time)
if(AM.Move(T2, t, move_time))
Move(T, t, move_time)

View File

@@ -285,7 +285,7 @@
direct = turn(direct, pick(90, -90))
n = get_step(my_mob, direct)
total_delay = DS2NEARESTTICK(total_delay) //Rounded to the next tick in equivalent ds
//total_delay = DS2NEARESTTICK(total_delay) //Rounded to the next tick in equivalent ds
my_mob.setMoveCooldown(total_delay)
if(istype(my_mob.pulledby, /obj/structure/bed/chair/wheelchair))
@@ -297,7 +297,7 @@
// If we ended up moving diagonally, increase delay.
if((direct & (direct - 1)) && mob.loc == n)
my_mob.setMoveCooldown(total_delay * 2)
my_mob.setMoveCooldown(total_delay * SQRT_TWO)
// If we have a grab
var/list/grablist = my_mob.ret_grab()