diff --git a/assets/common/items/armor/carapace/back.ron b/assets/common/items/armor/carapace/back.ron new file mode 100644 index 0000000000..6caa0fd72d --- /dev/null +++ b/assets/common/items/armor/carapace/back.ron @@ -0,0 +1,13 @@ +ItemDef( + name: "Carapace Cape", + description: "Shell that once shielded a beast.", + kind: Armor(( + kind: Back("Carapace"), + stats: ( + protection: Normal(4.0), + poise_resilience: Normal(0.2), + ), + )), + quality: Moderate, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/armor/carapace/belt.ron b/assets/common/items/armor/carapace/belt.ron new file mode 100644 index 0000000000..aec15668af --- /dev/null +++ b/assets/common/items/armor/carapace/belt.ron @@ -0,0 +1,13 @@ +ItemDef( + name: "Carapace Belt", + description: "Shell that once shielded a beast.", + kind: Armor(( + kind: Belt("Carapace"), + stats: ( + protection: Normal(4.0), + poise_resilience: Normal(1.0), + ), + )), + quality: Moderate, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/armor/carapace/chest.ron b/assets/common/items/armor/carapace/chest.ron new file mode 100644 index 0000000000..597dbc9078 --- /dev/null +++ b/assets/common/items/armor/carapace/chest.ron @@ -0,0 +1,13 @@ +ItemDef( + name: "Carapace Cuirass", + description: "Shell that once shielded a beast.", + kind: Armor(( + kind: Chest("Carapace"), + stats: ( + protection: Normal(25.0), + poise_resilience: Normal(1.0), + ), + )), + quality: High, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/armor/carapace/foot.ron b/assets/common/items/armor/carapace/foot.ron new file mode 100644 index 0000000000..4ee009005a --- /dev/null +++ b/assets/common/items/armor/carapace/foot.ron @@ -0,0 +1,13 @@ +ItemDef( + name: "Carapace Boots", + description: "Shell that once shielded a beast.", + kind: Armor(( + kind: Foot("Carapace"), + stats: ( + protection: Normal(5.0), + poise_resilience: Normal(1.0), + ), + )), + quality: High, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/armor/carapace/hand.ron b/assets/common/items/armor/carapace/hand.ron new file mode 100644 index 0000000000..83c817cfc2 --- /dev/null +++ b/assets/common/items/armor/carapace/hand.ron @@ -0,0 +1,13 @@ +ItemDef( + name: "Carapace Gauntlets", + description: "Shell that once shielded a beast.", + kind: Armor(( + kind: Hand("Carapace"), + stats: ( + protection: Normal(10.0), + poise_resilience: Normal(1.0), + ), + )), + quality: Moderate, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/armor/carapace/pants.ron b/assets/common/items/armor/carapace/pants.ron new file mode 100644 index 0000000000..811a425d6f --- /dev/null +++ b/assets/common/items/armor/carapace/pants.ron @@ -0,0 +1,13 @@ +ItemDef( + name: "Carapace Chausses", + description: "Shell that once shielded a beast.", + kind: Armor(( + kind: Pants("Carapace"), + stats: ( + protection: Normal(20.0), + poise_resilience: Normal(1.0), + ), + )), + quality: Moderate, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/armor/carapace/shoulder.ron b/assets/common/items/armor/carapace/shoulder.ron new file mode 100644 index 0000000000..713ef61d2d --- /dev/null +++ b/assets/common/items/armor/carapace/shoulder.ron @@ -0,0 +1,13 @@ +ItemDef( + name: "Carapace Shoulder Pad", + description: "Shell that once shielded a beast.", + kind: Armor(( + kind: Shoulder("Carapace"), + stats: ( + protection: Normal(15.0), + poise_resilience: Normal(1.0), + ), + )), + quality: Moderate, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/armor/dragonscale/back.ron b/assets/common/items/armor/dragonscale/back.ron new file mode 100644 index 0000000000..12d4754faf --- /dev/null +++ b/assets/common/items/armor/dragonscale/back.ron @@ -0,0 +1,13 @@ +ItemDef( + name: "Dragonscale cape", + description: "Power pulses through it.", + kind: Armor(( + kind: Back("Dragonscale"), + stats: ( + protection: Normal(4.0), + poise_resilience: Normal(0.2), + ), + )), + quality: Moderate, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/armor/dragonscale/belt.ron b/assets/common/items/armor/dragonscale/belt.ron new file mode 100644 index 0000000000..293a787a53 --- /dev/null +++ b/assets/common/items/armor/dragonscale/belt.ron @@ -0,0 +1,13 @@ +ItemDef( + name: "Dragonscale Belt", + description: "Power pulses through it.", + kind: Armor(( + kind: Belt("Dragonscale"), + stats: ( + protection: Normal(6.0), + poise_resilience: Normal(1.0), + ), + )), + quality: Epic, + tags: [], +) diff --git a/assets/common/items/armor/dragonscale/chest.ron b/assets/common/items/armor/dragonscale/chest.ron new file mode 100644 index 0000000000..cf79326090 --- /dev/null +++ b/assets/common/items/armor/dragonscale/chest.ron @@ -0,0 +1,13 @@ +ItemDef( + name: "Dragonscale Chest", + description: "Power pulses through it.", + kind: Armor(( + kind: Chest("Dragonscale"), + stats: ( + protection: Normal(30.0), + poise_resilience: Normal(1.0), + ), + )), + quality: Epic, + tags: [], +) diff --git a/assets/common/items/armor/dragonscale/foot.ron b/assets/common/items/armor/dragonscale/foot.ron new file mode 100644 index 0000000000..ac831b84a4 --- /dev/null +++ b/assets/common/items/armor/dragonscale/foot.ron @@ -0,0 +1,13 @@ +ItemDef( + name: "Dragonscale Boots", + description: "Power pulses through it.", + kind: Armor(( + kind: Foot("Dragonscale"), + stats: ( + protection: Normal(6.0), + poise_resilience: Normal(1.0), + ), + )), + quality: Epic, + tags: [], +) diff --git a/assets/common/items/armor/dragonscale/hand.ron b/assets/common/items/armor/dragonscale/hand.ron new file mode 100644 index 0000000000..e5306fdc3a --- /dev/null +++ b/assets/common/items/armor/dragonscale/hand.ron @@ -0,0 +1,13 @@ +ItemDef( + name: "Dragonscale Gloves", + description: "Power pulses through it.", + kind: Armor(( + kind: Hand("Dragonscale"), + stats: ( + protection: Normal(12.0), + poise_resilience: Normal(8.0), + ), + )), + quality: Epic, + tags: [], +) diff --git a/assets/common/items/armor/dragonscale/pants.ron b/assets/common/items/armor/dragonscale/pants.ron new file mode 100644 index 0000000000..6a54b21374 --- /dev/null +++ b/assets/common/items/armor/dragonscale/pants.ron @@ -0,0 +1,13 @@ +ItemDef( + name: "Dragonscale Skirt", + description: "Power pulses through it.", + kind: Armor(( + kind: Pants("Dragonscale"), + stats: ( + protection: Normal(24.0), + poise_resilience: Normal(1.0), + ), + )), + quality: Epic, + tags: [], +) diff --git a/assets/common/items/armor/dragonscale/shoulder.ron b/assets/common/items/armor/dragonscale/shoulder.ron new file mode 100644 index 0000000000..c235a90a33 --- /dev/null +++ b/assets/common/items/armor/dragonscale/shoulder.ron @@ -0,0 +1,13 @@ +ItemDef( + name: "Dragonscale Mantle", + description: "Power pulses through it.", + kind: Armor(( + kind: Shoulder("Dragonscale"), + stats: ( + protection: Normal(18.0), + poise_resilience: Normal(1.0), + ), + )), + quality: Epic, + tags: [], +) diff --git a/assets/common/items/armor/platescale/back.ron b/assets/common/items/armor/platescale/back.ron new file mode 100644 index 0000000000..b905544818 --- /dev/null +++ b/assets/common/items/armor/platescale/back.ron @@ -0,0 +1,13 @@ +ItemDef( + name: "Platescale cape", + description: "Smithed from hide tougher than steel.", + kind: Armor(( + kind: Back("Platescale"), + stats: ( + protection: Normal(4.0), + poise_resilience: Normal(0.2), + ), + )), + quality: Moderate, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/armor/platescale/belt.ron b/assets/common/items/armor/platescale/belt.ron new file mode 100644 index 0000000000..a9541d787a --- /dev/null +++ b/assets/common/items/armor/platescale/belt.ron @@ -0,0 +1,13 @@ +ItemDef( + name: "Platescale Belt", + description: "Smithed from hide tougher than steel.", + kind: Armor(( + kind: Belt("Platescale"), + stats: ( + protection: Normal(4.0), + poise_resilience: Normal(1.0), + ), + )), + quality: Moderate, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/armor/platescale/chest.ron b/assets/common/items/armor/platescale/chest.ron new file mode 100644 index 0000000000..0bef3dbeb2 --- /dev/null +++ b/assets/common/items/armor/platescale/chest.ron @@ -0,0 +1,13 @@ +ItemDef( + name: "Platescale Cuirass", + description: "Smithed from hide tougher than steel.", + kind: Armor(( + kind: Chest("Platescale"), + stats: ( + protection: Normal(25.0), + poise_resilience: Normal(1.0), + ), + )), + quality: High, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/armor/platescale/foot.ron b/assets/common/items/armor/platescale/foot.ron new file mode 100644 index 0000000000..79885dc632 --- /dev/null +++ b/assets/common/items/armor/platescale/foot.ron @@ -0,0 +1,13 @@ +ItemDef( + name: "Platescale Boots", + description: "Smithed from hide tougher than steel.", + kind: Armor(( + kind: Foot("Platescale"), + stats: ( + protection: Normal(5.0), + poise_resilience: Normal(1.0), + ), + )), + quality: High, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/armor/platescale/hand.ron b/assets/common/items/armor/platescale/hand.ron new file mode 100644 index 0000000000..9c4bea5a4f --- /dev/null +++ b/assets/common/items/armor/platescale/hand.ron @@ -0,0 +1,13 @@ +ItemDef( + name: "Platescale Gauntlets", + description: "Smithed from hide tougher than steel.", + kind: Armor(( + kind: Hand("Platescale"), + stats: ( + protection: Normal(10.0), + poise_resilience: Normal(1.0), + ), + )), + quality: Moderate, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/armor/platescale/pants.ron b/assets/common/items/armor/platescale/pants.ron new file mode 100644 index 0000000000..d0fbd6b6af --- /dev/null +++ b/assets/common/items/armor/platescale/pants.ron @@ -0,0 +1,13 @@ +ItemDef( + name: "Platescale Chausses", + description: "Smithed from hide tougher than steel.", + kind: Armor(( + kind: Pants("Platescale"), + stats: ( + protection: Normal(20.0), + poise_resilience: Normal(1.0), + ), + )), + quality: Moderate, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/armor/platescale/shoulder.ron b/assets/common/items/armor/platescale/shoulder.ron new file mode 100644 index 0000000000..77642ba97f --- /dev/null +++ b/assets/common/items/armor/platescale/shoulder.ron @@ -0,0 +1,13 @@ +ItemDef( + name: "Platescale Shoulder Pad", + description: "Smithed from hide tougher than steel.", + kind: Armor(( + kind: Shoulder("Platescale"), + stats: ( + protection: Normal(15.0), + poise_resilience: Normal(1.0), + ), + )), + quality: Moderate, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/armor/savage/back.ron b/assets/common/items/armor/savage/back.ron new file mode 100644 index 0000000000..090c8f5cd8 --- /dev/null +++ b/assets/common/items/armor/savage/back.ron @@ -0,0 +1,13 @@ +ItemDef( + name: "Savage Cape", + description: "Brings the fury of the barbarians.", + kind: Armor(( + kind: Back("Savage"), + stats: ( + protection: Normal(4.0), + poise_resilience: Normal(0.2), + ), + )), + quality: Moderate, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/armor/savage/belt.ron b/assets/common/items/armor/savage/belt.ron new file mode 100644 index 0000000000..94e9d34a5e --- /dev/null +++ b/assets/common/items/armor/savage/belt.ron @@ -0,0 +1,13 @@ +ItemDef( + name: "Savage Belt", + description: "Brings the fury of the barbarians.", + kind: Armor(( + kind: Belt("Savage"), + stats: ( + protection: Normal(4.0), + poise_resilience: Normal(1.0), + ), + )), + quality: Moderate, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/armor/savage/chest.ron b/assets/common/items/armor/savage/chest.ron new file mode 100644 index 0000000000..bac447837d --- /dev/null +++ b/assets/common/items/armor/savage/chest.ron @@ -0,0 +1,13 @@ +ItemDef( + name: "Savage Cuirass", + description: "Brings the fury of the barbarians.", + kind: Armor(( + kind: Chest("Savage"), + stats: ( + protection: Normal(25.0), + poise_resilience: Normal(1.0), + ), + )), + quality: High, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/armor/savage/foot.ron b/assets/common/items/armor/savage/foot.ron new file mode 100644 index 0000000000..c420b8c245 --- /dev/null +++ b/assets/common/items/armor/savage/foot.ron @@ -0,0 +1,13 @@ +ItemDef( + name: "Savage Boots", + description: "Brings the fury of the barbarians.", + kind: Armor(( + kind: Foot("Savage"), + stats: ( + protection: Normal(5.0), + poise_resilience: Normal(1.0), + ), + )), + quality: High, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/armor/savage/hand.ron b/assets/common/items/armor/savage/hand.ron new file mode 100644 index 0000000000..2d51883bf9 --- /dev/null +++ b/assets/common/items/armor/savage/hand.ron @@ -0,0 +1,13 @@ +ItemDef( + name: "Savage Gauntlets", + description: "Brings the fury of the barbarians.", + kind: Armor(( + kind: Hand("Savage"), + stats: ( + protection: Normal(10.0), + poise_resilience: Normal(1.0), + ), + )), + quality: Moderate, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/armor/savage/pants.ron b/assets/common/items/armor/savage/pants.ron new file mode 100644 index 0000000000..6348cdfe7f --- /dev/null +++ b/assets/common/items/armor/savage/pants.ron @@ -0,0 +1,13 @@ +ItemDef( + name: "Savage Chausses", + description: "Brings the fury of the barbarians.", + kind: Armor(( + kind: Pants("Savage"), + stats: ( + protection: Normal(20.0), + poise_resilience: Normal(1.0), + ), + )), + quality: Moderate, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/armor/savage/shoulder.ron b/assets/common/items/armor/savage/shoulder.ron new file mode 100644 index 0000000000..6c6362473d --- /dev/null +++ b/assets/common/items/armor/savage/shoulder.ron @@ -0,0 +1,13 @@ +ItemDef( + name: "Savage Shoulder Pad", + description: "Brings the fury of the barbarians.", + kind: Armor(( + kind: Shoulder("Savage"), + stats: ( + protection: Normal(15.0), + poise_resilience: Normal(1.0), + ), + )), + quality: Moderate, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/armor/scale/back.ron b/assets/common/items/armor/scale/back.ron new file mode 100644 index 0000000000..b70d526270 --- /dev/null +++ b/assets/common/items/armor/scale/back.ron @@ -0,0 +1,13 @@ +ItemDef( + name: "Scale cape", + description: "Each embedded scale provides protection.", + kind: Armor(( + kind: Back("Scale"), + stats: ( + protection: Normal(4.0), + poise_resilience: Normal(0.2), + ), + )), + quality: Moderate, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/armor/scale/belt.ron b/assets/common/items/armor/scale/belt.ron new file mode 100644 index 0000000000..f45402dba1 --- /dev/null +++ b/assets/common/items/armor/scale/belt.ron @@ -0,0 +1,13 @@ +ItemDef( + name: "Scale Belt", + description: "Each embedded scale provides protection.", + kind: Armor(( + kind: Belt("Scale"), + stats: ( + protection: Normal(2.0), + poise_resilience: Normal(1.0), + ), + )), + quality: Moderate, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/armor/scale/chest.ron b/assets/common/items/armor/scale/chest.ron new file mode 100644 index 0000000000..10981f5a80 --- /dev/null +++ b/assets/common/items/armor/scale/chest.ron @@ -0,0 +1,13 @@ +ItemDef( + name: "Scale Chestpiece", + description: "Each embedded scale provides protection.", + kind: Armor(( + kind: Chest("Scale"), + stats: ( + protection: Normal(15.0), + poise_resilience: Normal(1.0), + ), + )), + quality: Moderate, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/armor/scale/foot.ron b/assets/common/items/armor/scale/foot.ron new file mode 100644 index 0000000000..f3e5f7a384 --- /dev/null +++ b/assets/common/items/armor/scale/foot.ron @@ -0,0 +1,13 @@ +ItemDef( + name: "Scale Boots", + description: "Each embedded scale provides protection.", + kind: Armor(( + kind: Foot("Scale"), + stats: ( + protection: Normal(3.0), + poise_resilience: Normal(1.0), + ), + )), + quality: Moderate, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/armor/scale/hand.ron b/assets/common/items/armor/scale/hand.ron new file mode 100644 index 0000000000..f0bf7059b3 --- /dev/null +++ b/assets/common/items/armor/scale/hand.ron @@ -0,0 +1,13 @@ +ItemDef( + name: "Scale Wraps", + description: "Each embedded scale provides protection.", + kind: Armor(( + kind: Hand("Scale"), + stats: ( + protection: Normal(6.0), + poise_resilience: Normal(1.0), + ), + )), + quality: Moderate, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/armor/scale/pants.ron b/assets/common/items/armor/scale/pants.ron new file mode 100644 index 0000000000..6b50b28396 --- /dev/null +++ b/assets/common/items/armor/scale/pants.ron @@ -0,0 +1,13 @@ +ItemDef( + name: "Scale Pants", + description: "Each embedded scale provides protection.", + kind: Armor(( + kind: Pants("Scale"), + stats: ( + protection: Normal(12.0), + poise_resilience: Normal(1.0), + ), + )), + quality: Moderate, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/armor/scale/shoulder.ron b/assets/common/items/armor/scale/shoulder.ron new file mode 100644 index 0000000000..46deeeb43c --- /dev/null +++ b/assets/common/items/armor/scale/shoulder.ron @@ -0,0 +1,13 @@ +ItemDef( + name: "Scale Shoulders", + description: "Each embedded scale provides protection.", + kind: Armor(( + kind: Shoulder("Scale"), + stats: ( + protection: Normal(9.0), + poise_resilience: Normal(1.0), + ), + )), + quality: Common, + tags: [], +) \ No newline at end of file diff --git a/assets/common/loot_tables/creature/quad_low/default.ron b/assets/common/loot_tables/creature/quad_low/default.ron index 682bad6819..05f8e75b71 100644 --- a/assets/common/loot_tables/creature/quad_low/default.ron +++ b/assets/common/loot_tables/creature/quad_low/default.ron @@ -1,4 +1,4 @@ [ (1.0, Item("common.items.food.meat.tough_raw")), - (3.0, Item("common.items.crafting_ing.leather.leather_strips")), + (3.0, Item("common.items.crafting_ing.scales")), ] \ No newline at end of file diff --git a/assets/common/loot_tables/creature/quad_low/lavadrake.ron b/assets/common/loot_tables/creature/quad_low/lavadrake.ron new file mode 100644 index 0000000000..9594d282c3 --- /dev/null +++ b/assets/common/loot_tables/creature/quad_low/lavadrake.ron @@ -0,0 +1,4 @@ +[ + (1.0, Item("common.items.food.meat.tough_raw")), + (3.0, Item("common.items.crafting_ing.carapace")), +] \ No newline at end of file diff --git a/assets/common/loot_tables/creature/theropod/default.ron b/assets/common/loot_tables/creature/theropod/default.ron index 0ab536c87c..95e74724bd 100644 --- a/assets/common/loot_tables/creature/theropod/default.ron +++ b/assets/common/loot_tables/creature/theropod/default.ron @@ -1,3 +1,3 @@ [ - (1.0, Item("common.items.crafting_ing.hide.tough_hide")), + (1.0, Item("common.items.crafting_ing.plate")), ] \ No newline at end of file diff --git a/assets/voxygen/item_image_manifest.ron b/assets/voxygen/item_image_manifest.ron index d4c125db31..3d9e01aee7 100644 --- a/assets/voxygen/item_image_manifest.ron +++ b/assets/voxygen/item_image_manifest.ron @@ -1695,6 +1695,151 @@ "voxel.armor.warlock.shoulder", (0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2, ), + //Scale Set + Armor(Chest("Scale")): VoxTrans( + "voxel.armor.scale.chest", + (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2, + ), + Armor(Pants("Scale")): VoxTrans( + "voxel.armor.scale.pants", + (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2, + ), + Armor(Belt("Scale")): VoxTrans( + "voxel.armor.scale.belt", + (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.4, + ), + Armor(Foot("Scale")): VoxTrans( + "voxel.armor.scale.foot", + (0.0, 0.0, 0.0), (-95.0, 140.0, 0.0), 1.1, + ), + Armor(Hand("Scale")): VoxTrans( + "voxel.armor.scale.hand", + (0.0, -1.0, 0.0), (-90.0, 135.0, 0.0), 1.0, + ), + Armor(Shoulder("Scale")): VoxTrans( + "voxel.armor.scale.shoulder", + (0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2, + ), + Armor(Back("Scale")): VoxTrans( + "voxel.armor.scale.back", + (0.0, 0.0, 0.0), (-90.0, 0.0, 0.0), 1.0, + ), + //Carapace Set + Armor(Chest("Carapace")): VoxTrans( + "voxel.armor.carapace.chest", + (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2, + ), + Armor(Pants("Carapace")): VoxTrans( + "voxel.armor.carapace.pants", + (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2, + ), + Armor(Belt("Carapace")): VoxTrans( + "voxel.armor.carapace.belt", + (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.4, + ), + Armor(Foot("Carapace")): VoxTrans( + "voxel.armor.carapace.foot", + (0.0, 0.0, 0.0), (-95.0, 140.0, 0.0), 1.1, + ), + Armor(Hand("Carapace")): VoxTrans( + "voxel.armor.carapace.hand", + (0.0, -1.0, 0.0), (-90.0, 135.0, 0.0), 1.0, + ), + Armor(Shoulder("Carapace")): VoxTrans( + "voxel.armor.carapace.shoulder", + (0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2, + ), + Armor(Back("Carapace")): VoxTrans( + "voxel.armor.carapace.back", + (0.0, 0.0, 0.0), (-90.0, 0.0, 0.0), 1.0, + ), + //Platescale Set + Armor(Chest("Platescale")): VoxTrans( + "voxel.armor.platescale.chest", + (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2, + ), + Armor(Pants("Platescale")): VoxTrans( + "voxel.armor.platescale.pants", + (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2, + ), + Armor(Belt("Platescale")): VoxTrans( + "voxel.armor.platescale.belt", + (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.4, + ), + Armor(Foot("Platescale")): VoxTrans( + "voxel.armor.platescale.foot", + (0.0, 0.0, 0.0), (-95.0, 140.0, 0.0), 1.1, + ), + Armor(Hand("Platescale")): VoxTrans( + "voxel.armor.platescale.hand", + (0.0, -1.0, 0.0), (-90.0, 135.0, 0.0), 1.0, + ), + Armor(Shoulder("Platescale")): VoxTrans( + "voxel.armor.platescale.shoulder", + (0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2, + ), + Armor(Back("Platescale")): VoxTrans( + "voxel.armor.platescale.back", + (0.0, 0.0, 0.0), (-90.0, 0.0, 0.0), 1.0, + ), + //Dragonscale Set + Armor(Chest("Dragonscale")): VoxTrans( + "voxel.armor.dragonscale.chest", + (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2, + ), + Armor(Pants("Dragonscale")): VoxTrans( + "voxel.armor.dragonscale.pants", + (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2, + ), + Armor(Belt("Dragonscale")): VoxTrans( + "voxel.armor.dragonscale.belt", + (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.4, + ), + Armor(Foot("Dragonscale")): VoxTrans( + "voxel.armor.dragonscale.foot", + (0.0, 0.0, 0.0), (-95.0, 140.0, 0.0), 1.1, + ), + Armor(Hand("Dragonscale")): VoxTrans( + "voxel.armor.dragonscale.hand", + (0.0, -1.0, 0.0), (-90.0, 135.0, 0.0), 1.0, + ), + Armor(Shoulder("Dragonscale")): VoxTrans( + "voxel.armor.dragonscale.shoulder", + (0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2, + ), + Armor(Back("Dragonscale")): VoxTrans( + "voxel.armor.dragonscale.back", + (0.0, 0.0, 0.0), (-90.0, 0.0, 0.0), 1.0, + ), + //Savage Set + Armor(Chest("Savage")): VoxTrans( + "voxel.armor.savage.chest", + (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2, + ), + Armor(Pants("Savage")): VoxTrans( + "voxel.armor.savage.pants", + (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2, + ), + Armor(Belt("Savage")): VoxTrans( + "voxel.armor.savage.belt", + (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.4, + ), + Armor(Foot("Savage")): VoxTrans( + "voxel.armor.savage.foot", + (0.0, 0.0, 0.0), (-95.0, 140.0, 0.0), 1.1, + ), + Armor(Hand("Savage")): VoxTrans( + "voxel.armor.savage.hand", + (0.0, -1.0, 0.0), (-90.0, 135.0, 0.0), 1.0, + ), + Armor(Shoulder("Savage")): VoxTrans( + "voxel.armor.savage.shoulder", + (0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2, + ), + Armor(Back("Savage")): VoxTrans( + "voxel.armor.savage.back", + (0.0, 0.0, 0.0), (-90.0, 0.0, 0.0), 1.0, + ), //misc Armor(Pants("Hunting")): VoxTrans( "voxel.armor.misc.pants.grayscale", diff --git a/assets/voxygen/voxel/armor/carapace/back.vox b/assets/voxygen/voxel/armor/carapace/back.vox new file mode 100644 index 0000000000..1066243471 Binary files /dev/null and b/assets/voxygen/voxel/armor/carapace/back.vox differ diff --git a/assets/voxygen/voxel/armor/carapace/belt.vox b/assets/voxygen/voxel/armor/carapace/belt.vox new file mode 100644 index 0000000000..2786538676 Binary files /dev/null and b/assets/voxygen/voxel/armor/carapace/belt.vox differ diff --git a/assets/voxygen/voxel/armor/carapace/chest.vox b/assets/voxygen/voxel/armor/carapace/chest.vox new file mode 100644 index 0000000000..ad9fb0b9b2 Binary files /dev/null and b/assets/voxygen/voxel/armor/carapace/chest.vox differ diff --git a/assets/voxygen/voxel/armor/carapace/foot.vox b/assets/voxygen/voxel/armor/carapace/foot.vox new file mode 100644 index 0000000000..79e8838768 Binary files /dev/null and b/assets/voxygen/voxel/armor/carapace/foot.vox differ diff --git a/assets/voxygen/voxel/armor/carapace/hand.vox b/assets/voxygen/voxel/armor/carapace/hand.vox new file mode 100644 index 0000000000..41ad4c4d51 Binary files /dev/null and b/assets/voxygen/voxel/armor/carapace/hand.vox differ diff --git a/assets/voxygen/voxel/armor/carapace/pants.vox b/assets/voxygen/voxel/armor/carapace/pants.vox new file mode 100644 index 0000000000..6e288aa2b7 Binary files /dev/null and b/assets/voxygen/voxel/armor/carapace/pants.vox differ diff --git a/assets/voxygen/voxel/armor/carapace/shoulder.vox b/assets/voxygen/voxel/armor/carapace/shoulder.vox new file mode 100644 index 0000000000..ce6af04142 Binary files /dev/null and b/assets/voxygen/voxel/armor/carapace/shoulder.vox differ diff --git a/assets/voxygen/voxel/armor/dragonscale/back.vox b/assets/voxygen/voxel/armor/dragonscale/back.vox new file mode 100644 index 0000000000..2a7bcbe6ab Binary files /dev/null and b/assets/voxygen/voxel/armor/dragonscale/back.vox differ diff --git a/assets/voxygen/voxel/armor/dragonscale/belt.vox b/assets/voxygen/voxel/armor/dragonscale/belt.vox new file mode 100644 index 0000000000..3ecb3c4c97 Binary files /dev/null and b/assets/voxygen/voxel/armor/dragonscale/belt.vox differ diff --git a/assets/voxygen/voxel/armor/dragonscale/chest.vox b/assets/voxygen/voxel/armor/dragonscale/chest.vox new file mode 100644 index 0000000000..7d8c5739a0 Binary files /dev/null and b/assets/voxygen/voxel/armor/dragonscale/chest.vox differ diff --git a/assets/voxygen/voxel/armor/dragonscale/foot.vox b/assets/voxygen/voxel/armor/dragonscale/foot.vox new file mode 100644 index 0000000000..7352e69e02 Binary files /dev/null and b/assets/voxygen/voxel/armor/dragonscale/foot.vox differ diff --git a/assets/voxygen/voxel/armor/dragonscale/hand.vox b/assets/voxygen/voxel/armor/dragonscale/hand.vox new file mode 100644 index 0000000000..c725be65b4 Binary files /dev/null and b/assets/voxygen/voxel/armor/dragonscale/hand.vox differ diff --git a/assets/voxygen/voxel/armor/dragonscale/pants.vox b/assets/voxygen/voxel/armor/dragonscale/pants.vox new file mode 100644 index 0000000000..60fd05f2f0 Binary files /dev/null and b/assets/voxygen/voxel/armor/dragonscale/pants.vox differ diff --git a/assets/voxygen/voxel/armor/dragonscale/shoulder.vox b/assets/voxygen/voxel/armor/dragonscale/shoulder.vox new file mode 100644 index 0000000000..dd5e609c99 Binary files /dev/null and b/assets/voxygen/voxel/armor/dragonscale/shoulder.vox differ diff --git a/assets/voxygen/voxel/armor/platescale/back.vox b/assets/voxygen/voxel/armor/platescale/back.vox new file mode 100644 index 0000000000..d1b3869686 Binary files /dev/null and b/assets/voxygen/voxel/armor/platescale/back.vox differ diff --git a/assets/voxygen/voxel/armor/platescale/belt.vox b/assets/voxygen/voxel/armor/platescale/belt.vox new file mode 100644 index 0000000000..9b9befaef9 Binary files /dev/null and b/assets/voxygen/voxel/armor/platescale/belt.vox differ diff --git a/assets/voxygen/voxel/armor/platescale/chest.vox b/assets/voxygen/voxel/armor/platescale/chest.vox new file mode 100644 index 0000000000..c66aa998f1 Binary files /dev/null and b/assets/voxygen/voxel/armor/platescale/chest.vox differ diff --git a/assets/voxygen/voxel/armor/platescale/foot.vox b/assets/voxygen/voxel/armor/platescale/foot.vox new file mode 100644 index 0000000000..ecd5679ad3 Binary files /dev/null and b/assets/voxygen/voxel/armor/platescale/foot.vox differ diff --git a/assets/voxygen/voxel/armor/platescale/hand.vox b/assets/voxygen/voxel/armor/platescale/hand.vox new file mode 100644 index 0000000000..f1b9a5760b Binary files /dev/null and b/assets/voxygen/voxel/armor/platescale/hand.vox differ diff --git a/assets/voxygen/voxel/armor/platescale/pants.vox b/assets/voxygen/voxel/armor/platescale/pants.vox new file mode 100644 index 0000000000..ca42554b89 Binary files /dev/null and b/assets/voxygen/voxel/armor/platescale/pants.vox differ diff --git a/assets/voxygen/voxel/armor/platescale/shoulder.vox b/assets/voxygen/voxel/armor/platescale/shoulder.vox new file mode 100644 index 0000000000..c09526385e Binary files /dev/null and b/assets/voxygen/voxel/armor/platescale/shoulder.vox differ diff --git a/assets/voxygen/voxel/armor/savage/back.vox b/assets/voxygen/voxel/armor/savage/back.vox new file mode 100644 index 0000000000..c8ed83cf86 Binary files /dev/null and b/assets/voxygen/voxel/armor/savage/back.vox differ diff --git a/assets/voxygen/voxel/armor/savage/belt.vox b/assets/voxygen/voxel/armor/savage/belt.vox new file mode 100644 index 0000000000..6f26b6a1e2 Binary files /dev/null and b/assets/voxygen/voxel/armor/savage/belt.vox differ diff --git a/assets/voxygen/voxel/armor/savage/chest.vox b/assets/voxygen/voxel/armor/savage/chest.vox new file mode 100644 index 0000000000..5987d9a856 Binary files /dev/null and b/assets/voxygen/voxel/armor/savage/chest.vox differ diff --git a/assets/voxygen/voxel/armor/savage/foot.vox b/assets/voxygen/voxel/armor/savage/foot.vox new file mode 100644 index 0000000000..1ef779ff90 Binary files /dev/null and b/assets/voxygen/voxel/armor/savage/foot.vox differ diff --git a/assets/voxygen/voxel/armor/savage/hand.vox b/assets/voxygen/voxel/armor/savage/hand.vox new file mode 100644 index 0000000000..ea7fa833e0 Binary files /dev/null and b/assets/voxygen/voxel/armor/savage/hand.vox differ diff --git a/assets/voxygen/voxel/armor/savage/pants.vox b/assets/voxygen/voxel/armor/savage/pants.vox new file mode 100644 index 0000000000..91ba6091f2 Binary files /dev/null and b/assets/voxygen/voxel/armor/savage/pants.vox differ diff --git a/assets/voxygen/voxel/armor/savage/shoulder.vox b/assets/voxygen/voxel/armor/savage/shoulder.vox new file mode 100644 index 0000000000..34546b7c23 Binary files /dev/null and b/assets/voxygen/voxel/armor/savage/shoulder.vox differ diff --git a/assets/voxygen/voxel/armor/scale/back.vox b/assets/voxygen/voxel/armor/scale/back.vox new file mode 100644 index 0000000000..e849dd0832 Binary files /dev/null and b/assets/voxygen/voxel/armor/scale/back.vox differ diff --git a/assets/voxygen/voxel/armor/scale/belt.vox b/assets/voxygen/voxel/armor/scale/belt.vox new file mode 100644 index 0000000000..2037c3417c Binary files /dev/null and b/assets/voxygen/voxel/armor/scale/belt.vox differ diff --git a/assets/voxygen/voxel/armor/scale/chest.vox b/assets/voxygen/voxel/armor/scale/chest.vox new file mode 100644 index 0000000000..dab455182a Binary files /dev/null and b/assets/voxygen/voxel/armor/scale/chest.vox differ diff --git a/assets/voxygen/voxel/armor/scale/foot.vox b/assets/voxygen/voxel/armor/scale/foot.vox new file mode 100644 index 0000000000..752ea354b2 Binary files /dev/null and b/assets/voxygen/voxel/armor/scale/foot.vox differ diff --git a/assets/voxygen/voxel/armor/scale/hand.vox b/assets/voxygen/voxel/armor/scale/hand.vox new file mode 100644 index 0000000000..faac5be38a Binary files /dev/null and b/assets/voxygen/voxel/armor/scale/hand.vox differ diff --git a/assets/voxygen/voxel/armor/scale/pants.vox b/assets/voxygen/voxel/armor/scale/pants.vox new file mode 100644 index 0000000000..f62edc336f Binary files /dev/null and b/assets/voxygen/voxel/armor/scale/pants.vox differ diff --git a/assets/voxygen/voxel/armor/scale/shoulder.vox b/assets/voxygen/voxel/armor/scale/shoulder.vox new file mode 100644 index 0000000000..48af06c087 Binary files /dev/null and b/assets/voxygen/voxel/armor/scale/shoulder.vox differ diff --git a/assets/voxygen/voxel/armor/swift/back.vox b/assets/voxygen/voxel/armor/swift/back.vox new file mode 100644 index 0000000000..2e939ecbb7 Binary files /dev/null and b/assets/voxygen/voxel/armor/swift/back.vox differ diff --git a/assets/voxygen/voxel/armor/swift/belt.vox b/assets/voxygen/voxel/armor/swift/belt.vox index 62a0a2bc8d..f23b51fbfa 100644 Binary files a/assets/voxygen/voxel/armor/swift/belt.vox and b/assets/voxygen/voxel/armor/swift/belt.vox differ diff --git a/assets/voxygen/voxel/armor/swift/chest.vox b/assets/voxygen/voxel/armor/swift/chest.vox index 64ecd13f0f..ac9882bf3d 100644 Binary files a/assets/voxygen/voxel/armor/swift/chest.vox and b/assets/voxygen/voxel/armor/swift/chest.vox differ diff --git a/assets/voxygen/voxel/armor/swift/foot.vox b/assets/voxygen/voxel/armor/swift/foot.vox index 3a11434f6f..a8f033f29e 100644 Binary files a/assets/voxygen/voxel/armor/swift/foot.vox and b/assets/voxygen/voxel/armor/swift/foot.vox differ diff --git a/assets/voxygen/voxel/armor/swift/hand.vox b/assets/voxygen/voxel/armor/swift/hand.vox index d9c4695424..10f2b0d1ca 100644 Binary files a/assets/voxygen/voxel/armor/swift/hand.vox and b/assets/voxygen/voxel/armor/swift/hand.vox differ diff --git a/assets/voxygen/voxel/armor/swift/pants.vox b/assets/voxygen/voxel/armor/swift/pants.vox index 906cd7bf54..b1f1ca1aaa 100644 Binary files a/assets/voxygen/voxel/armor/swift/pants.vox and b/assets/voxygen/voxel/armor/swift/pants.vox differ diff --git a/assets/voxygen/voxel/armor/swift/shoulder.vox b/assets/voxygen/voxel/armor/swift/shoulder.vox index 9f7c968e73..8d641b72eb 100644 Binary files a/assets/voxygen/voxel/armor/swift/shoulder.vox and b/assets/voxygen/voxel/armor/swift/shoulder.vox differ diff --git a/assets/voxygen/voxel/humanoid_armor_back_manifest.ron b/assets/voxygen/voxel/humanoid_armor_back_manifest.ron index 2b242dbaae..f98b4c928c 100644 --- a/assets/voxygen/voxel/humanoid_armor_back_manifest.ron +++ b/assets/voxygen/voxel/humanoid_armor_back_manifest.ron @@ -52,5 +52,25 @@ vox_spec: ("armor.warlock.back", (-5.0, -1.5, -15.5)), color: None ), + "Scale": ( + vox_spec: ("armor.scale.back", (-5.0, -2.0, -10.5)), + color: None + ), + "Carapace": ( + vox_spec: ("armor.carapace.back", (-5.0, -1.5, -10.5)), + color: None + ), + "Platescale": ( + vox_spec: ("armor.platescale.back", (-5.0, -4.5, -10.5)), + color: None + ), + "Dragonscale": ( + vox_spec: ("armor.dragonscale.back", (-7.0, -2.5, -12.0)), + color: None + ), + "Savage": ( + vox_spec: ("armor.savage.back", (-5.0, -2.5, -11.0)), + color: None + ), }, )) diff --git a/assets/voxygen/voxel/humanoid_armor_belt_manifest.ron b/assets/voxygen/voxel/humanoid_armor_belt_manifest.ron index b16a29bee0..f6552cea70 100644 --- a/assets/voxygen/voxel/humanoid_armor_belt_manifest.ron +++ b/assets/voxygen/voxel/humanoid_armor_belt_manifest.ron @@ -100,5 +100,25 @@ vox_spec: ("armor.warlock.belt", (-4.0, -3.0, 2.0)), color: None ), + "Scale":( + vox_spec: ("armor.scale.belt", (-4.0, -3.5, 2.0)), + color: None + ), + "Carapace":( + vox_spec: ("armor.carapace.belt", (-4.0, -4.0, 1.5)), + color: None + ), + "Platescale":( + vox_spec: ("armor.platescale.belt", (-4.0, -4.0, 1.0)), + color: None + ), + "Dragonscale":( + vox_spec: ("armor.dragonscale.belt", (-4.0, -3.5, 1.5)), + color: None + ), + "Savage":( + vox_spec: ("armor.savage.belt", (-4.0, -4.0, 1.0)), + color: None + ), }, )) diff --git a/assets/voxygen/voxel/humanoid_armor_chest_manifest.ron b/assets/voxygen/voxel/humanoid_armor_chest_manifest.ron index 8b624b319f..5acda99d49 100644 --- a/assets/voxygen/voxel/humanoid_armor_chest_manifest.ron +++ b/assets/voxygen/voxel/humanoid_armor_chest_manifest.ron @@ -170,5 +170,25 @@ vox_spec: ("armor.warlock.chest", (-7.0, -3.5, 0.5)), color: None ), + "Scale": ( + vox_spec: ("armor.scale.chest", (-7.0, -3.5, 2.0)), + color: None + ), + "Carapace": ( + vox_spec: ("armor.carapace.chest", (-7.0, -3.5, 1.5)), + color: None + ), + "Platescale": ( + vox_spec: ("armor.platescale.chest", (-7.0, -3.5, 0.5)), + color: None + ), + "Dragonscale": ( + vox_spec: ("armor.dragonscale.chest", (-7.0, -3.5, 1.5)), + color: None + ), + "Savage": ( + vox_spec: ("armor.savage.chest", (-7.0, -4.0, 1.0)), + color: None + ), }, )) diff --git a/assets/voxygen/voxel/humanoid_armor_foot_manifest.ron b/assets/voxygen/voxel/humanoid_armor_foot_manifest.ron index f41ee92a53..6dcc0df967 100644 --- a/assets/voxygen/voxel/humanoid_armor_foot_manifest.ron +++ b/assets/voxygen/voxel/humanoid_armor_foot_manifest.ron @@ -100,5 +100,25 @@ vox_spec: ("armor.warlock.foot", (-2.5, -3.5, -2.0)), color: None ), + "Scale": ( + vox_spec: ("armor.scale.foot", (-2.5, -3.5, -2.0)), + color: None + ), + "Carapace": ( + vox_spec: ("armor.carapace.foot", (-2.5, -3.5, -2.0)), + color: None + ), + "Platescale": ( + vox_spec: ("armor.platescale.foot", (-2.5, -3.5, -2.0)), + color: None + ), + "Dragonscale": ( + vox_spec: ("armor.dragonscale.foot", (-2.5, -5.5, -2.0)), + color: None + ), + "Savage": ( + vox_spec: ("armor.savage.foot", (-2.5, -3.5, -2.0)), + color: None + ), }, )) diff --git a/assets/voxygen/voxel/humanoid_armor_hand_manifest.ron b/assets/voxygen/voxel/humanoid_armor_hand_manifest.ron index a95bd554a6..282168d327 100644 --- a/assets/voxygen/voxel/humanoid_armor_hand_manifest.ron +++ b/assets/voxygen/voxel/humanoid_armor_hand_manifest.ron @@ -220,5 +220,55 @@ color: None ) ), + "Scale": ( + left: ( + vox_spec: ("armor.scale.hand", (-3.5, -1.5, -2.5)), + color: None + ), + right: ( + vox_spec: ("armor.scale.hand", (-1.5, -1.5, -2.5)), + color: None + ) + ), + "Carapace": ( + left: ( + vox_spec: ("armor.carapace.hand", (-3.5, -2.5, -3.0)), + color: None + ), + right: ( + vox_spec: ("armor.carapace.hand", (-1.5, -2.5, -3.0)), + color: None + ) + ), + "Platescale": ( + left: ( + vox_spec: ("armor.platescale.hand", (-3.5, -3.5, -4.0)), + color: None + ), + right: ( + vox_spec: ("armor.platescale.hand", (-1.5, -3.5, -4.0)), + color: None + ) + ), + "Dragonscale": ( + left: ( + vox_spec: ("armor.dragonscale.hand", (-5.0, -1.5, -3.5)), + color: None + ), + right: ( + vox_spec: ("armor.dragonscale.hand", (-2.0, -1.5, -3.5)), + color: None + ) + ), + "Savage": ( + left: ( + vox_spec: ("armor.savage.hand", (-2.5, -3.0, -4.0)), + color: None + ), + right: ( + vox_spec: ("armor.savage.hand", (-1.5, -3.0, -4.0)), + color: None + ) + ), }, )) diff --git a/assets/voxygen/voxel/humanoid_armor_pants_manifest.ron b/assets/voxygen/voxel/humanoid_armor_pants_manifest.ron index fde3b5b2cb..eec6c5f952 100644 --- a/assets/voxygen/voxel/humanoid_armor_pants_manifest.ron +++ b/assets/voxygen/voxel/humanoid_armor_pants_manifest.ron @@ -128,5 +128,25 @@ vox_spec: ("armor.warlock.pants", (-5.0, -4.0, -2.0)), color: None ), + "Scale": ( + vox_spec: ("armor.scale.pants", (-5.0, -4.0, 0.0)), + color: None + ), + "Carapace": ( + vox_spec: ("armor.carapace.pants", (-6.0, -4.0, 0.5)), + color: None + ), + "Platescale": ( + vox_spec: ("armor.platescale.pants", (-6.0, -4.0, 0.0)), + color: None + ), + "Dragonscale": ( + vox_spec: ("armor.dragonscale.pants", (-5.0, -3.5, -1.5)), + color: None + ), + "Savage": ( + vox_spec: ("armor.savage.pants", (-5.0, -4.0, 0.5)), + color: None + ), }, )) diff --git a/assets/voxygen/voxel/humanoid_armor_shoulder_manifest.ron b/assets/voxygen/voxel/humanoid_armor_shoulder_manifest.ron index 2c25cce062..22dc0e122e 100644 --- a/assets/voxygen/voxel/humanoid_armor_shoulder_manifest.ron +++ b/assets/voxygen/voxel/humanoid_armor_shoulder_manifest.ron @@ -301,5 +301,55 @@ color: None ) ), + "Scale": ( + left: ( + vox_spec: ("armor.scale.shoulder", (-5.5, -4.0 , -0.5)), + color: None + ), + right: ( + vox_spec: ("armor.scale.shoulder", (-0.5, -4.0, -0.5)), + color: None + ) + ), + "Carapace": ( + left: ( + vox_spec: ("armor.carapace.shoulder", (-6.0, -4.0 , -2.0)), + color: None + ), + right: ( + vox_spec: ("armor.carapace.shoulder", (-1.0, -4.0, -2.0)), + color: None + ) + ), + "Platescale": ( + left: ( + vox_spec: ("armor.platescale.shoulder", (-6.0, -4.0 , -3.0)), + color: None + ), + right: ( + vox_spec: ("armor.platescale.shoulder", (-1.0, -4.0, -3.0)), + color: None + ) + ), + "Dragonscale": ( + left: ( + vox_spec: ("armor.dragonscale.shoulder", (-9.0, -3.5 , -1.0)), + color: None + ), + right: ( + vox_spec: ("armor.dragonscale.shoulder", (0.0, -3.5, -1.0)), + color: None + ) + ), + "Savage": ( + left: ( + vox_spec: ("armor.savage.shoulder", (-5.5, -4.0 , -2.0)), + color: None + ), + right: ( + vox_spec: ("armor.savage.shoulder", (-0.5, -4.0, -2.0)), + color: None + ) + ), }, )) diff --git a/server/src/events/entity_manipulation.rs b/server/src/events/entity_manipulation.rs index 36387b20fd..c51d5f6fda 100644 --- a/server/src/events/entity_manipulation.rs +++ b/server/src/events/entity_manipulation.rs @@ -400,6 +400,9 @@ pub fn handle_destroy(server: &mut Server, entity: EcsEntity, cause: HealthSourc quadruped_low::Species::Maneater => { "common.loot_tables.creature.quad_low.maneater" }, + quadruped_low::Species::Lavadrake => { + "common.loot_tables.creature.quad_low.lavadrake" + }, _ => "common.loot_tables.creature.quad_low.default", } },