Merge branch 'slipped/npc-configs' into 'master'

new mobs

See merge request veloren/veloren!703

CHANGELOG.md

@@ -45,6 +45,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   to the client.
 - Added fullscreen and window size to settings so that they can be persisted
 - Added coverage based scaling for pixel art
+- 28 new mobs
+
 
 ### Changed
 
@@ -84,6 +86,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Parallelized and otherwise sped up significant parts of world generation.
 - Various performance improvements to world generation.
 - Nametags now a fixed size and shown in a limited range
+- Non-humanoid skeletons now utilize configs for hotloading, and skeletal attributes.
 
 ### Removed
 

assets/common/npc_names.json

@@ -309,5 +309,14 @@
         "Ziggy",
         "Zoe",
         "Zoinks"
+    ],
+    "duck": [
+        "ducky"
+    ],
+    "giant": [
+        "leroybrown"
+    ],
+    "rat": [
+        "rat"
     ]
 }

assets/voxygen/voxel/biped_large_center_manifest.ron

@@ -0,0 +1,30 @@
+({
+    (Giant, Male): (
+        head: (
+            offset: (-9.0, -6.0, -6.5),
+            center: ("npc.giant.male.head"),
+        ),
+        torso_upper: (
+            offset: (-8.0, -4.5, -5.0),
+            center: ("npc.giant.male.torso_upper"),
+        ),
+        torso_lower: (
+            offset: (-5.0, 4.5, 4.5),
+            center: ("npc.giant.male.torso_lower"),
+        )
+    ),
+    (Giant, Female): (
+        head: (
+            offset: (-9.0, -6.0, -6.5),
+            center: ("npc.giant.female.head"),
+        ),
+        torso_upper: (
+            offset: (-8.0, -4.5, -5.0),
+            center: ("npc.giant.female.torso_upper"),
+        ),
+        torso_lower: (
+            offset: (-5.0, 4.5, 4.5),
+            center: ("npc.giant.female.torso_lower"),
+        )
+    ),
+})

assets/voxygen/voxel/biped_large_lateral_manifest.ron

@@ -0,0 +1,70 @@
+({
+    (Giant, Male): (
+        shoulder_l: (
+            offset: (-5.0, -5.5, -4.0),
+            lateral: ("npc.giant.male.shoulder_l"),
+        ),
+        shoulder_r: (
+            offset: (-5.0, -5.5, -4.0),
+            lateral: ("npc.giant.male.shoulder_r"),
+        ),
+        hand_l: (
+            offset: (-3.0, -2.5, -3.0),
+            lateral: ("npc.giant.male.hand_l"),
+        ),
+        hand_r: (
+            offset: (-3.0, -2.5, -3.0),
+            lateral: ("npc.giant.male.hand_r"),
+        ),
+        leg_l: (
+            offset: (-3.0, -3.5, -2.0),
+            lateral: ("npc.giant.male.leg_l"),
+        ),
+        leg_r: (
+            offset: (-3.0, -3.5, -2.0),
+            lateral: ("npc.giant.male.leg_r"),
+        ),
+        foot_l: (
+            offset: (-3.0, -5.5, -2.5),
+            lateral: ("npc.giant.male.foot_l"),
+        ),
+        foot_r: (
+            offset: (-3.0, -5.5, -2.5),
+            lateral: ("npc.giant.male.foot_r"),
+        )
+    ),
+    (Giant, Female): (
+        shoulder_l: (
+            offset: (-5.0, -5.5, -4.0),
+            lateral: ("npc.giant.female.shoulder_l"),
+        ),
+        shoulder_r: (
+            offset: (-5.0, -5.5, -4.0),
+            lateral: ("npc.giant.female.shoulder_r"),
+        ),
+        hand_l: (
+            offset: (-3.0, -2.5, -3.0),
+            lateral: ("npc.giant.female.hand_l"),
+        ),
+        hand_r: (
+            offset: (-3.0, -2.5, -3.0),
+            lateral: ("npc.giant.female.hand_r"),
+        ),
+        leg_l: (
+            offset: (-3.0, -3.5, -2.0),
+            lateral: ("npc.giant.female.leg_l"),
+        ),
+        leg_r: (
+            offset: (-3.0, -3.5, -2.0),
+            lateral: ("npc.giant.female.leg_r"),
+        ),
+        foot_l: (
+            offset: (-3.0, -5.5, -2.5),
+            lateral: ("npc.giant.female.foot_l"),
+        ),
+        foot_r: (
+            offset: (-3.0, -5.5, -2.5),
+            lateral: ("npc.giant.female.foot_r"),
+        )
+    ),
+})

assets/voxygen/voxel/bird_medium_center_manifest.ron

@@ -0,0 +1,114 @@
+({
+    (Duck, Male): (
+        head: (
+            offset: (-1.5, -2.0, -1.5),
+            center: ("npc.duck.male.head"),
+        ),
+        torso: (
+            offset: (-2.5, -3.0, -2.0),
+            center: ("npc.duck.male.torso"),
+        ),
+        tail: (
+            offset: (-1.5, -0.5, -2.5),
+            center: ("npc.duck.male.tail"),
+        )
+    ),
+    (Duck, Female): (
+        head: (
+            offset: (-1.5, -2.0, -1.5),
+            center: ("npc.duck.female.head"),
+        ),
+        torso: (
+            offset: (-2.5, -3.0, -2.0),
+            center: ("npc.duck.female.torso"),
+        ),
+        tail: (
+            offset: (-1.5, -0.5, -2.5),
+            center: ("npc.duck.female.tail"),
+        )
+    ),
+    (Chicken, Male): (
+        head: (
+            offset: (-1.5, -2.0, -3.5),
+            center: ("npc.chicken.male.head"),
+        ),
+        torso: (
+            offset: (-2.5, -3.0, -2.0),
+            center: ("npc.chicken.male.torso"),
+        ),
+        tail: (
+            offset: (-1.5, -1.5, -3.5),
+            center: ("npc.chicken.male.tail"),
+        )
+    ),
+    (Chicken, Female): (
+        head: (
+            offset: (-1.5, -2.0, -2.5),
+            center: ("npc.chicken.female.head"),
+        ),
+        torso: (
+            offset: (-2.5, -3.0, -2.0),
+            center: ("npc.chicken.female.torso"),
+        ),
+        tail: (
+            offset: (-1.5, -0.5, -2.5),
+            center: ("npc.chicken.female.tail"),
+        )
+    ),
+    (Goose, Male): (
+        head: (
+            offset: (-2.0, -3.5, -2.5),
+            center: ("npc.goose.male.head"),
+        ),
+        torso: (
+            offset: (-3.5, -4.5, -3.0),
+            center: ("npc.goose.male.torso"),
+        ),
+        tail: (
+            offset: (-2.0, -1.0, -3.5),
+            center: ("npc.goose.male.tail"),
+        )
+    ),
+    (Goose, Female): (
+        head: (
+            offset: (-2.0, -3.5, -2.5),
+            center: ("npc.goose.female.head"),
+        ),
+        torso: (
+            offset: (-3.5, -4.5, -3.0),
+            center: ("npc.goose.female.torso"),
+        ),
+        tail: (
+            offset: (-2.0, -1.0, -3.5),
+            center: ("npc.goose.female.tail"),
+        )
+    ),
+    (Peacock, Male): (
+        head: (
+            offset: (-2.0, -3.5, -3.0),
+            center: ("npc.peacock.male.head"),
+        ),
+        torso: (
+            offset: (-2.5, -5.5, -4.5),
+            center: ("npc.peacock.male.torso"),
+        ),
+        tail: (
+            offset: (-3.0, -1.5, -5.0),
+            center: ("npc.peacock.male.tail"),
+        )
+    ),
+    (Peacock, Female): (
+        head: (
+            offset: (-2.0, -3.5, -3.5),
+            center: ("npc.peacock.female.head"),
+        ),
+        torso: (
+            offset: (-2.5, -5.5, -4.5),
+            center: ("npc.peacock.female.torso"),
+        ),
+        tail: (
+            offset: (-3.0, -1.5, -5.0),
+            center: ("npc.peacock.female.tail"),
+        )
+    ),
+})

assets/voxygen/voxel/bird_medium_lateral_manifest.ron

@@ -0,0 +1,146 @@
+({
+    (Duck, Male): (
+        wing_l: (
+            offset: (-0.5, -2.5, -1.5),
+            lateral: ("npc.duck.male.wing"),
+        ),
+        wing_r: (
+            offset: (-0.5, -2.5, -1.5),
+            lateral: ("npc.duck.male.wing"),
+        ),
+        foot_l: (
+            offset: (-1.0, -1.5, -3.5),
+            lateral: ("npc.duck.male.leg_l"),
+        ),
+        foot_r: (
+            offset: (-1.0, -1.5, -3.5),
+            lateral: ("npc.duck.male.leg_r"),
+        )
+    ),
+    (Duck, Female): (
+        wing_l: (
+            offset: (-0.5, -2.5, -1.5),
+            lateral: ("npc.duck.female.wing"),
+        ),
+        wing_r: (
+            offset: (-0.5, -2.5, -1.5),
+            lateral: ("npc.duck.female.wing"),
+        ),
+        foot_l: (
+            offset: (-1.0, -1.5, -3.5),
+            lateral: ("npc.duck.female.leg_l"),
+        ),
+        foot_r: (
+            offset: (-1.0, -1.5, -3.5),
+            lateral: ("npc.duck.female.leg_r"),
+        )
+    ),
+    (Chicken, Male): (
+        wing_l: (
+            offset: (-0.5, -2.5, -1.5),
+            lateral: ("npc.chicken.male.wing"),
+        ),
+        wing_r: (
+            offset: (-0.5, -2.5, -1.5),
+            lateral: ("npc.chicken.male.wing"),
+        ),
+        foot_l: (
+            offset: (-1.0, -1.5, -1.5),
+            lateral: ("npc.chicken.male.leg_l"),
+        ),
+        foot_r: (
+            offset: (-1.0, -1.5, -1.5),
+            lateral: ("npc.chicken.male.leg_r"),
+        )
+    ),
+    (Chicken, Female): (
+        wing_l: (
+            offset: (-0.5, -2.5, -1.5),
+            lateral: ("npc.chicken.female.wing"),
+        ),
+        wing_r: (
+            offset: (-0.5, -2.5, -1.5),
+            lateral: ("npc.chicken.female.wing"),
+        ),
+        foot_l: (
+            offset: (-1.0, -1.5, -1.5),
+            lateral: ("npc.chicken.female.leg_l"),
+        ),
+        foot_r: (
+            offset: (-1.0, -1.5, -1.5),
+            lateral: ("npc.chicken.female.leg_r"),
+        )
+    ),
+    (Goose, Male): (
+        wing_l: (
+            offset: (-0.5, -2.5, -1.5),
+            lateral: ("npc.goose.male.wing"),
+        ),
+        wing_r: (
+            offset: (-0.5, -2.5, -1.5),
+            lateral: ("npc.goose.male.wing"),
+        ),
+        foot_l: (
+            offset: (-1.0, -1.5, -1.5),
+            lateral: ("npc.goose.male.leg_l"),
+        ),
+        foot_r: (
+            offset: (-1.0, -1.5, -1.5),
+            lateral: ("npc.goose.male.leg_r"),
+        )
+    ),
+    (Goose, Female): (
+        wing_l: (
+            offset: (-0.5, -2.5, -1.5),
+            lateral: ("npc.goose.female.wing"),
+        ),
+        wing_r: (
+            offset: (-0.5, -2.5, -1.5),
+            lateral: ("npc.goose.female.wing"),
+        ),
+        foot_l: (
+            offset: (-1.0, -1.5, -1.5),
+            lateral: ("npc.goose.female.leg_l"),
+        ),
+        foot_r: (
+            offset: (-1.0, -1.5, -1.5),
+            lateral: ("npc.goose.female.leg_r"),
+        )
+    ),
+    (Peacock, Male): (
+        wing_l: (
+            offset: (-1.0, -3.5, -2.5),
+            lateral: ("npc.peacock.male.wing_l"),
+        ),
+        wing_r: (
+            offset: (-1.0, -3.5, -2.5),
+            lateral: ("npc.peacock.male.wing_r"),
+        ),
+        foot_l: (
+            offset: (-1.0, -1.5, -3.5),
+            lateral: ("npc.peacock.male.leg_l"),
+        ),
+        foot_r: (
+            offset: (-1.0, -1.5, -3.5),
+            lateral: ("npc.peacock.male.leg_r"),
+        )
+    ),
+    (Peacock, Female): (
+        wing_l: (
+            offset: (-1.0, -3.5, -2.5),
+            lateral: ("npc.peacock.female.wing_l"),
+        ),
+        wing_r: (
+            offset: (-1.0, -3.5, -2.5),
+            lateral: ("npc.peacock.female.wing_r"),
+        ),
+        foot_l: (
+            offset: (-1.0, -1.5, -3.5),
+            lateral: ("npc.peacock.female.leg_l"),
+        ),
+        foot_r: (
+            offset: (-1.0, -1.5, -3.5),
+            lateral: ("npc.peacock.female.leg_r"),
+        )
+    ),
+})

assets/voxygen/voxel/critter_center_manifest.ron

@@ -0,0 +1,266 @@
+({
+    (Rat, Male): (
+        head: (
+            offset: (-4.5, -4.0, -4.0),
+            center: ("npc.rat.male.head"),
+        ),
+        chest: (
+            offset: (-4.5, -6.0, -4.0),
+            center: ("npc.rat.male.chest"),
+        ),
+        feet_f: (
+            offset: (-4.0, -1.5, -1.0),
+            center: ("npc.rat.male.feet_f"),
+        ),
+        feet_b: (
+            offset: (-4.0, -1.5, -1.0),
+            center: ("npc.rat.male.feet_b"),
+        ),
+        tail: (
+            offset: (-0.5, -4.0, -1.5),
+            center: ("npc.rat.male.tail"),
+        ),
+    ),
+    (Rat, Female): (
+        head: (
+            offset: (-4.5, -4.0, -4.0),
+            center: ("npc.rat.female.head"),
+        ),
+        chest: (
+            offset: (-4.5, -6.0, -4.0),
+            center: ("npc.rat.female.chest"),
+        ),
+        feet_f: (
+            offset: (-4.0, -1.5, -1.0),
+            center: ("npc.rat.female.feet_f"),
+        ),
+        feet_b: (
+            offset: (-4.0, -1.5, -1.0),
+            center: ("npc.rat.female.feet_b"),
+        ),
+        tail: (
+            offset: (-0.5, -4.0, -1.5),
+            center: ("npc.rat.female.tail"),
+        ),
+    ),
+    (Axolotl, Male): (
+        head: (
+            offset: (-3.5, -4.0, -2.0),
+            center: ("npc.axolotl.male.head"),
+        ),
+        chest: (
+            offset: (-2.5, -4.0, -1.5),
+            center: ("npc.axolotl.male.chest"),
+        ),
+        feet_f: (
+            offset: (-3.0, -0.5, -1.0),
+            center: ("npc.axolotl.male.feet_f"),
+        ),
+        feet_b: (
+            offset: (-3.0, -0.5, -1.0),
+            center: ("npc.axolotl.male.feet_b"),
+        ),
+        tail: (
+            offset: (-1.5, -2.5, -1.5),
+            center: ("npc.axolotl.male.tail"),
+        ),
+    ),
+    (Axolotl, Female): (
+        head: (
+            offset: (-3.5, -4.0, -2.0),
+            center: ("npc.axolotl.female.head"),
+        ),
+        chest: (
+            offset: (-2.5, -4.0, -1.5),
+            center: ("npc.axolotl.female.chest"),
+        ),
+        feet_f: (
+            offset: (-3.0, -0.5, -1.0),
+            center: ("npc.axolotl.female.feet_f"),
+        ),
+        feet_b: (
+            offset: (-3.0, -0.5, -1.0),
+            center: ("npc.axolotl.female.feet_b"),
+        ),
+        tail: (
+            offset: (-1.5, -2.5, -1.5),
+            center: ("npc.axolotl.female.tail"),
+        ),
+    ),
+    (Gecko, Male): (
+        head: (
+            offset: (-2.5, -3.0, -2.0),
+            center: ("npc.gecko.male.head"),
+        ),
+        chest: (
+            offset: (-1.5, -4.0, -2.0),
+            center: ("npc.gecko.male.chest"),
+        ),
+        feet_f: (
+            offset: (-2.0, -0.5, -1.0),
+            center: ("npc.gecko.male.feet_f"),
+        ),
+        feet_b: (
+            offset: (-2.0, -0.5, -1.0),
+            center: ("npc.gecko.male.feet_b"),
+        ),
+        tail: (
+            offset: (-0.5, -2.5, -1.0),
+            center: ("npc.gecko.male.tail"),
+        ),
+    ),
+    (Gecko, Female): (
+        head: (
+            offset: (-2.5, -3.0, -2.0),
+            center: ("npc.gecko.female.head"),
+        ),
+        chest: (
+            offset: (-1.5, -4.0, -1.5),
+            center: ("npc.gecko.female.chest"),
+        ),
+        feet_f: (
+            offset: (-2.0, -0.5, -1.0),
+            center: ("npc.gecko.female.feet_f"),
+        ),
+        feet_b: (
+            offset: (-2.0, -0.5, -1.0),
+            center: ("npc.gecko.female.feet_b"),
+        ),
+        tail: (
+            offset: (-0.5, -2.5, -1.0),
+            center: ("npc.gecko.female.tail"),
+        ),
+    ),
+    (Turtle, Male): (
+        head: (
+            offset: (-2.5, -2.5, -2.5),
+            center: ("npc.turtle.male.head"),
+        ),
+        chest: (
+            offset: (-6.0, -6.0, -4.0),
+            center: ("npc.turtle.male.chest"),
+        ),
+        feet_f: (
+            offset: (-5.0, -0.5, -1.0),
+            center: ("npc.turtle.male.feet_f"),
+        ),
+        feet_b: (
+            offset: (-5.0, -0.5, -1.0),
+            center: ("npc.turtle.male.feet_b"),
+        ),
+        tail: (
+            offset: (-0.5, -2.0, -1.0),
+            center: ("npc.turtle.male.tail"),
+        ),
+    ),
+    (Turtle, Female): (
+        head: (
+            offset: (-2.5, -2.5, -2.5),
+            center: ("npc.turtle.female.head"),
+        ),
+        chest: (
+            offset: (-6.0, -6.0, -4.0),
+            center: ("npc.turtle.female.chest"),
+        ),
+        feet_f: (
+            offset: (-5.0, -0.5, -1.0),
+            center: ("npc.turtle.female.feet_f"),
+        ),
+        feet_b: (
+            offset: (-5.0, -0.5, -1.0),
+            center: ("npc.turtle.female.feet_b"),
+        ),
+        tail: (
+            offset: (-0.5, -2.0, -1.0),
+            center: ("npc.turtle.female.tail"),
+        ),
+    ),
+    (Squirrel, Male): (
+        head: (
+            offset: (-1.5, -2.0, -2.0),
+            center: ("npc.squirrel.male.head"),
+        ),
+        chest: (
+            offset: (-1.5, -3.0, -1.5),
+            center: ("npc.squirrel.male.chest"),
+        ),
+        feet_f: (
+            offset: (-2.0, -0.5, -1.0),
+            center: ("npc.squirrel.male.feet_f"),
+        ),
+        feet_b: (
+            offset: (-2.0, -0.5, -1.0),
+            center: ("npc.squirrel.male.feet_b"),
+        ),
+        tail: (
+            offset: (-1.5, -1.5, -3.0),
+            center: ("npc.squirrel.male.tail"),
+        ),
+    ),
+    (Squirrel, Female): (
+        head: (
+            offset: (-1.5, -2.0, -2.0),
+            center: ("npc.squirrel.female.head"),
+        ),
+        chest: (
+            offset: (-1.5, -3.0, -1.5),
+            center: ("npc.squirrel.female.chest"),
+        ),
+        feet_f: (
+            offset: (-2.0, -0.5, -1.0),
+            center: ("npc.squirrel.female.feet_f"),
+        ),
+        feet_b: (
+            offset: (-2.0, -0.5, -1.0),
+            center: ("npc.squirrel.female.feet_b"),
+        ),
+        tail: (
+            offset: (-1.5, -1.5, -3.0),
+            center: ("npc.squirrel.female.tail"),
+        ),
+    ),
+    (Fungome, Male): (
+        head: (
+            offset: (-2.5, -1.5, -2.0),
+            center: ("npc.fungome.male.head"),
+        ),
+        chest: (
+            offset: (-6.0, -6.0, -4.0),
+            center: ("npc.fungome.male.chest"),
+        ),
+        feet_f: (
+            offset: (-3.0, -0.5, -1.0),
+            center: ("npc.fungome.male.feet_f"),
+        ),
+        feet_b: (
+            offset: (-3.0, -0.5, -1.0),
+            center: ("npc.fungome.male.feet_b"),
+        ),
+        tail: (
+            offset: (-1.0, -0.5, -1.0),
+            center: ("npc.fungome.male.tail"),
+        ),
+    ),
+    (Fungome, Female): (
+        head: (
+            offset: (-2.5, -1.5, -2.0),
+            center: ("npc.fungome.female.head"),
+        ),
+        chest: (
+            offset: (-6.0, -6.0, -4.0),
+            center: ("npc.fungome.female.chest"),
+        ),
+        feet_f: (
+            offset: (-3.0, -0.5, -1.0),
+            center: ("npc.fungome.female.feet_f"),
+        ),
+        feet_b: (
+            offset: (-3.0, -0.5, -1.0),
+            center: ("npc.fungome.female.feet_b"),
+        ),
+        tail: (
+            offset: (-1.0, -0.5, -1.0),
+            center: ("npc.fungome.female.tail"),
+        ),
+    ),
+})