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

Spawn dogs and cats in towns

Browse Source
This commit is contained in:
Joshua Barretto 2023-04-03 19:58:00 +01:00
parent 9f025de27d
commit 2eaf3c7e92
2 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
assets/common/entity/wild/peaceful/dog.ron Normal file
View File

@ -0,0 +1,11 @@
#![enable(implicit_some)]
(
name: Automatic,
body: RandomWith("dog"),
alignment: Alignment(Wild),
loot: LootTable("common.loot_tables.creature.quad_small.generic"),
inventory: (
loadout: FromBody,
),
meta: [],
)

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

@ -18,6 +18,8 @@ use crate::{
};
use common::{
astar::Astar,
comp::Alignment,
generation::EntityInfo,
lottery::Lottery,
spiral::Spiral2d,
store::{Id, Store},
@ -1076,9 +1078,10 @@ impl Site {
self.origin + tile * TILE_SIZE as i32 + TILE_SIZE as i32 / 2
}
pub fn render_tile(&self, canvas: &mut Canvas, _dynamic_rng: &mut impl Rng, tpos: Vec2<i32>) {
pub fn render_tile(&self, canvas: &mut Canvas, dynamic_rng: &mut impl Rng, tpos: Vec2<i32>) {
let tile = self.tiles.get(tpos);
let twpos = self.tile_wpos(tpos);
let twpos_center = self.tile_center_wpos(tpos);
let border = TILE_SIZE as i32;
let cols = (-border..TILE_SIZE as i32 + border).flat_map(|y| {
(-border..TILE_SIZE as i32 + border)
@ -1111,11 +1114,9 @@ impl Site {
let sub_surface_color = canvas
.col(wpos2d)
.map_or(Rgb::zero(), |col| col.sub_surface_color * 0.5);
let mut underground = true;
for z in -8..6 {
canvas.map(Vec3::new(wpos2d.x, wpos2d.y, alt + z), |b| {
if b.kind() == BlockKind::Snow {
underground = false;
b.into_vacant()
} else if b.is_filled() {
if b.is_terrain() {
@ -1127,11 +1128,23 @@ impl Site {
b
}
} else {
underground = false;
b.into_vacant()
}
})
}
if wpos2d == twpos_center && dynamic_rng.gen_bool(0.01) {
let spec = [
"common.entity.wild.peaceful.cat",
"common.entity.wild.peaceful.dog",
]
.choose(dynamic_rng)
.unwrap();
canvas.spawn(
EntityInfo::at(Vec3::new(wpos2d.x, wpos2d.y, alt).as_())
.with_asset_expect(&spec, dynamic_rng)
.with_alignment(Alignment::Tame),
);
}
}
});
},