diff --git a/assets/voxygen/item_image_manifest.ron b/assets/voxygen/item_image_manifest.ron index df9bdc01b0..544570aa4d 100644 --- a/assets/voxygen/item_image_manifest.ron +++ b/assets/voxygen/item_image_manifest.ron @@ -2976,6 +2976,14 @@ "voxel.armor.miner.helmet", (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.3, ), + Simple("common.items.armor.miner.helmet_red"): VoxTrans( + "voxel.armor.miner.helmet", + (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.3, + ), + Simple("common.items.armor.miner.helmet_blue"): VoxTrans( + "voxel.armor.miner.helmet", + (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.3, + ), // Rings Simple("common.items.armor.misc.ring.scratched"): VoxTrans( "voxel.armor.misc.ring.scratched", diff --git a/assets/voxygen/voxel/humanoid_armor_head_manifest.ron b/assets/voxygen/voxel/humanoid_armor_head_manifest.ron index 3c3d8c5845..770651061f 100644 --- a/assets/voxygen/voxel/humanoid_armor_head_manifest.ron +++ b/assets/voxygen/voxel/humanoid_armor_head_manifest.ron @@ -1452,19 +1452,64 @@ ), // Miner (Human, Male, "common.items.armor.miner.helmet_orange"): ( - vox_spec: ("armor.miner.helmet", (-4.0, -3.0, 5.0)), + vox_spec: ("armor.miner.helmet", (-4.0, -6.0, -1.0)), color: Some((212, 91, 0)), ), + (Human, Male, "common.items.armor.miner.helmet_red"): ( + vox_spec: ("armor.miner.helmet", (-4.0, -6.0, -1.0)), + color: Some((146, 32, 32)), + ), + (Human, Male, "common.items.armor.miner.helmet_blue"): ( + vox_spec: ("armor.miner.helmet", (-4.0, -6.0, -1.0)), + color: Some((83, 176, 210)), + ), + (Human, Female, "common.items.armor.miner.helmet_orange"): ( + vox_spec: ("armor.miner.helmet", (-4.0, -6.0, -1.0)), + color: Some((212, 91, 0)), + ), + (Human, Female, "common.items.armor.miner.helmet_red"): ( + vox_spec: ("armor.miner.helmet", (-4.0, -6.0, -1.0)), + color: Some((146, 32, 32)), + ), + (Human, Female, "common.items.armor.miner.helmet_blue"): ( + vox_spec: ("armor.miner.helmet", (-4.0, -6.0, -1.0)), + color: Some((83, 176, 210)), + ), + (Elf, Male, "common.items.armor.miner.helmet_orange"): ( + vox_spec: ("armor.miner.helmet", (-3.0, -6.0, -1.0)), + color: Some((212, 91, 0)), + ), + (Elf, Male, "common.items.armor.miner.helmet_red"): ( + vox_spec: ("armor.miner.helmet", (-3.0, -6.0, -1.0)), + color: Some((146, 32, 32)), + ), + (Elf, Male, "common.items.armor.miner.helmet_blue"): ( + vox_spec: ("armor.miner.helmet", (-3.0, -6.0, -1.0)), + color: Some((83, 176, 210)), + ), + (Elf, Female, "common.items.armor.miner.helmet_orange"): ( + vox_spec: ("armor.miner.helmet", (-3.0, -6.0, -1.0)), + color: Some((212, 91, 0)), + ), + (Elf, Female, "common.items.armor.miner.helmet_red"): ( + vox_spec: ("armor.miner.helmet", (-3.0, -6.0, -1.0)), + color: Some((146, 32, 32)), + ), + (Elf, Female, "common.items.armor.miner.helmet_blue"): ( + vox_spec: ("armor.miner.helmet", (-3.0, -6.0, -1.0)), + color: Some((83, 176, 210)), + ), + // (Dwarf, Male, "common.items.armor.miner.helmet_orange"): ( vox_spec: ("armor.miner.helmet", (-5.0, -5.0, -1.0)), color: Some((212, 91, 0)), ), (Dwarf, Male, "common.items.armor.miner.helmet_red"): ( - vox_spec: ("armor.miner.helmet", (-4.0, -3.0, 5.0)), + vox_spec: ("armor.miner.helmet", (-5.0, -5.0, -1.0)), color: Some((146, 32, 32)), ), (Dwarf, Male, "common.items.armor.miner.helmet_blue"): ( - vox_spec: ("armor.miner.helmet", (-4.0, -3.0, 5.0)), + vox_spec: ("armor.miner.helmet", (-5.0, -5.0, -1.0)), color: Some((83, 176, 210)), ), // @@ -1473,11 +1518,84 @@ color: Some((212, 91, 0)), ), (Dwarf, Female, "common.items.armor.miner.helmet_red"): ( - vox_spec: ("armor.miner.helmet", (-4.0, -3.0, 5.0)), + vox_spec: ("armor.miner.helmet", (-5.0, -5.0, -1.0)), color: Some((146, 32, 32)), ), (Dwarf, Female, "common.items.armor.miner.helmet_blue"): ( - vox_spec: ("armor.miner.helmet", (-4.0, -3.0, 5.0)), + vox_spec: ("armor.miner.helmet", (-5.0, -5.0, -1.0)), + color: Some((83, 176, 210)), + ), + // + (Danari, Male, "common.items.armor.miner.helmet_orange"): ( + vox_spec: ("armor.miner.helmet", (-2.0, -7.0, 2.0)), + color: Some((212, 91, 0)), + ), + (Danari, Male, "common.items.armor.miner.helmet_red"): ( + vox_spec: ("armor.miner.helmet", (-2.0, -7.0, 2.0)), + color: Some((146, 32, 32)), + ), + (Danari, Male, "common.items.armor.miner.helmet_blue"): ( + vox_spec: ("armor.miner.helmet", (-2.0, -7.0, 2.0)), + color: Some((83, 176, 210)), + ), + (Danari, Female, "common.items.armor.miner.helmet_orange"): ( + vox_spec: ("armor.miner.helmet", (-2.0, -7.0, 2.0)), + color: Some((212, 91, 0)), + ), + (Danari, Female, "common.items.armor.miner.helmet_red"): ( + vox_spec: ("armor.miner.helmet", (-2.0, -7.0, 2.0)), + color: Some((146, 32, 32)), + ), + (Danari, Female, "common.items.armor.miner.helmet_blue"): ( + vox_spec: ("armor.miner.helmet", (-2.0, -7.0, 2.0)), + color: Some((83, 176, 210)), + ), + (Draugr, Male, "common.items.armor.miner.helmet_orange"): ( + vox_spec: ("armor.miner.helmet", (-6.0, -7.0, 1.0)), + color: Some((212, 91, 0)), + ), + (Draugr, Male, "common.items.armor.miner.helmet_red"): ( + vox_spec: ("armor.miner.helmet", (-6.0, -7.0, 1.0)), + color: Some((146, 32, 32)), + ), + (Draugr, Male, "common.items.armor.miner.helmet_blue"): ( + vox_spec: ("armor.miner.helmet", (-6.0, -7.0, 1.0)), + color: Some((83, 176, 210)), + ), + (Draugr, Female, "common.items.armor.miner.helmet_orange"): ( + vox_spec: ("armor.miner.helmet", (-6.0, -7.0, 0.0)), + color: Some((212, 91, 0)), + ), + (Draugr, Female, "common.items.armor.miner.helmet_red"): ( + vox_spec: ("armor.miner.helmet", (-6.0, -7.0, 0.0)), + color: Some((146, 32, 32)), + ), + (Draugr, Female, "common.items.armor.miner.helmet_blue"): ( + vox_spec: ("armor.miner.helmet", (-6.0, -7.0, 0.0)), + color: Some((83, 176, 210)), + ), + (Orc, Male, "common.items.armor.miner.helmet_orange"): ( + vox_spec: ("armor.miner.helmet", (-3.0, -5.0, 1.0)), + color: Some((212, 91, 0)), + ), + (Orc, Male, "common.items.armor.miner.helmet_red"): ( + vox_spec: ("armor.miner.helmet", (-3.0, -5.0, 1.0)), + color: Some((146, 32, 32)), + ), + (Orc, Male, "common.items.armor.miner.helmet_blue"): ( + vox_spec: ("armor.miner.helmet", (-3.0, -5.0, 1.0)), + color: Some((83, 176, 210)), + ), + (Orc, Female, "common.items.armor.miner.helmet_orange"): ( + vox_spec: ("armor.miner.helmet", (-3.0, -7.0, -1.0)), + color: Some((212, 91, 0)), + ), + (Orc, Female, "common.items.armor.miner.helmet_red"): ( + vox_spec: ("armor.miner.helmet", (-3.0, -7.0, -1.0)), + color: Some((146, 32, 32)), + ), + (Orc, Female, "common.items.armor.miner.helmet_blue"): ( + vox_spec: ("armor.miner.helmet", (-3.0, -7.0, -1.0)), color: Some((83, 176, 210)), ), } diff --git a/assets/voxygen/voxel/item_drop_manifest.ron b/assets/voxygen/voxel/item_drop_manifest.ron index 0f43e42a69..4794601ef0 100644 --- a/assets/voxygen/voxel/item_drop_manifest.ron +++ b/assets/voxygen/voxel/item_drop_manifest.ron @@ -749,6 +749,9 @@ Simple("common.items.calendar.christmas.armor.misc.head.woolly_wintercap"): "voxel.armor.misc.head.woolly_wintercap", Simple("common.items.armor.misc.head.helmet"): "voxel.armor.misc.head.helmet", Simple("common.items.armor.misc.head.gnarling_mask"): "voxel.armor.misc.head.gnarling_mask_drop", + Simple("common.items.armor.miner.helmet_orange"): "voxel.armor.miner.helmet", + Simple("common.items.armor.miner.helmet_red"): "voxel.armor.miner.helmet", + Simple("common.items.armor.miner.helmet_blue"): "voxel.armor.miner.helmet", // Rings Simple("common.items.armor.misc.ring.scratched"): "voxel.armor.misc.ring.scratched", Simple("common.items.armor.misc.ring.gold"): "voxel.armor.misc.ring.gold",