From f129783a5171f25b92498dd67fc9064ad6c9bf02 Mon Sep 17 00:00:00 2001 From: ghostly_zsh Date: Thu, 2 Apr 2026 15:52:45 -0500 Subject: [PATCH] fix: planet sizes doubled to reduce gravity falloff --- crates/unified/assets/config/planets.pc.toml | 28 ++++++++++---------- crates/unified/src/server/heat/conduction.rs | 8 +++++- crates/unified/src/server/mod.rs | 2 ++ 3 files changed, 23 insertions(+), 15 deletions(-) diff --git a/crates/unified/assets/config/planets.pc.toml b/crates/unified/assets/config/planets.pc.toml index 2e2626e31a202b891b3003fefb9f06915393342e..8d9c36de710c9043162716f8ab9d6c35045ee17d 100644 --- a/crates/unified/assets/config/planets.pc.toml +++ b/crates/unified/assets/config/planets.pc.toml @@ -9,7 +9,7 @@ special_sprite_properties = { ForceColor = { Oklcha = { lightness = 10.0, chroma [[planets]] name = "Mercury" sprite = "textures/mercury.png" -radius = 333.33 # m +radius = 666.66 # m mass = 205_000_000.0 # kg default_transform = [116_129.4, 0.0, 0.0] orbit = { orbiting = "Sun", eccentricity = 0.2056 } @@ -17,7 +17,7 @@ orbit = { orbiting = "Sun", eccentricity = 0.2056 } [[planets]] name = "Venus" sprite = "textures/venus.png" -radius = 949.9 # m +radius = 1899.8 # m mass = 806_166_000.0 # kg default_transform = [216_999.6, 0.0, 0.0] orbit = { orbiting = "Sun", eccentricity = 0.0068 } @@ -26,8 +26,8 @@ orbit = { orbiting = "Sun", eccentricity = 0.0068 } name = "Earth" sprite = "textures/earth.png" indicator_sprite = "textures/earth_icon.png" -radius = 1000.0 # m -mass = 4_900_000_000.0 # kg +radius = 2000.0 # m +mass = 16_900_000_000.0 # kg default_transform = [300_000.0, 0.0, 0.0] orbit = { orbiting = "Sun", eccentricity = 0.0167 } @@ -35,16 +35,16 @@ orbit = { orbiting = "Sun", eccentricity = 0.0167 } name = "Moon" sprite = "textures/moon.png" indicator_sprite = "textures/moon_icon.png" -radius = 272.7 # m -mass = 60_236_000.0 # kg -default_transform = [305_700.0, 0.0, 0.0] +radius = 545.4 # m +mass = 360_236_000.0 # kg +default_transform = [312_700.0, 0.0, 0.0] orbit = { orbiting = "Earth", eccentricity = 0.0549 } [[planets]] name = "Mars" sprite = "textures/mars.png" indicator_sprite = "textures/mars_icon.png" -radius = 531.0 # m +radius = 1062.0 # m mass = 525_857_000.0 # kg default_transform = [430_000.0, 0.0, 0.0] orbit = { orbiting = "Sun", eccentricity = 0.0934 } @@ -52,7 +52,7 @@ orbit = { orbiting = "Sun", eccentricity = 0.0934 } [[planets]] name = "Jupiter" sprite = "textures/jupiter.png" -radius = 10973.0 # m +radius = 21946.0 # m mass = 1_131_221_218_000.0 # kg default_transform = [1_561_140.0, 0.0, 0.0] orbit = { orbiting = "Sun", eccentricity = 0.0484 } @@ -60,7 +60,7 @@ orbit = { orbiting = "Sun", eccentricity = 0.0484 } [[planets]] name = "Saturn" sprite = "textures/earth.png" -radius = 9_140.2 # m +radius = 18_280.4 # m mass = 561_386_112_000.0 # kg default_transform = [2_874_780.0, 0.0, 0.0] orbit = { orbiting = "Sun", eccentricity = 0.0541 } @@ -68,7 +68,7 @@ orbit = { orbiting = "Sun", eccentricity = 0.0541 } [[planets]] name = "Uranus" sprite = "textures/venus.png" -radius = 4007.0 # m +radius = 8014.0 # m mass = 69_763_532_000.0 # kg default_transform = [4_050_000.0, 0.0, 0.0] orbit = { orbiting = "Sun", eccentricity = 0.0472 } @@ -76,7 +76,7 @@ orbit = { orbiting = "Sun", eccentricity = 0.0472 } [[planets]] name = "Neptune" sprite = "textures/mars.png" -radius = 3_883.0 # m +radius = 7_766.0 # m mass = 106_674_649_000.0 # kg default_transform = [5_000_000.0, 0.0, 0.0] orbit = { orbiting = "Sun", eccentricity = 0.0086 } @@ -84,7 +84,7 @@ orbit = { orbiting = "Sun", eccentricity = 0.0086 } [[planets]] name = "Pluto" sprite = "textures/jupiter.png" -radius = 186.8 # m +radius = 373.6 # m mass = 10_817_000.0 # kg default_transform = [5_922_300.0, 0.0, 0.0] -orbit = { orbiting = "Sun", eccentricity = 0.2488 } \ No newline at end of file +orbit = { orbiting = "Sun", eccentricity = 0.2488 } diff --git a/crates/unified/src/server/heat/conduction.rs b/crates/unified/src/server/heat/conduction.rs index a6c45e1e23bbf44af0deef8569ba85c52dc458fd..150115334b5c52fd5234b652484c9a701c4b7f43 100644 --- a/crates/unified/src/server/heat/conduction.rs +++ b/crates/unified/src/server/heat/conduction.rs @@ -1,5 +1,11 @@ -use bevy::app::App; +use crate::{attachment::Peer, prelude::*}; pub fn heat_conduction_plugin(app: &mut App) { + app.add_systems(Update, propagate_heat); +} + +fn propagate_heat( + peers: Query<&Peer> +) { } diff --git a/crates/unified/src/server/mod.rs b/crates/unified/src/server/mod.rs index 7191b951a250940ae05eb45a92df9f3f8f575c21..91a395e7daaee7bfd4280f8a3469fd7a906a4f13 100644 --- a/crates/unified/src/server/mod.rs +++ b/crates/unified/src/server/mod.rs @@ -8,6 +8,7 @@ mod system_sets; use crate::server::earth_parts::spawn_parts_plugin; use crate::server::gravity::newtonian_gravity_plugin; +use crate::server::heat::conduction::heat_conduction_plugin; use crate::server::heat::cooling::heat_cooling_plugin; use crate::server::heat::radiation::heat_radiation_plugin; use crate::server::part::part_management_plugin; @@ -53,6 +54,7 @@ impl Plugin for ServerPlugin { .add_plugins(server_thrust_plugin) .add_plugins(heat_cooling_plugin) .add_plugins(heat_radiation_plugin) + .add_plugins(heat_conduction_plugin) .configure_sets(Update, WorldUpdateSet.before(PlayerInputSet)); //.configure_sets(Update, PlayerInputSet.before(PhysicsSet::SyncBackend)); }