From 943495c0c5b4159a441abccfd41287a1e8812abc Mon Sep 17 00:00:00 2001 From: Monty Marz Date: Thu, 5 Sep 2019 17:28:33 +0000 Subject: [PATCH] Pixel art for axe and flying rod, shadow for zone names and death message --- assets/voxygen/element/icons/2haxe_m1.vox | 3 ++ assets/voxygen/element/icons/2haxe_m2.vox | 3 ++ .../voxygen/element/icons/debug_wand_m1.vox | 3 ++ .../voxygen/element/icons/debug_wand_m2.vox | 3 ++ .../voxel/sprite/flowers/flower_pink_4.vox | 4 +-- voxygen/src/hud/img_ids.rs | 5 +++- voxygen/src/hud/minimap.rs | 6 ++++ voxygen/src/hud/skillbar.rs | 30 +++++++++++++++---- voxygen/src/scene/terrain.rs | 2 +- 9 files changed, 50 insertions(+), 9 deletions(-) create mode 100644 assets/voxygen/element/icons/2haxe_m1.vox create mode 100644 assets/voxygen/element/icons/2haxe_m2.vox create mode 100644 assets/voxygen/element/icons/debug_wand_m1.vox create mode 100644 assets/voxygen/element/icons/debug_wand_m2.vox diff --git a/assets/voxygen/element/icons/2haxe_m1.vox b/assets/voxygen/element/icons/2haxe_m1.vox new file mode 100644 index 0000000000..a8af399729 --- /dev/null +++ b/assets/voxygen/element/icons/2haxe_m1.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6b08e499c525245bbff2412eb0a3be3aef63ff8020564e0dea8c90f55fd543cb +size 62829 diff --git a/assets/voxygen/element/icons/2haxe_m2.vox b/assets/voxygen/element/icons/2haxe_m2.vox new file mode 100644 index 0000000000..30482d8869 --- /dev/null +++ b/assets/voxygen/element/icons/2haxe_m2.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:15213d757c7baa3c6d9c48cf93c57145a742785c31e3cccd80d125afa0cd5673 +size 63321 diff --git a/assets/voxygen/element/icons/debug_wand_m1.vox b/assets/voxygen/element/icons/debug_wand_m1.vox new file mode 100644 index 0000000000..3e10761c4c --- /dev/null +++ b/assets/voxygen/element/icons/debug_wand_m1.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9c89762741cb69b18014bee33bb31ee99f0a3fe759d914eff4521f9da6813f06 +size 63074 diff --git a/assets/voxygen/element/icons/debug_wand_m2.vox b/assets/voxygen/element/icons/debug_wand_m2.vox new file mode 100644 index 0000000000..130bb8e78e --- /dev/null +++ b/assets/voxygen/element/icons/debug_wand_m2.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:239bd097ef2b4d0b610f86f9f9225104a45a318d4b72b43d786197649fd1538c +size 63321 diff --git a/assets/voxygen/voxel/sprite/flowers/flower_pink_4.vox b/assets/voxygen/voxel/sprite/flowers/flower_pink_4.vox index 69b77e09ad..df49b9917c 100644 --- a/assets/voxygen/voxel/sprite/flowers/flower_pink_4.vox +++ b/assets/voxygen/voxel/sprite/flowers/flower_pink_4.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6dab8d22f78c283f57f500b9060553667c3ef8eddfef9ce21facfac9a8e02320 -size 56105 +oid sha256:16b691aca23cd49400445b820a8bf65432c19e3dfe6afa79af928a4aad81079b +size 56162 diff --git a/voxygen/src/hud/img_ids.rs b/voxygen/src/hud/img_ids.rs index d4873f5093..0c7fb13710 100644 --- a/voxygen/src/hud/img_ids.rs +++ b/voxygen/src/hud/img_ids.rs @@ -80,7 +80,10 @@ image_ids! { twohsword_m2: "voxygen.element.icons.2hsword_m2", twohhammer_m1: "voxygen.element.icons.2hhammer_m1", twohhammer_m2: "voxygen.element.icons.2hhammer_m2", - + twohaxe_m1: "voxygen.element.icons.2haxe_m1", + twohaxe_m2: "voxygen.element.icons.2haxe_m2", + flyingrod_m1: "voxygen.element.icons.debug_wand_m1", + flyingrod_m2: "voxygen.element.icons.debug_wand_m2", //////////////////////////////////////////////////////////////////////// diff --git a/voxygen/src/hud/minimap.rs b/voxygen/src/hud/minimap.rs index a6805166d2..c0b5bcdd4e 100644 --- a/voxygen/src/hud/minimap.rs +++ b/voxygen/src/hud/minimap.rs @@ -15,6 +15,7 @@ widget_ids! { mmap_frame_bg, mmap_location, mmap_button, + zone_display_bg, zone_display, } } @@ -149,6 +150,11 @@ impl<'a> Widget for MiniMap<'a> { Text::new(state.last_region_name.as_ref().unwrap_or(&"".to_owned())) .mid_top_with_margin_on(ui.window, 200.0) .font_size(80) + .color(Color::Rgba(0.0, 0.0, 0.0, fade)) + .set(state.ids.zone_display_bg, ui); + Text::new(state.last_region_name.as_ref().unwrap_or(&"".to_owned())) + .top_left_with_margins_on(state.ids.zone_display_bg, -2.5, -2.5) + .font_size(80) .color(Color::Rgba(1.0, 1.0, 1.0, fade)) .set(state.ids.zone_display, ui); } diff --git a/voxygen/src/hud/skillbar.rs b/voxygen/src/hud/skillbar.rs index 71e41d5494..d492e76277 100644 --- a/voxygen/src/hud/skillbar.rs +++ b/voxygen/src/hud/skillbar.rs @@ -15,6 +15,8 @@ widget_ids! { struct Ids { death_message_1, death_message_2, + death_message_1_bg, + death_message_2_bg, level_text, next_level_text, xp_bar_mid, @@ -215,13 +217,27 @@ impl<'a> Widget for Skillbar<'a> { Text::new("You Died") .mid_top_with_margin_on(ui.window, 60.0) .font_size(40) + .color(Color::Rgba(0.0, 0.0, 0.0, 1.0)) + .set(state.ids.death_message_1_bg, ui); + Text::new(&format!( + "Press {:?} to respawn.", + self.global_state.settings.controls.respawn + )) + .mid_bottom_with_margin_on(state.ids.death_message_1, -30.0) + .font_size(15) + .color(Color::Rgba(0.0, 0.0, 0.0, 1.0)) + .set(state.ids.death_message_2_bg, ui); + + Text::new("You Died") + .top_left_with_margins_on(state.ids.death_message_1_bg, -2.0, -2.0) + .font_size(40) .color(CRITICAL_HP_COLOR) .set(state.ids.death_message_1, ui); Text::new(&format!( "Press {:?} to respawn.", self.global_state.settings.controls.respawn )) - .mid_bottom_with_margin_on(state.ids.death_message_1, -30.0) + .top_left_with_margins_on(state.ids.death_message_2_bg, -1.5, -1.5) .font_size(15) .color(CRITICAL_HP_COLOR) .set(state.ids.death_message_2, ui); @@ -354,9 +370,11 @@ impl<'a> Widget for Skillbar<'a> { Button::image(match self.stats.equipment.main { Some(Item::Tool { kind, .. }) => match kind { Tool::Sword => self.imgs.twohsword_m1, - _ => self.imgs.twohhammer_m1, + Tool::Hammer => self.imgs.twohhammer_m1, + Tool::Axe => self.imgs.twohaxe_m1, + _ => self.imgs.flyingrod_m1, }, - _ => self.imgs.twohhammer_m1, + _ => self.imgs.flyingrod_m1, }) // Insert Icon here .w_h(38.0 * scale, 38.0 * scale) .middle_of(state.ids.m1_slot_bg) @@ -374,9 +392,11 @@ impl<'a> Widget for Skillbar<'a> { Button::image(match self.stats.equipment.main { Some(Item::Tool { kind, .. }) => match kind { Tool::Sword => self.imgs.twohsword_m2, - _ => self.imgs.twohhammer_m2, + Tool::Hammer => self.imgs.twohhammer_m2, + Tool::Axe => self.imgs.twohaxe_m2, + _ => self.imgs.flyingrod_m2, }, - _ => self.imgs.twohhammer_m2, + _ => self.imgs.flyingrod_m2, }) // Insert Icon here .w_h(38.0 * scale, 38.0 * scale) .middle_of(state.ids.m2_slot_bg) diff --git a/voxygen/src/scene/terrain.rs b/voxygen/src/scene/terrain.rs index 2f10ee1383..5d00b99698 100644 --- a/voxygen/src/scene/terrain.rs +++ b/voxygen/src/scene/terrain.rs @@ -499,7 +499,7 @@ impl Terrain { ( (BlockKind::ShortGrass, 3), make_model( - "voxygen.voxel.sprite.grass.grass_short_3", + "voxygen.voxel.sprite.grass.grass_short_4", Vec3::new(-6.0, -6.0, 0.0), ), ),