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

Trims skeletal attributes

Browse Source
This commit is contained in:
Snowram 2021-01-09 20:59:48 +01:00 committed by jshipsey
parent f48fea57f4
commit ebfb59f041
7 changed files with 51 additions and 137 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
voxygen/anim/src/biped_large/mod.rs
View File

@ -238,7 +238,7 @@ impl<'a> From<&'a Body> for SkeletonAttr {
(Occultsaurok, _) => (-4.5, -6.0),
(Mightysaurok, _) => (-4.5, -6.0),
(Slysaurok, _) => (-4.5, -6.0),
(_, _) => (0.0, 0.0),
_ => (0.0, 0.0),
},
shoulder: match (body.species, body.body_type) {
(Ogre, Male) => (12.0, 0.5, 0.0),
@ -295,65 +295,65 @@ impl<'a> From<&'a Body> for SkeletonAttr {
shl: match (body.species, body.body_type) {
(Dullahan, _) => (-4.75, -11.0, 8.5, 1.47, -0.2, 0.0),
(Mightysaurok, _) => (-1.75, -9.0, 3.5, 1.47, -0.2, 0.0),
(_, _) => (-4.75, -1.0, 2.5, 1.47, -0.2, 0.0),
_ => (-4.75, -1.0, 2.5, 1.47, -0.2, 0.0),
},
shr: match (body.species, body.body_type) {
(Dullahan, _) => (5.75, -11.5, 4.5, 1.47, 0.3, 0.0),
(Mightysaurok, _) => (2.75, -9.5, -0.5, 1.47, 0.3, 0.0),
(_, _) => (3.75, -1.5, -0.5, 1.47, 0.3, 0.0),
_ => (3.75, -1.5, -0.5, 1.47, 0.3, 0.0),
},
sc: match (body.species, body.body_type) {
(Dullahan, _) => (-7.0, 17.0, -16.0, -0.1, 0.0, 0.0),
(Mightysaurok, _) => (-7.0, 15.0, -11.0, -0.1, 0.0, 0.0),
(_, _) => (-7.0, 7.0, -10.0, -0.1, 0.0, 0.0),
_ => (-7.0, 7.0, -10.0, -0.1, 0.0, 0.0),
},
hhl: match (body.species, body.body_type) {
(Ogre, Male) => (-9.0, -10.0, 23.0, 1.57, -0.57, 0.0),
(Cyclops, _) => (-6.0, -10.0, 17.0, 1.57, -0.57, 0.0),
(Troll, _) => (-6.0, -10.0, 17.0, 1.57, -0.57, 0.0),
(_, _) => (-6.0, -10.0, 17.0, 1.57, -0.57, 0.0),
_ => (-6.0, -10.0, 17.0, 1.57, -0.57, 0.0),
},
hhr: match (body.species, body.body_type) {
(Ogre, Male) => (-5.0, -13.0, 0.0, 1.57, -0.57, 0.0),
(Cyclops, _) => (-6.0, -10.0, 0.0, 1.57, -0.57, 0.0),
(Troll, _) => (-6.0, -10.0, 0.0, 1.57, -0.57, 0.0),
(_, _) => (-6.0, -10.0, 0.0, 1.57, -0.57, 0.0),
_ => (-6.0, -10.0, 0.0, 1.57, -0.57, 0.0),
},
hc: match (body.species, body.body_type) {
(Ogre, Male) => (11.5, 9.0, -13.0, -0.57, -1.57, 1.0),
(Cyclops, _) => (8.5, 6.0, -12.0, -0.57, -1.57, 1.0),
(Troll, _) => (8.5, 6.0, -12.0, -0.57, -1.57, 1.0),
(_, _) => (8.5, 6.0, -12.0, -0.57, -1.57, 1.0),
_ => (8.5, 6.0, -12.0, -0.57, -1.57, 1.0),
},
sthl: match (body.species, body.body_type) {
(Ogre, Female) => (-1.0, -5.0, 12.0, 1.27, 0.0, 0.0),
(Occultsaurok, _) => (-1.0, -7.0, 12.0, 1.27, 0.0, 0.0),
(Mindflayer, _) => (1.0, -10.5, 7.0, 1.27, 0.0, 0.0),
(_, _) => (11.0, 5.0, -4.0, 1.27, 0.0, 0.0),
_ => (11.0, 5.0, -4.0, 1.27, 0.0, 0.0),
},
sthr: match (body.species, body.body_type) {
(Ogre, Female) => (5.0, -3.5, 18.0, 1.57, 0.8, 0.0),
(Occultsaurok, _) => (7.0, -3.5, 18.0, 1.57, 0.8, 0.0),
(Mindflayer, _) => (7.0, -9.0, 13.0, 1.57, 0.8, 0.0),
(_, _) => (17.0, 7.5, 2.0, 1.57, 0.8, 0.0),
_ => (17.0, 7.5, 2.0, 1.57, 0.8, 0.0),
},
stc: match (body.species, body.body_type) {
(Ogre, Female) => (-10.0, 7.0, -23.0, -0.3, 0.15, 0.0),
(Occultsaurok, _) => (-10.0, 7.0, -22.0, -0.3, 0.15, 0.0),
(Mindflayer, _) => (-10.0, 12.5, -22.0, -0.3, 0.15, 0.0),
(_, _) => (-18.0, 1.0, -2.0, -0.3, 0.15, 0.0),
_ => (-18.0, 1.0, -2.0, -0.3, 0.15, 0.0),
},
bhl: match (body.species, body.body_type) {
(Slysaurok, _) => (-1.0, -12.0, 1.0, 1.57, 0.0, 0.0),
(_, _) => (3.0, 2.5, 0.0, 1.2, -0.6, -0.3),
_ => (3.0, 2.5, 0.0, 1.2, -0.6, -0.3),
},
bhr: match (body.species, body.body_type) {
(Slysaurok, _) => (0.0, -6.0, -2.0, 1.57, 0.0, 0.0),
(_, _) => (5.9, 5.5, -5.0, 1.2, -0.6, -0.3),
_ => (5.9, 5.5, -5.0, 1.2, -0.6, -0.3),
},
bc: match (body.species, body.body_type) {
(Slysaurok, _) => (1.0, 13.0, -8.0, 0.0, 1.2, -0.6),
(_, _) => (-7.0, 3.0, -8.0, 0.0, 0.0, 0.0),
_ => (-7.0, 3.0, -8.0, 0.0, 0.0, 0.0),
},
beast: matches!((body.species, body.body_type), (Werewolf, _)),
float: matches!((body.species, body.body_type), (Mindflayer, _)),

4
voxygen/anim/src/bird_medium/mod.rs
View File

@ -140,14 +140,12 @@ impl<'a> From<&'a Body> for SkeletonAttr {
(Cockatrice, _) => (4.0, -3.5, 12.0),
},
feed: match (body.species, body.body_type) {
(Duck, _) => 1.0,
(Chicken, _) => 1.0,
(Goose, _) => 1.4,
(Peacock, _) => 1.6,
(Eagle, _) => 1.2,
(Snowyowl, _) => 1.0,
(Parrot, _) => 1.2,
(Cockatrice, _) => 1.3,
_ => 1.0,
},
}
}

46
voxygen/anim/src/character/mod.rs
View File

@ -243,73 +243,73 @@ impl<'a> From<&'a Body> for SkeletonAttr {
(Danari, Female) => (-1.5, 7.0),
},
chest: match (body.species, body.body_type) {
(_, _) => (0.0, 8.0),
_ => (0.0, 8.0),
},
belt: match (body.species, body.body_type) {
(_, _) => (0.0, -2.0),
_ => (0.0, -2.0),
},
back: match (body.species, body.body_type) {
(_, _) => (-3.1, 7.25),
_ => (-3.1, 7.25),
},
shorts: match (body.species, body.body_type) {
(_, _) => (0.0, -5.0),
_ => (0.0, -5.0),
},
hand: match (body.species, body.body_type) {
(_, _) => (7.0, -0.25, 0.5),
_ => (7.0, -0.25, 0.5),
},
foot: match (body.species, body.body_type) {
(_, _) => (3.4, 0.5, 2.0),
_ => (3.4, 0.5, 2.0),
},
shoulder: match (body.species, body.body_type) {
(_, _) => (5.0, 0.0, 5.0),
_ => (5.0, 0.0, 5.0),
},
lantern: match (body.species, body.body_type) {
(_, _) => (5.0, 2.5, 5.5),
_ => (5.0, 2.5, 5.5),
},
shl: match (body.species, body.body_type) {
(_, _) => (-0.75, -1.0, 0.5, 1.47, -0.2, 0.0),
_ => (-0.75, -1.0, 0.5, 1.47, -0.2, 0.0),
},
shr: match (body.species, body.body_type) {
(_, _) => (0.75, -1.5, -2.5, 1.47, 0.3, 0.0),
_ => (0.75, -1.5, -2.5, 1.47, 0.3, 0.0),
},
sc: match (body.species, body.body_type) {
(_, _) => (-7.0, 7.0, 2.0, -0.1, 0.0, 0.0),
_ => (-7.0, 7.0, 2.0, -0.1, 0.0, 0.0),
},
hhl: match (body.species, body.body_type) {
(_, _) => (-0.5, -1.0, 10.0, 4.71, 0.0, 0.0),
_ => (-0.5, -1.0, 10.0, 4.71, 0.0, 0.0),
},
hhr: match (body.species, body.body_type) {
(_, _) => (0.0, 0.0, 0.0, 4.71, 0.0, 0.0),
_ => (0.0, 0.0, 0.0, 4.71, 0.0, 0.0),
},
hc: match (body.species, body.body_type) {
(_, _) => (6.0, 7.0, 1.0, -0.3, -1.57, 3.64),
_ => (6.0, 7.0, 1.0, -0.3, -1.57, 3.64),
},
sthl: match (body.species, body.body_type) {
(_, _) => (0.0, 0.0, 6.0, 1.97, 0.0, 0.0),
_ => (0.0, 0.0, 6.0, 1.97, 0.0, 0.0),
},
sthr: match (body.species, body.body_type) {
(_, _) => (0.0, 0.0, 0.0, 1.27, 0.2, 0.0),
_ => (0.0, 0.0, 0.0, 1.27, 0.2, 0.0),
},
stc: match (body.species, body.body_type) {
(_, _) => (-5.0, 7.0, -2.0, -0.3, 0.15, 0.0),
_ => (-5.0, 7.0, -2.0, -0.3, 0.15, 0.0),
},
ahl: match (body.species, body.body_type) {
(_, _) => (-0.5, -1.0, 7.0, 1.17, PI, 0.0),
_ => (-0.5, -1.0, 7.0, 1.17, PI, 0.0),
},
ahr: match (body.species, body.body_type) {
(_, _) => (0.0, -1.0, 1.0, -2.0, 0.0, PI),
_ => (0.0, -1.0, 1.0, -2.0, 0.0, PI),
},
ac: match (body.species, body.body_type) {
(_, _) => (-8.0, 11.0, 3.0, 2.0, 0.0, 0.0),
_ => (-8.0, 11.0, 3.0, 2.0, 0.0, 0.0),
},
bhl: match (body.species, body.body_type) {
(_, _) => (0.0, -4.0, 1.0, 1.57, 0.0, 0.0),
_ => (0.0, -4.0, 1.0, 1.57, 0.0, 0.0),
},
bhr: match (body.species, body.body_type) {
(_, _) => (1.0, 2.0, -2.0, 1.57, 0.0, 0.0),
_ => (1.0, 2.0, -2.0, 1.57, 0.0, 0.0),
},
bc: match (body.species, body.body_type) {
(_, _) => (-5.0, 9.0, 1.0, 0.0, 1.2, -0.6),
_ => (-5.0, 9.0, 1.0, 0.0, 1.2, -0.6),
},
}
}

8
voxygen/anim/src/quadruped_low/mod.rs
View File

@ -247,27 +247,23 @@ impl<'a> From<&'a Body> for SkeletonAttr {
(Salamander, _) => (1.4),
(Monitor, _) => (1.1),
(Asp, _) => (1.4),
(Tortoise, _) => (1.0),
(Rocksnapper, _) => (1.4),
(Pangolin, _) => (1.3),
(Maneater, _) => (1.4),
(Sandshark, _) => (1.0),
(Hakulaq, _) => (1.0),
(Lavadrake, _) => (1.4),
_ => (1.0),
},
tempo: match (body.species, body.body_type) {
(Crocodile, _) => (0.7),
(Alligator, _) => (0.7),
(Salamander, _) => (0.75),
(Monitor, _) => (1.4),
(Asp, _) => (1.0),
(Tortoise, _) => (0.7),
(Rocksnapper, _) => (0.7),
(Pangolin, _) => (1.15),
(Maneater, _) => (0.9),
(Sandshark, _) => (1.0),
(Hakulaq, _) => (1.0),
(Lavadrake, _) => (1.1),
_ => (1.0),
},
}
}

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

@ -391,20 +391,9 @@ impl<'a> From<&'a Body> for SkeletonAttr {
(Lion, _) => (1.3),
(Tarasque, _) => (1.3),
(Tiger, _) => (1.2),
(Wolf, _) => (1.0),
(Frostfang, _) => (1.0),
(Mouflon, _) => (1.0),
(Catoblepas, _) => (1.3),
(Bonerattler, _) => (1.0),
(Deer, _) => (1.0),
(Hirdrasil, _) => (1.0),
(Roshwalr, _) => (1.2),
(Donkey, _) => (1.0),
(Camel, _) => (1.0),
(Zebra, _) => (1.0),
(Antelope, _) => (1.0),
(Kelpie, _) => (1.0),
(Horse, _) => (1.0),
_ => (1.0),
},
startangle: match (body.species, body.body_type) {
//changes the default angle of front feet
@ -413,21 +402,10 @@ impl<'a> From<&'a Body> for SkeletonAttr {
(Tuskram, _) => (0.3),
(Lion, _) => (0.2),
(Tarasque, _) => (-0.5),
(Tiger, _) => (0.0),
(Wolf, _) => (0.0),
(Frostfang, _) => (0.0),
(Mouflon, _) => (0.0),
(Catoblepas, _) => (-0.5),
(Bonerattler, _) => (-0.7),
(Deer, _) => (0.0),
(Hirdrasil, _) => (0.0),
(Roshwalr, _) => (-0.3),
(Donkey, _) => (0.0),
(Camel, _) => (0.0),
(Zebra, _) => (0.0),
(Antelope, _) => (0.0),
(Kelpie, _) => (0.0),
(Horse, _) => (0.0),
_ => (0.0),
},
tempo: match (body.species, body.body_type) {
(Grolgar, _) => (0.85),
@ -435,43 +413,35 @@ impl<'a> From<&'a Body> for SkeletonAttr {
(Tuskram, _) => (0.9),
(Lion, _) => (0.95),
(Tarasque, _) => (0.95),
(Tiger, _) => (1.0),
(Wolf, _) => (1.1),
(Frostfang, _) => (1.0),
(Mouflon, _) => (0.85),
(Catoblepas, _) => (1.1),
(Bonerattler, _) => (1.0),
(Deer, _) => (0.85),
(Hirdrasil, _) => (0.85),
(Roshwalr, _) => (0.75),
(Donkey, _) => (0.85),
(Camel, _) => (1.0),
(Zebra, _) => (0.85),
(Antelope, _) => (1.0),
(Kelpie, _) => (0.85),
(Horse, _) => (0.85),
_ => (1.0),
},
spring: match (body.species, body.body_type) {
(Grolgar, _) => (0.9),
(Saber, _) => (0.9),
(Tuskram, _) => (0.9),
(Lion, _) => (1.0),
(Tarasque, _) => (1.0),
(Tiger, _) => (1.0),
(Wolf, _) => (1.2),
(Frostfang, _) => (1.0),
(Mouflon, _) => (0.9),
(Catoblepas, _) => (0.55),
(Bonerattler, _) => (1.1),
(Deer, _) => (0.9),
(Hirdrasil, _) => (1.1),
(Roshwalr, _) => (1.0),
(Donkey, _) => (0.85),
(Camel, _) => (0.85),
(Zebra, _) => (0.85),
(Antelope, _) => (1.2),
(Kelpie, _) => (0.95),
(Horse, _) => (0.85),
_ => (1.0),
},
feed: match (body.species, body.body_type) {
(Tuskram, _) => (true, 0.5),
@ -483,7 +453,7 @@ impl<'a> From<&'a Body> for SkeletonAttr {
(Antelope, _) => (false, 0.9),
(Kelpie, _) => (false, 1.0),
(Horse, _) => (true, 0.85),
(_, _) => (false, 0.0),
_ => (false, 0.0),
},
}
}

62
voxygen/anim/src/quadruped_small/mod.rs
View File

@ -245,19 +245,14 @@ impl<'a> From<&'a Body> for SkeletonAttr {
scaler: match (body.species, body.body_type) {
(Pig, _) => (0.9),
(Fox, _) => (0.9),
(Sheep, _) => (1.0),
(Boar, _) => (1.1),
(Jackalope, _) => (0.8),
(Skunk, _) => (0.9),
(Cat, _) => (0.8),
(Batfox, _) => (1.1),
(Raccoon, _) => (1.0),
(Quokka, _) => (1.0),
(Dodarock, _) => (1.2),
(Holladon, _) => (1.4),
(Hyena, _) => (1.0),
(Rabbit, _) => (0.7),
(Truffler, _) => (1.0),
(Frog, _) => (0.7),
(Rat, _) => (0.65),
(Axolotl, _) => (0.65),
@ -266,97 +261,64 @@ impl<'a> From<&'a Body> for SkeletonAttr {
(Squirrel, _) => (0.7),
(Fungome, _) => (0.9),
(Porcupine, _) => (0.8),
(Beaver, _) => (1.0),
(Hare, _) => (0.8),
_ => (1.0),
},
tempo: match (body.species, body.body_type) {
(Pig, _) => (1.0),
(Fox, _) => (1.0),
(Sheep, _) => (1.0),
(Boar, _) => (1.1),
(Jackalope, _) => (1.0),
(Skunk, _) => (1.0),
(Cat, _) => (1.1),
(Batfox, _) => (1.0),
(Raccoon, _) => (1.0),
(Quokka, _) => (1.2),
(Dodarock, _) => (1.0),
(Holladon, _) => (1.0),
(Hyena, _) => (1.1),
(Rabbit, _) => (1.15),
(Truffler, _) => (1.0),
(Frog, _) => (1.15),
(Rat, _) => (1.0),
(Axolotl, _) => (1.2),
(Gecko, _) => (1.1),
(Turtle, _) => (0.9),
(Squirrel, _) => (1.15),
(Fungome, _) => (1.0),
(Porcupine, _) => (1.2),
(Beaver, _) => (1.2),
(Hare, _) => (1.15),
_ => (1.0),
},
maximize: match (body.species, body.body_type) {
(Pig, _) => (1.0),
(Fox, _) => (1.3),
(Sheep, _) => (1.1),
(Boar, _) => (1.4),
(Jackalope, _) => (1.2),
(Skunk, _) => (1.0),
(Cat, _) => (1.0),
(Batfox, _) => (1.0),
(Raccoon, _) => (1.0),
(Quokka, _) => (1.0),
(Dodarock, _) => (1.0),
(Holladon, _) => (1.0),
(Hyena, _) => (1.4),
(Rabbit, _) => (1.3),
(Truffler, _) => (1.0),
(Frog, _) => (1.3),
(Rat, _) => (1.0),
(Axolotl, _) => (0.9),
(Gecko, _) => (1.0),
(Turtle, _) => (0.8),
(Squirrel, _) => (1.0),
(Fungome, _) => (0.7),
(Porcupine, _) => (1.0),
(Beaver, _) => (1.0),
(Hare, _) => (1.3),
_ => (1.0),
},
minimize: match (body.species, body.body_type) {
(Pig, _) => (0.6),
(Fox, _) => (1.3),
(Sheep, _) => (0.8),
(Boar, _) => (1.0),
(Jackalope, _) => (0.8),
(Skunk, _) => (0.9),
(Cat, _) => (0.8),
(Batfox, _) => (1.0),
(Raccoon, _) => (1.0),
(Quokka, _) => (0.9),
(Dodarock, _) => (0.9),
(Holladon, _) => (0.7),
(Hyena, _) => (1.4),
(Rabbit, _) => (0.8),
(Truffler, _) => (1.0),
(Frog, _) => (0.8),
(Rat, _) => (1.0),
(Axolotl, _) => (1.0),
(Gecko, _) => (1.0),
(Turtle, _) => (0.8),
(Squirrel, _) => (1.0),
(Fungome, _) => (0.4),
(Porcupine, _) => (0.9),
(Beaver, _) => (0.9),
(Hare, _) => (0.8),
_ => (1.0),
},
spring: match (body.species, body.body_type) {
(Pig, _) => (1.0),
(Fox, _) => (1.0),
(Sheep, _) => (1.2),
(Boar, _) => (0.8),
(Jackalope, _) => (2.2),
(Skunk, _) => (1.0),
(Cat, _) => (1.4),
(Batfox, _) => (1.1),
(Raccoon, _) => (1.1),
@ -367,43 +329,31 @@ impl<'a> From<&'a Body> for SkeletonAttr {
(Rabbit, _) => (2.5),
(Truffler, _) => (0.8),
(Frog, _) => (2.5),
(Rat, _) => (1.0),
(Axolotl, _) => (0.8),
(Gecko, _) => (0.6),
(Turtle, _) => (0.7),
(Squirrel, _) => (1.0),
(Fungome, _) => (0.8),
(Porcupine, _) => (1.3),
(Beaver, _) => (1.3),
(Hare, Male) => (2.2),
(Hare, Female) => (2.5),
_ => (1.0),
},
feed: match (body.species, body.body_type) {
(Pig, _) => (1.0),
(Fox, _) => (1.0),
(Sheep, _) => (1.0),
(Boar, _) => (0.6),
(Jackalope, _) => (1.0),
(Skunk, _) => (0.8),
(Cat, _) => (1.0),
(Batfox, _) => (0.7),
(Raccoon, _) => (0.8),
(Quokka, _) => (1.0),
(Dodarock, _) => (0.7),
(Holladon, _) => (1.0),
(Hyena, _) => (1.0),
(Rabbit, _) => (1.2),
(Truffler, _) => (0.6),
(Frog, _) => (0.7),
(Rat, _) => (1.0),
(Axolotl, _) => (0.8),
(Gecko, _) => (0.8),
(Turtle, _) => (0.7),
(Squirrel, _) => (1.0),
(Fungome, _) => (0.7),
(Porcupine, _) => (1.0),
(Beaver, _) => (1.0),
(Hare, _) => (1.2),
_ => (1.0),
},
}
}

2
voxygen/src/hud/mod.rs
View File

@ -2240,7 +2240,7 @@ impl Hud {
// Don't put NPC messages in chat box.
self.new_messages
.retain(|m| !matches!(m.chat_type, comp::ChatType::Npc(_, _)));
.retain(|m| !matches!(m.chat_type, comp::ChatType::Npc(_, _)));
// Chat box
match Chat::new(