diff --git a/assets/voxygen/element/map/dif_3.png b/assets/voxygen/element/map/dif_3.png index dcabfc7e28..c0dba35c81 100644 Binary files a/assets/voxygen/element/map/dif_3.png and b/assets/voxygen/element/map/dif_3.png differ diff --git a/assets/world/manifests/baobabs.ron b/assets/world/manifests/baobabs.ron new file mode 100644 index 0000000000..1fb6b7d578 --- /dev/null +++ b/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) + ), +] diff --git a/assets/world/tree/baobab/0.vox b/assets/world/tree/baobab/0.vox new file mode 100644 index 0000000000..4383e72764 Binary files /dev/null and b/assets/world/tree/baobab/0.vox differ diff --git a/assets/world/tree/baobab/1.vox b/assets/world/tree/baobab/1.vox new file mode 100644 index 0000000000..a64be57dd8 Binary files /dev/null and b/assets/world/tree/baobab/1.vox differ diff --git a/assets/world/tree/baobab/2.vox b/assets/world/tree/baobab/2.vox new file mode 100644 index 0000000000..1a03562e55 Binary files /dev/null and b/assets/world/tree/baobab/2.vox differ diff --git a/assets/world/tree/baobab/3.vox b/assets/world/tree/baobab/3.vox new file mode 100644 index 0000000000..0461eb4ef0 Binary files /dev/null and b/assets/world/tree/baobab/3.vox differ diff --git a/assets/world/tree/baobab/4.vox b/assets/world/tree/baobab/4.vox new file mode 100644 index 0000000000..e9ad53cefd Binary files /dev/null and b/assets/world/tree/baobab/4.vox differ diff --git a/assets/world/tree/baobab/5.vox b/assets/world/tree/baobab/5.vox new file mode 100644 index 0000000000..39b82ff93c Binary files /dev/null and b/assets/world/tree/baobab/5.vox differ diff --git a/assets/world/tree/baobab/6.vox b/assets/world/tree/baobab/6.vox new file mode 100644 index 0000000000..1a289d0b06 Binary files /dev/null and b/assets/world/tree/baobab/6.vox differ diff --git a/common/src/comp/inventory/item/mod.rs b/common/src/comp/inventory/item/mod.rs index 8f4e1ad290..cdb3d53ee0 100644 --- a/common/src/comp/inventory/item/mod.rs +++ b/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", diff --git a/common/src/terrain/sprite.rs b/common/src/terrain/sprite.rs index 6c47efaae8..c50a9ffc29 100644 --- a/common/src/terrain/sprite.rs +++ b/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, diff --git a/voxygen/src/hud/mod.rs b/voxygen/src/hud/mod.rs index 3f97949fdb..1aaf642b91 100644 --- a/voxygen/src/hud/mod.rs +++ b/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) { diff --git a/world/src/all.rs b/world/src/all.rs index 2a28bc84c1..fb44983678 100644 --- a/world/src/all.rs +++ b/world/src/all.rs @@ -1,7 +1,8 @@ #[derive(Copy, Clone, Debug)] pub enum ForestKind { Palm, - Savannah, + Acacia, + Baobab, Oak, Pine, Birch, diff --git a/world/src/layer/tree.rs b/world/src/layer/tree.rs index 18c392a158..f7610e342b 100644 --- a/world/src/layer/tree.rs +++ b/world/src/layer/tree.rs @@ -19,6 +19,7 @@ lazy_static! { pub static ref PINES: Vec> = Structure::load_group("pines"); pub static ref PALMS: Vec> = Structure::load_group("palms"); pub static ref ACACIAS: Vec> = Structure::load_group("acacias"); + pub static ref BAOBABS: Vec> = Structure::load_group("baobabs"); pub static ref FRUIT_TREES: Vec> = Structure::load_group("fruit_trees"); pub static ref BIRCHES: Vec> = Structure::load_group("birch"); pub static ref MANGROVE_TREES: Vec> = 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, diff --git a/world/src/sim/mod.rs b/world/src/sim/mod.rs index 9c006fc010..cac34dfe68 100644 --- a/world/src/sim/mod.rs +++ b/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),