From 515e7fe4f035fc0d2442b5fe842cae1501c7f641 Mon Sep 17 00:00:00 2001 From: crabman Date: Wed, 21 Feb 2024 20:48:24 +0100 Subject: [PATCH] revert previous glider span length --- common/src/states/glide_wield.rs | 2 +- common/systems/src/phys.rs | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/common/src/states/glide_wield.rs b/common/src/states/glide_wield.rs index 0671421250..d775ed1d2a 100644 --- a/common/src/states/glide_wield.rs +++ b/common/src/states/glide_wield.rs @@ -49,7 +49,7 @@ impl From<&JoinData<'_>> for Data { // // A span/chord ratio of 4.5 gives an AR of ~5.73. // A span/chord ratio of 3.0 gives an ARI of ~3.82. - span_length: scale * 3.0, + span_length: scale * 4.5, chord_length: scale, ori: *data.ori, } diff --git a/common/systems/src/phys.rs b/common/systems/src/phys.rs index b987081c65..04a66b179a 100644 --- a/common/systems/src/phys.rs +++ b/common/systems/src/phys.rs @@ -145,7 +145,7 @@ fn simulated_wind_vel( .unwrap_or(0.); let interp_town = terrain .get_interpolated(pos_2d, |c| match c.meta().site() { - Some(SiteKindMeta::Settlement(_)) => 3.5, + Some(SiteKindMeta::Settlement(_)) => 2.7, _ => 1.0, }) .unwrap_or(0.); @@ -176,7 +176,7 @@ fn simulated_wind_vel( // 0.0..1.0, 0.25 morning, 0.45 midday, 0.66 evening, 0.79 night, 0.0/1.0 // midnight let sun_dir = time_of_day.get_sun_dir().normalized(); - let mut lift = ((sun_dir - normal.normalized()).magnitude() - 0.5).max(0.2) * 3.; + let mut lift = ((sun_dir - normal.normalized()).magnitude() - 0.5).max(0.2) * 2.3; // TODO: potential source of harsh edges in wind speed. let temperatures = surrounding_chunks_metas.iter().map(|m| m.temp()).minmax(); @@ -235,7 +235,7 @@ fn simulated_wind_vel( angle = (angle - 1.3).max(0.0); // the ridge lift is based on the angle and the velocity of the wind - angle * steepness * wind_velocity.magnitude() * 2.5 + angle * steepness * wind_velocity.magnitude() * 2.0 }; // Cliffs mean more lift