Merge branch 'pfauenauge/assets' into 'master'

Pfauenauge/assets

See merge request veloren/veloren!646

assets/common/items/apple.ron

@@ -4,7 +4,7 @@ Item(
     kind: Consumable(
         kind: Apple,
         effect: Health((
-            amount: 10,
+            amount: 20,
             cause: Item,
         )),
     ),

assets/common/items/cheese.ron

@@ -0,0 +1,11 @@
+Item(
+    name: "Dwarven Cheese",
+    description: "Aromatic and nutritious.",
+    kind: Consumable(
+        kind: Cheese,
+        effect: Health((
+            amount: 40,
+            cause: Item,
+        )),
+    ),
+)

assets/common/items/potion_minor.ron

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

assets/common/items/weapons/starter_staff.ron

@@ -1,5 +1,5 @@
 Item(
-    name: "Your first staff",
+    name: "Gnarled Rod",
     description: "Smells like resin and magic.",
     kind: Tool(
         kind: Staff,

assets/voxygen/item_image_manifest.ron

@@ -36,6 +36,13 @@
         "element.icons.item_apple",
         (0.0, 0.0, 0.0), (-90.0, 90.0, 0.0), 1.0,
     ),
+    Consumable(PotionMinor): VoxTrans(
+        "voxel.object.potion_red",
+        (0.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 0.8,
+    ),
+    Consumable(Cheese): Png(
+        "element.icons.item_cheese",        
+    ),
     Consumable(Potion): VoxTrans(
         "voxel.object.potion_red",
         (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0,

assets/voxygen/voxel/humanoid_head_manifest.ron

@@ -7,11 +7,29 @@
             Some(("figure.hair.human.male-0", (1, 1, 1))),
             Some(("figure.hair.human.male-1", (1, 1, 1))),
             Some(("figure.hair.human.male-2", (0, -1, 0))),
-            Some(("figure.hair.human.male-3", (0, -1, 0))),            
+            Some(("figure.hair.human.male-3", (0, -1, 0))), 
+            Some(("figure.hair.human.male-4", (2, 2, 0))),  
+            Some(("figure.hair.human.male-5", (1, 1, 0))),
+            Some(("figure.hair.human.male-6", (1, 1, 1))),
+            //Some(("figure.hair.human.male-7", (0, 0, 0))),
+            //Some(("figure.hair.human.male-8", (5, 0, 5))),
+            //Some(("figure.hair.human.male-9", (5, 0, 5))),         
+            Some(("figure.hair.human.male-10", (-3, -5, -4))),
+            //Some(("figure.hair.human.male-11", (0, 0, 0))),
+            Some(("figure.hair.human.male-12", (4, 2, 7))),
+            Some(("figure.hair.human.male-13", (1, 1, 0))),
+            Some(("figure.hair.human.male-14", (2, 0, 1))),
+            Some(("figure.hair.human.male-15", (1, 1, 0))),
+            Some(("figure.hair.human.male-16", (1, 0, 0))),
+            Some(("figure.hair.human.male-17", (1, 1, 0))),
+            Some(("figure.hair.human.male-18", (1, 0, 0))),
+            Some(("figure.hair.human.male-19", (2, 1, 0))),
+            Some(("figure.hair.human.male-20", (-3, -4, -7))),
         ],
         beard: [            
             Some(("figure.beard.human.human-0", (4, 6, -2))),
             Some(("figure.beard.human.human-1", (5, 10, -2))),
+            Some(("figure.beard.human.human-2", (3, 7, -3))),         
         ],
         accessory: [
             None]
@@ -94,6 +112,7 @@
         hair: [
             Some(("figure.hair.elf.male-0", (2, 1, 1))),
             Some(("figure.hair.elf.male-1", (1, -1, 0))),
+            Some(("figure.hair.elf.male-2", (-2, -4, -7))),
         ],
         beard: [None],
         accessory: [

common/src/comp/body/humanoid.rs

@@ -335,9 +335,9 @@ impl Race {
             (Race::Dwarf, BodyType::Female) => 1,
             (Race::Dwarf, BodyType::Male) => 3,
             (Race::Elf, BodyType::Female) => 21,
-            (Race::Elf, BodyType::Male) => 2,
+            (Race::Elf, BodyType::Male) => 3,
             (Race::Human, BodyType::Female) => 19,
-            (Race::Human, BodyType::Male) => 4,
+            (Race::Human, BodyType::Male) => 17,
             (Race::Orc, BodyType::Female) => 1,
             (Race::Orc, BodyType::Male) => 8,
             (Race::Undead, BodyType::Female) => 4,
@@ -369,7 +369,7 @@ impl Race {
             (Race::Elf, BodyType::Female) => 1,
             (Race::Elf, BodyType::Male) => 1,
             (Race::Human, BodyType::Female) => 1,
-            (Race::Human, BodyType::Male) => 3,
+            (Race::Human, BodyType::Male) => 4,
             (Race::Orc, BodyType::Female) => 1,
             (Race::Orc, BodyType::Male) => 3,
             (Race::Undead, BodyType::Female) => 1,

common/src/comp/inventory/item.rs

@@ -46,10 +46,12 @@ pub enum Armor {
 #[derive(Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
 pub enum Consumable {
     Apple,
+    Cheese,
     Potion,
     Mushroom,
     Velorite,
     VeloriteFrag,
+    PotionMinor,
 }
 
 #[derive(Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
@@ -110,7 +112,7 @@ impl Item {
                 Some(assets::load_expect_cloned("common.items.grasses.medium"))
             }
             BlockKind::ShortGrass => Some(assets::load_expect_cloned("common.items.grasses.short")),
-            BlockKind::Chest => Some(match rand::random::<usize>() % 4 {
+            BlockKind::Chest => Some(match rand::random::<usize>() % 6 {
                 0 => assets::load_expect_cloned("common.items.apple"),
                 1 => assets::load_expect_cloned("common.items.velorite"),
                 2 => (**assets::load_glob::<Item>("common.items.weapons.*")
@@ -119,6 +121,8 @@ impl Item {
                     .expect("Empty glob"))
                 .clone(),
                 3 => assets::load_expect_cloned("common.items.veloritefrag"),
+                4 => assets::load_expect_cloned("common.items.cheese"),
+                5 => assets::load_expect_cloned("common.items.potion_minor"),
                 _ => unreachable!(),
             }),
             _ => None,

common/src/comp/inventory/mod.rs

@@ -72,9 +72,8 @@ impl Default for Inventory {
         let mut inventory = Inventory {
             slots: vec![None; 25],
         };
-
-        inventory.push(assets::load_expect_cloned("common.items.debug.boost"));
-        inventory.push(assets::load_expect_cloned("common.items.debug.possess"));
+        inventory.push(assets::load_expect_cloned("common.items.cheese"));
+        inventory.push(assets::load_expect_cloned("common.items.apple"));
         inventory
     }
 }

server/src/cmd.rs

@@ -85,7 +85,8 @@ lazy_static! {
         ChatCommand::new(
             "giveitem",
             "{d}",
-            "/giveitem <name> : Give yourself an item.",
+            "/giveitem <path to item>\n\
+            Example: common/items/debug/boost",
             true,
             handle_give,),
         ChatCommand::new(