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

Merge branch 'maxicarlos08/chieftain-mask-fix' into 'master'

Browse Source 
Maxicarlos08/chieftain mask fix

See merge request veloren/veloren!4024
This commit is contained in:
Samuel Keiffer 2023-07-29 01:22:28 +00:00
commit 026b61baee
9 changed files with 48 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
assets/common/items/armor/miner/helmet_orange.ron → assets/common/items/armor/miner/helmet.ron
View File

@ -1,5 +1,5 @@
ItemDef(
name: "Miner's Helmet.",
name: "Miner Helmet",
description: "Someone carved 'Mine!' into the inside.",
kind: Armor((
kind: Head,

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_red.ron
View File

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

2
assets/common/items/tag_examples/gnarling.ron
View File

@ -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,

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"),

2
assets/voxygen/item_image_manifest.ron
View File

@ -2972,7 +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(
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,
),

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

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

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

@ -749,6 +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"): "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",

5
server/src/migrations/V52__miner_helmets.sql Normal file
View File

@ -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';