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
f7688462a1
veloren/common/src/comp/body/quadruped_small.rs

214 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};
update further dependencies, including strum and get rid of old strum_macro
2022-04-04 14:03:16 +00:00
use strum::{Display, EnumString};
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,
Small fixes
2023-03-29 23:11:59 +00:00
#[derive(Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, Deserialize)]
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
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();
Update Rust toolchain.
2022-09-08 19:51:02 +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 {
Update Rust toolchain.
2022-09-08 19:51:02 +00:00
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::QuadrupedSmall(body) }
}
* Pets are now saved on logout and spawned with the player on login * Pets now teleport to their owner when they are too far away from them * Limited the animals that can be tamed to `QuadrupedLow` and `QuadrupedSmall` to prevent players taming overly powerful creatures before the pet feature is further developed * Added `Pet` component used to store pet information about an entity - currently only used to store the pet's database ID * Added `pet` database table which stores a pet's `body_id` and `name`, alongside the `character_id` that it belongs to * Replaced `HomeChunk` component with more flexible `Anchor` component which supports anchoring entities to other entities as well as chunks.
2021-07-28 22:36:41 +00:00
// Renaming any enum entries here (re-ordering is fine) will require a
// database migration to ensure pets correctly de-serialize on player login.
Small fixes
2023-03-29 23:11:59 +00:00
#[derive(
Copy,
Clone,
Debug,
Display,
EnumString,
PartialEq,
Eq,
PartialOrd,
Ord,
Hash,
Serialize,
Deserialize,
)]
haul out the critter skele, add theropod
2020-08-29 08:23:12 +00:00
#[repr(u32)]
pub enum Species {
Pig = 0,
Fox = 1,
Sheep = 2,
Boar = 3,
Jackalope = 4,
Skunk = 5,
Cat = 6,
Batfox = 7,
Raccoon = 8,
Quokka = 9,
Creature model updates
2022-09-06 10:35:10 +00:00
Goat = 10,
haul out the critter skele, add theropod
2020-08-29 08:23:12 +00:00
Holladon = 11,
Hyena = 12,
Rabbit = 13,
Truffler = 14,
Frog = 15,
Rat = 16,
Axolotl = 17,
Gecko = 18,
Turtle = 19,
Squirrel = 20,
Fungome = 21,
add deer, beaver and porcupine npcs
2020-08-30 00:14:36 +00:00
Porcupine = 22,
Beaver = 23,
Adds 3 new npcs
2020-11-17 00:13:59 +00:00
Hare = 24,
More npcs work
2021-01-13 23:45:56 +00:00
Dog = 25,
seal
2022-12-17 21:06:19 +00:00
Seal = 26,
haul out the critter skele, add theropod
2020-08-29 08:23:12 +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> {
pub pig: SpeciesMeta,
pub fox: SpeciesMeta,
pub sheep: SpeciesMeta,
pub boar: SpeciesMeta,
pub jackalope: SpeciesMeta,
pub skunk: SpeciesMeta,
pub cat: SpeciesMeta,
pub batfox: SpeciesMeta,
pub raccoon: SpeciesMeta,
pub quokka: SpeciesMeta,
pub holladon: SpeciesMeta,
new animals
2020-04-28 03:13:23 +00:00
pub hyena: SpeciesMeta,
catoblepas, bonerattler, rabbit, improved anims
2020-07-28 02:20:13 +00:00
pub rabbit: SpeciesMeta,
Add troll, truffler and wendigo npcs
2020-07-28 23:09:45 +00:00
pub truffler: SpeciesMeta,
Add frog npc, tweak pig model
2020-07-30 19:53:48 +00:00
pub frog: SpeciesMeta,
haul out the critter skele, add theropod
2020-08-29 08:23:12 +00:00
pub rat: SpeciesMeta,
pub axolotl: SpeciesMeta,
pub gecko: SpeciesMeta,
pub turtle: SpeciesMeta,
pub squirrel: SpeciesMeta,
pub fungome: SpeciesMeta,
add deer, beaver and porcupine npcs
2020-08-30 00:14:36 +00:00
pub porcupine: SpeciesMeta,
pub beaver: SpeciesMeta,
Adds 3 new npcs
2020-11-17 00:13:59 +00:00
pub hare: SpeciesMeta,
More npcs work
2021-01-13 23:45:56 +00:00
pub dog: SpeciesMeta,
Add new npcs
2021-03-12 00:20:05 +00:00
pub goat: SpeciesMeta,
seal
2022-12-17 21:06:19 +00:00
pub seal: 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 {
Species::Pig => &self.pig,
Species::Fox => &self.fox,
Species::Sheep => &self.sheep,
Species::Boar => &self.boar,
Species::Jackalope => &self.jackalope,
Species::Skunk => &self.skunk,
Species::Cat => &self.cat,
Species::Batfox => &self.batfox,
Species::Raccoon => &self.raccoon,
Species::Quokka => &self.quokka,
Species::Holladon => &self.holladon,
new animals
2020-04-28 03:13:23 +00:00
Species::Hyena => &self.hyena,
catoblepas, bonerattler, rabbit, improved anims
2020-07-28 02:20:13 +00:00
Species::Rabbit => &self.rabbit,
Add troll, truffler and wendigo npcs
2020-07-28 23:09:45 +00:00
Species::Truffler => &self.truffler,
Add frog npc, tweak pig model
2020-07-30 19:53:48 +00:00
Species::Frog => &self.frog,
haul out the critter skele, add theropod
2020-08-29 08:23:12 +00:00
Species::Rat => &self.rat,
Species::Axolotl => &self.axolotl,
Species::Gecko => &self.gecko,
Species::Turtle => &self.turtle,
Species::Squirrel => &self.squirrel,
Species::Fungome => &self.fungome,
add deer, beaver and porcupine npcs
2020-08-30 00:14:36 +00:00
Species::Porcupine => &self.porcupine,
Species::Beaver => &self.beaver,
Adds 3 new npcs
2020-11-17 00:13:59 +00:00
Species::Hare => &self.hare,
More npcs work
2021-01-13 23:45:56 +00:00
Species::Dog => &self.dog,
Add new npcs
2021-03-12 00:20:05 +00:00
Species::Goat => &self.goat,
seal
2022-12-17 21:06:19 +00:00
Species::Seal => &self.seal,
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
}
}
}
seal
2022-12-17 21:06:19 +00:00
pub const ALL_SPECIES: [Species; 27] = [
new mobs alligators
2020-01-26 00:22:48 +00:00
Species::Pig,
Species::Fox,
Species::Sheep,
Species::Boar,
Species::Jackalope,
Species::Skunk,
Species::Cat,
Species::Batfox,
Species::Raccoon,
Species::Quokka,
Species::Holladon,
new animals
2020-04-28 03:13:23 +00:00
Species::Hyena,
catoblepas, bonerattler, rabbit, improved anims
2020-07-28 02:20:13 +00:00
Species::Rabbit,
Add troll, truffler and wendigo npcs
2020-07-28 23:09:45 +00:00
Species::Truffler,
Add frog npc, tweak pig model
2020-07-30 19:53:48 +00:00
Species::Frog,
haul out the critter skele, add theropod
2020-08-29 08:23:12 +00:00
Species::Rat,
Species::Axolotl,
Species::Gecko,
Species::Turtle,
Species::Squirrel,
Species::Fungome,
add deer, beaver and porcupine npcs
2020-08-30 00:14:36 +00:00
Species::Porcupine,
Species::Beaver,
Adds 3 new npcs
2020-11-17 00:13:59 +00:00
Species::Hare,
More npcs work
2021-01-13 23:45:56 +00:00
Species::Dog,
Add new npcs
2021-03-12 00:20:05 +00:00
Species::Goat,
seal
2022-12-17 21:06:19 +00:00
Species::Seal,
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() }
}
* Pets are now saved on logout and spawned with the player on login * Pets now teleport to their owner when they are too far away from them * Limited the animals that can be tamed to `QuadrupedLow` and `QuadrupedSmall` to prevent players taming overly powerful creatures before the pet feature is further developed * Added `Pet` component used to store pet information about an entity - currently only used to store the pet's database ID * Added `pet` database table which stores a pet's `body_id` and `name`, alongside the `character_id` that it belongs to * Replaced `HomeChunk` component with more flexible `Anchor` component which supports anchoring entities to other entities as well as chunks.
2021-07-28 22:36:41 +00:00
// Renaming any enum entries here (re-ordering is fine) will require a
// database migration to ensure pets correctly de-serialize on player login.
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,
* Pets are now saved on logout and spawned with the player on login * Pets now teleport to their owner when they are too far away from them * Limited the animals that can be tamed to `QuadrupedLow` and `QuadrupedSmall` to prevent players taming overly powerful creatures before the pet feature is further developed * Added `Pet` component used to store pet information about an entity - currently only used to store the pet's database ID * Added `pet` database table which stores a pet's `body_id` and `name`, alongside the `character_id` that it belongs to * Replaced `HomeChunk` component with more flexible `Anchor` component which supports anchoring entities to other entities as well as chunks.
2021-07-28 22:36:41 +00:00
#[derive(
Small fixes
2023-03-29 23:11:59 +00:00
Copy,
Clone,
Debug,
Display,
EnumString,
PartialEq,
Eq,
PartialOrd,
Ord,
Hash,
Serialize,
Deserialize,
* Pets are now saved on logout and spawned with the player on login * Pets now teleport to their owner when they are too far away from them * Limited the animals that can be tamed to `QuadrupedLow` and `QuadrupedSmall` to prevent players taming overly powerful creatures before the pet feature is further developed * Added `Pet` component used to store pet information about an entity - currently only used to store the pet's database ID * Added `pet` database table which stores a pet's `body_id` and `name`, alongside the `character_id` that it belongs to * Replaced `HomeChunk` component with more flexible `Anchor` component which supports anchoring entities to other entities as well as chunks.
2021-07-28 22:36:41 +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
#[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