Merge branch 'pfau/0.11_bg' into 'master'

0.11 Background images and more

See merge request veloren/veloren!2823

assets/common/entity/spot/pirate.ron

@@ -7,9 +7,9 @@ EntityConfig (
         beard: 0,
         eyes: 0,
         accessory: 0,
-        hair_color: 0,
-        skin: 0,
-        eye_color: 0,
+        hair_color: 12,
+        skin: 8,
+        eye_color: 3,
     ))),
     alignment: Alignment(Enemy),
 

assets/common/entity/spot/witch_dark.ron

@@ -3,17 +3,17 @@ EntityConfig (
     body: Exact(Humanoid(Body(
         species: Human,
         body_type: Female,
-        hair_style: 2,
+        hair_style: 15,
         beard: 0,
         eyes: 0,
         accessory: 0,
-        hair_color: 0,
+        hair_color: 12,
         skin: 0,
-        eye_color: 0,
+        eye_color: 1,
     ))),
     alignment: Alignment(Enemy),
 
-    loot: LootTable("common.loot_tables.creature.humanoid"),
+    loot: LootTable("common.loot_tables.creature.witch"),
 
     hands: TwoHanded(Item("common.items.weapons.sceptre.belzeshrub")),
 

assets/common/items/lantern/pumpkin.ron

@@ -9,6 +9,6 @@ ItemDef(
             flicker_thousandths: 600,
         ),
     ),
-    quality: High,
+    quality: Epic,
     tags: [Utility],
 )

assets/common/loot_tables/creature/witch.ron

@@ -0,0 +1,8 @@
+[    
+    (0.001, Item("common.items.lantern.pumpkin")),
+    (2.0, LootTable("common.loot_tables.materials.common")),    
+    (0.1, Item("common.items.armor.misc.ring.gold")),    
+    (1.0, LootTable("common.loot_tables.weapons.tier-3")),
+    (0.1, LootTable("common.loot_tables.weapons.tier-4")),
+    (1.5, LootTable("common.loot_tables.food.prepared")),
+]

assets/common/skillset/spots/general_max.ron

@@ -0,0 +1,4 @@
+([
+    Skill((General(HealthIncrease), Some(10))),
+    Skill((General(EnergyIncrease), Some(5))),
+])

assets/common/skillset/spots/sceptre_max.ron

@@ -0,0 +1,21 @@
+([
+    Group(Weapon(Sceptre)),
+
+    // Beam
+    Skill((Sceptre(LDamage), Some(3))),
+    Skill((Sceptre(LRange), Some(2))),
+    Skill((Sceptre(LLifesteal), Some(3))),
+    Skill((Sceptre(LRegen), Some(2))),
+
+    // Heal
+    Skill((Sceptre(HHeal), Some(3))),
+    Skill((Sceptre(HDuration), Some(2))),
+    Skill((Sceptre(HRange), Some(2))),
+    Skill((Sceptre(HCost), Some(2))),
+    // Ward
+    Skill((Sceptre(UnlockAura), None)),
+    Skill((Sceptre(AStrength), Some(2))),
+    Skill((Sceptre(ADuration), Some(2))),
+    Skill((Sceptre(ARange), Some(2))),
+    Skill((Sceptre(ACost), Some(2))),
+])

assets/common/skillset/spots/witch.ron

@@ -0,0 +1,4 @@
+([
+    Tree("common.skillset.spots.general_max"),
+    Tree("common.skillset.spots.sceptre_max"),    
+])

assets/server/manifests/kits.ron

@@ -358,8 +358,7 @@
         ("common.items.armor.witch.belt",1),
         ("common.items.armor.witch.chest",1),
         ("common.items.armor.witch.hand",1),
-        ("common.items.armor.witch.foot",1),
-        ("common.items.armor.witch.hand",1),
+        ("common.items.armor.witch.foot",1),        
         ("common.items.armor.witch.hat",1),
         ("common.items.armor.witch.pants",1),
         ("common.items.armor.witch.shoulder",1),

assets/voxygen/voxel/humanoid_armor_head_manifest.ron

@@ -29,7 +29,7 @@
             color: None
         ),
         (Human, "Witch"): (
-            vox_spec: ("armor.witch.hat", (-2.0, -2.0, 5.0)),
+            vox_spec: ("armor.witch.hat", (-4.0, -4.0, 5.0)),
             color: None
         ),
         (Human, "Pirate"): (

assets/voxygen/voxel/object_manifest.ron

@@ -769,4 +769,34 @@
             central: ("armor.empty"),
         )
     ),
+    Apple: (
+        bone0: (
+            offset: (-5.5, -5.5, 0.0),
+            central: ("sprite.fruit.apple"),
+        ),
+        bone1: (
+            offset: (0.0, 0.0, 0.0),
+            central: ("armor.empty"),
+        )
+    ),
+    Hive: (
+        bone0: (
+            offset: (-5.5, -5.5, 0.0),
+            central: ("sprite.beehive.beehive"),
+        ),
+        bone1: (
+            offset: (0.0, 0.0, 0.0),
+            central: ("armor.empty"),
+        )
+    ),
+    Coconut: (
+        bone0: (
+            offset: (-4.5, -4.5, 0.0),
+            central: ("sprite.fruit.coconut"),
+        ),
+        bone1: (
+            offset: (0.0, 0.0, 0.0),
+            central: ("armor.empty"),
+        )
+    ),
 })

assets/voxygen/voxel/sprite_manifest.ron

@@ -3279,4 +3279,35 @@ WitchWindow: Some((
     ],
     wind_sway: 0.0,
 )),
+// Bones
+Bones: Some((
+    variations: [
+        (
+            model: "voxygen.voxel.sprite.bone.bone-1",
+            offset: (-3.0, -5.5, 0.0),
+            lod_axes: (0.0, 0.0, 0.0),
+        ),
+        (
+            model: "voxygen.voxel.sprite.bone.bone-2",
+            offset: (-1.0, -5.0, 0.0),
+            lod_axes: (0.0, 0.0, 0.0),
+        ),
+        (
+            model: "voxygen.voxel.sprite.bone.bone-3",
+            offset: (-1.5, -4.5, 0.0),
+            lod_axes: (0.0, 0.0, 0.0),
+        ),
+        (
+            model: "voxygen.voxel.sprite.bone.bone-4",
+            offset: (-3.5, -5.0, 0.0),
+            lod_axes: (0.0, 0.0, 0.0),
+        ),
+        (
+            model: "voxygen.voxel.sprite.bone.bone-5",
+            offset: (-4.5, -5.5, 0.0),
+            lod_axes: (0.0, 0.0, 0.0),
+        ),
+    ],
+    wind_sway: 0.0,
+)),
 )

assets/world/manifests/spots/arch.ron

@@ -7,6 +7,6 @@
     ),  
     (
         specifier: "world.structure.natural.arch-1",
-        center: (14, 12, 10)
+        center: (12, 12, 10)
     ),  
 ]

assets/world/manifests/spots/big-mushroom.ron

@@ -3,6 +3,6 @@
 [
     (
         specifier: "world.structure.natural.big_mushroom",
-        center: (12, 12, 4),
+        center: (14, 14, 15),
     ),
 ]

assets/world/manifests/spots/gnome_spring.ron

@@ -0,0 +1,12 @@
+#![enable(unwrap_newtypes)]
+
+[
+    (
+        specifier: "world.structure.natural.gnome_spring",
+        center: (10, 10, 4),
+        custom_indices: {
+            136: Filled(GlowingRock, (r: 0, g: 255, b: 255)),       
+            17: Sprite(PinkFlower),   
+         },
+    ),
+]

assets/world/manifests/spots_general/igloo.ron

@@ -3,6 +3,6 @@
 [
     (
         specifier: "world.structure.natural.igloo",
-        center: (13, 10, 2),
+        center: (14, 13, 3),
     ),
 ]

assets/world/manifests/spots_savannah/lion_rock.ron

@@ -3,6 +3,6 @@
 [
     (
         specifier: "world.structure.natural.lionrock_0",
-        center: (16, 16, 5)
+        center: (14, 13, 5)
     ),
 ]

assets/world/manifests/spots_savannah/wolf_burrow.ron

@@ -3,6 +3,12 @@
 [
     (
         specifier: "world.structure.natural.wolf_burrow",
-        center: (10, 10, 0),
+        center: (10, 10, 6),
+        custom_indices: {
+            20: Sprite(ShortGrass),
+            19: Sprite(Mushroom),
+            18: Sprite(Chest),
+            17: Sprite(Bones),            
+         },
     ),
 ]

common/src/comp/body/object.rs

@@ -89,6 +89,9 @@ make_case_elim!(
         FishMeat = 74,
         SmallMeat = 75,
         Tornado = 76,
+        Apple = 77,
+        Hive = 78,
+        Coconut = 79,
     }
 );
 
@@ -99,7 +102,7 @@ impl Body {
     }
 }
 
-pub const ALL_OBJECTS: [Body; 77] = [
+pub const ALL_OBJECTS: [Body; 80] = [
     Body::Arrow,
     Body::Bomb,
     Body::Scarecrow,
@@ -177,6 +180,9 @@ pub const ALL_OBJECTS: [Body; 77] = [
     Body::FishMeat,
     Body::SmallMeat,
     Body::Tornado,
+    Body::Apple,
+    Body::Hive,
+    Body::Coconut,
 ];
 
 impl From<Body> for super::Body {
@@ -263,6 +269,9 @@ impl Body {
             Body::FishMeat => "fish_meat",
             Body::SmallMeat => "small_meat",
             Body::Tornado => "tornado",
+            Body::Apple => "apple",
+            Body::Hive => "hive",
+            Body::Coconut => "coconut",
         }
     }
 
@@ -361,6 +370,9 @@ impl Body {
             Body::BirdMeat => 10.0,
             Body::SmallMeat => 10.0,
             Body::Tornado => 50.0,
+            Body::Apple => 2.0,
+            Body::Hive => 2.0,
+            Body::Coconut => 2.0,
         };
 
         Mass(m)

common/src/terrain/sprite.rs

@@ -176,6 +176,7 @@ make_case_elim!(
         EnsnaringVines = 0x95,
         WitchWindow = 0x96,
         SmokeDummy = 0x97,
+        Bones = 0x98,
     }
 );
 

server/src/events/entity_manipulation.rs

@@ -1044,12 +1044,18 @@ pub fn handle_bonk(server: &mut Server, pos: Vec3<f32>, _owner: Option<Uid>, tar
                     drop(block_change);
                     server
                         .state
-                        .create_object(Default::default(), comp::object::Body::Pouch)
+                        .create_object(Default::default(), match block.get_sprite() {
+                            // Create different containers depending on the original sprite
+                            Some(SpriteKind::Apple) => comp::object::Body::Apple,
+                            Some(SpriteKind::Beehive) => comp::object::Body::Hive,
+                            Some(SpriteKind::Coconut) => comp::object::Body::Coconut,
+                            _ => comp::object::Body::Pouch,
+                        })
                         .with(comp::Pos(pos.map(|e| e as f32) + Vec3::new(0.5, 0.5, 0.0)))
                         .with(item)
                         .build();
                 }
-            }
+            };
         }
     }
 }

voxygen/src/hud/diary.rs

@@ -504,9 +504,17 @@ impl<'a> Widget for Diary<'a> {
                 .set(state.exp_bar_txt, ui);
         }
         Text::new(&rank_txt)
-            .mid_top_with_margin_on(state.exp_bar_frame, 5.0)
+            .mid_top_with_margin_on(state.exp_bar_frame, match rank {
+                0..=99 => 5.0,
+                100..=999 => 8.0,
+                _ => 10.0,
+            })
             .font_id(self.fonts.cyri.conrod_id)
-            .font_size(self.fonts.cyri.scale(28))
+            .font_size(self.fonts.cyri.scale(match rank {
+                0..=99 => 28,
+                100..=999 => 21,
+                _ => 15,
+            }))
             .color(TEXT_COLOR)
             .set(state.exp_bar_rank, ui);
 

voxygen/src/settings/interface.rs

@@ -65,7 +65,7 @@ impl Default for InterfaceSettings {
             ui_scale: ScaleMode::RelativeToWindow([1920.0, 1080.0].into()),
             map_zoom: 10.0,
             map_drag: Vec2 { x: 0.0, y: 0.0 },
-            map_show_topo_map: false,
+            map_show_topo_map: true,
             map_show_difficulty: true,
             map_show_towns: true,
             map_show_dungeons: true,
@@ -74,10 +74,10 @@ impl Default for InterfaceSettings {
             map_show_caves: true,
             map_show_trees: false,
             map_show_peaks: false,
-            map_show_voxel_map: false,
+            map_show_voxel_map: true,
             minimap_show: true,
-            minimap_face_north: false,
-            minimap_zoom: 10.0,
+            minimap_face_north: true,
+            minimap_zoom: 160.0,
         }
     }
 }

world/src/layer/spot.rs

@@ -38,7 +38,7 @@ pub enum Spot {
     GnarlingTotem,
     WitchHouse,
     PirateHideout,
-    BigMushroom,
+    GnomeSpring,
     WolfBurrow,
     Igloo,
     //BanditCamp,
@@ -85,7 +85,7 @@ impl Spot {
         Self::generate_spots(
             Spot::Igloo,
             world,
-            100.0,
+            2.0,
             |g, c| {
                 g < 0.5
                     && !c.near_cliffs()
@@ -99,7 +99,7 @@ impl Spot {
         Self::generate_spots(
             Spot::PirateHideout,
             world,
-            3.0,
+            2.0,
             |g, c| {
                 g < 0.25
                     && !c.near_cliffs()
@@ -198,7 +198,7 @@ impl Spot {
         Self::generate_spots(
             Spot::WolfBurrow,
             world,
-            10.0,
+            1.5,
             |g, c| {
                 g < 0.25
                     && !c.near_cliffs()
@@ -280,9 +280,9 @@ impl Spot {
             true,
         );
         Self::generate_spots(
-            Spot::BigMushroom,
+            Spot::GnomeSpring,
             world,
-            20.0,
+            1.0,
             |g, c| {
                 g < 0.25
                     && !c.near_cliffs()
@@ -291,7 +291,7 @@ impl Spot {
                     && c.sites.is_empty()
                     && matches!(c.get_biome(), Forest)
             },
-            true,
+            false,
         );
         Self::generate_spots(
             Spot::Shipwreck,
@@ -305,7 +305,6 @@ impl Spot {
 
         // Missing:
         /*
-        Witch House
         Bandit Camp
         Hunter Camp
         TowerRuinForest
@@ -314,9 +313,6 @@ impl Spot {
         Merchant Outpost -> Near a road!
         *Quirky:*
         TreeHouse (Forest)
-        TreeStump (Forest, Grassland)
-        DesertBones (Desert, Savannah)
-        AirshipCrash (Desert, Savannah, Grassland)
         EnchantedRock (Forest, Jungle)
         */
     }
@@ -389,9 +385,9 @@ pub fn apply_spots_to(canvas: &mut Canvas, _dynamic_rng: &mut impl Rng) {
                 base_structures: Some("spots.jungle.saurok-altar"),
                 entity_radius: 6.0,
                 entities: &[
-                    (2..4, "common.entity.wild.aggressive.occult_saurok"),
-                    (2..4, "common.entity.wild.aggressive.sly_saurok"),
-                    (2..4, "common.entity.wild.aggressive.mighty_saurok"),
+                    (0..3, "common.entity.wild.aggressive.occult_saurok"),
+                    (0..3, "common.entity.wild.aggressive.sly_saurok"),
+                    (0..3, "common.entity.wild.aggressive.mighty_saurok"),
                 ],
             },
             Spot::RockCircle => SpotConfig {
@@ -452,7 +448,7 @@ pub fn apply_spots_to(canvas: &mut Canvas, _dynamic_rng: &mut impl Rng) {
             },
             Spot::WolfBurrow => SpotConfig {
                 base_structures: Some("spots_savannah.wolf_burrow"),
-                entity_radius: 0.2,
+                entity_radius: 10.0,
                 entities: &[(5..8, "common.entity.wild.aggressive.wolf")],
             },
             Spot::TreeStumpForest => SpotConfig {
@@ -480,8 +476,8 @@ pub fn apply_spots_to(canvas: &mut Canvas, _dynamic_rng: &mut impl Rng) {
                 entity_radius: 2.0,
                 entities: &[(0..2, "common.entity.wild.peaceful.bear")],
             },
-            Spot::BigMushroom => SpotConfig {
-                base_structures: Some("spots.big-mushroom"),
+            Spot::GnomeSpring => SpotConfig {
+                base_structures: Some("spots.gnome_spring"),
                 entity_radius: 40.0,
                 entities: &[(7..10, "common.entity.spot.gnome.spear")],
             },