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 'modular-fixes' into 'master'

Browse Source 
Tweaks for this week

See merge request veloren/veloren!3383
This commit is contained in:
Samuel Keiffer 2022-05-19 19:35:32 +00:00
commit faa4c85cbb
23 changed files with 221 additions and 158 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
assets/common/items/tool/pickaxe_steel.ron
View File

@ -1,6 +1,6 @@
ItemDef(
name: "Steel Pickaxe",
description: "Strike the earth!",
description: "Allows for swift excavation of those pesky blue veins.",
kind: Tool((
kind: Pick,
hands: Two,

4
assets/common/items/weapons/axe/malachite_axe-0.ron
View File

@ -6,9 +6,9 @@ ItemDef(
hands: Two,
stats: (
equip_time_secs: 0.4,
power: 2.0,
power: 1.75,
effect_power: 1.0,
speed: 1.0,
speed: 0.65,
crit_chance: 0.140625,
range: 1.0,
energy_efficiency: 1.0,

6
assets/common/items/weapons/bow/velorite.ron
View File

@ -6,9 +6,9 @@ ItemDef(
hands: Two,
stats: (
equip_time_secs: 0.4,
power: 2.0,
effect_power: 1.1,
speed: 1.0,
power: 1.75,
effect_power: 1.0,
speed: 0.65,
crit_chance: 0.140625,
range: 1.0,
energy_efficiency: 1.0,

8
assets/common/items/weapons/hammer/cultist_purp_2h-0.ron
View File

@ -6,9 +6,9 @@ ItemDef(
hands: Two,
stats: (
equip_time_secs: 0.5,
power: 2.0,
power: 1.75,
effect_power: 1.0,
speed: 1.0,
speed: 0.65,
crit_chance: 0.140625,
range: 1.0,
energy_efficiency: 1.0,
@ -16,6 +16,8 @@ ItemDef(
),
)),
quality: Epic,
tags: [],
tags: [
Cultist,
],
ability_spec: None,
)

8
assets/common/items/weapons/sceptre/root_evil.ron
View File

@ -6,9 +6,9 @@ ItemDef(
hands: Two,
stats: (
equip_time_secs: 0.4,
power: 2.0,
power: 1.75,
effect_power: 1.0,
speed: 1.0,
speed: 0.65,
crit_chance: 0.140625,
range: 1.0,
energy_efficiency: 1.0,
@ -16,6 +16,8 @@ ItemDef(
),
)),
quality: Epic,
tags: [],
tags: [
Cultist,
],
ability_spec: None,
)

4
assets/common/items/weapons/sceptre/sceptre_velorite_0.ron
View File

@ -6,9 +6,9 @@ ItemDef(
hands: Two,
stats: (
equip_time_secs: 0.4,
power: 2.0,
power: 1.75,
effect_power: 1.5,
speed: 1.0,
speed: 0.65,
crit_chance: 0.21153846,
range: 1.0,
energy_efficiency: 1.0,

8
assets/common/items/weapons/staff/cultist_staff.ron
View File

@ -6,9 +6,9 @@ ItemDef(
hands: Two,
stats: (
equip_time_secs: 0.3,
power: 2.0,
power: 1.75,
effect_power: 1.0,
speed: 1.0,
speed: 0.65,
crit_chance: 0.140625,
range: 1.0,
energy_efficiency: 1.0,
@ -16,6 +16,8 @@ ItemDef(
),
)),
quality: Epic,
tags: [],
tags: [
Cultist,
],
ability_spec: None,
)

8
assets/common/items/weapons/sword/cultist.ron
View File

@ -6,9 +6,9 @@ ItemDef(
hands: Two,
stats: (
equip_time_secs: 0.5,
power: 2.0,
power: 1.75,
effect_power: 1.0,
speed: 1.0,
speed: 0.65,
crit_chance: 0.140625,
range: 1.0,
energy_efficiency: 1.0,
@ -16,6 +16,8 @@ ItemDef(
),
)),
quality: Epic,
tags: [],
tags: [
Cultist,
],
ability_spec: None,
)

2
assets/common/loadout/dungeon/tier-5/cultist.ron
View File

@ -24,6 +24,6 @@
(2, Item("common.items.weapons.hammer.cultist_purp_2h-0")),
(2, ModularWeapon(tool: Hammer, material: Orichalcum, hands: None)),
(2, Item("common.items.weapons.bow.velorite")),
(1, Item("common.items.weapons.sceptre.sceptre_velorite_0")),
(1, Item("common.items.weapons.sceptre.root_evil")),
]), None)),
)

1
assets/common/loot_tables/armor/cultist.ron
View File

@ -7,4 +7,5 @@
(1.0, Item("common.items.armor.cultist.shoulder")),
(1.0, Item("common.items.armor.cultist.bandana")),
(1.0, Item("common.items.armor.misc.back.dungeon_purple")),
(1.0, Item("common.items.armor.cultist.necklace")),
]

1
assets/common/loot_tables/dungeon/tier-5/boss.ron
View File

@ -7,7 +7,6 @@
// Rare misc items
(1.0, Item("common.items.boss_drops.lantern")),
(1.0, Item("common.items.glider.skullgrin")),
(1.0, Item("common.items.armor.cultist.necklace")),
(0.01, Item("common.items.armor.misc.neck.ankh_of_life")),
// Legendary weapons
(1.0, LootTable("common.loot_tables.weapons.legendary_ranged")),

4
assets/common/recipe_book.ron
View File

@ -296,14 +296,14 @@
],
craft_sprite: Some(Forge),
),
// Only for Christmas event so remove once done
/* Only for Christmas event so comment out once done
"diamonds": (
output: ("common.items.mineral.gem.diamond", 1),
inputs: [
(Item("common.items.mineral.ore.coal"), 20, false),
],
craft_sprite: Some(Forge),
),
), */
"cotton": (
output: ("common.items.crafting_ing.cloth.cotton", 1),
inputs: [

17
assets/server/manifests/kits.ron
View File

@ -337,13 +337,16 @@
(Item("common.items.armor.ferocious.back"),1),
],
"cultist": [
(Item("common.items.armor.cultist.chest"),1),
(Item("common.items.armor.cultist.pants"),1),
(Item("common.items.armor.cultist.hand"),1),
(Item("common.items.armor.cultist.foot"),1),
(Item("common.items.armor.cultist.shoulder"),1),
(Item("common.items.armor.cultist.belt"),1),
(Item("common.items.armor.misc.back.dungeon_purple"),1),
(Item("common.items.armor.cultist.chest"), 1),
(Item("common.items.armor.cultist.pants"), 1),
(Item("common.items.armor.cultist.hand"), 1),
(Item("common.items.armor.cultist.foot"), 1),
(Item("common.items.armor.cultist.shoulder"), 1),
(Item("common.items.armor.cultist.belt"), 1),
(Item("common.items.armor.misc.back.dungeon_purple"), 1),
(Item("common.items.armor.cultist.bandana"), 1),
(Item("common.items.armor.cultist.necklace"), 1),
(Item("common.items.armor.cultist.ring"), 2),
],
"admin_cosmetics": [
(Item("common.items.debug.cultist_belt"),1),

4
assets/voxygen/item_image_manifest.ron
View File

@ -3166,6 +3166,10 @@
"voxel.sprite.flowers.sunflower_1",
(-2.0, -0.5, -1.0), (-60.0, 40.0, 20.0), 1.1,
),
Simple("common.items.flowers.yellow"): VoxTrans(
"voxel.sprite.flowers.sunflower_1",
(-2.0, -0.5, -1.0), (-60.0, 40.0, 20.0), 1.1,
),
Simple("common.items.flowers.red"): VoxTrans(
"voxel.sprite.flowers.flower_red-4",
(0.0, 0.5, 0.0), (-70.0, 10.0, 0.0), 0.8,

BIN
assets/voxygen/voxel/armor/cultist/bandana.vox (Stored with Git LFS)
View File

Binary file not shown.

12
assets/voxygen/voxel/humanoid_armor_back_manifest.ron
View File

@ -40,6 +40,18 @@
vox_spec: ("armor.velorite_battlemage.back", (-5.0, -1.0, -14.0)),
color: None
),
"common.items.debug.admin_back": (
vox_spec: ("armor.velorite_battlemage.back", (-5.0, -1.0, -14.0)),
color: None
),
"common.items.debug.admin_back": (
vox_spec: ("armor.velorite_battlemage.back", (-5.0, -1.0, -14.0)),
color: None
),
"common.items.debug.dungeon_purple": (
vox_spec: ("armor.velorite_battlemage.back", (-5.0, -1.0, -14.0)),
color: None
),
"common.items.npc_armor.back.leather_blue": (
vox_spec: ("armor.leather_blue.back", (-5.0, -1.0, -11.0)),
color: None

8
assets/voxygen/voxel/humanoid_armor_belt_manifest.ron
View File

@ -69,8 +69,12 @@
color: None
),
"common.items.armor.velorite_mage.belt": (
vox_spec: ("armor.velorite_battlemage.belt", (-5.0, -3.5, 2.0)),
color: None
vox_spec: ("armor.velorite_battlemage.belt", (-5.0, -3.5, 2.0)),
color: None
),
"common.items.debug.cultist_belt": (
vox_spec: ("armor.velorite_battlemage.belt", (-5.0, -3.5, 2.0)),
color: None
),
"common.items.armor.hide.rawhide.belt": (
vox_spec: ("armor.hide.rawhide.belt", (-4.0, -3.5, 2.0)),

92
assets/voxygen/voxel/humanoid_armor_chest_manifest.ron
View File

@ -139,6 +139,10 @@
color: None
),
"common.items.armor.velorite_mage.chest": (
vox_spec: ("armor.velorite_battlemage.chest", (-7.0, -3.5, 0.5)),
color: None
),
"common.items.debug.cultist_chest_blue": (
vox_spec: ("armor.velorite_battlemage.chest", (-7.0, -3.5, 0.5)),
color: None
),
@ -151,92 +155,92 @@
color: None
),
"common.items.armor.hide.scale.chest": (
vox_spec: ("armor.hide.scale.chest", (-7.0, -3.5, 2.0)),
color: None
vox_spec: ("armor.hide.scale.chest", (-7.0, -3.5, 2.0)),
color: None
),
"common.items.armor.hide.carapace.chest": (
vox_spec: ("armor.hide.carapace.chest", (-7.0, -3.5, 1.5)),
color: None
vox_spec: ("armor.hide.carapace.chest", (-7.0, -3.5, 1.5)),
color: None
),
"common.items.armor.hide.primal.chest": (
vox_spec: ("armor.hide.primal.chest", (-7.0, -3.5, 0.5)),
color: None
vox_spec: ("armor.hide.primal.chest", (-7.0, -3.5, 0.5)),
color: None
),
"common.items.armor.hide.dragonscale.chest": (
vox_spec: ("armor.hide.dragonscale.chest", (-7.0, -3.5, 1.5)),
color: None
vox_spec: ("armor.hide.dragonscale.chest", (-7.0, -3.5, 1.5)),
color: None
),
"common.items.armor.savage.chest": (
vox_spec: ("armor.hide.savage.chest", (-7.0, -4.0, 1.0)),
color: None
vox_spec: ("armor.hide.savage.chest", (-7.0, -4.0, 1.0)),
color: None
),
"common.items.armor.witch.chest": (
vox_spec: ("armor.witch.chest", (-7.0, -4.0, 2.0)),
color: None
vox_spec: ("armor.witch.chest", (-7.0, -4.0, 2.0)),
color: None
),
"common.items.armor.pirate.chest": (
vox_spec: ("armor.pirate.chest", (-7.0, -4.0, 2.0)),
color: None
vox_spec: ("armor.pirate.chest", (-7.0, -4.0, 2.0)),
color: None
),
"common.items.armor.alchemist.chest": (
vox_spec: ("armor.alchemist.chest", (-7.0, -4.0, 2.0)),
color: None
vox_spec: ("armor.alchemist.chest", (-7.0, -4.0, 2.0)),
color: None
),
"common.items.armor.blacksmith.chest": (
vox_spec: ("armor.blacksmith.chest", (-7.0, -4.0, 2.0)),
color: None
vox_spec: ("armor.blacksmith.chest", (-7.0, -4.0, 2.0)),
color: None
),
"common.items.armor.chef.chest": (
vox_spec: ("armor.chef.chest", (-7.0, -4.0, 2.0)),
color: None
vox_spec: ("armor.chef.chest", (-7.0, -4.0, 2.0)),
color: None
),
"common.items.armor.cloth.linen.chest": (
vox_spec: ("armor.cloth.linen.chest", (-7.0, -4.0, 2.0)),
color: None
vox_spec: ("armor.cloth.linen.chest", (-7.0, -4.0, 2.0)),
color: None
),
"common.items.armor.cloth.woolen.chest": (
vox_spec: ("armor.cloth.woolen.chest", (-7.0, -4.0, 1.0)),
color: None
vox_spec: ("armor.cloth.woolen.chest", (-7.0, -4.0, 1.0)),
color: None
),
"common.items.armor.cloth.silken.chest": (
vox_spec: ("armor.cloth.silken.chest", (-7.0, -4.0, 1.0)),
color: None
vox_spec: ("armor.cloth.silken.chest", (-7.0, -4.0, 1.0)),
color: None
),
"common.items.armor.cloth.druid.chest": (
vox_spec: ("armor.cloth.druid.chest", (-7.0, -4.0, 2.0)),
color: None
vox_spec: ("armor.cloth.druid.chest", (-7.0, -4.0, 2.0)),
color: None
),
"common.items.armor.cloth.moonweave.chest": (
vox_spec: ("armor.cloth.moonweave.chest", (-7.0, -4.0, 1.0)),
color: None
vox_spec: ("armor.cloth.moonweave.chest", (-7.0, -4.0, 1.0)),
color: None
),
"common.items.armor.cloth.sunsilk.chest": (
vox_spec: ("armor.cloth.sunsilk.chest", (-7.0, -4.0, 1.0)),
color: None
vox_spec: ("armor.cloth.sunsilk.chest", (-7.0, -4.0, 1.0)),
color: None
),
"common.items.armor.mail.bronze.chest": (
vox_spec: ("armor.mail.bronze.chest", (-7.0, -4.0, 2.0)),
color: None
vox_spec: ("armor.mail.bronze.chest", (-7.0, -4.0, 2.0)),
color: None
),
"common.items.armor.mail.iron.chest": (
vox_spec: ("armor.mail.iron.chest", (-7.0, -4.0, 2.0)),
color: None
vox_spec: ("armor.mail.iron.chest", (-7.0, -4.0, 2.0)),
color: None
),
"common.items.armor.mail.steel.chest": (
vox_spec: ("armor.mail.steel.chest", (-8.0, -4.0, 1.0)),
color: None
vox_spec: ("armor.mail.steel.chest", (-8.0, -4.0, 1.0)),
color: None
),
"common.items.armor.mail.cobalt.chest": (
vox_spec: ("armor.mail.cobalt.chest", (-8.0, -4.0, 1.0)),
color: None
vox_spec: ("armor.mail.cobalt.chest", (-8.0, -4.0, 1.0)),
color: None
),
"common.items.armor.mail.bloodsteel.chest": (
vox_spec: ("armor.mail.bloodsteel.chest", (-8.0, -4.0, 1.0)),
color: None
vox_spec: ("armor.mail.bloodsteel.chest", (-8.0, -4.0, 1.0)),
color: None
),
"common.items.armor.mail.orichalcum.chest": (
vox_spec: ("armor.mail.orichalcum.chest", (-7.0, -4.0, 1.0)),
color: None
vox_spec: ("armor.mail.orichalcum.chest", (-7.0, -4.0, 1.0)),
color: None
),
"common.items.armor.merchant.chest": (
vox_spec: ("armor.merchant.chest", (-7.0, -4.0, 1.0)),

80
assets/voxygen/voxel/humanoid_armor_foot_manifest.ron
View File

@ -69,6 +69,10 @@
color: None
),
"common.items.armor.velorite_mage.foot": (
vox_spec: ("armor.velorite_battlemage.foot", (-2.5, -3.5, -2.0)),
color: None
),
"common.items.debug.cultist_boots": (
vox_spec: ("armor.velorite_battlemage.foot", (-2.5, -3.5, -2.0)),
color: None
),
@ -81,80 +85,80 @@
color: None
),
"common.items.armor.hide.scale.foot": (
vox_spec: ("armor.hide.scale.foot", (-2.5, -3.5, -2.0)),
color: None
vox_spec: ("armor.hide.scale.foot", (-2.5, -3.5, -2.0)),
color: None
),
"common.items.armor.hide.carapace.foot": (
vox_spec: ("armor.hide.carapace.foot", (-2.5, -3.5, -2.0)),
color: None
vox_spec: ("armor.hide.carapace.foot", (-2.5, -3.5, -2.0)),
color: None
),
"common.items.armor.hide.primal.foot": (
vox_spec: ("armor.hide.primal.foot", (-2.5, -3.5, -2.0)),
color: None
vox_spec: ("armor.hide.primal.foot", (-2.5, -3.5, -2.0)),
color: None
),
"common.items.armor.hide.dragonscale.foot": (
vox_spec: ("armor.hide.dragonscale.foot", (-2.5, -5.5, -2.0)),
color: None
vox_spec: ("armor.hide.dragonscale.foot", (-2.5, -5.5, -2.0)),
color: None
),
"common.items.armor.savage.foot": (
vox_spec: ("armor.savage.foot", (-2.5, -3.5, -2.0)),
color: None
vox_spec: ("armor.savage.foot", (-2.5, -3.5, -2.0)),
color: None
),
"common.items.armor.witch.foot": (
vox_spec: ("armor.witch.foot", (-2.5, -3.5, -2.0)),
color: None
vox_spec: ("armor.witch.foot", (-2.5, -3.5, -2.0)),
color: None
),
"common.items.armor.pirate.foot": (
vox_spec: ("armor.pirate.foot", (-2.5, -3.5, -2.0)),
color: None
vox_spec: ("armor.pirate.foot", (-2.5, -3.5, -2.0)),
color: None
),
"common.items.armor.cloth.linen.foot": (
vox_spec: ("armor.cloth.linen.foot", (-2.5, -3.5, -2.0)),
color: None
vox_spec: ("armor.cloth.linen.foot", (-2.5, -3.5, -2.0)),
color: None
),
"common.items.armor.cloth.woolen.foot": (
vox_spec: ("armor.cloth.woolen.foot", (-2.5, -3.5, -2.0)),
color: None
vox_spec: ("armor.cloth.woolen.foot", (-2.5, -3.5, -2.0)),
color: None
),
"common.items.armor.cloth.silken.foot": (
vox_spec: ("armor.cloth.silken.foot", (-2.5, -3.5, -2.0)),
color: None
vox_spec: ("armor.cloth.silken.foot", (-2.5, -3.5, -2.0)),
color: None
),
"common.items.armor.cloth.druid.foot": (
vox_spec: ("armor.cloth.druid.foot", (-2.5, -3.5, -2.0)),
color: None
vox_spec: ("armor.cloth.druid.foot", (-2.5, -3.5, -2.0)),
color: None
),
"common.items.armor.cloth.moonweave.foot": (
vox_spec: ("armor.cloth.moonweave.foot", (-2.5, -3.5, -2.0)),
color: None
vox_spec: ("armor.cloth.moonweave.foot", (-2.5, -3.5, -2.0)),
color: None
),
"common.items.armor.cloth.sunsilk.foot": (
vox_spec: ("armor.cloth.sunsilk.foot", (-2.5, -3.5, -2.0)),
color: None
vox_spec: ("armor.cloth.sunsilk.foot", (-2.5, -3.5, -2.0)),
color: None
),
"common.items.armor.mail.bronze.foot": (
vox_spec: ("armor.mail.bronze.foot", (-2.5, -3.5, -2.0)),
color: None
vox_spec: ("armor.mail.bronze.foot", (-2.5, -3.5, -2.0)),
color: None
),
"common.items.armor.mail.iron.foot": (
vox_spec: ("armor.mail.iron.foot", (-2.5, -3.5, -2.0)),
color: None
vox_spec: ("armor.mail.iron.foot", (-2.5, -3.5, -2.0)),
color: None
),
"common.items.armor.mail.steel.foot": (
vox_spec: ("armor.mail.steel.foot", (-2.5, -3.5, -2.0)),
color: None
vox_spec: ("armor.mail.steel.foot", (-2.5, -3.5, -2.0)),
color: None
),
"common.items.armor.mail.cobalt.foot": (
vox_spec: ("armor.mail.cobalt.foot", (-2.5, -3.5, -2.0)),
color: None
vox_spec: ("armor.mail.cobalt.foot", (-2.5, -3.5, -2.0)),
color: None
),
"common.items.armor.mail.bloodsteel.foot": (
vox_spec: ("armor.mail.bloodsteel.foot", (-2.5, -3.5, -2.0)),
color: None
vox_spec: ("armor.mail.bloodsteel.foot", (-2.5, -3.5, -2.0)),
color: None
),
"common.items.armor.mail.orichalcum.foot": (
vox_spec: ("armor.mail.orichalcum.foot", (-2.5, -3.5, -2.0)),
color: None
vox_spec: ("armor.mail.orichalcum.foot", (-2.5, -3.5, -2.0)),
color: None
),
"common.items.armor.merchant.foot": (
vox_spec: ("armor.merchant.foot", (-2.5, -3.5, -2.0)),

10
assets/voxygen/voxel/humanoid_armor_hand_manifest.ron
View File

@ -150,6 +150,16 @@
color: None
)
),
"common.items.debug.cultist_hands_blue": (
left: (
vox_spec: ("armor.velorite_battlemage.hand", (-2.5, -1.5, -2.5)),
color: None
),
right: (
vox_spec: ("armor.velorite_battlemage.hand", (-2.5, -1.5, -2.5)),
color: None
)
),
"common.items.armor.hide.rawhide.hand": (
left: (
vox_spec: ("armor.hide.rawhide.hand", (-1.5, -1.5, -2.5)),

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

@ -765,54 +765,54 @@
color: None
),
//
(Danari, Male, "common.items.armor.cultist.hat"): (
vox_spec: ("armor.cultist.bandana", (-2.0, -2.0, -8.0)),
(Danari, Male, "common.items.armor.cultist.bandana"): (
vox_spec: ("armor.cultist.bandana", (-2.0, -1.0, -8.0)),
color: None
),
(Danari, Female, "common.items.armor.cultist.hat"): (
vox_spec: ("armor.cultist.bandana", (-2.0, -2.0, -8.0)),
(Danari, Female, "common.items.armor.cultist.bandana"): (
vox_spec: ("armor.cultist.bandana", (-2.0, -1.0, -8.0)),
color: None
),
(Dwarf, Male, "common.items.armor.cultist.hat"): (
vox_spec: ("armor.cultist.bandana", (-5.0, -1.0, -10.0)),
(Dwarf, Male, "common.items.armor.cultist.bandana"): (
vox_spec: ("armor.cultist.bandana", (-5.0, 0.0, -10.0)),
color: None
),
(Dwarf, Female, "common.items.armor.cultist.hat"): (
vox_spec: ("armor.cultist.bandana", (-5.0, -1.0, -10.0)),
(Dwarf, Female, "common.items.armor.cultist.bandana"): (
vox_spec: ("armor.cultist.bandana", (-5.0, 0.0, -10.0)),
color: None
),
(Human, Male, "common.items.armor.cultist.hat"): (
vox_spec: ("armor.cultist.bandana", (-4.0, -2.0, -11.0)),
(Human, Male, "common.items.armor.cultist.bandana"): (
vox_spec: ("armor.cultist.bandana", (-4.0, -1.0, -10.0)),
color: None
),
(Human, Female, "common.items.armor.cultist.hat"): (
vox_spec: ("armor.cultist.bandana", (-4.0, -2.0, -10.0)),
(Human, Female, "common.items.armor.cultist.bandana"): (
vox_spec: ("armor.cultist.bandana", (-4.0, 0.0, -10.0)),
color: None
),
(Undead, Male, "common.items.armor.cultist.hat"): (
vox_spec: ("armor.cultist.bandana", (-6.0, -2.0, -8.0)),
(Undead, Male, "common.items.armor.cultist.bandana"): (
vox_spec: ("armor.cultist.bandana", (-6.0, -1.0, -8.0)),
color: None
),
(Undead, Female, "common.items.armor.cultist.hat"): (
vox_spec: ("armor.cultist.bandana", (-6.0, -2.0, -9.0)),
(Undead, Female, "common.items.armor.cultist.bandana"): (
vox_spec: ("armor.cultist.bandana", (-6.0, -1.0, -9.0)),
color: None
),
(Elf, Male, "common.items.armor.cultist.hat"): (
(Elf, Male, "common.items.armor.cultist.bandana"): (
vox_spec: ("armor.cultist.bandana", (-3.0, -1.0, -10.0)),
color: None
),
(Elf, Female, "common.items.armor.cultist.bandana"): (
vox_spec: ("armor.cultist.bandana", (-3.0, -1.0, -10.0)),
color: None
),
(Orc, Male, "common.items.armor.cultist.bandana"): (
vox_spec: ("armor.cultist.bandana", (-3.0, 0.0, -7.0)),
color: None
),
(Orc, Female, "common.items.armor.cultist.bandana"): (
vox_spec: ("armor.cultist.bandana", (-3.0, -2.0, -10.0)),
color: None
),
(Elf, Female, "common.items.armor.cultist.hat"): (
vox_spec: ("armor.cultist.bandana", (-3.0, -2.0, -10.0)),
color: None
),
(Orc, Male, "common.items.armor.cultist.hat"): (
vox_spec: ("armor.cultist.bandana", (-3.0, 0.0, -8.0)),
color: None
),
(Orc, Female, "common.items.armor.cultist.hat"): (
vox_spec: ("armor.cultist.bandana", (-3.0, -3.0, -10.0)),
color: None
),
//
(Human, Male, "common.items.armor.misc.head.hood"): (
vox_spec: ("armor.misc.head.hood", (-4.0, -6.0, -4.0)),
@ -961,51 +961,51 @@
color: None
),
// Merchant Turban
(Human, Male, "common.items.armor.merchant.hat"): (
(Human, Male, "common.items.armor.merchant.turban"): (
vox_spec: ("armor.merchant.turban", (-4.0, -7.0, -6.0)),
color: None
),
(Human, Female, "common.items.armor.merchant.hat"): (
(Human, Female, "common.items.armor.merchant.turban"): (
vox_spec: ("armor.merchant.turban", (-4.0, -6.0, -6.0)),
color: None
),
(Elf, Male, "common.items.armor.merchant.hat"): (
(Elf, Male, "common.items.armor.merchant.turban"): (
vox_spec: ("armor.merchant.turban", (-3.0, -7.0, -6.0)),
color: None
),
(Elf, Female, "common.items.armor.merchant.hat"): (
(Elf, Female, "common.items.armor.merchant.turban"): (
vox_spec: ("armor.merchant.turban", (-3.0, -7.0, -6.0)),
color: None
),
(Dwarf, Male, "common.items.armor.merchant.hat"): (
(Dwarf, Male, "common.items.armor.merchant.turban"): (
vox_spec: ("armor.merchant.turban", (-5.0, -6.0, -6.0)),
color: None
),
(Dwarf, Female, "common.items.armor.merchant.hat"): (
(Dwarf, Female, "common.items.armor.merchant.turban"): (
vox_spec: ("armor.merchant.turban", (-5.0, -6.0, -6.0)),
color: None
),
(Danari, Male, "common.items.armor.merchant.hat"): (
(Danari, Male, "common.items.armor.merchant.turban"): (
vox_spec: ("armor.merchant.turban", (-2.0, -7.0, -4.0)),
color: None
),
(Danari, Female, "common.items.armor.merchant.hat"): (
(Danari, Female, "common.items.armor.merchant.turban"): (
vox_spec: ("armor.merchant.turban", (-2.0, -7.0, -4.0)),
color: None
),
(Undead, Male, "common.items.armor.merchant.hat"): (
(Undead, Male, "common.items.armor.merchant.turban"): (
vox_spec: ("armor.merchant.turban", (-6.0, -7.0, -4.0)),
color: None
),
(Undead, Female, "common.items.armor.merchant.hat"): (
(Undead, Female, "common.items.armor.merchant.turban"): (
vox_spec: ("armor.merchant.turban", (-6.0, -7.0, -5.0)),
color: None
),
(Orc, Male, "common.items.armor.merchant.hat"): (
(Orc, Male, "common.items.armor.merchant.turban"): (
vox_spec: ("armor.merchant.turban", (-3.0, -5.0, -4.0)),
color: None
),
(Orc, Female, "common.items.armor.merchant.hat"): (
(Orc, Female, "common.items.armor.merchant.turban"): (
vox_spec: ("armor.merchant.turban", (-3.0, -8.0, -6.0)),
color: None
),

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

@ -96,6 +96,10 @@
vox_spec: ("armor.velorite_battlemage.pants", (-6.0, -3.5, -2.0)),
color: None
),
"common.items.debug.cultist_legs_blue": (
vox_spec: ("armor.velorite_battlemage.pants", (-6.0, -3.5, -2.0)),
color: None
),
"common.items.npc_armor.pants.leather_blue": (
vox_spec: ("armor.leather_blue.pants", (-5.0, -3.5, 1.0)),
color: None

10
assets/voxygen/voxel/humanoid_armor_shoulder_manifest.ron
View File

@ -231,6 +231,16 @@
color: None
)
),
"common.items.debug.cultist_shoulder_blue": (
left: (
vox_spec: ("armor.velorite_battlemage.shoulder", (-6.0, -4.0 , 0.0)),
color: None
),
right: (
vox_spec: ("armor.velorite_battlemage.shoulder", (-1.0, -4.0, 0.0)),
color: None
)
),
"common.items.armor.hide.rawhide.shoulder": (
left: (
vox_spec: ("armor.hide.rawhide.shoulder", (-4.0, -3.2, -0.5)),