Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'crabman/glider-buff' into 'master'

Browse Source 
Revert previous glider span length

See merge request veloren/veloren!4336
This commit is contained in:
crabman 2024-02-21 22:59:21 +00:00
commit 7a77fa6bfd
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/src/states/glide_wield.rs
View File

@ -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,
}

6
common/systems/src/phys.rs
View File

@ -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