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
9d7e8957bb
veloren/common/src/comp/body/quadruped_medium.rs

195 lines
5.3 KiB
Rust
Raw Normal View History

Further generalize the typed module. This enables us to automatically create configuration formats from enums or structs. For enums, we create a structure with a field for each case, representing a pattern match; the configuration format can then enter a different expression for each case. For structs, we create an enum with a variant for each field, representing projecting by that field; the configuration format selects the field to project from, and then can write a further expression on that field (for instance, it can perform another pattern match). So far we don't actually have anything that *uses* this functionality; I decided to finish it for the purpose of specifying a default lantern offset, only to discover that we already return a lantern offset from the animation crate. So I fixed it there instead.
2020-08-31 01:01:20 +00:00
use crate::{make_case_elim, make_proj_elim};
Clean up ecs actor body components
2019-06-28 23:42:51 +00:00
use rand::{seq::SliceRandom, thread_rng};
updated dependencies and fixed stuff - replace serde_derive by feature of serde incl. source code modifications to compile - reduce futures-timer to "2.0" to be same as async_std - update notify - removed mio, bincode and lz4 compress in common as networking is now in own crate btw there is a better lz4 compress crate, which is newer than 2017 - update prometheus to 0.9 - can't update uvth yet due to usues - hashbrown to 7.2 to only need a single version - libsqlite3 update - image didn't change as there is a problem with `image 0.23` - switch old directories with newer directories-next - no num upgrade as we still depend on num 0.2 anyways - rodio and cpal upgrade - const-tewaker update - dispatch (untested) update - git2 update - iterations update
2020-07-06 14:23:08 +00:00
use serde::{Deserialize, Serialize};
Clean up ecs actor body components
2019-06-28 23:42:51 +00:00
Further generalize the typed module. This enables us to automatically create configuration formats from enums or structs. For enums, we create a structure with a field for each case, representing a pattern match; the configuration format can then enter a different expression for each case. For structs, we create an enum with a variant for each field, representing projecting by that field; the configuration format selects the field to project from, and then can write a further expression on that field (for instance, it can perform another pattern match). So far we don't actually have anything that *uses* this functionality; I decided to finish it for the purpose of specifying a default lantern offset, only to discover that we already return a lantern offset from the animation crate. So I fixed it there instead.
2020-08-31 01:01:20 +00:00
make_proj_elim!(
body,
#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
pub struct Body {
pub species: Species,
pub body_type: BodyType,
}
);
Clean up ecs actor body components
2019-06-28 23:42:51 +00:00
impl Body {
pub fn random() -> Self {
let mut rng = thread_rng();
new mobs alligators
2020-01-26 00:22:48 +00:00
let species = *(&ALL_SPECIES).choose(&mut rng).unwrap();
Allow spawning individual species with /spawn. To get the old behavior, you now need to refer to the internal keywords (like "bird_medium" or "quadruped_small") rather than the old friendly names (like "duck" or "pig"), as the latter generate single species now.
2020-01-29 16:56:28 +00:00
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();
new mobs alligators
2020-01-26 00:22:48 +00:00
Self { species, body_type }
Clean up ecs actor body components
2019-06-28 23:42:51 +00:00
}
}
Allow spawning individual species with /spawn. To get the old behavior, you now need to refer to the internal keywords (like "bird_medium" or "quadruped_small") rather than the old friendly names (like "duck" or "pig"), as the latter generate single species now.
2020-01-29 16:56:28 +00:00
impl From<Body> for super::Body {
fn from(body: Body) -> Self { super::Body::QuadrupedMedium(body) }
}
add deer, beaver and porcupine npcs
2020-08-30 00:14:36 +00:00
#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
#[repr(u32)]
pub enum Species {
Grolgar = 0,
Saber = 1,
Tiger = 2,
Tuskram = 3,
Lion = 6,
Tarasque = 7,
Wolf = 8,
Frostfang = 9,
Mouflon = 10,
Catoblepas = 11,
Bonerattler = 12,
Deer = 13,
Better quadmed legs/feet ratio
2020-09-06 17:44:24 +00:00
Hirdrasil = 14,
Add roshwalr npc
2020-10-18 00:04:03 +00:00
Roshwalr = 15,
Adds new animals
2020-11-07 23:47:55 +00:00
Donkey = 16,
Camel = 17,
Zebra = 18,
Antelope = 19,
Kelpie = 20,
Horse = 21,
Add new quadmeds npcs with rough offsets
2021-01-12 22:35:59 +00:00
Barghest = 22,
Cattle = 23,
Darkhound = 24,
Highland = 25,
Yak = 26,
Panda = 27,
Bear = 28,
Add new npcs
2021-03-12 00:20:05 +00:00
Dreadhorn = 29,
Moose = 30,
Snowleopard = 31,
add deer, beaver and porcupine npcs
2020-08-30 00:14:36 +00:00
}
Per-speces NPC names! Is also able to refactor some of the uglier code and introduces a framework that (suitably extended) could be useful in removing boilerplate elsewhere.
2020-01-29 03:38:45 +00:00
/// Data representing per-species generic data.
///
/// NOTE: Deliberately don't (yet?) implement serialize.
#[derive(Clone, Debug, Deserialize)]
pub struct AllSpecies<SpeciesMeta> {
cyclops
2020-05-11 05:39:07 +00:00
pub grolgar: SpeciesMeta,
Per-speces NPC names! Is also able to refactor some of the uglier code and introduces a framework that (suitably extended) could be useful in removing boilerplate elsewhere.
2020-01-29 03:38:45 +00:00
pub saber: SpeciesMeta,
Add tiger mob
2020-06-10 22:29:16 +00:00
pub tiger: SpeciesMeta,
Per-speces NPC names! Is also able to refactor some of the uglier code and introduces a framework that (suitably extended) could be useful in removing boilerplate elsewhere.
2020-01-29 03:38:45 +00:00
pub tuskram: SpeciesMeta,
pub lion: SpeciesMeta,
pub tarasque: SpeciesMeta,
Add wolf, frostfang and mouflon npcs
2020-06-24 00:06:42 +00:00
pub wolf: SpeciesMeta,
pub frostfang: SpeciesMeta,
pub mouflon: SpeciesMeta,
catoblepas, bonerattler, rabbit, improved anims
2020-07-28 02:20:13 +00:00
pub catoblepas: SpeciesMeta,
pub bonerattler: SpeciesMeta,
add deer, beaver and porcupine npcs
2020-08-30 00:14:36 +00:00
pub deer: SpeciesMeta,
Better quadmed legs/feet ratio
2020-09-06 17:44:24 +00:00
pub hirdrasil: SpeciesMeta,
Add roshwalr npc
2020-10-18 00:04:03 +00:00
pub roshwalr: SpeciesMeta,
Adds new animals
2020-11-07 23:47:55 +00:00
pub donkey: SpeciesMeta,
pub camel: SpeciesMeta,
pub zebra: SpeciesMeta,
pub antelope: SpeciesMeta,
pub kelpie: SpeciesMeta,
pub horse: SpeciesMeta,
Add new quadmeds npcs with rough offsets
2021-01-12 22:35:59 +00:00
pub barghest: SpeciesMeta,
pub cattle: SpeciesMeta,
pub darkhound: SpeciesMeta,
pub highland: SpeciesMeta,
pub yak: SpeciesMeta,
pub panda: SpeciesMeta,
pub bear: SpeciesMeta,
Add new npcs
2021-03-12 00:20:05 +00:00
pub dreadhorn: SpeciesMeta,
pub moose: SpeciesMeta,
pub snowleopard: SpeciesMeta,
Per-speces NPC names! Is also able to refactor some of the uglier code and introduces a framework that (suitably extended) could be useful in removing boilerplate elsewhere.
2020-01-29 03:38:45 +00:00
}
Allow spawning individual species with /spawn. To get the old behavior, you now need to refer to the internal keywords (like "bird_medium" or "quadruped_small") rather than the old friendly names (like "duck" or "pig"), as the latter generate single species now.
2020-01-29 16:56:28 +00:00
impl<'a, SpeciesMeta> core::ops::Index<&'a Species> for AllSpecies<SpeciesMeta> {
Per-speces NPC names! Is also able to refactor some of the uglier code and introduces a framework that (suitably extended) could be useful in removing boilerplate elsewhere.
2020-01-29 03:38:45 +00:00
type Output = SpeciesMeta;
Allow spawning individual species with /spawn. To get the old behavior, you now need to refer to the internal keywords (like "bird_medium" or "quadruped_small") rather than the old friendly names (like "duck" or "pig"), as the latter generate single species now.
2020-01-29 16:56:28 +00:00
#[inline]
fn index(&self, &index: &'a Species) -> &Self::Output {
Per-speces NPC names! Is also able to refactor some of the uglier code and introduces a framework that (suitably extended) could be useful in removing boilerplate elsewhere.
2020-01-29 03:38:45 +00:00
match index {
cyclops
2020-05-11 05:39:07 +00:00
Species::Grolgar => &self.grolgar,
Per-speces NPC names! Is also able to refactor some of the uglier code and introduces a framework that (suitably extended) could be useful in removing boilerplate elsewhere.
2020-01-29 03:38:45 +00:00
Species::Saber => &self.saber,
Add tiger mob
2020-06-10 22:29:16 +00:00
Species::Tiger => &self.tiger,
Per-speces NPC names! Is also able to refactor some of the uglier code and introduces a framework that (suitably extended) could be useful in removing boilerplate elsewhere.
2020-01-29 03:38:45 +00:00
Species::Tuskram => &self.tuskram,
Species::Lion => &self.lion,
Species::Tarasque => &self.tarasque,
Add wolf, frostfang and mouflon npcs
2020-06-24 00:06:42 +00:00
Species::Wolf => &self.wolf,
Species::Frostfang => &self.frostfang,
Species::Mouflon => &self.mouflon,
catoblepas, bonerattler, rabbit, improved anims
2020-07-28 02:20:13 +00:00
Species::Catoblepas => &self.catoblepas,
Species::Bonerattler => &self.bonerattler,
add deer, beaver and porcupine npcs
2020-08-30 00:14:36 +00:00
Species::Deer => &self.deer,
Better quadmed legs/feet ratio
2020-09-06 17:44:24 +00:00
Species::Hirdrasil => &self.hirdrasil,
Add roshwalr npc
2020-10-18 00:04:03 +00:00
Species::Roshwalr => &self.roshwalr,
Adds new animals
2020-11-07 23:47:55 +00:00
Species::Donkey => &self.donkey,
Species::Camel => &self.camel,
Species::Zebra => &self.zebra,
Species::Antelope => &self.antelope,
Species::Kelpie => &self.kelpie,
Species::Horse => &self.horse,
Add new quadmeds npcs with rough offsets
2021-01-12 22:35:59 +00:00
Species::Barghest => &self.barghest,
Species::Cattle => &self.cattle,
Species::Darkhound => &self.darkhound,
Species::Highland => &self.highland,
Species::Yak => &self.yak,
Species::Panda => &self.panda,
Species::Bear => &self.bear,
Add new npcs
2021-03-12 00:20:05 +00:00
Species::Dreadhorn => &self.dreadhorn,
Species::Moose => &self.moose,
Species::Snowleopard => &self.snowleopard,
Per-speces NPC names! Is also able to refactor some of the uglier code and introduces a framework that (suitably extended) could be useful in removing boilerplate elsewhere.
2020-01-29 03:38:45 +00:00
}
}
}
Add new npcs
2021-03-12 00:20:05 +00:00
pub const ALL_SPECIES: [Species; 30] = [
cyclops
2020-05-11 05:39:07 +00:00
Species::Grolgar,
new mobs alligators
2020-01-26 00:22:48 +00:00
Species::Saber,
Add tiger mob
2020-06-10 22:29:16 +00:00
Species::Tiger,
new mobs alligators
2020-01-26 00:22:48 +00:00
Species::Tuskram,
Species::Lion,
Species::Tarasque,
Add wolf, frostfang and mouflon npcs
2020-06-24 00:06:42 +00:00
Species::Wolf,
Species::Frostfang,
Species::Mouflon,
catoblepas, bonerattler, rabbit, improved anims
2020-07-28 02:20:13 +00:00
Species::Catoblepas,
Species::Bonerattler,
add deer, beaver and porcupine npcs
2020-08-30 00:14:36 +00:00
Species::Deer,
Better quadmed legs/feet ratio
2020-09-06 17:44:24 +00:00
Species::Hirdrasil,
Add roshwalr npc
2020-10-18 00:04:03 +00:00
Species::Roshwalr,
Adds new animals
2020-11-07 23:47:55 +00:00
Species::Donkey,
Species::Camel,
Species::Zebra,
Species::Antelope,
Species::Kelpie,
Species::Horse,
Add new quadmeds npcs with rough offsets
2021-01-12 22:35:59 +00:00
Species::Barghest,
Species::Cattle,
Species::Darkhound,
Species::Highland,
Species::Yak,
Species::Panda,
Species::Bear,
Add new npcs
2021-03-12 00:20:05 +00:00
Species::Dreadhorn,
Species::Moose,
Species::Snowleopard,
new mobs alligators
2020-01-26 00:22:48 +00:00
];
Clean up ecs actor body components
2019-06-28 23:42:51 +00:00
Allow spawning individual species with /spawn. To get the old behavior, you now need to refer to the internal keywords (like "bird_medium" or "quadruped_small") rather than the old friendly names (like "duck" or "pig"), as the latter generate single species now.
2020-01-29 16:56:28 +00:00
impl<'a, SpeciesMeta: 'a> IntoIterator for &'a AllSpecies<SpeciesMeta> {
fix iterator type
2020-05-14 20:13:08 +00:00
type IntoIter = std::iter::Copied<std::slice::Iter<'static, Self::Item>>;
Allow spawning individual species with /spawn. To get the old behavior, you now need to refer to the internal keywords (like "bird_medium" or "quadruped_small") rather than the old friendly names (like "duck" or "pig"), as the latter generate single species now.
2020-01-29 16:56:28 +00:00
type Item = Species;
fn into_iter(self) -> Self::IntoIter { ALL_SPECIES.iter().copied() }
}
Further generalize the typed module. This enables us to automatically create configuration formats from enums or structs. For enums, we create a structure with a field for each case, representing a pattern match; the configuration format can then enter a different expression for each case. For structs, we create an enum with a variant for each field, representing projecting by that field; the configuration format selects the field to project from, and then can write a further expression on that field (for instance, it can perform another pattern match). So far we don't actually have anything that *uses* this functionality; I decided to finish it for the purpose of specifying a default lantern offset, only to discover that we already return a lantern offset from the animation crate. So I fixed it there instead.
2020-08-31 01:01:20 +00:00
make_case_elim!(
body_type,
#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
#[repr(u32)]
pub enum BodyType {
Female = 0,
Male = 1,
}
);
new mobs alligators
2020-01-26 00:22:48 +00:00
pub const ALL_BODY_TYPES: [BodyType; 2] = [BodyType::Female, BodyType::Male];
Reference in New Issue Copy Permalink