Merge branch 'pfau/keybinds_item_desc' into 'master'

Updated: Help Window, Map, Item Descriptions

See merge request veloren/veloren!633

assets/common/items/apple.ron

@@ -1,6 +1,6 @@
 Item(
-    name: "An apple",
+    name: "Apple",
-    description: "Looks refreshing",
+    description: "Red and juicy.",
     kind: Consumable(
         kind: Apple,
         effect: Health((

assets/common/items/debug/boost.ron

@@ -1,8 +1,9 @@
 Item(
-    name: "Boost rod",
+    name: "Weightless Rod",
-    description: "Your legs feel full of energy while holding this",
+    description: "The sky is the limit.",
     kind: Tool(
         kind: Debug(Boost),
         power: 0,
     ),
 )
+// And the ground is pretty hard at maximum velocity...

assets/common/items/debug/possess.ron

@@ -1,8 +1,9 @@
 Item(
-    name: "Possession rod",
+    name: "Rod of Possession",
-    description: "Your body seems loose while holding this",
+    description: "It's fixed on my branch.",
     kind: Tool(
         kind: Debug(Possess),
         power: 0,
     ),
 )
+// ... as zesterer always uses to tell us.

assets/common/items/flowers/blue.ron

@@ -1,5 +1,5 @@
 Item(
-    name: "A blue flower",
+    name: "Blue Flower",
-    description: "Look beautiful",
+    description: "Matches the color of the sky.",
-    kind: Ingredient(Flower),
+    kind: Ingredient,
 )

assets/common/items/flowers/pink.ron

@@ -1,5 +1,5 @@
 Item(
-    name: "A pink flower",
+    name: "Pink Flower",
-    description: "Look beautiful",
+    description: "Looks like a lollipop.",
-    kind: Ingredient(Flower),
+    kind: Ingredient,
 )

assets/common/items/flowers/red.ron

@@ -1,5 +1,5 @@
 Item(
-    name: "A red flower",
+    name: "Red Flower",
-    description: "Look beautiful",
+    description: "Roses are red...",
-    kind: Ingredient(Flower),
+    kind: Ingredient,
 )

assets/common/items/flowers/sun.ron

@@ -1,5 +1,5 @@
 Item(
-    name: "A sunflower",
+    name: "Sunflower",
-    description: "Look beautiful",
+    description: "Smells like summer.",
-    kind: Ingredient(Flower),
+    kind: Ingredient,
 )

assets/common/items/flowers/white.ron

@@ -1,5 +1,5 @@
 Item(
-    name: "A white flower",
+    name: "White flower",
-    description: "Look beautiful",
+    description: "Pure and precious.",
-    kind: Ingredient(Flower),
+    kind: Ingredient,
 )

assets/common/items/flowers/yellow.ron

@@ -1,5 +1,5 @@
 Item(
-    name: "A yellow flower",
+    name: "Yellow Flower",
-    description: "Look beautiful",
+    description: "Glows like the sun.",
-    kind: Ingredient(Flower),
+    kind: Ingredient,
 )

assets/common/items/grasses/long.ron

@@ -1,5 +1,5 @@
 Item(
-    name: "Long grass",
+    name: "Long Grass",
-    description: "Just some grass",
+    description: "Greener than an orc's snout.",
-    kind: Ingredient(Grass),
+    kind: Ingredient,
 )

assets/common/items/grasses/medium.ron

@@ -1,5 +1,5 @@
 Item(
-    name: "Medium grass",
+    name: "Medium Grass",
-    description: "Just some grass",
+    description: "Greener than an orc's snout.",
-    kind: Ingredient(Grass),
+    kind: Ingredient,
 )

assets/common/items/grasses/short.ron

@@ -1,5 +1,5 @@
 Item(
-    name: "Short grass",
+    name: "Short Grass",
-    description: "Just some grass",
+    description: "Greener than an orc's snout.",
-    kind: Ingredient(Grass),
+    kind: Ingredient,
 )

assets/common/items/mushroom.ron

@@ -1,6 +1,6 @@
 Item(
-    name: "A mushroom",
+    name: "Mushroom",
-    description: "It's dirty, but looks edible",
+    description: "Hopefully this one is not poisonous.",
     kind: Consumable(
         kind: Mushroom,
         effect: Health((

assets/common/items/velorite.ron

@@ -1,6 +1,6 @@
 Item(
     name: "Velorite",
-    description: "It's smooth and looks edible",
+    description: "Just a slight touch makes you feel the knowledge of ancient times.",
     kind: Consumable(
         kind: Velorite,
         effect: Xp(50),

assets/common/items/veloritefrag.ron

@@ -1,6 +1,6 @@
 Item(
     name: "Velorite Fragment",
-    description: "It's dirty, but looks edible",
+    description: "Small runes sparkle on its surface.",
     kind: Consumable(
         kind: VeloriteFrag,
         effect: Xp(20),

assets/common/items/weapons/starter_axe.ron

@@ -1,6 +1,6 @@
 Item(
-    name: "Your first axe",
+    name: "Notched Axe",
-    description: "A dusty axe that looks surprisingly weak",
+    description: "Every dent tells the story of a chopped tree.",
     kind: Tool(
         kind: Axe,
         power: 10,

assets/common/items/weapons/starter_bow.ron

@@ -1,6 +1,6 @@
 Item(
-    name: "Your first bow",
+    name: "Uneven Bow",
-    description: "A dusty bow that looks surprisingly weak",
+    description: "Someone carved his initials into it...",
     kind: Tool(
         kind: Bow,
         power: 10,

assets/common/items/weapons/starter_dagger.ron

@@ -1,6 +1,6 @@
 Item(
-    name: "Your first dagger",
+    name: "Sharp Kitchen Knife",
-    description: "A dusty dagger that looks surprisingly weak",
+    description: "Great for cutting meat.",
     kind: Tool(
         kind: Dagger,
         power: 10,

assets/common/items/weapons/starter_hammer.ron

@@ -1,6 +1,6 @@
 Item(
-    name: "Your first hammer",
+    name: "Sturdy Old Hammer",
-    description: "A dusty hammer that looks surprisingly weak",
+    description: "'Property of...' The rest is missing. ",
     kind: Tool(
         kind: Hammer,
         power: 10,

assets/common/items/weapons/starter_staff.ron

@@ -1,6 +1,6 @@
 Item(
     name: "Your first staff",
-    description: "A dusty staff that looks surprisingly weak",
+    description: "Smells like resin and magic.",
     kind: Tool(
         kind: Staff,
         power: 10,

assets/common/items/weapons/starter_sword.ron

@@ -1,6 +1,6 @@
 Item(
-    name: "Your first sword",
+    name: "Battered Sword",
-    description: "A dusty sword that looks surprisingly weak",
+    description: "Held together by Rust and hope.",
     kind: Tool(
         kind: Sword,
         power: 10,

assets/voxygen/item_image_manifest.ron

@@ -41,7 +41,7 @@
         (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0,
     ),
     Consumable(Mushroom): VoxTrans(
-        "voxel.sprite.mushrooms.mushroom-4",
+        "voxel.sprite.mushrooms.mushroom-10",
         (0.0, 0.0, 0.0), (-50.0, 70.0, 40.0), 1.0,
     ),
     Consumable(Velorite): VoxTrans(

voxygen/src/hud/bag.rs

@@ -196,7 +196,7 @@ impl<'a> Widget for Bag<'a> {
                     .with_tooltip(
                         self.tooltip_manager,
                         &item.name(),
-                        &format!("{}\n{}", item.name(), item.description()),
+                        &format!("{}", /*item.kind, item.effect(), */ item.description()),
                         &item_tooltip,
                     )
                     .set(state.ids.inv_slots[i], ui)

voxygen/src/hud/map.rs

@@ -157,7 +157,7 @@ impl<'a> Widget for Map<'a> {
 
         let worldsize = 32768.0; // TODO This has to get the actual world size and not be hardcoded
         let x = player_pos.x as f64 / worldsize * 700.0;
-        let y = player_pos.y as f64 / worldsize * 700.0;
+        let y = (1.0 - player_pos.y as f64 / worldsize) * 700.0;
         // Indicator
         Image::new(self.imgs.map_indicator)
             .bottom_left_with_margins_on(state.ids.grid, y, x - (12.0 * 1.4) / 2.0)

voxygen/src/hud/minimap.rs

@@ -113,7 +113,7 @@ impl<'a> Widget for MiniMap<'a> {
 
             let worldsize = 32768.0; // TODO This has to get the actual world size and not be hardcoded
             let x = player_pos.x as f64 / worldsize * 92.0 * 2.0;
-            let y = player_pos.y as f64 / worldsize * 82.0 * 2.0;
+            let y = (1.0 - player_pos.y as f64 / worldsize) * 82.0 * 2.0;
             // Indicator
             Image::new(self.imgs.indicator_mmap)
                 .bottom_left_with_margins_on(state.ids.grid, y, x - 2.5)

voxygen/src/scene/terrain.rs

@@ -124,7 +124,7 @@ fn sprite_config_for(kind: BlockKind) -> Option<SpriteConfig> {
             wind_sway: 0.0,
         }),
         BlockKind::Mushroom => Some(SpriteConfig {
-            variations: 10,
+            variations: 11,
             wind_sway: 0.0,
         }),
         BlockKind::Liana => Some(SpriteConfig {
@@ -623,6 +623,13 @@ impl<V: RectRasterableVol> Terrain<V> {
                         Vec3::new(-6.0, -6.0, 0.0),
                     ),
                 ),
+                (
+                    (BlockKind::Mushroom, 10),
+                    make_model(
+                        "voxygen.voxel.sprite.mushrooms.mushroom-10",
+                        Vec3::new(-6.0, -6.0, 0.0),
+                    ),
+                ),
                 (
                     (BlockKind::Liana, 0),
                     make_model(