Rename Saurok, various anim fixes

assets/common/items/npc_weapons/bow/saurok_bow.ron

@@ -1,13 +1,14 @@
 ItemDef(
-    name: "Lizardman bow",
+    name: "Saurok bow",
     description: "Placeholder",
     kind: Tool(
         (
-            kind: Bow("LizardmanBow"),
+            kind: Bow("SaurokBow"),
             stats: (
                 equip_time_millis: 500,
                 power: 1.00,
             ),
         )
     ),
+    quality: Low,
 )

assets/common/items/npc_weapons/hammer/cyclops_hammer.ron

@@ -10,4 +10,5 @@ ItemDef(
             ),
         )
     ),
+    quality: Low,
 )

assets/common/items/npc_weapons/hammer/ogre_hammer.ron

@@ -10,4 +10,5 @@ ItemDef(
             ),
         )
     ),
+    quality: Low,
 )

assets/common/items/npc_weapons/hammer/troll_hammer.ron

@@ -10,4 +10,5 @@ ItemDef(
             ),
         )
     ),
+    quality: Low,
 )

assets/common/items/npc_weapons/hammer/wendigo_hammer.ron

@@ -10,4 +10,5 @@ ItemDef(
             ),
         )
     ),
+    quality: Low,
 )

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

@@ -10,4 +10,5 @@ ItemDef(
             ),
         )
     ),
+    quality: Low,
 )

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

@@ -1,13 +1,14 @@
 ItemDef(
-    name: "Lizardman Staff",
+    name: "Saurok Staff",
     description: "Placeholder",
     kind: Tool(
         (
-            kind: Staff("LizardmanStaff"),
+            kind: Staff("SaurokStaff"),
             stats: (
                 equip_time_millis: 500,
                 power: 1.00,
             ),
         )
     ),
+    quality: Low,
 )

assets/common/items/npc_weapons/sword/dullahan_sword.ron

@@ -10,4 +10,5 @@ ItemDef(
             ),
         )
     ),
+    quality: Low,
 )

assets/common/items/npc_weapons/sword/saurok_sword.ron

@@ -1,13 +1,14 @@
 ItemDef(
-    name: "Lizardman Sword",
+    name: "Saurok Sword",
     description: "Placehoder",
     kind: Tool(
         (
-            kind: Sword("LizardmanSword"),    
+            kind: Sword("SaurokSword"),    
             stats: (
                 equip_time_millis: 500,
                 power: 1.00,
             ),
         )
     ),
+    quality: Low,
 )

assets/common/npc_names.json

@@ -578,17 +578,17 @@
                 "keyword": "werewolf",
                 "generic": "Werewolf"
             },
-            "lizardman_occult": {
-                "keyword": "lizardman_occult",
-                "generic": "Occult Lizardman"
+            "saurok_occult": {
+                "keyword": "saurok_occult",
+                "generic": "Occult Saurok"
             },
-            "lizardman_mighty": {
-                "keyword": "lizardman_mighty",
-                "generic": "Mighty Lizardman"
+            "saurok_mighty": {
+                "keyword": "saurok_mighty",
+                "generic": "Mighty Saurok"
             },
-            "lizardman_sly": {
-                "keyword": "lizardman_sly",
-                "generic": "Sly Lizardman"
+            "saurok_sly": {
+                "keyword": "saurok_sly",
+                "generic": "Sly Saurok"
             }
         }
     },

assets/voxygen/voxel/biped_large_central_manifest.ron

@@ -359,26 +359,26 @@
             central: ("armor.empty"),
         )
     ),
-    (Occultlizardman, Male): (
+    (Occultsaurok, Male): (
         head: (
             offset: (-3.0, 0.0, -4.5),
-            central: ("npc.lizardman_occult.male.head"),
+            central: ("npc.saurok_occult.male.head"),
         ),
         torso_upper: (
             offset: (-5.0, -6.5, -7.0),
-            central: ("npc.lizardman_occult.male.torso_upper"),
+            central: ("npc.saurok_occult.male.torso_upper"),
         ),
         torso_lower: (
             offset: (-6.0, -5.5, -8.0),
-            central: ("npc.lizardman_occult.male.torso_lower"),
+            central: ("npc.saurok_occult.male.torso_lower"),
         ),
         jaw: (
             offset: (-2.0, 0.0, -2.0),
-            central: ("npc.lizardman_occult.male.jaw"),
+            central: ("npc.saurok_occult.male.jaw"),
         ),
         tail: (
             offset: (-2.0, -16.0, -1.0),
-            central: ("npc.lizardman_occult.male.tail"),
+            central: ("npc.saurok_occult.male.tail"),
         ),
         second: (
             offset: (0.0, 0.0, 0.0),
@@ -386,29 +386,29 @@
         ),
         main: (
             offset: (-3.5, -3.0, -5.0),
-            central: ("weapon.staff.firestaff_lizardman"),
+            central: ("weapon.staff.firestaff_saurok"),
         )
     ),
-    (Occultlizardman, Female): (
+    (Occultsaurok, Female): (
         head: (
             offset: (-3.0, 0.0, -4.5),
-            central: ("npc.lizardman_occult.female.head"),
+            central: ("npc.saurok_occult.female.head"),
         ),
         torso_upper: (
             offset: (-5.0, -6.5, -7.0),
-            central: ("npc.lizardman_occult.female.torso_upper"),
+            central: ("npc.saurok_occult.female.torso_upper"),
         ),
         torso_lower: (
             offset: (-6.0, -5.5, -8.0),
-            central: ("npc.lizardman_occult.female.torso_lower"),
+            central: ("npc.saurok_occult.female.torso_lower"),
         ),
         jaw: (
             offset: (-2.0, 0.0, -2.0),
-            central: ("npc.lizardman_occult.female.jaw"),
+            central: ("npc.saurok_occult.female.jaw"),
         ),
         tail: (
             offset: (-2.0, -16.0, -1.0),
-            central: ("npc.lizardman_occult.female.tail"),
+            central: ("npc.saurok_occult.female.tail"),
         ),
         second: (
             offset: (0.0, 0.0, 0.0),
@@ -416,29 +416,29 @@
         ),
         main: (
             offset: (-3.5, -3.0, -5.0),
-            central: ("weapon.staff.firestaff_lizardman"),
+            central: ("weapon.staff.firestaff_saurok"),
         )
     ),
-    (Mightylizardman, Male): (
+    (Mightysaurok, Male): (
         head: (
             offset: (-3.0, 0.0, -4.5),
-            central: ("npc.lizardman_mighty.male.head"),
+            central: ("npc.saurok_mighty.male.head"),
         ),
         torso_upper: (
             offset: (-5.0, -6.5, -7.0),
-            central: ("npc.lizardman_mighty.male.torso_upper"),
+            central: ("npc.saurok_mighty.male.torso_upper"),
         ),
         torso_lower: (
             offset: (-6.0, -5.5, -8.0),
-            central: ("npc.lizardman_mighty.male.torso_lower"),
+            central: ("npc.saurok_mighty.male.torso_lower"),
         ),
         jaw: (
             offset: (-2.0, 0.0, -2.0),
-            central: ("npc.lizardman_mighty.male.jaw"),
+            central: ("npc.saurok_mighty.male.jaw"),
         ),
         tail: (
             offset: (-2.0, -16.0, -1.0),
-            central: ("npc.lizardman_mighty.male.tail"),
+            central: ("npc.saurok_mighty.male.tail"),
         ),
         second: (
             offset: (0.0, 0.0, 0.0),
@@ -446,29 +446,29 @@
         ),
         main: (
             offset: (-1.5, -3.0, -5.0),
-            central: ("weapon.sword.long_2h_lizardman"),
+            central: ("weapon.sword.long_2h_saurok"),
         )
     ),
-    (Mightylizardman, Female): (
+    (Mightysaurok, Female): (
         head: (
             offset: (-3.0, 0.0, -4.5),
-            central: ("npc.lizardman_mighty.female.head"),
+            central: ("npc.saurok_mighty.female.head"),
         ),
         torso_upper: (
             offset: (-5.0, -6.5, -7.0),
-            central: ("npc.lizardman_mighty.female.torso_upper"),
+            central: ("npc.saurok_mighty.female.torso_upper"),
         ),
         torso_lower: (
             offset: (-6.0, -5.5, -8.0),
-            central: ("npc.lizardman_mighty.female.torso_lower"),
+            central: ("npc.saurok_mighty.female.torso_lower"),
         ),
         jaw: (
             offset: (-2.0, 0.0, -2.0),
-            central: ("npc.lizardman_mighty.female.jaw"),
+            central: ("npc.saurok_mighty.female.jaw"),
         ),
         tail: (
             offset: (-2.0, -16.0, -1.0),
-            central: ("npc.lizardman_mighty.female.tail"),
+            central: ("npc.saurok_mighty.female.tail"),
         ),
         second: (
             offset: (0.0, 0.0, 0.0),
@@ -476,29 +476,29 @@
         ),
         main: (
             offset: (-1.5, -3.0, -5.0),
-            central: ("weapon.sword.long_2h_lizardman"),
+            central: ("weapon.sword.long_2h_saurok"),
         )
     ),
-    (Slylizardman, Male): (
+    (Slysaurok, Male): (
         head: (
             offset: (-3.0, 0.0, -4.5),
-            central: ("npc.lizardman_sly.male.head"),
+            central: ("npc.saurok_sly.male.head"),
         ),
         torso_upper: (
             offset: (-5.0, -6.5, -7.0),
-            central: ("npc.lizardman_sly.male.torso_upper"),
+            central: ("npc.saurok_sly.male.torso_upper"),
         ),
         torso_lower: (
             offset: (-6.0, -5.5, -8.0),
-            central: ("npc.lizardman_sly.male.torso_lower"),
+            central: ("npc.saurok_sly.male.torso_lower"),
         ),
         jaw: (
             offset: (-2.0, 0.0, -2.0),
-            central: ("npc.lizardman_sly.male.jaw"),
+            central: ("npc.saurok_sly.male.jaw"),
         ),
         tail: (
             offset: (-2.0, -16.0, -1.0),
-            central: ("npc.lizardman_sly.male.tail"),
+            central: ("npc.saurok_sly.male.tail"),
         ),
         second: (
             offset: (0.0, 0.0, 0.0),
@@ -506,29 +506,29 @@
         ),
         main: (
             offset: (-2.5, -4.0, -7.0),
-            central: ("weapon.bow.longbow_lizardman"),
+            central: ("weapon.bow.longbow_saurok"),
         )
     ),
-    (Slylizardman, Female): (
+    (Slysaurok, Female): (
         head: (
             offset: (-3.0, 0.0, -4.5),
-            central: ("npc.lizardman_sly.female.head"),
+            central: ("npc.saurok_sly.female.head"),
         ),
         torso_upper: (
             offset: (-5.0, -6.5, -7.0),
-            central: ("npc.lizardman_sly.female.torso_upper"),
+            central: ("npc.saurok_sly.female.torso_upper"),
         ),
         torso_lower: (
             offset: (-6.0, -5.5, -8.0),
-            central: ("npc.lizardman_sly.female.torso_lower"),
+            central: ("npc.saurok_sly.female.torso_lower"),
         ),
         jaw: (
             offset: (-2.0, 0.0, -2.0),
-            central: ("npc.lizardman_sly.female.jaw"),
+            central: ("npc.saurok_sly.female.jaw"),
         ),
         tail: (
             offset: (-2.0, -16.0, -1.0),
-            central: ("npc.lizardman_sly.female.tail"),
+            central: ("npc.saurok_sly.female.tail"),
         ),
         second: (
             offset: (0.0, 0.0, 0.0),
@@ -536,7 +536,7 @@
         ),
         main: (
             offset: (-2.5, -4.0, -7.0),
-            central: ("weapon.bow.longbow_lizardman"),
+            central: ("weapon.bow.longbow_saurok"),
         )
     ),
 })

assets/voxygen/voxel/biped_large_lateral_manifest.ron

@@ -407,208 +407,208 @@
             lateral: ("npc.werewolf.male.foot_r"),
         ),
     ),
-    (Occultlizardman, Male): (
+    (Occultsaurok, Male): (
         shoulder_l: (
             offset: (-3.5, -3.5, -4.5),
-            lateral: ("npc.lizardman_occult.male.shoulder_l"),
+            lateral: ("npc.saurok_occult.male.shoulder_l"),
         ),
         shoulder_r: (
             offset: (-3.5, -3.5, -4.5),
-            lateral: ("npc.lizardman_occult.male.shoulder_r"),
+            lateral: ("npc.saurok_occult.male.shoulder_r"),
         ),
         hand_l: (
             offset: (-2.0, -2.0, -10.0),
-            lateral: ("npc.lizardman_occult.male.hand_l"),
+            lateral: ("npc.saurok_occult.male.hand_l"),
         ),
         hand_r: (
             offset: (-2.0, -2.0, -10.0),
-            lateral: ("npc.lizardman_occult.male.hand_r"),
+            lateral: ("npc.saurok_occult.male.hand_r"),
         ),
         leg_l: (
             offset: (-2.0, -3.0, -3.5),
-            lateral: ("npc.lizardman_occult.male.leg_l"),
+            lateral: ("npc.saurok_occult.male.leg_l"),
         ),
         leg_r: (
             offset: (-2.0, -3.0, -3.5),
-            lateral: ("npc.lizardman_occult.male.leg_r"),
+            lateral: ("npc.saurok_occult.male.leg_r"),
         ),
         foot_l: (
             offset: (-2.5, -4.5, -5.0),
-            lateral: ("npc.lizardman_occult.male.foot_l"),
+            lateral: ("npc.saurok_occult.male.foot_l"),
         ),
         foot_r: (
             offset: (-2.5, -4.5, -5.0),
-            lateral: ("npc.lizardman_occult.male.foot_r"),
+            lateral: ("npc.saurok_occult.male.foot_r"),
         ),
     ),
-    (Occultlizardman, Female): (
+    (Occultsaurok, Female): (
         shoulder_l: (
             offset: (-3.5, -3.5, -4.5),
-            lateral: ("npc.lizardman_occult.female.shoulder_l"),
+            lateral: ("npc.saurok_occult.female.shoulder_l"),
         ),
         shoulder_r: (
             offset: (-3.5, -3.5, -4.5),
-            lateral: ("npc.lizardman_occult.female.shoulder_r"),
+            lateral: ("npc.saurok_occult.female.shoulder_r"),
         ),
         hand_l: (
             offset: (-2.0, -2.0, -10.0),
-            lateral: ("npc.lizardman_occult.female.hand_l"),
+            lateral: ("npc.saurok_occult.female.hand_l"),
         ),
         hand_r: (
             offset: (-2.0, -2.0, -10.0),
-            lateral: ("npc.lizardman_occult.female.hand_r"),
+            lateral: ("npc.saurok_occult.female.hand_r"),
         ),
         leg_l: (
             offset: (-2.0, -3.0, -3.5),
-            lateral: ("npc.lizardman_occult.female.leg_l"),
+            lateral: ("npc.saurok_occult.female.leg_l"),
         ),
         leg_r: (
             offset: (-2.0, -3.0, -3.5),
-            lateral: ("npc.lizardman_occult.female.leg_r"),
+            lateral: ("npc.saurok_occult.female.leg_r"),
         ),
         foot_l: (
             offset: (-2.5, -4.5, -5.0),
-            lateral: ("npc.lizardman_occult.female.foot_l"),
+            lateral: ("npc.saurok_occult.female.foot_l"),
         ),
         foot_r: (
             offset: (-2.5, -4.5, -5.0),
-            lateral: ("npc.lizardman_occult.female.foot_r"),
+            lateral: ("npc.saurok_occult.female.foot_r"),
         ),
     ),
-    (Mightylizardman, Male): (
+    (Mightysaurok, Male): (
         shoulder_l: (
             offset: (-3.5, -3.5, -4.5),
-            lateral: ("npc.lizardman_mighty.male.shoulder_l"),
+            lateral: ("npc.saurok_mighty.male.shoulder_l"),
         ),
         shoulder_r: (
             offset: (-3.5, -3.5, -4.5),
-            lateral: ("npc.lizardman_mighty.male.shoulder_r"),
+            lateral: ("npc.saurok_mighty.male.shoulder_r"),
         ),
         hand_l: (
             offset: (-2.0, -2.0, -10.0),
-            lateral: ("npc.lizardman_mighty.male.hand_l"),
+            lateral: ("npc.saurok_mighty.male.hand_l"),
         ),
         hand_r: (
             offset: (-2.0, -2.0, -10.0),
-            lateral: ("npc.lizardman_mighty.male.hand_r"),
+            lateral: ("npc.saurok_mighty.male.hand_r"),
         ),
         leg_l: (
             offset: (-2.0, -3.0, -3.5),
-            lateral: ("npc.lizardman_mighty.male.leg_l"),
+            lateral: ("npc.saurok_mighty.male.leg_l"),
         ),
         leg_r: (
             offset: (-2.0, -3.0, -3.5),
-            lateral: ("npc.lizardman_mighty.male.leg_r"),
+            lateral: ("npc.saurok_mighty.male.leg_r"),
         ),
         foot_l: (
             offset: (-2.5, -4.5, -5.0),
-            lateral: ("npc.lizardman_mighty.male.foot_l"),
+            lateral: ("npc.saurok_mighty.male.foot_l"),
         ),
         foot_r: (
             offset: (-2.5, -4.5, -5.0),
-            lateral: ("npc.lizardman_mighty.male.foot_r"),
+            lateral: ("npc.saurok_mighty.male.foot_r"),
         ),
     ),
-    (Mightylizardman, Female): (
+    (Mightysaurok, Female): (
         shoulder_l: (
             offset: (-3.5, -3.5, -4.5),
-            lateral: ("npc.lizardman_mighty.female.shoulder_l"),
+            lateral: ("npc.saurok_mighty.female.shoulder_l"),
         ),
         shoulder_r: (
             offset: (-3.5, -3.5, -4.5),
-            lateral: ("npc.lizardman_mighty.female.shoulder_r"),
+            lateral: ("npc.saurok_mighty.female.shoulder_r"),
         ),
         hand_l: (
             offset: (-2.0, -2.0, -10.0),
-            lateral: ("npc.lizardman_mighty.female.hand_l"),
+            lateral: ("npc.saurok_mighty.female.hand_l"),
         ),
         hand_r: (
             offset: (-2.0, -2.0, -10.0),
-            lateral: ("npc.lizardman_mighty.female.hand_r"),
+            lateral: ("npc.saurok_mighty.female.hand_r"),
         ),
         leg_l: (
             offset: (-2.0, -3.0, -3.5),
-            lateral: ("npc.lizardman_mighty.female.leg_l"),
+            lateral: ("npc.saurok_mighty.female.leg_l"),
         ),
         leg_r: (
             offset: (-2.0, -3.0, -3.5),
-            lateral: ("npc.lizardman_mighty.female.leg_r"),
+            lateral: ("npc.saurok_mighty.female.leg_r"),
         ),
         foot_l: (
             offset: (-2.5, -4.5, -5.0),
-            lateral: ("npc.lizardman_mighty.female.foot_l"),
+            lateral: ("npc.saurok_mighty.female.foot_l"),
         ),
         foot_r: (
             offset: (-2.5, -4.5, -5.0),
-            lateral: ("npc.lizardman_mighty.female.foot_r"),
+            lateral: ("npc.saurok_mighty.female.foot_r"),
         ),
     ),
-    (Slylizardman, Male): (
+    (Slysaurok, Male): (
         shoulder_l: (
             offset: (-3.5, -3.5, -4.5),
-            lateral: ("npc.lizardman_sly.male.shoulder_l"),
+            lateral: ("npc.saurok_sly.male.shoulder_l"),
         ),
         shoulder_r: (
             offset: (-3.5, -3.5, -4.5),
-            lateral: ("npc.lizardman_sly.male.shoulder_r"),
+            lateral: ("npc.saurok_sly.male.shoulder_r"),
         ),
         hand_l: (
             offset: (-2.0, -2.0, -10.0),
-            lateral: ("npc.lizardman_sly.male.hand_l"),
+            lateral: ("npc.saurok_sly.male.hand_l"),
         ),
         hand_r: (
             offset: (-2.0, -2.0, -10.0),
-            lateral: ("npc.lizardman_sly.male.hand_r"),
+            lateral: ("npc.saurok_sly.male.hand_r"),
         ),
         leg_l: (
             offset: (-2.0, -3.0, -3.5),
-            lateral: ("npc.lizardman_sly.male.leg_l"),
+            lateral: ("npc.saurok_sly.male.leg_l"),
         ),
         leg_r: (
             offset: (-2.0, -3.0, -3.5),
-            lateral: ("npc.lizardman_sly.male.leg_r"),
+            lateral: ("npc.saurok_sly.male.leg_r"),
         ),
         foot_l: (
             offset: (-2.5, -4.5, -5.0),
-            lateral: ("npc.lizardman_sly.male.foot_l"),
+            lateral: ("npc.saurok_sly.male.foot_l"),
         ),
         foot_r: (
             offset: (-2.5, -4.5, -5.0),
-            lateral: ("npc.lizardman_sly.male.foot_r"),
+            lateral: ("npc.saurok_sly.male.foot_r"),
         ),
     ),
-    (Slylizardman, Female): (
+    (Slysaurok, Female): (
         shoulder_l: (
             offset: (-3.5, -3.5, -4.5),
-            lateral: ("npc.lizardman_sly.female.shoulder_l"),
+            lateral: ("npc.saurok_sly.female.shoulder_l"),
         ),
         shoulder_r: (
             offset: (-3.5, -3.5, -4.5),
-            lateral: ("npc.lizardman_sly.female.shoulder_r"),
+            lateral: ("npc.saurok_sly.female.shoulder_r"),
         ),
         hand_l: (
             offset: (-2.0, -2.0, -10.0),
-            lateral: ("npc.lizardman_sly.female.hand_l"),
+            lateral: ("npc.saurok_sly.female.hand_l"),
         ),
         hand_r: (
             offset: (-2.0, -2.0, -10.0),
-            lateral: ("npc.lizardman_sly.female.hand_r"),
+            lateral: ("npc.saurok_sly.female.hand_r"),
         ),
         leg_l: (
             offset: (-2.0, -3.0, -3.5),
-            lateral: ("npc.lizardman_sly.female.leg_l"),
+            lateral: ("npc.saurok_sly.female.leg_l"),
         ),
         leg_r: (
             offset: (-2.0, -3.0, -3.5),
-            lateral: ("npc.lizardman_sly.female.leg_r"),
+            lateral: ("npc.saurok_sly.female.leg_r"),
         ),
         foot_l: (
             offset: (-2.5, -4.5, -5.0),
-            lateral: ("npc.lizardman_sly.female.foot_l"),
+            lateral: ("npc.saurok_sly.female.foot_l"),
         ),
         foot_r: (
             offset: (-2.5, -4.5, -5.0),
-            lateral: ("npc.lizardman_sly.female.foot_r"),
+            lateral: ("npc.saurok_sly.female.foot_r"),
         ),
     ),
 })

common/src/comp/body/biped_large.rs

@@ -40,9 +40,9 @@ make_case_elim!(
         Troll = 3,
         Dullahan = 4,
         Werewolf = 5,
-        Occultlizardman = 6,
-        Mightylizardman = 7,
-        Slylizardman = 8,
+        Occultsaurok = 6,
+        Mightysaurok = 7,
+        Slysaurok = 8,
     }
 );
 
@@ -57,9 +57,9 @@ pub struct AllSpecies<SpeciesMeta> {
     pub troll: SpeciesMeta,
     pub dullahan: SpeciesMeta,
     pub werewolf: SpeciesMeta,
-    pub lizardman_occult: SpeciesMeta,
-    pub lizardman_mighty: SpeciesMeta,
-    pub lizardman_sly: SpeciesMeta,
+    pub saurok_occult: SpeciesMeta,
+    pub saurok_mighty: SpeciesMeta,
+    pub saurok_sly: SpeciesMeta,
 }
 
 impl<'a, SpeciesMeta> core::ops::Index<&'a Species> for AllSpecies<SpeciesMeta> {
@@ -74,9 +74,9 @@ impl<'a, SpeciesMeta> core::ops::Index<&'a Species> for AllSpecies<SpeciesMeta>
             Species::Troll => &self.troll,
             Species::Dullahan => &self.dullahan,
             Species::Werewolf => &self.werewolf,
-            Species::Occultlizardman => &self.lizardman_occult,
-            Species::Mightylizardman => &self.lizardman_mighty,
-            Species::Slylizardman => &self.lizardman_sly,
+            Species::Occultsaurok => &self.saurok_occult,
+            Species::Mightysaurok => &self.saurok_mighty,
+            Species::Slysaurok => &self.saurok_sly,
         }
     }
 }
@@ -88,9 +88,9 @@ pub const ALL_SPECIES: [Species; 9] = [
     Species::Troll,
     Species::Dullahan,
     Species::Werewolf,
-    Species::Occultlizardman,
-    Species::Mightylizardman,
-    Species::Slylizardman,
+    Species::Occultsaurok,
+    Species::Mightysaurok,
+    Species::Slysaurok,
 ];
 
 impl<'a, SpeciesMeta: 'a> IntoIterator for &'a AllSpecies<SpeciesMeta> {

common/src/loadout_builder.rs

@@ -82,19 +82,19 @@ impl LoadoutBuilder {
                 _ => {},
             },
             Body::BipedLarge(biped_large) => match (biped_large.species, biped_large.body_type) {
-                (biped_large::Species::Occultlizardman, _) => {
+                (biped_large::Species::Occultsaurok, _) => {
                     main_tool = Some(Item::new_from_asset_expect(
-                        "common.items.npc_weapons.staff.lizardman_staff",
+                        "common.items.npc_weapons.staff.saurok_staff",
                     ));
                 },
-                (biped_large::Species::Mightylizardman, _) => {
+                (biped_large::Species::Mightysaurok, _) => {
                     main_tool = Some(Item::new_from_asset_expect(
-                        "common.items.npc_weapons.sword.lizardman_sword",
+                        "common.items.npc_weapons.sword.saurok_sword",
                     ));
                 },
-                (biped_large::Species::Slylizardman, _) => {
+                (biped_large::Species::Slysaurok, _) => {
                     main_tool = Some(Item::new_from_asset_expect(
-                        "common.items.npc_weapons.bow.lizardman_bow",
+                        "common.items.npc_weapons.bow.saurok_bow",
                     ));
                 },
                 (biped_large::Species::Ogre, biped_large::BodyType::Male) => {

voxygen/src/anim/src/biped_large/alpha.rs

@@ -202,19 +202,19 @@ impl Animation for AlphaAnimation {
                     -skeleton_attr.foot.0,
                     slow * -3.0 + quick * 3.0 - 4.0,
                     skeleton_attr.foot.2,
-                ) / 8.0;
+                );
                 next.foot_l.orientation = Quaternion::rotation_x(slow * 0.6)
                     * Quaternion::rotation_y((slow * -0.2).max(0.0));
-                next.foot_l.scale = Vec3::one() / 8.0;
+                next.foot_l.scale = Vec3::one();
 
                 next.foot_r.position = Vec3::new(
                     skeleton_attr.foot.0,
                     slow * 3.0 + quick * -3.0 + 5.0,
                     skeleton_attr.foot.2,
-                ) / 8.0;
+                );
                 next.foot_r.orientation = Quaternion::rotation_x(slow * -0.6)
                     * Quaternion::rotation_y((slow * 0.2).min(0.0));
-                next.foot_r.scale = Vec3::one() / 8.0;
+                next.foot_r.scale = Vec3::one();
 
                 next.torso.position = Vec3::new(0.0, 0.0, 0.1) * 1.01;
                 next.torso.orientation = Quaternion::rotation_z(0.0)
@@ -328,19 +328,19 @@ impl Animation for AlphaAnimation {
                         -skeleton_attr.foot.0,
                         -2.5,
                         skeleton_attr.foot.2 + (slower * 2.5).max(0.0),
-                    ) / 8.0;
+                    );
                     next.foot_l.orientation = Quaternion::rotation_x(slower * -0.2 - 0.2)
                         * Quaternion::rotation_z((slower * 1.0).max(0.0));
-                    next.foot_l.scale = Vec3::one() / 8.0;
+                    next.foot_l.scale = Vec3::one();
 
                     next.foot_r.position = Vec3::new(
                         skeleton_attr.foot.0,
                         3.5 - slower * 2.0,
                         skeleton_attr.foot.2,
-                    ) / 8.0;
+                    );
                     next.foot_r.orientation = Quaternion::rotation_x(slower * 0.1)
                         * Quaternion::rotation_z((slower * 0.5).max(0.0));
-                    next.foot_r.scale = Vec3::one() / 8.0;
+                    next.foot_r.scale = Vec3::one();
                     next.torso.position = Vec3::new(0.0, 0.0, 0.1) * 1.01;
                     next.torso.orientation = Quaternion::rotation_z(0.0);
                     next.torso.scale = Vec3::one() / 8.0 * 1.01;

voxygen/src/anim/src/biped_large/charge.rs

@@ -202,17 +202,17 @@ impl Animation for ChargeAnimation {
                 -skeleton_attr.foot.0,
                 skeleton_attr.foot.1,
                 skeleton_attr.foot.2,
-            ) / 8.0;
+            );
             next.foot_l.orientation = Quaternion::rotation_z(0.0);
-            next.foot_l.scale = Vec3::one() / 8.0;
+            next.foot_l.scale = Vec3::one();
 
             next.foot_r.position = Vec3::new(
                 skeleton_attr.foot.0,
                 skeleton_attr.foot.1,
                 skeleton_attr.foot.2,
-            ) / 8.0;
+            );
             next.foot_r.orientation = Quaternion::rotation_z(0.0);
-            next.foot_r.scale = Vec3::one() / 8.0;
+            next.foot_r.scale = Vec3::one();
 
             next.torso.position = Vec3::new(0.0, 0.0, 0.0) / 8.0;
             next.torso.orientation = Quaternion::rotation_z(test * 0.0);
@@ -264,19 +264,19 @@ impl Animation for ChargeAnimation {
                 -skeleton_attr.foot.0,
                 4.0 + skeleton_attr.foot.1 + foothoril * 8.5,
                 skeleton_attr.foot.2 + ((footvertl * 6.5).max(0.0)),
-            ) / 8.0;
+            );
             next.foot_l.orientation =
                 Quaternion::rotation_x(-0.5 + footrotl * 0.85) * Quaternion::rotation_y(0.0);
-            next.foot_l.scale = Vec3::one() / 8.0;
+            next.foot_l.scale = Vec3::one();
 
             next.foot_r.position = Vec3::new(
                 skeleton_attr.foot.0,
                 4.0 + skeleton_attr.foot.1 + foothorir * 8.5,
                 skeleton_attr.foot.2 + ((footvertr * 6.5).max(0.0)),
-            ) / 8.0;
+            );
             next.foot_r.orientation =
                 Quaternion::rotation_x(-0.5 + footrotr * 0.85) * Quaternion::rotation_y(0.0);
-            next.foot_r.scale = Vec3::one() / 8.0;
+            next.foot_r.scale = Vec3::one();
         }
         match active_tool_kind {
             Some(ToolKind::Bow(_)) => {

voxygen/src/anim/src/biped_large/dash.rs

@@ -103,13 +103,13 @@ impl Animation for DashAnimation {
                                 -skeleton_attr.foot.0,
                                 skeleton_attr.foot.1 + movement * -12.0,
                                 skeleton_attr.foot.2,
-                            ) / 8.0;
+                            );
                             next.foot_l.orientation = Quaternion::rotation_x(movement * -1.0);
                             next.foot_r.position = Vec3::new(
                                 skeleton_attr.foot.0,
                                 skeleton_attr.foot.1,
                                 skeleton_attr.foot.2,
-                            ) / 8.0;
+                            );
                         },
                         StageSection::Charge => {
                             next.head.position = Vec3::new(
@@ -143,7 +143,7 @@ impl Animation for DashAnimation {
                                 2.0 - skeleton_attr.foot.0,
                                 skeleton_attr.foot.1 + foothoril * -7.5,
                                 2.0 + skeleton_attr.foot.2 + ((footvertl * -4.0).max(-1.0)),
-                            ) / 8.0;
+                            );
                             next.foot_l.orientation =
                                 Quaternion::rotation_x(-0.6 + footrotl * -0.6)
                                     * Quaternion::rotation_z(-0.2);
@@ -152,7 +152,7 @@ impl Animation for DashAnimation {
                                 2.0 + skeleton_attr.foot.0,
                                 skeleton_attr.foot.1 + foothorir * -7.5,
                                 2.0 + skeleton_attr.foot.2 + ((footvertr * -4.0).max(-1.0)),
-                            ) / 8.0;
+                            );
                             next.foot_r.orientation =
                                 Quaternion::rotation_x(-0.6 + footrotr * -0.6)
                                     * Quaternion::rotation_z(-0.2);

voxygen/src/anim/src/biped_large/jump.rs

@@ -130,17 +130,17 @@ impl Animation for JumpAnimation {
             -skeleton_attr.foot.0,
             -5.0 + skeleton_attr.foot.1,
             skeleton_attr.foot.2,
-        ) / 8.0;
+        );
         next.foot_l.orientation = Quaternion::rotation_z(0.0) * Quaternion::rotation_x(-0.4);
-        next.foot_l.scale = Vec3::one() / 8.0;
+        next.foot_l.scale = Vec3::one();
 
         next.foot_r.position = Vec3::new(
             skeleton_attr.foot.0,
             5.0 + skeleton_attr.foot.1,
             skeleton_attr.foot.2,
-        ) / 8.0;
+        );
         next.foot_r.orientation = Quaternion::rotation_z(0.0) * Quaternion::rotation_x(0.4);
-        next.foot_r.scale = Vec3::one() / 8.0;
+        next.foot_r.scale = Vec3::one();
 
         next.torso.position = Vec3::new(0.0, 0.0, 0.0) / 8.0;
         next.torso.orientation = Quaternion::rotation_z(0.0) * Quaternion::rotation_x(0.0);