From 2a1efb4b2b95d411f723ce4c70ec7967ad97a1f4 Mon Sep 17 00:00:00 2001
From: Monty Marz <m.marzouq@gmx.de>
Date: Thu, 8 Jul 2021 00:01:08 +0000
Subject: [PATCH] Minimap modes, Danari customizations update & bald hairstyles
---
CHANGELOG.md | 2 +
.../element/ui/map/buttons/minimap_modes.png | Bin 0 -> 1495 bytes
assets/voxygen/i18n/en/hud/map.ron | 5 +-
assets/voxygen/i18n/en/skills.ron | 2 +-
.../voxygen/voxel/biped_weapon_manifest.ron | 292 +++++++++---------
.../voxel/figure/accessory/danari/horns-1.vox | Bin 0 -> 1144 bytes
.../voxel/figure/accessory/danari/horns-2.vox | Bin 0 -> 1248 bytes
.../voxel/figure/accessory/danari/horns-3.vox | Bin 0 -> 1104 bytes
.../voxel/figure/accessory/danari/horns-4.vox | Bin 0 -> 1136 bytes
.../voxel/figure/accessory/danari/horns-5.vox | Bin 0 -> 1224 bytes
.../voxel/figure/accessory/danari/horns-6.vox | Bin 0 -> 1152 bytes
.../voxel/figure/beard/danari/danari-1.vox | Bin 0 -> 1376 bytes
.../voxel/figure/beard/danari/danari-10.vox | Bin 0 -> 1504 bytes
.../voxel/figure/beard/danari/danari-11.vox | Bin 0 -> 1640 bytes
.../voxel/figure/beard/danari/danari-12.vox | Bin 0 -> 1240 bytes
.../voxel/figure/beard/danari/danari-13.vox | Bin 0 -> 1136 bytes
.../voxel/figure/beard/danari/danari-14.vox | Bin 0 -> 1280 bytes
.../voxel/figure/beard/danari/danari-2.vox | Bin 0 -> 1156 bytes
.../voxel/figure/beard/danari/danari-3.vox | Bin 0 -> 1592 bytes
.../voxel/figure/beard/danari/danari-4.vox | Bin 0 -> 1680 bytes
.../voxel/figure/beard/danari/danari-5.vox | Bin 0 -> 1160 bytes
.../voxel/figure/beard/danari/danari-6.vox | Bin 0 -> 1232 bytes
.../voxel/figure/beard/danari/danari-7.vox | Bin 0 -> 1512 bytes
.../voxel/figure/beard/danari/danari-8.vox | Bin 0 -> 1744 bytes
.../voxel/figure/beard/danari/danari-9.vox | Bin 0 -> 1808 bytes
.../voxel/figure/beard/dwarf/danari-11.vox | Bin 0 -> 1632 bytes
.../voxygen/voxel/humanoid_head_manifest.ron | 234 ++++++++------
common/src/comp/body/humanoid.rs | 10 +-
voxygen/src/hud/bag.rs | 3 -
voxygen/src/hud/img_ids.rs | 1 +
voxygen/src/hud/map.rs | 29 +-
voxygen/src/menu/char_selection/ui/mod.rs | 19 +-
voxygen/src/menu/main/ui/mod.rs | 6 +-
33 files changed, 334 insertions(+), 269 deletions(-)
create mode 100644 assets/voxygen/element/ui/map/buttons/minimap_modes.png
create mode 100644 assets/voxygen/voxel/figure/accessory/danari/horns-1.vox
create mode 100644 assets/voxygen/voxel/figure/accessory/danari/horns-2.vox
create mode 100644 assets/voxygen/voxel/figure/accessory/danari/horns-3.vox
create mode 100644 assets/voxygen/voxel/figure/accessory/danari/horns-4.vox
create mode 100644 assets/voxygen/voxel/figure/accessory/danari/horns-5.vox
create mode 100644 assets/voxygen/voxel/figure/accessory/danari/horns-6.vox
create mode 100644 assets/voxygen/voxel/figure/beard/danari/danari-1.vox
create mode 100644 assets/voxygen/voxel/figure/beard/danari/danari-10.vox
create mode 100644 assets/voxygen/voxel/figure/beard/danari/danari-11.vox
create mode 100644 assets/voxygen/voxel/figure/beard/danari/danari-12.vox
create mode 100644 assets/voxygen/voxel/figure/beard/danari/danari-13.vox
create mode 100644 assets/voxygen/voxel/figure/beard/danari/danari-14.vox
create mode 100644 assets/voxygen/voxel/figure/beard/danari/danari-2.vox
create mode 100644 assets/voxygen/voxel/figure/beard/danari/danari-3.vox
create mode 100644 assets/voxygen/voxel/figure/beard/danari/danari-4.vox
create mode 100644 assets/voxygen/voxel/figure/beard/danari/danari-5.vox
create mode 100644 assets/voxygen/voxel/figure/beard/danari/danari-6.vox
create mode 100644 assets/voxygen/voxel/figure/beard/danari/danari-7.vox
create mode 100644 assets/voxygen/voxel/figure/beard/danari/danari-8.vox
create mode 100644 assets/voxygen/voxel/figure/beard/danari/danari-9.vox
create mode 100644 assets/voxygen/voxel/figure/beard/dwarf/danari-11.vox
diff --git a/CHANGELOG.md b/CHANGELOG.md
index df44305925..0324bf1a1f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Ability to toggle chat visibility
- Added gem rings with various stat improvements.
- Animations for using consumables.
+- New danari character customizations
+- Bald hairstyles for humans and danari
### Changed
diff --git a/assets/voxygen/element/ui/map/buttons/minimap_modes.png b/assets/voxygen/element/ui/map/buttons/minimap_modes.png
new file mode 100644
index 0000000000000000000000000000000000000000..8a64d8fab5d0f5e2be88ebeceff18a981f0ec042
GIT binary patch
literal 1495
zcmV;|1t|K7P)<h;3K|Lk000e1NJLTq003$L000^Y1^@s6UjxZj00009a7bBm000XU
z000XU0RWnu7ytkOAY({UO#lFTB>(_`g8%^e{{R4h=>PzAFaQARU;qF*m;eA5Z<1fd
zMgRZ>T}ebiRCwC#TD^-TMHK&4bys)K?CiO68(nmFiDzJ_CW458U?K)4B6y*QkzgR0
zi;;+EsLA~Shp=#<C<cOZ7^%pKsEZezp02w)yR-dKU1jiIef0F)?%mEH-tIhTdbYc&
zUe){jz1J(OwOG>spX5>mOGPbdsi@OO>GT631Ri?zWeWgS7yv*!nb5te<B^?tE2A|4
zz-l`3&vx-Q0N{=1-U9%<yYUvS)0TeBGY`K60ND8P3az6DG`HRLV+OJS05k)#tF!Hj
zf4AMxxEi!KnHRYA$5jX!*&yfPZaStvM4C)L>K?5%EU9Rm=4VM5_~`kA&JqBiTiU~<
zQav7{VU6)50|2azDmtI0@n5_>7Dsy2r57)sSaczz>|HSMmu(HKQ_LKcNQ*>TXf2_&
z#Ok2-SCMHHnf6MWMNhrCYLE0N^PmpOubZxknZAmXET>nNUT&EkKjhg<F8}~;Z~es<
zE!b-V+iTx{#5<vN#&(a^)4_WWa+)_PhxE5N2tq;PLP1c7N@2@7mfZA^<B?&{)FdO3
z1W&pC8%2W0FHYuS;be5AqD~t*p?5;0F*Ch!9;zEMsA17?L=EdnVGmW(>>QOOFb5@D
zrs~Axc(an<Wr{qZ))Z$&8<>6l)8_zyou5Ae0KD?#>i~ccH(v8&F0MZf0Jyok2>_@x
z9VC@`;AQBLV@>&}P(%N2m{9&odCVj+?(~O4r*=`A=37e(#vyHx>yDC^sBc<!jh-3j
ztnO<^Br}94C3%;%5NQgLrlb%-m&g=Ern<<1>4%$rzM1Ot9Sv$2BVdexZY6XpktPPY
z(#Vy*3y+f0Z{9WyXDHjrM=>?dliV4z5Vup#MOM-M<4@n`buRcZn>)WSLLy#<EmNsr
znTA7At_I922%|PUj}vIRe`o>#S{L3T;d$>{jNQ8M7L!W*9yb>}KN&7Hb;n|WtgV_3
zIO)K9vlt!@(l5cp3?wHMN011b3yuPdN)CHvHlvnvdN;>Vln{W6+tw9@{mG`TU0fn&
z#gGfm;M%t>C4Vy}$XZzrozg~fvYn7;8Rj>2IRkl7h^p%V&(E%`cglm-w%*cRdEr4(
z9HaGOy(})A8=WlNo=&7kb-E2)4~i&v0)WU>2xT5v$lz7Z^jqtHiX!WECoJbitJ@ym
znR^pqX=gLrdxeMS26tIUnX>jP$SmV$+#b=US927_D(zeK>k{J%X6>w;&mM)Cs-yxp
zO}m0r`N02P&&X?@f8sI#;Kt^+{@pjfenmh-(q0?rLu#fe^d%yc7%8yRIywfqR**w?
z08rIIi3P*<PHX8jdX(>|M0MXRXnyQ<0q>!4cjB=N6yo;|vi~6TMcK}j480vJH&Nb@
zG_{fJErJs=&xzMc6KbMX)lRPhcb?<mvSc&QL=eEawetXg&#qske3*tkt`EuE#uep5
zVehq1B)Uylhu-3r6z9fHM7dYY5;1Z1Q)If+9|VB?J9ycNMSUVu9S?AVkMoFK0HAo}
zT;Q?2SM=&AW5hzvBTuT5;`>qEi8~d?wr#03<T?^6C4~z?c~`gi?)N@`n3R3KX9m^G
z{+~(>RBBM`1hr0}5`*HdIup@17BCWV5M1O@XQC{*_RyS=>s~G5lPmVQm2!rSJMeJd
zylO-13>1aQp;!&98aJN=@aOne6qaa@Tjf6-X4R1j^va5Im~cg`ng26Kp0!B1=UCN2
z#19OsV|OQd9(Ch`E8>3lDED2-wg#fe=*ram>o%GcX$*Zx<ZD<o7#0oktVN#92U-Mx
xFW=ei=|C+13+eu#<^N196}6<LqD~?GI{?VEG(Lu{?zsQ}002ovPDHLkV1iTpy(<6!
literal 0
HcmV?d00001
diff --git a/assets/voxygen/i18n/en/hud/map.ron b/assets/voxygen/i18n/en/hud/map.ron
index 5c30f4f22c..0ef0218382 100644
--- a/assets/voxygen/i18n/en/hud/map.ron
+++ b/assets/voxygen/i18n/en/hud/map.ron
@@ -26,7 +26,10 @@
"hud.map.mid_click": "Set Waypoint",
"hud.map.recenter": "Recenter",
"hud.map.marked_location": "Marked Location",
- "hud.map.marked_location_remove": "Click to remove",
+ "hud.map.marked_location_remove": "Click to remove",
+ "hud.map.change_map_mode": "Change Map Mode",
+ "hud.map.toggle_minimap_voxel": "Toggle Minimap Voxel View",
+ "hud.map.zoom_minimap_explanation": "Zoom in the Minimap to see\nthe area around you in higher detail",
},
diff --git a/assets/voxygen/i18n/en/skills.ron b/assets/voxygen/i18n/en/skills.ron
index 1a4d6ab3b8..831777a83b 100644
--- a/assets/voxygen/i18n/en/skills.ron
+++ b/assets/voxygen/i18n/en/skills.ron
@@ -241,7 +241,7 @@
// Mining
"hud.skill.mining_title": "Mining",
"hud.skill.pick_strike_title": "Pickaxe Strike",
- "hud.skill.pick_strike": "Hit rocks with the pickaxe to gain ore and gems and experience",
+ "hud.skill.pick_strike": "Hit rocks with the pickaxe to gain ore, gems and experience",
"hud.skill.pick_strike_speed_title": "Pickaxe Strike Speed",
"hud.skill.pick_strike_speed": "Mine rocks faster{SP}",
"hud.skill.pick_strike_oregain_title": "Pickaxe Strike Ore Yield",
diff --git a/assets/voxygen/voxel/biped_weapon_manifest.ron b/assets/voxygen/voxel/biped_weapon_manifest.ron
index 04d8e11aea..74cca7017f 100644
--- a/assets/voxygen/voxel/biped_weapon_manifest.ron
+++ b/assets/voxygen/voxel/biped_weapon_manifest.ron
@@ -1,86 +1,86 @@
({ //Swords
"common.items.weapons.sword.bloodsteel-0": (
- vox_spec: ("weapon.sword.bloodsteel-0", (-1.5, -4.5, -4.0)),
+ vox_spec: ("weapon.sword.bloodsteel-0", (-2.5, -4.5, -4.0)),
color: None
),
"common.items.weapons.sword.bloodsteel-1": (
- vox_spec: ("weapon.sword.bloodsteel-1", (-2.5, -3.0, -5.5)),
+ vox_spec: ("weapon.sword.bloodsteel-1", (-3.5, -3.0, -5.5)),
color: None
),
"common.items.weapons.sword.bloodsteel-2": (
- vox_spec: ("weapon.sword.bloodsteel-2", (-1.5, -3.5, -4.0)),
+ vox_spec: ("weapon.sword.bloodsteel-2", (-2.5, -3.5, -4.0)),
color: None
),
"common.items.weapons.sword.bronze-0": (
- vox_spec: ("weapon.sword.bronze-0", (-1.5, -3.0, -4.0)),
+ vox_spec: ("weapon.sword.bronze-0", (-2.5, -3.0, -4.0)),
color: None
),
"common.items.weapons.sword.bronze-1": (
- vox_spec: ("weapon.sword.bronze-1", (-1.5, -3.0, -4.0)),
+ vox_spec: ("weapon.sword.bronze-1", (-2.5, -3.0, -4.0)),
color: None
),
"common.items.weapons.sword.bronze-2": (
- vox_spec: ("weapon.sword.bronze-2", (-1.5, -3.0, -4.0)),
+ vox_spec: ("weapon.sword.bronze-2", (-2.5, -3.0, -4.0)),
color: None
),
"common.items.weapons.sword.caladbolg": (
- vox_spec: ("weapon.sword.caladbolg", (-1.5, -5.5, -4.0)),
+ vox_spec: ("weapon.sword.caladbolg", (-2.5, -5.5, -4.0)),
color: None
),
"common.items.weapons.sword.cobalt-0": (
- vox_spec: ("weapon.sword.cobalt-0", (-1.5, -5.0, -4.0)),
+ vox_spec: ("weapon.sword.cobalt-0", (-2.5, -5.0, -4.0)),
color: None
),
"common.items.weapons.sword.cobalt-1": (
- vox_spec: ("weapon.sword.cobalt-1", (-1.5, -6.0, -5.0)),
+ vox_spec: ("weapon.sword.cobalt-1", (-2.5, -6.0, -5.0)),
color: None
),
"common.items.weapons.sword.cobalt-2": (
- vox_spec: ("weapon.sword.cobalt-2", (-1.5, -5.0, -4.0)),
+ vox_spec: ("weapon.sword.cobalt-2", (-2.5, -5.0, -4.0)),
color: None
),
"common.items.weapons.sword.cobalt-3": (
- vox_spec: ("weapon.sword.cobalt-3", (-1.5, -4.0, -4.0)),
+ vox_spec: ("weapon.sword.cobalt-3", (-2.5, -4.0, -4.0)),
color: None
),
"common.items.weapons.sword.cultist": (
- vox_spec: ("weapon.sword.cultist", (-1.5, -4.0, -6.0)),
+ vox_spec: ("weapon.sword.cultist", (-2.5, -4.0, -6.0)),
color: None
),
"common.items.weapons.sword.frost-0": (
- vox_spec: ("weapon.sword.frost-0", (-1.5, -5.5, -5.0)),
+ vox_spec: ("weapon.sword.frost-0", (-2.5, -5.5, -5.0)),
color: None
),
"common.items.weapons.sword.frost-1": (
- vox_spec: ("weapon.sword.frost-1", (-1.5, -5.5, -5.0)),
+ vox_spec: ("weapon.sword.frost-1", (-2.5, -5.5, -5.0)),
color: None
),
"common.items.weapons.sword.iron-0": (
- vox_spec: ("weapon.sword.iron-0", (-1.5, -3.5, -4.0)),
+ vox_spec: ("weapon.sword.iron-0", (-2.5, -3.5, -4.0)),
color: None
),
"common.items.weapons.sword.iron-1": (
- vox_spec: ("weapon.sword.iron-1", (-1.5, -5.0, -5.0)),
+ vox_spec: ("weapon.sword.iron-1", (-2.5, -5.0, -5.0)),
color: None
),
"common.items.weapons.sword.iron-2": (
- vox_spec: ("weapon.sword.iron-2", (-1.5, -5.0, -4.0)),
+ vox_spec: ("weapon.sword.iron-2", (-2.5, -5.0, -4.0)),
color: None
),
"common.items.weapons.sword.iron-3": (
- vox_spec: ("weapon.sword.iron-3", (-1.5, -4.0, -4.0)),
+ vox_spec: ("weapon.sword.iron-3", (-2.5, -4.0, -4.0)),
color: None
),
"common.items.weapons.sword.iron-4": (
- vox_spec: ("weapon.sword.iron-4", (-1.5, -4.0, -4.0)),
+ vox_spec: ("weapon.sword.iron-4", (-2.5, -4.0, -4.0)),
color: None
),
"common.items.weapons.sword.iron-5": (
- vox_spec: ("weapon.sword.iron-5", (-1.5, -4.0, -4.0)),
+ vox_spec: ("weapon.sword.iron-5", (-2.5, -4.0, -4.0)),
color: None
),
"common.items.weapons.sword.iron-6": (
- vox_spec: ("weapon.sword.iron-6", (-1.5, -5.0, -5.0)),
+ vox_spec: ("weapon.sword.iron-6", (-2.5, -5.0, -5.0)),
color: None
),
"common.items.weapons.sword.iron-7": (
@@ -92,51 +92,51 @@
color: None
),
"common.items.weapons.sword.iron-9": (
- vox_spec: ("weapon.sword.iron-9", (-1.5, -2.5, -4.0)),
+ vox_spec: ("weapon.sword.iron-9", (-2.5, -2.5, -4.0)),
color: None
),
"common.items.weapons.sword.iron-10": (
- vox_spec: ("weapon.sword.iron-10", (-1.5, -4.0, -4.0)),
+ vox_spec: ("weapon.sword.iron-10", (-2.5, -4.0, -4.0)),
color: None
),
"common.items.weapons.sword.starter": (
- vox_spec: ("weapon.sword.starter", (-1.5, -4.0, -4.0)),
+ vox_spec: ("weapon.sword.starter", (-2.5, -4.0, -4.0)),
color: None
),
"common.items.weapons.sword.steel-0": (
- vox_spec: ("weapon.sword.steel-0", (-1.5, -5.0, -5.0)),
+ vox_spec: ("weapon.sword.steel-0", (-2.5, -5.0, -5.0)),
color: None
),
"common.items.weapons.sword.steel-1": (
- vox_spec: ("weapon.sword.steel-1", (-1.5, -4.0, -5.0)),
+ vox_spec: ("weapon.sword.steel-1", (-2.5, -4.0, -5.0)),
color: None
),
"common.items.weapons.sword.steel-2": (
- vox_spec: ("weapon.sword.steel-2", (-1.5, -6.0, -4.0)),
+ vox_spec: ("weapon.sword.steel-2", (-2.5, -6.0, -4.0)),
color: None
),
"common.items.weapons.sword.steel-3": (
- vox_spec: ("weapon.sword.steel-3", (-1.5, -4.0, -4.0)),
+ vox_spec: ("weapon.sword.steel-3", (-2.5, -4.0, -4.0)),
color: None
),
"common.items.weapons.sword.steel-4": (
- vox_spec: ("weapon.sword.steel-4", (-1.5, -5.0, -4.0)),
+ vox_spec: ("weapon.sword.steel-4", (-2.5, -5.0, -4.0)),
color: None
),
"common.items.weapons.sword.steel-5": (
- vox_spec: ("weapon.sword.steel-5", (-1.5, -2.5, -5.0)),
+ vox_spec: ("weapon.sword.steel-5", (-2.5, -2.5, -5.0)),
color: None
),
"common.items.weapons.sword.steel-6": (
- vox_spec: ("weapon.sword.steel-6", (-1.5, -5.0, -4.0)),
+ vox_spec: ("weapon.sword.steel-6", (-2.5, -5.0, -4.0)),
color: None
),
"common.items.weapons.sword.steel-7": (
- vox_spec: ("weapon.sword.steel-7", (-1.5, -5.0, -4.0)),
+ vox_spec: ("weapon.sword.steel-7", (-2.5, -5.0, -4.0)),
color: None
),
"common.items.weapons.sword.steel-8": (
- vox_spec: ("weapon.sword.steel-8", (-1.5, -5.0, -5.0)),
+ vox_spec: ("weapon.sword.steel-8", (-2.5, -5.0, -5.0)),
color: None
),
"common.items.weapons.sword.stone-0": (
@@ -144,23 +144,23 @@
color: None
),
"common.items.weapons.sword.stone-1": (
- vox_spec: ("weapon.sword.stone-1", (-1.5, -4.0, -5.0)),
+ vox_spec: ("weapon.sword.stone-1", (-2.5, -4.0, -5.0)),
color: None
),
"common.items.weapons.sword.stone-2": (
- vox_spec: ("weapon.sword.stone-2", (-1.5, -4.0, -4.0)),
+ vox_spec: ("weapon.sword.stone-2", (-2.5, -4.0, -4.0)),
color: None
),
"common.items.weapons.sword.wood-0": (
- vox_spec: ("weapon.sword.wood-0", (-1.5, -3.5, -4.0)),
+ vox_spec: ("weapon.sword.wood-0", (-2.5, -3.5, -4.0)),
color: None
),
"common.items.weapons.sword.wood-1": (
- vox_spec: ("weapon.sword.wood-1", (-1.5, -5.0, -5.0)),
+ vox_spec: ("weapon.sword.wood-1", (-2.5, -5.0, -5.0)),
color: None
),
"common.items.weapons.sword.wood-2": (
- vox_spec: ("weapon.sword.wood-2", (-1.5, -6.5, -3.0)),
+ vox_spec: ("weapon.sword.wood-2", (-2.5, -6.5, -3.0)),
color: None
),
// 1h Swords
@@ -169,11 +169,11 @@
color: None
),
"common.items.weapons.sword_1h.bloodsteel-1": (
- vox_spec: ("weapon.sword_1h.bloodsteel-1", (-1.5, -3.0, -3.0)),
+ vox_spec: ("weapon.sword_1h.bloodsteel-1", (-2.5, -3.0, -3.0)),
color: None
),
"common.items.weapons.sword_1h.bloodsteel-2": (
- vox_spec: ("weapon.sword_1h.bloodsteel-2", (-1.5, -3.0, -3.0)),
+ vox_spec: ("weapon.sword_1h.bloodsteel-2", (-2.5, -3.0, -3.0)),
color: None
),
"common.items.weapons.sword_1h.bronze-0": (
@@ -254,192 +254,192 @@
),
// Axes
"common.items.weapons.axe.starter_axe": (
- vox_spec: ("weapon.axe.2haxe_rusty", (-1.5, -7.0, -4.0)),
+ vox_spec: ("weapon.axe.2haxe_rusty", (-2.5, -7.0, -4.0)),
color: None
),
"common.items.weapons.axe.orc_axe-0": (
- vox_spec: ("weapon.axe.2haxe_orc-0", (-1.5, -6.0, -4.5)),
+ vox_spec: ("weapon.axe.2haxe_orc-0", (-2.5, -6.0, -4.5)),
color: None
),
"common.items.weapons.axe.bronze_axe-0": (
- vox_spec: ("weapon.axe.2haxe_bronze-0", (-1.5, -7.0, -4.5)),
+ vox_spec: ("weapon.axe.2haxe_bronze-0", (-2.5, -7.0, -4.5)),
color: None
),
"common.items.weapons.axe.bronze_axe-1": (
- vox_spec: ("weapon.axe.2haxe_bronze-1", (-1.5, -5.0, -4.0)),
+ vox_spec: ("weapon.axe.2haxe_bronze-1", (-2.5, -5.0, -4.0)),
color: None
),
"common.items.weapons.axe.bronze_axe-2": (
- vox_spec: ("weapon.axe.2haxe_bronze-2", (-1.5, -8.0, -4.0)),
+ vox_spec: ("weapon.axe.2haxe_bronze-2", (-2.5, -8.0, -4.0)),
color: None
),
"common.items.weapons.axe.iron_axe-0": (
- vox_spec: ("weapon.axe.2haxe_iron-0", (-1.5, -7.0, -5.5)),
+ vox_spec: ("weapon.axe.2haxe_iron-0", (-2.5, -7.0, -5.5)),
color: None
),
"common.items.weapons.axe.iron_axe-1": (
- vox_spec: ("weapon.axe.2haxe_iron-1", (-1.5, -7.0, -5.5)),
+ vox_spec: ("weapon.axe.2haxe_iron-1", (-2.5, -7.0, -5.5)),
color: None
),
"common.items.weapons.axe.iron_axe-2": (
- vox_spec: ("weapon.axe.2haxe_iron-2", (-1.5, -7.0, -5.5)),
+ vox_spec: ("weapon.axe.2haxe_iron-2", (-2.5, -7.0, -5.5)),
color: None
),
"common.items.weapons.axe.iron_axe-3": (
- vox_spec: ("weapon.axe.2haxe_iron-3", (-1.5, -8.0, -6.5)),
+ vox_spec: ("weapon.axe.2haxe_iron-3", (-2.5, -8.0, -6.5)),
color: None
),
"common.items.weapons.axe.iron_axe-4": (
- vox_spec: ("weapon.axe.2haxe_iron-4", (-1.5, -7.0, -5.5)),
+ vox_spec: ("weapon.axe.2haxe_iron-4", (-2.5, -7.0, -5.5)),
color: None
),
"common.items.weapons.axe.iron_axe-5": (
- vox_spec: ("weapon.axe.2haxe_iron-5", (-1.5, -7.0, -5.0)),
+ vox_spec: ("weapon.axe.2haxe_iron-5", (-2.5, -7.0, -5.0)),
color: None
),
"common.items.weapons.axe.iron_axe-6": (
- vox_spec: ("weapon.axe.2haxe_iron-6", (-1.5, -7.0, -6.0)),
+ vox_spec: ("weapon.axe.2haxe_iron-6", (-2.5, -7.0, -6.0)),
color: None
),
"common.items.weapons.axe.iron_axe-7": (
- vox_spec: ("weapon.axe.2haxe_iron-7", (-1.5, -7.0, -5.0)),
+ vox_spec: ("weapon.axe.2haxe_iron-7", (-2.5, -7.0, -5.0)),
color: None
),
"common.items.weapons.axe.iron_axe-8": (
- vox_spec: ("weapon.axe.2haxe_iron-8", (-1.5, -7.0, -5.0)),
+ vox_spec: ("weapon.axe.2haxe_iron-8", (-2.5, -7.0, -5.0)),
color: None
),
"common.items.weapons.axe.iron_axe-9": (
- vox_spec: ("weapon.axe.2haxe_iron-9", (-1.5, -6.0, -5.0)),
+ vox_spec: ("weapon.axe.2haxe_iron-9", (-2.5, -6.0, -5.0)),
color: None
),
"common.items.weapons.axe.steel_axe-0": (
- vox_spec: ("weapon.axe.2haxe_steel-0", (-1.5, -6.0, -4.5)),
+ vox_spec: ("weapon.axe.2haxe_steel-0", (-2.5, -6.0, -4.5)),
color: None
),
"common.items.weapons.axe.steel_axe-1": (
- vox_spec: ("weapon.axe.2haxe_steel-1", (-1.5, -8.0, -5.5)),
+ vox_spec: ("weapon.axe.2haxe_steel-1", (-2.5, -8.0, -5.5)),
color: None
),
"common.items.weapons.axe.steel_axe-2": (
- vox_spec: ("weapon.axe.2haxe_steel-2", (-1.5, -9.0, -3.5)),
+ vox_spec: ("weapon.axe.2haxe_steel-2", (-2.5, -9.0, -3.5)),
color: None
),
"common.items.weapons.axe.steel_axe-3": (
- vox_spec: ("weapon.axe.2haxe_steel-3", (-1.5, -5.5, -6.0)),
+ vox_spec: ("weapon.axe.2haxe_steel-3", (-2.5, -5.5, -6.0)),
color: None
),
"common.items.weapons.axe.steel_axe-4": (
- vox_spec: ("weapon.axe.2haxe_steel-4", (-1.5, -6.0, -5.5)),
+ vox_spec: ("weapon.axe.2haxe_steel-4", (-2.5, -6.0, -5.5)),
color: None
),
"common.items.weapons.axe.steel_axe-5": (
- vox_spec: ("weapon.axe.2haxe_steel-5", (-1.5, -8.0, -5.5)),
+ vox_spec: ("weapon.axe.2haxe_steel-5", (-2.5, -8.0, -5.5)),
color: None
),
"common.items.weapons.axe.steel_axe-6": (
- vox_spec: ("weapon.axe.2haxe_steel-6", (-1.5, -6.0, -4.0)),
+ vox_spec: ("weapon.axe.2haxe_steel-6", (-2.5, -6.0, -4.0)),
color: None
),
"common.items.weapons.axe.bloodsteel_axe-0": (
- vox_spec: ("weapon.axe.2haxe_bloodsteel-0", (-1.5, -7.0, -4.0)),
+ vox_spec: ("weapon.axe.2haxe_bloodsteel-0", (-2.5, -7.0, -4.0)),
color: None
),
"common.items.weapons.axe.bloodsteel_axe-1": (
- vox_spec: ("weapon.axe.2haxe_bloodsteel-1", (-1.5, -7.0, -5.0)),
+ vox_spec: ("weapon.axe.2haxe_bloodsteel-1", (-2.5, -7.0, -5.0)),
color: None
),
"common.items.weapons.axe.bloodsteel_axe-2": (
- vox_spec: ("weapon.axe.2haxe_bloodsteel-2", (-1.5, -8.0, -4.0)),
+ vox_spec: ("weapon.axe.2haxe_bloodsteel-2", (-2.5, -8.0, -4.0)),
color: None
),
"common.items.weapons.axe.cobalt_axe-0": (
- vox_spec: ("weapon.axe.2haxe_cobalt-0", (-1.5, -7.0, -5.5)),
+ vox_spec: ("weapon.axe.2haxe_cobalt-0", (-2.5, -7.0, -5.5)),
color: None
),
"common.items.weapons.axe.cobalt_axe-1": (
- vox_spec: ("weapon.axe.2haxe_cobalt-1", (-1.5, -8.0, -5.5)),
+ vox_spec: ("weapon.axe.2haxe_cobalt-1", (-2.5, -8.0, -5.5)),
color: None
),
"common.items.weapons.axe.malachite_axe-0": (
- vox_spec: ("weapon.axe.2haxe_malachite-0", (-1.5, -7.0, -5.0)),
+ vox_spec: ("weapon.axe.2haxe_malachite-0", (-2.5, -7.0, -5.0)),
color: None
),
"common.items.weapons.axe.parashu": (
- vox_spec: ("weapon.axe.parashu", (-1.5, -12.0, -6.0)),
+ vox_spec: ("weapon.axe.parashu", (-2.5, -12.0, -6.0)),
color: None
),
// 1h Axes
"common.items.weapons.axe_1h.bloodsteel-0": (
- vox_spec: ("weapon.axe_1h.bloodsteel-0", (-1.5, -2.0, -3.0)),
+ vox_spec: ("weapon.axe_1h.bloodsteel-0", (-2.5, -2.0, -3.0)),
color: None
),
"common.items.weapons.axe_1h.bloodsteel-1": (
- vox_spec: ("weapon.axe_1h.bloodsteel-1", (-1.5, -2.0, -3.0)),
+ vox_spec: ("weapon.axe_1h.bloodsteel-1", (-2.5, -2.0, -3.0)),
color: None
),
"common.items.weapons.axe_1h.bronze-0": (
- vox_spec: ("weapon.axe_1h.bronze-0", (-1.5, -2.0, -3.0)),
+ vox_spec: ("weapon.axe_1h.bronze-0", (-2.5, -2.0, -3.0)),
color: None
),
"common.items.weapons.axe_1h.bronze-1": (
- vox_spec: ("weapon.axe_1h.bronze-1", (-1.5, -2.0, -3.0)),
+ vox_spec: ("weapon.axe_1h.bronze-1", (-2.5, -2.0, -3.0)),
color: None
),
"common.items.weapons.axe_1h.cobalt-0": (
- vox_spec: ("weapon.axe_1h.cobalt-0", (-1.5, -3.0, -3.0)),
+ vox_spec: ("weapon.axe_1h.cobalt-0", (-2.5, -3.0, -3.0)),
color: None
),
"common.items.weapons.axe_1h.cobalt-1": (
- vox_spec: ("weapon.axe_1h.cobalt-1", (-1.5, -3.0, -3.0)),
+ vox_spec: ("weapon.axe_1h.cobalt-1", (-2.5, -3.0, -3.0)),
color: None
),
"common.items.weapons.axe_1h.iron-0": (
- vox_spec: ("weapon.axe_1h.iron-0", (-1.5, -2.0, -3.0)),
+ vox_spec: ("weapon.axe_1h.iron-0", (-2.5, -2.0, -3.0)),
color: None
),
"common.items.weapons.axe_1h.iron-1": (
- vox_spec: ("weapon.axe_1h.iron-1", (-1.5, -6.0, -3.0)),
+ vox_spec: ("weapon.axe_1h.iron-1", (-2.5, -6.0, -3.0)),
color: None
),
"common.items.weapons.axe_1h.iron-2": (
- vox_spec: ("weapon.axe_1h.iron-2", (-1.5, -2.0, -3.0)),
+ vox_spec: ("weapon.axe_1h.iron-2", (-2.5, -2.0, -3.0)),
color: None
),
"common.items.weapons.axe_1h.iron-3": (
- vox_spec: ("weapon.axe_1h.iron-3", (-1.5, -5.0, -3.0)),
+ vox_spec: ("weapon.axe_1h.iron-3", (-2.5, -5.0, -3.0)),
color: None
),
"common.items.weapons.axe_1h.orichalcum-0": (
- vox_spec: ("weapon.axe_1h.orichalcum-0", (-1.5, -6.0, -3.0)),
+ vox_spec: ("weapon.axe_1h.orichalcum-0", (-2.5, -6.0, -3.0)),
color: None
),
"common.items.weapons.axe_1h.steel-0": (
- vox_spec: ("weapon.axe_1h.steel-0", (-1.5, -2.0, -3.0)),
+ vox_spec: ("weapon.axe_1h.steel-0", (-2.5, -2.0, -3.0)),
color: None
),
"common.items.weapons.axe_1h.steel-1": (
- vox_spec: ("weapon.axe_1h.steel-1", (-1.5, -2.0, -3.0)),
+ vox_spec: ("weapon.axe_1h.steel-1", (-2.5, -2.0, -3.0)),
color: None
),
"common.items.weapons.axe_1h.steel-2": (
- vox_spec: ("weapon.axe_1h.steel-2", (-1.5, -2.0, -3.0)),
+ vox_spec: ("weapon.axe_1h.steel-2", (-2.5, -2.0, -3.0)),
color: None
),
"common.items.weapons.axe_1h.stone-0": (
- vox_spec: ("weapon.axe_1h.stone-0", (-1.5, -2.0, -3.0)),
+ vox_spec: ("weapon.axe_1h.stone-0", (-2.5, -2.0, -3.0)),
color: None
),
"common.items.weapons.axe_1h.stone-1": (
- vox_spec: ("weapon.axe_1h.stone-1", (-1.5, -2.0, -3.0)),
+ vox_spec: ("weapon.axe_1h.stone-1", (-2.5, -2.0, -3.0)),
color: None
),
"common.items.weapons.axe_1h.wood-0": (
- vox_spec: ("weapon.axe_1h.wood-0", (-1.5, -3.0, -3.0)),
+ vox_spec: ("weapon.axe_1h.wood-0", (-2.5, -3.0, -3.0)),
color: None
),
"common.items.weapons.axe_1h.wood-1": (
- vox_spec: ("weapon.axe_1h.wood-1", (-1.5, -2.0, -3.0)),
+ vox_spec: ("weapon.axe_1h.wood-1", (-2.5, -2.0, -3.0)),
color: None
),
// Hammers
@@ -508,7 +508,7 @@
color: None
),
"common.items.weapons.hammer.iron_hammer-5": (
- vox_spec: ("weapon.hammer.2hhammer_iron-5", (-1.5, -7.0, -5.0)),
+ vox_spec: ("weapon.hammer.2hhammer_iron-5", (-2.5, -7.0, -5.0)),
color: None
),
"common.items.weapons.hammer.iron_hammer-6": (
@@ -520,7 +520,7 @@
color: None
),
"common.items.weapons.hammer.iron_hammer-8": (
- vox_spec: ("weapon.hammer.2hhammer_iron-8", (-1.5, -5.5, -7.0)),
+ vox_spec: ("weapon.hammer.2hhammer_iron-8", (-2.5, -5.5, -7.0)),
color: None
),
"common.items.weapons.hammer.steel_hammer-0": (
@@ -617,7 +617,7 @@
color: None
),
"common.items.weapons.hammer_1h.orichalcum-0": (
- vox_spec: ("weapon.hammer_1h.orichalcum-0", (-1.5, -4.0, -3.0)),
+ vox_spec: ("weapon.hammer_1h.orichalcum-0", (-2.5, -4.0, -3.0)),
color: None
),
"common.items.weapons.hammer_1h.steel-0": (
@@ -650,15 +650,15 @@
),
// Daggers
"common.items.weapons.dagger.starter_dagger": (
- vox_spec: ("weapon.dagger.dagger_rusty", (-1.5, -3.0, -3.0)),
+ vox_spec: ("weapon.dagger.dagger_rusty", (-2.5, -3.0, -3.0)),
color: None
),
"common.items.weapons.dagger.basic_0": (
- vox_spec: ("weapon.dagger.dagger_basic-0", (-1.5, -3.0, -3.0)),
+ vox_spec: ("weapon.dagger.dagger_basic-0", (-2.5, -3.0, -3.0)),
color: None
),
"common.items.weapons.dagger.cultist_0": (
- vox_spec: ("weapon.dagger.dagger_cult-0", (-1.5, -3.0, -3.0)),
+ vox_spec: ("weapon.dagger.dagger_cult-0", (-2.5, -3.0, -3.0)),
color: None
),
// Shields
@@ -672,51 +672,51 @@
color: None
),
"common.items.weapons.bow.bone-1": (
- vox_spec: ("weapon.bow.bone-1", (-1.5, -4.5, -15.5)),
+ vox_spec: ("weapon.bow.bone-1", (-2.5, -4.5, -15.5)),
color: None
),
"common.items.weapons.bow.bone-2": (
- vox_spec: ("weapon.bow.bone-2", (-1.5, -5.5, -13.0)),
+ vox_spec: ("weapon.bow.bone-2", (-2.5, -5.5, -13.0)),
color: None
),
"common.items.weapons.bow.bone-3": (
- vox_spec: ("weapon.bow.bone-3", (-1.5, -5.0, -12.5)),
+ vox_spec: ("weapon.bow.bone-3", (-2.5, -5.0, -12.5)),
color: None
),
"common.items.weapons.bow.eldwood-0": (
- vox_spec: ("weapon.bow.eldwood-0", (-1.5, -4.0, -12.5)),
+ vox_spec: ("weapon.bow.eldwood-0", (-2.5, -4.0, -12.5)),
color: None
),
"common.items.weapons.bow.eldwood-1": (
- vox_spec: ("weapon.bow.eldwood-1", (-1.5, -5.5, -12.5)),
+ vox_spec: ("weapon.bow.eldwood-1", (-2.5, -5.5, -12.5)),
color: None
),
"common.items.weapons.bow.eldwood-2": (
- vox_spec: ("weapon.bow.eldwood-2", (-1.5, -4.5, -12.5)),
+ vox_spec: ("weapon.bow.eldwood-2", (-2.5, -4.5, -12.5)),
color: None
),
"common.items.weapons.bow.frostwood-0": (
- vox_spec: ("weapon.bow.frostwood-0", (-1.5, -6.0, -13.5)),
+ vox_spec: ("weapon.bow.frostwood-0", (-2.5, -6.0, -13.5)),
color: None
),
"common.items.weapons.bow.frostwood-1": (
- vox_spec: ("weapon.bow.frostwood-1", (-1.5, -5.0, -12.5)),
+ vox_spec: ("weapon.bow.frostwood-1", (-2.5, -5.0, -12.5)),
color: None
),
"common.items.weapons.bow.frostwood-2": (
- vox_spec: ("weapon.bow.frostwood-2", (-1.5, -4.5, -12.5)),
+ vox_spec: ("weapon.bow.frostwood-2", (-2.5, -4.5, -12.5)),
color: None
),
"common.items.weapons.bow.hardwood-0": (
- vox_spec: ("weapon.bow.hardwood-0", (-1.5, -4.0, -12.0)),
+ vox_spec: ("weapon.bow.hardwood-0", (-2.5, -4.0, -12.0)),
color: None
),
"common.items.weapons.bow.hardwood-1": (
- vox_spec: ("weapon.bow.hardwood-1", (-1.5, -4.5, -12.5)),
+ vox_spec: ("weapon.bow.hardwood-1", (-2.5, -4.5, -12.5)),
color: None
),
"common.items.weapons.bow.hardwood-2": (
- vox_spec: ("weapon.bow.hardwood-2", (-1.5, -6.0, -12.5)),
+ vox_spec: ("weapon.bow.hardwood-2", (-2.5, -6.0, -12.5)),
color: None
),
"common.items.weapons.bow.hardwood-3": (
@@ -728,7 +728,7 @@
color: None
),
"common.items.weapons.bow.hardwood-5": (
- vox_spec: ("weapon.bow.hardwood-5", (-1.5, -5.0, -13.5)),
+ vox_spec: ("weapon.bow.hardwood-5", (-2.5, -5.0, -13.5)),
color: None
),
"common.items.weapons.bow.metal-0": (
@@ -736,31 +736,31 @@
color: None
),
"common.items.weapons.bow.metal-1": (
- vox_spec: ("weapon.bow.metal-1", (-1.5, -5.0, -13.5)),
+ vox_spec: ("weapon.bow.metal-1", (-2.5, -5.0, -13.5)),
color: None
),
"common.items.weapons.bow.metal-2": (
- vox_spec: ("weapon.bow.metal-2", (-1.5, -4.0, -11.5)),
+ vox_spec: ("weapon.bow.metal-2", (-2.5, -4.0, -11.5)),
color: None
),
"common.items.weapons.bow.metal-3": (
- vox_spec: ("weapon.bow.metal-3", (-1.5, -5.5, -15.0)),
+ vox_spec: ("weapon.bow.metal-3", (-2.5, -5.5, -15.0)),
color: None
),
"common.items.weapons.bow.metal-4": (
- vox_spec: ("weapon.bow.metal-4", (-1.5, -4.0, -15.0)),
+ vox_spec: ("weapon.bow.metal-4", (-2.5, -4.0, -15.0)),
color: None
),
"common.items.weapons.bow.rawwood-0": (
- vox_spec: ("weapon.bow.rawwood-0", (-1.5, -4.0, -12.5)),
+ vox_spec: ("weapon.bow.rawwood-0", (-2.5, -4.0, -12.5)),
color: None
),
"common.items.weapons.bow.rawwood-1": (
- vox_spec: ("weapon.bow.rawwood-1", (-1.5, -4.0, -12.5)),
+ vox_spec: ("weapon.bow.rawwood-1", (-2.5, -4.0, -12.5)),
color: None
),
"common.items.weapons.bow.sagitta": (
- vox_spec: ("weapon.bow.sagitta", (-1.5, -7.0, -12.5)),
+ vox_spec: ("weapon.bow.sagitta", (-2.5, -7.0, -12.5)),
color: None
),
"common.items.weapons.bow.starter": (
@@ -768,11 +768,11 @@
color: None
),
"common.items.weapons.bow.velorite": (
- vox_spec: ("weapon.bow.velorite", (-1.5, -4.0, -15.0)),
+ vox_spec: ("weapon.bow.velorite", (-2.5, -4.0, -15.0)),
color: None
),
"common.items.debug.velorite_bow_debug": (
- vox_spec: ("weapon.bow.velorite", (-1.5, -4.0, -15.0)),
+ vox_spec: ("weapon.bow.velorite", (-2.5, -4.0, -15.0)),
color: Some((73, 63, 59))
),
"common.items.weapons.bow.wood-0": (
@@ -797,7 +797,7 @@
),
// Farming Equipment
"common.items.weapons.tool.broom": (
- vox_spec: ("weapon.tool.broom-0", (-1.5, -4.0, -4.0)),
+ vox_spec: ("weapon.tool.broom-0", (-2.5, -4.0, -4.0)),
color: None
),
"common.items.weapons.tool.hoe": (
@@ -817,7 +817,7 @@
color: None
),
"common.items.weapons.tool.pickaxe": (
- vox_spec: ("weapon.tool.pickaxe_green-0", (-1.5, -7.5, -4.0)),
+ vox_spec: ("weapon.tool.pickaxe_green-0", (-2.5, -7.5, -4.0)),
color: None
),
"common.items.weapons.tool.shovel-0": (
@@ -830,19 +830,19 @@
),
// Staves
"common.items.weapons.staff.staff_1": (
- vox_spec: ("weapon.staff.firestaff_starter", (-1.5, -3.0, -3.0)),
+ vox_spec: ("weapon.staff.firestaff_starter", (-2.5, -3.0, -3.0)),
color: None
),
"common.items.weapons.staff.starter_staff": (
- vox_spec: ("weapon.staff.firestaff_starter", (-1.5, -3.0, -3.0)),
+ vox_spec: ("weapon.staff.firestaff_starter", (-2.5, -3.0, -3.0)),
color: None
),
"common.items.weapons.staff.bone_staff": (
- vox_spec: ("weapon.staff.bone_staff", (-1.5, -2.5, -3.0)),
+ vox_spec: ("weapon.staff.bone_staff", (-2.5, -2.5, -3.0)),
color: None
),
"common.items.weapons.staff.crimson_eye": (
- vox_spec: ("weapon.staff.crimson_eye", (-1.5, -3.5, -4.0)),
+ vox_spec: ("weapon.staff.crimson_eye", (-2.5, -3.5, -4.0)),
color: None
),
"common.items.weapons.staff.cultist_staff": (
@@ -866,7 +866,7 @@
color: None
),
"common.items.weapons.staff.flamethrower_0": (
- vox_spec: ("weapon.staff.unstable_thrower", (-1.5, -2.5, -5.0)),
+ vox_spec: ("weapon.staff.unstable_thrower", (-2.5, -2.5, -5.0)),
color: None
),
"common.items.weapons.staff.ley_seeker": (
@@ -898,11 +898,11 @@
color: None
),
"common.items.weapons.staff.laevateinn": (
- vox_spec: ("weapon.staff.laevateinn", (-1.5, -4.5, -6.0)),
+ vox_spec: ("weapon.staff.laevateinn", (-2.5, -4.5, -6.0)),
color: None
),
"common.items.weapons.staff.ruby_rod": (
- vox_spec: ("weapon.staff.ruby_rod", (-1.5, -3.5, -4.0)),
+ vox_spec: ("weapon.staff.ruby_rod", (-2.5, -3.5, -4.0)),
color: None
),
"common.items.weapons.staff.dragon_tongue": (
@@ -910,16 +910,16 @@
color: None
),
"common.items.weapons.staff.solar": (
- vox_spec: ("weapon.staff.solar", (-1.5, -4.5, -4.0)),
+ vox_spec: ("weapon.staff.solar", (-2.5, -4.5, -4.0)),
color: None
),
// Sceptres
"common.items.weapons.sceptre.starter_sceptre": (
- vox_spec: ("weapon.sceptre.wood-simple", (-1.5, -2.5, -6.0)),
+ vox_spec: ("weapon.sceptre.wood-simple", (-2.5, -2.5, -6.0)),
color: None
),
"common.items.weapons.sceptre.moon0": (
- vox_spec: ("weapon.sceptre.moon", (-1.5, -2.5, -6.0)),
+ vox_spec: ("weapon.sceptre.moon", (-2.5, -2.5, -6.0)),
color: None
),
"common.items.weapons.sceptre.staff_nature": (
@@ -927,23 +927,23 @@
color: None
),
"common.items.weapons.sceptre.totem_green": (
- vox_spec: ("weapon.sceptre.totem_green", (-1.5, -2.5, -6.0)),
+ vox_spec: ("weapon.sceptre.totem_green", (-2.5, -2.5, -6.0)),
color: None
),
"common.items.weapons.sceptre.root_green0": (
- vox_spec: ("weapon.sceptre.root_green", (-1.5, -2.5, -6.0)),
+ vox_spec: ("weapon.sceptre.root_green", (-2.5, -2.5, -6.0)),
color: None
),
"common.items.weapons.sceptre.fork0": (
- vox_spec: ("weapon.sceptre.fork", (-1.5, -2.5, -6.0)),
+ vox_spec: ("weapon.sceptre.fork", (-2.5, -2.5, -6.0)),
color: None
),
"common.items.weapons.sceptre.loops0": (
- vox_spec: ("weapon.sceptre.loops", (-1.5, -2.5, -6.0)),
+ vox_spec: ("weapon.sceptre.loops", (-2.5, -2.5, -6.0)),
color: None
),
"common.items.weapons.sceptre.root_evil": (
- vox_spec: ("weapon.sceptre.root_evil", (-1.5, -2.5, -6.0)),
+ vox_spec: ("weapon.sceptre.root_evil", (-2.5, -2.5, -6.0)),
color: None
),
"common.items.weapons.sceptre.sceptre_velorite_0": (
@@ -951,7 +951,7 @@
color: None
),
"common.items.weapons.sceptre.caduceus": (
- vox_spec: ("weapon.sceptre.caduceus", (-1.5, -4.5, -6.0)),
+ vox_spec: ("weapon.sceptre.caduceus", (-2.5, -4.5, -6.0)),
color: None
),
"common.items.weapons.sceptre.coralline_cane": (
@@ -967,20 +967,20 @@
color: None
),
"common.items.weapons.sceptre.druids_arbor": (
- vox_spec: ("weapon.sceptre.druids_arbor", (-1.5, -4.5, -4.0)),
+ vox_spec: ("weapon.sceptre.druids_arbor", (-2.5, -4.5, -4.0)),
color: None
),
"common.items.weapons.sceptre.amethyst": (
- vox_spec: ("weapon.sceptre.amethyst", (-1.5, -4.5, -9.5)),
+ vox_spec: ("weapon.sceptre.amethyst", (-2.5, -4.5, -9.5)),
color: None
),
// Picks
"common.items.tool.pickaxe_stone": (
- vox_spec: ("weapon.tool.pickaxe_green-0", (-1.5, -7.5, -4.0)),
+ vox_spec: ("weapon.tool.pickaxe_green-0", (-2.5, -7.5, -4.0)),
color: None
),
"common.items.tool.pickaxe_steel": (
- vox_spec: ("weapon.tool.pickaxe_green-1", (-1.5, -9.5, -4.0)),
+ vox_spec: ("weapon.tool.pickaxe_green-1", (-2.5, -9.5, -4.0)),
color: None
),
// Misc
@@ -1019,7 +1019,7 @@
color: None
),
"common.items.npc_weapons.sword.dullahan_sword": (
- vox_spec: ("weapon.sword.greatsword_2h_dullahan", (-1.5, -9.0, -10.0)),
+ vox_spec: ("weapon.sword.greatsword_2h_dullahan", (-2.5, -9.0, -10.0)),
color: None
),
"common.items.npc_weapons.staff.saurok_staff": (
@@ -1027,11 +1027,11 @@
color: None
),
"common.items.npc_weapons.sword.saurok_sword": (
- vox_spec: ("weapon.sword.long_2h_saurok", (-1.5, -4.0, -5.0)),
+ vox_spec: ("weapon.sword.long_2h_saurok", (-2.5, -4.0, -5.0)),
color: None
),
"common.items.npc_weapons.bow.saurok_bow": (
- vox_spec: ("weapon.bow.longbow_saurok", (-1.5, -4.0, -16.5)),
+ vox_spec: ("weapon.bow.longbow_saurok", (-2.5, -4.0, -16.5)),
color: None
),
"common.items.npc_weapons.staff.mindflayer_staff": (
@@ -1063,11 +1063,11 @@
color: None
),
"common.items.npc_weapons.hammer.harvester_scythe": (
- vox_spec: ("weapon.hammer.2hhammer_harvester", (-1.5, -7.5, -6.0)),
+ vox_spec: ("weapon.hammer.2hhammer_harvester", (-2.5, -7.5, -6.0)),
color: None
),
"common.items.npc_weapons.axe.oni_blue_axe": (
- vox_spec: ("weapon.axe.2haxe_oni_blue", (-1.5, -2.0, -12.0)),
+ vox_spec: ("weapon.axe.2haxe_oni_blue", (-2.5, -2.0, -12.0)),
color: None
),
"common.items.npc_weapons.hammer.oni_red_hammer": (
@@ -1075,7 +1075,7 @@
color: None
),
"common.items.npc_weapons.sword.bipedlarge-cultist": (
- vox_spec: ("weapon.sword.cultist", (-1.5, -4.0, -6.0)),
+ vox_spec: ("weapon.sword.cultist", (-2.5, -4.0, -6.0)),
color: None
),
"common.items.npc_weapons.hammer.bipedlarge-cultist": (
@@ -1083,7 +1083,7 @@
color: None
),
"common.items.npc_weapons.bow.bipedlarge-velorite": (
- vox_spec: ("weapon.bow.velorite", (-1.5, -4.0, -15.0)),
+ vox_spec: ("weapon.bow.velorite", (-2.5, -4.0, -15.0)),
color: None
),
"common.items.npc_weapons.staff.bipedlarge-cultist": (
@@ -1092,7 +1092,7 @@
),
//BIPEDSMALL
"common.items.npc_weapons.biped_small.adlet.adlet_bow": (
- vox_spec: ("weapon.biped_small.bow.adlet", (-1.5, -3.0, -5.0)),
+ vox_spec: ("weapon.biped_small.bow.adlet", (-2.5, -3.0, -5.0)),
color: None
),
"common.items.npc_weapons.biped_small.adlet.gnoll_staff": (
@@ -1104,7 +1104,7 @@
color: None
),
"common.items.npc_weapons.biped_small.gnarling.adlet_bow": (
- vox_spec: ("weapon.biped_small.bow.adlet", (-1.5, -3.0, -5.0)),
+ vox_spec: ("weapon.biped_small.bow.adlet", (-2.5, -3.0, -5.0)),
color: None
),
"common.items.npc_weapons.biped_small.gnarling.gnoll_staff": (
diff --git a/assets/voxygen/voxel/figure/accessory/danari/horns-1.vox b/assets/voxygen/voxel/figure/accessory/danari/horns-1.vox
new file mode 100644
index 0000000000000000000000000000000000000000..96d7a7b3c92bb8ee6cb468168ed6529d36f1b0e8
GIT binary patch
literal 1144
zcmaizZ)}rQ6o-#3kY&|nu&$#WZnX?qI|J^IopS>^w>mmDpbRGzTu_RvX%?|Dbu`Tq
zs1WBe8Q2U$lsZkb5X0P-x=8r2EMy`HA<HDj#4L+3#;?W@<G07t;s-U;o#e^A=bn4c
zxxe?lw|n0q`>2R?Hv9JKAi*^vUA}<#@vNg(pyVrg%AvynU!9Iw%f^lCB$%%l);$(9
zDTcL%<0i#mFa}ME!Du{gQVeU<R}Qqj*eqH<Yrnk#o6UbPRZze~5gwY&Ip*d%$=VIy
zm;Xzl$Aa~k9s58P&Qt^9U5kYCk+BWPyoJI}p`=gPG$K4RDddHPClW%D`j*dyx=s`A
zeT4+h6!HGdleESKe^PjTLO8vkxqcgEAqN$47w(LQ(uf(yunkwboa#GUDLE=soYC5&
zLes1u2ep4J4@njv(`E*@u4nw&Vjk=$h4!atRE<96JLP93*)L3dD9nuucc;|%2xDI1
zs{_K)Ng<$qf449a)b*&);uLzG7ox4g6<zn&*$8<Z#Qc?vo~R-Iay_HHEzG_53csX7
zRBg7<R8!8LU6q{Zt|#0sBwiI#Zws>*g!rxwuI+z~qwa0=dE9inEQIPx8E)G`re`~W
z{mq1r?InKd2txxWiM<(M<Xo7{_<0s@e~igwVq?*I>~=fVP6zI7PxC^J6K_*B`(A2b
z<lRk7eB$8yyDpaQSMibd%%p{Tw}hX*6=I=Et|V%iztO_4KXefpDrES&nW+UUOO&sw
ze_`?+zP|nzGgo{6p`UM3uspx2es`G-pQ|FLKhoNOcSjQ)tu6R>x8?NL*4A>dKE?Lx
zF&YQYVog}N^QrLQh(J1x)9EA{jnc7u8cD<`jubO<`O!Zdu<6|?E92t1Bs&`~5ga<t
z#-0-Hf3by`fR#)7&Hmj#yDwYoaMwK|y>R;SIEl|Pd@y~RhW;eaof>54*%W)O&C)fw
zh{xmMM?H$<Dg2IcQCPnD=zPn1zgCOu6U@D{6~|lY|Bh)So3moxU$I>B-{vdql|KQ-
C)+$E;
literal 0
HcmV?d00001
diff --git a/assets/voxygen/voxel/figure/accessory/danari/horns-2.vox b/assets/voxygen/voxel/figure/accessory/danari/horns-2.vox
new file mode 100644
index 0000000000000000000000000000000000000000..dc0e63056da24c95d8816bf072a73aeac77d758e
GIT binary patch
literal 1248
zcmaize@NVQ7{?#(`@MDEmAE|5sY@^CHt&orf25giJJZXZ({0YO?Y3m)t$B#FB+MNm
zY}ZC6F1HRhVw<x#WW-Fxq}U%K!`48C*oYuRBBFmIM)cpS=WhK`Vfny|=XpNQ=lOg-
z@9+2XX+3b*Jt87aHG%!=WYH992?YI*Cla+(#je<t!$*RFtLhWBO)+eicDrI)j8KYV
z7)HphSWJx-yW&tRR-@gpYOXjmwrtS4VpklA_%V$Y(_*%#D5hbCQWV29L#C-?id|#F
zsx_<D6uZX82K9>7Vh!08)3COuD2M7_tP$0bu;1Q<EzUofN=@aV2oIgkB=hr4B<xn;
zi~l9f=OXL48+U&Zp3zFgZ$&!o$k>y}f{U~!A+t-^JS;pjDcCxNC!#{S=C03#vL*)&
zU1<c*r1Qb-Q`Ged%`xGP3E}jT_BLme8_uVo&rA7?kDP8N`9s-w<9QU{-A?8)q2P?J
zJt9=k3G%Y;AF&~^RAk!8!1j%dKbygWT{+P3G*zlGpnRwNti*bSiI0T&apB&S=00J}
zFMN4OSUD*KHScW|hC@2uBh-3?w&#VOI^l|rH<x7-_U996E@b3H34O0rFw#-W{QIx+
zOFT@`78lhedF<O$$cfepIva%OYr^O|!rX^K-=0RUAAFr-<vZx|mDB2V5iZMNsD3Lm
zZ954btfBMxe)>)wWw8Gwk+*^jpX+31{5;EduHkSv*p$8zx7$szC!g{i+jybGgTK0%
z120uF{N83JZsha*JufTwi@2(L&cubq+rm%Z3XyOjSE8jX+^Xf*A6n=hOk?P#lc}XF
zR>)gd|I*~Ue0}q6W<T!uhkm{ph1G?1^_S;n6Yv%!^>^1*;@?$GV_hxHd+U?>OG`_+
zSTV}Z;xVcQ&XN_);_fHHgQEiRI3ACOo}L~W_f8|x2pQcO%wB%<5BszA?&Rij@m!4E
zRhI}2o@Y~ACig$z%4{%;OZv_Jy?<g}Vyz=Bi*$Fu>C59pKb_&i^c^aDV?1|ifZb<D
z*>`=8mdRy&J|92oQN*V3JI1oG`qiWJt?K<+udYup`Oen#x8wg^(@LUe&Az{C$>zVs
IYs{5D0bKVs+yDRo
literal 0
HcmV?d00001
diff --git a/assets/voxygen/voxel/figure/accessory/danari/horns-3.vox b/assets/voxygen/voxel/figure/accessory/danari/horns-3.vox
new file mode 100644
index 0000000000000000000000000000000000000000..df32e023c1a985fb0db364a66bfb1cf52e866239
GIT binary patch
literal 1104
zcmaizeMr+=7{{O9K(fSg&NjQcmX(`P`EqCGs+lgEX|*h?RZ?N)7*dT`Hil5ExL&ce
zhDB7%Vn{@$vZUw_k+2tt5Q_*xBqI7ZBBK93ovnh~#e03=!#U6Moaa2}`}>_!vvIqj
zLqw`d92?Xi)~O=Z4wrpK%uzO7F<CK1v3-Zj@hcvSO%ka~P;4$=QzEJ^W}gqhe9bp{
zlalx%!WWGu&fs7bF}vfq_rE0DwCMI2Ff`?03Kt>vX^3Y!(m5L$(vn;yq%{b0+l0kE
zLV`z_85B~Kue~i4R3%c;kc{g@3V-+iL0Ld>hJ=0H!tr5M>(rCsHj))EV~N^G_i8Y<
z>M=($$$hejv|U2h3AJ~JU>y)-i|X%BKtf4KpN8f|v*=ou%Bz*>P%)2UrO}~yt@xk_
zH45DqguyQ1S+DYKLZ@B0zgZYPD7cj0SR=I6skl!lH3_xL1z(wPNyVK7dfav+erGlv
z`|}8FEu^Eql)=BY@iF2iXTBC|UMA~TXS2Vi5Kn~=+%1HU3Ipea!0Jk_ZQ9E&%Mu!F
z7HZ5|+y&{hmM<V$yA;=^5<Gi05IDS(mZpRF54mVN?IGHAhLJ~CNlZ*+PRc9{1_QY!
zBbFr#S&?VLZp~%m+9KLc&87RgkvGrGjK0X>is~7S2+to1?_UajcQ%)T`3&7D<<r}0
zye-MJ-qO%JtYehS3H1;69OLn=BlKUc|4lzn!!R~9p?*t-9)~$AuHRc$gngxz%Cb_N
z>&oN$^Yim*FATFZx0B-Lljwpvp4<>#?G%VaFqusFd_F4I^&vq&soqrjFaG$4O?q{A
zGBRjC9b#4SdFoouFsC++7k3xX@6vHzeY1b}kFAUCwWInu-g-EGv5Vl%C};Z~QPddX
z&%@2EIvHmDwE?PoMzGmzyi-S!1O;E2G9rvU_;J25b-yOct0x$LXXB0!BmbRKnOM!Z
Pbw6|Q;(yG?Su5WGj0+`a
literal 0
HcmV?d00001
diff --git a/assets/voxygen/voxel/figure/accessory/danari/horns-4.vox b/assets/voxygen/voxel/figure/accessory/danari/horns-4.vox
new file mode 100644
index 0000000000000000000000000000000000000000..ebb39d1ba7c52705668fe7c01b783f3734d8ba9e
GIT binary patch
literal 1136
zcmaize@N747{DJq+r(R9^E|t=>Fu)e&Zzv+nbYc=UUsI{<z{u6)Uxt8q;`y(9fwf2
zVoqFEhsCHai$h}MRBp1-A0pu@h!BeiLL?&kHzH#HefEB@{ZYf^10UY!$NN0b`+UFe
z+q`X;rC&rEtKD1GA}y&RO>VF26U|VPp-5MxDR%Alx>u@I6V3P0f|LUvD^gN)ZMqcQ
zfpmpl(^HkM(CJd!(iJ=EzN{8iSCdzVV5#A6Mlv#ZEy8PqA<4u<BbwZB|NcQTokmRi
zELggVu*E76*8;?!jtqQ?Od82-6mmL*C4IumVIj>gEQ|<Q$~OKglr`$9@5sb^Jd2;k
zKBG1)c%s5LL&C8smFqE+=d)4}w&O@R$qg8=_L{NB^C`Z)f}9qi;JB*YFI0^S@|Efz
zN<*R<$f$wt6^j^Llg-2RxlsQ(m1;(};*sLHBHAeoof9Sog}Wolb_xS7;g21{%wfT+
z?9OJPuTA-bLXAymT_*%<g$v5>DKq19SqXUx=|5OP`0H}|+iRHkaVIb0K8ltasVd25
z%f><uHkaeC7b1Iw*muJCX(7C^fy>+X)8be~htol`-H5L&m)^Q%BwAPF-Cm7<-&Vp$
z_t4XIn9va~eJA}S22U}4>k@jsp2b;<uvjb<+pIWNE$5388?LHiwr#4Q?}sG}U9s}`
zuAQ0tMO;)p6LI0*P2t%CA>=FMLZp<*8#TOq(nO#qliuqFMy5>6kU#JIQ^Vi$*Y$51
z`=$N8`MDE=*~xk5cjTFI+Y6HO2Wl&Dt*@e?wg%7Uy5#(&rKOxHkFmOVfXeO@m?9=_
zUlkti5s1gJ*=z)ZK^iuXB9Rc;fo#Ukzx{_@W_5S+@;Gxc%7)6bwDp`~acd6ue_O_w
z*Th-%&Hme8+o#pq-E@yYI~+SdNaR|ApGR*|(HUj!(QY=Jh_U7JI8DRTIGs+Os-sAn
tf;Z@<h1oyfo^Mv&uleHY2`1m!oa@c_|Ho8B%b7Fp-&ivF9es|y@(+RRDNq0a
literal 0
HcmV?d00001
diff --git a/assets/voxygen/voxel/figure/accessory/danari/horns-5.vox b/assets/voxygen/voxel/figure/accessory/danari/horns-5.vox
new file mode 100644
index 0000000000000000000000000000000000000000..9171abaf56b35195b86b854c3f0b1eee61533241
GIT binary patch
literal 1224
zcmaize@NVQ7{?#)dna<I;_`G;mtJmbo{lYlq?v9z)61PdwmHkT(`4nXd6=}0xSWX4
zZX21n>^j_tnpqq&Let}tVt<GXTZ1vgMg$=e5&au6qW@k!=OX%H?SU81=Xsvb^Z9(<
z-|y$sapbsTLPT2YJcrdu+$_@W@w!tJfm*s^RZ^7WC%m5X>J#QrjAZdy6_X{&XDC+1
zrkIk|D<-q4%chttrXHJOG8;adVpt5FYxt7P=1!B@>@&>f9;;&0ajNFTu=FGu7N22Q
zx~xj7j?*+Jret55Vi?IiR^?dZQ+1-}P1r9l!4CUx%%`VwPlS7R`vyx(tt4#5^V$EB
z;mRiGqyxur3C_uC#BD+PtjN?u$Z|Frt-{uRVf(nSXHH1z6VgILrpDQy2o<e1n));F
zzLCjW3lGyUB(z0@7iWdDE85$ZOTNF5okPV`#$DtE>=cgWQXDOy^yY42u^8cSm^~9h
z?V=#h=>CH#NF*JJ*%{frh3Ut#xVt|OnjWD>HF}h9lpmGIfH3>6urw{)n%CGROu2>6
zj|pq11+T^f9m2Rz^Fg8BDRe&}1RI1ans2Mf#qTa;u&s!RQ)LW2Tg60gJxgys$4^l|
zB|EaIEh}Iq)WBl6nZ70=^t>?nny~n`Fm$kmt4Cj;t8y>>u1Y$Jv+-BtG1j<?c=tZM
zN9*W2d6=Oyos15jX7Cj+;}`mfPhVv9#s}DJHnwGM!QpUF>MW#k@1s0f=EPlF%8{q5
z89%?B*$)f(_Es@#cS?9)_l!q{+t-C3z7_`kMO+D$vpiGJ&)>BZ7|mepnw|NT9M&j!
zp#GJ)*ZK0=t1P_N`#1f3H3{p>f9h{OSj4H0s(<OP%+JMBymLc;prIP~{#sfZ>S;UF
zxS_wiyqv1Zm)Tc3Ma{@LazZ)W{7AUlDG-g~bUFzJgR~rqA)!IC0$D6vzW)!0bM@}z
z=kv~m2nTAy_(m_Xt$QnXKHbHFH;1r(vw!ZNn3q`VMEh+5y>RyOG@*~<T#DVGdLY8%
zXGS=1Zj$D!i?q+J;&Qq8UXLOv3cq5k3hQ6oKi|6EuLsrj32wZzP5t%gf7i5<=-IUI
OkJ?7_U&fovmEQr4+c&ZR
literal 0
HcmV?d00001
diff --git a/assets/voxygen/voxel/figure/accessory/danari/horns-6.vox b/assets/voxygen/voxel/figure/accessory/danari/horns-6.vox
new file mode 100644
index 0000000000000000000000000000000000000000..20009b5f7b5f48f7a73eaebacdb99fd0cb131c22
GIT binary patch
literal 1152
zcmaizZD`Y16o-##E2Y^=UDIe%*T$%`Nk!L}rRy3swaIGwqQ+{c(G{I>HpDU)Mpi>8
z%uKPCYRy8Gv6*!v6gS$nAuAhxC`CFah?GvoKuQ@y{3=7nzCF8%W6asj0}tn(d+xdC
z{{H`aJ9q6j4U0&7qkE@vaw1ox!|ioFmkE>=Dhd?&iv0(?ZoBds%gpC27hi!wleg?>
zPTn$KfkLasn&rwXG`X6iT7@Q0^QBgy$<6U;6?>YuH;U?$vESZ?wYoo;EG*=a2#<8S
zEHg9hWNgg+&Hqy5&|^4k!qiuZB~g#K@{m9QGV%g4tEZ@4SlJ`29uhWA2>Aiw`KVB=
zV*OV_ZM&A1o+7*-6mx#+MVt}A6BphZ7f#KoT91)3znOIrE4H+Q(x49Wpb=}boT{4}
zNTpK5Vlg%j3-)P2_NxBjd?a3oq;&LeSi$JaCEVRo3N34BP#WEepA`2M@m^v4BVlG#
zxHYL_hcMz2zTG1%92dMQ?(GzYd}=-<G+BhMSA~#MxT5AgwMP6dGht5!!^f(L?5ktA
zyNQ`|Z}1@Lr*f?xdv!TuQ76-}Rst<T^i3i0o-ln;h-_=)>h2>PvTdTrVWZQk$6s5@
zVDoy?U7PXlZX|GcCy|o}8R$Ds_#H1pX9A>0&oY1GQ?yzwtBO}(GMT8dn6YhoiPx$v
zxa?KzdcB^Z4_7n(nVFw&Sy{MK$tS93Iw{<~F8unV5cXGaC0fJmSQ8KLbr2jVV(^-d
z$vFcHls{Ad+{F8Qf9+kSKJI=(KR+a3arSTht=lR%)>-$Iep{Ilw{=}sf6!TvYm1#W
zXA_<s%~}05H8s>FPO!OZgoggp7@`JlelFZSD3DBIu~-O&LbUBjA<-};!4jq}KmLb(
zMs;_}%D8kU&enz)zJar>>RQR2uh%o>H4szZ?BD$}>oR*C=(tU=8%|vwCHh603#l8_
z_r`hUWItO^CuqGoO~=GM4u^wZ)KMf~!SCeE3ya@9KHs9cU(d>`CzyR_OZw}{|IVpQ
Sre?{yzjE2)e~gz{D}MrnXfMM6
literal 0
HcmV?d00001
diff --git a/assets/voxygen/voxel/figure/beard/danari/danari-1.vox b/assets/voxygen/voxel/figure/beard/danari/danari-1.vox
new file mode 100644
index 0000000000000000000000000000000000000000..c8c09e8ae7d4068c8bcede80247ac519d4b50017
GIT binary patch
literal 1376
zcmbu8ZAhJE7{{;Y<s2V96)ulDUsCg>c{Jv0nrYiHb=&dXS+<>=wAe_Ku^}a!h_Rg-
z*;q3ZUEnecv547rI7-n6lO<!Y#yE`#O2&xjYab%|_Uk(CTOmQ+H$SfHe_hx8^4!mT
z_jDY{nHG_@`aruHX?2No2ZBux#Dum4MML6I4jc>yG7WXK?NMx7OqXKYMyE@$ZBw<W
z+EQ(GT9$3vic4|Fd@XRriY%9DSuVp?>r&k6$Eme#)rw`hO&wusX0w}?TkG9guQA1~
zew<p{R;?HkXF7^us8tLz&NLNEaVxRzD5j+`#jV7}d|Q1*#4+L(F&r~q5v`6_49n5|
zJG!Q0I*MgGhHa}>-0F+OoAHVmY85>#ohQNAzxSDXu{V!NqR}YfaF~0O!oExE<az((
zcdwVVwKihya$uSEmQoHMs%3Pzh2`-8%aey$o;gAF@^KRVDI|BLlQUL~Z>|Puav_5W
z$o#{|dJ2hcLh3Ogb3%Chir@?i4~B#!)hV9|m2DoHk0la3oy6NKkI*<ObWI5_EeWS?
z>sXyTYao~W(IToMelmu<<epEbXd#=j>pMv874lE(+|xqcsvytm`Xdf9^$-&FGQMLQ
zi>1ljc{&4{A7x5}73F*77iH?Cu=Jj=wkX`Vs@gBiHwj<t7dBoNf~rsU2opy%J}fl&
zguW+*;YQ)2#=9!h8EDF7q^pqWqveb~SIu;P1K-TN2H(z8oR>mfc{VM(3pv_T&0w<-
zIwZ`!Dy&`*s<P4v6y?)fwUeR78hVOS7^uwP{N4g0eI+#2mC>=MhG1tsgD<u-ay-by
zn}b9a&l0_MiO6g(YoEM=$Kzpp(l&B(awzlVQnm9jo+|e-@kS;~ALjDIjUqN~6*H@A
zMizvdUkN{dCyWdfaxqlF`sD_G`>~s$bBUb))XUY|X>5@FpTB?Yt>^i5Vc>s%e?>(F
z?^e%IQZ`TR_!-hdX<YwExbuR*!U8^@kN&)2TK9#K&<M#x$*j!W|A%AgdUvw2c)ehX
zUA2=OId_)reW~2~ynvNp8k2ffe?R|NU2Lv{-8UKPhf_0)gg%b&PWT${e;wtC6XWbU
zGe^q@t8`z9;`jTxr&|$6;Sa2+aQDmm`@5_6>)-PF3OC=`RyLO0Di@1)jAhY!p%hPv
Uho5GX{!v@$_p!UZe5*C&FSODlQ~&?~
literal 0
HcmV?d00001
diff --git a/assets/voxygen/voxel/figure/beard/danari/danari-10.vox b/assets/voxygen/voxel/figure/beard/danari/danari-10.vox
new file mode 100644
index 0000000000000000000000000000000000000000..28fb8ea95aa092c3c35b5f52df1c4b692e9cb9ce
GIT binary patch
literal 1504
zcmbu;e@L8l90%~vbI(tA6)w+no=dM&o2M~<rkS>#>9w6s%~`fxPFifG$=HyR?GR(T
z8rg6&J9L4|EW{#a+i@pFf7r2P3~Y>RL{KtDME~|jME|{eKezu13F`as;`9CWe7~RX
z^P{i(fOkejI$J_r46?3^^oGL0`|JkG7GjrV(Sd{E(44{w%gdyw;;=|m#i5XcG}6f=
zi?T@3SSP!vq>)YrS)|yVq>@HD8Dx@0iss<L9AnhUWZhy^c%w=h>12>aN@f?1@zO{q
zgG{nWu{R=>G}6f+lPt26P)Q@53^GX(&0&$kgzThLGRP#0GD&83WIv-x7AY#{lS&4e
zWZ7*V$RIvpM;3{~NWzS>NKtjBqBB38^I6weClQ154bEpI5tD6`(PFe5`}aK6B3kA(
zNjjZIJRZm0X~Eu0YbbX8iQio=q*9%*%jHlKT^&_8e5eUyqa8?2gpiy*jO6SIG$fBB
zJK#ocj|blI3i#(6AweB7yalrGAY{#r>`p=6F~RmJ!J}6M*0A9Is33=J_h*8-PAA%r
zWg~n#2k)#rgtjq3PfYOAvf$J$-pjQMhkPg*D@T1IfPxVhe3KrOFBYNt`VQpv3rbFN
z?HNJysz9FQ{t*ijdjJx5VPeNtELG*=_LBub`@@KdV1>S?Unq7`u>77NwIsN4mF<9F
zAt?A_zhL7PL7456eS)bY>>m}h`UL}z3r5=n7unxa=fP0Whe%HuW{%ci?70Ta47TE%
z+1G(@7f?~`MsrOOI(C=gXkP<{+Xc}>g8A13s}}_Ig&u^;OVD4x6C-Vn=qq<)sICB$
zdrFZQs6?>28r@GfBK%AXhF|PL<aiiUZw(`{bQbArmynq2N9vPT;dDB&EoUpdUN5Ts
zKGg4g1W(lXG4<wlEPv?34>!uOakBz*+%vH#SpQ1!^LK*CP#G>pYq55@6~F!1i;;8L
znEcd*tGDv8fujF>{?yyg<JZNZ|9$@2+FHEZFptXW1vE{ZL4GtJ*FO^6enEi6Mfm-G
z3>J@K-`+SR8bR(zE>>pmy~A-2zn#KDyipp%uBK@mId>M@2J&$8^HQvY^D)h5_4ns*
z&$HJ$*t?FALEzNv5~3d`a6Wzw?|+@fV<#rC>&!elK3GNXl{5l@0PZpsu?T-aO$+XP
zc`v^^{J#EeoPS~FKie$YgPV=n{oUh**mt1{&PpeKn#=je+`51tySr*O+e7{Wa(W~0
literal 0
HcmV?d00001
diff --git a/assets/voxygen/voxel/figure/beard/danari/danari-11.vox b/assets/voxygen/voxel/figure/beard/danari/danari-11.vox
new file mode 100644
index 0000000000000000000000000000000000000000..fff822568d351ed0123f338923f717fab8f481b1
GIT binary patch
literal 1640
zcmbu8eMnt(7{{OUJMZ2Kmsg#-)O=}Pjrp2p+ICHCyE@<IvhC)i#YUQp4Jp|~jLjOe
zvCT|$fy*q!B4+M#m7+gPmW;s~<2E8F86%>9`y-<NzJ1T#e}x2f4xjUTp5OEQp0{&O
zSKEQ?DG_O@3$=2Q{gy~)DBSpvr|?Q3Ch_zG2g9K}MS<5jVi}Io<5<dwuQpdxGYm`9
zl&v(Kt8OY~m`c+uo=hM<>K1LbvJIWGhe6p;rlC>Plw~N&igD;h*`kkW=+t%UI&&J7
z4b3DL(V5dCqHIkQTZwX%Xha<5wUx`9E_1t@%YBnr)IHhrrLMes4C>tDzR6x}uV(I>
zjBB%AD~?Uw(rjInA}&2_U29jwRjS=)D~h;$*g6H`D)z?M7BPuIbiyWRGg+zWWr^SP
z;7QJlIGmeJEMgLa=tL36tDmPFViWK7qA&~3TRcx2XK(AY5R({0CyF?nk;C4ZVTsi(
zX}Uvy&WjO*5nRrZ6Nukl26n@kJmbAHViBDv;&R3=y<M*p#xUY>G{#Zw`*uH9Cr12p
zkytE-NF;*$6M{Wg){*P~6TkcYSX*m>cU=uFqqVsNhY!_Yc(57EV<9Y09LDnW2~;f~
zM`ADq$sOs)9w|a#wi?oCLi!URbB{vSQ;^sqNIfRlHZFK_N#OJg9v&4WQBV0yP|@N;
z)3HQ^PbcA>mB-L9Ea;dNys{`bb%$peJF_nbdBcUMj0TZ0;787dbQI2Kq4dUfq;?DP
zPBZqDpmtRt`<Z{pflNLEiTE+LeG3*!l5zLh44~<8Op0KId{2HMlP3j>?+Mlx1UIiy
z4+`cQ1z+qFY`iK6Q$N`y7(c@OK|y^$(DSrlut9K{`yCbO=xfZuP)7l#j+SBgg(^(-
z*5jM$H-K;FP?Vd3+OjM(?<&C2t}6652}TbIW?vVqUJ_JhrXy6ChwjQ97-*<QS78eJ
zDl%|kcRr#$#b~T8Mceb$2)Eav|K(N;9S>vt?S4cT&LVdG3ZgUJSo`EP_<TNWP1=I&
z>}-?<a!|SB2|QC4!1!C+u=rsPez;kPjoU?-Vb18h;MP}ypT83f^%daqXgSue*5kJy
zJ27xR5f?u7<Jz4xY#{4D_rG@TMf^J7_rLouFE7WtRkJ8AokPvo8KjM-;l@XTyDtea
zKaW5lfZp6e?A;TAj1D1rAQ>yu58mNOI=`LFOuU&tiJdhQICB0hw)Ujr_UHLn38!I#
zv-<n|JwGqj!OmM4=mkzqFJScJC@w~><NdE=c<RI$cAl9<^9QTwT#6wW4B|dZ5r^Op
z=rO^)FCWx*kKfn7+4&d7|Fg|j&$yY*+ix4m#NJCK@D=;;(@fGod@F(h>}oCBEQkCB
DwdN>(
literal 0
HcmV?d00001
diff --git a/assets/voxygen/voxel/figure/beard/danari/danari-12.vox b/assets/voxygen/voxel/figure/beard/danari/danari-12.vox
new file mode 100644
index 0000000000000000000000000000000000000000..834bf970ffe62f0eb9714c3422b422b86ea2118e
GIT binary patch
literal 1240
zcmbu8e@t6d6vt0riy>AGlTt>Rr512)G2^Eof?E;lEDVsLxK&1+*&?-Bwlqq%hG4ep
zA}%<F4a@{YGz85u+?tkX`~#b9S(eOY!Nr&;S&T9M>mSDW-^cT|#6L8|MDNSz-FwdW
z+;i@I@7{slJ)UV1>23@6XeXC#BK_e==swfXc8{ViF_b-fBjJ?xW~)#Pt5_^ni^Z^7
zRJIs~A%>0&i;h(>EQ-Dq^(pF9G?hk~j|wV@VN;J)v8k>pHJ!z<DS0NQt#LLbPqCWu
zW@*i5Q>;3{s`YI;Y4^^j+U_h?*ETmdM>?IR-0{a>{N`|w%XMS6^WiK#T{Z0A*TU#X
z7uoSJ*{S_xXO7U6JxoE+Nl~8*&sY`y`DP@Phs5qh79K>dI4S5BiVq1}CWS{Y2>CJL
z{-jW-w)33O&~2ylPyvzSg}k%!5FMjJUrKm+SvYo6=W1?u)Jw%^fW}Oa(zpZfgp0sp
z8MRlpQamVB9M{~_LhGs^&uRTcK9YI>Njn(dx{0NlB5pld3Y`z5|AiIhTjggZbyQe>
zPsl9^*Dk6Z6c$3l=evdVSA>Y#M+bz-1L_|U+Wo@N<HAUXa8~_&4KAV~FNr=M(+BGq
zeZGn5;dU<1ybfP4P*v`vwXTe=9X<{YG!g3*lKX`D*M!y6LZjP7I8ec0<2K?Q%?t#b
zL>o$(*jY(tsG3k~Exk`S6M43c*h@Vm4o8@LD@JDNBx{%E$jlCs`{Y&Zb~~F3H{tPk
zsP%hk-1Z1h)cKiwa|_EKdim~Jfb|<y%xcZdqHz67;iqqeMAXOGWIb2TxAW`w{lrfd
zF!8B_i#JPHr|duPKlk<v{IVGR-}|qxujfqDJk_-ew2YsiBw51MkAzz<3g>)2{C+>f
z<s<BRCXFN$6vc~JnYsH9$6R`L+-}~eOtHOXiUX%kvU#YO8=qCO5-DLyzt!KrzZqxd
z+S`Af_%IxsSt9vyhIiAKc>k+49y>D5_7n4TeXvUZg*Ae~AU_I7zQXTV*M!?&++E*o
tJzxK(>lM6n&o=5!aU;$2_l~*Qb-D(7wVfYk3;z+@5cIR7r*5Mf@+YWU9P<DG
literal 0
HcmV?d00001
diff --git a/assets/voxygen/voxel/figure/beard/danari/danari-13.vox b/assets/voxygen/voxel/figure/beard/danari/danari-13.vox
new file mode 100644
index 0000000000000000000000000000000000000000..9132162058267f24b633c1ee41269d5273a41f69
GIT binary patch
literal 1136
zcmbu8e@GN&7{{MG8%S4S^E~rx=XGk{o#F2^r>k>%Yp1E1%jz<zDDpa@I7;deN8J{4
zVcG3a1DkUp7NXg4CmZ|2juHu)h?595i7}#o`y<Bw`}AH#e=KCM9{BRS-|zFj&-4Cx
z-j>F_<~|XruW~ggC#@?)nq6+^syI=msA%5!z5Cp*O>t4#N(H5B5+p$@3R;B((P}ly
zYeb_ot<vHHjds`ePpe)fQfq?2AmMPBO#MG^@j|aB7ON+2<E|(Tbp;$cP(f!$9no$V
z(cmGX{ii64o+Qa(Af?HOxhogjP&wlK0P(IwhCf7R3?$VHsV9W>y~3tRA<-+W4hYGL
z8^(l^dL6YVl5n3-=G&={sOc1%Lc-w*;oQ7ht8$w>7P30+ltvt+`}A0PjMzsqD4fk9
zwN=PEuX6VZmD7TJq3Zh+k<c0>tfxC?Eu#e~EPj#>wHpYDFs1NF;i*FCtT6GN5E~U9
z+)>;i3_FFNb_q+z1h?X6TZG;tO79S=Z9>}?p`%6^P<m5|5s%Y?zsXA9(IPr`m(kZ=
z&Her}@ar(SnFcD0GN{{T<!DP8-dZ7WKo~kLOkWX7O-5YyELuzR@YR&lVmII^NvCIf
zHj%b`oRx(%epZfqXBFOq4fs#G>HXSEWb`5n_pTEeY$bN{I69q<b;)Zno6Qv3ER^PL
z<l`b6y<e?o;s*<lAJ|!%%Vkj2jEo2me-ZxrP4IiH3<Qdq8L#H~@6GrwCDC(B&z<=+
zmdN<u=Z}4}hi4<6_db7daWPlRhR81*rlR`-X@N9me-sw?3u9I*Hk*z1%no*Z9!3Iw
zQhX^)^}l|@E~DxllZh|0Lu{=Ga^%uQ*0rTFcRQOYcN#%;SO32M_`G<oea#Q?wZpmo
zQ35w2Tn^vk+T8^<pXz4og(2#`pQd?o0f)oEp8}Goz~3Y+2v2@~y}u`_zy2$(zTm5W
lww#X#my5;q#x4^(t`wll*YU?-@;h@&95%K!6fIXnUII;A8#Dj_
literal 0
HcmV?d00001
diff --git a/assets/voxygen/voxel/figure/beard/danari/danari-14.vox b/assets/voxygen/voxel/figure/beard/danari/danari-14.vox
new file mode 100644
index 0000000000000000000000000000000000000000..bb54e034c2c6052e2c6ce05b6daf2000acd4a307
GIT binary patch
literal 1280
zcmbu8T})g>6vxlryO$DI4V7gnOI?r;%Yxxs5W#jStnESpDT?h%i8XCxB~6=+l9mum
zyV{5i7Lh<rsECH3F~xSX5RE2CDruV3rdb<fqNHhz@x=!pjPdQ~x$veTCVFyzcjo-h
z%sF@F&UAMi$ek3Cw#HDqHu9@eq$?B--fKH*sftQsDF+UQLtkoZTd880Vpxh{I1E#9
zDwblH4u_>|bPdC)lBMXgZl=DSilwC3iVBu3im540!>L$`I5dev1B#`jC|gw1!kWvT
zpt_QxY*8GhYNn~RO-G9M#o^TPTFG>(>@=K;rR?9cyK#L{x`t#jNjx6s?zph`;wt&>
zKl$D5W@V)f+b)F`X>Tp(@S%E!23lDh39&eSn8m3R)Gi(;E#M)e(@XAf3I3TnBxoW1
z_aL(mAgdnI+Jwww!uB!Yk;_7Azi?knNLSzUiBR3<qUBf`;nV57x%42-Lqg|-@WO&{
z>Xy#c+`dR21w+NuBm!hd-Q<mWDW1!r;@S=}dxV11ntM`cSQg}Itv{HGOx%ye-Hhzm
z%6xeSx1Y#{mWP-SVM+N;`B|AbDJ;Artjr77uc#joW`n|K`-Qa^g|PZ3yM?hMst*WF
zexdg<VW3&Kpn7Mumq;*=!OkKkk5)4DOf8drO?*A|3Vbt5Nxp}M${bpE6>+q?mi`tY
zc1W0cSy(<V)cCxFiVNteDJ9xmM|ZJ@NOd-&dkRVPmJw{IpySCp!cR5Q|9m@x$HR=h
z-cMrwEXk`ENlf>!^3hAUTrReyZzVT3mkNI#HKh;pc%`4Q*S53pejeXnFJ|p#3Da6L
zF(=&kLip)hVK7p}g;*7<mzwzPhc2S$(ir{N&6QhOtdaAd*T3?{v-~m_`QPiWs;c7c
z+8N3!W~m=JLsl${Yaa-=pA(py!|(Ugmp{P1y>TQqNJcb+rKyd7IPBH4<MZ)q;RHMD
z$2oHDEZcfBx%p`!OW`cWb+7)u|MoaL*TJqEMEl^>)I6~d6TB6_%DZ1BdGy2xJI~C}
z`ra~Kmy-kn0q*LjNUFjgm`UNz=NsR5N6**4#q|oV-?PnHJGfcQ);orM>^onMtIWlZ
S)9L>hTOIJTtG#lw8uAx+CLq}W
literal 0
HcmV?d00001
diff --git a/assets/voxygen/voxel/figure/beard/danari/danari-2.vox b/assets/voxygen/voxel/figure/beard/danari/danari-2.vox
new file mode 100644
index 0000000000000000000000000000000000000000..8945e528b934650fe5e6af3329b5e65cc2b575b5
GIT binary patch
literal 1156
zcmbu8T}%^J6vq#xCdBRoM=4TV=?Y9*7Wo{E!L$rIDW5|&rWMItG^1;bq}hlzghe}z
zXqb#O;1V37Y1p#Jv}uWE53F&-m^foPW0p)}j9K=&hh^E@Z>R9Kg_vyT=6_HA=YQ`x
z_p`5iw|z=PI-9&*>SV|$((Cnko=OunrIM-GpxC{~=XI-3+p~%cgBUWj8PfflTV)zB
zNJge1Qy~WR+QeW~&8Uh|nbELo=j%<Y$u&<Zl_D04@n}+LJ-<wm`7i!3n@J`+N!w*_
zg0A)o_U~(8WVoHgn3u%leiG9|)Flp+?Y5BHW5qsNhI6(a@oYc>8<Dx^kYx+mokHFr
zVatT@(iI^qAUquwa+F)X5o$V3v>nREcPxj~i_g<CBJ@Or_ZEbscXh7jw)q_tkGQCf
zyD12oag1AWMGL9Cxs|+rq4=2Qo)Q|D1bIvAhq92!Gf2$L*w#(VSLAZ<wE}2+frto;
ziu;OR6_F#t!skMAUbuBtxm%d?2-kKAEAI<F<wyF2i31uR7Mh*Hz$?OVi*QckJvCPR
z9tWYGQl<`8G4ggDQ-jU?F#QqyI7eBLg~qBv+IN(4u&<6ln-Jb7%zh{=ofT?rR=loa
z`fIllY^kTuWx-!l!1&G*;sfP)8Y}63qaNRzO$6TUB6Qft#EAg$`IDq>oF_ihPx7k|
zFquqj&e??BZl}`epmy7fyjtaC;*%{bTyXI7Ef*_y%9zob@u+b7JK^z9Ldajrxo|bh
zmz(+hmtKNrvKjx{%+<U3tWfx$_n$oV4!=eH|9k({)zy4fH%oct91UZ~$q(mq^P+HX
zuRt`4)9GZeXqb-H7!nSV8_Z>KdhHHJt@?IsHa;$iu)SfD17}XMc_5EF-<GiG%V$#0
z>YwMI9+%Fwr}s9&K{z@+Pxw-tPh&Uu;`<aY4~?<?_$=*TF421>h1>1skuF8D6#PkM
zN_cpEZG8{*eLYFnFSz>8*7Ip`JuMyY9<|YNwgOYRi3c+|{~BB4cCw?ZYP}lrH$t!;
AasU7T
literal 0
HcmV?d00001
diff --git a/assets/voxygen/voxel/figure/beard/danari/danari-3.vox b/assets/voxygen/voxel/figure/beard/danari/danari-3.vox
new file mode 100644
index 0000000000000000000000000000000000000000..5b9f43760eafd1fc1f670bbb68708c64fd615021
GIT binary patch
literal 1592
zcmbu;e@NVA90%~v_xJbiDqNmA&!y&%=AAKrrkS>#scolIbCzwFlNK9!9b@At*+h)(
zYGlLBOmu<EEW{#a+i@pFf0!&8gEhuAA}ARnqJR5iME|{ef8BqD1ogdp@%(<C&+|Or
zZ(sNR!f6rdYz}oXkrGp+HxzDrz$x%?QiEKy|3El&Php172<f`07O9$|YNV4vCRt>Y
zi!_~Wx}q3NO|qD`nJS8^x`}^PBb^K~$s(KF<TPrelR+j~WRr_D4%Bs(^Q($U7TK&5
zMdKRmKrV8VhZxbuq#9G53^K_gn_T23XHyy%*2y4~EV9Yvv@sx^3~t;ci+S4#Qgqct
zqA(CrNh6&svdKkm@(@plN8m)lKKxl^lZ)I=8#kztP8QkZa?0GaMZ6(ZAvbxPyuv*3
zHaOnkID_#UjNjmRmUWiNB#T5$jyE~p<ap*4=1CEYbrw^bsjcqY{Y<my8`m%CbQ+07
z0(U0`doHe_*!w5$dA(R&?S%7O3Z>B1QHetb8!<A}fz((CsmVh~%^XL4>KHPD*~seg
zp>VVu{<#K7n*oWsA@dJI*0Pb&Dabi0*ft?}{IbA~3LcCLGFi_4Tu|HTLHp4RgimGS
z-Q`EnIwI(q61=h`IC+a>Id^`f2qhx{)Fp$+i+NEr?n7Xq09DtvBd1?ba*A_L3z}90
z@;uicwjomwK@wh!ZQp{$$}HS|IuB@n6jLHtrXT26nmQp^dS9@*D7b!w<)C1`P4MMD
z!TPI$Fv}<U1QUl@KO|`J3kIGP47Ca_u)e3(he%ryhI`5|eWV&AFVtgtum#`Fya9YS
zkMiPdG*uU%V^<lD^wlHUE{Go#%)KsHIWMTo_aPK0L4Vy2#9ABB7sy7WHV@;wOOYI?
zKwDE4x}R-8__=08U+%*2u`njyjv~2u2I;F8k(}+v>Zh;4<MCi?<`xtd7NW{ugt{G%
z;i+mrCf?eHrH_j6<Mja6Z<b@0YbF;2H@+79^1Wa<Qicoh8mwJv!S6ryB6c<d<DYqP
z<yJ1%QShJlzxvLL_-!HbzxQ8LQ-k;F=TK2KkH)dn$c^XX+Q)+1FA1=)0Keal!Qvt8
z-IIXChmjS_!t%`hI~?`#-O10#o266O**J;AXU|~kKn`wxQHteoE+%<ae?NbxpEK8i
z-W!Mw0w-q{5&tBKbBU|?;F~m_I6j7*r{~b|;R<>$rx6SWahIWpP51*^T5#v9`|;i3
u`}J?_{0cX|v&~YcakDn3zI!wud(T(GQ{lnSvzh<sTO0IaS6B6BYsg=<a3wGR
literal 0
HcmV?d00001
diff --git a/assets/voxygen/voxel/figure/beard/danari/danari-4.vox b/assets/voxygen/voxel/figure/beard/danari/danari-4.vox
new file mode 100644
index 0000000000000000000000000000000000000000..a2a5720d4f06921d2c376048262a07d8cf66dbcf
GIT binary patch
literal 1680
zcmbu;eMntp90%~<dA;YQ!sS(`uB-Xdyc+X0&9v>By6yTpXW4dh(qbb`#)gz^BF1)W
zWW&u&bOV=Jh(*k{%T<d0Fj+DNYmD27pk$1Q{_T&5{`>Yl?!Q8UI+qW>=lMO)`JMYb
z&pBP~2ePL`q_r;G#vsF{NM|_G_>kA(<wd5%rUM5f;TDw*UK6C~q8en9<FyU8NpwY3
z$k3I2COK@oUd~|7V2&KNMN?ISOmazdmG`NtN(Px^lS3|v!Er-n5ss5dHaX0>jG}5B
zWFhi?IvHe=k1VpuA(uqsd{RjxoeVO`M;6)SkV~R-K5?R|kxmAg<Rgo0a>ymcTO4U*
zkVzKV<dDJzJH(At6>s5WlS3{ESD<*CK{h$$l4#6p+)zf1bn=l!HaQ$~85N!Pl14iD
z$Re8@@-|uHA?b`hve>p6#oJ_Z$R(ca#-=-ruGiK$MyhVGgu(S2tZA^zKAGerQB2k`
zS;u4@ws{f`DT<FdAEU)+sr&alS10<$YbA+90<l;O_a_8<FRvlj|0jO;`?0#(3h%lS
zUP4=Q2@W5s!SG-+mPW%^nmCN5=@Y10I*z1JDpEQ!kUdg_;A}Od(SY<jkhw=8YpF<T
z6{H;#Y#SFmc~xNb3m%RNlG#uFOi<D4qUl%?BBzt_?($=37#4I)3SL<hoVvq%Sv$~|
zgS_EFRK`Qd9PlG&ECYq}Stz}+9ckTyywj{bC8%8y$n$*ukOi511QPRObo&-8l%(M9
zvzb8C<Cqk|GJQ|K(Bw(M;`@Tt1;Nd0?1uz%je;-s3)Wv1MA$#sB^W=#{GgydDCl`w
zFxVit$b3gd2KpLvFw{|isiS2WexV9ez4iEJ`VHXQITYolqP8px&ASS4w5tmJO@inl
z!R+gTl?#H(KnB8vdFZa(fq{l<bQPweuObs;d-4(QDMn*$DcW~eBeJg!{V%s+=y(L<
zZ}%g<a2AQ{ml2=o#_A`p!F641P2Pg+>}-?<b5ObC2|QC4#Q0m=u=rsPez;kP_1i_5
z;WOj&f?Hn+e*R7{)K`Fu(Q>R^smE_Wc4FXM62?CD<Jz5ctRw3`uYdKO7xC+S-~V2J
zd3ibBtC~e|=^ScC&mcXTjvF5d?!F|z{5*oeAbN8L(XuxNi4GxUAO*|Q56*BTgYQlt
zfH(6ev9o3ZN6wwa)}A!n{yZPck#tOOul~OO-aN0?!OmM4=mkzqFChAH9Oq-#ap~&>
zo;op#oo8mz{J{!3uO<)*g>avLMJ&P}&=P`sUq1MM_xOJO+c>|%jqhx;=nZZ*=H=T*
c0%*BV0=L-3PczB?m|GDFVpm()X3vnn08D%*?EnA(
literal 0
HcmV?d00001
diff --git a/assets/voxygen/voxel/figure/beard/danari/danari-5.vox b/assets/voxygen/voxel/figure/beard/danari/danari-5.vox
new file mode 100644
index 0000000000000000000000000000000000000000..6eafb4cdc2e8decb298b4466d2a18dd62f0da5d8
GIT binary patch
literal 1160
zcmbu8Urdu{6vhw5B|tY*r4%VzYJo}1B7cQ3P>WEtATVTOT9K&HjIJ@7#u04@i`JQ;
zVInr5367y@m@zVJTC&9pY#cEr&X{V9i4tRs@zx7tcK7rB>fIJ%GS8RiJ9(aS-gDl+
zoo(B!BO=mL?`~C24lNStaC=-IYeZRwf|8Qhw%y}y)I?>5<UduHE*f+?(V%^jqM&?=
zh7=VOU0SN>QWVmYTxlwnu5!0-+EAY?tOg_!2_lgQ&xVD~7v{(}{=;jdk$AiX&91s*
zv^JNrduJ_uz0Jf1+{A`=6B|89b?g8Jr-`g~GuHlM?Bg|v>m$UMflMq#=1dq`gzWvo
z@*&}~X(7!gd=eBg6*pZGDqHk4?Kj{#n#swT6*Tq<?IB^$lyKyp8mnqsyfzB@98^V}
z<ob=+2F*Cad6eB+MRu1^a8%VE5$a|I`AYQ<q#>cjNW{p%swGU8X7ONcE;OwqB*Kis
zLxmR#p~J$|Ss^|t+`gu`Q<!iGe{2=zzZE=+AMO-}_A0$sXs`?2p9{T>!a1e4SDNv<
zYy{ei7}-}&-`CZQ^fd6-==bpV1jYF#>dNzIUSGt%&T4#3LU5-ren^--EmT>|xE%#_
zRjtO~SVO17gts!6!A*rkyGwA@mC?4b2G5uE_;$4tIN)LEM<3D26C`e4AUf7X{I~DW
z>-8+lT!PhVrOa-lYW1glQEq4G_;RLxweje-gZaC~jH#Z{uyE(P@ch0I@D_0{Si#)Y
z23|exz<<iX;AJD%?&UB~-v3^I{HJet8TNkg`YS3bI8!}NN!bLo1INe-=5Xtx@L-2P
zIE>wHrzgLcEt?}qFhG_+i<!}PXV`C6cgJGkhr$r+YKPf->IBQWv$^|wAv2yFhSgsE
zd;hgOt=9IAJNSFx$mk@&OHqD~+~oX?1Zxfsu<qD6&A-gjF`dBabn;A1MbZ>_Lux{J
y`scg(JyrMXeR1^!lkaRHuLT#1X?k0~g)OH`(U<6XGM4$D+)AgN^{wR#^^mvWHXe}x
literal 0
HcmV?d00001
diff --git a/assets/voxygen/voxel/figure/beard/danari/danari-6.vox b/assets/voxygen/voxel/figure/beard/danari/danari-6.vox
new file mode 100644
index 0000000000000000000000000000000000000000..9d9c0b29abfe2981841cd2c9e55ec0010441afd2
GIT binary patch
literal 1232
zcmbu8Z%mtI5Wuf*+tICRn3OVL0v2!-%=jya;8ujX6$Z#q+$tl^Y?0b5TN))>Loi!)
z5hojB12bVFng)#-ZcR%xnjo2ESu&TUF2+R3vKZr6KN#b;pZB_N8e*cC_xIj&ch7V8
z{2l1sS28Uk-EDy$Rq~}xq(2b!-(wmon-sgULD{!I7<fyyDIUdU6~nIBY^oKDSS$|3
z6o>gU^fN4mRoS3qDGt+TwOFiH^(k4}Hf(C!)K;>zEjn<cVzn8X+tA#G#tcI&R`pvo
zZZkG2VzH~X8+&&>(Iz@?Q!<$h$z+l{Q^M{GtCYI_;5V0xm6dKxxfn>((^bR411*e>
zbdeqpke)h7dgd5S>7!)(+~oEZP%>79cdi-n+mY}lWd43+)lGJ{katAbIw?GSNpOUP
zdt*Y5+U`$;hHfXFN3sc?%;C+Y2k00T`r^V1i^7SUI#zQRg*=pvR??XAQ5bRInJAz#
zQB3XCZR8CKWhXWFw9vXN$kSRs>OkW6AxRhG+cvXMlgq8g3!(Et;vy_5-zh&U@#Dhc
zJHpC>aP6|%K4IQ3e709udr=6geSAQeJf!{+q1`JCJt~ZJ2<O$`*HA#n?;+Y(!Svxe
zMxSY7dbpjhXI_DC=BX-m(^^+d*UkzK4>S?(6k-R2xtE3Ib3$WL0fEXg1{=2%>1bx4
z(oLwLkcnO8q=u^Tx7O18WHZ61+6X`2L-c5n$=AcA7EY77a)H$BAS)legwyF{OU`CW
zN=m5pdT8AK5RcV)nS5<4i|>2*{#qq#H>#M`nyG|v{R`ozZ-r>6g7dL@Rxh^m>ks`z
z&SW$3v5U($^I4<#Kd*n~jc55K5&GZjudlD??WQ@ZYv*YhKSh2lpQ|4Tx1JM7B=CB@
z4400uXLk~bMahlivNUt|495!e?i3aAYI&R;EmIsibDAwfdEEH4oTXqsQ@U4w-+!~8
znQMRlbt1!XVrGHZhbhh`ukh|y86G({&W=-abiKDs|D_B*pN~5_6>%v1jx{6P{`~Iz
vZtMN}x41sRzuwt;+6=B2GyT0|MeI3OgR|PnkFz=d=-c4)va_ddy&Cc-Kv^IM
literal 0
HcmV?d00001
diff --git a/assets/voxygen/voxel/figure/beard/danari/danari-7.vox b/assets/voxygen/voxel/figure/beard/danari/danari-7.vox
new file mode 100644
index 0000000000000000000000000000000000000000..9dd393c03e401bab4f28dd652315864e481d3b35
GIT binary patch
literal 1512
zcmbu;e@L8l90%~vbI(tA6)sPm=Q=NcG*4sxOfzjeQ@5Q?%~`fxPFif_C1c|#*$y$b
ztC0;ivqLv<nblztv+X#g=np%VjKLb?k_bx1i0I$`i0Hp}???YDB&aXE_<X;g@ALin
zJWpTuLGP4^bT$XN7-Ur!=?w(i9<UoMTZk#ipo52kfsYkdSO!Vc#G#WzRU9g5q?17=
zsTy;dqUdC>ZWom_(#ar;6gx>OX{3`uCRt<;P&J35kxmAg%qbjb5m#EDKxNcOCxc9~
zNU=A^$yL%wCxc9~Ha5=r*~bIuWUy|MBAUY@MX?v-%w&*B7KwugTR)AxD*MPJi!$s!
zZra|sN(Px^*=-)gAl|GagG6B@-X_QC+%Hd{>Wapwlfk-W=QQRt=Ez`O#Nc>?;~7cB
zWZPu47%j(vz0Wj@w*I;#olYZ>NZ|gYVBeJ$6uJJy?=BZosZQACYG4sv9hEq8xDg}6
z9atO-U~%#Y7N<|5e(?k{{W-|)al<=W4&Q78q)mqmZGp@^3|YxRW~U(cxM2H);PGn$
zYe?{5RFK7X&S!$!PAA%rXCine3-2sFg4Pj1PfYOgg5dOBj^*5*P$7y(%21c|BR}jy
z;kX-R@d8xc+=1MFLGc;RJtb&b7RYm4KVm^*4?z+xjP2Np`O0jpKAjJ=KZ=+Lmgsx>
zg<_`!3-1Y1^MYH~+4c+O+5}%55Ujl-2(o>uPcU(m`C&nePcZPLV7OIqiTR#dH$rWN
zi1d_V>R2^Kp0CH$U<<yPejWIB4&_BTXsRwi$L>-b>#N65yC8a4F#DQd`J$lC<3^yY
z82xoS5pHcjUs(=9wfPv|TY}_31=^ab(7mSt!DpK>^imfhCxV!GYY55tb4cH~g5*p;
zQlGpEr_+gTSzF=tdQs&oMBUEE@Km)A6K`(E!Uu);;Z_;e?v!JOYbN7@+g}NO{!S1H
zmEuyg1}j%v@Y|2Q2%pcy_@^#hznh0O6#VD&r`~=6zs5uV`}{REHF&pv78O-<XdF9>
zyl5V7ekfRdQGj?HKA#VRMZ?&?F9C^0kR8s(()7kV9Ch>C@p$k?NesIhCvo)rIcyuq
z#huSfuoTS0B=73)_isOE&vmHxHo}9z>FIeyKT6_4;s!2%oyHR<$FS?{EIQs_M(?#W
z{C+>~b1PyI{(zbm-1~B4fA{!({aZi(!u9`bvuJm2)@SFtM?Khou@cS-Cw`jA`p2`i
Nejj#sRd2S2`~}iCBqRU;
literal 0
HcmV?d00001
diff --git a/assets/voxygen/voxel/figure/beard/danari/danari-8.vox b/assets/voxygen/voxel/figure/beard/danari/danari-8.vox
new file mode 100644
index 0000000000000000000000000000000000000000..69bfaf21021099b70def9b1af55fad1a1f88e880
GIT binary patch
literal 1744
zcmbu;e@I<r7zgm@ob#Sv-U^pjox0Tg(YzY-XPRl-HMQ;P{58wAo0AqBX)-pXWD_yA
zTO(UGGtmVub0HQn+b&lr3QU%a!5ZT>A}ARnqJR4%qW`{qkNdBXpw8iQp7Xr#d!F}w
z&po%RZGZNZh_uv&S{dXkOQbUtZoJP+cq9;;#LM>|2#4O*dBfwPchN<6Nh#4yQYIsb
zu5FwSuP%wfNJ?q#CMlDVMAzFja>yky7)dFe^>o%_B+(64F?5Gq5`&QpWw55fv4(DW
z_a^U&E8%#>@rvUW$Fmq2q{t+TY;uW3*sV0hXp+Tyn^81VcZs`VJuZYe11p*vr^TyH
z4!I--$B|A3DKg0-n;de<+nB+ZpvWYPY_^GJ=^8oYlIYAyC+?8*dNW!Zr_HNFE@_6v
z*TXTS$Rvwwa=bppK2pl!d=}?pA8BIi4vA)SUR&46Ad75r$R%N>ai=;N#HTk-hga9@
zGuTH4S!9#r<%&6pIJ!%sF_LiQ8hNKnhQVKoOtQ#O%*iB+L|i`4FHK`4ewEA<7=4UB
zec$e<>O^@Tq)0p-M>HD6-3h^-3v0;r|B2uIeypyxz&kF5meAT<f<p&uFg)0drO^<U
zCJtd~`Z%hVjv+Cag5-{LWRDafFk202G$H*7khupTYbi)<5u_d!Y#SFmdRgG~3+|5y
zl9;D_DyV4jq3LKM!l#n(*78GW7#4I)3SL|koV>+nSv#{Y2YJJVsEh@XG2lneSUL*l
zvru|%J5sv^d8b%=N>IBZkY_mmkOP@~021|Mbo&-8lqBQ!lNmtM!<ZDoGJQ|K(Buih
z;(LPC1;O<z%!7itM#1O%1nVye!pu)}3C0hzeNa#z5cE7Q7;F%nXM0CQI{F%OFw{|i
zsUu|=ezpozz4iEJ`c>fDITYolptdXv&ASS4q^k=3O@hcl!R#x7m2-m1%yfhb^Uz(n
z0|O1!=qgM>UquGScIPA3Q;f#iQnWo?jc|J%`d?_p(6KPa-{?nd;SAzeFCaG4jn$7|
zhR^52)}$@S&dx?@AP1E@9>Ei30gS)C4T~S<;D_slSif0>8O|A-7u@(#@bh<qp}qo~
zkCbEWQayhAu@eJl6EXIQA6IUrVI5ijdH<_#K8IiD`~LU-%gf90Zq+P`OXpBCdKzhw
zG+etVxc$5U^YaJ<0_e>h#NItoNMs1f1IbvPzV{oBr1RU!%*1Q?lh|1^fx~CdU~5k*
zZhn@J<!~A%_^$r`{=IQttplAmFwhH}oL)fWqZr<aUd8)g$MM+lQS3ZDi{=kj(0MtI
zU@(ZgT#7h^KVZZKcfPo{zB~NB{;i*X!HxgfX3^{1tj}w28_C4pb0zQ<`|#6D(m%#l
N1OwRBTDI97@)ryRD?k7M
literal 0
HcmV?d00001
diff --git a/assets/voxygen/voxel/figure/beard/danari/danari-9.vox b/assets/voxygen/voxel/figure/beard/danari/danari-9.vox
new file mode 100644
index 0000000000000000000000000000000000000000..0b9855ae6dd6e82fb7adadc2a348c6c97b587635
GIT binary patch
literal 1808
zcmbu8e@s<n7{{OUp7%Y!E*i!!0Yd^!FE*7QK?LbFA-y0VQlvL^*>pk7>6kHPjHZ-}
zoJz#NHjJn-YE9F-3#;{qF=NinoV&T!R?fNB`nNw?>yNf?->d)CSX-T)&z|Rfp6_{{
z=Y7vP?JYYCM@6J*Q?!{z{&YmzqOtn4)Ph$)7?Ov`&RwzS4Mm4noM>B=A+~KPZCjQh
z4t-_www0x64RPqZwAye@tkeU<CYnM+9QrQtQZZw<7-HF)I!&FXPE)6;)6{9|7&F>3
z#Ig-_hC0JJ40VP&qg=*3B5X`COBu@{9(_L*<1pHo?S^>tE!*MX4o7oX$6+0ZbsW}l
zlt)B6tV4}<I2tv?5Qn&od9*&UjMJhGbHt->D_3d4i4>LW;j#yP;u6s=>oQJkqKP36
zafwHKVi}j)V2*h7mGXGh9&39?3}H7`_qY#_J(wffW{x=YUE&eZ)DT5%qP1rk;?Q@A
zM|@%#=7~c*VkuuKViWF^y?l1_mDoOeGDmFU5SMtwC!(1rirB;<F7b#@lwsWXmP1_n
zVg<@4q5}2|*n?{#c3}C$)&XY@ct!zh1$;K(xdeQj0c!-7NJ#laELtLpmWZS=o<_UK
z@`=b|t{1BvTb|h@`u=Av$z&4ocpUeJ1zXS0qd4;q{Fa%Cxw$5!t_#r_G&iotzCAVQ
z>uJQyU=%aM`!F+h7*#WekRHiKR%;##`_~{mQ4Og#kgfnS`7mTY8|h7goP&a8LxRUI
z3A`@Bq5(k$*V&&6Dw;xQIGB#u@eI5@`v~g#1g#^2moEyA-Qu&XUC>#C6@4YBOhl01
zor$8;c_^7$j?!zZkh5E`;y7!M3Tm$i<T>{5^&lgQA@NKMu3CcW^;x+6bUx7VC`Lpu
zOTHsNlaZr>i|-2NrUln8a~%;()(bx0A-MC3Ajb94cEQko#(M;t!-Bm}3VP}U=NNCT
z$U|p+5qeu!WAs27`kt@CXvb!JJ@y*#%_P<oXQQ@kIT|;v#)0-KbTtSD_6R192(FwJ
zR2JkRTCxJWE7zjCt{Uwn+32ju$LTFAk=VNq^|hsFdA1s{?VHf`QZsrF#W3_{7ZTGa
zk-T~yiSgZ-`}kFaLLn^8Sc1aBLX?J!P`UOoJXIFP&>PEe@q;3Kf4u~EZmz*NdnTp?
zH@+17^sS(`b2ZKllw<zFX8ig?8@f-W<Mbz)xO^)Ycd-0F?|<&C7x2qe=l|Y+d3ibB
zshYsL(n-_|o<QzEF0Oqjxc#C4Q&R|s!{{jP!M3e&$UrZ$y0b7l_TU}%=kePqD8TD0
zN3fx082eA1#L~SvxcS*i%*Jvt%(MFY`KNTLTD#hApt}P&Ha3lcj}kZ&zl!(1O5%yb
zgV=Cl0*&uqLEEJyB9RF0aTM_geuteD-2LLge0TYM{ac=Y;r;(?A)87rluN~1`U|k_
Z?0SUOh4ABe#y_+bkuWwkmo3yo{sJ3BF5LhC
literal 0
HcmV?d00001
diff --git a/assets/voxygen/voxel/figure/beard/dwarf/danari-11.vox b/assets/voxygen/voxel/figure/beard/dwarf/danari-11.vox
new file mode 100644
index 0000000000000000000000000000000000000000..ca01594c1cf0bba8931a824eb955f81cc5396a13
GIT binary patch
literal 1632
zcmbu;Z%AEb90%~<dCuSKt#EnO`6sojHm}C~n`YW}O>MjWcb088CoMM8WNb*uCSq*2
zBpYsKq6=JRAr>*)E>|gfVX|Zl))==DLCF{qz3oLr@4kJHdsj$M=kPhtd7j_%{C>|p
z_nhwbgE=!I(pnd4V<Rn=NLMJ__<-Btkw7N7{ey?Xp-jaa9%H0*Q8tOvl!uhAb=YJW
znlee0>hO@#73VQ*C}kK*Gs)sT6L6gy&>3fI=$xZ-j?Otc=Wv`v8Jx#OZUWNDAd@Vz
z$xW=Yut6qSWOGb3lj}{TNGGn^IxSuu@{p!8PC6N6l0`N-qzuLkletaiHksRGZsyf2
zrIACTcu$IS;?9`a+B$7s9rBQ-Tbj~2hYT{wBAXmHW-vyEVX>CQT8xn<wsJ@`n>Be)
zeEOQEY}T|{)2(7}oer-aH>NX2I$30s<Ms{qNyJee5{)ehcj+Nbcepn`9dbxF*e8=L
z67g`IhwIo9-xBr{*m~J|)q#D_)QPe6nn*kzM>HD6y(z)|OB=}b{fXawKCG{|!aXjB
zR?ya5f+L4(Ff!DPmGKZ(rjB4`_9UuSP9QOug5=J0<ct;}FkcO6G$8{CkcEdK8!1R^
z6{H>)WKIemzanr31P?|8N$jV5Ca7rjqUm@d!e^53&gvs*7!h<%3tnCpoW9Mq%$?Qm
zN8U&wDq}%p4Eo@oNJrsfHcGGWLTZm7?+kO#2x`{^@*L|AJCNyzAW<L2ckRGZNiyy{
zodGmGifIw7()aWWO`j4hzb9B<65P1Teo(N`DEQ)lVDlA0nEg}Tg2|&C9}?6D1ieoR
zh8hGHIo?^3j{ZhJhC2%|bF2&_&sSlluO8pbz7Bl5fTG+K)RtwVd2a!Zbys1aNf0?K
zn14;Mc0o{?m5xwh9(pQwW3Ztb-GwRWugJi}zI?=bi_utHiuPx#5$>qNz)NiyJ`u*`
zTLXwKjUj&R5@K^bSpVczc)eciOxl5*oE($}{HWah7@jH%VDimOEPv?74>t<2d8-I>
ztQlJr-26)L^LK*b{sLT#lw;#^J%0PK3xnqpG4ZJnS8u0b6WRay_piVG0)AcW|KGpA
zyu2LmR?VZhbOANvXOR|3!}X5@cU}}=aS?$)0DZYbXxSfyM23+(n2gog`~Tr+I^UhF
zEWD9FjXgC}IC^djJ9|@c>+^i9hSM;`XZ82z@6K~`9qPJ?!9L*h>=Gg$$8bJ+4ex&)
z#}g;VvFGeOnm<@W*OfSe!65E&E8-CTfF2jz{qp|)?(+Tmw>ZDTt?z8R)(vhKbI039
cv(R#(1m0pVews`A$J~lw0DIfYwyPn30dM3c@c;k-
literal 0
HcmV?d00001
diff --git a/assets/voxygen/voxel/humanoid_head_manifest.ron b/assets/voxygen/voxel/humanoid_head_manifest.ron
index 66fd22d638..05956dce02 100644
--- a/assets/voxygen/voxel/humanoid_head_manifest.ron
+++ b/assets/voxygen/voxel/humanoid_head_manifest.ron
@@ -3,26 +3,26 @@
offset: (-7.0, -4.0, -2.0),
head: ("figure.head.human.male", (0, 2, 0)),
eyes: [
- Some(("figure.eyes.general.male_default-0", (3, 9, 2))),
- Some(("figure.eyes.general.male_brow_col-0", (3, 9, 2))),
+ Some(("figure.eyes.general.male_default-0", (3, 9, 2))),
+ Some(("figure.eyes.general.male_brow_col-0", (3, 9, 2))),
Some(("figure.eyes.general.male_bushy-0", (3, 9, 2))),
Some(("figure.eyes.general.male_as_hair-0", (3, 9, 2))),
- Some(("figure.eyes.general.male_heterochromia-0", (3, 9, 2))),
- Some(("figure.eyes.general.male_scar-0", (3, 9, 2))),
- Some(("figure.eyes.general.male_blind-0", (3, 9, 2))),
- Some(("figure.eyes.general.male_old", (3, 9, 2))),
+ Some(("figure.eyes.general.male_heterochromia-0", (3, 9, 2))),
+ Some(("figure.eyes.general.male_scar-0", (3, 9, 2))),
+ Some(("figure.eyes.general.male_blind-0", (3, 9, 2))),
+ Some(("figure.eyes.general.male_old", (3, 9, 2))),
],
hair: [
Some(("figure.hair.human.male-0", (1, 1, 1))),
Some(("figure.hair.human.male-1", (1, 1, 1))),
Some(("figure.hair.human.male-2", (0, -1, 0))),
- Some(("figure.hair.human.male-3", (0, -1, 0))),
- Some(("figure.hair.human.male-4", (2, 2, 0))),
+ Some(("figure.hair.human.male-3", (0, -1, 0))),
+ Some(("figure.hair.human.male-4", (2, 2, 0))),
Some(("figure.hair.human.male-5", (1, 1, 0))),
Some(("figure.hair.human.male-6", (1, 1, 1))),
//Some(("figure.hair.human.male-7", (0, 0, 0))),
//Some(("figure.hair.human.male-8", (5, 0, 5))),
- //Some(("figure.hair.human.male-9", (5, 0, 5))),
+ //Some(("figure.hair.human.male-9", (5, 0, 5))),
Some(("figure.hair.human.male-10", (-3, -5, -4))),
//Some(("figure.hair.human.male-11", (0, 0, 0))),
Some(("figure.hair.human.male-12", (4, 2, 7))),
@@ -34,12 +34,13 @@
Some(("figure.hair.human.male-18", (1, 0, 0))),
Some(("figure.hair.human.male-19", (2, 1, 0))),
Some(("figure.hair.human.male-20", (-3, -4, -7))),
+ None,
],
- beard: [
+ beard: [
None,
Some(("figure.beard.human.human-0", (4, 6, -2))),
Some(("figure.beard.human.human-1", (5, 10, -2))),
- Some(("figure.beard.human.human-2", (3, 7, -3))),
+ Some(("figure.beard.human.human-2", (3, 7, -3))),
],
accessory: [
None]
@@ -48,15 +49,15 @@
offset: (-7.0, -4.0, -2.0),
head: ("figure.head.human.female", (0, 3, 0)),
eyes: [
- Some(("figure.eyes.general.female_default-0", (2, 10, 2))),
- Some(("figure.eyes.general.female_styled-0", (2, 10, 2))),
- Some(("figure.eyes.general.female_as_hair-0", (2, 10, 2))),
- Some(("figure.eyes.general.female_heterochromia-0", (2, 10, 2))),
- Some(("figure.eyes.general.female_scar-0", (2, 10, 2))),
- Some(("figure.eyes.general.female_blind-0", (2, 10, 2))),
+ Some(("figure.eyes.general.female_default-0", (2, 10, 2))),
+ Some(("figure.eyes.general.female_styled-0", (2, 10, 2))),
+ Some(("figure.eyes.general.female_as_hair-0", (2, 10, 2))),
+ Some(("figure.eyes.general.female_heterochromia-0", (2, 10, 2))),
+ Some(("figure.eyes.general.female_scar-0", (2, 10, 2))),
+ Some(("figure.eyes.general.female_blind-0", (2, 10, 2))),
],
hair: [
- Some(("figure.hair.human.female-0", (-1, -1, 0))),
+ Some(("figure.hair.human.female-0", (-1, -1, 0))),
Some(("figure.hair.human.female-1", (1, 2, -1))),
Some(("figure.hair.human.female-2", (1, 2, 0))),
Some(("figure.hair.human.female-3", (1, 1, -7))),
@@ -85,8 +86,8 @@
offset: (-8.0, -5.0, -2.0),
head: ("figure.head.orc.male", (0, 3, 0)),
eyes: [
- Some(("figure.eyes.orc.male-0", (5, 10, 6))),
- Some(("figure.eyes.orc.male-1", (5, 10, 5))),
+ Some(("figure.eyes.orc.male-0", (5, 10, 6))),
+ Some(("figure.eyes.orc.male-1", (5, 10, 5))),
],
hair: [
Some(("figure.hair.dwarf.bald", (0, 3, -1))),
@@ -104,38 +105,38 @@
Some(("figure.beard.orc.2", (3, 8, -2))),
],
accessory: [
- Some(("figure.accessory.orc.teeth-0", (5, 11, 3))),
- Some(("figure.accessory.orc.earring-male-0", (2, 7, 3))),
+ Some(("figure.accessory.orc.teeth-0", (5, 11, 3))),
+ Some(("figure.accessory.orc.earring-male-0", (2, 7, 3))),
Some(("figure.accessory.orc.teeth-1", (5, 11, 3))),
- Some(("figure.accessory.orc.teeth-2", (5, 11, 3))),
+ Some(("figure.accessory.orc.teeth-2", (5, 11, 3))),
Some(("figure.accessory.orc.warpaint-male-0", (0, 4, 3))),
Some(("figure.accessory.orc.male_eyepatch", (0, 3, 0))),
],
- ),
+ ),
(Orc, Female): (
offset: (-8.0, -2.5, -2.0),
head: ("figure.head.orc.female", (0, 1, 0)),
eyes: [
- Some(("figure.eyes.general.female_default-0", (3, 8, 2))),
- Some(("figure.eyes.general.female_styled-0", (3, 8, 2))),
+ Some(("figure.eyes.general.female_default-0", (3, 8, 2))),
+ Some(("figure.eyes.general.female_styled-0", (3, 8, 2))),
Some(("figure.eyes.general.female_as_hair-0", (3, 8, 2))),
- Some(("figure.eyes.general.female_heterochromia-0", (3, 8, 2))),
- Some(("figure.eyes.general.female_scar-0", (3, 8, 2))),
- Some(("figure.eyes.general.female_blind-0", (3, 8, 2))),
+ Some(("figure.eyes.general.female_heterochromia-0", (3, 8, 2))),
+ Some(("figure.eyes.general.female_scar-0", (3, 8, 2))),
+ Some(("figure.eyes.general.female_blind-0", (3, 8, 2))),
],
hair: [
Some(("figure.hair.orc.female-0", (-2, -8, 0))),
Some(("figure.hair.orc.female-1", (-2, -8, 0))),
- Some(("figure.hair.orc.female-2", (-2, -8, 0))),
- Some(("figure.hair.orc.female-3", (-2, -8, -4))),
- Some(("figure.hair.orc.female-4", (-2, -8, 0))),
- Some(("figure.hair.orc.female-5", (-2, -8, -4))),
- Some(("figure.hair.orc.female-6", (-2, -8, -4))),
+ Some(("figure.hair.orc.female-2", (-2, -8, 0))),
+ Some(("figure.hair.orc.female-3", (-2, -8, -4))),
+ Some(("figure.hair.orc.female-4", (-2, -8, 0))),
+ Some(("figure.hair.orc.female-5", (-2, -8, -4))),
+ Some(("figure.hair.orc.female-6", (-2, -8, -4))),
],
beard: [None],
accessory: [
None,
- Some(("figure.accessory.orc.earring-female-0", (2, 4, 1))),
+ Some(("figure.accessory.orc.earring-female-0", (2, 4, 1))),
Some(("figure.accessory.orc.warpaint-female-0", (-2, -4, -7))),
Some(("figure.accessory.orc.warpaint-female-1", (-2, -4, -7))),
],
@@ -144,13 +145,13 @@
offset: (-8.0, -4.0, -2.0),
head: ("figure.head.elf.male", (0, 2, 0)),
eyes: [
- Some(("figure.eyes.general.male_default-0", (4, 9, 2))),
- Some(("figure.eyes.general.male_brow_col-0", (4, 9, 2))),
+ Some(("figure.eyes.general.male_default-0", (4, 9, 2))),
+ Some(("figure.eyes.general.male_brow_col-0", (4, 9, 2))),
Some(("figure.eyes.general.male_bushy-0", (4, 9, 2))),
Some(("figure.eyes.general.male_as_hair-0", (4, 9, 2))),
- Some(("figure.eyes.general.male_heterochromia-0", (4, 9, 2))),
- Some(("figure.eyes.general.male_scar-0", (4, 9, 2))),
- Some(("figure.eyes.general.male_blind-0", (4, 9, 2))),
+ Some(("figure.eyes.general.male_heterochromia-0", (4, 9, 2))),
+ Some(("figure.eyes.general.male_scar-0", (4, 9, 2))),
+ Some(("figure.eyes.general.male_blind-0", (4, 9, 2))),
],
hair: [
Some(("figure.hair.elf.male-0", (2, 1, 1))),
@@ -162,20 +163,20 @@
accessory: [
None,
]
- ),
+ ),
(Elf, Female): (
offset: (-8.0, -4.0, -2.0),
head: ("figure.head.elf.female", (0, 2, 0)),
eyes: [
- Some(("figure.eyes.general.female_styled-0", (3, 9, 2))),
+ Some(("figure.eyes.general.female_styled-0", (3, 9, 2))),
Some(("figure.eyes.general.female_default-0", (3, 9, 2))),
- Some(("figure.eyes.general.female_as_hair-0", (3, 9, 2))),
- Some(("figure.eyes.general.female_heterochromia-0", (3, 9, 2))),
- Some(("figure.eyes.general.female_scar-0", (3, 9, 2))),
- Some(("figure.eyes.general.female_blind-0", (3, 9, 2))),
+ Some(("figure.eyes.general.female_as_hair-0", (3, 9, 2))),
+ Some(("figure.eyes.general.female_heterochromia-0", (3, 9, 2))),
+ Some(("figure.eyes.general.female_scar-0", (3, 9, 2))),
+ Some(("figure.eyes.general.female_blind-0", (3, 9, 2))),
],
- hair: [
- Some(("figure.hair.elf.female-0", (0, -2, 0))),
+ hair: [
+ Some(("figure.hair.elf.female-0", (0, -2, 0))),
Some(("figure.hair.elf.female-1", (2, 1, -1))),
Some(("figure.hair.elf.female-2", (2, 1, 0))),
Some(("figure.hair.elf.female-3", (2, 0, -7))),
@@ -186,7 +187,7 @@
Some(("figure.hair.elf.female-8", (1, -1, 0))),
Some(("figure.hair.elf.female-9", (1, 1, -1))),
Some(("figure.hair.elf.female-10", (0, -2, 0))),
- Some(("figure.hair.elf.female-11", (2, 1, 0))),
+ Some(("figure.hair.elf.female-11", (2, 1, 0))),
Some(("figure.hair.elf.female-12", (2, -2, 0))),
Some(("figure.hair.elf.female-13", (2, -3, -1))),
Some(("figure.hair.elf.female-14", (2, 1, 0))),
@@ -208,29 +209,29 @@
head: ("figure.head.dwarf.male", (0, 3, 0)),
eyes: [
Some(("figure.eyes.general.male_bushy-0", (2, 10, 2))),
- Some(("figure.eyes.general.male_default-0", (2, 10, 2))),
- Some(("figure.eyes.general.male_brow_col-0", (2, 10, 2))),
- Some(("figure.eyes.general.male_as_hair-0", (2, 10, 2))),
- Some(("figure.eyes.general.male_heterochromia-0", (2, 10, 2))),
- Some(("figure.eyes.general.male_scar-0", (2, 10, 2))),
- Some(("figure.eyes.general.male_blind-0", (2, 10, 2))),
- Some(("figure.eyes.general.male_old", (1, 10, 1))),
+ Some(("figure.eyes.general.male_default-0", (2, 10, 2))),
+ Some(("figure.eyes.general.male_brow_col-0", (2, 10, 2))),
+ Some(("figure.eyes.general.male_as_hair-0", (2, 10, 2))),
+ Some(("figure.eyes.general.male_heterochromia-0", (2, 10, 2))),
+ Some(("figure.eyes.general.male_scar-0", (2, 10, 2))),
+ Some(("figure.eyes.general.male_blind-0", (2, 10, 2))),
+ Some(("figure.eyes.general.male_old", (1, 10, 1))),
],
hair: [
- Some(("figure.hair.dwarf.bald", (0, 3, 1))),
+ Some(("figure.hair.dwarf.bald", (0, 3, 1))),
Some(("figure.hair.dwarf.male-0", (1, 1, -3))),
Some(("figure.hair.dwarf.male-1", (4, 0, 1))),
//Some(("figure.hair.dwarf.male-2", (0, 2, -2))),
Some(("figure.hair.dwarf.male-3", (1, 1, -3))),
],
- beard: [
+ beard: [
Some(("figure.beard.dwarf.dwarf-0", (4, 9, -2))),
- Some(("figure.beard.dwarf.dwarf-1", (1, 7, -8))),
- //Some(("figure.beard.dwarf.dwarf-2", (4, 10, -1))),
- Some(("figure.beard.dwarf.dwarf-3", (0, 8, -1))),
- Some(("figure.beard.dwarf.dwarf-4", (4, 9, -4))),
- Some(("figure.beard.dwarf.dwarf-5", (0, 7, -5))),
- Some(("figure.beard.dwarf.dwarf-6", (0, 6, -5))),
+ Some(("figure.beard.dwarf.dwarf-1", (1, 7, -8))),
+ //Some(("figure.beard.dwarf.dwarf-2", (4, 10, -1))),
+ Some(("figure.beard.dwarf.dwarf-3", (0, 8, -1))),
+ Some(("figure.beard.dwarf.dwarf-4", (4, 9, -4))),
+ Some(("figure.beard.dwarf.dwarf-5", (0, 7, -5))),
+ Some(("figure.beard.dwarf.dwarf-6", (0, 6, -5))),
Some(("figure.beard.dwarf.dwarf-7", (1, 10, -1))),
Some(("figure.beard.dwarf.dwarf-8", (1, 7, -1))),
Some(("figure.beard.dwarf.dwarf-9", (1, 7, -1))),
@@ -247,55 +248,55 @@
Some(("figure.beard.dwarf.dwarf-20", (1, 7,-4))),
],
accessory: [
- None,
+ None,
Some(("figure.accessory.dwarf.earring-0", (0, 3, 0))),
Some(("figure.accessory.dwarf.earring-1", (0, 3, 0))),
Some(("figure.accessory.dwarf.earrings-0", (0, 3, 0))),
Some(("figure.accessory.dwarf.earrings-1", (0, 3, 0))),
Some(("figure.accessory.dwarf.earrings-2", (0, 3, 0))),
- Some(("figure.accessory.dwarf.earrings-3", (0, 3, 0))),
+ Some(("figure.accessory.dwarf.earrings-3", (0, 3, 0))),
]
- ),
+ ),
(Dwarf, Female): (
offset: (-6.0, -4.5, -2.0),
head: ("figure.head.dwarf.female", (0, 3, 0)),
eyes: [
- Some(("figure.eyes.general.female_default-0", (1, 10, 2))),
+ Some(("figure.eyes.general.female_default-0", (1, 10, 2))),
Some(("figure.eyes.general.female_styled-0", (1, 10, 2))),
- Some(("figure.eyes.general.female_as_hair-0", (1, 10, 2))),
- Some(("figure.eyes.general.female_heterochromia-0", (1, 10, 2))),
- Some(("figure.eyes.general.female_scar-0", (1, 10, 2))),
- Some(("figure.eyes.general.female_blind-0", (1, 10, 2))),
+ Some(("figure.eyes.general.female_as_hair-0", (1, 10, 2))),
+ Some(("figure.eyes.general.female_heterochromia-0", (1, 10, 2))),
+ Some(("figure.eyes.general.female_scar-0", (1, 10, 2))),
+ Some(("figure.eyes.general.female_blind-0", (1, 10, 2))),
],
hair: [
- Some(("figure.hair.dwarf.female-0", (-9, -9, -7))),
- Some(("figure.hair.dwarf.female-1", (-9, -9, -7))),
+ Some(("figure.hair.dwarf.female-0", (-9, -9, -7))),
+ Some(("figure.hair.dwarf.female-1", (-9, -9, -7))),
Some(("figure.hair.dwarf.female-2", (-9, -9, -7))),
Some(("figure.hair.dwarf.female-3", (-9, -9, -7))),
Some(("figure.hair.dwarf.female-4", (-3, -2, -5))),
Some(("figure.hair.dwarf.female-5", (-3, -2, -5))),
Some(("figure.hair.dwarf.female-6", (-3, -2, -5))),
- Some(("figure.hair.dwarf.female-7", (-9, -9, -7))),
+ Some(("figure.hair.dwarf.female-7", (-9, -9, -7))),
],
beard: [None],
accessory: [
- None,
+ None,
Some(("figure.accessory.dwarf.earring-0", (0, 3, 0))),
Some(("figure.accessory.dwarf.earring-1", (0, 3, 0))),
Some(("figure.accessory.dwarf.earrings-0", (0, 3, 0))),
Some(("figure.accessory.dwarf.earrings-1", (0, 3, 0))),
Some(("figure.accessory.dwarf.earrings-2", (0, 3, 0))),
- Some(("figure.accessory.dwarf.earrings-3", (0, 3, 0))),
+ Some(("figure.accessory.dwarf.earrings-3", (0, 3, 0))),
]
),
(Undead, Male): (
offset: (-5.0, -4.0, -2.0),
head: ("figure.head.undead.male", (0, 2, 0)),
eyes: [
- Some(("figure.eyes.undead.male-0", (2, 8, 4))),
- Some(("figure.eyes.undead.male-1", (1, 7, 4))),
- Some(("figure.eyes.undead.male-2", (1, 8, 4))),
- Some(("figure.eyes.undead.male-3", (1, 8, 4))),
+ Some(("figure.eyes.undead.male-0", (2, 8, 4))),
+ Some(("figure.eyes.undead.male-1", (1, 7, 4))),
+ Some(("figure.eyes.undead.male-2", (1, 8, 4))),
+ Some(("figure.eyes.undead.male-3", (1, 8, 4))),
],
hair: [
Some(("figure.hair.dwarf.bald", (-1, 1, 1))),
@@ -308,14 +309,14 @@
accessory: [
None,
Some(("figure.accessory.undead.male_eyepatch", (0, 1, 0))),]
- ),
+ ),
(Undead, Female): (
offset: (-5.0, -4.0, -2.0),
head: ("figure.head.undead.female", (0, 2, 0)),
eyes: [
Some(("figure.eyes.undead.female-0", (2, 8, 3))),
- Some(("figure.eyes.undead.female-1", (0, 8, 3))),
- Some(("figure.eyes.undead.female-2", (0, 8, 3))),
+ Some(("figure.eyes.undead.female-1", (0, 8, 3))),
+ Some(("figure.eyes.undead.female-2", (0, 8, 3))),
],
hair: [
Some(("figure.hair.undead.female-0", (0, 1, 0))),
@@ -334,38 +335,60 @@
offset: (-9.0, -4.0, -2.0),
head: ("figure.head.danari.male", (0, 2, 2)),
eyes: [
- Some(("figure.eyes.general.male_bushy-0", (5, 9, 4))),
+ Some(("figure.eyes.general.male_bushy-0", (5, 9, 4))),
Some(("figure.eyes.general.male_default-0", (5, 9, 4))),
- Some(("figure.eyes.general.male_brow_col-0", (5, 9, 4))),
- Some(("figure.eyes.general.male_as_hair-0", (5, 9, 4))),
- Some(("figure.eyes.general.male_heterochromia-0", (5, 9, 4))),
+ Some(("figure.eyes.general.male_brow_col-0", (5, 9, 4))),
+ Some(("figure.eyes.general.male_as_hair-0", (5, 9, 4))),
+ Some(("figure.eyes.general.male_heterochromia-0", (5, 9, 4))),
Some(("figure.eyes.general.male_scar-0", (5, 9, 4))),
- Some(("figure.eyes.general.male_blind-0", (5, 9, 4))),
- Some(("figure.eyes.general.male_old", (4, 9, 3))),
+ Some(("figure.eyes.general.male_blind-0", (5, 9, 4))),
+ Some(("figure.eyes.general.male_old", (4, 9, 3))),
],
hair: [
Some(("figure.hair.danari.male-0", (3, 1, 2))),
Some(("figure.hair.danari.male-1", (3, 1, 2))),
Some(("figure.hair.danari.male-2", (3, -2, 3))),
- Some(("figure.hair.danari.male-3", (-1, -2, 3))), // <- Modify
- ],
+ Some(("figure.hair.danari.male-3", (-1, -2, 3))),
+ None,
+ ],
beard: [
None,
Some(("figure.beard.danari.danari-0", (4, 6, -1))),
+ Some(("figure.beard.danari.danari-1", (4, 6, -5))),
+ Some(("figure.beard.danari.danari-2", (7, 8, -1))),
+ Some(("figure.beard.danari.danari-3", (3, 6, -2))),
+ Some(("figure.beard.danari.danari-4", (3, 5, -2))),
+ Some(("figure.beard.danari.danari-5", (4, 6, 2))),
+ Some(("figure.beard.danari.danari-6", (4, 6, 1))),
+ Some(("figure.beard.danari.danari-7", (4, 6, -2))),
+ Some(("figure.beard.danari.danari-8", (4, 6, -5))),
+ Some(("figure.beard.danari.danari-9", (4, 5, -7))),
+ Some(("figure.beard.danari.danari-10", (4, 6, -2))),
+ Some(("figure.beard.danari.danari-11", (4, 6, -5))),
+ Some(("figure.beard.danari.danari-12", (6, 6, 0))),
+ Some(("figure.beard.danari.danari-13", (7, 10, 0))),
+ Some(("figure.beard.danari.danari-14", (5, 7, -1))),
],
- accessory: [
- Some(("figure.accessory.danari.horns-0", (4, 8, 8))),]
- ),
+ accessory: [
+ Some(("figure.accessory.danari.horns-0", (4, 8, 8))),
+ Some(("figure.accessory.danari.horns-1", (2, 3, 8))),
+ Some(("figure.accessory.danari.horns-2", (2, 1, 6))),
+ Some(("figure.accessory.danari.horns-3", (4, 8, 8))),
+ Some(("figure.accessory.danari.horns-4", (2, 4, 6))),
+ Some(("figure.accessory.danari.horns-5", (2, 3, 8))),
+ Some(("figure.accessory.danari.horns-6", (2, 3, 8))),
+ ]
+ ),
(Danari, Female): (
offset: (-9.0, -4.0, -2.0),
head: ("figure.head.danari.female", (0, 2, 2)),
eyes: [
Some(("figure.eyes.general.female_default-0", (4, 9, 4))),
- Some(("figure.eyes.general.female_styled-0", (4, 9, 4))),
- Some(("figure.eyes.general.female_as_hair-0", (4, 9, 4))),
- Some(("figure.eyes.general.female_heterochromia-0", (4, 9, 4))),
- Some(("figure.eyes.general.female_scar-0", (4, 9, 4))),
- Some(("figure.eyes.general.female_blind-0", (4, 9, 4))),
+ Some(("figure.eyes.general.female_styled-0", (4, 9, 4))),
+ Some(("figure.eyes.general.female_as_hair-0", (4, 9, 4))),
+ Some(("figure.eyes.general.female_heterochromia-0", (4, 9, 4))),
+ Some(("figure.eyes.general.female_scar-0", (4, 9, 4))),
+ Some(("figure.eyes.general.female_blind-0", (4, 9, 4))),
],
hair: [
Some(("figure.hair.danari.female-0", (3, -4, 1))),
@@ -374,8 +397,15 @@
Some(("figure.hair.danari.female-3", (1, -3, 0))),
],
beard: [None],
- accessory: [
- Some(("figure.accessory.danari.horns-0", (4, 9, 8))),]
+ accessory: [
+ Some(("figure.accessory.danari.horns-0", (4, 8, 8))),
+ Some(("figure.accessory.danari.horns-1", (2, 3, 8))),
+ Some(("figure.accessory.danari.horns-2", (2, 1, 6))),
+ Some(("figure.accessory.danari.horns-3", (4, 8, 8))),
+ Some(("figure.accessory.danari.horns-4", (2, 4, 6))),
+ Some(("figure.accessory.danari.horns-5", (2, 3, 8))),
+ Some(("figure.accessory.danari.horns-6", (2, 3, 8))),
+ ]
),
// More here
})
diff --git a/common/src/comp/body/humanoid.rs b/common/src/comp/body/humanoid.rs
index dc63f8fd9c..7858d0d192 100644
--- a/common/src/comp/body/humanoid.rs
+++ b/common/src/comp/body/humanoid.rs
@@ -289,13 +289,13 @@ impl Species {
pub fn num_hair_styles(self, body_type: BodyType) -> u8 {
match (self, body_type) {
(Species::Danari, BodyType::Female) => 4,
- (Species::Danari, BodyType::Male) => 4,
+ (Species::Danari, BodyType::Male) => 5,
(Species::Dwarf, BodyType::Female) => 8,
(Species::Dwarf, BodyType::Male) => 4,
(Species::Elf, BodyType::Female) => 21,
(Species::Elf, BodyType::Male) => 4,
(Species::Human, BodyType::Female) => 19,
- (Species::Human, BodyType::Male) => 17,
+ (Species::Human, BodyType::Male) => 18,
(Species::Orc, BodyType::Female) => 7,
(Species::Orc, BodyType::Male) => 8,
(Species::Undead, BodyType::Female) => 6,
@@ -305,8 +305,8 @@ impl Species {
pub fn num_accessories(self, body_type: BodyType) -> u8 {
match (self, body_type) {
- (Species::Danari, BodyType::Female) => 1,
- (Species::Danari, BodyType::Male) => 1,
+ (Species::Danari, BodyType::Female) => 7,
+ (Species::Danari, BodyType::Male) => 7,
(Species::Dwarf, BodyType::Female) => 7,
(Species::Dwarf, BodyType::Male) => 7,
(Species::Elf, BodyType::Female) => 2,
@@ -342,7 +342,7 @@ impl Species {
pub fn num_beards(self, body_type: BodyType) -> u8 {
match (self, body_type) {
(Species::Danari, BodyType::Female) => 1,
- (Species::Danari, BodyType::Male) => 2,
+ (Species::Danari, BodyType::Male) => 16,
(Species::Dwarf, BodyType::Female) => 1,
(Species::Dwarf, BodyType::Male) => 20,
(Species::Elf, BodyType::Female) => 1,
diff --git a/voxygen/src/hud/bag.rs b/voxygen/src/hud/bag.rs
index ee8e47d735..354de471dd 100644
--- a/voxygen/src/hud/bag.rs
+++ b/voxygen/src/hud/bag.rs
@@ -47,15 +47,12 @@ widget_ids! {
inv_scrollbar,
inv_slots_0,
inv_slots[],
- //tooltip[],
bg,
bg_frame,
char_ico,
coin_ico,
- //cheese_ico,
space_txt,
coin_txt,
- //cheese_txt,
inventory_title,
inventory_title_bg,
scrollbar_bg,
diff --git a/voxygen/src/hud/img_ids.rs b/voxygen/src/hud/img_ids.rs
index 4c0ee48503..7fb4b93e26 100644
--- a/voxygen/src/hud/img_ids.rs
+++ b/voxygen/src/hud/img_ids.rs
@@ -356,6 +356,7 @@ image_ids! {
indicator_group_down: "voxygen.element.ui.map.buttons.group_indicator_arrow_down",
location_marker: "voxygen.element.ui.map.buttons.location_marker",
map_mode_overlay: "voxygen.element.ui.map.buttons.map_modes",
+ minimap_mode_overlay: "voxygen.element.ui.map.buttons.minimap_modes",
// MiniMap
mmap_frame: "voxygen.element.ui.minimap.mmap",
diff --git a/voxygen/src/hud/map.rs b/voxygen/src/hud/map.rs
index 5e5634d82d..792fdc3662 100644
--- a/voxygen/src/hud/map.rs
+++ b/voxygen/src/hud/map.rs
@@ -80,6 +80,9 @@ widget_ids! {
waypoint_txt,
map_mode_btn,
map_mode_overlay,
+ minimap_mode_btn,
+ minimap_mode_overlay,
+
}
}
@@ -1193,7 +1196,7 @@ impl<'a> Widget for Map<'a> {
.bottom_right_with_margins_on(state.ids.map_layers[0], -36.0, 0.0)
.with_tooltip(
self.tooltip_manager,
- "Change Map Mode",
+ i18n.get("hud.map.change_map_mode"),
"",
&site_tooltip,
TEXT_COLOR,
@@ -1209,6 +1212,30 @@ impl<'a> Widget for Map<'a> {
.middle_of(state.ids.map_mode_btn)
.set(state.ids.map_mode_overlay, ui);
+ // Render voxel view on minimap
+ if Button::image(self.imgs.button)
+ .w_h(92.0, icon_size.y)
+ .hover_image(self.imgs.button_hover)
+ .press_image(self.imgs.button_press)
+ .left_from(state.ids.map_mode_btn, 5.0)
+ .with_tooltip(
+ self.tooltip_manager,
+ i18n.get("hud.map.toggle_minimap_voxel"),
+ i18n.get("hud.map.zoom_minimap_explanation"),
+ &site_tooltip,
+ TEXT_COLOR,
+ )
+ .set(state.ids.minimap_mode_btn, ui)
+ .was_clicked()
+ {
+ events.push(Event::SettingsChange(MapShowVoxelMap(!show_voxel_map)));
+ };
+ Button::image(self.imgs.minimap_mode_overlay)
+ .w_h(92.0, icon_size.y)
+ .graphics_for(state.ids.minimap_mode_btn)
+ .middle_of(state.ids.minimap_mode_btn)
+ .set(state.ids.minimap_mode_overlay, ui);
+
events
}
}
diff --git a/voxygen/src/menu/char_selection/ui/mod.rs b/voxygen/src/menu/char_selection/ui/mod.rs
index a874e8c91e..63aaa203d7 100644
--- a/voxygen/src/menu/char_selection/ui/mod.rs
+++ b/voxygen/src/menu/char_selection/ui/mod.rs
@@ -16,7 +16,7 @@ use crate::{
},
Element, IcedRenderer, IcedUi as Ui,
},
- img_ids::ImageGraphic,
+ img_ids::{BlankGraphic, ImageGraphic},
},
window, GlobalState,
};
@@ -116,6 +116,9 @@ image_ids_ice! {
// Tooltips
tt_edge: "voxygen.element.ui.generic.frames.tooltip.edge",
tt_corner: "voxygen.element.ui.generic.frames.tooltip.corner",
+
+ <BlankGraphic>
+ nothing: (),
}
}
@@ -437,9 +440,13 @@ impl Controls {
Space::new(Length::Units(16), Length::Units(16)),
)
.style(
- style::button::Style::new(imgs.delete_button)
- .hover_image(imgs.delete_button_hover)
- .press_image(imgs.delete_button_press),
+ style::button::Style::new(if Some(i) != selected {
+ imgs.nothing
+ } else {
+ imgs.delete_button
+ })
+ .hover_image(imgs.delete_button_hover)
+ .press_image(imgs.delete_button_press),
)
.on_press(Message::Delete(i))
.with_tooltip(
@@ -470,7 +477,7 @@ impl Controls {
style::button::Style::new(if Some(i) == selected {
imgs.selection_hover
} else {
- imgs.selection
+ imgs.nothing
})
.hover_image(imgs.selection_hover)
.press_image(imgs.selection_press),
@@ -481,7 +488,7 @@ impl Controls {
)
.ratio_of_image(imgs.selection),
)
- .padding(12)
+ .padding(2)
.align_x(Align::End)
.into()
},
diff --git a/voxygen/src/menu/main/ui/mod.rs b/voxygen/src/menu/main/ui/mod.rs
index cb333a9671..0730a41403 100644
--- a/voxygen/src/menu/main/ui/mod.rs
+++ b/voxygen/src/menu/main/ui/mod.rs
@@ -11,7 +11,7 @@ use crate::{
self,
fonts::IcedFonts as Fonts,
ice::{load_font, style, widget, Element, IcedUi as Ui},
- img_ids::{ImageGraphic, VoxelGraphic},
+ img_ids::ImageGraphic,
Graphic,
},
window, GlobalState,
@@ -34,10 +34,8 @@ pub const FILL_FRAC_TWO: f32 = 0.53;
image_ids_ice! {
struct Imgs {
- <VoxelGraphic>
- v_logo: "voxygen.element.v_logo",
-
<ImageGraphic>
+ v_logo: "voxygen.element.v_logo",
bg: "voxygen.background.bg_main",
banner_top: "voxygen.element.ui.generic.frames.banner_top",
banner_gradient_bottom: "voxygen.element.ui.generic.frames.banner_gradient_bottom",