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

Adds new npcs

See merge request veloren/veloren!1496

assets/common/items/npc_weapons/staff/mindflayer_staff.ron

@@ -0,0 +1,15 @@
+ItemDef(
+    name: "Mindflayer Staff",
+    description: "Placeholder",
+    kind: Tool(
+        (
+            kind: Staff,
+            stats: (
+                equip_time_millis: 300,
+                power: 1.00,
+                speed: 1.0,
+            ),
+        )
+    ),
+    quality: Low,
+)

assets/common/npc_names.json

@@ -298,6 +298,30 @@
             "roshwalr": {
                 "keyword": "roshwalr",
                 "generic": "Roshwalr"
+            },
+            "donkey": {
+                "keyword": "donkey",
+                "generic": "Donkey"
+            },
+            "camel": {
+                "keyword": "camel",
+                "generic": "Camel"
+            },
+            "zebra": {
+                "keyword": "zebra",
+                "generic": "Zebra"
+            },
+            "antelope": {
+                "keyword": "antelope",
+                "generic": "Antelope"
+            },
+            "kelpie": {
+                "keyword": "kelpie",
+                "generic": "Kelpie"
+            },
+            "horse": {
+                "keyword": "horse",
+                "generic": "Horse"
             }
         }
     },
@@ -505,6 +529,10 @@
             "beaver": {
                 "keyword": "beaver",
                 "generic": "Beaver"
+            },
+            "hare": {
+                "keyword": "hare",
+                "generic": "Hare"
             }
         }
     },
@@ -593,6 +621,10 @@
             "saurok_sly": {
                 "keyword": "saurok_sly",
                 "generic": "Sly Saurok"
+            },
+            "mindflayer": {
+                "keyword": "mindflayer",
+                "generic": "Mindflayer"
             }
         }
     },
@@ -729,6 +761,14 @@
             "maneater": {
                 "keyword": "maneater",
                 "generic": "Maneater"
+            },
+            "sandshark": {
+                "keyword": "sandshark",
+                "generic": "Sand Shark"
+            },
+            "hakulaq": {
+                "keyword": "hakulaq",
+                "generic": "Hakulaq"
             }
         }
     }

assets/voxygen/audio/ambient.ron

@@ -2,7 +2,7 @@
     tracks: [
         (
             path: "voxygen.audio.ambient.wind",
-            length: 14.5,
+            length: 14.2,
             tag: Wind,
         ),        
     ]

assets/voxygen/voxel/biped_large_central_manifest.ron

@@ -539,4 +539,64 @@
             central: ("weapon.bow.longbow_saurok"),
         )
     ),
+    (Mindflayer, Male): (
+        head: (
+            offset: (-8.5, -8.0, -10.5),
+            central: ("npc.mindflayer.male.head"),
+        ),
+        torso_upper: (
+            offset: (-10.5, -8.5, -11.0),
+            central: ("npc.mindflayer.male.torso_upper"),
+        ),
+        torso_lower: (
+            offset: (-12.5, -10.0, -9.0),
+            central: ("npc.mindflayer.male.torso_lower"),
+        ),
+        jaw: (
+            offset: (0.0, 0.0, 0.0),
+            central: ("armor.empty"),
+        ),
+        tail: (
+            offset: (0.0, 0.0, 0.0),
+            central: ("armor.empty"),
+        ),
+        second: (
+            offset: (0.0, 0.0, 0.0),
+            central: ("armor.empty"),
+        ),
+        main: (
+            offset: (-5.5, -3.5, -4.0),
+            central: ("weapon.staff.firestaff_mindflayer"),
+        )
+    ),
+    (Mindflayer, Female): (
+        head: (
+            offset: (-8.5, -8.0, -10.5),
+            central: ("npc.mindflayer.male.head"),
+        ),
+        torso_upper: (
+            offset: (-10.5, -8.5, -11.0),
+            central: ("npc.mindflayer.male.torso_upper"),
+        ),
+        torso_lower: (
+            offset: (-12.5, -10.0, -9.0),
+            central: ("npc.mindflayer.male.torso_lower"),
+        ),
+        jaw: (
+            offset: (0.0, 0.0, 0.0),
+            central: ("armor.empty"),
+        ),
+        tail: (
+            offset: (0.0, 0.0, 0.0),
+            central: ("armor.empty"),
+        ),
+        second: (
+            offset: (0.0, 0.0, 0.0),
+            central: ("armor.empty"),
+        ),
+        main: (
+            offset: (-5.5, -3.5, -4.0),
+            central: ("weapon.staff.firestaff_mindflayer"),
+        )
+    ),
 })

assets/voxygen/voxel/biped_large_lateral_manifest.ron

@@ -611,4 +611,72 @@
             lateral: ("npc.saurok_sly.female.foot_r"),
         ),
     ),
+    (Mindflayer, Male): (
+        shoulder_l: (
+            offset: (-4.5, -3.0, -4.0),
+            lateral: ("npc.mindflayer.male.shoulder_l"),
+        ),
+        shoulder_r: (
+            offset: (-4.5, -3.0, -4.0),
+            lateral: ("npc.mindflayer.male.shoulder_r"),
+        ),
+        hand_l: (
+            offset: (-4.5, -4.0, -12.0),
+            lateral: ("npc.mindflayer.male.hand_l"),
+        ),
+        hand_r: (
+            offset: (-4.5, -4.0, -12.0),
+            lateral: ("npc.mindflayer.male.hand_r"),
+        ),
+        leg_l: (
+            offset: (-6.5, -10.0, -16.0),
+            lateral: ("armor.empty"),
+        ),
+        leg_r: (
+            offset: (-6.5, -10.0, -16.0),
+            lateral: ("armor.empty"),
+        ),
+        foot_l: (
+            offset: (-2.0, -4.5, -4.0),
+            lateral: ("npc.mindflayer.male.foot_l"),
+        ),
+        foot_r: (
+            offset: (-2.0, -4.5, -4.0),
+            lateral: ("npc.mindflayer.male.foot_r"),
+        )
+    ),
+    (Mindflayer, Female): (
+        shoulder_l: (
+            offset: (-4.5, -3.0, -4.0),
+            lateral: ("npc.mindflayer.male.shoulder_l"),
+        ),
+        shoulder_r: (
+            offset: (-4.5, -3.0, -4.0),
+            lateral: ("npc.mindflayer.male.shoulder_r"),
+        ),
+        hand_l: (
+            offset: (-4.5, -4.0, -12.0),
+            lateral: ("npc.mindflayer.male.hand_l"),
+        ),
+        hand_r: (
+            offset: (-4.5, -4.0, -12.0),
+            lateral: ("npc.mindflayer.male.hand_r"),
+        ),
+        leg_l: (
+            offset: (-6.5, -10.0, -16.0),
+            lateral: ("armor.empty"),
+        ),
+        leg_r: (
+            offset: (-6.5, -10.0, -16.0),
+            lateral: ("armor.empty"),
+        ),
+        foot_l: (
+            offset: (-2.0, -4.5, -4.0),
+            lateral: ("npc.mindflayer.male.foot_l"),
+        ),
+        foot_r: (
+            offset: (-2.0, -4.5, -4.0),
+            lateral: ("npc.mindflayer.male.foot_r"),
+        )
+    ),
 })