add baobabs, fix map difficulty, make mushrooms lootable

assets/world/manifests/baobabs.ron

@@ -0,0 +1,56 @@
+#![enable(unwrap_newtypes)]
+
+[
+    (
+        specifier: "world.tree.baobab.0",
+        center: (27, 35, 10)
+    ),
+    (
+        specifier: "world.tree.baobab.1",
+        center: (23, 22, 6)
+    ),
+    (
+        specifier: "world.tree.baobab.2",
+        center: (23, 22, 6)
+    ),
+    (
+        specifier: "world.tree.baobab.3",
+        center: (18, 16, 10)
+    ),
+    (
+        specifier: "world.tree.baobab.4",
+        center: (15, 16, 5)
+    ),
+    (
+        specifier: "world.tree.baobab.5",
+        center: (11, 12, 4)
+    ),
+    (
+        specifier: "world.tree.baobab.5",
+        center: (11, 12, 4)
+    ),
+    (
+        specifier: "world.tree.baobab.5",
+        center: (11, 12, 4)
+    ),
+    (
+        specifier: "world.tree.baobab.5",
+        center: (11, 12, 4)
+    ),
+    (
+        specifier: "world.tree.baobab.5",
+        center: (11, 12, 4)
+    ),
+    (
+        specifier: "world.tree.baobab.6",
+        center: (17, 17, 4)
+    ),
+    (
+        specifier: "world.tree.acacia.2",
+        center: (5, 5, 4)
+    ),
+    (
+        specifier: "world.tree.acacia.3",
+        center: (6, 6, 3)
+    ),
+]

common/src/comp/inventory/item/mod.rs

@@ -305,6 +305,7 @@ impl Item {
         Some(Item::new_from_asset_expect(match block.get_sprite()? {
             SpriteKind::Apple => "common.items.food.apple",
             SpriteKind::Mushroom => "common.items.food.mushroom",
+            SpriteKind::CaveMushroom => "common.items.food.mushroom",
             SpriteKind::Velorite => "common.items.ore.velorite",
             SpriteKind::VeloriteFrag => "common.items.ore.veloritefrag",
             SpriteKind::BlueFlower => "common.items.flowers.blue",

common/src/terrain/sprite.rs

@@ -185,6 +185,7 @@ impl SpriteKind {
             SpriteKind::ShortGrass => false,
             SpriteKind::Apple => true,
             SpriteKind::Mushroom => true,
+            SpriteKind::CaveMushroom => true,
             SpriteKind::Velorite => true,
             SpriteKind::VeloriteFrag => true,
             SpriteKind::Chest => true,

voxygen/src/hud/mod.rs

@@ -2259,7 +2259,7 @@ impl Hud {
                 self.pulse,
                 &self.i18n,
                 &global_state,
-                tooltip_manager,
+                tooltip_manager,                
             )
             .set(self.ids.map, ui_widgets)
             {

world/src/all.rs

@@ -1,7 +1,8 @@
 #[derive(Copy, Clone, Debug)]
 pub enum ForestKind {
     Palm,
-    Savannah,
+    Acacia,
+    Baobab,
     Oak,
     Pine,
     Birch,

world/src/layer/tree.rs

@@ -19,6 +19,7 @@ lazy_static! {
     pub static ref PINES: Vec<Arc<Structure>> = Structure::load_group("pines");
     pub static ref PALMS: Vec<Arc<Structure>> = Structure::load_group("palms");
     pub static ref ACACIAS: Vec<Arc<Structure>> = Structure::load_group("acacias");
+    pub static ref BAOBABS: Vec<Arc<Structure>> = Structure::load_group("baobabs");
     pub static ref FRUIT_TREES: Vec<Arc<Structure>> = Structure::load_group("fruit_trees");
     pub static ref BIRCHES: Vec<Arc<Structure>> = Structure::load_group("birch");
     pub static ref MANGROVE_TREES: Vec<Arc<Structure>> = Structure::load_group("mangrove_trees");
@@ -85,7 +86,8 @@ pub fn apply_trees_to(canvas: &mut Canvas) {
                                     &FRUIT_TREES
                                 },
                                 ForestKind::Palm => &PALMS,
-                                ForestKind::Savannah => &ACACIAS,
+                                ForestKind::Acacia => &ACACIAS,
+                                ForestKind::Baobab => &BAOBABS,
                                 ForestKind::Oak => &OAKS,
                                 ForestKind::Pine => &PINES,
                                 ForestKind::Birch => &BIRCHES,

world/src/sim/mod.rs

@@ -2238,7 +2238,13 @@ impl SimChunk {
                         (1.0, 2.0),
                     ),
                     (
-                        ForestKind::Savannah,
+                        ForestKind::Acacia,
+                        (0.0, 1.5),
+                        (CONFIG.tropical_temp, 1.5),
+                        (0.0, 1.0),
+                    ),
+                    (
+                        ForestKind::Baobab,
                         (0.0, 1.5),
                         (CONFIG.tropical_temp, 1.5),
                         (0.0, 1.0),