Merge branch 'snowram/npcs-rework' into 'master'

npc improvements

See merge request veloren/veloren!1234

CHANGELOG.md

@@ -46,7 +46,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Initial crafting system implementation
 - Protection stat to armor that reduces incoming damage
 - Loading-Screen tips
-
+- Feeding animation for some animals
 ### Changed
 
 - Improved camera aiming
@@ -64,7 +64,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Replaced `log` with `tracing` in all crates
 - Switch to a new network backend that will allow several improvements in the future
 - Connection screen fails after 4 minutes if it can't connect to the server instead of 80 minutes
-- Rebuilt quadruped_medium animation and assets
+- Rebuilt quadruped_medium/quadruped_small animation and assets
 - Disabled destruction of most blocks by explosions
 - Disable damage to pets
 - Made pets healable

assets/common/npc_names.json

@@ -278,6 +278,14 @@
             "mouflon": {
                 "keyword": "mouflon",
                 "generic": "Mouflon"
+            },
+            "catoblepas": {
+                "keyword": "catoblepas",
+                "generic": "Catoblepas"
+            },
+            "bonerattler": {
+                "keyword": "bonerattler",
+                "generic": "Bonerattler"
             }
         }
     },
@@ -441,6 +449,18 @@
             "hyena": {
                 "keyword": "hyena",
                 "generic": "Hyena"
+            },
+            "rabbit": {
+                "keyword": "rabbit",
+                "generic": "Rabbit"
+            },
+            "truffler": {
+                "keyword": "truffler",
+                "generic": "Truffler"
+            },
+            "frog": {
+                "keyword": "frog",
+                "generic": "Frog"
             }
         }
     },
@@ -501,6 +521,14 @@
             "cyclops": {
                 "keyword": "cyclops",
                 "generic": "Cyclops"
+            },
+            "wendigo": {
+                "keyword": "wendigo",
+                "generic": "Wendigo"
+            },
+            "troll": {
+                "keyword": "troll",
+                "generic": "Troll"
             }
         }
     },
@@ -605,6 +633,10 @@
             "pangolin": {
                 "keyword": "pangolin",
                 "generic": "Pangolin"
+            },
+            "maneater": {
+                "keyword": "maneater",
+                "generic": "Maneater"
             }
         }
     }

assets/voxygen/voxel/biped_large_center_manifest.ron

@@ -9,8 +9,12 @@
             center: ("npc.ogre.male.torso_upper"),
         ),
         torso_lower: (
-            offset: (-5.0, -4.5, -4.5),
+            offset: (-5.0, -4.5, -9.0),
             center: ("npc.ogre.male.torso_lower"),
+        ),
+        main: (
+            offset: (-8.0, -4.5, -5.0),
+            center: ("armor.empty"),
         )
     ),
     (Ogre, Female): (
@@ -23,8 +27,12 @@
             center: ("npc.ogre.male.torso_upper"),
         ),
         torso_lower: (
-            offset: (-5.0, -4.5, -4.5),
+            offset: (-5.0, -4.5, -9.0),
             center: ("npc.ogre.male.torso_lower"),
+        ),
+        main: (
+            offset: (-8.0, -4.5, -5.0),
+            center: ("armor.empty"),
         )
     ),
     (Cyclops, Male): (
@@ -37,8 +45,12 @@
             center: ("npc.cyclops.male.torso_upper"),
         ),
         torso_lower: (
-            offset: (-6.0, -5.5, -6.0),
+            offset: (-6.0, -5.5, -12.0),
             center: ("npc.cyclops.male.torso_lower"),
+        ),
+        main: (
+            offset: (-5.0, -6.5, -4.0),
+            center: ("npc.cyclops.male.hammer"),
         )
     ),
     (Cyclops, Female): (
@@ -51,8 +63,84 @@
             center: ("npc.cyclops.male.torso_upper"),
         ),
         torso_lower: (
-            offset: (-6.0, -5.5, -6.0),
+            offset: (-6.0, -5.5, -12.0),
             center: ("npc.cyclops.male.torso_lower"),
+        ),
+        main: (
+            offset: (-5.0, -6.5, -4.0),
+            center: ("npc.cyclops.male.hammer"),
+        )
+    ),
+    (Wendigo, Male): (
+        head: (
+            offset: (-15.0, -4.5, -9.5),
+            center: ("npc.wendigo.male.head"),
+        ),
+        torso_upper: (
+            offset: (-6.0, -5.5, -6.5),
+            center: ("npc.wendigo.male.torso_upper"),
+        ),
+        torso_lower: (
+            offset: (-4.0, -2.0, -4.0),
+            center: ("npc.wendigo.male.torso_lower"),
+        ),
+        main: (
+            offset: (-8.0, -4.5, -5.0),
+            center: ("armor.empty"),
+        )
+    ),
+    (Wendigo, Female): (
+        head: (
+            offset: (-15.0, -4.5, -9.5),
+            center: ("npc.wendigo.male.head"),
+        ),
+        torso_upper: (
+            offset: (-6.0, -5.5, -6.5),
+            center: ("npc.wendigo.male.torso_upper"),
+        ),
+        torso_lower: (
+            offset: (-4.0, -2.0, -4.0),
+            center: ("npc.wendigo.male.torso_lower"),
+        ),
+        main: (
+            offset: (-8.0, -4.5, -5.0),
+            center: ("armor.empty"),
+        )
+    ),
+    (Troll, Male): (
+        head: (
+            offset: (-8.0, -8.5, -9.0),
+            center: ("npc.troll.male.head"),
+        ),
+        torso_upper: (
+            offset: (-8.0, -7.5, -11.0),
+            center: ("npc.troll.male.torso_upper"),
+        ),
+        torso_lower: (
+            offset: (-6.0, -3.5, -5.0),
+            center: ("npc.troll.male.torso_lower"),
+        ),
+        main: (
+            offset: (-8.0, -4.5, -5.0),
+            center: ("armor.empty"),
+        )
+    ),
+    (Troll, Female): (
+        head: (
+            offset: (-8.0, -8.5, -9.0),
+            center: ("npc.troll.male.head"),
+        ),
+        torso_upper: (
+            offset: (-8.0, -7.5, -11.0),
+            center: ("npc.troll.male.torso_upper"),
+        ),
+        torso_lower: (
+            offset: (-6.0, -3.5, -5.0),
+            center: ("npc.troll.male.torso_lower"),
+        ),
+        main: (
+            offset: (-8.0, -4.5, -5.0),
+            center: ("armor.empty"),
         )
     ),
 })

assets/voxygen/voxel/biped_large_lateral_manifest.ron

@@ -135,4 +135,140 @@
             lateral: ("npc.cyclops.male.foot_r"),
         )
     ),
+    (Wendigo, Male): (
+        shoulder_l: (
+            offset: (-3.0, -4.0, -5.0),
+            lateral: ("npc.wendigo.male.shoulder_l"),
+        ),
+        shoulder_r: (
+            offset: (-3.0, -4.0, -5.0),
+            lateral: ("npc.wendigo.male.shoulder_r"),
+        ),
+        hand_l: (
+            offset: (-4.0, -3.5, -18.0),
+            lateral: ("npc.wendigo.male.hand_l"),
+        ),
+        hand_r: (
+            offset: (-4.0, -3.5, -18.0),
+            lateral: ("npc.wendigo.male.hand_r"),
+        ),
+        leg_l: (
+            offset: (-4.0, -2.5, -9.0),
+            lateral: ("npc.wendigo.male.leg_l"),
+        ),
+        leg_r: (
+            offset: (0.0, -2.5, -9.0),
+            lateral: ("npc.wendigo.male.leg_r"),
+        ),
+        foot_l: (
+            offset: (-4.0, -5.0, -5.5),
+            lateral: ("npc.wendigo.male.foot_l"),
+        ),
+        foot_r: (
+            offset: (-4.0, -5.0, -5.5),
+            lateral: ("npc.wendigo.male.foot_r"),
+        )
+    ),
+    (Wendigo, Female): (
+        shoulder_l: (
+            offset: (-3.0, -4.0, -5.0),
+            lateral: ("npc.wendigo.male.shoulder_l"),
+        ),
+        shoulder_r: (
+            offset: (-3.0, -4.0, -5.0),
+            lateral: ("npc.wendigo.male.shoulder_r"),
+        ),
+        hand_l: (
+            offset: (-4.0, -3.5, -18.0),
+            lateral: ("npc.wendigo.male.hand_l"),
+        ),
+        hand_r: (
+            offset: (-4.0, -3.5, -18.0),
+            lateral: ("npc.wendigo.male.hand_r"),
+        ),
+        leg_l: (
+            offset: (-4.0, -2.5, -9.0),
+            lateral: ("npc.wendigo.male.leg_l"),
+        ),
+        leg_r: (
+            offset: (0.0, -2.5, -9.0),
+            lateral: ("npc.wendigo.male.leg_r"),
+        ),
+        foot_l: (
+            offset: (-4.0, -5.0, -5.5),
+            lateral: ("npc.wendigo.male.foot_l"),
+        ),
+        foot_r: (
+            offset: (-4.0, -5.0, -5.5),
+            lateral: ("npc.wendigo.male.foot_r"),
+        )
+    ),
+    (Troll, Male): (
+        shoulder_l: (
+            offset: (-5.0, -4.5, -7.0),
+            lateral: ("npc.troll.male.shoulder_l"),
+        ),
+        shoulder_r: (
+            offset: (-5.0, -4.5, -7.0),
+            lateral: ("npc.troll.male.shoulder_r"),
+        ),
+        hand_l: (
+            offset: (-3.5, -4.0, -15.0),
+            lateral: ("npc.troll.male.hand_l"),
+        ),
+        hand_r: (
+            offset: (-3.5, -4.0, -15.0),
+            lateral: ("npc.troll.male.hand_r"),
+        ),
+        leg_l: (
+            offset: (-3.0, -2.5, -4.5),
+            lateral: ("npc.troll.male.leg_l"),
+        ),
+        leg_r: (
+            offset: (-3.0, -2.5, -4.5),
+            lateral: ("npc.troll.male.leg_r"),
+        ),
+        foot_l: (
+            offset: (-3.0, -5.0, -2.5),
+            lateral: ("npc.troll.male.foot_l"),
+        ),
+        foot_r: (
+            offset: (-3.0, -5.0, -2.5),
+            lateral: ("npc.troll.male.foot_r"),
+        )
+    ),
+    (Troll, Female): (
+        shoulder_l: (
+            offset: (-5.0, -4.5, -7.0),
+            lateral: ("npc.troll.male.shoulder_l"),
+        ),
+        shoulder_r: (
+            offset: (-5.0, -4.5, -7.0),
+            lateral: ("npc.troll.male.shoulder_r"),
+        ),
+        hand_l: (
+            offset: (-3.5, -4.0, -15.0),
+            lateral: ("npc.troll.male.hand_l"),
+        ),
+        hand_r: (
+            offset: (-3.5, -4.0, -15.0),
+            lateral: ("npc.troll.male.hand_r"),
+        ),
+        leg_l: (
+            offset: (-3.0, -2.5, -4.5),
+            lateral: ("npc.troll.male.leg_l"),
+        ),
+        leg_r: (
+            offset: (-3.0, -2.5, -4.5),
+            lateral: ("npc.troll.male.leg_r"),
+        ),
+        foot_l: (
+            offset: (-3.0, -5.0, -2.5),
+            lateral: ("npc.troll.male.foot_l"),
+        ),
+        foot_r: (
+            offset: (-3.0, -5.0, -2.5),
+            lateral: ("npc.troll.male.foot_r"),
+        )
+    ),
 })

assets/voxygen/voxel/bird_medium_center_manifest.ron

@@ -57,7 +57,7 @@
     ),
     (Goose, Male): (
         head: (
-            offset: (-2.0, -3.5, -2.5),
+            offset: (-2.0, -3.5, -0.0),
             center: ("npc.goose.male.head"),
         ),
         torso: (
@@ -71,7 +71,7 @@
     ),
     (Goose, Female): (
         head: (
-            offset: (-2.0, -3.5, -2.5),
+            offset: (-2.0, -3.5, -0.0),
             center: ("npc.goose.male.head"),
         ),
         torso: (
@@ -85,7 +85,7 @@
     ),
     (Peacock, Male): (
         head: (
-            offset: (-2.0, -1.5, -6.5),
+            offset: (-2.0, -1.5, -0.0),
             center: ("npc.peacock.male.head"),
         ),
         torso: (
@@ -99,7 +99,7 @@
     ),
     (Peacock, Female): (
         head: (
-            offset: (-2.0, -1.5, -6.5),
+            offset: (-2.0, -1.5, -0.0),
             center: ("npc.peacock.female.head"),
         ),
         torso: (
@@ -197,7 +197,7 @@
     ),
     (Cockatrice, Male): (
         head: (
-            offset: (-2.5, -3.5, -8.0),
+            offset: (-2.5, 0.0, -8.0),
             center: ("npc.cockatrice.male.head"),
         ),
         torso: (
@@ -211,7 +211,7 @@
     ),
     (Cockatrice, Female): (
         head: (
-            offset: (-2.5, -3.5, -8.0),
+            offset: (-2.5, 0.0, -8.0),
             center: ("npc.cockatrice.male.head"),
         ),
         torso: (

assets/voxygen/voxel/dragon_center_manifest.ron

@@ -17,7 +17,7 @@
             center: ("npc.reddragon.male.chest_front"),
         ),
         chest_rear: (
-            offset: (-6.5, -7.0, -7.0),
+            offset: (-6.5, -13.0, -7.0),
             center: ("npc.reddragon.male.chest_rear"),
         ),
         tail_front: (
@@ -47,7 +47,7 @@
             center: ("npc.reddragon.male.chest_front"),
         ),
         chest_rear: (
-            offset: (-6.5, -7.0, -7.0),
+            offset: (-6.5, -13.0, -7.0),
             center: ("npc.reddragon.male.chest_rear"),
         ),
         tail_front: (