Added Lionesses

assets/common/entity/spot/female_lion.ron

@@ -0,0 +1,14 @@
+#![enable(implicit_some)]
+(
+    name: Name("Lioness"),
+    body: Exact(QuadrupedMedium((
+        species: Lion,
+        body_type: Female,
+    ))),
+    alignment: Alignment(Enemy),
+    loot: LootTable("common.loot_tables.creature.quad_medium.clawed"),
+    inventory: (
+        loadout: FromBody,
+    ),
+    meta: [],
+)

assets/common/entity/wild/aggressive/male_lion.ron

@@ -1,11 +1,14 @@
 #![enable(implicit_some)]
 (
     name: Automatic,
-    body: RandomWith("lion"),
+    body: Exact(QuadrupedMedium((
+        species: Lion,
+        body_type: Male,
+    ))),
     alignment: Alignment(Enemy),
     loot: LootTable("common.loot_tables.creature.quad_medium.clawed"),
     inventory: (
         loadout: FromBody,
     ),
     meta: [],
-)
+)

assets/voxygen/voxel/quadruped_medium_central_manifest.ron

@@ -211,32 +211,32 @@
     ),
     (Lion, Female): (
         head: (
-            offset: (-4.5, 0.0, -4.5),
+            offset: (-5.5, 0.5, -7.5),
-            central: ("npc.lion.male.head"),
+            central: ("npc.lion.female.head"),
         ),
         neck: (
-            offset: (-7.5, -3.0, -8.5),
+            offset: (-3.5, -3.0, -11.5),
-            central: ("npc.lion.male.neck"),
+            central: ("npc.lion.female.neck"),
         ),
         jaw: (
-            offset: (-2.5, 0.0, -1.0),
+            offset: (-2.5, 1.0, -3.5),
-            central: ("npc.lion.male.jaw"),
+            central: ("npc.lion.female.jaw"),
         ),
         torso_front: (
             offset: (-5.5, -13.0, -6.0),
-            central: ("npc.lion.male.torso_front"),
+            central: ("npc.lion.female.torso_front"),
         ),
         torso_back: (
-            offset: (-5.5, -12.0, -5.0),
+            offset: (-5.5, -13.0, -5.5),
-            central: ("npc.lion.male.torso_back"),
+            central: ("npc.lion.female.torso_back"),
         ),
         ears: (
-            offset: (-4.5, -1.0, 0.0),
+            offset: (-4.5, -0.5, -1.5),
-            central: ("npc.lion.male.ears"),
+            central: ("npc.lion.female.ears"),
         ),
         tail: (
-            offset: (-1.5, -15.0, -10.0),
+            offset: (-1.5, -16.0, -10.0),
-            central: ("npc.lion.male.tail"),
+            central: ("npc.lion.female.tail"),
         ),
     ),
     (Tarasque, Male): (

assets/voxygen/voxel/quadruped_medium_lateral_manifest.ron

@@ -239,36 +239,36 @@
     ),
     (Lion, Female): (
         leg_fl: (
-            offset: (-2.0, -2.5, -3.5),
+            offset: (-1.0, -3.5, -3.5),
-            lateral: ("npc.lion.male.leg_fr"),
+            lateral: ("npc.lion.female.leg_fr"),
         ),
         leg_fr: (
-            offset: (-2.0, -2.5, -3.5),
+            offset: (-3.0, -3.5, -3.5),
-            lateral: ("npc.lion.male.leg_fr"),
+            lateral: ("npc.lion.female.leg_fr"),
         ),
         leg_bl: (
-            offset: (-2.0, -3.0, -3.5),
+            offset: (-1.5, -5.5, -4.0),
-            lateral: ("npc.lion.male.leg_br"),
+            lateral: ("npc.lion.female.leg_br"),
         ),
         leg_br: (
-            offset: (-2.0, -3.0, -3.5),
+            offset: (-2.5, -5.5, -4.0),
-            lateral: ("npc.lion.male.leg_br"),
+            lateral: ("npc.lion.female.leg_br"),
         ),
         foot_fl: (
-            offset: (-2.5, -2.0, -8.0),
+            offset: (-1.5, -4.0, -8.5),
-            lateral: ("npc.lion.male.foot_fr"),
+            lateral: ("npc.lion.female.foot_fr"),
         ),
         foot_fr: (
-            offset: (-2.5, -2.0, -8.0),
+            offset: (-3.5, -4.0, -8.5),
-            lateral: ("npc.lion.male.foot_fr"),
+            lateral: ("npc.lion.female.foot_fr"),
         ),
         foot_bl: (
-            offset: (-2.5, -2.0, -8.0),
+            offset: (-2.0, -4.5, -8.5),
-            lateral: ("npc.lion.male.foot_br"),
+            lateral: ("npc.lion.female.foot_br"),
         ),
         foot_br: (
-            offset: (-2.5, -2.0, -8.0),
+            offset: (-3.0, -4.5, -8.5),
-            lateral: ("npc.lion.male.foot_br"),
+            lateral: ("npc.lion.female.foot_br"),
         ),
     ),
     (Tarasque, Male): (

assets/world/wildlife/spawn/tropical/rainforest.ron

@@ -4,7 +4,7 @@ SpawnEntry (
     rules: [
         Pack(
             groups: [
-                (1, (1, 2, "common.entity.wild.aggressive.lion")),
+                (1, (1, 2, "common.entity.wild.aggressive.male_lion")),
                 (1, (1, 3, "common.entity.wild.aggressive.hyena")),
             ],
             is_underwater: false,

voxygen/anim/src/quadruped_medium/mod.rs

@@ -176,7 +176,8 @@ impl<'a> From<&'a Body> for SkeletonAttr {
                 (Grolgar, _) => (0.0, -1.0),
                 (Saber, _) => (5.0, -3.0),
                 (Tuskram, _) => (0.0, 0.0),
-                (Lion, _) => (4.5, 2.0),
+                (Lion, Male) => (4.5, 2.0),
+                (Lion, Female) => (2.5, -2.0),
                 (Tarasque, _) => (-4.0, 3.5),
                 (Tiger, _) => (2.0, 1.0),
                 (Wolf, _) => (1.5, 3.0),
@@ -216,7 +217,8 @@ impl<'a> From<&'a Body> for SkeletonAttr {
                 (Grolgar, _) => (1.0, -1.0),
                 (Saber, _) => (-3.5, -2.0),
                 (Tuskram, _) => (-1.0, 1.0),
-                (Lion, _) => (-1.5, 1.0),
+                (Lion, Male) => (-1.5, 1.0),
+                (Lion, Female) => (-2.0, 8.5),
                 (Tarasque, _) => (-1.5, -4.0),
                 (Tiger, _) => (0.0, 0.0),
                 (Wolf, _) => (-4.5, 2.0),
@@ -254,7 +256,8 @@ impl<'a> From<&'a Body> for SkeletonAttr {
                 (Grolgar, _) => (7.0, 2.0),
                 (Saber, _) => (2.5, -2.0),
                 (Tuskram, _) => (4.0, -5.0),
-                (Lion, _) => (3.5, -4.0),
+                (Lion, Male) => (3.5, -4.0),
+                (Lion, Female) => (3.5, -4.0),
                 (Tarasque, _) => (9.0, -9.5),
                 (Tiger, _) => (3.0, -3.5),
                 (Wolf, _) => (5.0, -2.5),
@@ -293,7 +296,8 @@ impl<'a> From<&'a Body> for SkeletonAttr {
                 (Grolgar, _) => (-11.5, -0.5),
                 (Saber, _) => (-11.0, 0.0),
                 (Tuskram, _) => (-8.0, 2.0),
-                (Lion, _) => (-11.0, 1.0),
+                (Lion, Male) => (-11.0, 1.0),
+                (Lion, Female) => (-11.0, 1.0),
                 (Tarasque, _) => (-11.0, 0.0),
                 (Tiger, _) => (-13.5, 3.0),
                 (Wolf, _) => (-11.0, 0.0),
@@ -331,7 +335,8 @@ impl<'a> From<&'a Body> for SkeletonAttr {
                 (Grolgar, _) => (10.0, 13.0),
                 (Saber, _) => (14.0, 13.0),
                 (Tuskram, _) => (10.0, 16.0),
-                (Lion, _) => (10.0, 12.5),
+                (Lion, Male) => (10.0, 13.0),
+                (Lion, Female) => (10.0, 13.5),
                 (Tarasque, _) => (11.5, 17.5),
                 (Tiger, _) => (10.0, 13.0),
                 (Wolf, _) => (12.0, 13.0),
@@ -369,7 +374,8 @@ impl<'a> From<&'a Body> for SkeletonAttr {
                 (Grolgar, _) => (-10.0, 1.5),
                 (Saber, _) => (-13.5, 0.0),
                 (Tuskram, _) => (-12.0, -2.5),
-                (Lion, _) => (-12.0, -0.5),
+                (Lion, Male) => (-12.0, -0.5),
+                (Lion, Female) => (-12.0, -0.5),
                 (Tarasque, _) => (-14.0, -1.0),
                 (Tiger, _) => (-13.0, -0.5),
                 (Wolf, _) => (-12.5, 1.0),
@@ -407,7 +413,8 @@ impl<'a> From<&'a Body> for SkeletonAttr {
                 (Grolgar, _) => (5.0, 8.0),
                 (Saber, _) => (3.0, 5.5),
                 (Tuskram, _) => (0.0, 0.0),
-                (Lion, _) => (2.0, 3.5),
+                (Lion, Male) => (2.0, 3.5),
+                (Lion, Female) => (2.0, 1.0),
                 (Tarasque, _) => (12.0, -3.0),
                 (Tiger, _) => (2.5, 4.0),
                 (Wolf, _) => (3.0, 2.5),
@@ -446,7 +453,8 @@ impl<'a> From<&'a Body> for SkeletonAttr {
                 (Grolgar, _) => (7.5, -5.5, -1.0),
                 (Saber, _) => (7.0, -4.0, -2.5),
                 (Tuskram, _) => (8.5, -4.5, -2.0),
-                (Lion, _) => (6.5, -6.5, -1.5),
+                (Lion, Male) => (6.5, -6.5, -1.5),
+                (Lion, Female) => (6.5, -6.5, -1.5),
                 (Tarasque, _) => (7.0, -8.0, -6.0),
                 (Tiger, _) => (6.0, -6.0, -1.5),
                 (Wolf, _) => (4.5, -6.5, -1.5),
@@ -484,7 +492,8 @@ impl<'a> From<&'a Body> for SkeletonAttr {
                 (Grolgar, _) => (6.0, -6.5, -4.0),
                 (Saber, _) => (6.0, -7.0, -3.5),
                 (Tuskram, _) => (6.0, -5.5, -2.5),
-                (Lion, _) => (6.0, -5.0, -1.5),
+                (Lion, Male) => (6.0, -5.0, -1.5),
+                (Lion, Female) => (6.0, -5.0, -1.5),
                 (Tarasque, _) => (6.0, -6.5, -6.5),
                 (Tiger, _) => (6.0, -7.0, -1.0),
                 (Wolf, _) => (5.0, -6.5, -3.0),
@@ -522,7 +531,8 @@ impl<'a> From<&'a Body> for SkeletonAttr {
                 (Grolgar, _) => (0.0, 0.0, -4.0),
                 (Saber, _) => (1.0, -3.5, -2.5),
                 (Tuskram, _) => (-1.0, -1.5, -6.0),
-                (Lion, _) => (0.5, 0.5, -3.5),
+                (Lion, Male) => (0.5, 0.5, -3.5),
+                (Lion, Female) => (0.5, 0.5, -3.5),
                 (Tarasque, _) => (1.0, 0.0, -3.0),
                 (Tiger, _) => (0.5, 0.0, -4.5),
                 (Wolf, _) => (0.5, 0.0, -2.0),
@@ -560,7 +570,8 @@ impl<'a> From<&'a Body> for SkeletonAttr {
                 (Grolgar, _) => (0.5, -1.5, -3.0),
                 (Saber, _) => (1.0, -1.0, -1.0),
                 (Tuskram, _) => (0.5, -1.0, -3.0),
-                (Lion, _) => (0.5, -1.0, -3.0),
+                (Lion, Male) => (0.5, -1.0, -3.0),
+                (Lion, Female) => (0.5, -1.0, -3.0),
                 (Tarasque, _) => (1.5, -1.0, -2.5),
                 (Tiger, _) => (0.5, -1.0, -4.0),
                 (Wolf, _) => (0.0, -1.0, -1.5),
@@ -598,7 +609,8 @@ impl<'a> From<&'a Body> for SkeletonAttr {
                 (Grolgar, _) => (1.05),
                 (Saber, _) => (0.9),
                 (Tuskram, _) => (0.95),
-                (Lion, _) => (1.05),
+                (Lion, Male) => (1.05),
+                (Lion, Female) => (1.05),
                 (Tarasque, _) => (1.05),
                 (Tiger, _) => (0.95),
                 (Catoblepas, _) => (1.05),
@@ -627,7 +639,8 @@ impl<'a> From<&'a Body> for SkeletonAttr {
                 (Grolgar, _) => (-0.3),
                 (Saber, _) => (-0.2),
                 (Tuskram, _) => (0.3),
-                (Lion, _) => (-0.1),
+                (Lion, Male) => (-0.1),
+                (Lion, Female) => (-0.1),
                 (Tarasque, _) => (-0.5),
                 (Catoblepas, _) => (-0.5),
                 (Bonerattler, _) => (-0.7),
@@ -639,7 +652,8 @@ impl<'a> From<&'a Body> for SkeletonAttr {
                 (Grolgar, _) => (0.85),
                 (Saber, _) => (1.1),
                 (Tuskram, _) => (0.9),
-                (Lion, _) => (0.95),
+                (Lion, Male) => (0.95),
+                (Lion, Female) => (0.95),
                 (Tarasque, _) => (0.95),
                 (Wolf, _) => (1.1),
                 (Mouflon, _) => (0.85),
@@ -706,7 +720,8 @@ fn mount_point(body: &Body) -> Vec3<f32> {
         (Grolgar, _) => (0.0, -6.0, 3.0),
         (Saber, _) => (0.0, -12.0, 1.0),
         (Tuskram, _) => (0.0, -17.0, -1.0),
-        (Lion, _) => (0.0, -8.0, 1.0),
+        (Lion, Male) => (0.0, -8.0, 1.0),
+        (Lion, Female) => (0.0, -8.0, 1.0),
         (Tarasque, _) => (0.0, -6.0, 1.0),
         (Tiger, _) => (0.0, -8.0, 1.0),
         (Wolf, _) => (0.0, -9.0, 0.0),

world/src/layer/spot.rs

@@ -504,8 +504,11 @@ pub fn apply_spots_to(canvas: &mut Canvas, _dynamic_rng: &mut impl Rng) {
             // Random World Objects
             Spot::LionRock => SpotConfig {
                 base_structures: Some("spots_savannah.lion_rock"),
-                entity_radius: 20.0,
+                entity_radius: 30.0,
-                entities: &[(5..8, "common.entity.wild.aggressive.lion")],
+                entities: &[
+                    (5..10, "common.entity.spot.female_lion"),
+                    (1..2, "common.entity.wild.aggressive.male_lion"),
+                ],
             },
             Spot::WolfBurrow => SpotConfig {
                 base_structures: Some("spots_savannah.wolf_burrow"),