mirror of
https://github.com/PolarisSS13/Polaris.git
synced 2026-08-30 00:30:06 +01:00
Merge pull request #7246 from VOREStation/vplk-overmap-pixel-movement
[PORT] Overmap Ship Pixel Movement
This commit is contained in:
Atermonera
@@ -150,7 +150,7 @@
|
||||
var/area/overmap/A = new
|
||||
for (var/square in block(locate(1,1,global.using_map.overmap_z), locate(global.using_map.overmap_size,global.using_map.overmap_size,global.using_map.overmap_z)))
|
||||
var/turf/T = square
|
||||
if(T.x == global.using_map.overmap_size || T.y == global.using_map.overmap_size)
|
||||
if(T.x == 1 || T.y == 1 || T.x == global.using_map.overmap_size || T.y == global.using_map.overmap_size)
|
||||
T = T.ChangeTurf(/turf/unsimulated/map/edge)
|
||||
else
|
||||
T = T.ChangeTurf(/turf/unsimulated/map)
|
||||
|
||||
@@ -12,18 +12,21 @@
|
||||
/obj/effect/overmap/visitable/ship
|
||||
name = "generic ship"
|
||||
desc = "Space faring vessel."
|
||||
dir = NORTH
|
||||
icon_state = "ship"
|
||||
appearance_flags = TILE_BOUND|KEEP_TOGETHER|LONG_GLIDE
|
||||
var/moving_state = "ship_moving"
|
||||
|
||||
var/vessel_mass = 10000 //tonnes, arbitrary number, affects acceleration provided by engines
|
||||
var/vessel_size = SHIP_SIZE_LARGE //arbitrary number, affects how likely are we to evade meteors
|
||||
var/max_speed = 1/(1 SECOND) //"speed of light" for the ship, in turfs/tick.
|
||||
var/max_speed = 1/(1 SECOND) //"speed of light" for the ship, in turfs/decisecond.
|
||||
var/min_speed = 1/(2 MINUTES) // Below this, we round speed to 0 to avoid math errors.
|
||||
|
||||
var/position_x // Pixel coordinates in the world
|
||||
var/position_y // Pixel coordinates in the world.
|
||||
var/list/speed = list(0,0) //speed in x,y direction
|
||||
var/last_burn = 0 //worldtime when ship last acceleated
|
||||
var/burn_delay = 1 SECOND //how often ship can do burns
|
||||
var/list/last_movement = list(0,0) //worldtime when ship last moved in x,y direction
|
||||
var/fore_dir = NORTH //what dir ship flies towards for purpose of moving stars effect procs
|
||||
|
||||
var/list/engines = list()
|
||||
@@ -38,10 +41,11 @@
|
||||
min_speed = round(min_speed, SHIP_MOVE_RESOLUTION)
|
||||
max_speed = round(max_speed, SHIP_MOVE_RESOLUTION)
|
||||
SSshuttles.ships += src
|
||||
START_PROCESSING(SSobj, src)
|
||||
position_x = ((loc.x - 1) * WORLD_ICON_SIZE) + (WORLD_ICON_SIZE/2) + pixel_x + 1
|
||||
position_y = ((loc.y - 1) * WORLD_ICON_SIZE) + (WORLD_ICON_SIZE/2) + pixel_y + 1
|
||||
|
||||
/obj/effect/overmap/visitable/ship/Destroy()
|
||||
STOP_PROCESSING(SSobj, src)
|
||||
STOP_PROCESSING(SSprocessing, src)
|
||||
SSshuttles.ships -= src
|
||||
. = ..()
|
||||
|
||||
@@ -93,14 +97,22 @@
|
||||
return (ATAN2(speed[2], speed[1]) + 360) % 360 // Yes ATAN2(y, x) is correct to get clockwise degrees
|
||||
|
||||
/obj/effect/overmap/visitable/ship/proc/adjust_speed(n_x, n_y)
|
||||
var/old_still = is_still()
|
||||
CHANGE_SPEED_BY(speed[1], n_x)
|
||||
CHANGE_SPEED_BY(speed[2], n_y)
|
||||
for(var/zz in map_z)
|
||||
if(is_still())
|
||||
toggle_move_stars(zz)
|
||||
else
|
||||
toggle_move_stars(zz, fore_dir)
|
||||
update_icon()
|
||||
var/still = is_still()
|
||||
if(still == old_still)
|
||||
return
|
||||
else if(still)
|
||||
STOP_PROCESSING(SSprocessing, src)
|
||||
for(var/zz in map_z)
|
||||
toggle_move_stars(zz)
|
||||
else
|
||||
START_PROCESSING(SSprocessing, src)
|
||||
glide_size = WORLD_ICON_SIZE/max(DS2TICKS(SSprocessing.wait), 1) //Down to whatever decimal
|
||||
for(var/zz in map_z)
|
||||
toggle_move_stars(zz, fore_dir)
|
||||
|
||||
/obj/effect/overmap/visitable/ship/proc/get_brake_path()
|
||||
if(!get_acceleration())
|
||||
@@ -136,26 +148,55 @@
|
||||
if(direction & SOUTH)
|
||||
adjust_speed(0, -acceleration)
|
||||
|
||||
/obj/effect/overmap/visitable/ship/process()
|
||||
if(!halted && !is_still())
|
||||
var/list/deltas = list(0,0)
|
||||
for(var/i=1, i<=2, i++)
|
||||
if(MOVING(speed[i]) && world.time > last_movement[i] + 1/abs(speed[i]))
|
||||
deltas[i] = SIGN(speed[i])
|
||||
last_movement[i] = world.time
|
||||
var/turf/newloc = locate(x + deltas[1], y + deltas[2], z)
|
||||
if(newloc)
|
||||
Move(newloc)
|
||||
update_icon()
|
||||
/obj/effect/overmap/visitable/ship/process(wait)
|
||||
var/new_position_x = position_x + (speed[1] * WORLD_ICON_SIZE * wait)
|
||||
var/new_position_y = position_y + (speed[2] * WORLD_ICON_SIZE * wait)
|
||||
|
||||
// For simplicity we assume that you can't travel more than one turf per tick. That would be hella-fast.
|
||||
var/new_turf_x = CEILING(new_position_x / WORLD_ICON_SIZE, 1)
|
||||
var/new_turf_y = CEILING(new_position_y / WORLD_ICON_SIZE, 1)
|
||||
|
||||
var/new_pixel_x = MODULUS(new_position_x, WORLD_ICON_SIZE) - (WORLD_ICON_SIZE/2) - 1
|
||||
var/new_pixel_y = MODULUS(new_position_y, WORLD_ICON_SIZE) - (WORLD_ICON_SIZE/2) - 1
|
||||
|
||||
var/new_loc = locate(new_turf_x, new_turf_y, z)
|
||||
|
||||
position_x = new_position_x
|
||||
position_y = new_position_y
|
||||
|
||||
if(new_loc != loc)
|
||||
var/turf/old_loc = loc
|
||||
Move(new_loc, NORTH, wait)
|
||||
if(get_dist(old_loc, loc) > 1)
|
||||
pixel_x = new_pixel_x
|
||||
pixel_y = new_pixel_y
|
||||
return
|
||||
animate(src, pixel_x = new_pixel_x, pixel_y = new_pixel_y, time = wait, flags = ANIMATION_END_NOW)
|
||||
|
||||
// If we get moved, update our internal tracking to account for it
|
||||
/obj/effect/overmap/visitable/ship/Moved(atom/old_loc, direction, forced = FALSE)
|
||||
. = ..()
|
||||
// If moving out of another sector start off centered in the turf.
|
||||
if(!isturf(old_loc))
|
||||
position_x = (WORLD_ICON_SIZE/2) + 1
|
||||
position_y = (WORLD_ICON_SIZE/2) + 1
|
||||
pixel_x = 0
|
||||
pixel_y = 0
|
||||
position_x = ((loc.x - 1) * WORLD_ICON_SIZE) + MODULUS(position_x, WORLD_ICON_SIZE)
|
||||
position_y = ((loc.y - 1) * WORLD_ICON_SIZE) + MODULUS(position_y, WORLD_ICON_SIZE)
|
||||
|
||||
/obj/effect/overmap/visitable/ship/update_icon()
|
||||
if(!is_still())
|
||||
icon_state = moving_state
|
||||
dir = get_heading()
|
||||
transform = matrix().Turn(get_heading_degrees())
|
||||
else
|
||||
icon_state = initial(icon_state)
|
||||
transform = null
|
||||
..()
|
||||
|
||||
/obj/effect/overmap/visitable/ship/set_dir(new_dir)
|
||||
return ..(NORTH) // NO! We always face north.
|
||||
|
||||
/obj/effect/overmap/visitable/ship/proc/burn()
|
||||
for(var/datum/ship_engine/E in engines)
|
||||
. += E.burn()
|
||||
@@ -175,10 +216,15 @@
|
||||
//deciseconds to next step
|
||||
/obj/effect/overmap/visitable/ship/proc/ETA()
|
||||
. = INFINITY
|
||||
for(var/i=1, i<=2, i++)
|
||||
if(MOVING(speed[i]))
|
||||
. = min(last_movement[i] - world.time + 1/abs(speed[i]), .)
|
||||
. = max(.,0)
|
||||
if(MOVING(speed[1]))
|
||||
var/offset = MODULUS(position_x, WORLD_ICON_SIZE)
|
||||
var/dist_to_go = (speed[1] > 0) ? (WORLD_ICON_SIZE - offset) : offset
|
||||
. = min(., (dist_to_go / abs(speed[1])) * (1/WORLD_ICON_SIZE))
|
||||
if(MOVING(speed[2]))
|
||||
var/offset = MODULUS(position_y, WORLD_ICON_SIZE)
|
||||
var/dist_to_go = (speed[2] > 0) ? (WORLD_ICON_SIZE - offset) : offset
|
||||
. = min(., (dist_to_go / abs(speed[2])) * (1/WORLD_ICON_SIZE))
|
||||
. = max(., 0)
|
||||
|
||||
/obj/effect/overmap/visitable/ship/proc/halt()
|
||||
adjust_speed(-speed[1], -speed[2])
|
||||
|
||||
@@ -19,7 +19,10 @@ var/global/list/map_sectors = list()
|
||||
var/turf/unsimulated/map/edge/wrap_buddy
|
||||
|
||||
/turf/unsimulated/map/edge/Initialize()
|
||||
. = ..()
|
||||
..()
|
||||
return INITIALIZE_HINT_LATELOAD
|
||||
|
||||
/turf/unsimulated/map/edge/LateInitialize()
|
||||
//This could be done by using the using_map.overmap_size much faster, HOWEVER, doing it programatically to 'find'
|
||||
// the edges this way allows for 'sub overmaps' elsewhere and whatnot.
|
||||
for(var/side in alldirs) //The order of this list is relevant: It should definitely break on finding a cardinal FIRST.
|
||||
|
||||
Reference in New Issue
Block a user