fire bolt visuals

This commit is contained in:
Pfauenauge90 2020-03-27 18:31:45 +01:00
parent 6fe5c5724c
commit 0b3fb2dd3c
11 changed files with 20 additions and 17 deletions

BIN
assets/voxygen/voxel/weapon/projectile/fire-bolt-0.vox (Stored with Git LFS) Normal file

Binary file not shown.

BIN
assets/voxygen/voxel/weapon/projectile/fire-bolt-1.vox (Stored with Git LFS) Normal file

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -55,6 +55,7 @@ pub enum Body {
BoltFire = 49,
ArrowSnake = 50,
CampfireLit = 51,
BoltFireBig = 52,
}
impl Body {
@ -64,7 +65,7 @@ impl Body {
}
}
const ALL_OBJECTS: [Body; 51] = [
const ALL_OBJECTS: [Body; 52] = [
Body::Arrow,
Body::Bomb,
Body::Scarecrow,
@ -115,5 +116,6 @@ const ALL_OBJECTS: [Body; 51] = [
Body::CarpetHumanSquircle,
Body::CraftingBench,
Body::BoltFire,
Body::BoltFireBig,
Body::ArrowSnake,
];

View File

@ -182,7 +182,7 @@ impl ToolData {
time_left: Duration::from_secs(20),
owner: None,
},
projectile_body: Body::Object(object::Body::BoltFire),
projectile_body: Body::Object(object::Body::BoltFireBig),
projectile_light: Some(LightEmitter {
col: (0.72, 0.11, 0.11).into(),
..Default::default()

View File

@ -1869,7 +1869,8 @@ pub fn mesh_object(obj: object::Body) -> Mesh<FigurePipeline> {
Body::Pouch => ("object.pouch", Vec3::new(-5.5, -4.5, 0.0)),
Body::CraftingBench => ("object.crafting_bench", Vec3::new(-9.5, -7.0, 0.0)),
Body::ArrowSnake => ("weapon.projectile.snake-arrow", Vec3::new(-1.5, -6.5, 0.0)),
Body::BoltFire => ("weapon.projectile.fire-bolt", Vec3::new(-3.0, -5.5, -3.0)),
Body::BoltFire => ("weapon.projectile.fire-bolt-0", Vec3::new(-3.0, -5.5, -3.0)),
Body::BoltFireBig => ("weapon.projectile.fire-bolt-1", Vec3::new(-6.0, -6.0, -6.0)),
};
load_mesh(name, offset)
}