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

Used correct entity configs

Browse Source
This commit is contained in:
Joshua Barretto 2021-10-17 12:27:41 +01:00
parent 4acffb9cfb
commit 4b8bf94320
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/src/rtsim/entity.rs
View File

@ -746,8 +746,8 @@ fn humanoid_config(kind: RtSimEntityKind) -> &'static str {
match kind {
RtSimEntityKind::Cultist => "common.entity.dungeon.tier-5.cultist",
RtSimEntityKind::Random => "common.entity.world.traveler",
RtSimEntityKind::Villager => "common.loadout.village.villager",
RtSimEntityKind::Merchant => "common.loadout.village.merchant",
RtSimEntityKind::Villager => "common.entity.village.villager",
RtSimEntityKind::Merchant => "common.entity.village.merchant",
}
}

7
world/src/lib.rs
View File

@ -7,12 +7,7 @@
)]
#![allow(clippy::branches_sharing_code)] // TODO: evaluate
#![deny(clippy::clone_on_ref_ptr)]
#![feature(
bool_to_option,
const_panic,
label_break_value,
option_zip
)]
#![feature(bool_to_option, const_panic, label_break_value, option_zip)]
mod all;
mod block;