From 67f623b50b225519dbbd2fa9cfc2ac191754a2aa Mon Sep 17 00:00:00 2001 From: ghostly_zsh Date: Mon, 24 Mar 2025 13:48:51 -0500 Subject: [PATCH] buffed landing thrusters and updated config files --- crates/client/src/rendering/assets_wasm.rs | 2 +- crates/server/config.toml | 7 ++-- crates/server/parts.toml | 2 +- crates/server/planets.toml | 40 +++++++++++++++++++--- crates/server/src/module/mod.rs | 2 +- 5 files changed, 43 insertions(+), 10 deletions(-) diff --git a/crates/client/src/rendering/assets_wasm.rs b/crates/client/src/rendering/assets_wasm.rs index 85de854aac4d43ca45643c7fd0e866c2a9499506..4919ed8c12afa34ce6454e5463eb4e8cb1a44470 100644 --- a/crates/client/src/rendering/assets_wasm.rs +++ b/crates/client/src/rendering/assets_wasm.rs @@ -66,7 +66,7 @@ impl Assets { }; let tree = usvg::Tree::from_data(&response.bytes, &opt).expect(&format!("Couldn't parse svg {}", local_path_clone)); let tree_size = tree.size().to_int_size(); - let size = usvg::Size::from_wh(500.0, 500.0).unwrap().to_int_size(); + let size = usvg::Size::from_wh(512.0, 512.0).unwrap().to_int_size(); assert!(size.width() > 0 && size.height() > 0); let mut pixmap = tiny_skia::Pixmap::new(size.width(), size.height()).expect("Failed to construct pixmap"); resvg::render(&tree, tiny_skia::Transform::from_scale((size.width() as f32)/(tree_size.height() as f32), (size.height() as f32)/(tree_size.height() as f32)), &mut pixmap.as_mut()); diff --git a/crates/server/config.toml b/crates/server/config.toml index 95f0e60f9496ef4cbff91e5d50a08ab4188eb514..0c9167afe79707ec7da6853f8a775565e8567e45 100644 --- a/crates/server/config.toml +++ b/crates/server/config.toml @@ -1,6 +1,7 @@ [physics] solver = "SmallstepPGS" # or "OldPGS" -dt = 0.05 +[physics.parameters] +dt = 0.016666666 min_ccd_dt = 0.000166666666667 erp = 0.8 damping_ratio = 0.25 @@ -17,7 +18,7 @@ min_island_size = 128 max_ccd_substeps = 1 [world] -gravity = 0.0002 +gravity = 0.015 pixels_per_meter = 1.0 [security] @@ -26,6 +27,6 @@ required_permission_level = 0 [server] tick_time_ms = 1 -world_fixed_timestep = 0.01666 +world_fixed_timestep = 0.016666666 bind = { ip = "0.0.0.0", port = 3000 } max_free_parts = 50 diff --git a/crates/server/parts.toml b/crates/server/parts.toml index 48bfc59df443f6324fefaff1c7521b1ff1aa9542..d02f79c64ca5fd3ce14abd5458c35862192ef943 100644 --- a/crates/server/parts.toml +++ b/crates/server/parts.toml @@ -8,7 +8,7 @@ thruster_energy = 1 mass = 0.9 energy_capacity = 1000 thruster_force = 5 -thruster_energy = 3 +thruster_energy = 2 [part.Cargo] mass = 0.5 diff --git a/crates/server/planets.toml b/crates/server/planets.toml index f1c65cdfbf80ae7901d811941ec11c8f6f222c80..e889cfdecb3f8ecf4624dbdbaa4314fc1b3650ca 100644 --- a/crates/server/planets.toml +++ b/crates/server/planets.toml @@ -1,11 +1,43 @@ +[planets.Sun] +size = 400.0 +mass = 16000000.0 + +[planets.Mercury] +size = 6.66667 +mass = 246.669133339 + +[planets.Venus] +size = 18.998 +mass = 8166.826315 + [planets.Earth] size = 20.0 mass = 10000.0 [planets.Moon] -size = 5.0 -mass = 300.0 +size = 5.454 +mass = 123.082143245 [planets.Mars] -size = 10.0 -mass = 1250.0 \ No newline at end of file +size = 10.62 +mass = 1070.519602 + +[planets.Jupiter] +size = 219.46 +mass = 2554342.75093 + +[planets.Saturn] +size = 182.804 +mass = 889991.421487 + +[planets.Uranus] +size = 80.14 +mass = 142374.556949 + +[planets.Neptune] +size = 77.66 +mass = 171547.175867 + +[planets.Pluto] +size = 3.736 +mass = 22.0759477551 diff --git a/crates/server/src/module/mod.rs b/crates/server/src/module/mod.rs index 466cfb73bb142d13037cf64cba8015b47d87db7e..e94bdf4c5307d4fcf7279abf066a13f00a8006f7 100644 --- a/crates/server/src/module/mod.rs +++ b/crates/server/src/module/mod.rs @@ -537,7 +537,7 @@ fn convert_modules_recursive( let joint = PrismaticJointBuilder::new(Vec2::new(0., 1.)) .local_anchor1(Vec2::new(0., 0.)) .local_anchor2(Vec2::new(0., 0.)) - .set_motor(0., 0., 3000., 3000.) + .set_motor(0., 0., 9000., 3000.) .limits([0., 1.]) .build(); let mut suspension = commands.spawn(PartBundle {