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 'tormod-spread-towns-out' into 'master'

Browse Source 
Fix bug where chunks outside the map counted as occupied.

See merge request veloren/veloren!3268
This commit is contained in:
Joshua Barretto
2022-03-12 13:10:32 +00:00
parent 87b139d32b 5f12163e54
commit 5ee6278860
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -23,6 +23,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Fixed ### Fixed
- Fixed bug that would sometimes cause taking a screenshot to panic because a buffer was mapped a the wrong time. - Fixed bug that would sometimes cause taking a screenshot to panic because a buffer was mapped a the wrong time.
- Players can no longer push waypoints around - Players can no longer push waypoints around
- Sites will now also be placed near the edge of the map
## [0.12.0] - 2022-02-19 ## [0.12.0] - 2022-02-19

16
world/src/civ/mod.rs
View File

@ -109,16 +109,16 @@ impl Civs {
for _ in 0..initial_civ_count * 3 { for _ in 0..initial_civ_count * 3 {
attempt(5, || { attempt(5, || {
let (kind, size, avoid) = match ctx.rng.gen_range(0..64) { let (kind, size, avoid) = match ctx.rng.gen_range(0..64) {
0..=5 => (SiteKind::Castle, 3, (&castle_enemies, 20)), 0..=5 => (SiteKind::Castle, 3, (&castle_enemies, 40)),
28..=31 => { 28..=31 => {
if index.features().site2_giant_trees { if index.features().site2_giant_trees {
(SiteKind::GiantTree, 4, (&tree_enemies, 20)) (SiteKind::GiantTree, 4, (&tree_enemies, 40))
} else { } else {
(SiteKind::Tree, 4, (&tree_enemies, 20)) (SiteKind::Tree, 4, (&tree_enemies, 40))
} }
}, },
32..=37 => (SiteKind::Gnarling, 5, (&gnarling_enemies, 20)), 32..=37 => (SiteKind::Gnarling, 5, (&gnarling_enemies, 40)),
_ => (SiteKind::Dungeon, 0, (&dungeon_enemies, 20)), _ => (SiteKind::Dungeon, 0, (&dungeon_enemies, 40)),
}; };
let loc = find_site_loc(&mut ctx, avoid, size, kind)?; let loc = find_site_loc(&mut ctx, avoid, size, kind)?;
match kind { match kind {
@ -481,7 +481,7 @@ impl Civs {
) -> Option<Id<Civ>> { ) -> Option<Id<Civ>> {
let kind = SiteKind::Refactor; let kind = SiteKind::Refactor;
let site = attempt(100, || { let site = attempt(100, || {
let loc = find_site_loc(ctx, (start_locations, 40), 1, kind)?; let loc = find_site_loc(ctx, (start_locations, 60), 0, kind)?;
start_locations.push(loc); start_locations.push(loc);
Some(self.establish_site(ctx, loc, |place| Site { Some(self.establish_site(ctx, loc, |place| Site {
kind, kind,
@ -1031,7 +1031,7 @@ fn loc_suitable_for_site(sim: &WorldSim, loc: Vec2<i32>, site_kind: SiteKind) ->
for y in (-radius)..radius { for y in (-radius)..radius {
let check_loc = let check_loc =
loc + Vec2::new(x, y).map2(TerrainChunkSize::RECT_SIZE, |e, sz| e * sz as i32); loc + Vec2::new(x, y).map2(TerrainChunkSize::RECT_SIZE, |e, sz| e * sz as i32);
if sim.get(check_loc).map_or(true, |c| !c.sites.is_empty()) { if sim.get(check_loc).map_or(false, |c| !c.sites.is_empty()) {
return false; return false;
} }
} }
@ -1277,7 +1277,7 @@ impl SiteKind {
+ (trading_score as f32 + 1.0).log2(); + (trading_score as f32 + 1.0).log2();
has_potable_water has_potable_water
&& has_building_materials && has_building_materials
&& industry_score > 6.0 && industry_score > 6.7
&& warm_or_firewood && warm_or_firewood
}, },
_ => true, _ => true,