Merge branch 'pfau/sprites-hairstyles-ui' into 'master'

35 new ground sprites, UI fixes

See merge request veloren/veloren!755

assets/voxygen/i18n/en.ron

@@ -164,9 +164,8 @@ Enjoy your stay in the World of Veloren."#,
         "hud.settings.crosshair": "Crosshair",
         "hud.settings.transparency": "Transparency",
         "hud.settings.hotbar": "Hotbar",        
-        "hud.settings.toggle_bar_experience": "Toggle Experience Bar",
         "hud.settings.toggle_shortcuts": "Toggle Shortcuts",
-        "hud.settings.toggle_bar_experience": "Toggle Shortcuts",
+        "hud.settings.toggle_bar_experience": "Toggle Experience Bar",
         "hud.settings.scrolling_combat_text": "Scrolling Combat Text",
         "hud.settings.single_damage_number": "Single Damage Numbers",
         "hud.settings.cumulated_damage": "Cumulated Damage",
@@ -177,6 +176,7 @@ Enjoy your stay in the World of Veloren."#,
         "hud.settings.percentages": "Percentages",
         "hud.settings.chat": "Chat",
         "hud.settings.background_transparency": "Background Transparency",
+        "hud.settings.none": "None",
 
         "hud.settings.pan_sensitivity": "Pan Sensitivity",
         "hud.settings.zoom_sensitivity": "Zoom Sensitivity",

assets/world/manifests/palms.ron

@@ -2,43 +2,43 @@
     [
         (
             specifier: "world.tree.desert_palm.1",
-            center: (12, 12, 10)
+            center: (7, 8, 2)
         ),
         (
             specifier: "world.tree.desert_palm.2",
-            center: (12, 10, 10)
+            center: (8, 7, 2)
         ),
         (
             specifier: "world.tree.desert_palm.3",
-            center: (12, 12, 10)
+            center: (7, 8, 2)
         ),
         (
             specifier: "world.tree.desert_palm.4",
-            center: (10, 10, 10)
+            center: (6, 7, 2)
         ),
         (
             specifier: "world.tree.desert_palm.5",
-            center: (10, 10, 10)
+            center: (6, 7, 2)
         ),
         (
             specifier: "world.tree.desert_palm.6",
-            center: (10, 10, 10)
+            center: (7, 7, 2)
         ),
         (
             specifier: "world.tree.desert_palm.7",
-            center: (10, 10, 10)
+            center: (7, 7, 2)
         ),
         (
             specifier: "world.tree.desert_palm.8",
-            center: (10, 10, 10)
+            center: (5, 7, 2)
         ),
         (
             specifier: "world.tree.desert_palm.9",
-            center: (10, 10, 10)
+            center: (7, 7, 2)
         ),
         (
             specifier: "world.tree.desert_palm.10",
-            center: (10, 10, 10)
+            center: (6, 7, 2)
         ),
     ]
 )

common/src/terrain/block.rs

@@ -33,6 +33,13 @@ pub enum BlockKind {
     VeloriteFrag,
     Chest,
     Leaves,
+    Pumpkin,
+    Welwitch,
+    LingonBerry,
+    LeafyPlant,
+    Fern,
+    DeadBush,
+    Blueberry,
 }
 
 impl BlockKind {
@@ -68,6 +75,12 @@ impl BlockKind {
             BlockKind::Velorite => true,
             BlockKind::VeloriteFrag => true,
             BlockKind::Chest => true,
+            BlockKind::Welwitch => true,
+            BlockKind::LingonBerry => true,
+            BlockKind::LeafyPlant => true,
+            BlockKind::Fern => true,
+            BlockKind::DeadBush => true,
+            BlockKind::Blueberry => true,
             _ => false,
         }
     }
@@ -105,6 +118,12 @@ impl BlockKind {
             BlockKind::Velorite => false,
             BlockKind::VeloriteFrag => false,
             BlockKind::Chest => false,
+            BlockKind::Welwitch => false,
+            BlockKind::LingonBerry => false,
+            BlockKind::LeafyPlant => false,
+            BlockKind::Fern => false,
+            BlockKind::DeadBush => false,
+            BlockKind::Blueberry => false,
             _ => true,
         }
     }
@@ -133,6 +152,13 @@ impl BlockKind {
             BlockKind::Mushroom => false,
             BlockKind::Liana => false,
             BlockKind::Chest => true,
+            BlockKind::Pumpkin => true,
+            BlockKind::Welwitch => false,
+            BlockKind::LingonBerry => false,
+            BlockKind::LeafyPlant => false,
+            BlockKind::Fern => false,
+            BlockKind::DeadBush => false,
+            BlockKind::Blueberry => false,
             _ => true,
         }
     }
@@ -154,6 +180,7 @@ impl BlockKind {
             BlockKind::Velorite => true,
             BlockKind::VeloriteFrag => true,
             BlockKind::Chest => true,
+            BlockKind::Pumpkin => true,
             _ => false,
         }
     }

voxygen/src/scene/terrain.rs

@@ -58,7 +58,7 @@ struct SpriteConfig {
 fn sprite_config_for(kind: BlockKind) -> Option<SpriteConfig> {
     match kind {
         BlockKind::LargeCactus => Some(SpriteConfig {
-            variations: 1,
+            variations: 2,
             wind_sway: 0.0,
         }),
         BlockKind::BarrelCactus => Some(SpriteConfig {
@@ -144,6 +144,31 @@ fn sprite_config_for(kind: BlockKind) -> Option<SpriteConfig> {
             variations: 4,
             wind_sway: 0.0,
         }),
+        BlockKind::Welwitch => Some(SpriteConfig {
+            variations: 1,
+            wind_sway: 0.1,
+        }),
+        BlockKind::Pumpkin => Some(SpriteConfig {
+            variations: 5,
+            wind_sway: 0.0,
+        }),
+        BlockKind::LingonBerry => Some(SpriteConfig {
+            variations: 3,
+            wind_sway: 0.0,
+        }),
+        BlockKind::LeafyPlant => Some(SpriteConfig {
+            variations: 10,
+            wind_sway: 0.4,
+        }),
+        BlockKind::Fern => Some(SpriteConfig {
+            variations: 12,
+            wind_sway: 0.4,
+        }),
+        BlockKind::DeadBush => Some(SpriteConfig {
+            variations: 4,
+            wind_sway: 0.1,
+        }),
+
         _ => None,
     }
 }
@@ -252,6 +277,13 @@ impl<V: RectRasterableVol> Terrain<V> {
                         Vec3::new(-13.5, -5.5, 0.0),
                     ),
                 ),
+                (
+                    (BlockKind::LargeCactus, 1),
+                    make_model(
+                        "voxygen.voxel.sprite.cacti.tall",
+                        Vec3::new(-6.0, -6.0, 0.0),
+                    ),
+                ),
                 (
                     (BlockKind::BarrelCactus, 0),
                     make_model(
@@ -752,6 +784,285 @@ impl<V: RectRasterableVol> Terrain<V> {
                         Vec3::new(-7.0, -5.0, -0.0),
                     ),
                 ),
+                //Welwitch
+                (
+                    (BlockKind::Welwitch, 0),
+                    make_model(
+                        "voxygen.voxel.sprite.welwitch.1",
+                        Vec3::new(-15.0, -17.0, -0.0),
+                    ),
+                ),
+                //Pumpkins
+                (
+                    (BlockKind::Pumpkin, 0),
+                    make_model(
+                        "voxygen.voxel.sprite.pumpkin.1",
+                        Vec3::new(-6.0, -6.0, -0.0),
+                    ),
+                ),
+                (
+                    (BlockKind::Pumpkin, 1),
+                    make_model(
+                        "voxygen.voxel.sprite.pumpkin.2",
+                        Vec3::new(-6.0, -6.0, -0.0),
+                    ),
+                ),
+                (
+                    (BlockKind::Pumpkin, 2),
+                    make_model(
+                        "voxygen.voxel.sprite.pumpkin.3",
+                        Vec3::new(-6.0, -6.0, -0.0),
+                    ),
+                ),
+                (
+                    (BlockKind::Pumpkin, 3),
+                    make_model(
+                        "voxygen.voxel.sprite.pumpkin.4",
+                        Vec3::new(-6.0, -6.0, -0.0),
+                    ),
+                ),
+                (
+                    (BlockKind::Pumpkin, 4),
+                    make_model(
+                        "voxygen.voxel.sprite.pumpkin.5",
+                        Vec3::new(-6.0, -6.0, -0.0),
+                    ),
+                ),
+                //Lingonberries
+                (
+                    (BlockKind::LingonBerry, 0),
+                    make_model(
+                        "voxygen.voxel.sprite.lingonberry.1",
+                        Vec3::new(-6.0, -6.0, -0.0),
+                    ),
+                ),
+                (
+                    (BlockKind::LingonBerry, 1),
+                    make_model(
+                        "voxygen.voxel.sprite.lingonberry.2",
+                        Vec3::new(-6.0, -6.0, -0.0),
+                    ),
+                ),
+                (
+                    (BlockKind::LingonBerry, 2),
+                    make_model(
+                        "voxygen.voxel.sprite.lingonberry.3",
+                        Vec3::new(-6.0, -6.0, -0.0),
+                    ),
+                ),
+                // Leafy Plants
+                (
+                    (BlockKind::LeafyPlant, 0),
+                    make_model(
+                        "voxygen.voxel.sprite.leafy_plant.1",
+                        Vec3::new(-6.0, -6.0, -0.0),
+                    ),
+                ),
+                (
+                    (BlockKind::LeafyPlant, 1),
+                    make_model(
+                        "voxygen.voxel.sprite.leafy_plant.2",
+                        Vec3::new(-6.0, -6.0, -0.0),
+                    ),
+                ),
+                (
+                    (BlockKind::LeafyPlant, 2),
+                    make_model(
+                        "voxygen.voxel.sprite.leafy_plant.3",
+                        Vec3::new(-6.0, -6.0, -0.0),
+                    ),
+                ),
+                (
+                    (BlockKind::LeafyPlant, 3),
+                    make_model(
+                        "voxygen.voxel.sprite.leafy_plant.4",
+                        Vec3::new(-6.0, -6.0, -0.0),
+                    ),
+                ),
+                (
+                    (BlockKind::LeafyPlant, 4),
+                    make_model(
+                        "voxygen.voxel.sprite.leafy_plant.5",
+                        Vec3::new(-6.0, -6.0, -0.0),
+                    ),
+                ),
+                (
+                    (BlockKind::LeafyPlant, 5),
+                    make_model(
+                        "voxygen.voxel.sprite.leafy_plant.6",
+                        Vec3::new(-6.0, -6.0, -0.0),
+                    ),
+                ),
+                (
+                    (BlockKind::LeafyPlant, 6),
+                    make_model(
+                        "voxygen.voxel.sprite.leafy_plant.7",
+                        Vec3::new(-6.0, -6.0, -0.0),
+                    ),
+                ),
+                (
+                    (BlockKind::LeafyPlant, 7),
+                    make_model(
+                        "voxygen.voxel.sprite.leafy_plant.8",
+                        Vec3::new(-6.0, -6.0, -0.0),
+                    ),
+                ),
+                (
+                    (BlockKind::LeafyPlant, 8),
+                    make_model(
+                        "voxygen.voxel.sprite.leafy_plant.9",
+                        Vec3::new(-6.0, -6.0, -0.0),
+                    ),
+                ),
+                (
+                    (BlockKind::LeafyPlant, 9),
+                    make_model(
+                        "voxygen.voxel.sprite.leafy_plant.10",
+                        Vec3::new(-6.0, -6.0, -0.0),
+                    ),
+                ),
+                // Ferns
+                (
+                    (BlockKind::Fern, 0),
+                    make_model("voxygen.voxel.sprite.ferns.1", Vec3::new(-6.0, -6.0, -0.0)),
+                ),
+                (
+                    (BlockKind::Fern, 1),
+                    make_model("voxygen.voxel.sprite.ferns.2", Vec3::new(-6.0, -6.0, -0.0)),
+                ),
+                (
+                    (BlockKind::Fern, 2),
+                    make_model("voxygen.voxel.sprite.ferns.3", Vec3::new(-6.0, -6.0, -0.0)),
+                ),
+                (
+                    (BlockKind::Fern, 3),
+                    make_model("voxygen.voxel.sprite.ferns.4", Vec3::new(-6.0, -6.0, -0.0)),
+                ),
+                (
+                    (BlockKind::Fern, 4),
+                    make_model("voxygen.voxel.sprite.ferns.5", Vec3::new(-6.0, -6.0, -0.0)),
+                ),
+                (
+                    (BlockKind::Fern, 5),
+                    make_model("voxygen.voxel.sprite.ferns.6", Vec3::new(-6.0, -6.0, -0.0)),
+                ),
+                (
+                    (BlockKind::Fern, 6),
+                    make_model("voxygen.voxel.sprite.ferns.7", Vec3::new(-6.0, -6.0, -0.0)),
+                ),
+                (
+                    (BlockKind::Fern, 7),
+                    make_model("voxygen.voxel.sprite.ferns.8", Vec3::new(-6.0, -6.0, -0.0)),
+                ),
+                (
+                    (BlockKind::Fern, 8),
+                    make_model("voxygen.voxel.sprite.ferns.9", Vec3::new(-6.0, -6.0, -0.0)),
+                ),
+                (
+                    (BlockKind::Fern, 9),
+                    make_model("voxygen.voxel.sprite.ferns.10", Vec3::new(-6.0, -6.0, -0.0)),
+                ),
+                (
+                    (BlockKind::Fern, 10),
+                    make_model("voxygen.voxel.sprite.ferns.11", Vec3::new(-6.0, -6.0, -0.0)),
+                ),
+                (
+                    (BlockKind::Fern, 11),
+                    make_model("voxygen.voxel.sprite.ferns.12", Vec3::new(-6.0, -6.0, -0.0)),
+                ),
+                // Dead Bush
+                (
+                    (BlockKind::DeadBush, 0),
+                    make_model(
+                        "voxygen.voxel.sprite.dead_bush.1",
+                        Vec3::new(-6.0, -6.0, -0.0),
+                    ),
+                ),
+                (
+                    (BlockKind::DeadBush, 1),
+                    make_model(
+                        "voxygen.voxel.sprite.dead_bush.2",
+                        Vec3::new(-6.0, -6.0, -0.0),
+                    ),
+                ),
+                (
+                    (BlockKind::DeadBush, 2),
+                    make_model(
+                        "voxygen.voxel.sprite.dead_bush.3",
+                        Vec3::new(-6.0, -6.0, -0.0),
+                    ),
+                ),
+                (
+                    (BlockKind::DeadBush, 3),
+                    make_model(
+                        "voxygen.voxel.sprite.dead_bush.4",
+                        Vec3::new(-6.0, -6.0, -0.0),
+                    ),
+                ),
+                // Blueberries
+                (
+                    (BlockKind::Blueberry, 0),
+                    make_model(
+                        "voxygen.voxel.sprite.blueberry.1",
+                        Vec3::new(-6.0, -6.0, -0.0),
+                    ),
+                ),
+                (
+                    (BlockKind::Blueberry, 1),
+                    make_model(
+                        "voxygen.voxel.sprite.blueberry.2",
+                        Vec3::new(-6.0, -6.0, -0.0),
+                    ),
+                ),
+                (
+                    (BlockKind::Blueberry, 2),
+                    make_model(
+                        "voxygen.voxel.sprite.blueberry.3",
+                        Vec3::new(-6.0, -6.0, -0.0),
+                    ),
+                ),
+                (
+                    (BlockKind::Blueberry, 3),
+                    make_model(
+                        "voxygen.voxel.sprite.blueberry.4",
+                        Vec3::new(-6.0, -6.0, -0.0),
+                    ),
+                ),
+                (
+                    (BlockKind::Blueberry, 4),
+                    make_model(
+                        "voxygen.voxel.sprite.blueberry.5",
+                        Vec3::new(-6.0, -6.0, -0.0),
+                    ),
+                ),
+                (
+                    (BlockKind::Blueberry, 5),
+                    make_model(
+                        "voxygen.voxel.sprite.blueberry.6",
+                        Vec3::new(-6.0, -6.0, -0.0),
+                    ),
+                ),
+                (
+                    (BlockKind::Blueberry, 6),
+                    make_model(
+                        "voxygen.voxel.sprite.blueberry.7",
+                        Vec3::new(-6.0, -6.0, -0.0),
+                    ),
+                ),
+                (
+                    (BlockKind::Blueberry, 7),
+                    make_model(
+                        "voxygen.voxel.sprite.blueberry.8",
+                        Vec3::new(-6.0, -6.0, -0.0),
+                    ),
+                ),
+                (
+                    (BlockKind::Blueberry, 8),
+                    make_model(
+                        "voxygen.voxel.sprite.blueberry.9",
+                        Vec3::new(-6.0, -6.0, -0.0),
+                    ),
+                ),
             ]
             .into_iter()
             .collect(),

world/src/block/mod.rs

@@ -282,7 +282,7 @@ impl<'a> BlockGen<'a> {
                 && marble > 0.6
                 && marble_small > 0.55
                 && (marble * 3173.7).fract() < 0.6
-                && humidity > 0.4
+                && humidity > CONFIG.desert_hum
             {
                 let treasures = [BlockKind::Chest, BlockKind::Velorite];
 
@@ -295,8 +295,11 @@ impl<'a> BlockGen<'a> {
                     BlockKind::YellowFlower,
                     BlockKind::Sunflower,
                     BlockKind::Mushroom,
+                    BlockKind::LeafyPlant,
+                    BlockKind::Blueberry,
+                    BlockKind::LingonBerry,
+                    BlockKind::Fern,
                 ];
-
                 let grasses = [
                     BlockKind::LongGrass,
                     BlockKind::MediumGrass,
@@ -317,13 +320,18 @@ impl<'a> BlockGen<'a> {
                 && temp > CONFIG.desert_temp
                 && (marble * 4423.5).fract() < 0.0005
             {
-                let large_cacti = [BlockKind::LargeCactus, BlockKind::MedFlatCactus];
+                let large_cacti = [
+                    BlockKind::LargeCactus,
+                    BlockKind::MedFlatCactus,
+                    BlockKind::Welwitch,
+                ];
 
                 let small_cacti = [
                     BlockKind::BarrelCactus,
                     BlockKind::RoundCactus,
                     BlockKind::ShortCactus,
                     BlockKind::ShortFlatCactus,
+                    BlockKind::DeadBush,
                 ];
 
                 Some(Block::new(