png item images, fix map cursor

assets/common/items/armor/head/assa_mask_0.ron

@@ -2,7 +2,7 @@ Item(
     name: "Dark Assassin Mask",
    description: "WIP",
     kind: Armor(
-        kind: Head(Leather0),
+        kind: Head(AssaMask0),
         stats: (20),
     ),
 )

assets/voxygen/item_image_manifest.ron

@@ -232,34 +232,27 @@
         (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.0,
     ),
     // Rings
-    Armor(Ring(Ring0)): VoxTrans(
-        "voxel.armor.ring.ring-0",
-        (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.0,
+    Armor(Ring(Ring0)): Png(
+        "element.icons.ring-0",        
     ),
     // Necks
-    Armor(Neck(Neck0)): VoxTrans(
-        "voxel.armor.neck.neck-0",
-        (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.0,
+    Armor(Neck(Neck0)): Png(
+        "element.icons.neck-0",        
     ),
-
     // Lanterns
-    Armor(Lantern(Black0)): VoxTrans(
-        "voxel.armor.lantern.lantern_black-0",
-        (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.0,
+    Armor(Lantern(Black0)): Png(
+        "voxel.element.icons.lantern_grey-0",        
     ),
-    Armor(Lantern(Green0)): VoxTrans(
-        "voxel.armor.lantern.lantern_green-0",
-        (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.0,
+    Armor(Lantern(Green0)): Png(
+        "element.icons.lantern_green-0",        
     ),
     // Tabards
-    Armor(Tabard(Admin)): VoxTrans(
-        "voxel.armor.tabard.admin",
-        (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.0,
+    Armor(Tabard(Admin)): Png(
+        "element.icons.tabard_admin",        
     ),
     // Heads
-    Armor(Head(Leather0)): VoxTrans(
-        "voxel.armor.head.leather-0",
-        (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.0,
+    Armor(Head(Leather0)): Png(
+        "element.icons.head_leather-0",        
     ),
     Armor(Head(AssaMask0)): VoxTrans(
         "voxel.armor.head.assa_mask-0",

voxygen/src/hud/map.rs

@@ -13,13 +13,8 @@ use conrod_core::{
     widget::{self, Button, Image, Rectangle, Text},
     widget_ids, Colorable, Positionable, Sizeable, Widget, WidgetCommon,
 };
-//use const_tweaker::tweak;
 use specs::WorldExt;
 use vek::*;
-/*#[tweak(min = 0.0, max = 40.0, step = 1.0)]
-const X: f64 = 10.0;
-#[tweak(min = 0.0, max = 40.0, step = 1.0)]
-const Y: f64 = 10.0;*/
 
 widget_ids! {
     struct Ids {
@@ -201,12 +196,14 @@ impl<'a> Widget for Map<'a> {
 
         let x = player_pos.x as f64 / worldsize.x * 760.0;
         let y = player_pos.y as f64 / worldsize.y * 760.0;
-        let indic_scale = 0.6;
+        let x_rel = player_pos.x as f64 / worldsize.x;
+        let y_rel = player_pos.y as f64 / worldsize.y;
+        let indic_scale = 0.6;        
         Image::new(self.rot_imgs.indicator_mmap_small.target_north)
             .bottom_left_with_margins_on(
                 state.ids.grid,
-                y - 37.0 * indic_scale / 2.0,
-                x - 32.0 * indic_scale / 2.0,
+                if y_rel > 0.0 &&  y_rel < 1.0 { y - 37.0 * indic_scale / 2.0 } else { 760.0 - 37.0 * indic_scale / 2.0 },
+                if x_rel > 0.0 &&  x_rel < 1.0 { x - 32.0 * indic_scale / 2.0 } else { 760.0 - 32.0 * indic_scale / 2.0 },
             )
             .w_h(32.0 * indic_scale, 37.0 * indic_scale)
             .color(Some(UI_HIGHLIGHT_0))