diff --git a/assets/voxygen/element/map/dif_3.png b/assets/voxygen/element/map/dif_3.png index 8c6f98e063..5e330c2c05 100644 --- a/assets/voxygen/element/map/dif_3.png +++ b/assets/voxygen/element/map/dif_3.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:18fb560e7235cd028b3bf3be38b4ee987920b678abfdda862328d7bb16516e8f -size 1804 +oid sha256:e786f5fec371659ba3f95deb4c3ff00e490dcd21fbfb452459f8687fa0c3b2c7 +size 2009 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..fb1a31c6a2 --- /dev/null +++ b/assets/world/tree/baobab/0.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:99f63abd76a8e029c9010d585dc2172a694e89ab56b185d848e28d8107793523 +size 89580 diff --git a/assets/world/tree/baobab/1.vox b/assets/world/tree/baobab/1.vox new file mode 100644 index 0000000000..11fb847f48 --- /dev/null +++ b/assets/world/tree/baobab/1.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:49b4a651332a3719992cfe5f725349cda8553d4c26437f73496bf89f584d2d48 +size 46308 diff --git a/assets/world/tree/baobab/2.vox b/assets/world/tree/baobab/2.vox new file mode 100644 index 0000000000..b380f6edc0 --- /dev/null +++ b/assets/world/tree/baobab/2.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d16de99de9bdc5fab0ca72f515fe3decd7bc47ab2856873f094e0217d8ed057f +size 41996 diff --git a/assets/world/tree/baobab/3.vox b/assets/world/tree/baobab/3.vox new file mode 100644 index 0000000000..d80156720c --- /dev/null +++ b/assets/world/tree/baobab/3.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3cebd3eb0da76ecc1880479c848e942c86f5f0ce44d504582bc958bebf3669e4 +size 22696 diff --git a/assets/world/tree/baobab/4.vox b/assets/world/tree/baobab/4.vox new file mode 100644 index 0000000000..5b9cf421e0 --- /dev/null +++ b/assets/world/tree/baobab/4.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6e74f070033aefcdedd47bbc3b6430fe1e6985b337c9a75968f395c2742aeaa2 +size 17876 diff --git a/assets/world/tree/baobab/5.vox b/assets/world/tree/baobab/5.vox new file mode 100644 index 0000000000..baa54642d9 --- /dev/null +++ b/assets/world/tree/baobab/5.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bfb95bf94806d94574b24ab8d24925ef9602d399fc37c24b187e25cf215cb130 +size 7820 diff --git a/assets/world/tree/baobab/6.vox b/assets/world/tree/baobab/6.vox new file mode 100644 index 0000000000..ecb1db2404 --- /dev/null +++ b/assets/world/tree/baobab/6.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5ffb0e2987091f1d841885ea39ea1be2bfaba2c1852aa40beef39c68d37c4aba +size 18952 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),