From 0b884c7099a328a44535a29f956f394e22b87771 Mon Sep 17 00:00:00 2001 From: Vincent Foulon Date: Wed, 17 Mar 2021 18:15:25 +0100 Subject: [PATCH] Add new random loading animations --- .../element/animation/loaders/cauldron1.png | Bin 0 -> 594 bytes .../element/animation/loaders/cauldron2.png | Bin 0 -> 608 bytes .../element/animation/loaders/cauldron3.png | Bin 0 -> 589 bytes .../element/animation/loaders/cauldron4.png | Bin 0 -> 588 bytes .../element/animation/loaders/cauldron5.png | Bin 0 -> 598 bytes .../element/animation/loaders/cheese1.png | Bin 0 -> 382 bytes .../element/animation/loaders/cheese2.png | Bin 0 -> 385 bytes .../element/animation/loaders/cheese3.png | Bin 0 -> 384 bytes .../element/animation/loaders/cheese4.png | Bin 0 -> 381 bytes .../element/animation/loaders/cheese5.png | Bin 0 -> 387 bytes .../element/animation/loaders/coins1.png | Bin 0 -> 727 bytes .../element/animation/loaders/coins2.png | Bin 0 -> 744 bytes .../element/animation/loaders/coins3.png | Bin 0 -> 705 bytes .../element/animation/loaders/coins4.png | Bin 0 -> 691 bytes .../element/animation/loaders/coins5.png | Bin 0 -> 747 bytes .../element/animation/loaders/house1.png | Bin 0 -> 370 bytes .../element/animation/loaders/house2.png | Bin 0 -> 369 bytes .../element/animation/loaders/house3.png | Bin 0 -> 371 bytes .../element/animation/loaders/house4.png | Bin 0 -> 376 bytes .../element/animation/loaders/house5.png | Bin 0 -> 369 bytes .../element/animation/loaders/ship1.png | Bin 0 -> 381 bytes .../element/animation/loaders/ship2.png | Bin 0 -> 381 bytes .../element/animation/loaders/ship3.png | Bin 0 -> 379 bytes .../element/animation/loaders/ship4.png | Bin 0 -> 381 bytes .../element/animation/loaders/ship5.png | Bin 0 -> 381 bytes voxygen/src/menu/main/ui/connecting.rs | 91 ++++++++++++++++-- voxygen/src/menu/main/ui/mod.rs | 36 +++++-- 27 files changed, 111 insertions(+), 16 deletions(-) create mode 100644 assets/voxygen/element/animation/loaders/cauldron1.png create mode 100644 assets/voxygen/element/animation/loaders/cauldron2.png create mode 100644 assets/voxygen/element/animation/loaders/cauldron3.png create mode 100644 assets/voxygen/element/animation/loaders/cauldron4.png create mode 100644 assets/voxygen/element/animation/loaders/cauldron5.png create mode 100644 assets/voxygen/element/animation/loaders/cheese1.png create mode 100644 assets/voxygen/element/animation/loaders/cheese2.png create mode 100644 assets/voxygen/element/animation/loaders/cheese3.png create mode 100644 assets/voxygen/element/animation/loaders/cheese4.png create mode 100644 assets/voxygen/element/animation/loaders/cheese5.png create mode 100644 assets/voxygen/element/animation/loaders/coins1.png create mode 100644 assets/voxygen/element/animation/loaders/coins2.png create mode 100644 assets/voxygen/element/animation/loaders/coins3.png create mode 100644 assets/voxygen/element/animation/loaders/coins4.png create mode 100644 assets/voxygen/element/animation/loaders/coins5.png create mode 100644 assets/voxygen/element/animation/loaders/house1.png create mode 100644 assets/voxygen/element/animation/loaders/house2.png create mode 100644 assets/voxygen/element/animation/loaders/house3.png create mode 100644 assets/voxygen/element/animation/loaders/house4.png create mode 100644 assets/voxygen/element/animation/loaders/house5.png create mode 100644 assets/voxygen/element/animation/loaders/ship1.png create mode 100644 assets/voxygen/element/animation/loaders/ship2.png create mode 100644 assets/voxygen/element/animation/loaders/ship3.png create mode 100644 assets/voxygen/element/animation/loaders/ship4.png create mode 100644 assets/voxygen/element/animation/loaders/ship5.png diff --git a/assets/voxygen/element/animation/loaders/cauldron1.png b/assets/voxygen/element/animation/loaders/cauldron1.png new file mode 100644 index 0000000000000000000000000000000000000000..ea5a91a2a12774fa7070e30e27e3718b1432e464 GIT binary patch literal 594 zcmV-Y0Px%3`s;mR9J=WR&7e_KomVQX&TUyMw6nb?}0ABUAPaybqVgnUAO=XqC&CNTG}UR z+T{JHQ)ec3J{q404-bS1lRNjE`!O>Ce(=p;rVrWG>H2+me&ckMU7ccYn`1C5E7`Ye zZOcXspt6b7F_@Lr*>QyHe(t@N8|IZLG*MQ(lY7G?KvrHEY+UQSGDjM{N35h!uBDz4 z@y#^fQ~>FuX|tJ7YeFAqO`6RFQx7Loe*ImCt(#J zNA&dkg5K_qGU{Tf3{0ju;!e~|fbLX~>f}P~mt??ITbrFLdZz%&IW^iu+M);SC*h~g z0TI0xfYz2)45aa-{1pz||ibd&6-G<~w)C6Qnih!>!8lOW*CZ@ldLYOHFinA<9sVJ51rRpeyu&wzV gjz^#Ri~7It7xvaRs`~TRMgRZ+07*qoM6N<$f-~_B@&Et; literal 0 HcmV?d00001 diff --git a/assets/voxygen/element/animation/loaders/cauldron2.png b/assets/voxygen/element/animation/loaders/cauldron2.png new file mode 100644 index 0000000000000000000000000000000000000000..337912f099469e77801ee8ac7cd8445f63c43591 GIT binary patch literal 608 zcmV-m0-ybfP)Px%8c9S!R9J=OS4&RAFc5uqngl_W2AZmfp9BYB#TD3dgi4$Xi6gM*3aoknDj`5Z z1SnMtq$vptFxctDHX$q!PpTZH<9TmB87IJh2dmRrbi4}yx$HOY^|gC=&E$~CbDMp& z2_Q(VvfHS_B1H>8NwXY1Go>G>kb&rU7u_W;NOEy6?)51lMpVkc%_PhBw|$%r5+TI8 z>58b_10Uo+hBgC+TIbSrWt46fwZ55T3Q^qa>x60l`?df8a;*VFXX`{;3)tCM0{~3- z7VvV=REEjI$(VU(FQv|A+b*6CTZ-t#qes>lq@OnDm)BMTtfp86u%ZC63143`HhE5K z72!5G<9xp2qyWd^dC>F`wgL0a?ymo=OPN*W&r?@Ow)X8y`wlTBNeM4qHKevk7P=pEy`ICg>Cqr zi)5NAMw~M?8YiR!SwsQyTN8kq7sp3AcL_X{Td%AnZzp38)=vMeah uqOeUxsdO(@M;V0eoX>c8SL-L?-^Lro20ff2SRyO{0000Px%2T4RhR9J=WmTgYkKoExCU1zfrM2>?UfeNi;4v<42}*06Pq8=!md5uwVm>(Wu$0rXLjb9kNp5X<$o8}bV4*4;q;i}ah>J5joI~GD*)bR z(&IYI$FWqexlQ*&007`-njGTyO*&P7M3a&6UPv*+d*qGFSTsaBx7FDO=K!w{03aX7 zQcpE=8Eey^)*fh6=cWy617H=;PH6&OGJJXQ1pu&(1+vfs0Py(^ooVVcwv7dLu|RTl zlmmdg{mr~-YRtX={<9XqL2KJ0tO!6Z!`&`p>p$sVg%BOiI4@U{1n@kb`#p)E?_=?@ ztUXrAa+M(6W;uwAJ4+DseP?uaApo%1Vs3o5E<@e<@MJ)aN>4#poReY&&?9>K^^D=k zz!;0LR0fu-1b$DJzSjaM8dXk<&K2y3WWZHho1QCrCje!f8f}oa=mE=4hyynx6}<+q zKbQ)ufZXH1o}EH;yw(7ObAVWaKt&1CZRSi}L+6!J0*HbT9^W5Abv7a0G38t}q3jAo zLFfhmfMk>A-_D1I;VP$URE{WJzbBDw=(EK*3!)%|>Zl8$Te3M@%n!Or b|6B43>`XK*9g#}h00000NkvXXu0mjf4p0S6 literal 0 HcmV?d00001 diff --git a/assets/voxygen/element/animation/loaders/cauldron4.png b/assets/voxygen/element/animation/loaders/cauldron4.png new file mode 100644 index 0000000000000000000000000000000000000000..729fb300d97ce9de5600696f1d8174f406e0b00e GIT binary patch literal 588 zcmV-S0<-;zP)Px%21!IgR9J=WmhDQzFcgO0r0W7Yy6QS6e!;u|@51{Kye`4}@GiUn2cp7o>KvQW zb+-PP(R`dHUDZG83nMH|@;>L}G%4_}zb>}wgyif{{aXNFqvMP32QZ8vP2T$pb8cM- z5+FG{L~osAILixl-01ki0;6D7f#PKkhO@jl>I>DxTvUStfZjTn{e=vqHUI#e4^r3T zkF5BhU21p?tSC)WQyys2gj87(QqK%obyEw#1x6Jpr7A^eO+MJ&c1~FILp-0fi=)2y zNcY<56Kf1IuNeSbUf)&%s8m2T#7qFP2wz`wHhamw6(VeK#<{&)BtQ`GB5Dc5?Fi$i zN#(XolWB@1OPS~-)sHOgGe>+Zf=mR948?h=A@heYD9MrkLYf0 zXsroLWneN*5w(QXUkSimRGOOR681+j;M-f*IA8Q$0BUinbwRqK2izy&m(Bqhy#lbj z8;rMrJjeI8dI%dqZ2-a?AYMVBWDBxI?oHi_=B2U#lDLC_2LP%aLaH%kE{jk!LnLv> z4*&q^JS+Bhy4u2Jrm~er)Yzyckk0A5MY{`)0A95g)pRkQ33eO zf?5k!2Gr=UZtftOAPx%5J^NqR9J=WR$EHLKomVQNjjhu(;05=IrlLS;2(b-th$h%9ig|*aX&3e)n<5l>2#K!9cgo)Z#cDh zKP}3WzL3+BvZ2U(>s;EGlpt>b0B}CYe0VjiBHSc^8U8!bRCrij7@l6r)G>8Ug{9UE zUy*wWZxo#*H#O-hO<2o-4`i)B(p{p#PN~A!gf6Voq!el;INaN@elYJxSo9-g$7>}3 zh>KSi4042n+>7w)=1!ZNN?_bV;Rl(xcy-zms0B<4SS$)Qeao9Tb|MNnHe!rk#@?d|<4J~mUVJvI3R4e!MxSiN&ggta0ARz>qqc6{1uA)WYm*$MofKgq zCt($!M)dIXjPBN^Hde(_85mD8#BEVq_YzQbDoLy4QtXdpz*SqDohy2$0LnQv+Cy&_1M-T(jq literal 0 HcmV?d00001 diff --git a/assets/voxygen/element/animation/loaders/cheese1.png b/assets/voxygen/element/animation/loaders/cheese1.png new file mode 100644 index 0000000000000000000000000000000000000000..8f0245ca2ec92d3a4691666497e5309d4615f248 GIT binary patch literal 382 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|iUNE>T!FNb zf{Ck!O`4@)f0*_CLbaO<(%v1O_4||A%%=fa`wYydT zuiwZbshDzS*L1(PN|#p_*B_MLl^|j%9X{ircH@o+g)1$&-etB^!n-Ore}66cDdWUW zb;r#e5lm|sI=W{cx#6MdwuZ6WvrpmL0bM7DgZt)We3$$1srtbC<&tL{=AP%e70j|l sh4}_^D$7&njr-Xz*vjnub4^(Oc%#?Nojwv`KsPaXy85}Sb4q9e03>sT!FNb zf{Ck!O`4@)f0*_CLbaO<(%v1O_4||A%%=fa`wYyd83$4;RCDoj^JAYf-?6QMP zelr~4TNf(QA@E&mh2F^`;SF4wuO|Ii@;1`pbfw-Ct}CbdnI;PU`h6%mv1yA8$0n^t u@2G~*0=vY&fy(`?JBq%`864a?&w`T!FNb zf{Ck!O`4@)f0*_CLbaO<(%v1O_4||A%%=fa`wYydm@SYKMk)We=yjuca-(a)rf$YLozx3kDSiw9o?D{y`+rg;5JT& zmT!FNb zf{Ck!O`4@)f0*_CLbaO<(%v1O_4||A%%=fa`wYydmfJ(=rDR;jPLarF2sFSLiyeKA7~H zCE;(u{6`HM$!{AYTfOoWz9~c+az8Ww(ARP6D!b7<$LD4j(vRmp_*O35vzs#|h53Wy qhSmq}EC2I7`1;UNpltcIPYk&VUi)2c%!vRxiNVv=&t;ucLK6U0c(QQ- literal 0 HcmV?d00001 diff --git a/assets/voxygen/element/animation/loaders/cheese5.png b/assets/voxygen/element/animation/loaders/cheese5.png new file mode 100644 index 0000000000000000000000000000000000000000..ae2f4ffb095a2de55313b810f545e6b26bbe40b1 GIT binary patch literal 387 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 literal 0 HcmV?d00001 diff --git a/assets/voxygen/element/animation/loaders/house1.png b/assets/voxygen/element/animation/loaders/house1.png new file mode 100644 index 0000000000000000000000000000000000000000..255922cfcae0fda5356bf842887467a47da15155 GIT binary patch literal 370 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|G6Q@~IC1O`=m@x`nSY7RuT<`cRsW+nhUX9SoDZ;`Kg2G2TI$sSv1_Vw7QCfN zoF9+at{4BX=jO!8|Jc+LPo3Q1EFKY3$m-XnAE4E%X2o>*o_PKsaOC2 literal 0 HcmV?d00001 diff --git a/assets/voxygen/element/animation/loaders/house3.png b/assets/voxygen/element/animation/loaders/house3.png new file mode 100644 index 0000000000000000000000000000000000000000..23ffa54ccc88e4980d4a149e8eb6aa4f2507ac51 GIT binary patch literal 371 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|G6Q@zKGkL)D)9=b|&S=PmbuG&jm%N4|gw(JU5xKSTW+?=8btP`DzlQrwd;Q z(6>q4`SINA<{x`*2X6YibOP7ZH+LQixcD|Ur7&|(*?G}Lf#WM%E3cJQlOWqYr(d%i jo4agVnHI)WFeR{ioD=xm!*>20&`}JYu6{1-oD!M<8y~HD literal 0 HcmV?d00001 diff --git a/assets/voxygen/element/animation/loaders/house4.png b/assets/voxygen/element/animation/loaders/house4.png new file mode 100644 index 0000000000000000000000000000000000000000..d53457131b6ae5ff396a5fea2457e8fb315579d9 GIT binary patch literal 376 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|G6Q@A--VJ><|Cl^IRr} zlu26T#xIw3^!~{|=c&jtpO#iZp@q_Ev*tWY*tg)fR>z}2f&BSm1wj+IU-G2dd&U1a zv@zd&!9x3rL*E{mzmGri{BB>^+s&;ZD?-!T6gy@yv94qjTk+|nCX-`^nMTfqs{%2J p4|G%3Nt&#<5v(C_t681F?smT*`$maO{=yC+M!Sq z8m& zF6-xsZ1Z}_d_17rp6U7(^F_OhyIu?Gu=^ESStOP*^>E$LVR|+}(%q!MW%E_GtJ^KZ zCmd0Edx`PolitSr+gQ94-)n!EwAgD_>!S1gYqVAcy#Myc^|7;6gF|v_F<(=i$=l1F xyc2k0R3#V7Ibn81ydinaA$E6b5uEgQu&X%Q~loCIB;HsV@Kk literal 0 HcmV?d00001 diff --git a/assets/voxygen/element/animation/loaders/ship2.png b/assets/voxygen/element/animation/loaders/ship2.png new file mode 100644 index 0000000000000000000000000000000000000000..c574e40f185f7c0626c1fef272983fbc500de96d GIT binary patch literal 381 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|5(0ceT!FNb zf{Ck!O`4@)f0%WSqi%?S=DWkQet$BX`7|JFpMm+5Jnu~XAa4~T8%ulp5`%=M=)8x? zv;W7ReRBHtpa1{=-@0|HrLH|QD=RWAsLZKrjgisK@Z{^&yZWblb>$maO{=yC+M!Sq z;P5AIb&3waUA!m+z1}SoA<-d9!eu`hgV$maO{=yC+M!Sq zR8sF5f4BE4ubM7M`BU$2IvE z`Fr2cTFNiutox7iPVoMYcjq+Mxo?oMIQsHI%S~1Tt%S`SGn~_8E*=m(8zvoc|5=Qq z(Bv)N>`Nx|v(?=e(rK+-cfh+(D^sk?&VIwH6;69^zZUQ1f62hqD|*h7z-da4+f_Ocw=mgi6=DR%4f`gTe~DWM4fA!Vjz literal 0 HcmV?d00001 diff --git a/assets/voxygen/element/animation/loaders/ship4.png b/assets/voxygen/element/animation/loaders/ship4.png new file mode 100644 index 0000000000000000000000000000000000000000..c574e40f185f7c0626c1fef272983fbc500de96d GIT binary patch literal 381 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|5(0ceT!FNb zf{Ck!O`4@)f0%WSqi%?S=DWkQet$BX`7|JFpMm+5Jnu~XAa4~T8%ulp5`%=M=)8x? zv;W7ReRBHtpa1{=-@0|HrLH|QD=RWAsLZKrjgisK@Z{^&yZWblb>$maO{=yC+M!Sq z;P5AIb&3waUA!m+z1}SoA<-d9!eu`hgV$maO{=yC+M!Sq z8m& zF6-xsZ1Z}_d_17rp6U7(^F_OhyIu?Gu=^ESStOP*^>E$LVR|+}(%q!MW%E_GtJ^KZ zCmd0Edx`PolitSr+gQ94-)n!EwAgD_>!S1gYqVAcy#Myc^|7;6gF|v_F<(=i$=l1F xyc2k0R3#V7Ibn81ydinaA$E6b5uEgQu&X%Q~loCIB;HsV@Kk literal 0 HcmV?d00001 diff --git a/voxygen/src/menu/main/ui/connecting.rs b/voxygen/src/menu/main/ui/connecting.rs index 1ca9c3d5bf..add8f5fef9 100644 --- a/voxygen/src/menu/main/ui/connecting.rs +++ b/voxygen/src/menu/main/ui/connecting.rs @@ -8,12 +8,38 @@ use crate::{ }; use iced::{button, Align, Column, Container, Length, Row, Space, Text}; -const GEAR_ANIMATION_SPEED_FACTOR: f64 = 10.0; +const LOADER_CAULDRON_SPEED_FACTOR: f64 = 8.0; +const LOADER_CHEESE_SPEED_FACTOR: f64 = 6.0; +const LOADER_COINS_SPEED_FACTOR: f64 = 6.0; +const LOADER_HOUSE_SPEED_FACTOR: f64 = 1.0; +const LOADER_SHIP_SPEED_FACTOR: f64 = 1.0; + +enum LoaderAnimation { + Cauldron, + Cheese, + Coins, + House, + Ship, +} + +impl LoaderAnimation { + fn random() -> LoaderAnimation { + match rand::random::() % 5 { + 0 => LoaderAnimation::Cauldron, + 1 => LoaderAnimation::Cheese, + 2 => LoaderAnimation::Coins, + 3 => LoaderAnimation::House, + _ => LoaderAnimation::Ship, + } + } +} + /// Connecting screen for the main menu pub struct Screen { cancel_button: button::State, add_button: button::State, tip_number: u16, + loader_animation: LoaderAnimation, } impl Screen { @@ -22,6 +48,7 @@ impl Screen { cancel_button: Default::default(), add_button: Default::default(), tip_number: rand::random(), + loader_animation: LoaderAnimation::random(), } } @@ -35,14 +62,58 @@ impl Screen { button_style: style::button::Style, show_tip: bool, ) -> Element { - let gear_anim_time = time * GEAR_ANIMATION_SPEED_FACTOR; // TODO: add built in support for animated images - let gear_anim_image = match (gear_anim_time % 5.0).trunc() as u8 { - 0 => imgs.f1, - 1 => imgs.f2, - 2 => imgs.f3, - 3 => imgs.f4, - _ => imgs.f5, + let gear_anim_image = match self.loader_animation { + LoaderAnimation::Cauldron => { + let gear_anim_time = time * LOADER_CAULDRON_SPEED_FACTOR; + match (gear_anim_time % 5.0).trunc() as u8 { + 0 => imgs.loader_cauldron1, + 1 => imgs.loader_cauldron2, + 2 => imgs.loader_cauldron3, + 3 => imgs.loader_cauldron4, + _ => imgs.loader_cauldron5, + } + }, + LoaderAnimation::Cheese => { + let gear_anim_time = time * LOADER_CHEESE_SPEED_FACTOR; + match (gear_anim_time % 5.0).trunc() as u8 { + 0 => imgs.loader_cheese1, + 1 => imgs.loader_cheese2, + 2 => imgs.loader_cheese3, + 3 => imgs.loader_cheese4, + _ => imgs.loader_cheese5, + } + }, + LoaderAnimation::Coins => { + let gear_anim_time = time * LOADER_COINS_SPEED_FACTOR; + match (gear_anim_time % 5.0).trunc() as u8 { + 0 => imgs.loader_coins1, + 1 => imgs.loader_coins2, + 2 => imgs.loader_coins3, + 3 => imgs.loader_coins4, + _ => imgs.loader_coins5, + } + }, + LoaderAnimation::House => { + let gear_anim_time = time * LOADER_HOUSE_SPEED_FACTOR; + match (gear_anim_time % 5.0).trunc() as u8 { + 0 => imgs.loader_house1, + 1 => imgs.loader_house2, + 2 => imgs.loader_house3, + 3 => imgs.loader_house4, + _ => imgs.loader_house5, + } + }, + LoaderAnimation::Ship => { + let gear_anim_time = time * LOADER_SHIP_SPEED_FACTOR; + match (gear_anim_time % 5.0).trunc() as u8 { + 0 => imgs.loader_ship1, + 1 => imgs.loader_ship2, + 2 => imgs.loader_ship3, + 3 => imgs.loader_ship4, + _ => imgs.loader_ship5, + } + }, }; let children = match connection_state { @@ -83,8 +154,8 @@ impl Screen { let gear = Container::new( Image::new(gear_anim_image) - .width(Length::Units(74)) - .height(Length::Units(62)), + .width(Length::Units(64)) + .height(Length::Units(64)), ) .width(Length::Fill) .padding(10) diff --git a/voxygen/src/menu/main/ui/mod.rs b/voxygen/src/menu/main/ui/mod.rs index 08e1bdb84d..bd965f7f34 100644 --- a/voxygen/src/menu/main/ui/mod.rs +++ b/voxygen/src/menu/main/ui/mod.rs @@ -52,12 +52,36 @@ image_ids_ice! { selection_hover: "voxygen.element.frames.selection_hover", selection_press: "voxygen.element.frames.selection_press", - // Animation - f1: "voxygen.element.animation.gears.1", - f2: "voxygen.element.animation.gears.2", - f3: "voxygen.element.animation.gears.3", - f4: "voxygen.element.animation.gears.4", - f5: "voxygen.element.animation.gears.5", + // Loader Animations + loader_cauldron1: "voxygen.element.animation.loaders.cauldron1", + loader_cauldron2: "voxygen.element.animation.loaders.cauldron2", + loader_cauldron3: "voxygen.element.animation.loaders.cauldron3", + loader_cauldron4: "voxygen.element.animation.loaders.cauldron4", + loader_cauldron5: "voxygen.element.animation.loaders.cauldron5", + + loader_cheese1: "voxygen.element.animation.loaders.cheese1", + loader_cheese2: "voxygen.element.animation.loaders.cheese2", + loader_cheese3: "voxygen.element.animation.loaders.cheese3", + loader_cheese4: "voxygen.element.animation.loaders.cheese4", + loader_cheese5: "voxygen.element.animation.loaders.cheese5", + + loader_coins1: "voxygen.element.animation.loaders.coins1", + loader_coins2: "voxygen.element.animation.loaders.coins2", + loader_coins3: "voxygen.element.animation.loaders.coins3", + loader_coins4: "voxygen.element.animation.loaders.coins4", + loader_coins5: "voxygen.element.animation.loaders.coins5", + + loader_house1: "voxygen.element.animation.loaders.house1", + loader_house2: "voxygen.element.animation.loaders.house2", + loader_house3: "voxygen.element.animation.loaders.house3", + loader_house4: "voxygen.element.animation.loaders.house4", + loader_house5: "voxygen.element.animation.loaders.house5", + + loader_ship1: "voxygen.element.animation.loaders.ship1", + loader_ship2: "voxygen.element.animation.loaders.ship2", + loader_ship3: "voxygen.element.animation.loaders.ship3", + loader_ship4: "voxygen.element.animation.loaders.ship4", + loader_ship5: "voxygen.element.animation.loaders.ship5", } }