From 2f82a27ab254902ad66daacc8745b9c06e5e6ef1 Mon Sep 17 00:00:00 2001
From: yuni <hut@hut.pm>
Date: Sat, 8 Jun 2024 01:19:17 +0200
Subject: [PATCH 01/23] change player's orbital position based on game start
 time

---
 src/data/defs.txt | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/data/defs.txt b/src/data/defs.txt
index 2d75984..f23d175 100644
--- a/src/data/defs.txt
+++ b/src/data/defs.txt
@@ -122,11 +122,11 @@ actor 0 0 0
                 only_in_map_at_dist 1e7 amalthea
                 clickable no
                 physics off
-        actor 0 127093 0 moonlet
+        actor 0 0 0 moonlet
             name Thebe
             relativeto jupiter
             id thebe
-            orbit 221900e3 0.34
+            orbitaround jupiter 221900e3
             scale 50e3
             moon yes
             angularmomentum 0 0.025 0
@@ -259,7 +259,8 @@ actor 0 0 0
 actor 0 593051 0 suitv2
     template person
     relativeto jupiter
-    orbit 221900e3 0.338
+    orbitaround jupiter 221900e3
+    orbit_phase_offset 0.002
     player yes
     id player
     wants maxvelocity none

From 797b10625593e688b191ec3f48d882afc1b9ad61 Mon Sep 17 00:00:00 2001
From: yuni <hut@hut.pm>
Date: Sat, 8 Jun 2024 01:21:41 +0200
Subject: [PATCH 02/23] lower player closer to the orbital plane

---
 src/data/defs.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/data/defs.txt b/src/data/defs.txt
index f23d175..3fd429e 100644
--- a/src/data/defs.txt
+++ b/src/data/defs.txt
@@ -256,7 +256,7 @@ actor 0 0 0
             physics off
 
 
-actor 0 593051 0 suitv2
+actor 0 59305 0 suitv2
     template person
     relativeto jupiter
     orbitaround jupiter 221900e3

From 159dfe8e1943eaaf8c256301b32a9f6b49d75be4 Mon Sep 17 00:00:00 2001
From: yuni <hut@hut.pm>
Date: Sat, 8 Jun 2024 02:34:18 +0200
Subject: [PATCH 03/23] add comment

---
 src/nature.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/nature.rs b/src/nature.rs
index 6b47701..fa35ab1 100644
--- a/src/nature.rs
+++ b/src/nature.rs
@@ -163,6 +163,7 @@ pub fn inverse_lorentz_factor_custom_c(speed: f64, c: f64) -> f64 {
     (1.0 - (speed.powf(2.0) / c.powf(2.0))).sqrt()
 }
 
+/// Calculates orbit duration in seconds, with given parameters, assuming circular orbit.
 pub fn simple_orbital_period(mass: f64, distance: f64) -> f64 {
     return 2.0 * PI * (distance.powf(3.0) / (G * mass)).sqrt();
 }

From c6750eae461504da00077a12e6f86846c9e9501e Mon Sep 17 00:00:00 2001
From: yuni <hut@hut.pm>
Date: Sat, 8 Jun 2024 02:57:25 +0200
Subject: [PATCH 04/23] add nature::orbital_velocity

---
 src/nature.rs | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/nature.rs b/src/nature.rs
index fa35ab1..78b9284 100644
--- a/src/nature.rs
+++ b/src/nature.rs
@@ -11,6 +11,7 @@
 // This module manages the messy, impure parts of our universe.
 
 use crate::prelude::*;
+use bevy::prelude::Vec3;
 
 pub const OXYGEN_USE_KG_PER_S: f32 = 1e-5;
 pub const OXY_S: f32 = OXYGEN_USE_KG_PER_S;
@@ -168,6 +169,17 @@ pub fn simple_orbital_period(mass: f64, distance: f64) -> f64 {
     return 2.0 * PI * (distance.powf(3.0) / (G * mass)).sqrt();
 }
 
+/// Calculates the orbital velocity with given parameters, assuming prograde circular orbit.
+pub fn orbital_velocity(coords: Vec3, mass: f64) -> Vec3 {
+    let r = coords.length() as f64;
+    let speed = (G * mass / r).sqrt() as f32;
+
+    // This generates a perpendicular orbital vector in the prograde direction
+    let perpendicular = Vec3::new(-coords.z, 0.0, -coords.x).normalize();
+
+    return perpendicular * speed;
+}
+
 pub fn phase_dist_to_coords(phase_radians: f64, distance: f64) -> DVec3 {
     return DVec3::new(
         distance * phase_radians.cos(),

From 169b9ee2571edfd03376c582c19114f152e39f69 Mon Sep 17 00:00:00 2001
From: yuni <hut@hut.pm>
Date: Sat, 8 Jun 2024 03:15:25 +0200
Subject: [PATCH 05/23] add nature::gravitational_acceleration, incl. test

---
 src/nature.rs | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/src/nature.rs b/src/nature.rs
index 78b9284..360059e 100644
--- a/src/nature.rs
+++ b/src/nature.rs
@@ -28,9 +28,11 @@ pub const G: f64 = 6.6743015e-11; // Gravitational constant in Nm²/kg²
 pub const SOL_RADIUS: f64 = 696_300_000.0;
 pub const JUPITER_RADIUS: f64 = 71_492_000.0;
 pub const JUPITER_RING_RADIUS: f64 = 229_000_000.0;
+pub const EARTH_RADIUS: f64 = 6_371_000.0;
 
 pub const SOL_MASS: f64 = 1.9885e30;
 pub const JUPITER_MASS: f64 = 1.8982e27;
+pub const EARTH_MASS: f64 = 5.972168e24;
 
 // Each star's values: (x, y, z, magnitude, color index, distance, name)
 pub const STARS: &[(f32, f32, f32, f32, f32, f32, &str)] = &include!("data/stars.in");
@@ -180,6 +182,22 @@ pub fn orbital_velocity(coords: Vec3, mass: f64) -> Vec3 {
     return perpendicular * speed;
 }
 
+/// Calculates the acceleration towards a mass in m/s
+pub fn gravitational_acceleration(coords: Vec3, mass: f64) -> Vec3 {
+    let r_squared = coords.length_squared() as f64;
+    let acceleration_magnitude = G * mass / r_squared;
+    return -acceleration_magnitude as f32 * (coords / r_squared.sqrt() as f32);
+}
+
+#[test]
+fn test_gravitational_acceleration() {
+    let coords = Vec3::new(EARTH_RADIUS as f32, 0.0, 0.0);
+    let mass = EARTH_MASS;
+    let g = gravitational_acceleration(coords, mass);
+    let g_rounded = (g * 10.0).round() / 10.0;
+    assert_eq!(g_rounded, Vec3::new(-9.8, 0.0, 0.0));
+}
+
 pub fn phase_dist_to_coords(phase_radians: f64, distance: f64) -> DVec3 {
     return DVec3::new(
         distance * phase_radians.cos(),

From 1614ece72afac240313d72b9c3bf8fbcb8ea5c6f Mon Sep 17 00:00:00 2001
From: yuni <hut@hut.pm>
Date: Sat, 8 Jun 2024 03:25:07 +0200
Subject: [PATCH 06/23] update the 2 new nature functions using DVec3 instead
 of Vec3

---
 src/nature.rs | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/nature.rs b/src/nature.rs
index 360059e..17b8ae2 100644
--- a/src/nature.rs
+++ b/src/nature.rs
@@ -11,7 +11,6 @@
 // This module manages the messy, impure parts of our universe.
 
 use crate::prelude::*;
-use bevy::prelude::Vec3;
 
 pub const OXYGEN_USE_KG_PER_S: f32 = 1e-5;
 pub const OXY_S: f32 = OXYGEN_USE_KG_PER_S;
@@ -172,30 +171,30 @@ pub fn simple_orbital_period(mass: f64, distance: f64) -> f64 {
 }
 
 /// Calculates the orbital velocity with given parameters, assuming prograde circular orbit.
-pub fn orbital_velocity(coords: Vec3, mass: f64) -> Vec3 {
-    let r = coords.length() as f64;
-    let speed = (G * mass / r).sqrt() as f32;
+pub fn orbital_velocity(coords: DVec3, mass: f64) -> DVec3 {
+    let r = coords.length();
+    let speed = (G * mass / r).sqrt();
 
     // This generates a perpendicular orbital vector in the prograde direction
-    let perpendicular = Vec3::new(-coords.z, 0.0, -coords.x).normalize();
+    let perpendicular = DVec3::new(-coords.z, 0.0, -coords.x).normalize();
 
     return perpendicular * speed;
 }
 
 /// Calculates the acceleration towards a mass in m/s
-pub fn gravitational_acceleration(coords: Vec3, mass: f64) -> Vec3 {
-    let r_squared = coords.length_squared() as f64;
+pub fn gravitational_acceleration(coords: DVec3, mass: f64) -> DVec3 {
+    let r_squared = coords.length_squared();
     let acceleration_magnitude = G * mass / r_squared;
-    return -acceleration_magnitude as f32 * (coords / r_squared.sqrt() as f32);
+    return -acceleration_magnitude * (coords / r_squared.sqrt());
 }
 
 #[test]
 fn test_gravitational_acceleration() {
-    let coords = Vec3::new(EARTH_RADIUS as f32, 0.0, 0.0);
+    let coords = DVec3::new(EARTH_RADIUS, 0.0, 0.0);
     let mass = EARTH_MASS;
     let g = gravitational_acceleration(coords, mass);
     let g_rounded = (g * 10.0).round() / 10.0;
-    assert_eq!(g_rounded, Vec3::new(-9.8, 0.0, 0.0));
+    assert_eq!(g_rounded, DVec3::new(-9.8, 0.0, 0.0));
 }
 
 pub fn phase_dist_to_coords(phase_radians: f64, distance: f64) -> DVec3 {

From 24a9b208bda8cdcb823338db9dc2ed6b4eeabdf2 Mon Sep 17 00:00:00 2001
From: yuni <hut@hut.pm>
Date: Sat, 8 Jun 2024 04:13:26 +0200
Subject: [PATCH 07/23] fix direction of orbital velocity

---
 src/nature.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/nature.rs b/src/nature.rs
index 17b8ae2..7071fc9 100644
--- a/src/nature.rs
+++ b/src/nature.rs
@@ -176,7 +176,7 @@ pub fn orbital_velocity(coords: DVec3, mass: f64) -> DVec3 {
     let speed = (G * mass / r).sqrt();
 
     // This generates a perpendicular orbital vector in the prograde direction
-    let perpendicular = DVec3::new(-coords.z, 0.0, -coords.x).normalize();
+    let perpendicular = DVec3::new(coords.z, 0.0, -coords.x).normalize();
 
     return perpendicular * speed;
 }

From e56f931951c87be36f64c3d5fde4988dd1c0bf7d Mon Sep 17 00:00:00 2001
From: yuni <hut@hut.pm>
Date: Sat, 8 Jun 2024 04:13:53 +0200
Subject: [PATCH 08/23] ignore gforce for 0.01s on startup, to survive a large
 starting velocity

---
 src/actor.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/actor.rs b/src/actor.rs
index 81c4151..7baef30 100644
--- a/src/actor.rs
+++ b/src/actor.rs
@@ -128,7 +128,7 @@ impl Default for ExperiencesGForce {
             visual_effect_threshold: 20.0,
             visual_effect: 0.0,
             last_linear_velocity: DVec3::splat(0.0),
-            ignore_gforce_seconds: 0.0,
+            ignore_gforce_seconds: 0.01,
         }
     }
 }

From 974bf9cb8d4e7cd916aee0c8ed0cb6a7e4859258 Mon Sep 17 00:00:00 2001
From: yuni <hut@hut.pm>
Date: Sat, 8 Jun 2024 04:14:51 +0200
Subject: [PATCH 09/23] add feature flag for toggling the generic ring
 asteroids

---
 src/world.rs | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/world.rs b/src/world.rs
index 0c09de0..05d6d32 100644
--- a/src/world.rs
+++ b/src/world.rs
@@ -19,6 +19,7 @@ use bevy_xpbd_3d::prelude::*;
 use fastrand;
 use std::collections::HashMap;
 
+const ENABLE_ASTEROIDS: bool = true;
 const ASTEROID_UPDATE_INTERVAL: f32 = 0.1; // seconds
 const ASTEROID_SIZE_FACTOR: f32 = 10.0;
 const RING_THICKNESS: f64 = 8.0e6;
@@ -36,19 +37,21 @@ pub struct WorldPlugin;
 impl Plugin for WorldPlugin {
     fn build(&self, app: &mut App) {
         app.add_systems(Startup, setup);
-        app.add_systems(PostUpdate, handle_despawn);
-        app.add_systems(Update, spawn_despawn_asteroids);
         app.add_systems(Update, handle_respawn.run_if(on_event::<RespawnEvent>()));
         app.add_plugins(PhysicsPlugins::default());
         //app.add_plugins(PhysicsDebugPlugin::default());
         app.insert_resource(Gravity(DVec3::splat(0.0)));
-        app.insert_resource(AsteroidUpdateTimer(Timer::from_seconds(
-            ASTEROID_UPDATE_INTERVAL,
-            TimerMode::Repeating,
-        )));
         app.insert_resource(ActiveAsteroids(HashMap::new()));
-        app.add_event::<DespawnAsteroidEvent>();
         app.add_event::<RespawnEvent>();
+        if ENABLE_ASTEROIDS {
+            app.insert_resource(AsteroidUpdateTimer(Timer::from_seconds(
+                ASTEROID_UPDATE_INTERVAL,
+                TimerMode::Repeating,
+            )));
+            app.add_systems(Update, spawn_despawn_asteroids);
+            app.add_systems(PostUpdate, handle_despawn_asteroids);
+            app.add_event::<DespawnAsteroidEvent>();
+        }
     }
 }
 
@@ -344,7 +347,7 @@ fn spawn_despawn_asteroids(
     }
 }
 
-fn handle_despawn(
+fn handle_despawn_asteroids(
     mut commands: Commands,
     mut er_despawn: EventReader<DespawnAsteroidEvent>,
     mut db: ResMut<ActiveAsteroids>,

From 7be6b0746fa73626eea0c5401323b7532c69a549 Mon Sep 17 00:00:00 2001
From: yuni <hut@hut.pm>
Date: Sat, 8 Jun 2024 04:15:16 +0200
Subject: [PATCH 10/23] disable ring asteroids by default

---
 src/world.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/world.rs b/src/world.rs
index 05d6d32..a703844 100644
--- a/src/world.rs
+++ b/src/world.rs
@@ -19,7 +19,7 @@ use bevy_xpbd_3d::prelude::*;
 use fastrand;
 use std::collections::HashMap;
 
-const ENABLE_ASTEROIDS: bool = true;
+const ENABLE_ASTEROIDS: bool = false;
 const ASTEROID_UPDATE_INTERVAL: f32 = 0.1; // seconds
 const ASTEROID_SIZE_FACTOR: f32 = 10.0;
 const RING_THICKNESS: f64 = 8.0e6;

From e16a650b221d143d5735b2b9b28729c5ba395ef2 Mon Sep 17 00:00:00 2001
From: yuni <hut@hut.pm>
Date: Sat, 8 Jun 2024 04:17:28 +0200
Subject: [PATCH 11/23] apply gravity towards Jupiter for objects orbiting
 Jupiter

---
 src/actor.rs | 34 ++++++++++++++++++++++++++++++++++
 src/cmd.rs   |  4 ++++
 2 files changed, 38 insertions(+)

diff --git a/src/actor.rs b/src/actor.rs
index 7baef30..ed94544 100644
--- a/src/actor.rs
+++ b/src/actor.rs
@@ -44,6 +44,7 @@ impl Plugin for ActorPlugin {
         app.add_systems(
             Update,
             (
+                handle_gravity,
                 handle_input.run_if(in_control),
                 handle_collisions,
                 handle_damage,
@@ -51,9 +52,16 @@ impl Plugin for ActorPlugin {
         );
         app.add_systems(PostUpdate, (handle_vehicle_enter_exit,));
         app.add_event::<VehicleEnterExitEvent>();
+        app.insert_resource(GravityUpdateTimer(Timer::from_seconds(
+            1.0,
+            TimerMode::Repeating,
+        )));
     }
 }
 
+#[derive(Resource)]
+pub struct GravityUpdateTimer(Timer);
+
 #[derive(Copy, Clone)]
 pub enum DamageType {
     Unknown,
@@ -157,6 +165,8 @@ pub struct WantsMaxVelocity(pub f64);
 pub struct WantsToLookAt(pub String);
 #[derive(Component)]
 pub struct Identifier(pub String);
+#[derive(Component)]
+pub struct OrbitsJupiter;
 
 #[derive(Component)]
 pub struct LifeForm {
@@ -632,3 +642,27 @@ fn handle_gforce(
         }
     }
 }
+
+fn handle_gravity(
+    time: Res<Time>,
+    mut timer: ResMut<GravityUpdateTimer>,
+    mut q_pos: Query<(&Position, &mut LinearVelocity), With<OrbitsJupiter>>,
+    id2pos: Res<game::Id2Pos>,
+) {
+    if !timer.0.tick(time.delta()).just_finished() {
+        return;
+    }
+
+    let pos_jupiter: DVec3 = if let Some(pos_jupiter) = id2pos.0.get(cmd::ID_JUPITER) {
+        *pos_jupiter
+    } else {
+        return;
+    };
+
+    // this assumes prograde orbits for every object
+    for (pos, mut v) in &mut q_pos {
+        let relative_pos = pos.0 - pos_jupiter;
+        let accel = nature::gravitational_acceleration(relative_pos, nature::JUPITER_MASS);
+        v.0 += accel;
+    }
+}
diff --git a/src/cmd.rs b/src/cmd.rs
index 54b74c1..f7f6a3e 100644
--- a/src/cmd.rs
+++ b/src/cmd.rs
@@ -668,6 +668,7 @@ fn spawn_entities(
                     1.0
                 } * state.model_scale,
             );
+            let orbits_jupiter = state.id != ID_JUPITER;
 
             // Spawn the actor
             let actor_entity;
@@ -680,6 +681,9 @@ fn spawn_entities(
                     ..default()
                 });
                 actor.insert(SleepingDisabled);
+                if orbits_jupiter {
+                    actor.insert(actor::OrbitsJupiter);
+                }
                 actor.insert(world::DespawnOnPlayerDeath);
                 actor.insert(actor::HitPoints::default());
                 actor.insert(Position::from(absolute_pos));

From d9af542d544c7eb6d8f3b93d9b89643e65cdfd4d Mon Sep 17 00:00:00 2001
From: yuni <hut@hut.pm>
Date: Sat, 8 Jun 2024 04:17:54 +0200
Subject: [PATCH 12/23] give objects orbiting jupiter an orbital velocity on
 startup

---
 src/cmd.rs | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/cmd.rs b/src/cmd.rs
index f7f6a3e..17e37e7 100644
--- a/src/cmd.rs
+++ b/src/cmd.rs
@@ -617,6 +617,12 @@ fn spawn_entities(
     settings: Res<var::Settings>,
 ) {
     for state_wrapper in er_spawn.read() {
+        let jupiter_pos: DVec3 = if let Some(jupiter_pos) = id2pos.0.get(ID_JUPITER) {
+            *jupiter_pos
+        } else {
+            warn!("Could not determine Jupiter's position");
+            DVec3::ZERO
+        };
         let state = &state_wrapper.0;
         let mut rotation = state.rotation;
         if state.class == DefClass::Actor {
@@ -669,6 +675,12 @@ fn spawn_entities(
                 } * state.model_scale,
             );
             let orbits_jupiter = state.id != ID_JUPITER;
+            let velocity = if orbits_jupiter {
+                let coords = absolute_pos - jupiter_pos;
+                state.velocity + nature::orbital_velocity(coords, nature::JUPITER_MASS)
+            } else {
+                state.velocity
+            };
 
             // Spawn the actor
             let actor_entity;
@@ -719,7 +731,7 @@ fn spawn_entities(
                 // Physics Parameters
                 if state.has_physics {
                     actor.insert(RigidBody::Dynamic);
-                    actor.insert(LinearVelocity(state.velocity));
+                    actor.insert(LinearVelocity(velocity));
                     actor.insert(AngularVelocity(state.angular_momentum));
                     actor.insert(ColliderDensity(state.density));
                     if state.collider_is_mesh {

From 76272a7fc2ffbf28016a5b65ccfbb375e829719f Mon Sep 17 00:00:00 2001
From: yuni <hut@hut.pm>
Date: Tue, 11 Jun 2024 00:05:03 +0200
Subject: [PATCH 13/23] add "target_velocity" var to handle_wants_maxvelocity()

---
 src/actor.rs | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/actor.rs b/src/actor.rs
index ed94544..483baeb 100644
--- a/src/actor.rs
+++ b/src/actor.rs
@@ -545,25 +545,32 @@ fn handle_wants_maxrotation(
     }
 }
 
+/// Slows down NPC's movement until they reach their target velocity.
 fn handle_wants_maxvelocity(
     time: Res<Time>,
     mut query: Query<(&mut LinearVelocity, &Engine, &WantsMaxVelocity)>,
 ) {
     let dt = time.delta_seconds();
     for (mut v, engine, maxv) in &mut query {
-        let total = v.0.length();
-        if total <= maxv.0 + EPSILON {
-            if total > maxv.0 {
-                v.0 = DVec3::splat(0.0);
+        let target_velocity = DVec3::splat(0.0);
+        let relative_velocity = v.0 - target_velocity;
+        let relative_speed = relative_velocity.length();
+
+        if relative_speed <= maxv.0 + EPSILON {
+            // it's already pretty close to the target
+            if relative_speed > maxv.0 {
+                // but not quite the target, so let's set it to the target
+                v.0 = target_velocity;
             }
         } else {
+            // slow it down a little bit
             // TODO: respect engine parameters for different thrusts for different directions
             let avg_thrust =
                 (engine.thrust_forward + engine.thrust_back + engine.thrust_sideways) / 3.0;
-            let acceleration = (avg_thrust * dt) as f64 * -v.0;
+            let acceleration = (avg_thrust * dt) as f64 * -relative_velocity;
             v.0 += acceleration;
             if v.0.length() + EPSILON < acceleration.length() {
-                v.0 = DVec3::splat(0.0);
+                v.0 = target_velocity;
             }
         }
     }

From cd13b529c3752f9e4d80ef903a889cb78611407d Mon Sep 17 00:00:00 2001
From: yuni <hut@hut.pm>
Date: Tue, 11 Jun 2024 00:50:25 +0200
Subject: [PATCH 14/23] base `handle_wants_maxvelocity` on current orbital
 velocity

---
 src/actor.rs | 26 ++++++++++++++++++++++----
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/src/actor.rs b/src/actor.rs
index 483baeb..755fd0d 100644
--- a/src/actor.rs
+++ b/src/actor.rs
@@ -31,7 +31,7 @@ impl Plugin for ActorPlugin {
                 update_physics_lifeforms,
                 update_power,
                 handle_wants_maxrotation,
-                handle_wants_maxvelocity,
+                handle_wants_maxvelocity.run_if(any_with_component::<WantsMaxVelocity>),
                 handle_wants_lookat.run_if(alive),
             ),
         );
@@ -548,11 +548,29 @@ fn handle_wants_maxrotation(
 /// Slows down NPC's movement until they reach their target velocity.
 fn handle_wants_maxvelocity(
     time: Res<Time>,
-    mut query: Query<(&mut LinearVelocity, &Engine, &WantsMaxVelocity)>,
+    mut query: Query<(
+        &Position,
+        &mut LinearVelocity,
+        &Engine,
+        &WantsMaxVelocity,
+        Option<&OrbitsJupiter>,
+    )>,
+    id2pos: Res<game::Id2Pos>,
 ) {
     let dt = time.delta_seconds();
-    for (mut v, engine, maxv) in &mut query {
-        let target_velocity = DVec3::splat(0.0);
+    let jupiter_pos: DVec3 = if let Some(jupiter_pos) = id2pos.0.get(cmd::ID_JUPITER) {
+        *jupiter_pos
+    } else {
+        warn!("Could not determine Jupiter's position");
+        DVec3::ZERO
+    };
+    for (pos, mut v, engine, maxv, orbits_jupiter) in &mut query {
+        let target_velocity = if orbits_jupiter.is_some() {
+            let relative_pos = pos.0 - jupiter_pos;
+            nature::orbital_velocity(relative_pos, nature::JUPITER_MASS)
+        } else {
+            DVec3::ZERO
+        };
         let relative_velocity = v.0 - target_velocity;
         let relative_speed = relative_velocity.length();
 

From 5817944a79f4c1833dc442a0f72c9cd0133182cd Mon Sep 17 00:00:00 2001
From: yuni <hut@hut.pm>
Date: Tue, 11 Jun 2024 00:50:56 +0200
Subject: [PATCH 15/23] add a line about darkness to the tutorial

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index db52e9f..53a6db5 100644
--- a/README.md
+++ b/README.md
@@ -35,6 +35,8 @@ The `SPACE` key helps you move more intuitively by slowing you down.  Hold it fo
 
 When you're ready, take a look around, explore the starting area. There is a friendly person floating nearby in a red space suit that would love to talk to you.
 
+The game is a bit dark, since it's meant to be played in the night. But maybe you're unlucky and you start with a planet or moon eclipsing the sun, making everything extra dark. (Yes, all celestial objects move in real time and have different positions depending on when you play.)  If it's too dark, try the flashlight (`f` key), turning off the shadows in the menu, and make sure that Augmented Reality is on (`TAB` key) which gives you a little extra light amplification.
+
 Press the `ESC` key for the menu to restart the game if you get lost, explore more key bindings, game features, and the **achievements** to get some guidance on what you can do in the game.
 
 But in the end, OutFly is an open world game with no true goals other than the ones you set for yourself.  Just lean back, get cozy, and drift towards whatever catches your eye :)

From 77c1bd1e6a0d804a1d0666cdc003bd97981bbece Mon Sep 17 00:00:00 2001
From: yuni <hut@hut.pm>
Date: Tue, 11 Jun 2024 00:58:56 +0200
Subject: [PATCH 16/23] add game::JupiterPos resource

---
 src/actor.rs | 20 ++++----------------
 src/game.rs  | 12 +++++++++++-
 2 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/src/actor.rs b/src/actor.rs
index 755fd0d..c5e98a3 100644
--- a/src/actor.rs
+++ b/src/actor.rs
@@ -555,18 +555,12 @@ fn handle_wants_maxvelocity(
         &WantsMaxVelocity,
         Option<&OrbitsJupiter>,
     )>,
-    id2pos: Res<game::Id2Pos>,
+    jupiter_pos: Res<game::JupiterPos>,
 ) {
     let dt = time.delta_seconds();
-    let jupiter_pos: DVec3 = if let Some(jupiter_pos) = id2pos.0.get(cmd::ID_JUPITER) {
-        *jupiter_pos
-    } else {
-        warn!("Could not determine Jupiter's position");
-        DVec3::ZERO
-    };
     for (pos, mut v, engine, maxv, orbits_jupiter) in &mut query {
         let target_velocity = if orbits_jupiter.is_some() {
-            let relative_pos = pos.0 - jupiter_pos;
+            let relative_pos = pos.0 - jupiter_pos.0;
             nature::orbital_velocity(relative_pos, nature::JUPITER_MASS)
         } else {
             DVec3::ZERO
@@ -672,21 +666,15 @@ fn handle_gravity(
     time: Res<Time>,
     mut timer: ResMut<GravityUpdateTimer>,
     mut q_pos: Query<(&Position, &mut LinearVelocity), With<OrbitsJupiter>>,
-    id2pos: Res<game::Id2Pos>,
+    jupiter_pos: Res<game::JupiterPos>,
 ) {
     if !timer.0.tick(time.delta()).just_finished() {
         return;
     }
 
-    let pos_jupiter: DVec3 = if let Some(pos_jupiter) = id2pos.0.get(cmd::ID_JUPITER) {
-        *pos_jupiter
-    } else {
-        return;
-    };
-
     // this assumes prograde orbits for every object
     for (pos, mut v) in &mut q_pos {
-        let relative_pos = pos.0 - pos_jupiter;
+        let relative_pos = pos.0 - jupiter_pos.0;
         let accel = nature::gravitational_acceleration(relative_pos, nature::JUPITER_MASS);
         v.0 += accel;
     }
diff --git a/src/game.rs b/src/game.rs
index 29f4395..8afa8ff 100644
--- a/src/game.rs
+++ b/src/game.rs
@@ -32,6 +32,7 @@ impl Plugin for GamePlugin {
         );
         app.add_systems(Update, check_achievements);
         app.insert_resource(Id2Pos(HashMap::new()));
+        app.insert_resource(JupiterPos(DVec3::ZERO));
         app.insert_resource(var::AchievementTracker::default());
         app.insert_resource(var::Settings::default());
         app.insert_resource(var::GameVars::default());
@@ -50,6 +51,8 @@ pub struct PlayerDiesEvent(pub actor::DamageType);
 #[derive(Resource)]
 pub struct Id2Pos(pub HashMap<String, DVec3>);
 #[derive(Resource)]
+pub struct JupiterPos(pub DVec3);
+#[derive(Resource)]
 pub struct AchievementCheckTimer(pub Timer);
 
 #[derive(Event)]
@@ -351,10 +354,17 @@ fn handle_cheats(
     }
 }
 
-fn update_id2pos(mut id2pos: ResMut<Id2Pos>, q_id: Query<(&Position, &actor::Identifier)>) {
+fn update_id2pos(
+    mut id2pos: ResMut<Id2Pos>,
+    mut jupiterpos: ResMut<JupiterPos>,
+    q_id: Query<(&Position, &actor::Identifier)>,
+) {
     id2pos.0.clear();
     for (pos, id) in &q_id {
         id2pos.0.insert(id.0.clone(), pos.0);
+        if id.0 == "jupiter" {
+            jupiterpos.0 = pos.0;
+        }
     }
 }
 

From d04b400fad4e5ea33cd46d186660a7345b478340 Mon Sep 17 00:00:00 2001
From: yuni <hut@hut.pm>
Date: Tue, 11 Jun 2024 01:04:23 +0200
Subject: [PATCH 17/23] "space" key now slows down relative to orbital velocity

---
 src/camera.rs | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/camera.rs b/src/camera.rs
index 93c1cd2..e8aa821 100644
--- a/src/camera.rs
+++ b/src/camera.rs
@@ -416,6 +416,7 @@ pub fn apply_input_to_player(
     time: Res<Time>,
     mut commands: Commands,
     settings: Res<var::Settings>,
+    jupiter_pos: Res<game::JupiterPos>,
     windows: Query<&Window, With<PrimaryWindow>>,
     mut mouse_events: EventReader<MouseMotion>,
     key_input: Res<ButtonInput<KeyCode>>,
@@ -426,6 +427,7 @@ pub fn apply_input_to_player(
             Entity,
             &Transform,
             &mut actor::Engine,
+            &Position,
             &mut LinearVelocity,
             &mut ExternalTorque,
             Option<&actor::PlayerDrivesThis>,
@@ -451,15 +453,15 @@ pub fn apply_input_to_player(
         win_res_y = 1050.0;
     }
 
-    let target_v: DVec3 = if let Ok(target) = q_target.get_single() {
-        target.0
-    } else {
-        DVec3::splat(0.0)
-    };
-
-    if let Ok((player_entity, player_transform, mut engine, mut v, mut torque, bike)) =
+    if let Ok((player_entity, player_transform, mut engine, pos, mut v, mut torque, bike)) =
         q_playercam.get_single_mut()
     {
+        let target_v: DVec3 = if let Ok(target) = q_target.get_single() {
+            target.0
+        } else {
+            let relative_pos = pos.0 - jupiter_pos.0;
+            nature::orbital_velocity(relative_pos, nature::JUPITER_MASS)
+        };
         // Handle key input
         if focused {
             if key_input.pressed(settings.key_forward) || settings.cruise_control_active {

From 46a030f15ef4305ef70bd9eb08db5c4e09d72a37 Mon Sep 17 00:00:00 2001
From: yuni <hut@hut.pm>
Date: Tue, 11 Jun 2024 01:12:41 +0200
Subject: [PATCH 18/23] speedometer shows speed relative to orbital velocity

---
 src/hud.rs | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/hud.rs b/src/hud.rs
index ea5b6b9..2379123 100644
--- a/src/hud.rs
+++ b/src/hud.rs
@@ -707,7 +707,8 @@ fn update_dashboard(
 fn update_speedometer(
     timer: ResMut<FPSUpdateTimer>,
     settings: Res<Settings>,
-    q_camera: Query<&LinearVelocity, With<actor::PlayerCamera>>,
+    jupiter_pos: Res<game::JupiterPos>,
+    q_camera: Query<(&LinearVelocity, &Position), With<actor::PlayerCamera>>,
     q_player: Query<&actor::ExperiencesGForce, With<actor::Player>>,
     q_target: Query<&LinearVelocity, With<IsTargeted>>,
     mut q_speedometer: Query<&mut Style, (With<Speedometer>, Without<Speedometer2>)>,
@@ -717,8 +718,9 @@ fn update_speedometer(
     if !settings.hud_active || !timer.0.just_finished() {
         return;
     }
-    if let Ok(cam_v) = q_camera.get_single() {
-        let speed = cam_v.length();
+    if let Ok((cam_v, pos)) = q_camera.get_single() {
+        let orbital_v = nature::orbital_velocity(pos.0 - jupiter_pos.0, nature::JUPITER_MASS);
+        let speed = (cam_v.0 - orbital_v).length();
 
         let speedometer_split = 5_000.0;
         if let Ok(mut speedometer) = q_speedometer.get_single_mut() {

From 3d26b0915d57a48e2a895f381f7b033f13b1f8c0 Mon Sep 17 00:00:00 2001
From: yuni <hut@hut.pm>
Date: Tue, 11 Jun 2024 02:46:31 +0200
Subject: [PATCH 19/23] add Id2V resource, "wants matchvelocitywith" command

---
 src/actor.rs      | 15 +++++++++++++--
 src/cmd.rs        |  9 +++++++++
 src/data/defs.txt | 14 ++++++++++++++
 src/game.rs       | 11 +++++++++++
 4 files changed, 47 insertions(+), 2 deletions(-)

diff --git a/src/actor.rs b/src/actor.rs
index c5e98a3..d6820e1 100644
--- a/src/actor.rs
+++ b/src/actor.rs
@@ -164,6 +164,8 @@ pub struct WantsMaxVelocity(pub f64);
 #[derive(Component)]
 pub struct WantsToLookAt(pub String);
 #[derive(Component)]
+pub struct WantsMatchVelocityWith(pub String);
+#[derive(Component)]
 pub struct Identifier(pub String);
 #[derive(Component)]
 pub struct OrbitsJupiter;
@@ -554,12 +556,21 @@ fn handle_wants_maxvelocity(
         &Engine,
         &WantsMaxVelocity,
         Option<&OrbitsJupiter>,
+        Option<&WantsMatchVelocityWith>,
     )>,
+    id2v: Res<game::Id2V>,
     jupiter_pos: Res<game::JupiterPos>,
 ) {
     let dt = time.delta_seconds();
-    for (pos, mut v, engine, maxv, orbits_jupiter) in &mut query {
-        let target_velocity = if orbits_jupiter.is_some() {
+    for (pos, mut v, engine, maxv, orbits_jupiter, matchwith) in &mut query {
+        let target_velocity = if let Some(matchwith) = matchwith {
+            if let Some(target_v) = id2v.0.get(&matchwith.0) {
+                *target_v
+            } else {
+                warn!("Can't match velocity with nonexisting ID {}", matchwith.0);
+                continue;
+            }
+        } else if orbits_jupiter.is_some() {
             let relative_pos = pos.0 - jupiter_pos.0;
             nature::orbital_velocity(relative_pos, nature::JUPITER_MASS)
         } else {
diff --git a/src/cmd.rs b/src/cmd.rs
index 17e37e7..77e13b0 100644
--- a/src/cmd.rs
+++ b/src/cmd.rs
@@ -86,6 +86,7 @@ struct ParserState {
     wants_maxrotation: Option<f64>,
     wants_maxvelocity: Option<f64>,
     wants_tolookat_id: Option<String>,
+    wants_matchvelocity_id: Option<String>,
     collider_is_mesh: bool,
     collider_is_one_mesh_of_scene: bool,
     thrust_forward: f32,
@@ -143,6 +144,7 @@ impl Default for ParserState {
             wants_maxrotation: None,
             wants_maxvelocity: None,
             wants_tolookat_id: None,
+            wants_matchvelocity_id: None,
             collider_is_mesh: false,
             collider_is_one_mesh_of_scene: false,
             thrust_forward: default_engine.thrust_forward,
@@ -582,6 +584,10 @@ pub fn load_defs(mut ew_spawn: EventWriter<SpawnEvent>) {
                 // NOTE: Will not work if the actor has no engine
                 state.wants_tolookat_id = Some(id.to_string());
             }
+            ["wants", "matchvelocitywith", id] => {
+                // NOTE: Will not work if the actor has no engine
+                state.wants_matchvelocity_id = Some(id.to_string());
+            }
             ["armodel", asset_name] => {
                 state.ar_model = Some(asset_name.to_string());
             }
@@ -815,6 +821,9 @@ fn spawn_entities(
                 if let Some(value) = &state.wants_tolookat_id {
                     actor.insert(actor::WantsToLookAt(value.clone()));
                 }
+                if let Some(value) = &state.wants_matchvelocity_id {
+                    actor.insert(actor::WantsMatchVelocityWith(value.clone()));
+                }
                 if let Some(color) = state.light_color {
                     actor.insert((
                         PointLight {
diff --git a/src/data/defs.txt b/src/data/defs.txt
index 3fd429e..505db58 100644
--- a/src/data/defs.txt
+++ b/src/data/defs.txt
@@ -288,6 +288,7 @@ actor -55e3 44e3 0 suitv2
     name "Yuni"
     chatid Yuni
     rotationx 180
+    wants matchvelocitywith thebe
 
 actor 5000 0 -3000 moonlet
     name Moonlet
@@ -309,12 +310,14 @@ actor 13200 300 -3000 hollow_asteroid
     actor 0 0 0 suitv2
         template person
         relativeto cultasteroid
+        wants matchvelocitywith cultasteroid
         name "Ash"
         chatid Ash
         pronoun they
     actor -8 8 0 suitv2
         template person
         relativeto cultasteroid
+        wants matchvelocitywith cultasteroid
         name "River"
         chatid River
         rotationy 54
@@ -443,6 +446,7 @@ actor -3300 10 0 pizzeria
         relativeto pizzeria
         armodel clippy_ar
         wants lookat PLAYERCAMERA
+        wants matchvelocitywith pizzeria
         rotationy -126
         chatid SubduedClippy
 
@@ -453,6 +457,7 @@ actor -3300 10 0 pizzeria
         chatid PizzaChef
         armodel suit_ar_chefhat
         wants lookat PLAYERCAMERA
+        wants matchvelocitywith pizzeria
         rotationy -90
         pronoun he
 
@@ -465,6 +470,7 @@ actor 30 -12 -40 suitv2
     armodel suit_ar_wings
     angularmomentum 0.4 0.2 0.1
     wants maxrotation 0.5
+    wants matchvelocitywith pizzeria
     rotationy 108
     rotationx 180
     pronoun it
@@ -496,6 +502,7 @@ actor -300 0 40 suitv2
     name "梓涵"
     chatid Drifter
     alive no
+    wants maxvelocity none
     oxygen 0.08
     pronoun she
 
@@ -506,12 +513,14 @@ actor 100 -18000 2000 clippy
     name "StarTrans Clippy™ Serenity Station"
     armodel clippy_ar
     wants lookat PLAYERCAMERA
+    wants matchvelocitywith orbbusstopserenity
     rotationy -90
     chatid ClippyTransSerenity
 
     actor 60 0 0 "orb_busstop"
         name "StarTrans Bus Stop: Serenity Station"
         relativeto busstopclippy
+        id orbbusstopserenity
         scale 5
     actor 80 0 0 "orb_busstop"
         name "StarTrans Bus Stop: Serenity Station"
@@ -638,6 +647,7 @@ actor 100 -18000 2000 clippy
     actor 8 20 0 suitv2
         template person
         relativeto "busstopclippy"
+        wants matchvelocitywith orbbusstopserenity
         name "Rudy"
         chatid NPCinCryoStasis
         pronoun he
@@ -649,12 +659,14 @@ actor -184971e3 149410e3 -134273e3 clippy
     name "StarTrans Clippy™ Farview Station"
     armodel clippy_ar
     wants lookat PLAYERCAMERA
+    wants matchvelocitywith orbbusstopfarview
     rotationy -90
     chatid ClippyTransFarview
 
     actor 60 0 0 "orb_busstop"
         name "StarTrans Bus Stop: Farview Station"
         relativeto busstopclippy2
+        id orbbusstopfarview
         scale 5
     actor 80 0 0 "orb_busstop"
         name "StarTrans Bus Stop: Farview Station"
@@ -786,6 +798,7 @@ actor 0 -44e3 0 clippy
     name "StarTrans Clippy™ Metis Prime Station"
     armodel clippy_ar
     wants lookat PLAYERCAMERA
+    wants matchvelocitywith orbbusstopmetis
     orbitaround jupiter 128000e3
     orbit_phase_offset -0.002
     rotationy -90
@@ -794,6 +807,7 @@ actor 0 -44e3 0 clippy
     actor 60 0 0 "orb_busstop"
         name "StarTrans Bus Stop: Metis Prime Station"
         relativeto busstopclippy3
+        id orbbusstopmetis
         scale 5
     actor 80 0 0 "orb_busstop"
         name "StarTrans Bus Stop: Metis Prime Station"
diff --git a/src/game.rs b/src/game.rs
index 8afa8ff..79e4fb5 100644
--- a/src/game.rs
+++ b/src/game.rs
@@ -26,12 +26,14 @@ impl Plugin for GamePlugin {
         app.add_systems(PostUpdate, handle_game_event);
         app.add_systems(PreUpdate, handle_player_death);
         app.add_systems(PostUpdate, update_id2pos);
+        app.add_systems(PostUpdate, update_id2v);
         app.add_systems(
             Update,
             handle_achievement_event.run_if(on_event::<AchievementEvent>()),
         );
         app.add_systems(Update, check_achievements);
         app.insert_resource(Id2Pos(HashMap::new()));
+        app.insert_resource(Id2V(HashMap::new()));
         app.insert_resource(JupiterPos(DVec3::ZERO));
         app.insert_resource(var::AchievementTracker::default());
         app.insert_resource(var::Settings::default());
@@ -51,6 +53,8 @@ pub struct PlayerDiesEvent(pub actor::DamageType);
 #[derive(Resource)]
 pub struct Id2Pos(pub HashMap<String, DVec3>);
 #[derive(Resource)]
+pub struct Id2V(pub HashMap<String, DVec3>);
+#[derive(Resource)]
 pub struct JupiterPos(pub DVec3);
 #[derive(Resource)]
 pub struct AchievementCheckTimer(pub Timer);
@@ -368,6 +372,13 @@ fn update_id2pos(
     }
 }
 
+fn update_id2v(mut id2v: ResMut<Id2V>, q_id: Query<(&LinearVelocity, &actor::Identifier)>) {
+    id2v.0.clear();
+    for (v, id) in &q_id {
+        id2v.0.insert(id.0.clone(), v.0);
+    }
+}
+
 fn debug(
     settings: Res<var::Settings>,
     keyboard_input: Res<ButtonInput<KeyCode>>,

From 4dd195e17a37487aa95ae3c8eca263d30137993f Mon Sep 17 00:00:00 2001
From: yuni <hut@hut.pm>
Date: Tue, 11 Jun 2024 02:54:13 +0200
Subject: [PATCH 20/23] fix velocity after traveling with busses

---
 src/chat.rs | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/chat.rs b/src/chat.rs
index 6dc0506..3bd56d4 100644
--- a/src/chat.rs
+++ b/src/chat.rs
@@ -827,6 +827,7 @@ pub fn handle_chat_scripts(
     mut ew_effect: EventWriter<visual::SpawnEffectEvent>,
     mut ew_achievement: EventWriter<game::AchievementEvent>,
     id2pos: Res<game::Id2Pos>,
+    id2v: Res<game::Id2V>,
 ) {
     for script in er_chatscript.read() {
         // Parse the script string
@@ -892,15 +893,22 @@ pub fn handle_chat_scripts(
                             _ => None,
                         };
                         if let Some(station) = busstop {
-                            if let Some(target) = id2pos.0.get(&station.to_string()) {
-                                pos.0 = *target + DVec3::new(0.0, -1000.0, 0.0);
-                                v.0 = DVec3::ZERO;
+                            if let Some(target_pos) = id2pos.0.get(&station.to_string()) {
+                                pos.0 = *target_pos + DVec3::new(0.0, -1000.0, 0.0);
                             } else {
                                 error!(
                                     "Could not determine position of actor with ID: '{}'",
                                     station
                                 );
                             }
+                            if let Some(target_v) = id2v.0.get(&station.to_string()) {
+                                v.0 = *target_v;
+                            } else {
+                                error!(
+                                    "Could not determine velocity of actor with ID: '{}'",
+                                    station
+                                );
+                            }
                         } else {
                             error!("Invalid destination for cryotrip chat script: '{}'", param1);
                         }

From 79351dc4d0225ce218d1373599ec54ffe32982e3 Mon Sep 17 00:00:00 2001
From: yuni <hut@hut.pm>
Date: Tue, 11 Jun 2024 02:59:10 +0200
Subject: [PATCH 21/23] fix velocity after using teleport cheats

---
 src/game.rs | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/game.rs b/src/game.rs
index 79e4fb5..f359948 100644
--- a/src/game.rs
+++ b/src/game.rs
@@ -18,6 +18,10 @@ use bevy::window::{PrimaryWindow, Window, WindowMode};
 use bevy_xpbd_3d::prelude::*;
 use std::collections::HashMap;
 
+pub const CHEAT_WARP_1: &str = "pizzeria";
+pub const CHEAT_WARP_2: &str = "busstopclippy2";
+pub const CHEAT_WARP_3: &str = "busstopclippy3";
+
 pub struct GamePlugin;
 impl Plugin for GamePlugin {
     fn build(&self, app: &mut App) {
@@ -268,6 +272,7 @@ fn handle_cheats(
     mut ew_playerdies: EventWriter<PlayerDiesEvent>,
     mut settings: ResMut<Settings>,
     id2pos: Res<Id2Pos>,
+    id2v: Res<Id2V>,
     mut ew_sfx: EventWriter<audio::PlaySfxEvent>,
 ) {
     if q_player.is_empty() || q_life.is_empty() {
@@ -326,22 +331,31 @@ fn handle_cheats(
     }
 
     if key_input.just_pressed(settings.key_cheat_pizza) {
-        if let Some(target) = id2pos.0.get(&"pizzeria".to_string()) {
+        if let Some(target) = id2pos.0.get(&CHEAT_WARP_1.to_string()) {
             pos.0 = *target + DVec3::new(-60.0, 0.0, 0.0);
             gforce.ignore_gforce_seconds = 1.0;
         }
+        if let Some(target) = id2v.0.get(&CHEAT_WARP_1.to_string()) {
+            v.0 = *target;
+        }
     }
     if key_input.just_pressed(settings.key_cheat_farview1) {
-        if let Some(target) = id2pos.0.get(&"busstopclippy2".to_string()) {
+        if let Some(target) = id2pos.0.get(&CHEAT_WARP_2.to_string()) {
             pos.0 = *target + DVec3::new(0.0, -1000.0, 0.0);
             gforce.ignore_gforce_seconds = 1.0;
         }
+        if let Some(target) = id2v.0.get(&CHEAT_WARP_2.to_string()) {
+            v.0 = *target;
+        }
     }
     if key_input.just_pressed(settings.key_cheat_farview2) {
-        if let Some(target) = id2pos.0.get(&"busstopclippy3".to_string()) {
+        if let Some(target) = id2pos.0.get(&CHEAT_WARP_3.to_string()) {
             pos.0 = *target + DVec3::new(0.0, -1000.0, 0.0);
             gforce.ignore_gforce_seconds = 1.0;
         }
+        if let Some(target) = id2v.0.get(&CHEAT_WARP_3.to_string()) {
+            v.0 = *target;
+        }
     }
     if key_input.pressed(settings.key_cheat_adrenaline_zero) {
         lifeform.adrenaline = 0.0;

From 91bf2ddc54aa00dd400942aaadee6d7b9d25be71 Mon Sep 17 00:00:00 2001
From: yuni <hut@hut.pm>
Date: Tue, 11 Jun 2024 03:04:54 +0200
Subject: [PATCH 22/23] fix velocity after using stop cheat

---
 src/game.rs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/game.rs b/src/game.rs
index f359948..4cb4bdd 100644
--- a/src/game.rs
+++ b/src/game.rs
@@ -271,6 +271,7 @@ fn handle_cheats(
     >,
     mut ew_playerdies: EventWriter<PlayerDiesEvent>,
     mut settings: ResMut<Settings>,
+    jupiter_pos: Res<JupiterPos>,
     id2pos: Res<Id2Pos>,
     id2v: Res<Id2V>,
     mut ew_sfx: EventWriter<audio::PlaySfxEvent>,
@@ -297,7 +298,7 @@ fn handle_cheats(
 
     if key_input.just_pressed(settings.key_cheat_stop) {
         gforce.ignore_gforce_seconds = 1.0;
-        v.0 = DVec3::ZERO;
+        v.0 = nature::orbital_velocity(pos.0 - jupiter_pos.0, nature::JUPITER_MASS);
     }
     if key_input.pressed(settings.key_cheat_speed)
         || key_input.pressed(settings.key_cheat_speed_backward)

From 6275a64d7c665c16f4af87e42e74018755df81d6 Mon Sep 17 00:00:00 2001
From: yuni <hut@hut.pm>
Date: Tue, 11 Jun 2024 03:29:26 +0200
Subject: [PATCH 23/23] ignore gravity when calculating g forces
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Because gravity is obviously not a force, just a ✨magical✨ property of
spacetime, conveyed by messenger particles called Higgs Bosons which act
as force carriers for this non-force.  Who made this up? :D
---
 src/actor.rs | 38 +++++++++++++++++++++-----------------
 1 file changed, 21 insertions(+), 17 deletions(-)

diff --git a/src/actor.rs b/src/actor.rs
index d6820e1..f83c529 100644
--- a/src/actor.rs
+++ b/src/actor.rs
@@ -30,6 +30,7 @@ impl Plugin for ActorPlugin {
             (
                 update_physics_lifeforms,
                 update_power,
+                handle_gravity,
                 handle_wants_maxrotation,
                 handle_wants_maxvelocity.run_if(any_with_component::<WantsMaxVelocity>),
                 handle_wants_lookat.run_if(alive),
@@ -44,7 +45,6 @@ impl Plugin for ActorPlugin {
         app.add_systems(
             Update,
             (
-                handle_gravity,
                 handle_input.run_if(in_control),
                 handle_collisions,
                 handle_damage,
@@ -52,16 +52,9 @@ impl Plugin for ActorPlugin {
         );
         app.add_systems(PostUpdate, (handle_vehicle_enter_exit,));
         app.add_event::<VehicleEnterExitEvent>();
-        app.insert_resource(GravityUpdateTimer(Timer::from_seconds(
-            1.0,
-            TimerMode::Repeating,
-        )));
     }
 }
 
-#[derive(Resource)]
-pub struct GravityUpdateTimer(Timer);
-
 #[derive(Copy, Clone)]
 pub enum DamageType {
     Unknown,
@@ -126,6 +119,7 @@ pub struct ExperiencesGForce {
     pub visual_effect_threshold: f32,
     pub visual_effect: f32,
     pub last_linear_velocity: DVec3,
+    pub gravitational_component: DVec3,
     pub ignore_gforce_seconds: f32,
 }
 impl Default for ExperiencesGForce {
@@ -135,7 +129,8 @@ impl Default for ExperiencesGForce {
             damage_threshold: 100.0,
             visual_effect_threshold: 20.0,
             visual_effect: 0.0,
-            last_linear_velocity: DVec3::splat(0.0),
+            last_linear_velocity: DVec3::ZERO,
+            gravitational_component: DVec3::ZERO,
             ignore_gforce_seconds: 0.01,
         }
     }
@@ -650,8 +645,10 @@ fn handle_gforce(
     let dt = time.delta_seconds();
     let factor = 1.0 / dt / nature::EARTH_GRAVITY;
     for (v, mut hp, mut gforce) in &mut q_actor {
-        gforce.gforce = factor * (v.0 - gforce.last_linear_velocity).length() as f32;
+        gforce.gforce = factor
+            * (v.0 - gforce.last_linear_velocity - gforce.gravitational_component).length() as f32;
         gforce.last_linear_velocity = v.0;
+        gforce.gravitational_component = DVec3::ZERO;
         if gforce.ignore_gforce_seconds > 0.0 {
             gforce.ignore_gforce_seconds -= dt;
             continue;
@@ -675,18 +672,25 @@ fn handle_gforce(
 
 fn handle_gravity(
     time: Res<Time>,
-    mut timer: ResMut<GravityUpdateTimer>,
-    mut q_pos: Query<(&Position, &mut LinearVelocity), With<OrbitsJupiter>>,
+    mut q_pos: Query<
+        (
+            &Position,
+            &mut LinearVelocity,
+            Option<&mut ExperiencesGForce>,
+        ),
+        With<OrbitsJupiter>,
+    >,
     jupiter_pos: Res<game::JupiterPos>,
 ) {
-    if !timer.0.tick(time.delta()).just_finished() {
-        return;
-    }
+    let dt = time.delta_seconds() as f64;
 
     // this assumes prograde orbits for every object
-    for (pos, mut v) in &mut q_pos {
+    for (pos, mut v, gforce_maybe) in &mut q_pos {
         let relative_pos = pos.0 - jupiter_pos.0;
-        let accel = nature::gravitational_acceleration(relative_pos, nature::JUPITER_MASS);
+        let accel = dt * nature::gravitational_acceleration(relative_pos, nature::JUPITER_MASS);
+        if let Some(mut gforce) = gforce_maybe {
+            gforce.gravitational_component += accel;
+        }
         v.0 += accel;
     }
 }