diff --git a/CHANGELOG.md b/CHANGELOG.md index 20735e8a3e..05431595d5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,6 +25,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Bomb sprites (can be exploded with arrows or other explosions) - Campfire waypoints in towns - Arbitrary volume entities +- New outfit for merchants ### Changed diff --git a/assets/common/entity/template.ron b/assets/common/entity/template.ron index 232df63200..84d7159364 100644 --- a/assets/common/entity/template.ron +++ b/assets/common/entity/template.ron @@ -13,6 +13,6 @@ EntityConfig ( meta: [ LoadoutAsset("common.loadout.village.merchant"), - SkillSetAsset("common.skillset.village.merchant"), + SkillSetAsset("common.skillset.village.merchant.merchant"), ], ) diff --git a/assets/common/entity/village/merchant.ron b/assets/common/entity/village/merchant.ron index c20c0297bc..fc1f869927 100644 --- a/assets/common/entity/village/merchant.ron +++ b/assets/common/entity/village/merchant.ron @@ -6,9 +6,14 @@ EntityConfig ( // TODO: consider giving some gold/gems/materials? loot: LootTable("common.loot_tables.creature.humanoid"), - hands: TwoHanded(Item("common.items.weapons.bow.eldwood-0")), + hands: TwoHanded(Choice([ + (2.0, Some(Item("common.items.weapons.bow.eldwood-0"))), + (1.0, Some(Item("common.items.weapons.sword.steel-0"))), + (1.0, Some(Item("common.items.weapons.sword_1h.bloodsteel-0"))), + (2.0, Some(Item("common.items.weapons.staff.flamethrower_0"))), + ])), meta: [ - SkillSetAsset("common.skillset.village.merchant"), + SkillSetAsset("common.skillset.village.merchant.merchant"), ], ) diff --git a/assets/common/items/armor/leather_plate/helmet.ron b/assets/common/items/armor/leather_plate/helmet.ron new file mode 100644 index 0000000000..62c16ec28d --- /dev/null +++ b/assets/common/items/armor/leather_plate/helmet.ron @@ -0,0 +1,20 @@ +ItemDef( + name: "Leather Plate Helmet", + description: "Leather adorned with steel for better protection.", + kind: Armor(( + kind: Head("LeatherPlate"), + stats: ( + protection: Normal(32.0), + poise_resilience: Normal(8.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, + ), + )), + quality: Moderate, + tags: [ + Material(Leather), + SalvageInto(Leather), + ], +) \ No newline at end of file diff --git a/assets/common/items/armor/merchant/back.ron b/assets/common/items/armor/merchant/back.ron new file mode 100644 index 0000000000..ef363de708 --- /dev/null +++ b/assets/common/items/armor/merchant/back.ron @@ -0,0 +1,18 @@ +ItemDef( + name: "Merchant Backpack", + description: "", + kind: Armor(( + kind: Back("Merchant"), + stats: ( + protection: Normal(1.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.017, + stealth: 0.017, + ), + )), + quality: High, + slots: 18, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/armor/merchant/belt.ron b/assets/common/items/armor/merchant/belt.ron new file mode 100644 index 0000000000..57aaef7843 --- /dev/null +++ b/assets/common/items/armor/merchant/belt.ron @@ -0,0 +1,19 @@ +ItemDef( + name: "Merchant Belt", + description: "", + kind: Armor(( + kind: Belt("Merchant"), + stats: ( + protection: Normal(8.0), + poise_resilience: Normal(1.0), + energy_max: 2.0, + energy_reward: 0.025, + crit_power: 0.02, + stealth: 0.0, + ), + )), + quality: Epic, + tags: [ + + ], +) diff --git a/assets/common/items/armor/merchant/chest.ron b/assets/common/items/armor/merchant/chest.ron new file mode 100644 index 0000000000..9e7683b243 --- /dev/null +++ b/assets/common/items/armor/merchant/chest.ron @@ -0,0 +1,19 @@ +ItemDef( + name: "Merchant Jacket", + description: "", + kind: Armor(( + kind: Chest("Merchant"), + stats: ( + protection: Normal(48.0), + poise_resilience: Normal(6.0), + energy_max: 13.5, + energy_reward: 0.135, + crit_power: 0.125, + stealth: 0.0, + ), + )), + quality: Epic, + tags: [ + + ], +) diff --git a/assets/common/items/armor/merchant/foot.ron b/assets/common/items/armor/merchant/foot.ron new file mode 100644 index 0000000000..c9b6f5dec3 --- /dev/null +++ b/assets/common/items/armor/merchant/foot.ron @@ -0,0 +1,19 @@ +ItemDef( + name: "Merchant Boots", + description: "", + kind: Armor(( + kind: Foot("Merchant"), + stats: ( + protection: Normal(16.0), + poise_resilience: Normal(2.0), + energy_max: 4.5, + energy_reward: 0.045, + crit_power: 0.04, + stealth: 0.0, + ), + )), + quality: Epic, + tags: [ + + ], +) diff --git a/assets/common/items/armor/merchant/hand.ron b/assets/common/items/armor/merchant/hand.ron new file mode 100644 index 0000000000..9cea681c51 --- /dev/null +++ b/assets/common/items/armor/merchant/hand.ron @@ -0,0 +1,19 @@ +ItemDef( + name: "Merchant Gloves", + description: "", + kind: Armor(( + kind: Hand("Merchant"), + stats: ( + protection: Normal(16.0), + poise_resilience: Normal(2.0), + energy_max: 4.5, + energy_reward: 0.045, + crit_power: 0.04, + stealth: 0.0, + ), + )), + quality: Epic, + tags: [ + + ], +) diff --git a/assets/common/items/armor/merchant/pants.ron b/assets/common/items/armor/merchant/pants.ron new file mode 100644 index 0000000000..73abfcf788 --- /dev/null +++ b/assets/common/items/armor/merchant/pants.ron @@ -0,0 +1,19 @@ +ItemDef( + name: "Merchant Pants", + description: "", + kind: Armor(( + kind: Pants("Merchant"), + stats: ( + protection: Normal(32.0), + poise_resilience: Normal(4.0), + energy_max: 9.0, + energy_reward: 0.1, + crit_power: 0.08, + stealth: 0.0, + ), + )), + quality: Epic, + tags: [ + + ], +) diff --git a/assets/common/items/armor/merchant/shoulder.ron b/assets/common/items/armor/merchant/shoulder.ron new file mode 100644 index 0000000000..fda177e3df --- /dev/null +++ b/assets/common/items/armor/merchant/shoulder.ron @@ -0,0 +1,19 @@ +ItemDef( + name: "Merchant Mantle", + description: "", + kind: Armor(( + kind: Shoulder("Merchant"), + stats: ( + protection: Normal(32.0), + poise_resilience: Normal(5.0), + energy_max: 9.0, + energy_reward: 0.1, + crit_power: 0.08, + stealth: 0.0, + ), + )), + quality: Epic, + tags: [ + + ], +) diff --git a/assets/common/items/armor/merchant/turban.ron b/assets/common/items/armor/merchant/turban.ron new file mode 100644 index 0000000000..a69ec53de2 --- /dev/null +++ b/assets/common/items/armor/merchant/turban.ron @@ -0,0 +1,17 @@ +ItemDef( + name: "Impressive Turban", + description: "Fancy.", + kind: Armor(( + kind: Head("Merchant"), + stats: ( + protection: Normal(6.0), + poise_resilience: Normal(4.0), + energy_max: 12.0, + energy_reward: 0.25, + crit_power: 0.015, + stealth: 0.0, + ), + )), + quality: Epic, + tags: [], +) diff --git a/assets/common/items/armor/misc/head/crown.ron b/assets/common/items/armor/misc/head/crown.ron index 3d75d5a2b1..9d02da00b1 100644 --- a/assets/common/items/armor/misc/head/crown.ron +++ b/assets/common/items/armor/misc/head/crown.ron @@ -7,8 +7,8 @@ ItemDef( protection: Normal(12.0), poise_resilience: Normal(2.0), energy_max: 5.0, - energy_reward: 0.1, - crit_power: 0.1, + energy_reward: 0.05, + crit_power: 0.01, stealth: 0.0, ), )), diff --git a/assets/common/loadout/village/guard.ron b/assets/common/loadout/village/guard.ron index 9280fd9a65..c6d0fceaeb 100644 --- a/assets/common/loadout/village/guard.ron +++ b/assets/common/loadout/village/guard.ron @@ -5,6 +5,7 @@ Armor(Hands): Item("common.items.armor.leather_plate.hand"), Armor(Legs): Item("common.items.armor.leather_plate.pants"), Armor(Feet): Item("common.items.armor.leather_plate.foot"), + //Armor(Head): Item("common.items.armor.leather_plate.helmet"), Lantern: Choice([ (1.0, Some(Item("common.items.lantern.black_0"))), diff --git a/assets/common/loadout/village/merchant.ron b/assets/common/loadout/village/merchant.ron index a2a97e41e8..eea18d6c36 100644 --- a/assets/common/loadout/village/merchant.ron +++ b/assets/common/loadout/village/merchant.ron @@ -1,11 +1,11 @@ ({ - Armor(Shoulders): Item("common.items.armor.twigsflowers.shoulder"), - Armor(Chest): Item("common.items.armor.twigsflowers.chest"), - Armor(Hands): Item("common.items.armor.twigsflowers.hand"), - Armor(Legs): Item("common.items.armor.twigsflowers.pants"), - Armor(Feet): Item("common.items.armor.twigsflowers.foot"), - Armor(Belt): Item("common.items.armor.twigsflowers.belt"), - Armor(Head): Item("common.items.armor.misc.head.hood"), + Armor(Shoulders): Item("common.items.armor.merchant.shoulder"), + Armor(Chest): Item("common.items.armor.merchant.chest"), + Armor(Hands): Item("common.items.armor.merchant.hand"), + Armor(Legs): Item("common.items.armor.merchant.pants"), + Armor(Feet): Item("common.items.armor.merchant.foot"), + Armor(Belt): Item("common.items.armor.merchant.belt"), + Armor(Head): Item("common.items.armor.merchant.turban"), Lantern: Item("common.items.lantern.black_0"), Armor(Neck): Item("common.items.armor.misc.neck.gem_of_resilience"), diff --git a/assets/common/recipe_book.ron b/assets/common/recipe_book.ron index 6e7a0d6c9d..5bc24699bf 100644 --- a/assets/common/recipe_book.ron +++ b/assets/common/recipe_book.ron @@ -1878,6 +1878,16 @@ ], craft_sprite: Some(CraftingBench), is_recycling: false, + ), + "merchant turban": ( + output: ("common.items.armor.merchant.turban", 1), + inputs: [ + (Item("common.items.crafting_ing.cloth.linen_red"), 20), + (Item("common.items.mineral.gem.diamond"), 4), + (Item("common.items.crafting_ing.mindflayer_bag_damaged"), 1), + (Item("common.items.crafting_tools.sewing_set"), 0), + ], + craft_sprite: Some(CraftingBench), ), //"metal_blade": ( // output: ("common.items.crafting_ing.modular.damage.sword.metal_blade", 1), diff --git a/assets/common/skillset/village/merchant.ron b/assets/common/skillset/village/merchant.ron deleted file mode 100644 index 06355a4ff4..0000000000 --- a/assets/common/skillset/village/merchant.ron +++ /dev/null @@ -1,17 +0,0 @@ -([ - Group(Weapon(Bow)), - - // Charged - Skill((Bow(CDamage), Some(1))), - Skill((Bow(CRegen), Some(1))), - Skill((Bow(CKnockback), Some(1))), - Skill((Bow(CSpeed), Some(1))), - - // Repeater - Skill((Bow(RDamage), Some(1))), - Skill((Bow(RCost), Some(1))), - - // Shotgun - Skill((Bow(UnlockShotgun), None)), - Skill((Bow(SCost), Some(1))), -]) diff --git a/assets/common/skillset/village/merchant/bow.ron b/assets/common/skillset/village/merchant/bow.ron new file mode 100644 index 0000000000..029ce8ef22 --- /dev/null +++ b/assets/common/skillset/village/merchant/bow.ron @@ -0,0 +1,18 @@ +([ + Group(Weapon(Bow)), + + // Charged + Skill((Bow(CDamage), Some(2))), + Skill((Bow(CKnockback), Some(2))), + Skill((Bow(CSpeed), Some(2))), + Skill((Bow(CRegen), Some(1))), + Skill((Bow(CMove), Some(1))), + + // Repeater + Skill((Bow(RDamage), Some(2))), + Skill((Bow(RCost), Some(1))), + Skill((Bow(RSpeed), Some(1))), + + // Shotgun + Skill((Bow(UnlockShotgun), None)), +]) \ No newline at end of file diff --git a/assets/common/skillset/village/merchant/merchant.ron b/assets/common/skillset/village/merchant/merchant.ron new file mode 100644 index 0000000000..eb7778b299 --- /dev/null +++ b/assets/common/skillset/village/merchant/merchant.ron @@ -0,0 +1,5 @@ +([ + Tree("common.skillset.village.merchant.sword"), + Tree("common.skillset.village.merchant.bow"), + Tree("common.skillset.village.merchant.staff"), +]) diff --git a/assets/common/skillset/village/merchant/staff.ron b/assets/common/skillset/village/merchant/staff.ron new file mode 100644 index 0000000000..0c3baff6a5 --- /dev/null +++ b/assets/common/skillset/village/merchant/staff.ron @@ -0,0 +1,17 @@ +([ + Group(Weapon(Staff)), + + // Fireball + Skill((Staff(BDamage), Some(3))), + Skill((Staff(BRegen), Some(2))), + Skill((Staff(BRadius), Some(2))), + + // Flamethrower + Skill((Staff(FRange), Some(2))), + Skill((Staff(FDamage), Some(2))), + Skill((Staff(FDrain), Some(1))), + Skill((Staff(FVelocity), Some(1))), + + // Shockwave + Skill((Staff(UnlockShockwave), None)), +]) \ No newline at end of file diff --git a/assets/common/skillset/village/merchant/sword.ron b/assets/common/skillset/village/merchant/sword.ron new file mode 100644 index 0000000000..02a33e62bd --- /dev/null +++ b/assets/common/skillset/village/merchant/sword.ron @@ -0,0 +1,21 @@ +([ + Group(Weapon(Sword)), + + Skill((Sword(InterruptingAttacks), None)), + + // TripleStrike + Skill((Sword(TsCombo), None)), + Skill((Sword(TsDamage), Some(2))), + Skill((Sword(TsRegen), Some(2))), + Skill((Sword(TsSpeed), Some(1))), + + // Dash + Skill((Sword(DCost), Some(2))), + Skill((Sword(DDrain), Some(2))), + Skill((Sword(DDamage), Some(1))), + Skill((Sword(DScaling), Some(1))), + Skill((Sword(DSpeed), None)), + + // Spin of death + Skill((Sword(UnlockSpin), None)), +]) \ No newline at end of file diff --git a/assets/server/manifests/kits.ron b/assets/server/manifests/kits.ron index a2ab58741d..f953c11299 100644 --- a/assets/server/manifests/kits.ron +++ b/assets/server/manifests/kits.ron @@ -369,4 +369,14 @@ ("common.items.weapons.sceptre.belzeshrub",1), ("common.items.lantern.pumpkin",1), ], + "merchant": [ + ("common.items.armor.merchant.back",1), + ("common.items.armor.merchant.belt",1), + ("common.items.armor.merchant.chest",1), + ("common.items.armor.merchant.hand",1), + ("common.items.armor.merchant.foot",1), + ("common.items.armor.merchant.turban",1), + ("common.items.armor.merchant.pants",1), + ("common.items.armor.merchant.shoulder",1), + ], }) diff --git a/assets/voxygen/item_image_manifest.ron b/assets/voxygen/item_image_manifest.ron index e353e31449..5fe775f6e1 100644 --- a/assets/voxygen/item_image_manifest.ron +++ b/assets/voxygen/item_image_manifest.ron @@ -1215,6 +1215,51 @@ "voxel.armor.misc.chest.shirt_white", (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1, ), + // Merchant + Armor(Chest("Merchant")): VoxTrans( + "voxel.armor.merchant.chest", + (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1, + ), + Armor(Pants("Merchant")): VoxTrans( + "voxel.armor.merchant.pants", + (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 0.9, + ), + Armor(Belt("Merchant")): VoxTrans( + "voxel.armor.merchant.belt", + (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9, + ), + Armor(Foot("Merchant")): VoxTrans( + "voxel.armor.merchant.foot", + (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9, + ), + Armor(Hand("Merchant")): VoxTrans( + "voxel.armor.merchant.hand", + (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9, + ), + Armor(Shoulder("Merchant")): VoxTrans( + "voxel.armor.merchant.shoulder_l", + (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1, + ), + Armor(Chest("Merchant")): VoxTrans( + "voxel.armor.merchant.chest", + (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1, + ), + Armor(Pants("Merchant")): VoxTrans( + "voxel.armor.merchant.pants", + (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 0.9, + ), + Armor(Hand("Merchant")): VoxTrans( + "voxel.armor.merchant.hand", + (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9, + ), + Armor(Head("Merchant")): VoxTrans( + "voxel.armor.merchant.turban_human", + (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 1.0, + ), + Armor(Back("Merchant")): VoxTrans( + "voxel.armor.merchant.back", + (0.0, 0.0, 0.0), (-90.0, 45.0,0.0), 0.9, + ), // Velorite Battlemage Set Armor(Chest("VeloriteMage")): VoxTrans( "voxel.armor.velorite_battlemage.chest", diff --git a/assets/voxygen/voxel/armor/leather_plate/helmet_orc_m.vox b/assets/voxygen/voxel/armor/leather_plate/helmet_orc_m.vox new file mode 100644 index 0000000000..6e96c677e1 --- /dev/null +++ b/assets/voxygen/voxel/armor/leather_plate/helmet_orc_m.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8cef9dfa1ccd0b1ddabfad17484893c1d2116856221da15931fc282a5e896456 +size 45878 diff --git a/assets/voxygen/voxel/armor/leather_plate/helmet_undead_m.vox b/assets/voxygen/voxel/armor/leather_plate/helmet_undead_m.vox new file mode 100644 index 0000000000..68cda0e0f6 --- /dev/null +++ b/assets/voxygen/voxel/armor/leather_plate/helmet_undead_m.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:50aa168ee73fd1ca524418e039f4eafb5a848d82028e45a0dddf94b62fa9bc87 +size 20544 diff --git a/assets/voxygen/voxel/armor/merchant/back.vox b/assets/voxygen/voxel/armor/merchant/back.vox new file mode 100644 index 0000000000..c16bf08a7f --- /dev/null +++ b/assets/voxygen/voxel/armor/merchant/back.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:16765c1edb691b2054a1bc3b91d52fb6574e004b71fa62145a21dc4e882f2358 +size 6640 diff --git a/assets/voxygen/voxel/armor/merchant/belt.vox b/assets/voxygen/voxel/armor/merchant/belt.vox new file mode 100644 index 0000000000..b40798b267 --- /dev/null +++ b/assets/voxygen/voxel/armor/merchant/belt.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d9a6206f3fbd6df87b1737a2255db37c074d0d4d8480e7ad818be3bcc2ce4271 +size 1504 diff --git a/assets/voxygen/voxel/armor/merchant/chest.vox b/assets/voxygen/voxel/armor/merchant/chest.vox new file mode 100644 index 0000000000..52bdd46c4b --- /dev/null +++ b/assets/voxygen/voxel/armor/merchant/chest.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fbece3fe255571a574b2323b2eae993df518648ca0a48abdba56aa3ece49394b +size 2892 diff --git a/assets/voxygen/voxel/armor/merchant/foot.vox b/assets/voxygen/voxel/armor/merchant/foot.vox new file mode 100644 index 0000000000..26d212530f --- /dev/null +++ b/assets/voxygen/voxel/armor/merchant/foot.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f42954946bdf8c6e3cdcb1718147859aa15a28682b12ce5e6f58ee01cc410f5f +size 1376 diff --git a/assets/voxygen/voxel/armor/merchant/hand.vox b/assets/voxygen/voxel/armor/merchant/hand.vox new file mode 100644 index 0000000000..03e615a744 --- /dev/null +++ b/assets/voxygen/voxel/armor/merchant/hand.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:70888269c4aa6f572315fc61b5c50ef282abefa5596cbbed76f49263af8a7b49 +size 1240 diff --git a/assets/voxygen/voxel/armor/merchant/pants.vox b/assets/voxygen/voxel/armor/merchant/pants.vox new file mode 100644 index 0000000000..39ba063d89 --- /dev/null +++ b/assets/voxygen/voxel/armor/merchant/pants.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7082872d3298fc83e7578145971d15d1f383b2fe8a309614f50b828e45ecdee8 +size 2200 diff --git a/assets/voxygen/voxel/armor/merchant/shoulder_l.vox b/assets/voxygen/voxel/armor/merchant/shoulder_l.vox new file mode 100644 index 0000000000..ee5afd319a --- /dev/null +++ b/assets/voxygen/voxel/armor/merchant/shoulder_l.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:99b6adc6aa88a10b2e2ce12fd7cc8e605512833a7c8ddce003bcfaa861f61a3a +size 1752 diff --git a/assets/voxygen/voxel/armor/merchant/turban_dwarf.vox b/assets/voxygen/voxel/armor/merchant/turban_dwarf.vox new file mode 100644 index 0000000000..37de7c3c44 --- /dev/null +++ b/assets/voxygen/voxel/armor/merchant/turban_dwarf.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7575d723a0f9574b790c1737abd5be26a6bb11ba50ab315227ef8335d95246e7 +size 13952 diff --git a/assets/voxygen/voxel/armor/merchant/turban_human.vox b/assets/voxygen/voxel/armor/merchant/turban_human.vox new file mode 100644 index 0000000000..f59e91e43c --- /dev/null +++ b/assets/voxygen/voxel/armor/merchant/turban_human.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:59ba791be2f984b7c402099d11059de16353a92ae7b0087844c2cc8edfea1dd4 +size 13964 diff --git a/assets/voxygen/voxel/armor/merchant/turban_orc.vox b/assets/voxygen/voxel/armor/merchant/turban_orc.vox new file mode 100644 index 0000000000..6f59b023f7 --- /dev/null +++ b/assets/voxygen/voxel/armor/merchant/turban_orc.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:510c98209d4e27d4e6d1bdef7a571a01f1a099077221acb3b2ea533dba1bb023 +size 13956 diff --git a/assets/voxygen/voxel/armor/merchant/turban_undead.vox b/assets/voxygen/voxel/armor/merchant/turban_undead.vox new file mode 100644 index 0000000000..f259b8daf0 --- /dev/null +++ b/assets/voxygen/voxel/armor/merchant/turban_undead.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:310a44423ea38f4a298e31ac27812036708b8970751df9386e14bc8fff2830c6 +size 13856 diff --git a/assets/voxygen/voxel/humanoid_armor_back_manifest.ron b/assets/voxygen/voxel/humanoid_armor_back_manifest.ron index 10f0b422df..fc7b4d2c9c 100644 --- a/assets/voxygen/voxel/humanoid_armor_back_manifest.ron +++ b/assets/voxygen/voxel/humanoid_armor_back_manifest.ron @@ -120,5 +120,9 @@ vox_spec: ("armor.mail.orichalcum.back", (-5.0, -4.5, -12.0)), color: None ), + "Merchant": ( + vox_spec: ("armor.merchant.back", (-9.0, -7.0, -12.0)), + color: None + ), }, )) diff --git a/assets/voxygen/voxel/humanoid_armor_belt_manifest.ron b/assets/voxygen/voxel/humanoid_armor_belt_manifest.ron index abccd52507..7a72873235 100644 --- a/assets/voxygen/voxel/humanoid_armor_belt_manifest.ron +++ b/assets/voxygen/voxel/humanoid_armor_belt_manifest.ron @@ -156,5 +156,9 @@ vox_spec: ("armor.mail.orichalcum.belt", (-4.0, -3.5, 1.0)), color: None ), + "Merchant": ( + vox_spec: ("armor.merchant.belt", (-5.0, -4.0, 2.0)), + color: None + ), }, )) diff --git a/assets/voxygen/voxel/humanoid_armor_chest_manifest.ron b/assets/voxygen/voxel/humanoid_armor_chest_manifest.ron index 150d9eef14..d1a5f26e9e 100644 --- a/assets/voxygen/voxel/humanoid_armor_chest_manifest.ron +++ b/assets/voxygen/voxel/humanoid_armor_chest_manifest.ron @@ -226,5 +226,9 @@ vox_spec: ("armor.mail.orichalcum.chest", (-7.0, -4.0, 1.0)), color: None ), + "Merchant": ( + vox_spec: ("armor.merchant.chest", (-7.0, -4.0, 1.0)), + color: None + ), }, )) diff --git a/assets/voxygen/voxel/humanoid_armor_foot_manifest.ron b/assets/voxygen/voxel/humanoid_armor_foot_manifest.ron index bcf204c131..2802b43d31 100644 --- a/assets/voxygen/voxel/humanoid_armor_foot_manifest.ron +++ b/assets/voxygen/voxel/humanoid_armor_foot_manifest.ron @@ -156,5 +156,9 @@ vox_spec: ("armor.mail.orichalcum.foot", (-2.5, -3.5, -2.0)), color: None ), + "Merchant": ( + vox_spec: ("armor.merchant.foot", (-2.5, -3.5, -2.0)), + color: None + ), }, )) diff --git a/assets/voxygen/voxel/humanoid_armor_hand_manifest.ron b/assets/voxygen/voxel/humanoid_armor_hand_manifest.ron index 403df3fcc5..1805201e0b 100644 --- a/assets/voxygen/voxel/humanoid_armor_hand_manifest.ron +++ b/assets/voxygen/voxel/humanoid_armor_hand_manifest.ron @@ -360,5 +360,15 @@ color: None ) ), + "Merchant": ( + left: ( + vox_spec: ("armor.merchant.hand", (-2.5, -2.0, -4.0)), + color: None + ), + right:( + vox_spec: ("armor.merchant.hand", (-1.5, -2.0, -4.0)), + color: None + ) + ), }, )) diff --git a/assets/voxygen/voxel/humanoid_armor_head_manifest.ron b/assets/voxygen/voxel/humanoid_armor_head_manifest.ron index dc32befc84..5bbc96e032 100644 --- a/assets/voxygen/voxel/humanoid_armor_head_manifest.ron +++ b/assets/voxygen/voxel/humanoid_armor_head_manifest.ron @@ -813,5 +813,104 @@ vox_spec: ("armor.misc.head.spikeguard", (-3.0, -5.0, -2.0)), color: None ), + // Village Guard + (Human, Male, "LeatherPlate"): ( + vox_spec: ("armor.leather_plate.helmet_undead_m", (-3.0, -3.0, -0.0)), + color: None + ), + (Human, Female, "LeatherPlate"): ( + vox_spec: ("armor.leather_plate.helmet_undead_m", (-3.0, -1.0, -0.0)), + color: None + ), + (Elf, Male, "LeatherPlate"): ( + vox_spec: ("armor.leather_plate.helmet_orc_m", (-5.0, -2.0, 0.0)), + color: None + ), + (Elf, Female, "LeatherPlate"): ( + vox_spec: ("armor.leather_plate.helmet_undead_m", (-5.0, -2.0, 0.0)), + color: None + ), + (Dwarf, Male, "LeatherPlate"): ( + vox_spec: ("armor.leather_plate.helmet_undead_m", (-5.0, -2.0, 0.0)), + color: None + ), + (Dwarf, Female, "LeatherPlate"): ( + vox_spec: ("armor.leather_plate.helmet_undead_m", (-5.0, -2.0, 0.0)), + color: None + ), + (Danari, Male, "LeatherPlate"): ( + vox_spec: ("armor.leather_plate.helmet_undead_m", (-5.0, -2.0, 0.0)), + color: None + ), + (Danari, Female, "LeatherPlate"): ( + vox_spec: ("armor.leather_plate.helmet_undead_m", (-5.0, -2.0, 0.0)), + color: None + ), + (Undead, Male, "LeatherPlate"): ( + vox_spec: ("armor.leather_plate.helmet_undead_m", (-5.0, -2.0, 0.0)), + color: None + ), + (Undead, Female, "LeatherPlate"): ( + vox_spec: ("armor.leather_plate.helmet_undead_m", (-5.0, -2.0, 0.0)), + color: None + ), + (Orc, Male, "LeatherPlate"): ( + vox_spec: ("armor.leather_plate.helmet_orc_m", (-2.0, -1.0, 1.0)), + color: None + ), + (Orc, Female, "LeatherPlate"): ( + vox_spec: ("armor.leather_plate.helmet_undead_m", (-5.0, -2.0, 0.0)), + color: None + ), + // Merchant Turban + (Human, Male, "Merchant"): ( + vox_spec: ("armor.merchant.turban_human", (-2.0, -3.0, 2.0)), + color: None + ), + (Human, Female, "Merchant"): ( + vox_spec: ("armor.merchant.turban_human", (-2.0, -2.0, 2.0)), + color: None + ), + (Elf, Male, "Merchant"): ( + vox_spec: ("armor.merchant.turban_human", (-1.0, -3.0, 2.0)), + color: None + ), + (Elf, Female, "Merchant"): ( + vox_spec: ("armor.merchant.turban_human", (-1.0, -3.0, 2.0)), + color: None + ), + (Dwarf, Male, "Merchant"): ( + vox_spec: ("armor.merchant.turban_dwarf", (-3.0, -2.0, 2.0)), + color: None + ), + (Dwarf, Female, "Merchant"): ( + vox_spec: ("armor.merchant.turban_dwarf", (-3.0, -2.0, 2.0)), + color: None + ), + (Danari, Male, "Merchant"): ( + vox_spec: ("armor.merchant.turban_human", (0.0, -4.0, 4.0)), + color: None + ), + (Danari, Female, "Merchant"): ( + vox_spec: ("armor.merchant.turban_human", (0.0, -4.0, 4.0)), + color: None + ), + (Undead, Male, "Merchant"): ( + vox_spec: ("armor.merchant.turban_undead", (-4.0, -3.0, 4.0)), + color: None + ), + (Undead, Female, "Merchant"): ( + vox_spec: ("armor.merchant.turban_undead", (-4.0, -3.0, 3.0)), + color: None + ), + (Orc, Male, "Merchant"): ( + vox_spec: ("armor.merchant.turban_orc", (-1.0, -2.0, 4.0)), + color: None + ), + (Orc, Female, "Merchant"): ( + vox_spec: ("armor.merchant.turban_orc", (-1.0, -4.0, 2.0)), + color: None + ), + } )) diff --git a/assets/voxygen/voxel/humanoid_armor_pants_manifest.ron b/assets/voxygen/voxel/humanoid_armor_pants_manifest.ron index 47e10db1d1..0821a71de2 100644 --- a/assets/voxygen/voxel/humanoid_armor_pants_manifest.ron +++ b/assets/voxygen/voxel/humanoid_armor_pants_manifest.ron @@ -184,5 +184,9 @@ vox_spec: ("armor.mail.orichalcum.pants", (-6.0, -4.0, 0.5)), color: None ), + "Merchant": ( + vox_spec: ("armor.merchant.pants", (-6.0, -4.0, 0.5)), + color: None + ), }, )) diff --git a/assets/voxygen/voxel/humanoid_armor_shoulder_manifest.ron b/assets/voxygen/voxel/humanoid_armor_shoulder_manifest.ron index 8e0c946767..da6301c000 100644 --- a/assets/voxygen/voxel/humanoid_armor_shoulder_manifest.ron +++ b/assets/voxygen/voxel/humanoid_armor_shoulder_manifest.ron @@ -441,5 +441,15 @@ color: None ) ), + "Merchant": ( + left: ( + vox_spec: ("armor.merchant.shoulder_l", (-3.0, -4.0 , -8.0)), + color: None + ), + right: ( + vox_spec: ("armor.empty", (0.0, 0.0 , 0.0)), + color: None + ), + ), }, ))