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

Addresses comments

Browse Source
This commit is contained in:
Snowram 2020-09-18 18:45:03 +02:00
parent 8330d087e6
commit f9fada87cf
3 changed files with 3 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

99
common/src/comp/body/critter.rs
View File

@ -1,99 +0,0 @@
use crate::{make_case_elim, make_proj_elim};
use rand::{seq::SliceRandom, thread_rng};
use serde::{Deserialize, Serialize};
make_proj_elim!(
body,
#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
pub struct Body {
pub species: Species,
pub body_type: BodyType,
}
);
impl Body {
pub fn random() -> Self {
let mut rng = thread_rng();
let species = *(&ALL_SPECIES).choose(&mut rng).unwrap();
Self::random_with(&mut rng, &species)
}
#[inline]
pub fn random_with(rng: &mut impl rand::Rng, &species: &Species) -> Self {
let body_type = *(&ALL_BODY_TYPES).choose(rng).unwrap();
Self { species, body_type }
}
}
impl From<Body> for super::Body {
fn from(body: Body) -> Self { super::Body::Critter(body) }
}
make_case_elim!(
species,
#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
#[repr(u32)]
pub enum Species {
Rat = 0,
Axolotl = 1,
Gecko = 2,
Turtle = 3,
Squirrel = 4,
Fungome = 5,
}
);
/// Data representing per-species generic data.
#[derive(Clone, Debug, Serialize, Deserialize)]
pub struct AllSpecies<SpeciesMeta> {
pub rat: SpeciesMeta,
pub axolotl: SpeciesMeta,
pub gecko: SpeciesMeta,
pub turtle: SpeciesMeta,
pub squirrel: SpeciesMeta,
pub fungome: SpeciesMeta,
}
impl<'a, SpeciesMeta> core::ops::Index<&'a Species> for AllSpecies<SpeciesMeta> {
type Output = SpeciesMeta;
#[inline]
fn index(&self, &index: &'a Species) -> &Self::Output {
match index {
Species::Rat => &self.rat,
Species::Axolotl => &self.axolotl,
Species::Gecko => &self.gecko,
Species::Turtle => &self.turtle,
Species::Squirrel => &self.squirrel,
Species::Fungome => &self.fungome,
}
}
}
pub const ALL_SPECIES: [Species; 6] = [
Species::Rat,
Species::Axolotl,
Species::Gecko,
Species::Turtle,
Species::Squirrel,
Species::Fungome,
];
impl<'a, SpeciesMeta: 'a> IntoIterator for &'a AllSpecies<SpeciesMeta> {
type IntoIter = std::iter::Copied<std::slice::Iter<'static, Self::Item>>;
type Item = Species;
fn into_iter(self) -> Self::IntoIter { ALL_SPECIES.iter().copied() }
}
make_case_elim!(
body_type,
#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
#[repr(u32)]
pub enum BodyType {
Female = 0,
Male = 1,
}
);
pub const ALL_BODY_TYPES: [BodyType; 2] = [BodyType::Female, BodyType::Male];

2
server/src/persistence/character/conversions.rs
View File

@ -43,6 +43,7 @@ pub fn convert_items_to_database_items(
("neck", loadout.neck.as_ref()), ("neck", loadout.neck.as_ref()),
("head", loadout.head.as_ref()), ("head", loadout.head.as_ref()),
("tabard", loadout.tabard.as_ref()), ("tabard", loadout.tabard.as_ref()),
("glider", loadout.glider.as_ref()),
]; ];
let loadout = loadout let loadout = loadout
@ -254,6 +255,7 @@ pub fn convert_loadout_from_database_items(database_items: &[Item]) -> Result<Lo
"neck" => loadout = loadout.neck(Some(item)), "neck" => loadout = loadout.neck(Some(item)),
"head" => loadout = loadout.head(Some(item)), "head" => loadout = loadout.head(Some(item)),
"tabard" => loadout = loadout.tabard(Some(item)), "tabard" => loadout = loadout.tabard(Some(item)),
"glider" => loadout = loadout.glider(Some(item)),
_ => { _ => {
return Err(Error::ConversionError(format!( return Err(Error::ConversionError(format!(
"Unknown loadout position on item: {}", "Unknown loadout position on item: {}",

2
voxygen/src/audio/sfx/event_mapper/movement/mod.rs
View File

@ -75,7 +75,7 @@ impl EventMapper for MovementEventMapper {
| Body::BirdMedium(_) | Body::BirdMedium(_)
| Body::BirdSmall(_) | Body::BirdSmall(_)
| Body::BipedLarge(_) => Self::map_non_humanoid_movement_event(physics, vel.0), | Body::BipedLarge(_) => Self::map_non_humanoid_movement_event(physics, vel.0),
_ => SfxEvent::Idle, // Ignore fish, critters, etc... _ => SfxEvent::Idle, // Ignore fish, etc...
}; };
// Check for SFX config entry for this movement // Check for SFX config entry for this movement