diff --git a/assets/common/npc_names.json b/assets/common/npc_names.json index fb5f7b2a76..657d073103 100644 --- a/assets/common/npc_names.json +++ b/assets/common/npc_names.json @@ -602,9 +602,9 @@ "keyword": "archaeos", "generic": "Archaeos" }, - "odontotyrannos": { - "keyword": "odontotyrannos", - "generic": "Odontotyrannos" + "odonto": { + "keyword": "odonto", + "generic": "Odonto" } } }, diff --git a/assets/voxygen/voxel/npc/odontotyrannos/male/chest_back.vox b/assets/voxygen/voxel/npc/odonto/male/chest_back.vox similarity index 100% rename from assets/voxygen/voxel/npc/odontotyrannos/male/chest_back.vox rename to assets/voxygen/voxel/npc/odonto/male/chest_back.vox diff --git a/assets/voxygen/voxel/npc/odontotyrannos/male/chest_front.vox b/assets/voxygen/voxel/npc/odonto/male/chest_front.vox similarity index 100% rename from assets/voxygen/voxel/npc/odontotyrannos/male/chest_front.vox rename to assets/voxygen/voxel/npc/odonto/male/chest_front.vox diff --git a/assets/voxygen/voxel/npc/odontotyrannos/male/foot_l.vox b/assets/voxygen/voxel/npc/odonto/male/foot_l.vox similarity index 100% rename from assets/voxygen/voxel/npc/odontotyrannos/male/foot_l.vox rename to assets/voxygen/voxel/npc/odonto/male/foot_l.vox diff --git a/assets/voxygen/voxel/npc/odontotyrannos/male/foot_r.vox b/assets/voxygen/voxel/npc/odonto/male/foot_r.vox similarity index 100% rename from assets/voxygen/voxel/npc/odontotyrannos/male/foot_r.vox rename to assets/voxygen/voxel/npc/odonto/male/foot_r.vox diff --git a/assets/voxygen/voxel/npc/odontotyrannos/male/hand_l.vox b/assets/voxygen/voxel/npc/odonto/male/hand_l.vox similarity index 100% rename from assets/voxygen/voxel/npc/odontotyrannos/male/hand_l.vox rename to assets/voxygen/voxel/npc/odonto/male/hand_l.vox diff --git a/assets/voxygen/voxel/npc/odontotyrannos/male/hand_r.vox b/assets/voxygen/voxel/npc/odonto/male/hand_r.vox similarity index 100% rename from assets/voxygen/voxel/npc/odontotyrannos/male/hand_r.vox rename to assets/voxygen/voxel/npc/odonto/male/hand_r.vox diff --git a/assets/voxygen/voxel/npc/odontotyrannos/male/head.vox b/assets/voxygen/voxel/npc/odonto/male/head.vox similarity index 100% rename from assets/voxygen/voxel/npc/odontotyrannos/male/head.vox rename to assets/voxygen/voxel/npc/odonto/male/head.vox diff --git a/assets/voxygen/voxel/npc/odontotyrannos/male/jaw.vox b/assets/voxygen/voxel/npc/odonto/male/jaw.vox similarity index 100% rename from assets/voxygen/voxel/npc/odontotyrannos/male/jaw.vox rename to assets/voxygen/voxel/npc/odonto/male/jaw.vox diff --git a/assets/voxygen/voxel/npc/odontotyrannos/male/leg_l.vox b/assets/voxygen/voxel/npc/odonto/male/leg_l.vox similarity index 100% rename from assets/voxygen/voxel/npc/odontotyrannos/male/leg_l.vox rename to assets/voxygen/voxel/npc/odonto/male/leg_l.vox diff --git a/assets/voxygen/voxel/npc/odontotyrannos/male/leg_r.vox b/assets/voxygen/voxel/npc/odonto/male/leg_r.vox similarity index 100% rename from assets/voxygen/voxel/npc/odontotyrannos/male/leg_r.vox rename to assets/voxygen/voxel/npc/odonto/male/leg_r.vox diff --git a/assets/voxygen/voxel/npc/odontotyrannos/male/tail_back.vox b/assets/voxygen/voxel/npc/odonto/male/tail_back.vox similarity index 100% rename from assets/voxygen/voxel/npc/odontotyrannos/male/tail_back.vox rename to assets/voxygen/voxel/npc/odonto/male/tail_back.vox diff --git a/assets/voxygen/voxel/npc/odontotyrannos/male/tail_front.vox b/assets/voxygen/voxel/npc/odonto/male/tail_front.vox similarity index 100% rename from assets/voxygen/voxel/npc/odontotyrannos/male/tail_front.vox rename to assets/voxygen/voxel/npc/odonto/male/tail_front.vox diff --git a/assets/voxygen/voxel/theropod_central_manifest.ron b/assets/voxygen/voxel/theropod_central_manifest.ron index f0bc769355..01d2f7a1d5 100644 --- a/assets/voxygen/voxel/theropod_central_manifest.ron +++ b/assets/voxygen/voxel/theropod_central_manifest.ron @@ -59,14 +59,14 @@ central: ("npc.archaeos.male.tail_back"), ), ), - (Odontotyrannos, Male): ( + (Odonto, Male): ( head: ( offset: (-10.5, 0.0, -8.0), - central: ("npc.odontotyrannos.male.head"), + central: ("npc.odonto.male.head"), ), jaw: ( offset: (-6.5, 0.0, -3.0), - central: ("npc.odontotyrannos.male.jaw"), + central: ("npc.odonto.male.jaw"), ), neck: ( offset: (0.0, 0.0, 0.0), @@ -74,29 +74,29 @@ ), chest_front: ( offset: (-5.5, -5.0, -6.0), - central: ("npc.odontotyrannos.male.chest_front"), + central: ("npc.odonto.male.chest_front"), ), chest_back: ( offset: (-6.5, -8.0, -8.5), - central: ("npc.odontotyrannos.male.chest_back"), + central: ("npc.odonto.male.chest_back"), ), tail_front: ( offset: (-3.5, -8.0, -5.5), - central: ("npc.odontotyrannos.male.tail_front"), + central: ("npc.odonto.male.tail_front"), ), tail_back: ( - offset: (-2.5, -23.0, -3.0), - central: ("npc.odontotyrannos.male.tail_back"), + offset: (-2.5, -19.0, -5.0), + central: ("npc.odonto.male.tail_back"), ), ), - (Odontotyrannos, Female): ( + (Odonto, Female): ( head: ( offset: (-10.5, 0.0, -8.0), - central: ("npc.odontotyrannos.male.head"), + central: ("npc.odonto.male.head"), ), jaw: ( offset: (-6.5, 0.0, -3.0), - central: ("npc.odontotyrannos.male.jaw"), + central: ("npc.odonto.male.jaw"), ), neck: ( offset: (0.0, 0.0, 0.0), @@ -104,19 +104,19 @@ ), chest_front: ( offset: (-5.5, -5.0, -6.0), - central: ("npc.odontotyrannos.male.chest_front"), + central: ("npc.odonto.male.chest_front"), ), chest_back: ( offset: (-6.5, -8.0, -8.5), - central: ("npc.odontotyrannos.male.chest_back"), + central: ("npc.odonto.male.chest_back"), ), tail_front: ( offset: (-3.5, -8.0, -5.5), - central: ("npc.odontotyrannos.male.tail_front"), + central: ("npc.odonto.male.tail_front"), ), tail_back: ( - offset: (-2.5, -8.0, -3.0), - central: ("npc.odontotyrannos.male.tail_back"), + offset: (-2.5, -19.0, -5.0), + central: ("npc.odonto.male.tail_back"), ), ), }) diff --git a/assets/voxygen/voxel/theropod_lateral_manifest.ron b/assets/voxygen/voxel/theropod_lateral_manifest.ron index ca4cc8cd0f..39603e4a41 100644 --- a/assets/voxygen/voxel/theropod_lateral_manifest.ron +++ b/assets/voxygen/voxel/theropod_lateral_manifest.ron @@ -51,56 +51,56 @@ lateral: ("npc.archaeos.male.foot_r"), ), ), - (Odontotyrannos, Male): ( + (Odonto, Male): ( hand_l: ( offset: (-3.0, -3.0, -7.0), - lateral: ("npc.odontotyrannos.male.hand_l"), + lateral: ("npc.odonto.male.hand_l"), ), hand_r: ( offset: (0.0, -3.0, -7.0), - lateral: ("npc.odontotyrannos.male.hand_r"), + lateral: ("npc.odonto.male.hand_r"), ), leg_l: ( offset: (-7.0, -4.5, -4.0), - lateral: ("npc.odontotyrannos.male.leg_l"), + lateral: ("npc.odonto.male.leg_l"), ), leg_r: ( offset: (0.0, -4.5, -4.0), - lateral: ("npc.odontotyrannos.male.leg_r"), + lateral: ("npc.odonto.male.leg_r"), ), foot_l: ( - offset: (-14.0, -1.0, -8.0), - lateral: ("npc.odontotyrannos.male.foot_l"), + offset: (-8.0, -1.0, -8.0), + lateral: ("npc.odonto.male.foot_l"), ), foot_r: ( offset: (-6.0, -1.0, -8.0), - lateral: ("npc.odontotyrannos.male.foot_r"), + lateral: ("npc.odonto.male.foot_r"), ), ), - (Odontotyrannos, Female): ( + (Odonto, Female): ( hand_l: ( offset: (-3.0, -3.0, -7.0), - lateral: ("npc.odontotyrannos.male.hand_l"), + lateral: ("npc.odonto.male.hand_l"), ), hand_r: ( offset: (0.0, -3.0, -7.0), - lateral: ("npc.odontotyrannos.male.hand_r"), + lateral: ("npc.odonto.male.hand_r"), ), leg_l: ( offset: (-7.0, -4.5, -4.0), - lateral: ("npc.odontotyrannos.male.leg_l"), + lateral: ("npc.odonto.male.leg_l"), ), leg_r: ( offset: (0.0, -4.5, -4.0), - lateral: ("npc.odontotyrannos.male.leg_r"), + lateral: ("npc.odonto.male.leg_r"), ), foot_l: ( - offset: (-14.0, -1.0, -8.0), - lateral: ("npc.odontotyrannos.male.foot_l"), + offset: (-8.0, -1.0, -8.0), + lateral: ("npc.odonto.male.foot_l"), ), foot_r: ( offset: (-6.0, -1.0, -8.0), - lateral: ("npc.odontotyrannos.male.foot_r"), + lateral: ("npc.odonto.male.foot_r"), ), ), }) diff --git a/common/src/comp/agent.rs b/common/src/comp/agent.rs index 1fc7b53371..fbccf28c87 100644 --- a/common/src/comp/agent.rs +++ b/common/src/comp/agent.rs @@ -1,5 +1,5 @@ use crate::{ - comp::{humanoid, quadruped_low, quadruped_medium, quadruped_small, theropod, Body}, + comp::{humanoid, quadruped_low, quadruped_medium, quadruped_small, Body}, path::Chaser, sync::Uid, }; diff --git a/common/src/comp/body/theropod.rs b/common/src/comp/body/theropod.rs index 446034a128..e7d2ac75f6 100644 --- a/common/src/comp/body/theropod.rs +++ b/common/src/comp/body/theropod.rs @@ -29,14 +29,14 @@ impl From for super::Body { #[repr(u32)] pub enum Species { Archaeos = 0, - Odontotyrannos = 1, + Odonto = 1, } /// Data representing per-species generic data. #[derive(Clone, Debug, Serialize, Deserialize)] pub struct AllSpecies { pub archaeos: SpeciesMeta, - pub odontotyrannos: SpeciesMeta, + pub odonto: SpeciesMeta, } impl<'a, SpeciesMeta> core::ops::Index<&'a Species> for AllSpecies { @@ -46,12 +46,12 @@ impl<'a, SpeciesMeta> core::ops::Index<&'a Species> for AllSpecies fn index(&self, &index: &'a Species) -> &Self::Output { match index { Species::Archaeos => &self.archaeos, - Species::Odontotyrannos => &self.odontotyrannos, + Species::Odonto => &self.odonto, } } } -pub const ALL_SPECIES: [Species; 2] = [Species::Archaeos, Species::Odontotyrannos]; +pub const ALL_SPECIES: [Species; 2] = [Species::Archaeos, Species::Odonto]; impl<'a, SpeciesMeta: 'a> IntoIterator for &'a AllSpecies { type IntoIter = std::iter::Copied>; diff --git a/server/src/events/entity_manipulation.rs b/server/src/events/entity_manipulation.rs index cef530ce5d..88428fc3d7 100644 --- a/server/src/events/entity_manipulation.rs +++ b/server/src/events/entity_manipulation.rs @@ -317,7 +317,9 @@ pub fn handle_destroy(server: &mut Server, entity: EcsEntity, cause: HealthSourc 7 => "common.loot_tables.loot_table_weapon_rare", _ => "common.loot_tables.loot_table", }, - Some(common::comp::Body::Theropod(_)) => "common.loot_tables.loot_table_animal_parts", + Some(common::comp::Body::Theropod(_)) => { + "common.loot_tables.loot_table_animal_parts" + }, Some(common::comp::Body::Dragon(_)) => "common.loot_tables.loot_table_weapon_rare", Some(common::comp::Body::QuadrupedLow(_)) => match rng.gen_range(0, 3) { 0 => "common.loot_tables.loot_table_food", diff --git a/voxygen/src/anim/src/quadruped_medium/feed.rs b/voxygen/src/anim/src/quadruped_medium/feed.rs index bef398b5fa..4788b37b62 100644 --- a/voxygen/src/anim/src/quadruped_medium/feed.rs +++ b/voxygen/src/anim/src/quadruped_medium/feed.rs @@ -61,9 +61,10 @@ impl Animation for FeedAnimation { skeleton_attr.head.0, skeleton_attr.head.1 + slower * 0.2, ); - next.head.orientation = - Quaternion::rotation_z(0.3 * look.x) - * Quaternion::rotation_x(fast * 0.05 + faster * 0.08 + 0.8 * skeleton_attr.feed.1 * transition); + next.head.orientation = Quaternion::rotation_z(0.3 * look.x) + * Quaternion::rotation_x( + fast * 0.05 + faster * 0.08 + 0.8 * skeleton_attr.feed.1 * transition, + ); next.head.scale = Vec3::one(); next.neck.position = Vec3::new( @@ -71,7 +72,8 @@ impl Animation for FeedAnimation { skeleton_attr.neck.0, skeleton_attr.neck.1 + slower * 0.1 - 4.0 * transition, ); - next.neck.orientation =Quaternion::rotation_x(-2.5 * skeleton_attr.feed.1 * transition); + next.neck.orientation = + Quaternion::rotation_x(-2.5 * skeleton_attr.feed.1 * transition); next.neck.scale = Vec3::one() * 1.02; next.jaw.position = Vec3::new( @@ -90,7 +92,7 @@ impl Animation for FeedAnimation { next.head.orientation = Quaternion::rotation_z(0.3 * look.x) * Quaternion::rotation_x(0.3 * look.y); next.head.scale = Vec3::one(); - + next.neck.position = Vec3::new( 0.0, skeleton_attr.neck.0, @@ -98,14 +100,14 @@ impl Animation for FeedAnimation { ); next.neck.orientation = Quaternion::rotation_z(0.0) * Quaternion::rotation_x(0.0); next.neck.scale = Vec3::one() * 1.02; - + next.jaw.position = Vec3::new( 0.0, skeleton_attr.jaw.0 - slower * 0.12, skeleton_attr.jaw.1 + slow * 0.2 + 0.5, ); next.jaw.orientation = Quaternion::rotation_x(slow * 0.05 - 0.08); - next.jaw.scale = Vec3::one() * 1.02; + next.jaw.scale = Vec3::one() * 1.02; } next.tail.position = Vec3::new(0.0, skeleton_attr.tail.0, skeleton_attr.tail.1); @@ -202,4 +204,4 @@ impl Animation for FeedAnimation { next } -} \ No newline at end of file +} diff --git a/voxygen/src/anim/src/quadruped_medium/idle.rs b/voxygen/src/anim/src/quadruped_medium/idle.rs index 5da26b09e6..3285ba2bcb 100644 --- a/voxygen/src/anim/src/quadruped_medium/idle.rs +++ b/voxygen/src/anim/src/quadruped_medium/idle.rs @@ -170,4 +170,4 @@ impl Animation for IdleAnimation { next } -} \ No newline at end of file +} diff --git a/voxygen/src/anim/src/quadruped_medium/mod.rs b/voxygen/src/anim/src/quadruped_medium/mod.rs index 7985b40f70..5212b1377a 100644 --- a/voxygen/src/anim/src/quadruped_medium/mod.rs +++ b/voxygen/src/anim/src/quadruped_medium/mod.rs @@ -6,7 +6,8 @@ pub mod run; // Reexports pub use self::{ - alpha::AlphaAnimation, feed::FeedAnimation, idle::IdleAnimation, jump::JumpAnimation, run::RunAnimation, + alpha::AlphaAnimation, feed::FeedAnimation, idle::IdleAnimation, jump::JumpAnimation, + run::RunAnimation, }; use super::{make_bone, vek::*, FigureBoneData, Skeleton}; @@ -288,7 +289,7 @@ impl<'a> From<&'a Body> for SkeletonAttr { feet_b: match (body.species, body.body_type) { (Grolgar, _) => (0.5, -1.5, -3.0), (Saber, _) => (1.0, -1.0, -1.0), - (Tuskram, _) => (0.5,-1.0, -2.5), + (Tuskram, _) => (0.5, -1.0, -2.5), (Lion, _) => (0.5, -1.0, -3.0), (Tarasque, _) => (1.5, -1.0, -2.5), (Tiger, _) => (0.5, -1.0, -4.0), @@ -370,4 +371,4 @@ impl<'a> From<&'a Body> for SkeletonAttr { }, } } -} \ No newline at end of file +} diff --git a/voxygen/src/anim/src/theropod/idle.rs b/voxygen/src/anim/src/theropod/idle.rs index b37857e31e..cce7b1bbf4 100644 --- a/voxygen/src/anim/src/theropod/idle.rs +++ b/voxygen/src/anim/src/theropod/idle.rs @@ -115,7 +115,7 @@ impl Animation for IdleAnimation { next.foot_l.position = Vec3::new( -skeleton_attr.foot.0, skeleton_attr.foot.1, - skeleton_attr.foot.2 + breathe * -0.35, + skeleton_attr.foot.2 + breathe * -0.15, ); next.foot_l.orientation = Quaternion::rotation_z(0.0); next.foot_l.scale = Vec3::one() * 1.02; @@ -123,7 +123,7 @@ impl Animation for IdleAnimation { next.foot_r.position = Vec3::new( skeleton_attr.foot.0, skeleton_attr.foot.1, - skeleton_attr.foot.2 + breathe * -0.45, + skeleton_attr.foot.2 + breathe * -0.15, ); next.foot_r.orientation = Quaternion::rotation_z(0.0); next.foot_r.scale = Vec3::one() * 1.02; diff --git a/voxygen/src/anim/src/theropod/mod.rs b/voxygen/src/anim/src/theropod/mod.rs index d14642c740..24c1796f3b 100644 --- a/voxygen/src/anim/src/theropod/mod.rs +++ b/voxygen/src/anim/src/theropod/mod.rs @@ -116,43 +116,43 @@ impl<'a> From<&'a Body> for SkeletonAttr { Self { head: match (body.species, body.body_type) { (Archaeos, _) => (8.0, 4.0), - (Odontotyrannos, _) => (-2.5, 3.0), + (Odonto, _) => (-1.0, 5.0), }, jaw: match (body.species, body.body_type) { (Archaeos, _) => (1.0, -7.0), - (Odontotyrannos, _) => (1.0, -7.0), + (Odonto, _) => (2.0, -7.0), }, neck: match (body.species, body.body_type) { (Archaeos, _) => (4.5, -2.0), - (Odontotyrannos, _) => (4.5, -2.0), + (Odonto, _) => (4.5, -2.0), }, chest_front: match (body.species, body.body_type) { (Archaeos, _) => (0.0, 20.0), - (Odontotyrannos, _) => (0.0, 9.0), + (Odonto, _) => (0.0, 13.0), }, chest_back: match (body.species, body.body_type) { (Archaeos, _) => (-5.5, -1.0), - (Odontotyrannos, _) => (-5.0, 2.0), + (Odonto, _) => (-5.0, 2.0), }, tail_front: match (body.species, body.body_type) { (Archaeos, _) => (-9.0, -1.5), - (Odontotyrannos, _) => (-8.0, -1.0), + (Odonto, _) => (-7.0, -1.0), }, tail_back: match (body.species, body.body_type) { (Archaeos, _) => (-8.0, -0.5), - (Odontotyrannos, _) => (-12.0, -1.5), + (Odonto, _) => (-8.0, 0.5), }, hand: match (body.species, body.body_type) { (Archaeos, _) => (3.0, 0.0, -4.0), - (Odontotyrannos, _) => (3.5, 3.0, -4.0), + (Odonto, _) => (3.5, 3.0, -4.0), }, leg: match (body.species, body.body_type) { (Archaeos, _) => (4.5, -3.0, -4.0), - (Odontotyrannos, _) => (5.5, -2.5, -2.0), + (Odonto, _) => (5.5, -2.5, -4.0), }, foot: match (body.species, body.body_type) { (Archaeos, _) => (1.0, -0.5, -7.0), - (Odontotyrannos, _) => (-1.0, -6.5, -3.0), + (Odonto, _) => (2.0, -6.5, -3.0), }, } } diff --git a/voxygen/src/scene/figure/load.rs b/voxygen/src/scene/figure/load.rs index f541e79c1e..1d77fe0f0f 100644 --- a/voxygen/src/scene/figure/load.rs +++ b/voxygen/src/scene/figure/load.rs @@ -1916,11 +1916,7 @@ impl TheropodCentralSpec { (central, Vec3::from(spec.chest_back.offset)) } - fn mesh_tail_front( - &self, - species: TSpecies, - body_type: TBodyType, - ) -> BoneMeshes { + fn mesh_tail_front(&self, species: TSpecies, body_type: TBodyType) -> BoneMeshes { let spec = match self.0.get(&(species, body_type)) { Some(spec) => spec, None => { @@ -1936,11 +1932,7 @@ impl TheropodCentralSpec { (central, Vec3::from(spec.tail_front.offset)) } - fn mesh_tail_back( - &self, - species: TSpecies, - body_type: TBodyType, - ) -> BoneMeshes { + fn mesh_tail_back(&self, species: TSpecies, body_type: TBodyType) -> BoneMeshes { let spec = match self.0.get(&(species, body_type)) { Some(spec) => spec, None => { @@ -1957,11 +1949,7 @@ impl TheropodCentralSpec { } } impl TheropodLateralSpec { - fn mesh_hand_l( - &self, - species: TSpecies, - body_type: TBodyType, - ) -> BoneMeshes { + fn mesh_hand_l(&self, species: TSpecies, body_type: TBodyType) -> BoneMeshes { let spec = match self.0.get(&(species, body_type)) { Some(spec) => spec, None => { @@ -1977,11 +1965,7 @@ impl TheropodLateralSpec { (lateral, Vec3::from(spec.hand_l.offset)) } - fn mesh_hand_r( - &self, - species: TSpecies, - body_type: TBodyType, - ) -> BoneMeshes { + fn mesh_hand_r(&self, species: TSpecies, body_type: TBodyType) -> BoneMeshes { let spec = match self.0.get(&(species, body_type)) { Some(spec) => spec, None => { @@ -1997,11 +1981,7 @@ impl TheropodLateralSpec { (lateral, Vec3::from(spec.hand_r.offset)) } - fn mesh_leg_l( - &self, - species: TSpecies, - body_type: TBodyType, - ) -> BoneMeshes { + fn mesh_leg_l(&self, species: TSpecies, body_type: TBodyType) -> BoneMeshes { let spec = match self.0.get(&(species, body_type)) { Some(spec) => spec, None => { @@ -2017,11 +1997,7 @@ impl TheropodLateralSpec { (lateral, Vec3::from(spec.leg_l.offset)) } - fn mesh_leg_r( - &self, - species: TSpecies, - body_type: TBodyType, - ) -> BoneMeshes { + fn mesh_leg_r(&self, species: TSpecies, body_type: TBodyType) -> BoneMeshes { let spec = match self.0.get(&(species, body_type)) { Some(spec) => spec, None => { @@ -2037,11 +2013,7 @@ impl TheropodLateralSpec { (lateral, Vec3::from(spec.leg_r.offset)) } - fn mesh_foot_l( - &self, - species: TSpecies, - body_type: TBodyType, - ) -> BoneMeshes { + fn mesh_foot_l(&self, species: TSpecies, body_type: TBodyType) -> BoneMeshes { let spec = match self.0.get(&(species, body_type)) { Some(spec) => spec, None => { @@ -2057,11 +2029,7 @@ impl TheropodLateralSpec { (lateral, Vec3::from(spec.foot_l.offset)) } - fn mesh_foot_r( - &self, - species: TSpecies, - body_type: TBodyType, - ) -> BoneMeshes { + fn mesh_foot_r(&self, species: TSpecies, body_type: TBodyType) -> BoneMeshes { let spec = match self.0.get(&(species, body_type)) { Some(spec) => spec, None => { @@ -3103,11 +3071,7 @@ impl GolemCentralSpec { (central, Vec3::from(spec.torso_upper.offset)) } - pub fn mesh_torso_lower( - &self, - species: GSpecies, - body_type: GBodyType, - ) -> BoneMeshes { + pub fn mesh_torso_lower(&self, species: GSpecies, body_type: GBodyType) -> BoneMeshes { let spec = match self.0.get(&(species, body_type)) { Some(spec) => spec, None => { diff --git a/world/src/lib.rs b/world/src/lib.rs index e698f714e8..d7147bc736 100644 --- a/world/src/lib.rs +++ b/world/src/lib.rs @@ -35,7 +35,7 @@ use crate::{ util::{Grid, Sampler}, }; use common::{ - comp::{self, bird_medium, quadruped_low, quadruped_medium, quadruped_small, theropod}, + comp::{self, bird_medium, quadruped_low, quadruped_medium, quadruped_small}, generation::{ChunkSupplement, EntityInfo}, msg::server::WorldMapMsg, terrain::{Block, BlockKind, TerrainChunk, TerrainChunkMeta, TerrainChunkSize}, @@ -256,10 +256,6 @@ impl World { comp::Body::BirdMedium(bird_medium::Body::random()) }, 2 => { - is_hostile = true; - comp::Body::Theropod(theropod::Body::random()) - }, - 3 => { match quadlow { comp::Body::QuadrupedLow(quadruped_low) => { match quadruped_low.species {