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

Adjusted quad_small health and fixed training dummy hitbox

Browse Source
This commit is contained in:
Scott Williams 2021-06-11 12:27:40 +01:00
parent 3dafc2c5b5
commit b90c51d100
2 changed files with 34 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -423,13 +423,33 @@ impl Body {
match self {
Body::Humanoid(_) => 500,
Body::QuadrupedSmall(quadruped_small) => match quadruped_small.species {
quadruped_small::Species::Boar => 700,
quadruped_small::Species::Batfox => 400,
quadruped_small::Species::Dodarock => 1000,
quadruped_small::Species::Holladon => 800,
quadruped_small::Species::Hyena => 450,
quadruped_small::Species::Boar => 400,
quadruped_small::Species::Batfox => 300,
quadruped_small::Species::Dodarock => 500,
quadruped_small::Species::Holladon => 500,
quadruped_small::Species::Hyena => 400,
quadruped_small::Species::Truffler => 450,
_ => 400,
quadruped_small::Species::Rat => 100,
quadruped_small::Species::Pig => 200,
quadruped_small::Species::Fox => 200,
quadruped_small::Species::Sheep => 200,
quadruped_small::Species::Jackalope => 150,
quadruped_small::Species::Skunk => 150,
quadruped_small::Species::Cat => 150,
quadruped_small::Species::Raccoon => 150,
quadruped_small::Species::Quokka => 150,
quadruped_small::Species::Rabbit => 150,
quadruped_small::Species::Frog => 100,
quadruped_small::Species::Gecko => 100,
quadruped_small::Species::Turtle => 300,
quadruped_small::Species::Squirrel => 100,
quadruped_small::Species::Fungome => 150,
quadruped_small::Species::Porcupine => 250,
quadruped_small::Species::Beaver => 250,
quadruped_small::Species::Hare => 150,
quadruped_small::Species::Dog => 200,
quadruped_small::Species::Goat => 200,
_ => 250,
},
Body::QuadrupedMedium(quadruped_medium) => match quadruped_medium.species {
quadruped_medium::Species::Grolgar => 900,
@ -461,12 +481,13 @@ impl Body {
_ => 700,
},
Body::BirdMedium(bird_medium) => match bird_medium.species {
bird_medium::Species::Chicken => 300,
bird_medium::Species::Duck => 300,
bird_medium::Species::Goose => 300,
bird_medium::Species::Parrot => 250,
bird_medium::Species::Peacock => 350,
bird_medium::Species::Eagle => 450,
bird_medium::Species::Chicken => 150,
bird_medium::Species::Duck => 150,
bird_medium::Species::Goose => 250,
bird_medium::Species::Parrot => 150,
bird_medium::Species::Peacock => 300,
bird_medium::Species::Eagle => 350,
bird_medium::Species::Owl => 350,
_ => 250,
},
Body::FishMedium(_) => 250,

1
common/src/comp/body/object.rs
View File

@ -370,6 +370,7 @@ impl Body {
Body::BoltFire => Vec3::new(0.1, 0.1, 0.1),
Body::Crossbow => Vec3::new(3.0, 3.0, 1.5),
Body::HaniwaSentry => Vec3::new(0.8, 0.8, 1.4),
Body::TrainingDummy => Vec3::new(1.5, 1.2, 2.8),
Body::SeaLantern => Vec3::new(0.5, 0.5, 1.0),
Body::Snowball => Vec3::broadcast(2.5),
_ => Vec3::broadcast(0.5),