cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-30 08:29:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix Ship Acceleration (Without Byond 516) (#21625)

Browse Source 
This PR fixes some math errors in Overmap Ship math that were causing
ships to have entirely wrong acceleration when moving in any diagonal
direction. It was off by about 30% in the diagonal directions. This is
also an alternate PR to #21620 which doesn't require changing the repo
to Byond 516

I hate this so much more than the other PR, I really badly need Vectors
for doing what I do, and to do stuff like this PR so much better.
This commit is contained in:
VMSolidus
2025-11-30 11:18:35 +00:00
committed by GitHub
parent 3541ce57fd
commit ee30451d9a
3 changed files with 45 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/overmap/ships/ship.dm
+26 -13
View File
@@ -199,25 +199,38 @@
return round(num_burns/burns_per_grid)
/obj/effect/overmap/visitable/ship/proc/decelerate()
if(((speed[1]) || (speed[2])) && can_burn())
if (speed[1])
adjust_speed(-SIGN(speed[1]) * min(get_burn_acceleration(),abs(speed[1])), 0)
if (speed[2])
adjust_speed(0, -SIGN(speed[2]) * min(get_burn_acceleration(),abs(speed[2])))
if(can_burn())
// Pythagorean theorem gives us the magnitude of the ship's velocity, which is always an absolute value.
// This is also the mathematical definition for Vector.size
var/magnitude_velocity = ((speed[1] ** 2) + (speed[2] **2)) ** (1/2)
// Get the magnitude of our desired change in velocity
var/alpha = min(get_burn_acceleration(), magnitude_velocity)
// First we "Normalize" the current velocity to get the direction without a distance
// Then we take the exact negative of this direction to get its true opposite
// And finally multiply by the magnitude of our desired delta_v to get the true delta_v
var/delta_x = -(speed[1] / magnitude_velocity) * alpha
var/delta_y = -(speed[2] / magnitude_velocity) * alpha
adjust_speed(delta_x, delta_y)
last_burn = world.time
/obj/effect/overmap/visitable/ship/proc/accelerate(direction, accel_limit)
if(can_burn())
last_burn = world.time
// Get our "Alpha" value as the ship's desired acceleration (change in Velocity)
var/acceleration = min(get_burn_acceleration(), accel_limit)
if(direction & EAST)
adjust_speed(acceleration, 0)
if(direction & WEST)
adjust_speed(-acceleration, 0)
if(direction & NORTH)
adjust_speed(0, acceleration)
if(direction & SOUTH)
adjust_speed(0, -acceleration)
// Convert from cardinal directions to an angle (in degrees)
// !This is absolutely terrible and should at some point be swapped to Radians
// !But for now it's "Okay" until overmap ships are updated to work on time differentials properly.
var/theta = dir2degree(direction)
// This comes from the actual definition of a Vector2d, <Acos(theta), Asin(theta)>, where theta is an Angle, and A is a constant multiplier that traditionally represents distance.
// In this case A is our DeltaVelocity, or Acceleration.
adjust_speed(acceleration * cos(theta), acceleration * sin(theta))
/obj/effect/overmap/visitable/ship/process()
..()