Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix alignments and remove unused variations

Browse Source
This commit is contained in:
Maxicarlos08 2023-07-13 17:07:06 +02:00
parent 326d33d935
commit b16b1bf51f
No known key found for this signature in database
7 changed files with 19 additions and 148 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
assets/common/items/armor/miner/helmet_red.ron → assets/common/items/armor/miner/helmet.ron
View File

10
assets/common/items/armor/miner/helmet_blue.ron
View File

@ -1,10 +0,0 @@
ItemDef(
name: "Miner Captain's Helmet.",
description: "Someone carved 'Mine!' into the inside.",
kind: Armor((
kind: Head,
stats: FromSet("Miner"),
)),
quality: Epic,
tags: [],
)

10
assets/common/items/armor/miner/helmet_orange.ron
View File

@ -1,10 +0,0 @@
ItemDef(
name: "Miner's Helmet.",
description: "Someone carved 'Mine!' into the inside.",
kind: Armor((
kind: Head,
stats: FromSet("Miner"),
)),
quality: Epic,
tags: [],
)

2
assets/common/loadout/dungeon/dwarven_quarry/greedy_miner.ron
View File

@ -1,6 +1,6 @@
#![enable(implicit_some)]
(
head: Item("common.items.armor.miner.helmet_orange"),
head: Item("common.items.armor.miner.helmet"),
chest: Item("common.items.armor.miner.chest"),
gloves: Item("common.items.armor.miner.hand"),
belt: Item("common.items.armor.miner.belt"),

10
assets/voxygen/item_image_manifest.ron
View File

@ -2972,15 +2972,7 @@
"voxel.armor.misc.head.helmet",
(0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 1.3,
),
Simple("common.items.armor.miner.helmet_orange"): 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_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(
Simple("common.items.armor.miner.helmet"): VoxTrans(
"voxel.armor.miner.helmet",
(0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.3,
),

131
assets/voxygen/voxel/humanoid_armor_head_manifest.ron
View File

@ -1451,152 +1451,53 @@
color: None
),
// Miner
(Human, Male, "common.items.armor.miner.helmet_orange"): (
vox_spec: ("armor.miner.helmet", (-4.0, -6.0, -1.0)),
color: Some((212, 91, 0)),
),
(Human, Male, "common.items.armor.miner.helmet_red"): (
(Human, Male, "common.items.armor.miner.helmet"): (
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"): (
(Human, Female, "common.items.armor.miner.helmet"): (
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"): (
(Elf, Male, "common.items.armor.miner.helmet"): (
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"): (
(Elf, Female, "common.items.armor.miner.helmet"): (
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"): (
(Dwarf, Male, "common.items.armor.miner.helmet"): (
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", (-5.0, -5.0, -1.0)),
color: Some((83, 176, 210)),
),
//
(Dwarf, Female, "common.items.armor.miner.helmet_orange"): (
vox_spec: ("armor.miner.helmet", (-5.0, -5.0, -1.0)),
color: Some((212, 91, 0)),
),
(Dwarf, Female, "common.items.armor.miner.helmet_red"): (
(Dwarf, Female, "common.items.armor.miner.helmet"): (
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", (-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)),
(Danari, Male, "common.items.armor.miner.helmet"): (
vox_spec: ("armor.miner.helmet", (-2.0, -6.0, 1.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)),
(Danari, Female, "common.items.armor.miner.helmet"): (
vox_spec: ("armor.miner.helmet", (-2.0, -6.0, 1.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)),
(Draugr, Male, "common.items.armor.miner.helmet"): (
vox_spec: ("armor.miner.helmet", (-6.0, -6.0, 0.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)),
(Draugr, Female, "common.items.armor.miner.helmet"): (
vox_spec: ("armor.miner.helmet", (-6.0, -6.0, -1.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"): (
(Orc, Male, "common.items.armor.miner.helmet"): (
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"): (
(Orc, Female, "common.items.armor.miner.helmet"): (
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)),
),
}
))

4
assets/voxygen/voxel/item_drop_manifest.ron
View File

@ -749,9 +749,7 @@
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",
Simple("common.items.armor.miner.helmet"): "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",