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

bristlemane

Browse Source
This commit is contained in:
flo666 2022-12-18 10:23:57 +01:00
parent 271b80b832
commit 75bfbff2c3
18 changed files with 195 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
assets/common/entity/wild/aggressive/bristlemane.ron Normal file
View File

@ -0,0 +1,11 @@
#![enable(implicit_some)]
(
name: Automatic,
body: RandomWith("bristlemane"),
alignment: Alignment(Enemy),
loot: LootTable("common.loot_tables.creature.quad_medium.generic"),
inventory: (
loadout: FromBody,
),
meta: [],
)

4
assets/common/npc_names.ron
View File

@ -567,6 +567,10 @@
keyword: "akhlut",
generic: "Akhlut"
),
bristlemane: (
keyword: "bristlemane",
generic: "Bristlemane"
),
)
),
quadruped_small: (

BIN
assets/voxygen/voxel/npc/bristlemane/male/foot_br.vox (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/voxel/npc/bristlemane/male/foot_fr.vox (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/voxel/npc/bristlemane/male/head.vox (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/voxel/npc/bristlemane/male/jaw.vox (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/voxel/npc/bristlemane/male/leg_br.vox (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/voxel/npc/bristlemane/male/leg_fr.vox (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/voxel/npc/bristlemane/male/neck.vox (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/voxel/npc/bristlemane/male/tail.vox (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/voxel/npc/bristlemane/male/torso_back.vox (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/voxel/npc/bristlemane/male/torso_front.vox (Stored with Git LFS) Normal file
View File

Binary file not shown.

60
assets/voxygen/voxel/quadruped_medium_central_manifest.ron
View File

@ -2099,4 +2099,64 @@
central: ("npc.akhlut.male.tail"),
),
),
(Bristlemane, Male): (
head: (
offset: (-7.5, 0.0, -8.5),
central: ("npc.bristlemane.male.head"),
),
neck: (
offset: (-3.5, -2.0, -6.5),
central: ("npc.bristlemane.male.neck"),
),
jaw: (
offset: (-3.5, -3.5, -0.5),
central: ("npc.bristlemane.male.jaw"),
),
torso_front: (
offset: (-6.5, -5.0, -6.0),
central: ("npc.bristlemane.male.torso_front"),
),
torso_back: (
offset: (-3.5, -8.0, -6.0),
central: ("npc.bristlemane.male.torso_back"),
),
ears: (
offset: (0.0, 0.0, 0.0),
central: ("armor.empty"),
),
tail: (
offset: (-1.5, -6.0, -4.5),
central: ("npc.bristlemane.male.tail"),
),
),
(Bristlemane, Female): (
head: (
offset: (-7.5, 0.0, -8.5),
central: ("npc.bristlemane.male.head"),
),
neck: (
offset: (-3.5, -2.0, -6.5),
central: ("npc.bristlemane.male.neck"),
),
jaw: (
offset: (-3.5, -3.5, -0.5),
central: ("npc.bristlemane.male.jaw"),
),
torso_front: (
offset: (-6.5, -5.0, -6.0),
central: ("npc.bristlemane.male.torso_front"),
),
torso_back: (
offset: (-3.5, -8.0, -6.0),
central: ("npc.bristlemane.male.torso_back"),
),
ears: (
offset: (0.0, 0.0, 0.0),
central: ("armor.empty"),
),
tail: (
offset: (-1.5, -6.0, -4.5),
central: ("npc.bristlemane.male.tail"),
),
),
})

68
assets/voxygen/voxel/quadruped_medium_lateral_manifest.ron
View File

@ -2379,4 +2379,72 @@
lateral: ("npc.akhlut.male.foot_br"),
),
),
(Bristlemane, Male): (
leg_fl: (
offset: (-1.5, -2.0, -2.0),
lateral: ("npc.bristlemane.male.leg_fr"),
),
leg_fr: (
offset: (-1.5, -2.0, -2.0),
lateral: ("npc.bristlemane.male.leg_fr"),
),
leg_bl: (
offset: (-1.5, -2.0, -4.0),
lateral: ("npc.bristlemane.male.leg_br"),
),
leg_br: (
offset: (-1.5, -2.0, -4.0),
lateral: ("npc.bristlemane.male.leg_br"),
),
foot_fl: (
offset: (-1.5, -1.5, -5.0),
lateral: ("npc.bristlemane.male.foot_fr"),
),
foot_fr: (
offset: (-1.5, -1.5, -5.0),
lateral: ("npc.bristlemane.male.foot_fr"),
),
foot_bl: (
offset: (-1.0, -2.0, -5.0),
lateral: ("npc.bristlemane.male.foot_br"),
),
foot_br: (
offset: (-1.0, -2.0, -5.0),
lateral: ("npc.bristlemane.male.foot_br"),
),
),
(Bristlemane, Female): (
leg_fl: (
offset: (-1.5, -2.0, -2.0),
lateral: ("npc.bristlemane.male.leg_fr"),
),
leg_fr: (
offset: (-1.5, -2.0, -2.0),
lateral: ("npc.bristlemane.male.leg_fr"),
),
leg_bl: (
offset: (-1.5, -2.0, -4.0),
lateral: ("npc.bristlemane.male.leg_br"),
),
leg_br: (
offset: (-1.5, -2.0, -4.0),
lateral: ("npc.bristlemane.male.leg_br"),
),
foot_fl: (
offset: (-1.5, -1.5, -5.0),
lateral: ("npc.bristlemane.male.foot_fr"),
),
foot_fr: (
offset: (-1.5, -1.5, -5.0),
lateral: ("npc.bristlemane.male.foot_fr"),
),
foot_bl: (
offset: (-1.0, -2.0, -5.0),
lateral: ("npc.bristlemane.male.foot_br"),
),
foot_br: (
offset: (-1.0, -2.0, -5.0),
lateral: ("npc.bristlemane.male.foot_br"),
),
),
})

3
common/src/comp/body.rs
View File

@ -463,6 +463,7 @@ impl Body {
quadruped_medium::Species::Horse => Vec3::new(2.0, 3.0, 2.4),
quadruped_medium::Species::Lion => Vec3::new(2.0, 3.3, 2.0),
quadruped_medium::Species::Moose => Vec3::new(2.0, 4.0, 2.5),
quadruped_medium::Species::Bristlemane => Vec3::new(2.0, 4.0, 2.5),
quadruped_medium::Species::Roshwalr => Vec3::new(2.0, 3.5, 2.2),
quadruped_medium::Species::Saber => Vec3::new(2.0, 3.0, 2.0),
quadruped_medium::Species::Tarasque => Vec3::new(2.0, 4.0, 2.6),
@ -713,6 +714,7 @@ impl Body {
quadruped_medium::Species::Panda => 90,
quadruped_medium::Species::Bear => 90,
quadruped_medium::Species::Moose => 80,
quadruped_medium::Species::Bristlemane => 90,
quadruped_medium::Species::Dreadhorn => 370,
quadruped_medium::Species::Mammoth => 250,
quadruped_medium::Species::Ngoubou => 290,
@ -979,6 +981,7 @@ impl Body {
(quadruped_medium::Species::Bear, _) => [0.0, -0.4, 2.5],
(quadruped_medium::Species::Dreadhorn, _) => [0.0, 0.2, 3.5],
(quadruped_medium::Species::Moose, _) => [0.0, -0.6, 2.1],
(quadruped_medium::Species::Bristlemane, _) => [0.0, -0.6, 2.1],
(quadruped_medium::Species::Snowleopard, _) => [-0.5, -0.5, 1.4],
(quadruped_medium::Species::Mammoth, _) => [0.0, 4.9, 7.2],
(quadruped_medium::Species::Ngoubou, _) => [0.0, 0.3, 2.0],

6
common/src/comp/body/quadruped_medium.rs
View File

@ -70,6 +70,7 @@ pub enum Species {
Llama = 34,
Alpaca = 35,
Akhlut = 36,
Bristlemane = 37,
}
/// Data representing per-species generic data.
@ -112,6 +113,7 @@ pub struct AllSpecies<SpeciesMeta> {
pub llama: SpeciesMeta,
pub alpaca: SpeciesMeta,
pub akhlut: SpeciesMeta,
pub bristlemane: SpeciesMeta,
}
impl<'a, SpeciesMeta> core::ops::Index<&'a Species> for AllSpecies<SpeciesMeta> {
@ -155,11 +157,12 @@ impl<'a, SpeciesMeta> core::ops::Index<&'a Species> for AllSpecies<SpeciesMeta>
Species::Llama => &self.llama,
Species::Alpaca => &self.alpaca,
Species::Akhlut => &self.akhlut,
Species::Bristlemane => &self.bristlemane,
}
}
}
pub const ALL_SPECIES: [Species; 35] = [
pub const ALL_SPECIES: [Species; 36] = [
Species::Grolgar,
Species::Saber,
Species::Tiger,
@ -195,6 +198,7 @@ pub const ALL_SPECIES: [Species; 35] = [
Species::Llama,
Species::Alpaca,
Species::Akhlut,
Species::Bristlemane,
];
impl<'a, SpeciesMeta: 'a> IntoIterator for &'a AllSpecies<SpeciesMeta> {

1
common/src/states/utils.rs
View File

@ -89,6 +89,7 @@ impl Body {
quadruped_medium::Species::Llama => 120.0,
quadruped_medium::Species::Alpaca => 110.0,
quadruped_medium::Species::Akhlut => 90.0,
quadruped_medium::Species::Bristlemane => 135.0,
},
Body::BipedLarge(body) => match body.species {
biped_large::Species::Slysaurok => 100.0,

13
voxygen/anim/src/quadruped_medium/mod.rs
View File

@ -237,6 +237,7 @@ impl<'a> From<&'a Body> for SkeletonAttr {
(Llama, _) => (0.5, 10.0),
(Alpaca, _) => (0.5, 7.5),
(Akhlut, _) => (1.0, 3.5),
(Bristlemane, _) => (-3.0, -2.0),
},
neck: match (body.species, body.body_type) {
(Grolgar, _) => (1.0, -1.0),
@ -276,6 +277,7 @@ impl<'a> From<&'a Body> for SkeletonAttr {
(Llama, _) => (2.5, 4.5),
(Alpaca, _) => (-1.5, 3.0),
(Akhlut, _) => (8.5, -1.0),
(Bristlemane, _) => (6.0, 2.5),
},
jaw: match (body.species, body.body_type) {
(Grolgar, _) => (7.0, 2.0),
@ -316,6 +318,7 @@ impl<'a> From<&'a Body> for SkeletonAttr {
(Llama, _) => (4.0, -1.0),
(Alpaca, _) => (3.0, -2.5),
(Akhlut, _) => (0.0, -4.5),
(Bristlemane, _) => (8.0, -6.0),
},
tail: match (body.species, body.body_type) {
(Grolgar, _) => (-11.5, -0.5),
@ -355,6 +358,7 @@ impl<'a> From<&'a Body> for SkeletonAttr {
(Llama, _) => (-9.0, 6.0),
(Alpaca, _) => (-8.5, 3.5),
(Akhlut, _) => (-14.0, -2.0),
(Bristlemane, _) => (-7.0, -5.5),
},
torso_front: match (body.species, body.body_type) {
(Grolgar, _) => (10.0, 13.0),
@ -394,6 +398,7 @@ impl<'a> From<&'a Body> for SkeletonAttr {
(Llama, _) => (7.0, 15.0),
(Alpaca, _) => (7.0, 11.5),
(Akhlut, _) => (5.5, 14.5),
(Bristlemane, _) => (1.5, 9.0),
},
torso_back: match (body.species, body.body_type) {
(Grolgar, _) => (-10.0, 1.5),
@ -433,6 +438,7 @@ impl<'a> From<&'a Body> for SkeletonAttr {
(Llama, _) => (-8.0, 0.0),
(Alpaca, _) => (-6.0, 0.0),
(Akhlut, _) => (-7.0, 1.0),
(Bristlemane, _) => (-4.0, 2.0),
},
ears: match (body.species, body.body_type) {
(Grolgar, _) => (5.0, 8.0),
@ -473,6 +479,7 @@ impl<'a> From<&'a Body> for SkeletonAttr {
(Llama, _) => (1.0, 3.5),
(Alpaca, _) => (1.0, 2.0),
(Akhlut, _) => (12.0, -3.0),
(Bristlemane, _) => (6.0, 1.0),
},
leg_f: match (body.species, body.body_type) {
(Grolgar, _) => (7.5, -5.5, -1.0),
@ -512,6 +519,7 @@ impl<'a> From<&'a Body> for SkeletonAttr {
(Llama, _) => (5.0, -1.5, -1.0),
(Alpaca, _) => (3.5, -2.5, -0.5),
(Akhlut, _) => (8.0, -2.0, 0.5),
(Bristlemane, _) => (6.0, 1.0, -2.0),
},
leg_b: match (body.species, body.body_type) {
(Grolgar, _) => (6.0, -6.5, -4.0),
@ -551,6 +559,7 @@ impl<'a> From<&'a Body> for SkeletonAttr {
(Llama, _) => (5.0, -7.0, -2.0),
(Alpaca, _) => (3.5, -7.0, 0.0),
(Akhlut, _) => (6.0, -7.5, -2.0),
(Bristlemane, _) => (4.5, -3.0, -2.0),
},
feet_f: match (body.species, body.body_type) {
(Grolgar, _) => (0.0, 0.0, -4.0),
@ -590,6 +599,7 @@ impl<'a> From<&'a Body> for SkeletonAttr {
(Llama, _) => (-0.5, 0.5, -6.0),
(Alpaca, _) => (0.0, -0.5, -5.0),
(Akhlut, _) => (0.0, 0.0, -5.0),
(Bristlemane, _) => (0.0, -0.5, -2.0),
},
feet_b: match (body.species, body.body_type) {
(Grolgar, _) => (0.5, -1.5, -3.0),
@ -629,6 +639,7 @@ impl<'a> From<&'a Body> for SkeletonAttr {
(Llama, _) => (0.5, -1.5, -3.5),
(Alpaca, _) => (-0.5, -0.5, -5.5),
(Akhlut, _) => (1.5, -1.0, -4.5),
(Bristlemane, _) => (-0.5, 0.0, -4.0),
},
scaler: match (body.species, body.body_type) {
(Grolgar, _) => 1.05,
@ -657,6 +668,7 @@ impl<'a> From<&'a Body> for SkeletonAttr {
(Mammoth, _) => 3.0,
(Ngoubou, _) => 1.0,
(Akhlut, _) => 1.4,
(Bristlemane, _) => 1.1,
_ => 0.9,
},
startangle: match (body.species, body.body_type) {
@ -779,6 +791,7 @@ fn mount_point(body: &Body) -> Vec3<f32> {
(Llama, _) => (0.0, -6.0, 2.0),
(Alpaca, _) => (0.0, -9.0, 0.0),
(Akhlut, _) => (0.0, -6.0, 1.0),
(Bristlemane, _) => (0.0, -9.0, 3.0),
}
.into()
}