From a6342c7d29ba5e79a479036ae036fc89c787e939 Mon Sep 17 00:00:00 2001
From: ghostly_zsh <ghostly@e3t.cc>
Date: Sat, 25 Apr 2026 18:13:35 -0500
Subject: [PATCH] fix: planets rely purely on springs now, so it should be
 possible to push them around now

---
 crates/unified/assets/config/planets.pc.toml |  3 ++-
 crates/unified/src/config/planet.rs          |  3 ++-
 crates/unified/src/server/orbit/mod.rs       |  6 +++---
 crates/unified/src/server/planets.rs         | 10 +++++++---
 4 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/crates/unified/assets/config/planets.pc.toml b/crates/unified/assets/config/planets.pc.toml
index c735e651262e1775ebf689889118a521359d719c..46aa05afdf8b28ed1cdb793916ea4c01c5635d14 100644
--- a/crates/unified/assets/config/planets.pc.toml
+++ b/crates/unified/assets/config/planets.pc.toml
@@ -1,5 +1,6 @@
 [orbit]
-planet_spring_compliance = 10000000000.0
+planet_spring_compliance = 0.01
+planet_spring_damping = 0.1
 
 [[planets]]
 name = "Sun"
diff --git a/crates/unified/src/config/planet.rs b/crates/unified/src/config/planet.rs
index 7348cc9001ba86b33a9c01246223129d94b35855..bfb58f4ca5ddc11402e8830eb6700b17b4df1eb0 100644
--- a/crates/unified/src/config/planet.rs
+++ b/crates/unified/src/config/planet.rs
@@ -72,5 +72,6 @@ pub struct PlanetConfigCollection {
 
 #[derive(Deserialize, Asset, TypePath, Clone, Debug)]
 pub struct OrbitConfig {
-    pub planet_spring_compliance: f64
+    pub planet_spring_compliance: f64,
+    pub planet_spring_damping: f64,
 }
diff --git a/crates/unified/src/server/orbit/mod.rs b/crates/unified/src/server/orbit/mod.rs
index 8cbafcfadf96c61fc4bedf87c8be334eb586accb..9988f72bea6c4c8de62833eb6a931e4ba66a3935 100644
--- a/crates/unified/src/server/orbit/mod.rs
+++ b/crates/unified/src/server/orbit/mod.rs
@@ -22,7 +22,7 @@ impl Plugin for OrbitPlugin {
 fn update_orbits(
     mut planets: Query<(&Planet, &Transform, &mut LinearVelocity), Without<PlanetSpring>>,
     planets_2: Query<(&Planet, &Transform, &Mass), Without<PlanetSpring>>,
-    mut planet_springs: Query<(&PlanetSpring, &mut Transform), Without<Planet>>,
+    mut planet_springs: Query<(&PlanetSpring, &mut Transform, &mut LinearVelocity), Without<Planet>>,
     world_config: Res<WorldConfigResource>,
     time: Res<Time>
 ) {
@@ -61,8 +61,8 @@ fn update_orbits(
         let b_factor = (1.0 - e * e).sqrt();
         let vx = -a * e_k.sin() * de_dt;
         let vy = a * b_factor * e_k.cos() * de_dt;
-        vel.x = vx + parent_velocity.x;
-        vel.y = vy + parent_velocity.y;
+        planet_spring.2.x = vx + parent_velocity.x;
+        planet_spring.2.y = vy + parent_velocity.y;
     }
 }
 
diff --git a/crates/unified/src/server/planets.rs b/crates/unified/src/server/planets.rs
index 3a2fd07d3860dc23802bd6525f368ca3d677803f..591d80bb4490ef90df0df052ce6d756efa342de0 100644
--- a/crates/unified/src/server/planets.rs
+++ b/crates/unified/src/server/planets.rs
@@ -73,14 +73,18 @@ pub fn update_planets(
                                     planet.default_transform[1],
                                     planet.default_transform[2],
                                 ),
-                                Mass(planet.mass),
-                                RigidBody::Static,
+                                RigidBody::Kinematic,
+                                LinearVelocity::ZERO,
                             )).id();
                             commands.spawn((
                                 PlanetSpringJoint {
                                     name: planet.name.clone()
                                 },
-                                FixedJoint::new(planet_entity, spring)/*.with_point_compliance(planet_config.orbit.planet_spring_compliance)*/,
+                                FixedJoint::new(planet_entity, spring).with_point_compliance(planet_config.orbit.planet_spring_compliance),
+                                JointDamping {
+                                    linear: planet_config.orbit.planet_spring_damping,
+                                    angular: 1.0,
+                                },
                             ));
                         }