diff --git a/assets/common/items/tool/pickaxe_steel.ron b/assets/common/items/tool/pickaxe_steel.ron index 8379b760b5..874f286f91 100644 --- a/assets/common/items/tool/pickaxe_steel.ron +++ b/assets/common/items/tool/pickaxe_steel.ron @@ -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, diff --git a/assets/common/items/weapons/axe/malachite_axe-0.ron b/assets/common/items/weapons/axe/malachite_axe-0.ron index 53d6437cfe..eefa7e28cb 100644 --- a/assets/common/items/weapons/axe/malachite_axe-0.ron +++ b/assets/common/items/weapons/axe/malachite_axe-0.ron @@ -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, diff --git a/assets/common/items/weapons/bow/velorite.ron b/assets/common/items/weapons/bow/velorite.ron index 0e39379e5b..e3acdf7676 100644 --- a/assets/common/items/weapons/bow/velorite.ron +++ b/assets/common/items/weapons/bow/velorite.ron @@ -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, diff --git a/assets/common/items/weapons/hammer/cultist_purp_2h-0.ron b/assets/common/items/weapons/hammer/cultist_purp_2h-0.ron index f305dc333f..8e305f8095 100644 --- a/assets/common/items/weapons/hammer/cultist_purp_2h-0.ron +++ b/assets/common/items/weapons/hammer/cultist_purp_2h-0.ron @@ -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, ) \ No newline at end of file diff --git a/assets/common/items/weapons/sceptre/root_evil.ron b/assets/common/items/weapons/sceptre/root_evil.ron index d58af7a7de..7b599d352c 100644 --- a/assets/common/items/weapons/sceptre/root_evil.ron +++ b/assets/common/items/weapons/sceptre/root_evil.ron @@ -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, ) \ No newline at end of file diff --git a/assets/common/items/weapons/sceptre/sceptre_velorite_0.ron b/assets/common/items/weapons/sceptre/sceptre_velorite_0.ron index 1a368fdae5..20ce5b14a6 100644 --- a/assets/common/items/weapons/sceptre/sceptre_velorite_0.ron +++ b/assets/common/items/weapons/sceptre/sceptre_velorite_0.ron @@ -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, diff --git a/assets/common/items/weapons/staff/cultist_staff.ron b/assets/common/items/weapons/staff/cultist_staff.ron index 35d2f41732..f65ab75d40 100644 --- a/assets/common/items/weapons/staff/cultist_staff.ron +++ b/assets/common/items/weapons/staff/cultist_staff.ron @@ -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, ) \ No newline at end of file diff --git a/assets/common/items/weapons/sword/cultist.ron b/assets/common/items/weapons/sword/cultist.ron index 742cef15a9..91e0fc30ff 100644 --- a/assets/common/items/weapons/sword/cultist.ron +++ b/assets/common/items/weapons/sword/cultist.ron @@ -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, ) \ No newline at end of file diff --git a/assets/common/loadout/dungeon/tier-5/cultist.ron b/assets/common/loadout/dungeon/tier-5/cultist.ron index a147f8950c..1346c584ad 100644 --- a/assets/common/loadout/dungeon/tier-5/cultist.ron +++ b/assets/common/loadout/dungeon/tier-5/cultist.ron @@ -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)), ) diff --git a/assets/common/loot_tables/armor/cultist.ron b/assets/common/loot_tables/armor/cultist.ron index 37fb4d2e15..f2bf5599ad 100644 --- a/assets/common/loot_tables/armor/cultist.ron +++ b/assets/common/loot_tables/armor/cultist.ron @@ -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")), ] \ No newline at end of file diff --git a/assets/common/loot_tables/dungeon/tier-5/boss.ron b/assets/common/loot_tables/dungeon/tier-5/boss.ron index 172fc4a4cd..3b7572089d 100644 --- a/assets/common/loot_tables/dungeon/tier-5/boss.ron +++ b/assets/common/loot_tables/dungeon/tier-5/boss.ron @@ -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")), diff --git a/assets/common/recipe_book.ron b/assets/common/recipe_book.ron index 62e1efdbdf..241462a8e5 100644 --- a/assets/common/recipe_book.ron +++ b/assets/common/recipe_book.ron @@ -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: [ diff --git a/assets/server/manifests/kits.ron b/assets/server/manifests/kits.ron index 169b9cc94f..4101b3779c 100644 --- a/assets/server/manifests/kits.ron +++ b/assets/server/manifests/kits.ron @@ -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), diff --git a/assets/voxygen/item_image_manifest.ron b/assets/voxygen/item_image_manifest.ron index dab00ef2ac..1c7db9d146 100644 --- a/assets/voxygen/item_image_manifest.ron +++ b/assets/voxygen/item_image_manifest.ron @@ -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, diff --git a/assets/voxygen/voxel/armor/cultist/bandana.vox b/assets/voxygen/voxel/armor/cultist/bandana.vox index 14d45c6c96..57881ee61f 100644 --- a/assets/voxygen/voxel/armor/cultist/bandana.vox +++ b/assets/voxygen/voxel/armor/cultist/bandana.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b5ff49320a6198671531cb0fc3b358366dc75ac388bd2efd06c20fd68f008c46 -size 2792 +oid sha256:8c5ad4e34dd6be8e21ba62aee6e5f96b14c7a77591246342517e55adc82abde3 +size 2784 diff --git a/assets/voxygen/voxel/humanoid_armor_back_manifest.ron b/assets/voxygen/voxel/humanoid_armor_back_manifest.ron index d1f68b9a7a..e9463e8238 100644 --- a/assets/voxygen/voxel/humanoid_armor_back_manifest.ron +++ b/assets/voxygen/voxel/humanoid_armor_back_manifest.ron @@ -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 diff --git a/assets/voxygen/voxel/humanoid_armor_belt_manifest.ron b/assets/voxygen/voxel/humanoid_armor_belt_manifest.ron index ad460ac1c9..69212f2ae1 100644 --- a/assets/voxygen/voxel/humanoid_armor_belt_manifest.ron +++ b/assets/voxygen/voxel/humanoid_armor_belt_manifest.ron @@ -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)), diff --git a/assets/voxygen/voxel/humanoid_armor_chest_manifest.ron b/assets/voxygen/voxel/humanoid_armor_chest_manifest.ron index 945a11602c..f9e9d49786 100644 --- a/assets/voxygen/voxel/humanoid_armor_chest_manifest.ron +++ b/assets/voxygen/voxel/humanoid_armor_chest_manifest.ron @@ -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)), diff --git a/assets/voxygen/voxel/humanoid_armor_foot_manifest.ron b/assets/voxygen/voxel/humanoid_armor_foot_manifest.ron index 6af351e9f8..5f42c91d7c 100644 --- a/assets/voxygen/voxel/humanoid_armor_foot_manifest.ron +++ b/assets/voxygen/voxel/humanoid_armor_foot_manifest.ron @@ -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)), diff --git a/assets/voxygen/voxel/humanoid_armor_hand_manifest.ron b/assets/voxygen/voxel/humanoid_armor_hand_manifest.ron index 526bbea91d..b4ca981c87 100644 --- a/assets/voxygen/voxel/humanoid_armor_hand_manifest.ron +++ b/assets/voxygen/voxel/humanoid_armor_hand_manifest.ron @@ -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)), diff --git a/assets/voxygen/voxel/humanoid_armor_head_manifest.ron b/assets/voxygen/voxel/humanoid_armor_head_manifest.ron index cfa93fccd7..88958c9891 100644 --- a/assets/voxygen/voxel/humanoid_armor_head_manifest.ron +++ b/assets/voxygen/voxel/humanoid_armor_head_manifest.ron @@ -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 ), diff --git a/assets/voxygen/voxel/humanoid_armor_pants_manifest.ron b/assets/voxygen/voxel/humanoid_armor_pants_manifest.ron index 912c1f4bfb..eedc856df7 100644 --- a/assets/voxygen/voxel/humanoid_armor_pants_manifest.ron +++ b/assets/voxygen/voxel/humanoid_armor_pants_manifest.ron @@ -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 diff --git a/assets/voxygen/voxel/humanoid_armor_shoulder_manifest.ron b/assets/voxygen/voxel/humanoid_armor_shoulder_manifest.ron index f131607d3a..25509a2cc3 100644 --- a/assets/voxygen/voxel/humanoid_armor_shoulder_manifest.ron +++ b/assets/voxygen/voxel/humanoid_armor_shoulder_manifest.ron @@ -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)),