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

Adlets can now carve tunnels and caverns

Browse Source
This commit is contained in:
Sam 2022-03-01 13:07:02 -05:00
parent 76f4db6f70
commit abf3546e64
3 changed files with 209 additions and 1987 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -105,7 +105,7 @@ impl Site {
.filter_map(|plot| match &plot.kind {
PlotKind::Dungeon(d) => Some(d.spawn_rules(wpos)),
PlotKind::Gnarling(g) => Some(g.spawn_rules(wpos)),
PlotKind::Adlet(g) => Some(g.spawn_rules(wpos)),
PlotKind::Adlet(a) => Some(a.spawn_rules(wpos)),
_ => None,
})
.fold(base_spawn_rules, |a, b| a.combine(b))
@ -480,10 +480,13 @@ impl Site {
site.demarcate_obstacles(land);
let adlet_stronghold = plot::AdletStronghold::generate(origin, land, &mut rng);
site.name = adlet_stronghold.name().to_string();
// TODO: Update this to also blit tiles near entrance when entrance has stuff
let size = adlet_stronghold.radius() / tile::TILE_SIZE as i32;
let offset = (adlet_stronghold.origin() - origin) / tile::TILE_SIZE as i32;
let aabr = Aabr {
min: Vec2::broadcast(-size),
max: Vec2::broadcast(size),
min: Vec2::broadcast(-size) + offset,
max: Vec2::broadcast(size) + offset,
};
let plot = site.create_plot(Plot {
kind: PlotKind::Adlet(adlet_stronghold),
@ -1450,7 +1453,7 @@ impl Site {
match &plot.kind {
PlotKind::Dungeon(d) => d.apply_supplement(dynamic_rng, wpos2d, supplement),
PlotKind::Gnarling(g) => g.apply_supplement(dynamic_rng, wpos2d, supplement),
PlotKind::Adlet(g) => g.apply_supplement(dynamic_rng, wpos2d, supplement),
PlotKind::Adlet(a) => a.apply_supplement(dynamic_rng, wpos2d, supplement),
_ => {},
}
}

2178
world/src/site2/plot/adlet.rs
View File

File diff suppressed because it is too large Load Diff

7
world/src/site2/tile.rs
View File

@ -222,7 +222,12 @@ impl Tile {
pub fn is_empty(&self) -> bool { self.kind == TileKind::Empty }
pub fn is_natural(&self) -> bool { matches!(self.kind, TileKind::Empty | TileKind::Hazard(_)) }
pub fn is_natural(&self) -> bool {
matches!(
self.kind,
TileKind::Empty | TileKind::Hazard(_) | TileKind::AdletStronghold
)
}
pub fn is_road(&self) -> bool {
matches!(