From 8d5742776fadccc366f67aebc5e4baa5cb184bc6 Mon Sep 17 00:00:00 2001
From: Snowram <robin.gilh@gmail.com>
Date: Mon, 12 Oct 2020 02:33:46 +0200
Subject: [PATCH] Rename Saurok, various anim fixes
---
.../bow/{lizardman_bow.ron => saurok_bow.ron} | 5 +-
.../npc_weapons/hammer/cyclops_hammer.ron | 1 +
.../items/npc_weapons/hammer/ogre_hammer.ron | 1 +
.../items/npc_weapons/hammer/troll_hammer.ron | 1 +
.../npc_weapons/hammer/wendigo_hammer.ron | 1 +
.../items/npc_weapons/staff/ogre_staff.ron | 1 +
.../{lizardman_staff.ron => saurok_staff.ron} | 5 +-
.../npc_weapons/sword/dullahan_sword.ron | 1 +
.../{lizardman_sword.ron => saurok_sword.ron} | 5 +-
assets/common/npc_names.json | 18 +--
.../voxel/biped_large_central_manifest.ron | 84 +++++++-------
.../voxel/biped_large_lateral_manifest.ron | 108 +++++++++---------
.../female/foot_l.vox | Bin
.../female/foot_r.vox | Bin
.../female/hand_l.vox | Bin
.../female/hand_r.vox | Bin
.../female/head.vox | Bin
.../female/jaw.vox | Bin
.../female/leg_l.vox | Bin
.../female/leg_r.vox | Bin
.../female/shoulder_l.vox | Bin
.../female/shoulder_r.vox | Bin
.../female/tail.vox | Bin
.../female/torso_lower.vox | Bin
.../female/torso_upper.vox | Bin
.../male/foot_l.vox | Bin
.../male/foot_r.vox | Bin
.../male/hand_l.vox | Bin
.../male/hand_r.vox | Bin
.../male/head.vox | Bin
.../male/jaw.vox | Bin
.../male/leg_l.vox | Bin
.../male/leg_r.vox | Bin
.../male/shoulder_l.vox | Bin
.../male/shoulder_r.vox | Bin
.../male/tail.vox | Bin
.../male/torso_lower.vox | Bin
.../male/torso_upper.vox | Bin
.../female/foot_l.vox | Bin
.../female/foot_r.vox | Bin
.../female/hand_l.vox | Bin
.../female/hand_r.vox | Bin
.../female/head.vox | Bin
.../female/jaw.vox | Bin
.../female/leg_l.vox | Bin
.../female/leg_r.vox | Bin
.../female/shoulder_l.vox | Bin
.../female/shoulder_r.vox | Bin
.../female/tail.vox | Bin
.../female/torso_lower.vox | Bin
.../female/torso_upper.vox | Bin
.../male/foot_l.vox | Bin
.../male/foot_r.vox | Bin
.../male/hand_l.vox | Bin
.../male/hand_r.vox | Bin
.../male/head.vox | Bin
.../male/jaw.vox | Bin
.../male/leg_l.vox | Bin
.../male/leg_r.vox | Bin
.../male/shoulder_l.vox | Bin
.../male/shoulder_r.vox | Bin
.../male/tail.vox | Bin
.../male/torso_lower.vox | Bin
.../male/torso_upper.vox | Bin
.../male/weapon.vox | Bin
.../female/foot_l.vox | Bin
.../female/foot_r.vox | Bin
.../female/hand_l.vox | Bin
.../female/hand_r.vox | Bin
.../female/head.vox | Bin
.../female/jaw.vox | Bin
.../female/leg_l.vox | Bin
.../female/leg_r.vox | Bin
.../female/shoulder_l.vox | Bin
.../female/shoulder_r.vox | Bin
.../female/tail.vox | Bin
.../female/torso_lower.vox | Bin
.../female/torso_upper.vox | Bin
.../male/foot_l.vox | Bin
.../male/foot_r.vox | Bin
.../male/hand_l.vox | Bin
.../male/hand_r.vox | Bin
.../male/head.vox | Bin
.../male/jaw.vox | Bin
.../male/leg_l.vox | Bin
.../male/leg_r.vox | Bin
.../male/shoulder_l.vox | Bin
.../male/shoulder_r.vox | Bin
.../male/tail.vox | Bin
.../male/torso_lower.vox | Bin
.../male/torso_upper.vox | Bin
...ngbow_lizardman.vox => longbow_saurok.vox} | Bin
...aff_lizardman.vox => firestaff_saurok.vox} | Bin
...ng_2h_lizardman.vox => long_2h_saurok.vox} | Bin
common/src/comp/body/biped_large.rs | 24 ++--
common/src/loadout_builder.rs | 12 +-
voxygen/src/anim/src/biped_large/alpha.rs | 16 +--
voxygen/src/anim/src/biped_large/charge.rs | 16 +--
voxygen/src/anim/src/biped_large/dash.rs | 8 +-
voxygen/src/anim/src/biped_large/jump.rs | 8 +-
voxygen/src/anim/src/biped_large/mod.rs | 56 ++++-----
voxygen/src/anim/src/biped_large/run.rs | 15 ++-
voxygen/src/anim/src/biped_large/shoot.rs | 16 +--
voxygen/src/anim/src/biped_large/spinmelee.rs | 4 +-
104 files changed, 207 insertions(+), 199 deletions(-)
rename assets/common/items/npc_weapons/bow/{lizardman_bow.ron => saurok_bow.ron} (71%)
rename assets/common/items/npc_weapons/staff/{lizardman_staff.ron => saurok_staff.ron} (69%)
rename assets/common/items/npc_weapons/sword/{lizardman_sword.ron => saurok_sword.ron} (68%)
rename assets/voxygen/voxel/npc/{lizardman_mighty => saurok_mighty}/female/foot_l.vox (100%)
rename assets/voxygen/voxel/npc/{lizardman_mighty => saurok_mighty}/female/foot_r.vox (100%)
rename assets/voxygen/voxel/npc/{lizardman_mighty => saurok_mighty}/female/hand_l.vox (100%)
rename assets/voxygen/voxel/npc/{lizardman_mighty => saurok_mighty}/female/hand_r.vox (100%)
rename assets/voxygen/voxel/npc/{lizardman_mighty => saurok_mighty}/female/head.vox (100%)
rename assets/voxygen/voxel/npc/{lizardman_mighty => saurok_mighty}/female/jaw.vox (100%)
rename assets/voxygen/voxel/npc/{lizardman_mighty => saurok_mighty}/female/leg_l.vox (100%)
rename assets/voxygen/voxel/npc/{lizardman_mighty => saurok_mighty}/female/leg_r.vox (100%)
rename assets/voxygen/voxel/npc/{lizardman_mighty => saurok_mighty}/female/shoulder_l.vox (100%)
rename assets/voxygen/voxel/npc/{lizardman_mighty => saurok_mighty}/female/shoulder_r.vox (100%)
rename assets/voxygen/voxel/npc/{lizardman_mighty => saurok_mighty}/female/tail.vox (100%)
rename assets/voxygen/voxel/npc/{lizardman_mighty => saurok_mighty}/female/torso_lower.vox (100%)
rename assets/voxygen/voxel/npc/{lizardman_mighty => saurok_mighty}/female/torso_upper.vox (100%)
rename assets/voxygen/voxel/npc/{lizardman_mighty => saurok_mighty}/male/foot_l.vox (100%)
rename assets/voxygen/voxel/npc/{lizardman_mighty => saurok_mighty}/male/foot_r.vox (100%)
rename assets/voxygen/voxel/npc/{lizardman_mighty => saurok_mighty}/male/hand_l.vox (100%)
rename assets/voxygen/voxel/npc/{lizardman_mighty => saurok_mighty}/male/hand_r.vox (100%)
rename assets/voxygen/voxel/npc/{lizardman_mighty => saurok_mighty}/male/head.vox (100%)
rename assets/voxygen/voxel/npc/{lizardman_mighty => saurok_mighty}/male/jaw.vox (100%)
rename assets/voxygen/voxel/npc/{lizardman_mighty => saurok_mighty}/male/leg_l.vox (100%)
rename assets/voxygen/voxel/npc/{lizardman_mighty => saurok_mighty}/male/leg_r.vox (100%)
rename assets/voxygen/voxel/npc/{lizardman_mighty => saurok_mighty}/male/shoulder_l.vox (100%)
rename assets/voxygen/voxel/npc/{lizardman_mighty => saurok_mighty}/male/shoulder_r.vox (100%)
rename assets/voxygen/voxel/npc/{lizardman_mighty => saurok_mighty}/male/tail.vox (100%)
rename assets/voxygen/voxel/npc/{lizardman_mighty => saurok_mighty}/male/torso_lower.vox (100%)
rename assets/voxygen/voxel/npc/{lizardman_mighty => saurok_mighty}/male/torso_upper.vox (100%)
rename assets/voxygen/voxel/npc/{lizardman_occult => saurok_occult}/female/foot_l.vox (100%)
rename assets/voxygen/voxel/npc/{lizardman_occult => saurok_occult}/female/foot_r.vox (100%)
rename assets/voxygen/voxel/npc/{lizardman_occult => saurok_occult}/female/hand_l.vox (100%)
rename assets/voxygen/voxel/npc/{lizardman_occult => saurok_occult}/female/hand_r.vox (100%)
rename assets/voxygen/voxel/npc/{lizardman_occult => saurok_occult}/female/head.vox (100%)
rename assets/voxygen/voxel/npc/{lizardman_occult => saurok_occult}/female/jaw.vox (100%)
rename assets/voxygen/voxel/npc/{lizardman_occult => saurok_occult}/female/leg_l.vox (100%)
rename assets/voxygen/voxel/npc/{lizardman_occult => saurok_occult}/female/leg_r.vox (100%)
rename assets/voxygen/voxel/npc/{lizardman_occult => saurok_occult}/female/shoulder_l.vox (100%)
rename assets/voxygen/voxel/npc/{lizardman_occult => saurok_occult}/female/shoulder_r.vox (100%)
rename assets/voxygen/voxel/npc/{lizardman_occult => saurok_occult}/female/tail.vox (100%)
rename assets/voxygen/voxel/npc/{lizardman_occult => saurok_occult}/female/torso_lower.vox (100%)
rename assets/voxygen/voxel/npc/{lizardman_occult => saurok_occult}/female/torso_upper.vox (100%)
rename assets/voxygen/voxel/npc/{lizardman_occult => saurok_occult}/male/foot_l.vox (100%)
rename assets/voxygen/voxel/npc/{lizardman_occult => saurok_occult}/male/foot_r.vox (100%)
rename assets/voxygen/voxel/npc/{lizardman_occult => saurok_occult}/male/hand_l.vox (100%)
rename assets/voxygen/voxel/npc/{lizardman_occult => saurok_occult}/male/hand_r.vox (100%)
rename assets/voxygen/voxel/npc/{lizardman_occult => saurok_occult}/male/head.vox (100%)
rename assets/voxygen/voxel/npc/{lizardman_occult => saurok_occult}/male/jaw.vox (100%)
rename assets/voxygen/voxel/npc/{lizardman_occult => saurok_occult}/male/leg_l.vox (100%)
rename assets/voxygen/voxel/npc/{lizardman_occult => saurok_occult}/male/leg_r.vox (100%)
rename assets/voxygen/voxel/npc/{lizardman_occult => saurok_occult}/male/shoulder_l.vox (100%)
rename assets/voxygen/voxel/npc/{lizardman_occult => saurok_occult}/male/shoulder_r.vox (100%)
rename assets/voxygen/voxel/npc/{lizardman_occult => saurok_occult}/male/tail.vox (100%)
rename assets/voxygen/voxel/npc/{lizardman_occult => saurok_occult}/male/torso_lower.vox (100%)
rename assets/voxygen/voxel/npc/{lizardman_occult => saurok_occult}/male/torso_upper.vox (100%)
rename assets/voxygen/voxel/npc/{lizardman_occult => saurok_occult}/male/weapon.vox (100%)
rename assets/voxygen/voxel/npc/{lizardman_sly => saurok_sly}/female/foot_l.vox (100%)
rename assets/voxygen/voxel/npc/{lizardman_sly => saurok_sly}/female/foot_r.vox (100%)
rename assets/voxygen/voxel/npc/{lizardman_sly => saurok_sly}/female/hand_l.vox (100%)
rename assets/voxygen/voxel/npc/{lizardman_sly => saurok_sly}/female/hand_r.vox (100%)
rename assets/voxygen/voxel/npc/{lizardman_sly => saurok_sly}/female/head.vox (100%)
rename assets/voxygen/voxel/npc/{lizardman_sly => saurok_sly}/female/jaw.vox (100%)
rename assets/voxygen/voxel/npc/{lizardman_sly => saurok_sly}/female/leg_l.vox (100%)
rename assets/voxygen/voxel/npc/{lizardman_sly => saurok_sly}/female/leg_r.vox (100%)
rename assets/voxygen/voxel/npc/{lizardman_sly => saurok_sly}/female/shoulder_l.vox (100%)
rename assets/voxygen/voxel/npc/{lizardman_sly => saurok_sly}/female/shoulder_r.vox (100%)
rename assets/voxygen/voxel/npc/{lizardman_sly => saurok_sly}/female/tail.vox (100%)
rename assets/voxygen/voxel/npc/{lizardman_sly => saurok_sly}/female/torso_lower.vox (100%)
rename assets/voxygen/voxel/npc/{lizardman_sly => saurok_sly}/female/torso_upper.vox (100%)
rename assets/voxygen/voxel/npc/{lizardman_sly => saurok_sly}/male/foot_l.vox (100%)
rename assets/voxygen/voxel/npc/{lizardman_sly => saurok_sly}/male/foot_r.vox (100%)
rename assets/voxygen/voxel/npc/{lizardman_sly => saurok_sly}/male/hand_l.vox (100%)
rename assets/voxygen/voxel/npc/{lizardman_sly => saurok_sly}/male/hand_r.vox (100%)
rename assets/voxygen/voxel/npc/{lizardman_sly => saurok_sly}/male/head.vox (100%)
rename assets/voxygen/voxel/npc/{lizardman_sly => saurok_sly}/male/jaw.vox (100%)
rename assets/voxygen/voxel/npc/{lizardman_sly => saurok_sly}/male/leg_l.vox (100%)
rename assets/voxygen/voxel/npc/{lizardman_sly => saurok_sly}/male/leg_r.vox (100%)
rename assets/voxygen/voxel/npc/{lizardman_sly => saurok_sly}/male/shoulder_l.vox (100%)
rename assets/voxygen/voxel/npc/{lizardman_sly => saurok_sly}/male/shoulder_r.vox (100%)
rename assets/voxygen/voxel/npc/{lizardman_sly => saurok_sly}/male/tail.vox (100%)
rename assets/voxygen/voxel/npc/{lizardman_sly => saurok_sly}/male/torso_lower.vox (100%)
rename assets/voxygen/voxel/npc/{lizardman_sly => saurok_sly}/male/torso_upper.vox (100%)
rename assets/voxygen/voxel/weapon/bow/{longbow_lizardman.vox => longbow_saurok.vox} (100%)
rename assets/voxygen/voxel/weapon/staff/{firestaff_lizardman.vox => firestaff_saurok.vox} (100%)
rename assets/voxygen/voxel/weapon/sword/{long_2h_lizardman.vox => long_2h_saurok.vox} (100%)
diff --git a/assets/common/items/npc_weapons/bow/lizardman_bow.ron b/assets/common/items/npc_weapons/bow/saurok_bow.ron
similarity index 71%
rename from assets/common/items/npc_weapons/bow/lizardman_bow.ron
rename to assets/common/items/npc_weapons/bow/saurok_bow.ron
index 10f43346aa..01e55c9324 100644
--- a/assets/common/items/npc_weapons/bow/lizardman_bow.ron
+++ b/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,
)
diff --git a/assets/common/items/npc_weapons/hammer/cyclops_hammer.ron b/assets/common/items/npc_weapons/hammer/cyclops_hammer.ron
index a725d44894..c05dcbc953 100644
--- a/assets/common/items/npc_weapons/hammer/cyclops_hammer.ron
+++ b/assets/common/items/npc_weapons/hammer/cyclops_hammer.ron
@@ -10,4 +10,5 @@ ItemDef(
),
)
),
+ quality: Low,
)
diff --git a/assets/common/items/npc_weapons/hammer/ogre_hammer.ron b/assets/common/items/npc_weapons/hammer/ogre_hammer.ron
index 7f75bf9c20..e644eb425b 100644
--- a/assets/common/items/npc_weapons/hammer/ogre_hammer.ron
+++ b/assets/common/items/npc_weapons/hammer/ogre_hammer.ron
@@ -10,4 +10,5 @@ ItemDef(
),
)
),
+ quality: Low,
)
diff --git a/assets/common/items/npc_weapons/hammer/troll_hammer.ron b/assets/common/items/npc_weapons/hammer/troll_hammer.ron
index 63e08a4e27..be4995c0c2 100644
--- a/assets/common/items/npc_weapons/hammer/troll_hammer.ron
+++ b/assets/common/items/npc_weapons/hammer/troll_hammer.ron
@@ -10,4 +10,5 @@ ItemDef(
),
)
),
+ quality: Low,
)
diff --git a/assets/common/items/npc_weapons/hammer/wendigo_hammer.ron b/assets/common/items/npc_weapons/hammer/wendigo_hammer.ron
index bb756335ac..e9a3c1df84 100644
--- a/assets/common/items/npc_weapons/hammer/wendigo_hammer.ron
+++ b/assets/common/items/npc_weapons/hammer/wendigo_hammer.ron
@@ -10,4 +10,5 @@ ItemDef(
),
)
),
+ quality: Low,
)
diff --git a/assets/common/items/npc_weapons/staff/ogre_staff.ron b/assets/common/items/npc_weapons/staff/ogre_staff.ron
index c0a9e94435..c5e7862ee1 100644
--- a/assets/common/items/npc_weapons/staff/ogre_staff.ron
+++ b/assets/common/items/npc_weapons/staff/ogre_staff.ron
@@ -10,4 +10,5 @@ ItemDef(
),
)
),
+ quality: Low,
)
diff --git a/assets/common/items/npc_weapons/staff/lizardman_staff.ron b/assets/common/items/npc_weapons/staff/saurok_staff.ron
similarity index 69%
rename from assets/common/items/npc_weapons/staff/lizardman_staff.ron
rename to assets/common/items/npc_weapons/staff/saurok_staff.ron
index 51ad4b819e..e961c2029c 100644
--- a/assets/common/items/npc_weapons/staff/lizardman_staff.ron
+++ b/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,
)
diff --git a/assets/common/items/npc_weapons/sword/dullahan_sword.ron b/assets/common/items/npc_weapons/sword/dullahan_sword.ron
index c55fdc1dff..443038a718 100644
--- a/assets/common/items/npc_weapons/sword/dullahan_sword.ron
+++ b/assets/common/items/npc_weapons/sword/dullahan_sword.ron
@@ -10,4 +10,5 @@ ItemDef(
),
)
),
+ quality: Low,
)
diff --git a/assets/common/items/npc_weapons/sword/lizardman_sword.ron b/assets/common/items/npc_weapons/sword/saurok_sword.ron
similarity index 68%
rename from assets/common/items/npc_weapons/sword/lizardman_sword.ron
rename to assets/common/items/npc_weapons/sword/saurok_sword.ron
index 99cdda52f8..ca9f9e7ce9 100644
--- a/assets/common/items/npc_weapons/sword/lizardman_sword.ron
+++ b/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,
)
diff --git a/assets/common/npc_names.json b/assets/common/npc_names.json
index 4107643372..6611e6ad48 100644
--- a/assets/common/npc_names.json
+++ b/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"
}
}
},
diff --git a/assets/voxygen/voxel/biped_large_central_manifest.ron b/assets/voxygen/voxel/biped_large_central_manifest.ron
index a71eaa8242..9c8a2f6bb0 100644
--- a/assets/voxygen/voxel/biped_large_central_manifest.ron
+++ b/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"),
)
),
})
\ No newline at end of file
diff --git a/assets/voxygen/voxel/biped_large_lateral_manifest.ron b/assets/voxygen/voxel/biped_large_lateral_manifest.ron
index d05cdc9ed3..784fb1d729 100644
--- a/assets/voxygen/voxel/biped_large_lateral_manifest.ron
+++ b/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"),
),
),
})
\ No newline at end of file
diff --git a/assets/voxygen/voxel/npc/lizardman_mighty/female/foot_l.vox b/assets/voxygen/voxel/npc/saurok_mighty/female/foot_l.vox
similarity index 100%
rename from assets/voxygen/voxel/npc/lizardman_mighty/female/foot_l.vox
rename to assets/voxygen/voxel/npc/saurok_mighty/female/foot_l.vox
diff --git a/assets/voxygen/voxel/npc/lizardman_mighty/female/foot_r.vox b/assets/voxygen/voxel/npc/saurok_mighty/female/foot_r.vox
similarity index 100%
rename from assets/voxygen/voxel/npc/lizardman_mighty/female/foot_r.vox
rename to assets/voxygen/voxel/npc/saurok_mighty/female/foot_r.vox
diff --git a/assets/voxygen/voxel/npc/lizardman_mighty/female/hand_l.vox b/assets/voxygen/voxel/npc/saurok_mighty/female/hand_l.vox
similarity index 100%
rename from assets/voxygen/voxel/npc/lizardman_mighty/female/hand_l.vox
rename to assets/voxygen/voxel/npc/saurok_mighty/female/hand_l.vox
diff --git a/assets/voxygen/voxel/npc/lizardman_mighty/female/hand_r.vox b/assets/voxygen/voxel/npc/saurok_mighty/female/hand_r.vox
similarity index 100%
rename from assets/voxygen/voxel/npc/lizardman_mighty/female/hand_r.vox
rename to assets/voxygen/voxel/npc/saurok_mighty/female/hand_r.vox
diff --git a/assets/voxygen/voxel/npc/lizardman_mighty/female/head.vox b/assets/voxygen/voxel/npc/saurok_mighty/female/head.vox
similarity index 100%
rename from assets/voxygen/voxel/npc/lizardman_mighty/female/head.vox
rename to assets/voxygen/voxel/npc/saurok_mighty/female/head.vox
diff --git a/assets/voxygen/voxel/npc/lizardman_mighty/female/jaw.vox b/assets/voxygen/voxel/npc/saurok_mighty/female/jaw.vox
similarity index 100%
rename from assets/voxygen/voxel/npc/lizardman_mighty/female/jaw.vox
rename to assets/voxygen/voxel/npc/saurok_mighty/female/jaw.vox
diff --git a/assets/voxygen/voxel/npc/lizardman_mighty/female/leg_l.vox b/assets/voxygen/voxel/npc/saurok_mighty/female/leg_l.vox
similarity index 100%
rename from assets/voxygen/voxel/npc/lizardman_mighty/female/leg_l.vox
rename to assets/voxygen/voxel/npc/saurok_mighty/female/leg_l.vox
diff --git a/assets/voxygen/voxel/npc/lizardman_mighty/female/leg_r.vox b/assets/voxygen/voxel/npc/saurok_mighty/female/leg_r.vox
similarity index 100%
rename from assets/voxygen/voxel/npc/lizardman_mighty/female/leg_r.vox
rename to assets/voxygen/voxel/npc/saurok_mighty/female/leg_r.vox
diff --git a/assets/voxygen/voxel/npc/lizardman_mighty/female/shoulder_l.vox b/assets/voxygen/voxel/npc/saurok_mighty/female/shoulder_l.vox
similarity index 100%
rename from assets/voxygen/voxel/npc/lizardman_mighty/female/shoulder_l.vox
rename to assets/voxygen/voxel/npc/saurok_mighty/female/shoulder_l.vox
diff --git a/assets/voxygen/voxel/npc/lizardman_mighty/female/shoulder_r.vox b/assets/voxygen/voxel/npc/saurok_mighty/female/shoulder_r.vox
similarity index 100%
rename from assets/voxygen/voxel/npc/lizardman_mighty/female/shoulder_r.vox
rename to assets/voxygen/voxel/npc/saurok_mighty/female/shoulder_r.vox
diff --git a/assets/voxygen/voxel/npc/lizardman_mighty/female/tail.vox b/assets/voxygen/voxel/npc/saurok_mighty/female/tail.vox
similarity index 100%
rename from assets/voxygen/voxel/npc/lizardman_mighty/female/tail.vox
rename to assets/voxygen/voxel/npc/saurok_mighty/female/tail.vox
diff --git a/assets/voxygen/voxel/npc/lizardman_mighty/female/torso_lower.vox b/assets/voxygen/voxel/npc/saurok_mighty/female/torso_lower.vox
similarity index 100%
rename from assets/voxygen/voxel/npc/lizardman_mighty/female/torso_lower.vox
rename to assets/voxygen/voxel/npc/saurok_mighty/female/torso_lower.vox
diff --git a/assets/voxygen/voxel/npc/lizardman_mighty/female/torso_upper.vox b/assets/voxygen/voxel/npc/saurok_mighty/female/torso_upper.vox
similarity index 100%
rename from assets/voxygen/voxel/npc/lizardman_mighty/female/torso_upper.vox
rename to assets/voxygen/voxel/npc/saurok_mighty/female/torso_upper.vox
diff --git a/assets/voxygen/voxel/npc/lizardman_mighty/male/foot_l.vox b/assets/voxygen/voxel/npc/saurok_mighty/male/foot_l.vox
similarity index 100%
rename from assets/voxygen/voxel/npc/lizardman_mighty/male/foot_l.vox
rename to assets/voxygen/voxel/npc/saurok_mighty/male/foot_l.vox
diff --git a/assets/voxygen/voxel/npc/lizardman_mighty/male/foot_r.vox b/assets/voxygen/voxel/npc/saurok_mighty/male/foot_r.vox
similarity index 100%
rename from assets/voxygen/voxel/npc/lizardman_mighty/male/foot_r.vox
rename to assets/voxygen/voxel/npc/saurok_mighty/male/foot_r.vox
diff --git a/assets/voxygen/voxel/npc/lizardman_mighty/male/hand_l.vox b/assets/voxygen/voxel/npc/saurok_mighty/male/hand_l.vox
similarity index 100%
rename from assets/voxygen/voxel/npc/lizardman_mighty/male/hand_l.vox
rename to assets/voxygen/voxel/npc/saurok_mighty/male/hand_l.vox
diff --git a/assets/voxygen/voxel/npc/lizardman_mighty/male/hand_r.vox b/assets/voxygen/voxel/npc/saurok_mighty/male/hand_r.vox
similarity index 100%
rename from assets/voxygen/voxel/npc/lizardman_mighty/male/hand_r.vox
rename to assets/voxygen/voxel/npc/saurok_mighty/male/hand_r.vox
diff --git a/assets/voxygen/voxel/npc/lizardman_mighty/male/head.vox b/assets/voxygen/voxel/npc/saurok_mighty/male/head.vox
similarity index 100%
rename from assets/voxygen/voxel/npc/lizardman_mighty/male/head.vox
rename to assets/voxygen/voxel/npc/saurok_mighty/male/head.vox
diff --git a/assets/voxygen/voxel/npc/lizardman_mighty/male/jaw.vox b/assets/voxygen/voxel/npc/saurok_mighty/male/jaw.vox
similarity index 100%
rename from assets/voxygen/voxel/npc/lizardman_mighty/male/jaw.vox
rename to assets/voxygen/voxel/npc/saurok_mighty/male/jaw.vox
diff --git a/assets/voxygen/voxel/npc/lizardman_mighty/male/leg_l.vox b/assets/voxygen/voxel/npc/saurok_mighty/male/leg_l.vox
similarity index 100%
rename from assets/voxygen/voxel/npc/lizardman_mighty/male/leg_l.vox
rename to assets/voxygen/voxel/npc/saurok_mighty/male/leg_l.vox
diff --git a/assets/voxygen/voxel/npc/lizardman_mighty/male/leg_r.vox b/assets/voxygen/voxel/npc/saurok_mighty/male/leg_r.vox
similarity index 100%
rename from assets/voxygen/voxel/npc/lizardman_mighty/male/leg_r.vox
rename to assets/voxygen/voxel/npc/saurok_mighty/male/leg_r.vox
diff --git a/assets/voxygen/voxel/npc/lizardman_mighty/male/shoulder_l.vox b/assets/voxygen/voxel/npc/saurok_mighty/male/shoulder_l.vox
similarity index 100%
rename from assets/voxygen/voxel/npc/lizardman_mighty/male/shoulder_l.vox
rename to assets/voxygen/voxel/npc/saurok_mighty/male/shoulder_l.vox
diff --git a/assets/voxygen/voxel/npc/lizardman_mighty/male/shoulder_r.vox b/assets/voxygen/voxel/npc/saurok_mighty/male/shoulder_r.vox
similarity index 100%
rename from assets/voxygen/voxel/npc/lizardman_mighty/male/shoulder_r.vox
rename to assets/voxygen/voxel/npc/saurok_mighty/male/shoulder_r.vox
diff --git a/assets/voxygen/voxel/npc/lizardman_mighty/male/tail.vox b/assets/voxygen/voxel/npc/saurok_mighty/male/tail.vox
similarity index 100%
rename from assets/voxygen/voxel/npc/lizardman_mighty/male/tail.vox
rename to assets/voxygen/voxel/npc/saurok_mighty/male/tail.vox
diff --git a/assets/voxygen/voxel/npc/lizardman_mighty/male/torso_lower.vox b/assets/voxygen/voxel/npc/saurok_mighty/male/torso_lower.vox
similarity index 100%
rename from assets/voxygen/voxel/npc/lizardman_mighty/male/torso_lower.vox
rename to assets/voxygen/voxel/npc/saurok_mighty/male/torso_lower.vox
diff --git a/assets/voxygen/voxel/npc/lizardman_mighty/male/torso_upper.vox b/assets/voxygen/voxel/npc/saurok_mighty/male/torso_upper.vox
similarity index 100%
rename from assets/voxygen/voxel/npc/lizardman_mighty/male/torso_upper.vox
rename to assets/voxygen/voxel/npc/saurok_mighty/male/torso_upper.vox
diff --git a/assets/voxygen/voxel/npc/lizardman_occult/female/foot_l.vox b/assets/voxygen/voxel/npc/saurok_occult/female/foot_l.vox
similarity index 100%
rename from assets/voxygen/voxel/npc/lizardman_occult/female/foot_l.vox
rename to assets/voxygen/voxel/npc/saurok_occult/female/foot_l.vox
diff --git a/assets/voxygen/voxel/npc/lizardman_occult/female/foot_r.vox b/assets/voxygen/voxel/npc/saurok_occult/female/foot_r.vox
similarity index 100%
rename from assets/voxygen/voxel/npc/lizardman_occult/female/foot_r.vox
rename to assets/voxygen/voxel/npc/saurok_occult/female/foot_r.vox
diff --git a/assets/voxygen/voxel/npc/lizardman_occult/female/hand_l.vox b/assets/voxygen/voxel/npc/saurok_occult/female/hand_l.vox
similarity index 100%
rename from assets/voxygen/voxel/npc/lizardman_occult/female/hand_l.vox
rename to assets/voxygen/voxel/npc/saurok_occult/female/hand_l.vox
diff --git a/assets/voxygen/voxel/npc/lizardman_occult/female/hand_r.vox b/assets/voxygen/voxel/npc/saurok_occult/female/hand_r.vox
similarity index 100%
rename from assets/voxygen/voxel/npc/lizardman_occult/female/hand_r.vox
rename to assets/voxygen/voxel/npc/saurok_occult/female/hand_r.vox
diff --git a/assets/voxygen/voxel/npc/lizardman_occult/female/head.vox b/assets/voxygen/voxel/npc/saurok_occult/female/head.vox
similarity index 100%
rename from assets/voxygen/voxel/npc/lizardman_occult/female/head.vox
rename to assets/voxygen/voxel/npc/saurok_occult/female/head.vox
diff --git a/assets/voxygen/voxel/npc/lizardman_occult/female/jaw.vox b/assets/voxygen/voxel/npc/saurok_occult/female/jaw.vox
similarity index 100%
rename from assets/voxygen/voxel/npc/lizardman_occult/female/jaw.vox
rename to assets/voxygen/voxel/npc/saurok_occult/female/jaw.vox
diff --git a/assets/voxygen/voxel/npc/lizardman_occult/female/leg_l.vox b/assets/voxygen/voxel/npc/saurok_occult/female/leg_l.vox
similarity index 100%
rename from assets/voxygen/voxel/npc/lizardman_occult/female/leg_l.vox
rename to assets/voxygen/voxel/npc/saurok_occult/female/leg_l.vox
diff --git a/assets/voxygen/voxel/npc/lizardman_occult/female/leg_r.vox b/assets/voxygen/voxel/npc/saurok_occult/female/leg_r.vox
similarity index 100%
rename from assets/voxygen/voxel/npc/lizardman_occult/female/leg_r.vox
rename to assets/voxygen/voxel/npc/saurok_occult/female/leg_r.vox
diff --git a/assets/voxygen/voxel/npc/lizardman_occult/female/shoulder_l.vox b/assets/voxygen/voxel/npc/saurok_occult/female/shoulder_l.vox
similarity index 100%
rename from assets/voxygen/voxel/npc/lizardman_occult/female/shoulder_l.vox
rename to assets/voxygen/voxel/npc/saurok_occult/female/shoulder_l.vox
diff --git a/assets/voxygen/voxel/npc/lizardman_occult/female/shoulder_r.vox b/assets/voxygen/voxel/npc/saurok_occult/female/shoulder_r.vox
similarity index 100%
rename from assets/voxygen/voxel/npc/lizardman_occult/female/shoulder_r.vox
rename to assets/voxygen/voxel/npc/saurok_occult/female/shoulder_r.vox
diff --git a/assets/voxygen/voxel/npc/lizardman_occult/female/tail.vox b/assets/voxygen/voxel/npc/saurok_occult/female/tail.vox
similarity index 100%
rename from assets/voxygen/voxel/npc/lizardman_occult/female/tail.vox
rename to assets/voxygen/voxel/npc/saurok_occult/female/tail.vox
diff --git a/assets/voxygen/voxel/npc/lizardman_occult/female/torso_lower.vox b/assets/voxygen/voxel/npc/saurok_occult/female/torso_lower.vox
similarity index 100%
rename from assets/voxygen/voxel/npc/lizardman_occult/female/torso_lower.vox
rename to assets/voxygen/voxel/npc/saurok_occult/female/torso_lower.vox
diff --git a/assets/voxygen/voxel/npc/lizardman_occult/female/torso_upper.vox b/assets/voxygen/voxel/npc/saurok_occult/female/torso_upper.vox
similarity index 100%
rename from assets/voxygen/voxel/npc/lizardman_occult/female/torso_upper.vox
rename to assets/voxygen/voxel/npc/saurok_occult/female/torso_upper.vox
diff --git a/assets/voxygen/voxel/npc/lizardman_occult/male/foot_l.vox b/assets/voxygen/voxel/npc/saurok_occult/male/foot_l.vox
similarity index 100%
rename from assets/voxygen/voxel/npc/lizardman_occult/male/foot_l.vox
rename to assets/voxygen/voxel/npc/saurok_occult/male/foot_l.vox
diff --git a/assets/voxygen/voxel/npc/lizardman_occult/male/foot_r.vox b/assets/voxygen/voxel/npc/saurok_occult/male/foot_r.vox
similarity index 100%
rename from assets/voxygen/voxel/npc/lizardman_occult/male/foot_r.vox
rename to assets/voxygen/voxel/npc/saurok_occult/male/foot_r.vox
diff --git a/assets/voxygen/voxel/npc/lizardman_occult/male/hand_l.vox b/assets/voxygen/voxel/npc/saurok_occult/male/hand_l.vox
similarity index 100%
rename from assets/voxygen/voxel/npc/lizardman_occult/male/hand_l.vox
rename to assets/voxygen/voxel/npc/saurok_occult/male/hand_l.vox
diff --git a/assets/voxygen/voxel/npc/lizardman_occult/male/hand_r.vox b/assets/voxygen/voxel/npc/saurok_occult/male/hand_r.vox
similarity index 100%
rename from assets/voxygen/voxel/npc/lizardman_occult/male/hand_r.vox
rename to assets/voxygen/voxel/npc/saurok_occult/male/hand_r.vox
diff --git a/assets/voxygen/voxel/npc/lizardman_occult/male/head.vox b/assets/voxygen/voxel/npc/saurok_occult/male/head.vox
similarity index 100%
rename from assets/voxygen/voxel/npc/lizardman_occult/male/head.vox
rename to assets/voxygen/voxel/npc/saurok_occult/male/head.vox
diff --git a/assets/voxygen/voxel/npc/lizardman_occult/male/jaw.vox b/assets/voxygen/voxel/npc/saurok_occult/male/jaw.vox
similarity index 100%
rename from assets/voxygen/voxel/npc/lizardman_occult/male/jaw.vox
rename to assets/voxygen/voxel/npc/saurok_occult/male/jaw.vox
diff --git a/assets/voxygen/voxel/npc/lizardman_occult/male/leg_l.vox b/assets/voxygen/voxel/npc/saurok_occult/male/leg_l.vox
similarity index 100%
rename from assets/voxygen/voxel/npc/lizardman_occult/male/leg_l.vox
rename to assets/voxygen/voxel/npc/saurok_occult/male/leg_l.vox
diff --git a/assets/voxygen/voxel/npc/lizardman_occult/male/leg_r.vox b/assets/voxygen/voxel/npc/saurok_occult/male/leg_r.vox
similarity index 100%
rename from assets/voxygen/voxel/npc/lizardman_occult/male/leg_r.vox
rename to assets/voxygen/voxel/npc/saurok_occult/male/leg_r.vox
diff --git a/assets/voxygen/voxel/npc/lizardman_occult/male/shoulder_l.vox b/assets/voxygen/voxel/npc/saurok_occult/male/shoulder_l.vox
similarity index 100%
rename from assets/voxygen/voxel/npc/lizardman_occult/male/shoulder_l.vox
rename to assets/voxygen/voxel/npc/saurok_occult/male/shoulder_l.vox
diff --git a/assets/voxygen/voxel/npc/lizardman_occult/male/shoulder_r.vox b/assets/voxygen/voxel/npc/saurok_occult/male/shoulder_r.vox
similarity index 100%
rename from assets/voxygen/voxel/npc/lizardman_occult/male/shoulder_r.vox
rename to assets/voxygen/voxel/npc/saurok_occult/male/shoulder_r.vox
diff --git a/assets/voxygen/voxel/npc/lizardman_occult/male/tail.vox b/assets/voxygen/voxel/npc/saurok_occult/male/tail.vox
similarity index 100%
rename from assets/voxygen/voxel/npc/lizardman_occult/male/tail.vox
rename to assets/voxygen/voxel/npc/saurok_occult/male/tail.vox
diff --git a/assets/voxygen/voxel/npc/lizardman_occult/male/torso_lower.vox b/assets/voxygen/voxel/npc/saurok_occult/male/torso_lower.vox
similarity index 100%
rename from assets/voxygen/voxel/npc/lizardman_occult/male/torso_lower.vox
rename to assets/voxygen/voxel/npc/saurok_occult/male/torso_lower.vox
diff --git a/assets/voxygen/voxel/npc/lizardman_occult/male/torso_upper.vox b/assets/voxygen/voxel/npc/saurok_occult/male/torso_upper.vox
similarity index 100%
rename from assets/voxygen/voxel/npc/lizardman_occult/male/torso_upper.vox
rename to assets/voxygen/voxel/npc/saurok_occult/male/torso_upper.vox
diff --git a/assets/voxygen/voxel/npc/lizardman_occult/male/weapon.vox b/assets/voxygen/voxel/npc/saurok_occult/male/weapon.vox
similarity index 100%
rename from assets/voxygen/voxel/npc/lizardman_occult/male/weapon.vox
rename to assets/voxygen/voxel/npc/saurok_occult/male/weapon.vox
diff --git a/assets/voxygen/voxel/npc/lizardman_sly/female/foot_l.vox b/assets/voxygen/voxel/npc/saurok_sly/female/foot_l.vox
similarity index 100%
rename from assets/voxygen/voxel/npc/lizardman_sly/female/foot_l.vox
rename to assets/voxygen/voxel/npc/saurok_sly/female/foot_l.vox
diff --git a/assets/voxygen/voxel/npc/lizardman_sly/female/foot_r.vox b/assets/voxygen/voxel/npc/saurok_sly/female/foot_r.vox
similarity index 100%
rename from assets/voxygen/voxel/npc/lizardman_sly/female/foot_r.vox
rename to assets/voxygen/voxel/npc/saurok_sly/female/foot_r.vox
diff --git a/assets/voxygen/voxel/npc/lizardman_sly/female/hand_l.vox b/assets/voxygen/voxel/npc/saurok_sly/female/hand_l.vox
similarity index 100%
rename from assets/voxygen/voxel/npc/lizardman_sly/female/hand_l.vox
rename to assets/voxygen/voxel/npc/saurok_sly/female/hand_l.vox
diff --git a/assets/voxygen/voxel/npc/lizardman_sly/female/hand_r.vox b/assets/voxygen/voxel/npc/saurok_sly/female/hand_r.vox
similarity index 100%
rename from assets/voxygen/voxel/npc/lizardman_sly/female/hand_r.vox
rename to assets/voxygen/voxel/npc/saurok_sly/female/hand_r.vox
diff --git a/assets/voxygen/voxel/npc/lizardman_sly/female/head.vox b/assets/voxygen/voxel/npc/saurok_sly/female/head.vox
similarity index 100%
rename from assets/voxygen/voxel/npc/lizardman_sly/female/head.vox
rename to assets/voxygen/voxel/npc/saurok_sly/female/head.vox
diff --git a/assets/voxygen/voxel/npc/lizardman_sly/female/jaw.vox b/assets/voxygen/voxel/npc/saurok_sly/female/jaw.vox
similarity index 100%
rename from assets/voxygen/voxel/npc/lizardman_sly/female/jaw.vox
rename to assets/voxygen/voxel/npc/saurok_sly/female/jaw.vox
diff --git a/assets/voxygen/voxel/npc/lizardman_sly/female/leg_l.vox b/assets/voxygen/voxel/npc/saurok_sly/female/leg_l.vox
similarity index 100%
rename from assets/voxygen/voxel/npc/lizardman_sly/female/leg_l.vox
rename to assets/voxygen/voxel/npc/saurok_sly/female/leg_l.vox
diff --git a/assets/voxygen/voxel/npc/lizardman_sly/female/leg_r.vox b/assets/voxygen/voxel/npc/saurok_sly/female/leg_r.vox
similarity index 100%
rename from assets/voxygen/voxel/npc/lizardman_sly/female/leg_r.vox
rename to assets/voxygen/voxel/npc/saurok_sly/female/leg_r.vox
diff --git a/assets/voxygen/voxel/npc/lizardman_sly/female/shoulder_l.vox b/assets/voxygen/voxel/npc/saurok_sly/female/shoulder_l.vox
similarity index 100%
rename from assets/voxygen/voxel/npc/lizardman_sly/female/shoulder_l.vox
rename to assets/voxygen/voxel/npc/saurok_sly/female/shoulder_l.vox
diff --git a/assets/voxygen/voxel/npc/lizardman_sly/female/shoulder_r.vox b/assets/voxygen/voxel/npc/saurok_sly/female/shoulder_r.vox
similarity index 100%
rename from assets/voxygen/voxel/npc/lizardman_sly/female/shoulder_r.vox
rename to assets/voxygen/voxel/npc/saurok_sly/female/shoulder_r.vox
diff --git a/assets/voxygen/voxel/npc/lizardman_sly/female/tail.vox b/assets/voxygen/voxel/npc/saurok_sly/female/tail.vox
similarity index 100%
rename from assets/voxygen/voxel/npc/lizardman_sly/female/tail.vox
rename to assets/voxygen/voxel/npc/saurok_sly/female/tail.vox
diff --git a/assets/voxygen/voxel/npc/lizardman_sly/female/torso_lower.vox b/assets/voxygen/voxel/npc/saurok_sly/female/torso_lower.vox
similarity index 100%
rename from assets/voxygen/voxel/npc/lizardman_sly/female/torso_lower.vox
rename to assets/voxygen/voxel/npc/saurok_sly/female/torso_lower.vox
diff --git a/assets/voxygen/voxel/npc/lizardman_sly/female/torso_upper.vox b/assets/voxygen/voxel/npc/saurok_sly/female/torso_upper.vox
similarity index 100%
rename from assets/voxygen/voxel/npc/lizardman_sly/female/torso_upper.vox
rename to assets/voxygen/voxel/npc/saurok_sly/female/torso_upper.vox
diff --git a/assets/voxygen/voxel/npc/lizardman_sly/male/foot_l.vox b/assets/voxygen/voxel/npc/saurok_sly/male/foot_l.vox
similarity index 100%
rename from assets/voxygen/voxel/npc/lizardman_sly/male/foot_l.vox
rename to assets/voxygen/voxel/npc/saurok_sly/male/foot_l.vox
diff --git a/assets/voxygen/voxel/npc/lizardman_sly/male/foot_r.vox b/assets/voxygen/voxel/npc/saurok_sly/male/foot_r.vox
similarity index 100%
rename from assets/voxygen/voxel/npc/lizardman_sly/male/foot_r.vox
rename to assets/voxygen/voxel/npc/saurok_sly/male/foot_r.vox
diff --git a/assets/voxygen/voxel/npc/lizardman_sly/male/hand_l.vox b/assets/voxygen/voxel/npc/saurok_sly/male/hand_l.vox
similarity index 100%
rename from assets/voxygen/voxel/npc/lizardman_sly/male/hand_l.vox
rename to assets/voxygen/voxel/npc/saurok_sly/male/hand_l.vox
diff --git a/assets/voxygen/voxel/npc/lizardman_sly/male/hand_r.vox b/assets/voxygen/voxel/npc/saurok_sly/male/hand_r.vox
similarity index 100%
rename from assets/voxygen/voxel/npc/lizardman_sly/male/hand_r.vox
rename to assets/voxygen/voxel/npc/saurok_sly/male/hand_r.vox
diff --git a/assets/voxygen/voxel/npc/lizardman_sly/male/head.vox b/assets/voxygen/voxel/npc/saurok_sly/male/head.vox
similarity index 100%
rename from assets/voxygen/voxel/npc/lizardman_sly/male/head.vox
rename to assets/voxygen/voxel/npc/saurok_sly/male/head.vox
diff --git a/assets/voxygen/voxel/npc/lizardman_sly/male/jaw.vox b/assets/voxygen/voxel/npc/saurok_sly/male/jaw.vox
similarity index 100%
rename from assets/voxygen/voxel/npc/lizardman_sly/male/jaw.vox
rename to assets/voxygen/voxel/npc/saurok_sly/male/jaw.vox
diff --git a/assets/voxygen/voxel/npc/lizardman_sly/male/leg_l.vox b/assets/voxygen/voxel/npc/saurok_sly/male/leg_l.vox
similarity index 100%
rename from assets/voxygen/voxel/npc/lizardman_sly/male/leg_l.vox
rename to assets/voxygen/voxel/npc/saurok_sly/male/leg_l.vox
diff --git a/assets/voxygen/voxel/npc/lizardman_sly/male/leg_r.vox b/assets/voxygen/voxel/npc/saurok_sly/male/leg_r.vox
similarity index 100%
rename from assets/voxygen/voxel/npc/lizardman_sly/male/leg_r.vox
rename to assets/voxygen/voxel/npc/saurok_sly/male/leg_r.vox
diff --git a/assets/voxygen/voxel/npc/lizardman_sly/male/shoulder_l.vox b/assets/voxygen/voxel/npc/saurok_sly/male/shoulder_l.vox
similarity index 100%
rename from assets/voxygen/voxel/npc/lizardman_sly/male/shoulder_l.vox
rename to assets/voxygen/voxel/npc/saurok_sly/male/shoulder_l.vox
diff --git a/assets/voxygen/voxel/npc/lizardman_sly/male/shoulder_r.vox b/assets/voxygen/voxel/npc/saurok_sly/male/shoulder_r.vox
similarity index 100%
rename from assets/voxygen/voxel/npc/lizardman_sly/male/shoulder_r.vox
rename to assets/voxygen/voxel/npc/saurok_sly/male/shoulder_r.vox
diff --git a/assets/voxygen/voxel/npc/lizardman_sly/male/tail.vox b/assets/voxygen/voxel/npc/saurok_sly/male/tail.vox
similarity index 100%
rename from assets/voxygen/voxel/npc/lizardman_sly/male/tail.vox
rename to assets/voxygen/voxel/npc/saurok_sly/male/tail.vox
diff --git a/assets/voxygen/voxel/npc/lizardman_sly/male/torso_lower.vox b/assets/voxygen/voxel/npc/saurok_sly/male/torso_lower.vox
similarity index 100%
rename from assets/voxygen/voxel/npc/lizardman_sly/male/torso_lower.vox
rename to assets/voxygen/voxel/npc/saurok_sly/male/torso_lower.vox
diff --git a/assets/voxygen/voxel/npc/lizardman_sly/male/torso_upper.vox b/assets/voxygen/voxel/npc/saurok_sly/male/torso_upper.vox
similarity index 100%
rename from assets/voxygen/voxel/npc/lizardman_sly/male/torso_upper.vox
rename to assets/voxygen/voxel/npc/saurok_sly/male/torso_upper.vox
diff --git a/assets/voxygen/voxel/weapon/bow/longbow_lizardman.vox b/assets/voxygen/voxel/weapon/bow/longbow_saurok.vox
similarity index 100%
rename from assets/voxygen/voxel/weapon/bow/longbow_lizardman.vox
rename to assets/voxygen/voxel/weapon/bow/longbow_saurok.vox
diff --git a/assets/voxygen/voxel/weapon/staff/firestaff_lizardman.vox b/assets/voxygen/voxel/weapon/staff/firestaff_saurok.vox
similarity index 100%
rename from assets/voxygen/voxel/weapon/staff/firestaff_lizardman.vox
rename to assets/voxygen/voxel/weapon/staff/firestaff_saurok.vox
diff --git a/assets/voxygen/voxel/weapon/sword/long_2h_lizardman.vox b/assets/voxygen/voxel/weapon/sword/long_2h_saurok.vox
similarity index 100%
rename from assets/voxygen/voxel/weapon/sword/long_2h_lizardman.vox
rename to assets/voxygen/voxel/weapon/sword/long_2h_saurok.vox
diff --git a/common/src/comp/body/biped_large.rs b/common/src/comp/body/biped_large.rs
index 3427767c33..1dab709ab6 100644
--- a/common/src/comp/body/biped_large.rs
+++ b/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> {
diff --git a/common/src/loadout_builder.rs b/common/src/loadout_builder.rs
index 829fa834fc..c7db97016e 100644
--- a/common/src/loadout_builder.rs
+++ b/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) => {
diff --git a/voxygen/src/anim/src/biped_large/alpha.rs b/voxygen/src/anim/src/biped_large/alpha.rs
index c7010d639c..05897dc062 100644
--- a/voxygen/src/anim/src/biped_large/alpha.rs
+++ b/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;
diff --git a/voxygen/src/anim/src/biped_large/charge.rs b/voxygen/src/anim/src/biped_large/charge.rs
index 1edd44386a..b86973a075 100644
--- a/voxygen/src/anim/src/biped_large/charge.rs
+++ b/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(_)) => {
diff --git a/voxygen/src/anim/src/biped_large/dash.rs b/voxygen/src/anim/src/biped_large/dash.rs
index 8b077c672b..1f94d5c52e 100644
--- a/voxygen/src/anim/src/biped_large/dash.rs
+++ b/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);
diff --git a/voxygen/src/anim/src/biped_large/jump.rs b/voxygen/src/anim/src/biped_large/jump.rs
index 037c2dfbd1..2b78b6626f 100644
--- a/voxygen/src/anim/src/biped_large/jump.rs
+++ b/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);
diff --git a/voxygen/src/anim/src/biped_large/mod.rs b/voxygen/src/anim/src/biped_large/mod.rs
index 4b4bf1b0ba..858a7da4eb 100644
--- a/voxygen/src/anim/src/biped_large/mod.rs
+++ b/voxygen/src/anim/src/biped_large/mod.rs
@@ -99,7 +99,7 @@ impl Skeleton for BipedLargeSkeleton {
make_bone(leg_control_l * Mat4::<f32>::from(self.foot_l)),
make_bone(leg_control_r * Mat4::<f32>::from(self.foot_r)),
// FIXME: Should this be control_l_mat?
- make_bone(control_mat * hand_l_mat * Mat4::<f32>::from(self.hold)),
+ make_bone(upper_torso_mat * control_mat * hand_l_mat * Mat4::<f32>::from(self.hold)),
];
Vec3::default()
}
@@ -158,9 +158,9 @@ impl<'a> From<&'a Body> for SkeletonAttr {
(Troll, _) => (6.0, 10.0),
(Dullahan, _) => (3.0, 6.0),
(Werewolf, _) => (11.5, 1.0),
- (Occultlizardman, _) => (6.0, 3.5),
- (Mightylizardman, _) => (6.0, 3.5),
- (Slylizardman, _) => (6.0, 3.5),
+ (Occultsaurok, _) => (6.0, 3.5),
+ (Mightysaurok, _) => (6.0, 3.5),
+ (Slysaurok, _) => (6.0, 3.5),
},
jaw: match (body.species, body.body_type) {
(Ogre, _) => (0.0, 0.0),
@@ -169,9 +169,9 @@ impl<'a> From<&'a Body> for SkeletonAttr {
(Troll, _) => (2.0, -4.0),
(Dullahan, _) => (0.0, 0.0),
(Werewolf, _) => (5.0, -4.5),
- (Occultlizardman, _) => (1.0, -2.5),
- (Mightylizardman, _) => (1.0, -2.5),
- (Slylizardman, _) => (1.0, -2.5),
+ (Occultsaurok, _) => (1.0, -2.5),
+ (Mightysaurok, _) => (1.0, -2.5),
+ (Slysaurok, _) => (1.0, -2.5),
},
upper_torso: match (body.species, body.body_type) {
(Ogre, Male) => (0.0, 28.0),
@@ -181,9 +181,9 @@ impl<'a> From<&'a Body> for SkeletonAttr {
(Troll, _) => (-1.0, 27.5),
(Dullahan, _) => (0.0, 29.0),
(Werewolf, _) => (3.0, 27.5),
- (Occultlizardman, _) => (3.0, 23.0),
- (Mightylizardman, _) => (3.0, 23.0),
- (Slylizardman, _) => (3.0, 23.0),
+ (Occultsaurok, _) => (3.0, 23.0),
+ (Mightysaurok, _) => (3.0, 23.0),
+ (Slysaurok, _) => (3.0, 23.0),
},
lower_torso: match (body.species, body.body_type) {
(Ogre, Male) => (1.0, -7.0),
@@ -193,9 +193,9 @@ impl<'a> From<&'a Body> for SkeletonAttr {
(Troll, _) => (1.0, -10.5),
(Dullahan, _) => (0.0, -6.5),
(Werewolf, _) => (1.0, -10.0),
- (Occultlizardman, _) => (0.0, -6.0),
- (Mightylizardman, _) => (0.0, -6.0),
- (Slylizardman, _) => (0.0, -6.0),
+ (Occultsaurok, _) => (0.0, -6.0),
+ (Mightysaurok, _) => (0.0, -6.0),
+ (Slysaurok, _) => (0.0, -6.0),
},
tail: match (body.species, body.body_type) {
(Ogre, _) => (0.0, 0.0),
@@ -204,9 +204,9 @@ impl<'a> From<&'a Body> for SkeletonAttr {
(Troll, _) => (0.0, 0.0),
(Dullahan, _) => (0.0, 0.0),
(Werewolf, _) => (-5.5, -2.0),
- (Occultlizardman, _) => (-4.5, -6.0),
- (Mightylizardman, _) => (-4.5, -6.0),
- (Slylizardman, _) => (-4.5, -6.0),
+ (Occultsaurok, _) => (-4.5, -6.0),
+ (Mightysaurok, _) => (-4.5, -6.0),
+ (Slysaurok, _) => (-4.5, -6.0),
},
shoulder: match (body.species, body.body_type) {
(Ogre, Male) => (12.0, 0.5, 0.0),
@@ -216,9 +216,9 @@ impl<'a> From<&'a Body> for SkeletonAttr {
(Troll, _) => (11.0, 0.5, -1.5),
(Dullahan, _) => (14.0, 0.5, 4.5),
(Werewolf, _) => (9.0, 4.0, -3.0),
- (Occultlizardman, _) => (7.5, 1.0, -1.5),
- (Mightylizardman, _) => (7.5, 1.0, -1.5),
- (Slylizardman, _) => (7.5, 1.0, -1.5),
+ (Occultsaurok, _) => (7.5, 1.0, -1.5),
+ (Mightysaurok, _) => (7.5, 1.0, -1.5),
+ (Slysaurok, _) => (7.5, 1.0, -1.5),
},
hand: match (body.species, body.body_type) {
(Ogre, Male) => (14.5, 0.0, -2.0),
@@ -228,9 +228,9 @@ impl<'a> From<&'a Body> for SkeletonAttr {
(Troll, _) => (11.5, 0.0, -1.5),
(Dullahan, _) => (14.5, 0.0, -2.5),
(Werewolf, _) => (10.0, 2.5, -11.0),
- (Occultlizardman, _) => (8.0, 1.5, -5.5),
- (Mightylizardman, _) => (8.0, 1.5, -5.5),
- (Slylizardman, _) => (8.0, 1.5, -5.5),
+ (Occultsaurok, _) => (8.0, 1.5, -5.5),
+ (Mightysaurok, _) => (8.0, 1.5, -5.5),
+ (Slysaurok, _) => (8.0, 1.5, -5.5),
},
leg: match (body.species, body.body_type) {
(Ogre, Male) => (0.0, 0.0, -4.0),
@@ -240,9 +240,9 @@ impl<'a> From<&'a Body> for SkeletonAttr {
(Troll, _) => (5.0, 0.0, -6.0),
(Dullahan, _) => (0.0, 0.0, -5.0),
(Werewolf, _) => (4.5, 1.0, -5.0),
- (Occultlizardman, _) => (3.0, 0.5, -6.0),
- (Mightylizardman, _) => (3.0, 0.5, -6.0),
- (Slylizardman, _) => (3.0, 0.5, -6.0),
+ (Occultsaurok, _) => (3.0, 0.5, -6.0),
+ (Mightysaurok, _) => (3.0, 0.5, -6.0),
+ (Slysaurok, _) => (3.0, 0.5, -6.0),
},
foot: match (body.species, body.body_type) {
(Ogre, Male) => (4.0, 2.5, -14.0),
@@ -252,9 +252,9 @@ impl<'a> From<&'a Body> for SkeletonAttr {
(Troll, _) => (6.0, 1.5, -13.0),
(Dullahan, _) => (4.0, 2.5, -14.0),
(Werewolf, _) => (4.0, 2.5, -8.5),
- (Occultlizardman, _) => (3.5, 2.0, -12.0),
- (Mightylizardman, _) => (3.5, 2.0, -12.0),
- (Slylizardman, _) => (3.5, 2.0, -12.0),
+ (Occultsaurok, _) => (3.5, 2.0, -12.0),
+ (Mightysaurok, _) => (3.5, 2.0, -12.0),
+ (Slysaurok, _) => (3.5, 2.0, -12.0),
},
beast: match (body.species, body.body_type) {
(Werewolf, _) => (true),
diff --git a/voxygen/src/anim/src/biped_large/run.rs b/voxygen/src/anim/src/biped_large/run.rs
index aa0c0de4a6..b17c54631b 100644
--- a/voxygen/src/anim/src/biped_large/run.rs
+++ b/voxygen/src/anim/src/biped_large/run.rs
@@ -25,7 +25,7 @@ impl Animation for RunAnimation {
let speed = Vec2::<f32>::from(velocity).magnitude();
*rate = 1.0;
- let lab = 0.55; //.65
+ let lab = 0.65; //.65
let foothoril = (((1.0)
/ (0.4
+ (0.6)
@@ -75,7 +75,6 @@ impl Animation for RunAnimation {
//let shortalt = (anim_time as f32 * lab as f32 * 16.0 + PI / 2.0).sin();
- let lab = 0.65; //0.72
let amplitude = (speed / 21.0).max(0.25);
let amplitude2 = (speed * 1.4 / 21.0).powf(0.5).max(0.6);
let amplitude3 = (speed / 21.0).powf(0.5).max(0.35);
@@ -117,7 +116,7 @@ impl Animation for RunAnimation {
let foot2b = (anim_time as f32 * (16.0) * lab as f32 * speedmult + 1.1 + shift2).sin(); //1.6
//BL
let foot3a = (anim_time as f32 * (16.0) * lab as f32 * speedmult + shift3).sin(); //0.0
- let foot3b = (anim_time as f32 * (16.0) * lab as f32 * speedmult + 1.57 + shift3).sin(); //0.4
+ let foot3b = (anim_time as f32 * (16.0) * lab as f32 * speedmult + 0.3 + shift3).sin(); //0.4
//BR
let foot4a =
(anim_time as f32 * (16.0) * lab as f32 * speedmult + 0.0 + canceler * 0.05 + shift4)
@@ -158,7 +157,7 @@ impl Animation for RunAnimation {
next.tail.position = Vec3::new(0.0, skeleton_attr.tail.0, skeleton_attr.tail.1);
next.tail.orientation =
- Quaternion::rotation_x(canceler * 1.0 + amplitude * shortalt * 0.3)
+ Quaternion::rotation_x(canceler * 1.0 + amplitude * shortalt * 0.1)
* Quaternion::rotation_z(tilt * 1.5);
next.tail.scale = Vec3::one();
@@ -226,7 +225,7 @@ impl Animation for RunAnimation {
skeleton_attr.hand.2 + (foot1a * -3.0).max(1.0) * amplitude2,
);
next.hand_l.orientation =
- Quaternion::rotation_x((amplitude2 * foot1b * 0.9 + canceler * 0.9).max(0.5))
+ Quaternion::rotation_x((amplitude2 * foot1b * 0.9 + canceler * 0.9))
* Quaternion::rotation_y(tilt * -1.0);
next.hand_l.scale = Vec3::one() * 0.96;
@@ -236,7 +235,7 @@ impl Animation for RunAnimation {
skeleton_attr.hand.2 + (foot2a * -3.0).max(1.0) * amplitude2,
);
next.hand_r.orientation =
- Quaternion::rotation_x((amplitude2 * foot2b * 0.9 + canceler * 0.7).max(0.5))
+ Quaternion::rotation_x((amplitude2 * foot2b * 0.9 + canceler * 0.7))
* Quaternion::rotation_y(tilt * -1.0);
next.hand_r.scale = Vec3::one() * 0.96;
@@ -246,7 +245,7 @@ impl Animation for RunAnimation {
0.0 + amplitude3 * foot3a * -2.5,
);
next.leg_control_l.orientation =
- Quaternion::rotation_x(canceler * -0.4 + amplitude3 * foot3b * 0.3)
+ Quaternion::rotation_x(canceler * -0.4 + amplitude3 * foot3b * 0.4 + 0.5)
* Quaternion::rotation_y(tilt * 1.5)
* Quaternion::rotation_z(tilt * -1.5);
next.leg_control_l.scale = Vec3::one() * 1.02;
@@ -257,7 +256,7 @@ impl Animation for RunAnimation {
0.0 + amplitude3 * foot4a * -2.5,
);
next.leg_control_r.orientation =
- Quaternion::rotation_x(canceler * -0.4 + amplitude3 * foot4b * 0.3)
+ Quaternion::rotation_x(canceler * -0.4 + amplitude3 * foot4b * 0.4 + 0.5)
* Quaternion::rotation_y(tilt * 1.5)
* Quaternion::rotation_z(tilt * -1.5);
next.leg_control_r.scale = Vec3::one() * 1.02;
diff --git a/voxygen/src/anim/src/biped_large/shoot.rs b/voxygen/src/anim/src/biped_large/shoot.rs
index 9db3bd04a5..d0e9e2e0ae 100644
--- a/voxygen/src/anim/src/biped_large/shoot.rs
+++ b/voxygen/src/anim/src/biped_large/shoot.rs
@@ -171,17 +171,17 @@ impl Animation for ShootAnimation {
-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);
@@ -275,19 +275,19 @@ impl Animation for ShootAnimation {
-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(_)) => {
diff --git a/voxygen/src/anim/src/biped_large/spinmelee.rs b/voxygen/src/anim/src/biped_large/spinmelee.rs
index 26aac3af6b..5577aed181 100644
--- a/voxygen/src/anim/src/biped_large/spinmelee.rs
+++ b/voxygen/src/anim/src/biped_large/spinmelee.rs
@@ -105,13 +105,13 @@ impl Animation for SpinMeleeAnimation {
-skeleton_attr.foot.0,
skeleton_attr.foot.1 + movement * 4.0,
skeleton_attr.foot.2,
- ) / 8.0;
+ );
next.foot_l.orientation = Quaternion::rotation_x(movement * 0.2);
next.foot_r.position = Vec3::new(
skeleton_attr.foot.0,
skeleton_attr.foot.1 + movement * -12.0,
skeleton_attr.foot.2 + movement * 1.0 + quick * 1.0,
- ) / 8.0;
+ );
next.foot_r.orientation = Quaternion::rotation_x(movement * -1.0)
* Quaternion::rotation_z(movement * -0.8);
},