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 'fix_plazas_in_site2_towns' into 'master'

Browse Source 
fix plazas in site2 towns spawning on top of each other

See merge request veloren/veloren!3191
This commit is contained in:
Joshua Barretto 2022-02-09 23:19:01 +00:00
commit 507b5d371c
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
world/src/site2/mod.rs
View File

@ -232,7 +232,7 @@ impl Site {
self.find_aabr(search_pos, area_range, min_dims) self.find_aabr(search_pos, area_range, min_dims)
} }
pub fn make_plaza(&mut self, land: &Land, rng: &mut impl Rng) -> Id<Plot> { pub fn make_plaza(&mut self, land: &Land, rng: &mut impl Rng) -> Option<Id<Plot>> {
let plaza_radius = rng.gen_range(1..4); let plaza_radius = rng.gen_range(1..4);
let plaza_dist = 6.5 + plaza_radius as f32 * 4.0; let plaza_dist = 6.5 + plaza_radius as f32 * 4.0;
let pos = attempt(32, || { let pos = attempt(32, || {
@ -245,6 +245,7 @@ impl Site {
* plaza_dist) * plaza_dist)
.map(|e| e as i32) .map(|e| e as i32)
}) })
.or_else(|| Some(Vec2::zero()))
.filter(|tile| !self.tiles.get(*tile).is_obstacle()) .filter(|tile| !self.tiles.get(*tile).is_obstacle())
.filter(|&tile| { .filter(|&tile| {
self.plazas.iter().all(|&p| { self.plazas.iter().all(|&p| {
@ -252,8 +253,7 @@ impl Site {
> (plaza_dist * 0.85).powi(2) > (plaza_dist * 0.85).powi(2)
}) && rng.gen_range(0..48) > tile.map(|e| e.abs()).reduce_max() }) && rng.gen_range(0..48) > tile.map(|e| e.abs()).reduce_max()
}) })
}) })?;
.unwrap_or_else(Vec2::zero);
let plaza_alt = land.get_alt_approx(self.tile_center_wpos(pos)) as i32; let plaza_alt = land.get_alt_approx(self.tile_center_wpos(pos)) as i32;
@ -304,7 +304,7 @@ impl Site {
} }
} }
plaza Some(plaza)
} }
pub fn demarcate_obstacles(&mut self, land: &Land) { pub fn demarcate_obstacles(&mut self, land: &Land) {