From d057e9d4d6a5c68f55d50438a2e5afc44abc01d8 Mon Sep 17 00:00:00 2001 From: Maxicarlos08 Date: Thu, 13 Jul 2023 14:19:04 +0200 Subject: [PATCH 1/6] remove incorret chieftain mask definitions --- .../voxel/humanoid_armor_head_manifest.ron | 38 ------------------- 1 file changed, 38 deletions(-) diff --git a/assets/voxygen/voxel/humanoid_armor_head_manifest.ron b/assets/voxygen/voxel/humanoid_armor_head_manifest.ron index 5395a95b41..3c3d8c5845 100644 --- a/assets/voxygen/voxel/humanoid_armor_head_manifest.ron +++ b/assets/voxygen/voxel/humanoid_armor_head_manifest.ron @@ -1455,19 +1455,6 @@ vox_spec: ("armor.miner.helmet", (-4.0, -3.0, 5.0)), color: Some((212, 91, 0)), ), - (Human, Female, "common.items.armor.misc.head.gnarling_mask"): ( - vox_spec: ("armor.miner.helmet", (-4.0, -3.0, 5.0)), - color: Some((212, 91, 0)), - ), - (Elf, Male, "common.items.armor.misc.head.gnarling_mask"): ( - vox_spec: ("armor.miner.helmet", (-4.0, -3.0, 5.0)), - color: Some((212, 91, 0)), - ), - (Elf, Female, "common.items.armor.misc.head.gnarling_mask"): ( - vox_spec: ("armor.miner.helmet", (-4.0, -3.0, 5.0)), - color: Some((212, 91, 0)), - ), - // (Dwarf, Male, "common.items.armor.miner.helmet_orange"): ( vox_spec: ("armor.miner.helmet", (-5.0, -5.0, -1.0)), color: Some((212, 91, 0)), @@ -1493,30 +1480,5 @@ vox_spec: ("armor.miner.helmet", (-4.0, -3.0, 5.0)), color: Some((83, 176, 210)), ), - // - (Danari, Male, "common.items.armor.misc.head.gnarling_mask"): ( - vox_spec: ("armor.miner.helmet", (-4.0, -3.0, 5.0)), - color: Some((212, 91, 0)), - ), - (Danari, Female, "common.items.armor.misc.head.gnarling_mask"): ( - vox_spec: ("armor.miner.helmet", (-4.0, -3.0, 5.0)), - color: Some((212, 91, 0)), - ), - (Draugr, Male, "common.items.armor.misc.head.gnarling_mask"): ( - vox_spec: ("armor.miner.helmet", (-4.0, -3.0, 5.0)), - color: Some((212, 91, 0)), - ), - (Draugr, Female, "common.items.armor.misc.head.gnarling_mask"): ( - vox_spec: ("armor.miner.helmet", (-4.0, -3.0, 5.0)), - color: Some((212, 91, 0)), - ), - (Orc, Male, "common.items.armor.misc.head.gnarling_mask"): ( - vox_spec: ("armor.miner.helmet", (-4.0, -3.0, 5.0)), - color: Some((212, 91, 0)), - ), - (Orc, Female, "common.items.armor.misc.head.gnarling_mask"): ( - vox_spec: ("armor.miner.helmet", (-4.0, -3.0, 5.0)), - color: Some((212, 91, 0)), - ), } )) From 326d33d935d4b3713b0f1d8996f8e9aa310ba5a7 Mon Sep 17 00:00:00 2001 From: flo666 Date: Thu, 13 Jul 2023 16:25:43 +0200 Subject: [PATCH 2/6] re-add helmet definitions & fix offsets, add missing helmets in image and drop manifest --- assets/voxygen/item_image_manifest.ron | 8 ++ .../voxel/humanoid_armor_head_manifest.ron | 128 +++++++++++++++++- assets/voxygen/voxel/item_drop_manifest.ron | 3 + 3 files changed, 134 insertions(+), 5 deletions(-) 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", From b16b1bf51f2dac2c271ba8e8272654814edc8f39 Mon Sep 17 00:00:00 2001 From: Maxicarlos08 Date: Thu, 13 Jul 2023 17:07:06 +0200 Subject: [PATCH 3/6] Fix alignments and remove unused variations --- .../miner/{helmet_red.ron => helmet.ron} | 0 .../common/items/armor/miner/helmet_blue.ron | 10 -- .../items/armor/miner/helmet_orange.ron | 10 -- .../dungeon/dwarven_quarry/greedy_miner.ron | 2 +- assets/voxygen/item_image_manifest.ron | 10 +- .../voxel/humanoid_armor_head_manifest.ron | 131 +++--------------- assets/voxygen/voxel/item_drop_manifest.ron | 4 +- 7 files changed, 19 insertions(+), 148 deletions(-) rename assets/common/items/armor/miner/{helmet_red.ron => helmet.ron} (100%) delete mode 100644 assets/common/items/armor/miner/helmet_blue.ron delete mode 100644 assets/common/items/armor/miner/helmet_orange.ron diff --git a/assets/common/items/armor/miner/helmet_red.ron b/assets/common/items/armor/miner/helmet.ron similarity index 100% rename from assets/common/items/armor/miner/helmet_red.ron rename to assets/common/items/armor/miner/helmet.ron diff --git a/assets/common/items/armor/miner/helmet_blue.ron b/assets/common/items/armor/miner/helmet_blue.ron deleted file mode 100644 index c5c7a0c381..0000000000 --- a/assets/common/items/armor/miner/helmet_blue.ron +++ /dev/null @@ -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: [], -) \ No newline at end of file diff --git a/assets/common/items/armor/miner/helmet_orange.ron b/assets/common/items/armor/miner/helmet_orange.ron deleted file mode 100644 index fbbf0d3fad..0000000000 --- a/assets/common/items/armor/miner/helmet_orange.ron +++ /dev/null @@ -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: [], -) \ No newline at end of file diff --git a/assets/common/loadout/dungeon/dwarven_quarry/greedy_miner.ron b/assets/common/loadout/dungeon/dwarven_quarry/greedy_miner.ron index fcd370dec2..7abdf78bec 100644 --- a/assets/common/loadout/dungeon/dwarven_quarry/greedy_miner.ron +++ b/assets/common/loadout/dungeon/dwarven_quarry/greedy_miner.ron @@ -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"), diff --git a/assets/voxygen/item_image_manifest.ron b/assets/voxygen/item_image_manifest.ron index 544570aa4d..99ff67952c 100644 --- a/assets/voxygen/item_image_manifest.ron +++ b/assets/voxygen/item_image_manifest.ron @@ -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, ), diff --git a/assets/voxygen/voxel/humanoid_armor_head_manifest.ron b/assets/voxygen/voxel/humanoid_armor_head_manifest.ron index 770651061f..3da202e624 100644 --- a/assets/voxygen/voxel/humanoid_armor_head_manifest.ron +++ b/assets/voxygen/voxel/humanoid_armor_head_manifest.ron @@ -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)), - ), } )) diff --git a/assets/voxygen/voxel/item_drop_manifest.ron b/assets/voxygen/voxel/item_drop_manifest.ron index 4794601ef0..d6e55f7fcc 100644 --- a/assets/voxygen/voxel/item_drop_manifest.ron +++ b/assets/voxygen/voxel/item_drop_manifest.ron @@ -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", From 2cbb104243cc1b8b958ee95ba78714cbe3e257c0 Mon Sep 17 00:00:00 2001 From: Maxicarlos08 Date: Thu, 13 Jul 2023 17:18:46 +0200 Subject: [PATCH 4/6] Miner helmet migrations --- assets/common/items/armor/miner/helmet.ron | 2 +- server/src/migrations/V52_miner_helmets.sql | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 server/src/migrations/V52_miner_helmets.sql diff --git a/assets/common/items/armor/miner/helmet.ron b/assets/common/items/armor/miner/helmet.ron index 69f8a1321b..aeaf3f9e4f 100644 --- a/assets/common/items/armor/miner/helmet.ron +++ b/assets/common/items/armor/miner/helmet.ron @@ -1,5 +1,5 @@ ItemDef( - name: "Flamekeeper Miner Helmet.", + name: "Miner Helmet", description: "Someone carved 'Mine!' into the inside.", kind: Armor(( kind: Head, diff --git a/server/src/migrations/V52_miner_helmets.sql b/server/src/migrations/V52_miner_helmets.sql new file mode 100644 index 0000000000..b0c7e47446 --- /dev/null +++ b/server/src/migrations/V52_miner_helmets.sql @@ -0,0 +1,6 @@ +UPDATE item +SET item_definition_id = 'common.items.armor.miner.helmet_blue' WHERE item_definition_id = 'common.items.armor.miner.helmet'; +UPDATE item +SET item_definition_id = 'common.items.armor.miner.helmet_orange' WHERE item_definition_id = 'common.items.armor.miner.helmet'; +UPDATE item +SET item_definition_id = 'common.items.armor.miner.helmet_red' WHERE item_definition_id = 'common.items.armor.miner.helmet'; From 9901ba691ea08ad148a0e1361f9057544072b2da Mon Sep 17 00:00:00 2001 From: Maxicarlos08 Date: Fri, 14 Jul 2023 00:59:27 +0200 Subject: [PATCH 5/6] fix alignment of wanderer's hat and a typo --- assets/common/items/tag_examples/gnarling.ron | 2 +- assets/voxygen/voxel/humanoid_armor_head_manifest.ron | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/assets/common/items/tag_examples/gnarling.ron b/assets/common/items/tag_examples/gnarling.ron index d4860acb41..3089df840c 100644 --- a/assets/common/items/tag_examples/gnarling.ron +++ b/assets/common/items/tag_examples/gnarling.ron @@ -3,7 +3,7 @@ ItemDef( description: "Worn by Gnarlings and their Chieftains.", kind: TagExamples( item_ids: [ - "common.items.armor.mist.head.gnarling_mask", + "common.items.armor.misc.head.gnarling_mask", ], ), quality: Common, diff --git a/assets/voxygen/voxel/humanoid_armor_head_manifest.ron b/assets/voxygen/voxel/humanoid_armor_head_manifest.ron index 3da202e624..5302cd1829 100644 --- a/assets/voxygen/voxel/humanoid_armor_head_manifest.ron +++ b/assets/voxygen/voxel/humanoid_armor_head_manifest.ron @@ -295,7 +295,7 @@ color: None ), (Dwarf, Female, "common.items.armor.misc.head.wanderers_hat"): ( - vox_spec: ("armor.misc.head.wanderers_hat", (-4, -5.0, 4.0)), + vox_spec: ("armor.misc.head.wanderers_hat", (-5, -5.0, 4.0)), color: None ), (Danari, Male, "common.items.armor.misc.head.wanderers_hat"): ( From 922a592c8d32687444455c0d52384827eec68d67 Mon Sep 17 00:00:00 2001 From: Maxicarlos08 Date: Fri, 14 Jul 2023 02:30:06 +0200 Subject: [PATCH 6/6] fixed migrations --- server/src/migrations/V52__miner_helmets.sql | 5 +++++ server/src/migrations/V52_miner_helmets.sql | 6 ------ 2 files changed, 5 insertions(+), 6 deletions(-) create mode 100644 server/src/migrations/V52__miner_helmets.sql delete mode 100644 server/src/migrations/V52_miner_helmets.sql diff --git a/server/src/migrations/V52__miner_helmets.sql b/server/src/migrations/V52__miner_helmets.sql new file mode 100644 index 0000000000..771f5e1549 --- /dev/null +++ b/server/src/migrations/V52__miner_helmets.sql @@ -0,0 +1,5 @@ +UPDATE item + SET item_definition_id = 'common.items.armor.miner.helmet' + WHERE item_definition_id = 'common.items.armor.miner.helmet_red' + OR item_definition_id = 'common.items.armor.miner.helmet_blue' + OR item_definition_id = 'common.items.armor.miner.helmet_orange'; diff --git a/server/src/migrations/V52_miner_helmets.sql b/server/src/migrations/V52_miner_helmets.sql deleted file mode 100644 index b0c7e47446..0000000000 --- a/server/src/migrations/V52_miner_helmets.sql +++ /dev/null @@ -1,6 +0,0 @@ -UPDATE item -SET item_definition_id = 'common.items.armor.miner.helmet_blue' WHERE item_definition_id = 'common.items.armor.miner.helmet'; -UPDATE item -SET item_definition_id = 'common.items.armor.miner.helmet_orange' WHERE item_definition_id = 'common.items.armor.miner.helmet'; -UPDATE item -SET item_definition_id = 'common.items.armor.miner.helmet_red' WHERE item_definition_id = 'common.items.armor.miner.helmet';