cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2026-08-27 14:46:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'allow-old-shifting' of https://github.com/DeDrascol/Snowstorm-Station-13 into pixelshift

Browse Source
This commit is contained in:
BongaTheProto
2023-05-19 17:32:38 -05:00
parent 22704761d3 556840700f
commit 635fc04860
4 changed files with 20 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modular_sand/code/modules/pixel_shift/pixel_shift.dm
+8 -14
View File
@@ -1,6 +1,3 @@
#define MAXIMUM_PIXEL_SHIFT 16
#define PASSABLE_SHIFT_THRESHOLD 8
/mob
/// If we are in the shifting setting.
var/shifting = FALSE
@@ -60,35 +57,35 @@
passthroughable = NONE
// switch(direction) // diagonal pixel-shifting, rejoice
if(CHECK_BITFIELD(direction, NORTH))
if(pixel_y <= MAXIMUM_PIXEL_SHIFT + base_pixel_y)
if(pixel_y <= PIXEL_SHIFT_MAXIMUM + base_pixel_y)
pixel_y++
client?.pixel_y++
is_shifted = TRUE
if(CHECK_BITFIELD(direction, EAST))
if(pixel_x <= MAXIMUM_PIXEL_SHIFT + base_pixel_x)
if(pixel_x <= PIXEL_SHIFT_MAXIMUM + base_pixel_x)
pixel_x++
client?.pixel_x++
is_shifted = TRUE
if(CHECK_BITFIELD(direction, SOUTH))
if(pixel_y >= -MAXIMUM_PIXEL_SHIFT + base_pixel_y)
if(pixel_y >= -PIXEL_SHIFT_MAXIMUM + base_pixel_y)
pixel_y--
client?.pixel_y--
is_shifted = TRUE
if(CHECK_BITFIELD(direction, WEST))
if(pixel_x >= -MAXIMUM_PIXEL_SHIFT + base_pixel_x)
if(pixel_x >= -PIXEL_SHIFT_MAXIMUM + base_pixel_x)
pixel_x--
client?.pixel_x--
is_shifted = TRUE
// Yes, I know this sets it to true for everything if more than one is matched.
// Movement doesn't check diagonals, and instead just checks EAST or WEST, depending on where you are for those.
if(pixel_y > PASSABLE_SHIFT_THRESHOLD)
if(pixel_y > PIXEL_SHIFT_PASSABLE_THRESHOLD)
passthroughable |= EAST | SOUTH | WEST
if(pixel_x > PASSABLE_SHIFT_THRESHOLD)
if(pixel_x > PIXEL_SHIFT_PASSABLE_THRESHOLD)
passthroughable |= NORTH | SOUTH | WEST
if(pixel_y < -PASSABLE_SHIFT_THRESHOLD)
if(pixel_y < -PIXEL_SHIFT_PASSABLE_THRESHOLD)
passthroughable |= NORTH | EAST | WEST
if(pixel_x < -PASSABLE_SHIFT_THRESHOLD)
if(pixel_x < -PIXEL_SHIFT_PASSABLE_THRESHOLD)
passthroughable |= NORTH | EAST | SOUTH
/mob/living/Login()
@@ -102,6 +99,3 @@
if(!istype(mover, /obj/item/projectile) && !mover.throwing && passthroughable & get_dir(src, mover))
return TRUE
return ..()
#undef MAXIMUM_PIXEL_SHIFT
#undef PASSABLE_SHIFT_THRESHOLD