From 6535deae9c7955ffbd7ac99749a339428dc2b308 Mon Sep 17 00:00:00 2001 From: AlKabir <7501421-frrleone@users.noreply.gitlab.com> Date: Sat, 7 Nov 2020 23:34:20 -0600 Subject: [PATCH] added two meat assets for mobs to drop --- assets/voxygen/voxel/object/meat_drop.vox | 3 +++ assets/voxygen/voxel/object/steak.vox | 3 +++ common/src/comp/body/object.rs | 8 +++++++- server/src/events/entity_manipulation.rs | 4 +++- voxygen/src/scene/figure/load.rs | 2 ++ 5 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 assets/voxygen/voxel/object/meat_drop.vox create mode 100644 assets/voxygen/voxel/object/steak.vox diff --git a/assets/voxygen/voxel/object/meat_drop.vox b/assets/voxygen/voxel/object/meat_drop.vox new file mode 100644 index 0000000000..d3ce8c7549 --- /dev/null +++ b/assets/voxygen/voxel/object/meat_drop.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cefa4b9fef1b67ecdc03aaacb9777f60788c17efdfc08f110729c7638928d9dd +size 3312 diff --git a/assets/voxygen/voxel/object/steak.vox b/assets/voxygen/voxel/object/steak.vox new file mode 100644 index 0000000000..26c2b93efe --- /dev/null +++ b/assets/voxygen/voxel/object/steak.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ed58c0d09849a4bb73193c6b21b6f83161e3f4613d6e214ff7ac67c62641a2a9 +size 27338 diff --git a/common/src/comp/body/object.rs b/common/src/comp/body/object.rs index 64ff313920..f0bcdeacac 100644 --- a/common/src/comp/body/object.rs +++ b/common/src/comp/body/object.rs @@ -68,6 +68,8 @@ make_case_elim!( FireworkYellow = 58, MultiArrow = 59, BoltNature = 60, + MeatDrop = 61, + Steak = 62, } ); @@ -78,7 +80,7 @@ impl Body { } } -pub const ALL_OBJECTS: [Body; 61] = [ +pub const ALL_OBJECTS: [Body; 63] = [ Body::Arrow, Body::Bomb, Body::Scarecrow, @@ -140,6 +142,8 @@ pub const ALL_OBJECTS: [Body; 61] = [ Body::FireworkYellow, Body::MultiArrow, Body::BoltNature, + Body::MeatDrop, + Body::Steak, ]; impl From for super::Body { @@ -210,6 +214,8 @@ impl Body { Body::FireworkYellow => "firework_yellow", Body::MultiArrow => "multi_arrow", Body::BoltNature => "bolt_nature", + Body::MeatDrop => "meat_drop", + Body::Steak => "steak", } } } diff --git a/server/src/events/entity_manipulation.rs b/server/src/events/entity_manipulation.rs index 0b1b0b30da..2062cbe826 100644 --- a/server/src/events/entity_manipulation.rs +++ b/server/src/events/entity_manipulation.rs @@ -436,7 +436,9 @@ pub fn handle_destroy(server: &mut Server, entity: EcsEntity, cause: HealthSourc .create_object(comp::Pos(pos.0 + Vec3::unit_z() * 0.25), match old_body { Some(common::comp::Body::Humanoid(_)) => object::Body::Pouch, Some(common::comp::Body::Golem(_)) => object::Body::Chest, - _ => object::Body::Pumpkin, + Some(common::comp::Body::BipedLarge(_)) => object::Body::MeatDrop, + Some(common::comp::Body::QuadrupedLow(_)) => object::Body::MeatDrop, + _ => object::Body::Steak, }) .with(item) .build(); diff --git a/voxygen/src/scene/figure/load.rs b/voxygen/src/scene/figure/load.rs index 751af13c1a..124194e6d5 100644 --- a/voxygen/src/scene/figure/load.rs +++ b/voxygen/src/scene/figure/load.rs @@ -3649,6 +3649,8 @@ fn mesh_object(obj: &object::Body) -> BoneMeshes { Body::TrainingDummy => ("object.training_dummy", Vec3::new(-7.0, -5.0, 0.0)), Body::MultiArrow => ("weapon.projectile.multi-arrow", Vec3::new(-4.0, -9.5, -5.0)), Body::BoltNature => ("weapon.projectile.nature-bolt", Vec3::new(-6.0, -6.0, -6.0)), + Body::MeatDrop => ("object.meat_drop", Vec3::new(0.0, 0.0, 0.0)), + Body::Steak => ("object.steak", Vec3::new(0.0, 0.0, -1.0)), }; load_mesh(name, offset) }