assset cleanup, transparency, new icons

assets/common/items/apple.ron

@@ -1,6 +1,8 @@
 Item(
     name: "Apple",
-    description: "Red and juicy.",
+    description: "Red and juicy.
+    
+Restores 20 Health.",
     kind: Consumable(
         kind: Apple,
         effect: Health((

assets/common/items/cheese.ron

@@ -1,6 +1,8 @@
 Item(
     name: "Dwarven Cheese",
-    description: "Aromatic and nutritious.",
+    description: "Aromatic and nutritious.
+    
+Restores 40 Health.",
     kind: Consumable(
         kind: Cheese,
         effect: Health((

assets/common/items/mushroom.ron

@@ -1,6 +1,8 @@
 Item(
     name: "Mushroom",
-    description: "Hopefully this one is not poisonous.",
+    description: "Hopefully this one is not poisonous.
+
+Restores 10 Health.",
     kind: Consumable(
         kind: Mushroom,
         effect: Health((

assets/common/items/potion_minor.ron

@@ -1,6 +1,8 @@
 Item(
     name: "Minor Potion",
-    description: "Restores a small amount of Health.",
+    description: "Restores a small amount of Health.
+
+Restores 50 Health.",
     kind: Consumable(
         kind: PotionMinor,
         effect: Health((

assets/common/items/velorite.ron

@@ -1,8 +1,10 @@
 Item(
     name: "Velorite",
-    description: "Just a slight touch makes you feel the knowledge of ancient times.",
+    description: "Just a slight touch makes you feel the knowledge of ancient times.
+
+Increases Exp by 20.",
     kind: Consumable(
         kind: Velorite,
-        effect: Xp(50),
+        effect: Xp(20),
     ),
 )

assets/common/items/veloritefrag.ron

@@ -1,8 +1,10 @@
 Item(
     name: "Velorite Fragment",
-    description: "Small runes sparkle on its surface.",
+    description: "Small runes sparkle on its surface.
+
+Increases Exp by 10.",
     kind: Consumable(
         kind: VeloriteFrag,
-        effect: Xp(20),
+        effect: Xp(10),
     ),
 )

assets/voxygen/item_image_manifest.ron

@@ -55,10 +55,10 @@
         (0.0, 0.0, 0.0), (-90.0, 90.0, 0.0), 2.4,
     ),
     // Other
-    Utility(Collar): VoxTrans(
+    Utility(Collar): Png(
         "element.icons.collar",
-        (0.0, 0.0, 0.0), (-90.0, 180.0, 10.0), 1.3,
     ),
+    
     // Armor
     // Assassin Set
     Armor(Chest(Assassin)): VoxTrans(

common/src/comp/inventory/item.rs

@@ -375,6 +375,7 @@ impl Item {
                     "common.items.collar",
                     "common.items.weapons.starter_sword",
                     "common.items.weapons.starter_axe",
+                    "common.items.weapons.staff_nature",
                     "common.items.weapons.starter_hammer",
                     "common.items.weapons.starter_bow",
                     "common.items.weapons.starter_staff",

voxygen/src/hud/img_ids.rs

@@ -103,27 +103,11 @@ image_ids! {
         fireplace: "voxygen.element.misc_bg.fireplace",
 
         // Skill Icons
-        twohsword_m1: "voxygen.element.icons.2hsword_m1",
-        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",
-        bow_m1: "voxygen.element.icons.bow_m1",
         bow_m2: "voxygen.element.icons.bow_m2",
-        staff_m1: "voxygen.element.icons.staff_m1",
-        staff_m2: "voxygen.element.icons.staff_m2",
-        flyingrod_m1: "voxygen.element.icons.debug_wand_m1",
-        flyingrod_m2: "voxygen.element.icons.debug_wand_m2",
-        charge: "voxygen.element.icons.skill_charge_3",
 
         // Icons
         flower: "voxygen.element.icons.item_flower",
         grass: "voxygen.element.icons.item_grass",
-        apple: "voxygen.element.icons.item_apple",
-        mushroom: "voxygen.element.icons.item_mushroom",
-        skull: "voxygen.element.icons.skull",
-        skull_2: "voxygen.element.icons.skull_2",
 
         // Map
         indicator_mmap: "voxygen.element.buttons.indicator_mmap",
@@ -202,6 +186,25 @@ image_ids! {
 //////////////////////////////////////////////////////////////////////////////////////////////////////
 
         <ImageGraphic>
+        // Skill Icons
+        twohsword_m1: "voxygen.element.icons.2hsword_m1",
+        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",
+        bow_m1: "voxygen.element.icons.bow_m1",
+        //bow_m2: "voxygen.element.icons.bow_m2",
+        staff_m1: "voxygen.element.icons.staff_m1",
+        staff_m2: "voxygen.element.icons.staff_m2",
+        flyingrod_m1: "voxygen.element.icons.debug_wand_m1",
+        flyingrod_m2: "voxygen.element.icons.debug_wand_m2",
+        charge: "voxygen.element.icons.skill_charge_3",
+
+        // Other Icons
+        skull: "voxygen.element.icons.skull",
+        skull_2: "voxygen.element.icons.skull_2",
+
         // Map
         map_bg: "voxygen.element.misc_bg.map_bg",
         map_frame: "voxygen.element.misc_bg.map_frame",

voxygen/src/hud/skillbar.rs

@@ -19,11 +19,12 @@ use conrod_core::{
     widget::{self, Button, Image, Rectangle, Text},
     widget_ids, Color, Colorable, Positionable, Sizeable, Widget, WidgetCommon,
 };
-//use const_tweaker::tweak;
-use std::time::{Duration, Instant}; // <- REMOVE THIS BEFORE MERGE!
 
-/*#[tweak(min = 0.5, max = 1.0, step = 0.01)]
-const ALPHA: f32 = 0.90;*/
+use std::time::{Duration, Instant};
+/*
+use const_tweaker::tweak;
+#[tweak(min = 0.0, max = 1.0, step = 0.01)]
+const RGB: f32 = 0.1;*/
 
 widget_ids! {
     struct Ids {
@@ -608,9 +609,9 @@ impl<'a> Widget for Skillbar<'a> {
                     ToolKind::Bow(_) => self.imgs.bow_m1,
                     ToolKind::Staff(_) => self.imgs.staff_m1,
                     ToolKind::Debug(DebugKind::Boost) => self.imgs.flyingrod_m1,
-                    _ => self.imgs.twohaxe_m1,
+                    _ => self.imgs.nothing,
                 },
-                _ => self.imgs.twohaxe_m1,
+                _ => self.imgs.nothing,
             },
         ) // Insert Icon here
         .w(
@@ -704,21 +705,20 @@ impl<'a> Widget for Skillbar<'a> {
             match self.loadout.active_item.as_ref().map(|i| &i.item.kind) {
                 Some(ItemKind::Tool(ToolData { kind, .. })) => match kind {
                     ToolKind::Sword(_) => self.imgs.charge,
-                    ToolKind::Hammer(_) => self.imgs.twohhammer_m2,
-                    ToolKind::Axe(_) => self.imgs.twohaxe_m2,
-                    ToolKind::Bow(_) => self.imgs.bow_m2,
+                    ToolKind::Hammer(_) => self.imgs.nothing,
+                    ToolKind::Axe(_) => self.imgs.nothing,
+                    ToolKind::Bow(_) => self.imgs.nothing,
                     ToolKind::Staff(StaffKind::Sceptre) => self.imgs.heal_0,
                     ToolKind::Staff(_) => self.imgs.staff_m2,
                     ToolKind::Debug(DebugKind::Boost) => self.imgs.flyingrod_m2,
-                    _ => self.imgs.twohaxe_m2,
+                    _ => self.imgs.nothing,
                 },
-                _ => self.imgs.twohaxe_m2,
+                _ => self.imgs.nothing,
             },
         ) // Insert Icon here
         .w(
             match self.loadout.active_item.as_ref().map(|i| &i.item.kind) {
                 Some(ItemKind::Tool(ToolData { kind, .. })) => match kind {
-                    ToolKind::Bow(_) => 30.0 * scale,
                     ToolKind::Staff(_) => 30.0 * scale,
                     _ => 38.0 * scale,
                 },
@@ -728,7 +728,6 @@ impl<'a> Widget for Skillbar<'a> {
         .h(
             match self.loadout.active_item.as_ref().map(|i| &i.item.kind) {
                 Some(ItemKind::Tool(ToolData { kind, .. })) => match kind {
-                    ToolKind::Bow(_) => 30.0 * scale,
                     ToolKind::Staff(_) => 30.0 * scale,
                     _ => 38.0 * scale,
                 },
@@ -736,14 +735,21 @@ impl<'a> Widget for Skillbar<'a> {
             },
         )
         .middle_of(state.ids.m2_slot_bg)
-        .color(
+        .image_color(
             match self.loadout.active_item.as_ref().map(|i| &i.item.kind) {
                 Some(ItemKind::Tool(ToolData { kind, .. })) => match kind {
                     ToolKind::Sword(_) => {
                         if self.energy.current() as f64 >= 200.0 {
                             Color::Rgba(1.0, 1.0, 1.0, 1.0)
                         } else {
-                            Color::Rgba(0.4, 0.4, 0.4, 1.0)
+                            Color::Rgba(0.3, 0.3, 0.3, 0.8)
+                        }
+                    },
+                    ToolKind::Staff(StaffKind::Sceptre) => {
+                        if self.energy.current() as f64 >= 400.0 {
+                            Color::Rgba(1.0, 1.0, 1.0, 1.0)
+                        } else {
+                            Color::Rgba(0.3, 0.3, 0.3, 0.8)
                         }
                     },
                     _ => Color::Rgba(1.0, 1.0, 1.0, 1.0),
@@ -844,7 +850,7 @@ impl<'a> Widget for Skillbar<'a> {
                         .color(if self.energy.current() as f64 >= 500.0 {
                             Some(Color::Rgba(1.0, 1.0, 1.0, 1.0))
                         } else {
-                            Some(Color::Rgba(0.4, 0.4, 0.4, 1.0))
+                            Some(Color::Rgba(0.3, 0.3, 0.3, 0.8))
                         })
                         .middle_of(state.ids.slot1_bg)
                         .set(state.ids.slot1_icon, ui);