From fee25d7d8f4ae72bfafe78a972ee970f7f854b64 Mon Sep 17 00:00:00 2001 From: jshipsey Date: Thu, 23 Sep 2021 22:13:21 -0400 Subject: [PATCH] headbands --- .../common/items/armor/misc/head/headband.ron | 17 ++++ .../armor/misc/head/headband/danari_f.vox | Bin 0 -> 1192 bytes .../armor/misc/head/headband/danari_m.vox | Bin 0 -> 1200 bytes .../armor/misc/head/headband/dwarf_f.vox | Bin 0 -> 1208 bytes .../armor/misc/head/headband/dwarf_m.vox | Bin 0 -> 1192 bytes .../voxel/armor/misc/head/headband/elf_f.vox | Bin 0 -> 1216 bytes .../voxel/armor/misc/head/headband/elf_m.vox | Bin 0 -> 1216 bytes .../armor/misc/head/headband/human_f.vox | Bin 0 -> 1216 bytes .../armor/misc/head/headband/human_m.vox | Bin 0 -> 1216 bytes .../voxel/armor/misc/head/headband/orc_f.vox | Bin 0 -> 1208 bytes .../voxel/armor/misc/head/headband/orc_m.vox | Bin 0 -> 1208 bytes .../armor/misc/head/headband/undead_f.vox | Bin 0 -> 1204 bytes .../armor/misc/head/headband/undead_m.vox | Bin 0 -> 1200 bytes .../voxel/humanoid_armor_head_manifest.ron | 76 ++++++++++++++---- voxygen/src/scene/figure/load.rs | 9 ++- 15 files changed, 86 insertions(+), 16 deletions(-) create mode 100644 assets/common/items/armor/misc/head/headband.ron create mode 100644 assets/voxygen/voxel/armor/misc/head/headband/danari_f.vox create mode 100644 assets/voxygen/voxel/armor/misc/head/headband/danari_m.vox create mode 100644 assets/voxygen/voxel/armor/misc/head/headband/dwarf_f.vox create mode 100644 assets/voxygen/voxel/armor/misc/head/headband/dwarf_m.vox create mode 100644 assets/voxygen/voxel/armor/misc/head/headband/elf_f.vox create mode 100644 assets/voxygen/voxel/armor/misc/head/headband/elf_m.vox create mode 100644 assets/voxygen/voxel/armor/misc/head/headband/human_f.vox create mode 100644 assets/voxygen/voxel/armor/misc/head/headband/human_m.vox create mode 100644 assets/voxygen/voxel/armor/misc/head/headband/orc_f.vox create mode 100644 assets/voxygen/voxel/armor/misc/head/headband/orc_m.vox create mode 100644 assets/voxygen/voxel/armor/misc/head/headband/undead_f.vox create mode 100644 assets/voxygen/voxel/armor/misc/head/headband/undead_m.vox diff --git a/assets/common/items/armor/misc/head/headband.ron b/assets/common/items/armor/misc/head/headband.ron new file mode 100644 index 0000000000..6024571501 --- /dev/null +++ b/assets/common/items/armor/misc/head/headband.ron @@ -0,0 +1,17 @@ +ItemDef( + name: "Headband", + description: "yep.", + kind: Armor(( + kind: Head("Headband"), + stats: ( + protection: Normal(0.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, + ), + )), + quality: Common, + tags: [], +) diff --git a/assets/voxygen/voxel/armor/misc/head/headband/danari_f.vox b/assets/voxygen/voxel/armor/misc/head/headband/danari_f.vox new file mode 100644 index 0000000000000000000000000000000000000000..9586c7f63cc7bf293090405d88ef00788fd150bd GIT binary patch literal 1192 zcmaizZ%o@|5XW!h&pL312^3l;)XE$!W|Kb_5w;bfvNG7#p}2LEOv4;aL!6DNtZ7KL zx z=egf=PtX2Cws8^ZYVqzd;3%yQfhqGNm|xRdSjNP z*NddHa#brdHl1zg97&th-k`QgZLO2un5~=dWZQ9oC8t`TF@)Y=EzpJ`D( zBfsDMoL^tzFMN}?36e?X=escEs`rckMSYlNXR?Bto7*TkDpa1<+T%j=oFLEX{t*)re-N1|VtCtTCZ8zg-p(@Uc!VYq zyozrXKPlpa!qj`h{G@Q}n)+^G!XtcnP*^@8_|+fm5ytv-JuI|3gx;rwaGP*R*M0R? z0v?FCIhJmGNPd1k zrG=ZZ*=*D}?6|f+#?!S9Jk2%if3}gaH@7hLk)7{uIa$6_%?G+?DkOTwAoTOvRf0FHXO~*H>O+_Wk~U^iMhgD+_D(?<%+AbyjBj z54APo+1X5ITPwaj?V0}T>gqV(kYGp61Wm(du*59f{8+emL^5;ga5xBu!*uSML1Gb# zL&eNqynly7R-K*la?YQPv#aR>eIw^6?JeQXXIq)|TezVA?BDwvaYn7f-M0z#!>Nmt z#6C&!&dd!O2je_>a+qCb670P^NB8s+Znv8s^eAFd@Eci6!pc|o&$puUwHB|BF!Rn< Y)z_2%%_(E#teW>Hmr4Gcy-KY70iUWq1ONa4 literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/armor/misc/head/headband/danari_m.vox b/assets/voxygen/voxel/armor/misc/head/headband/danari_m.vox new file mode 100644 index 0000000000000000000000000000000000000000..28c453aabc256f53b54948a0f5c831a18f2ae6d1 GIT binary patch literal 1200 zcmaizZA_b06vq$pR>2u2P}VY`R_16io4i;=*j9wf%3xcE;?_+v&E{w-aWLujti~ft(pid0xnGfN zN#~2&s*)q=Ji}I%TvbK#RF$lJN#AFnaV?k5RZQyVE7@vitL7=WN{+Ix z^Eto1!e4w-unv+*=I6UH#ue`u|4WhEjODNm+fWUTL=)o4MS=y$#6!q}nWAo?Y(UsJ zCOkeZn1aH(m{6>~`BR~xyO7R-BK#+dd1v-v+M|LmF1$P?oLJOcpOuP$ovNr4SISL! zs090{6=$-N+8diGJ0w({)V0TjmN`M5)A|t;5`PexDPef?dM2MJMOn8JZ_X*3#1i$)&y~5ZLeIFLu975kyLbzSHpznPRRstS7 z5nnaqN9%|_-^h4>8}o0!z|YA5HIJHUsjFnyj%tqfHWKU)|C8SU6as&6a)y{!Zf?~xUSLWYf-E^{iyM~KeGnEu>T@!x1BSZq#T!_`P zaHWl3zV9J4QpD)x60R;NQ&?gaZhS1Toy+hr@L3oIzp{N<*d0 zp1=1Ghpc*bDk?a8I?ndya~v5t!-l>xZhy9kS-*vI`py1b-m|(GvsLw4 W^1ovmF>+ST`!kkF{+qqZT=@gPR6ouD literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/armor/misc/head/headband/dwarf_f.vox b/assets/voxygen/voxel/armor/misc/head/headband/dwarf_f.vox new file mode 100644 index 0000000000000000000000000000000000000000..a4ab558dbadda2a16ac58ac6c936ca4e109999a3 GIT binary patch literal 1208 zcmaize@xVM7{?!e36pFnaCis7bzyQx)A-R5fqDcN9)fyOsHZV&n%r(IySWQ*H#WU= z5hKxV=vsNA-I!|<(#2~2!I(qO%^5@I+!|x8wf=4W(O+$^o;zHtM)7Q~y+6c&s@XbE$xgty0q6LVVYHc{%eP#&^jk2@&# z7hoAOVT+Yfb!Q_*2Zi#Jy7q|BI4#KQx_>YSi9C%=7BH}JEn_bh@^DKrv^`6M2rlK3 z^0N}@6UILgX2yiOH`I3sqfX)5J;K6K!J~d(moR)-;{l=BDs;ar1X_fP8h6*4@H#C7 z-4%=+sV4MB9V0!>%zU_)Ut(S=pEJ-{UB-@W6&&fR!`CK+-xQ+9h3T_GXj?m%cE80z z`zCrFcDif^ytTy)wQeBZy&2E$CVYo>5;}H(!TzHJ-}Nwj+DCls4D+`>CpR~j_4#Wt zo6S^NE!a0b&nwkdoQ+lNdaa(}4@wxnY~k@;8w>X<`AqkW$Ao(~g`XY>L2m^Y!!^ua zZ|2t@I`I$YF?6kf8*@e$C|j}rxrz6=eeFG_KJEEO|0JTYIJ;v1_EHlrTY0K~e@i{i zEseCdG~?dhn(Du%riOEMQ8rhN(lBreW7x=@E5gGAlDel>tCc_?K>PMdBpjsBU&z#j zrGMCO(z{by%DK}KwlrQ8in8Osn}5vWIS;UTCeMS2>uhRN;5vRk|Gc4N~^ z7cmm;hOVU-wHtFyL_C?zKNxf5xjAF#T3chRwbs9_Kl-cf({rb5)hM3rv*-8wzR&mj zzTJEFTgF7Bv)R2{l|-{dy4+sZ6Dda}_c0l&_aE@Ods9J`62*`uNl`SHT%%+v+Mdi- z44InCR;@^mY9+%U$sEl|hSsYsT4PwFeQIYZ*@{7PqOlyc_qDy;tm~)cj|bQJ?QQ-}qnhokmQDEm#Jtu*Dh>S2p5bi;O>o%p1w?6pH(W4Wq(yQ$ns^ zSQilr)Hi-5)OF_3-k*>6L;)YoJWXp@@I-~TCWYe*+Uqe>=Ce`}w&O@RDGd~29Wi5% zms5RbGsTC5iW9o_n9wvU$g8@4C>M!7iA)zVw0S)f&lmAdg3DRzjXi#*Wkw zeyyIdz82;_e4St7KB_hvX{sq_*N#e#bl2l=7b0&6vG;`8GeUSr2bcD~$sxxU`kfBC z?M8fcrHr&~BGI!I@7`wohj$Y`c97x0qlDh^GJ48SV&XK5w=a^Hmq$s#dMp+T)ix`R zEzj~&jSW{*HG5uZVDy6xOnz?V`@43Q?pN`d?wN=S_ihP4JrF{^N-jidnZMG)uRnAV z7|v(pav|3iOe|5p>ii2+@AJ*&cbWOL?;rD%jKT8!s`ER_%((3p>G=b#4Y;;7(b3w1 zXJ=b_{@U7F&eq4+T0KtV&`C@Y6L-E49v+nRJ+;|v1cO03c1|Oa5JiC^X3jtQhl6Il zJ7r~@Jr!kp<2ibVPgBxU%>ApInDLr8r{C<~`={zsYaQsiN1zXmpPwM|WrB~VZ__Xk z<%MHIY(E)e*QHsyrWSEJo&2arkz9q}$y^kczkYPSWxZdk<@FJ!-`R@#R{Xznno0Gn P*!MV>ZvLCSLaqD>fY3et literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/armor/misc/head/headband/elf_f.vox b/assets/voxygen/voxel/armor/misc/head/headband/elf_f.vox new file mode 100644 index 0000000000000000000000000000000000000000..4792f1545de854c1518eb4007b2ecec42346f1f6 GIT binary patch literal 1216 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 bJ6loTNc?w9Bk7tI>;8;oivPA=Ay@tYFTz76 literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/armor/misc/head/headband/orc_f.vox b/assets/voxygen/voxel/armor/misc/head/headband/orc_f.vox new file mode 100644 index 0000000000000000000000000000000000000000..620fe21975477dae95b247197941eb380fffcef6 GIT binary patch literal 1208 zcmaizZ%mt26vhwZ&&p84RHk)oSx{BJ6#S9riqS*&R7F?Gs3&F*h7($FOel>pZ>(BFcYMjAvk|*b$=bY!< zd*1inuKkCsaS`z~d-ti6&$C22y#dc-MxeGqVNzr$4jm47PpdbqOtDTRm95ClmXv9| zq?AZWrlfL|Td#4B!DVSaM}3B*v~?=e$Qc@g*VpXdT*$FYaW1-iKi~yk9*6BWKk7&F8y|F(0#H9jwNlXh1yK zNbd$@{7Gb?n0%j5(kGOS30tQGQ?KxNR4CB6_zR)Vmq&YFK7pYE-kW`j)&apE6W*8< z&MvCfZ=pPBqjJE3YsO7!s1Vzz1xK=inmb!4IVw~RY45nuG$+W*x_`uk#GXK=3mM+B zk%{Muc(Ah++MlLT1h3+I#V?9jzcBfMFh3#Oy{WNV821QY9~72P3IUD#yM(dh%7=v( zyU_iD5N;K&D(|ne5cJrH_^XJYsAb@ldg47T%)k38zb1oJKT}LoZ3TOGS8<}Np5AsL z`kIh9EzG?y4D9aU+JVe@!1+eMe7m|$Hgqivg+>E2G@Kr_9^_Azkk2qS|hiM$nH z?0hdX6Bk&z{V{oYd2A}!h}CMP#%{y4?OArz+VM2iu>Yk7#@;Do@)H|B+;y;gznYJ9 z&zYof@0RfMcS0ms#nq^jg&QsW_G2fZk$gt47jkpa%rX^g&c8TyhHtOG&FqIgkIYXh z0V@k@&hIL>;B{1{=MS|u;Mv(kM{5iIJ#FdvolYm0>Jx0Q8K-gh9OkH*JD&;P0rjclbqEHdDS04VuL5tp<@^UVnkFl%qGRH?Qu&KL*`(JKmHelwmezX7X zZ`2vR4tL%o)B|U)Oc4EShKtj;Y3Psf{HbAfolCIy+8muzOSs)`e$u0eNx>gvE(t5& mJUriu-mkUt`UunSY*l|N`Tsf17@Adef92BRf2~)kl|KPonLS+q literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/armor/misc/head/headband/orc_m.vox b/assets/voxygen/voxel/armor/misc/head/headband/orc_m.vox new file mode 100644 index 0000000000000000000000000000000000000000..1b7730ec70c87f3aa4691d58ca257c4f39205262 GIT binary patch literal 1208 zcmbW0ZEVwZ5XWy%v{E%ww$65St7Vh6BjDEAG1#zktI%P=QXNomAqKKF%_3>Ygr=F< zs>HcW$7~8D${4yVN|>oua%h)H?ZCiLO;%qFnM^^NW@5 z-SK>z@)c}eBrlf(U##G_b8G+RfBEvd)Mv(W*p7Xm z4%b98;x9pBYmv#vkwr75L7}2gu#E{DuL#DN@JLEnr?&Z$&=@q)*;h(ra2@Z?JxNDW z2&IMBW`vWsG&f|WD(avn>BgJ&Q5i48F>1vIvA1Jnr%%D}KVmYOFc}Tl?RM&24!oP5W^02Be@i`kUT9|QEgLfz9Q<(I&GOAU zKGdGsDdEP~!oBZ=MAXUIl!wL3?fm*vnD|I3qo0;>^_GQYs{i-?@15`Y&--t-+g9Db z$K&C2(*&FAC)qYUge7I++C|~^LE)0qiOc1pcYQxE?wmzZ3CiQ;%$>P^hXYo9J5^P@ zS(|42wsDS(oZ^Y@3T}R0%Us05xSrWR&;PTKhuM8z4uo$I?}d|Rrb&IA<-OT&Irq&H z&mJ3Q`_Kft&d(FRvV_m)CNF{r+ltV!GT7FkxOJ0EvpJfEh>fYNX-KxZ zMI=l%8@3p?4oyQAGh|qaW*-Pya9y%Y!WLs<2rAO1L_ScRdO;VnJ$vdP}Z%J zq)ExikYtv|**eZrGL2lek|xPCC0lDI^%76v)>A^6&qhVq zL4CqWX`m3>XbFyZIn}qfP<%wFIHhZk3(a$ayr}z!Oi1)mWTueeEgP78ricgIOQGWl znnZ9b-zq;T(LrJA17UtrxN}2er!e6XzC0i-pAftn5B3OS$21=lTJ1vbb3(99xTJYc zT?syyjgY63@#8gwUus~yua)_CU*_kykE$olG}n}~XJ;kHdm8X}2$5HW*jvKf`$BkU zCs+2r%8~l5^gHY6ahUPdl``7CnMCh4y!%`5AKgoM;4mXYCkVaaW$cWf#N=6)Ze1oX zFOQ7{8?aifRNHOTZ+(jAYwWn1tJ$}!k+F9+F?H3(cXu2t->c#y-7^sv?%ouByf1`& zm0XI{vT(hXU%u}qFp|&cwL)$zT3Duh&Hfjs-{$LUZ!-H~-#_{%8H1IDHT$nGE5Yrk zNcA6RYs9s^na;LWJiFUd{nyska=szPw(1F*hEHROSh)SM@Zhkd?y22wCm0OUxqAkQ zgeVFWF?;dhKO8F2yHi%i`7=>=G+p4>$XPb_7IW{j&CGf&T+na!@BNK=##)EE?-J;P zlNTq6e3IbY%q%#PDB_FS2xdwL0{)5#Bd6fr6MM#hq`^3}uht?2z)tFDhQ b_0CrHH{<_Z(~6;4RrhBtCH~uZmAUchomW308-zpX#|1K3_YclJ+>;@RHc=llG4KhNj+ zexFa%!6UXo5oxIM9#AFMl0+K4e$QhuLnT#VQWz9Rj{3cCs*Z_Ou^~xTj7C{WGD`l2 zWLY+)$V!S)mPOwaRT~VloS<<-f-GyubV25QY6E440QPe9H`5uLIkhk2gR?7aECDRkuW_h+#6HdEev^tuMP`~rv<;-9ZkZ(N%aSX zYKPGLoDi%LuBzX+%Sx-qPN%Ps!BZu4yFk#~ft4~4G1_1rl08pmBbXmh)0a++z~l|z5+HYS>P;y+YH;KTvC&K#q!`!tr8X(^Y=BJ3<4qN3+KmXL+Jp9&9; z>F(&BIvfsy!65bf#*t7bS?yU&UU~EnyREuAxw%}r5N1!sWlr{8WOH*i55CyOq~F42 z{bv8}AIpo?I@)-j_7*sMWth-s6MQg!hw_dv&z|XF&-n=ZZ%olRI*;4!=4U;Mm=yd; v;=Hi*^`rAG>3*#j*Gm|`18eHr(f^KVB*s~j_jfE#*2nDZEWN$GYvsycPg6x% literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/humanoid_armor_head_manifest.ron b/assets/voxygen/voxel/humanoid_armor_head_manifest.ron index 1c7d876a40..d92dd8f091 100644 --- a/assets/voxygen/voxel/humanoid_armor_head_manifest.ron +++ b/assets/voxygen/voxel/humanoid_armor_head_manifest.ron @@ -4,37 +4,85 @@ color: None ), map: { - (Danari, "Exclamation"): ( + (Danari, Male, "Exclamation"): ( vox_spec: ("armor.misc.head.exclamation", (-10.0, -10.0, 20.0)), color: None - ), - (Dwarf, "Exclamation"): ( + ),//fix + (Dwarf, Male, "Exclamation"): ( vox_spec: ("armor.misc.head.exclamation", (-13.0, -10.0, 18.0)), color: None - ), - (Human, "Exclamation"): ( + ),//fix + (Human, Male, "Exclamation"): ( vox_spec: ("armor.misc.head.exclamation", (-12.0, -11.0, 18.0)), color: None - ), - (Orc, "Exclamation"): ( + ),//fix + (Orc, Male, "Exclamation"): ( vox_spec: ("armor.misc.head.exclamation", (-11.0, -12.0, 18.0)), color: None - ), - (Undead, "Exclamation"): ( + ),//fix + (Undead, Male, "Exclamation"): ( vox_spec: ("armor.misc.head.exclamation", (-14.0, -11.0, 18.0)), color: None - ), - (Elf, "Exclamation"): ( + ),//fix + (Elf, Male, "Exclamation"): ( vox_spec: ("armor.misc.head.exclamation", (-11.0, -11.0, 18.0)), color: None - ), - (Human, "Witch"): ( + ),//fix + (Human, Female, "Witch"): ( vox_spec: ("armor.witch.hat", (-4.0, -4.0, 5.0)), color: None ), - (Human, "Pirate"): ( + (Human, Female, "Pirate"): ( vox_spec: ("armor.pirate.hat", (-2.0, -2.0, 5.0)), color: None ), + (Danari, Male, "Headband"): ( + vox_spec: ("armor.misc.head.headband.danari_m", (4.0, 2.0, 7.0)), + color: None + ), + (Danari, Female, "Headband"): ( + vox_spec: ("armor.misc.head.headband.danari_f", (4.0, 2.0, 7.0)), + color: None + ), + (Dwarf, Male, "Headband"): ( + vox_spec: ("armor.misc.head.headband.dwarf_m", (2.0, 3.0, 6.0)), + color: None + ), + (Dwarf, Female, "Headband"): ( + vox_spec: ("armor.misc.head.headband.dwarf_f", (2.0, 3.0, 5.0)), + color: None + ), + (Human, Male, "Headband"): ( + vox_spec: ("armor.misc.head.headband.human_m", (2.0, 2.0, 5.0)), + color: None + ), + (Human, Female, "Headband"): ( + vox_spec: ("armor.misc.head.headband.human_f", (4.0, 2.0, 7.0)), + color: None + ), + (Orc, Male, "Headband"): ( + vox_spec: ("armor.misc.head.headband.orc_m", (4.0, 3.0, 7.0)), + color: None + ), + (Orc, Female, "Headband"): ( + vox_spec: ("armor.misc.head.headband.orc_f", (3.0, 1.0, 5.0)), + color: None + ), + (Undead, Male, "Headband"): ( + vox_spec: ("armor.misc.head.headband.undead_m", (0.0, 2.0, 7.0)), + color: Some((44, 74, 109)) + ), + (Undead, Female, "Headband"): ( + vox_spec: ("armor.misc.head.headband.undead_f", (0.0, 2.0, 6.0)), + color: None + ), + (Elf, Male, "Headband"): ( + vox_spec: ("armor.misc.head.headband.elf_m", (3.0, 2.0, 5.0)), + color: None + ), + (Elf, Female, "Headband"): ( + vox_spec: ("armor.misc.head.headband.elf_f", (3.0, 2.0, 5.0)), + color: None + ), } )) diff --git a/voxygen/src/scene/figure/load.rs b/voxygen/src/scene/figure/load.rs index dda604e939..eefe2780b7 100644 --- a/voxygen/src/scene/figure/load.rs +++ b/voxygen/src/scene/figure/load.rs @@ -359,7 +359,7 @@ struct HumArmorLanternSpec(ArmorVoxSpecMap); #[derive(Deserialize)] struct HumArmorGliderSpec(ArmorVoxSpecMap); #[derive(Deserialize)] -struct HumArmorHeadSpec(ArmorVoxSpecMap<(Species, String), ArmorVoxSpec>); +struct HumArmorHeadSpec(ArmorVoxSpecMap<(Species, BodyType, String), ArmorVoxSpec>); #[derive(Deserialize)] struct HumArmorTabardSpec(ArmorVoxSpecMap); @@ -969,7 +969,11 @@ impl HumArmorLanternSpec { } impl HumArmorHeadSpec { fn load_head(&self, body: &Body, head: Option<&str>) -> Option<(Segment, Vec3)> { - match self.0.map.get(&(body.species, head?.to_string())) { + match self + .0 + .map + .get(&(body.species, body.body_type, head?.to_string())) + { Some(spec) => Some(( graceful_load_segment(&spec.vox_spec.0), Vec3::::from(spec.vox_spec.1).as_(), @@ -981,6 +985,7 @@ impl HumArmorHeadSpec { } } } + impl HumArmorTabardSpec { /// FIXME: Either use this, or remove it. #[allow(dead_code)]