From d6520fdee6dc8e88e8d6c86b34f9fbcc74316d82 Mon Sep 17 00:00:00 2001 From: Aelita4 Date: Tue, 14 Jan 2025 18:55:41 +0100 Subject: [PATCH] Improve resource bar --- public/images/resources/coal.png | Bin 0 -> 870 bytes public/images/resources/gold.png | Bin 0 -> 1367 bytes public/images/resources/helium-3.png | Bin 0 -> 1065 bytes public/images/resources/hydrogen.png | Bin 0 -> 1147 bytes public/images/resources/iron.png | Bin 0 -> 1921 bytes public/images/resources/liquid-nitrogen.png | Bin 0 -> 956 bytes public/images/resources/oxygen.png | Bin 0 -> 638 bytes public/images/resources/sulfuric-acid.png | Bin 0 -> 864 bytes public/images/resources/water.png | Bin 0 -> 802 bytes src/components/ResourceBar.astro | 208 +++++++++----------- src/layouts/LoggedIn.astro | 19 +- 11 files changed, 107 insertions(+), 120 deletions(-) create mode 100644 public/images/resources/coal.png create mode 100644 public/images/resources/gold.png create mode 100644 public/images/resources/helium-3.png create mode 100644 public/images/resources/hydrogen.png create mode 100644 public/images/resources/iron.png create mode 100644 public/images/resources/liquid-nitrogen.png create mode 100644 public/images/resources/oxygen.png create mode 100644 public/images/resources/sulfuric-acid.png create mode 100644 public/images/resources/water.png diff --git a/public/images/resources/coal.png b/public/images/resources/coal.png new file mode 100644 index 0000000000000000000000000000000000000000..ff08ce0cf258a82342ac34e0a7dda29ba9c17528 GIT binary patch literal 870 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dy%*9TgAsieWw;%dH0CG7CJR*x3 z7#QhT|5}cn_Ql40p%1~Zju9umYU7Va)kgAtols@~NjTBIIWPneI z>;M1%f$D)kK|#UX++0aX3CPga)&?>(LBIgW0CIsWMMX6O15;gHT`eswO-(&zWo2Vy zb45i}1qBsFMHM9_Rc&ouBO_B~WmS-rp_z$^8IY}|rK7E_qof2>pbS)?rKM|XVgY2p zMD&0fb#(N!wLu7Ij+v07MXmm8Bh!t*>tgLj&k3 zphtCqjse;TG#RK^U*8C*-q66<(7?pd(Adb()Y!<(*cj+FbD;Aq%&md0vb3KXmNW`Ab)B-@SML;iJb-o;`p5;?>&^A3lEm z_Wk?MpTGY6{rmUdzn|`_V}Ow;@9E+gA|bi1F0+;$`L9WzFs)fpg?` zPx$`7zCe28+|IfWpZ0xRZ*%$IN3A~^o0T2jd#yE5-aE-tsVb=L?mL~D#arJ@d>9t_ zM|tUlPi-fQ778U9e=S%MyL`ujO}S=@ip!@5Ez(l03gYvAYIAd5=%w4H{D-axD70Ho z{jkC~|KJuEzv)`<+I&+DCKN35kr&*?bHL%!@}O6)&v)=jcvOYHY7FjToKPZv`Q|nD zh9w0pvNa4ITpI%zCX^g)5?Am{PvlilJfZhfLGg%Qtb*bhz0(Sg>C=_hOmd!ZH!X0p z$F^dzZ|b*999F-(zp%w%xy<=W?Fm!vT6l@geO%*QDz)U$H`YbLW;y*^pDD?nyM%z2FinyxTmY1%Q~loCIEfC9|`~f literal 0 HcmV?d00001 diff --git a/public/images/resources/gold.png b/public/images/resources/gold.png new file mode 100644 index 0000000000000000000000000000000000000000..49fc267ece4dddfb1004913ef4e328400ed9a3af GIT binary patch literal 1367 zcmV-d1*rOoP)wf(Zuw^8$+T*MClEY7>Ig-h~>|QwrOpP>;84O zOSii-bG+D6Tj;hZa3$}}H}lOo@B7Yo&UfHG{_l{xNv2VXZP#kBghABqk}`VkCVzfm z#dG7?iI|_+5$p8r<{Eb_9;3vKS_d`mt55`vBTyr?Z&T) zsA3JTq9H2nsJY{w8W=WVXnfODCpzP0C*tXHWAl2Q#P(*5J+}DXizg^^`nP=SB%Vk* z5uZBIB6SCzS2wvsooJbBN32tJpSe9>{)9cCVX9Q|j{7Y{r4zAUQ)gDYn3XT${15~i zu~s48-5})%)B23~9ItuNY1Wf0{8t7vLbWT_J~w9V)oYZG>h<_xFIm-pfVLSnUaM2yTqTY6l2#4F#I??H=d4__xBToDI%^&lnSC6^DJ?d{jQtY ziE}Y$+#R5gBv>w4I#aXud%HikrhWvSZ1W1#P1 z)>g^155X#f>UY357yR`(&uMo8VJ|w{L>D$faRAL61vl1Xgw!$HoKN&54Wq-y_JFl; zuY?EINzsD8G|<(l$!$xa-ISqHCHcMJtAm1>V00QdHwgzHK&vZI|79>{fo36ds!gtC zLlV*zDAmJ}F95r5q>Yq7+wfxU3==;Zq<9kyoPwIS2EYk(e$NcN0fWL)D6E6naY*FK zsYQZTFGi-!M>AgmCg_7#r29fbBD#!Q%RE4aD%nV4>7ugp;GBZ($p%q>*6Mz@2wMzQJ6{D@sB&91S5Wa!)C|7U1j5MJ% z@Fv-0Jx=^PJTo2AZQx%3=5S1D6AX1C<_3(O>sjg7(~>SfW3(Rck#nc(Na@^3gwFz7 zX=I5s(Q=Cc09nojne+8Ve5r@XbR5Q4m%*|ExpT^bXF3dZfOoz}qRwi$+!-VluV!ML zL)cCu%VYybZ=MC?-esBFeN`4;+e0=oAEWqN{QSgVEBF^dx)pp2a;XN%yt2w^ge|gx zhozAt;|-y_21bm`JKiqKBL~USM7Db$W*`O@IQ`(A4F+~z;U?BdBgZDMdP&z38@#5>_rVX#;SyX5kqLYutRN0L0ed)UAj|b%S?AZju#Zun4Q^KO6`-( z&AiWfpI^?IH)jYXNa}j?QR3!)fWHW$767XjN?C9|3Zg+0^rIIC2d3Tj^ppZXFn{QM zuhrVNVU@pJ1acZC0HDH$%DH(we&#}UZ~RE=EdcA61pt7Qo|--vVrET7$zOlJ?^+E2 z963~fqblgBO;61z05+D=kd+8P-i$`ie=t@V4T;UQQBkRlib{3J)3W*CXwaL{2mmb$ zfYiBnGXSC~<3DtKcgy^@ z>2pDbPo>c8?%!s?bhdWr)UjKI*4cgod5xY7d4;r_Z~*vdjfmlPABNj~IN$DrVgPAn zE*$a-X^qTgyLGkzBrwr34Bbt5p{A7rkmrD97&-||EE(Yc(y{?W#Cy9?Or_ohuJu)u z*OhO@kD%ZfuHW%W*c8O0MA#nju&YZ6Pz zRX_31dmFtuJC7U1ujVUMlOL8(CI$-C9j1V?e#YxRKw;Tbe^uM4&0ggRvr+}MW$&(eS5rHcz$2T_&hzqTrC?{+U z6~Adr&Y_t+0!~>6z{0w;eO)SNG5yyWRsOP3fDYh}dG9fKk&PihGb|*otEo9qUf$X) zJ6P@YOlNE(XLO>?Yu(A>G literal 0 HcmV?d00001 diff --git a/public/images/resources/hydrogen.png b/public/images/resources/hydrogen.png new file mode 100644 index 0000000000000000000000000000000000000000..5be2800f8bd29fe096eb5cf69b437d31ed457754 GIT binary patch literal 1147 zcmV->1cdvEP)TAP*9rqV(EekMWhG{R&0|ZLah&duo|HhwAeLW>_fzwPGe$|PBW9q z+&Ocm;Ik04vhE zZ|mkQfDTm+!+kq;uNs@WuxEJxud|nZ*cXnZou2OUz%M7}jW(LTY4cAO%A-BOo~w~b zXPRFc&Ue;KUv=o!HI1VNSn$QqlP&hsvP{?ViD!QpVct6L0rG+HXmv-x-$3pJx6B&58bG;y39wwF~oyD!ah@S0)a>7H~u)oxad+Z!cB9MEFK$X?bJAr zPKcHq06>(b#vm~-B1fPqj}mzvD50sWPhS`8&QaeH`~B#{jUb zdJJ_n6;y>B)=jJO`^e8!xed)M>FC2xTF^IXAC*#{37jy+=U`S7h_H9S1~6_P<=P zgpFukL`E#hf)W;?&%mf#o&}#O0Y}IT=Ty~iRs4<_%t>lApIf-8_zN);e{%SdeG&iw N002ovPDHLkV1n*98-f4; literal 0 HcmV?d00001 diff --git a/public/images/resources/iron.png b/public/images/resources/iron.png new file mode 100644 index 0000000000000000000000000000000000000000..04918f2f3a9d1f510035a2a4cddc8ab697a6e997 GIT binary patch literal 1921 zcmV-{2Y&d8P)CINaIF&W_W<8u{o>bVOilhK8`no7x5T=sLtl}hDXI=yby znoT?Gik~}ug3PpwczF4t)#p#FIn7^_gK z4zEf|(R%dru?ZCB=W^hqorHvs;&SR&lGSQ$bvC-3*Bcy9+Twpo7euJkns4IQZqx?` zhuQ>g-MGfit%(d79z}k3I&UmmhA4J$;G-Rg9UT@??0BN+dwK&wDz*B;lI00@#mnv% zvuj%tp~IrcyZjyT37ZHW9LCvy9>+g$FbMqYF7Q)n98%}K8E*&;A7K-yt}JK!rUXL5 zM{zalJL3M7NIx%McD|R0gWid%ic+getx2)9_gSC7U9HjN%$OVN79BIy=FBkF*RgqB zJpKbi`Tojf7R0S&P-r+GzQ2Liwg)sfnWXa4VnL}?wLRQpm8^10=TKVuGy^gRt?rgg zCi58>GQ=)-=XMdk{z2R*%;R_S-elOQG3@&=g{sO*EEW-OA3tWk5!-Fgkx%|YM(PDD z7R$R&n}nKnv)O0%!Z^F)qS(Qe>vRW-%&B>I6A2UeO!#e6rXti3fh$7K3QyKf~DV#Wb zkivp|9E~n0WUx4XO*io~r;d@6nMPkPUy836+ywU6Eke0mK2v9KY#TXxoX~DIlb4-= zLZL+L=%A&o9i7pg!mGK={CzBwU!BR>)5pn7zle*QJ7W6--d>%IT>j{MsTa=h^_f$6 z`2}$6T0vP;qiF=tDz_v4no6zt+xjiLwAEFWWTmI_tH4maeSJ}?R9I0^a{Ve3CQoPT zZ)TBt;VfVN<8!?Gzd(IWIjfUX&}baG@?~eFa`dy#$(VELf@n6ktpoZ3^|o$cfbdc!5Q#)tawYtly&Z^ABY4-06rN9rnHw z05X}J;bSInqu>hbHt)pf(z`2GbiJ@^IQ=&#oi!V`qc=FRW!-YjW;6A*Ro%KEM5R)n zdu!!--GIPBw42Qcg249uN9>BXo6W3^n@3?@HVK>l+)cc+p#{i$Xuw~k(R@39$qIc)*f0R(3OP!piWLiHJ@p0*j!vvxzXi9x z9$oLMD(IO+yda0l`Bl$ju;j=_-N-hp~HGGUj%X#)dlUeN)|@ zmX_va(Am)ITwMEX?Csje?kQ_)s&MM%N=-!>Dz%!Pu(eg?%$dK0h{!1Zx@#*nH8r%G z&DMt6sv|AUO|u{J3P9oOA3(&&F?N&YWTcXtnTDsgAALMLd&JIL6wk1cV>q~XHgIk!E|<3hQb16M1W0}Zf+W{I9+Dsk(wzBArDgAI zkd!KwWOQ+r1VNDOvvJaah_ejMXpeuXbj zeol5~8phskl$RD?YrWqz0eGUPWdJgza*dn>dB>G1Its{$Kq2 z>}lM+{HU#}w7mYuRgbaz7&~z?(UZEfB}G4!G&h+dfi~={NrE7gd# literal 0 HcmV?d00001 diff --git a/public/images/resources/liquid-nitrogen.png b/public/images/resources/liquid-nitrogen.png new file mode 100644 index 0000000000000000000000000000000000000000..de7ca06b237f7e89544af9ab0f7a1739578ee70a GIT binary patch literal 956 zcmV;t14I0YP)@% zu*)>94*&v7OHnDsffJ*7zuaPZazL48zW@gW7)u#YrrGZW%e8=!(}^}k9F)XJPemLY zIh}Al3Rfc-K0CjYr1cr#fPDu=*%bSNkMsZPV!CobDC!fC0RaX3lmVfr&kd%w1K~6A zkODu_=`}!&p(mTdSrZU$oGwTvb3Xwn(E$bU)9+904?WsCw_c;x2ogzuwss)uGq9tWYCe8p@P?*1@zazm%B6i9*ioNyX zQ%lBO`F2FRB)H0j^{W$H<=YYM%Ba!FfxaMea*dha019R&#q)Uf~yTvdzdhh9rpi3sJt|^?d#fg zTL+{e>ll-jXDrSxuYpZ%0V!~Vz|~#_u)>(nj31P|GDikQv;|10$Og`UG@yo= zjANWWMrM5hDIj8y$1}jx!#?$0Nh6Fj48`^i*nW!Vwoi=<@MPMnS0`Bj*Yd5{m839w z1ypHTZE|k=)VLj&<7ITY>Bn)98U->Ag8{q&;~ii;@aN~gO~n^_7~Hw4hmDiHgJsXO z9RPsd!Lnxp>bmm-R6(-5b9Hccon-D6hA554W8*2v&NY44oyapf000+4e>PFhd<4K= zhZYGS24IUr{R=PVSKkO1#ho}ZK1gnai{h~y)GF{ThpX0<#9QoY3VbV;gW62wfQx7O z`EwINFm3`UUZ?dp2<^A;R}Smoy836-+WKv?Da295Ml~^NKuaGhrU;RWfG{R4>-pWg e6|?I=Eyq83s18d>5kn&Y0000cTHEZ#%G`Ue<= z5-k3{dJ`}GOM2CVQs~W7Z?+&(g`TQl2!ayQinYcxiDr{#GamHNg3{R~8iYL9%ktj0 z-_Cop>F~wqLR}i5pp{o z6BhQIA3en|MYVR6C*a_=&Q6X-AJrw&()4&8|{JPW3-&(LV%75ZK;U??Kh`mU^6t0TcD@`)z@5@Y0$p!GPoO8z6X?2t z(T8Zr?W@?Qh690PwpA&1N+9Vby#e6|60o%NjPe3e|3dTx{ttl$su>h)T4N-zkxi8l zKTk|)#BYCx1-dSWi~04rxt1yO Y2O|fIhzIz%i2wiq07*qoM6N<$g0>15P5=M^ literal 0 HcmV?d00001 diff --git a/public/images/resources/sulfuric-acid.png b/public/images/resources/sulfuric-acid.png new file mode 100644 index 0000000000000000000000000000000000000000..86069705c04a32451dca6b2cfa70ab0a0cff53af GIT binary patch literal 864 zcmV-m1E2hfP))iKfiNts}D0;Dj|qRqUO;iL|CwCSb8OmwXm_lMu>%t*b+8PSg{b1 z*s<_eAS!OA>J`$cN;`K{>(zVD&qAh}&P?xPdRFK0JKyi;{BF+ULKDR=P{=rEl%X$Y>fJlV*~Fh;@d57NEs(xRFLDH9)11J1cNt0ns79u;Wx3 zt;C<8(%-wyhGrO8xoBt_ar#$#-lrsbi87$z*udPYV-Ap24en^dMI{38i@A#k`x=c4 za?mg4&Lq){O*>UA7DU5mKwCuUkI=F!?yiWH0WB6=MT7e>%mF$a;jV(SYyiH77eIE# zi3LE|SIOtk#S4ux&*wL*s0Vb$2KZOLs~Z&7ynH*hR8V9F6dg)o4v;Z{dowC%NdUhu zH;8aJg*gBU$IE@WCFeH;&| zqFkD91FB6xh+b~AE$af5zm5+A8>{Va7AnmUz?MoreDe?k_H$upO$IuC&lIZW0q|RCdi7Q5 zOeT|G+*t!)Ro2fVTWB|u?$uJKSfd*v0mRC;YW!UNB{vV$P<7z5jqV_1j?_bjsZ~Ru~3`P`saYL zxA=Dek~KoNBa}nMw@OM5YmnRZ2I>NIy?Xr=(TCM`yTCeE(*MQ4gRWBPd29dxcTUeD zd{`LRWl}+WY;ot#HyUgRkR2VJ6r4fOnyr(d_#*aL=H3=ux1T q|5x@H$ZN$uZn5$xJ2EmASMx8V1o)~Eq+Bfk0000WwA< literal 0 HcmV?d00001 diff --git a/public/images/resources/water.png b/public/images/resources/water.png new file mode 100644 index 0000000000000000000000000000000000000000..2ac40af93f403224a8debe885a0a07f21a1196e2 GIT binary patch literal 802 zcmV+-1Ks?IP)f9KAOBkG`{6&3cv=Zy4#Hf?GV?V?o_kr1>{B9caP5wz$55oL^6 z5J5X5$W^P_wQZ9{q|De91wIxDnfbzT?maC=Mw5GI?j48fEWdN^_x(8c|G!-L$0db6 z_#mO%Oy!D#`i1+Knq~5@0rV#|Xr>tk>Q|)E?af3^iI`r!j6wj+G#A%|12l~%I9-UB z=MBW(YZaw@25Q#o3Sa$xS~?qK$%~)o4M-{1)`tTK>^7IV;Mvd1a4fF7fCLb97@1a! z`mTulaO>%H1GjU815}H_RWF9FHxL`q{TK|f4mxN+Z4f3Fvr@|EC*0W}U)=b*-hle( zwVSUG!I90dqdY5>SZQv$^>qc%7uVyW9JT9xn+HqbKouA(`&2j+i|e7H01T@76z(|n z=hKj!gK|GKhO)Ad;~7r?lL^iPkz6w$e?rQF)=DT@bv)dc&=VU1xc5QJ6>j7+Nm(#5 zlL>FFT-8;%`}nN}3I+(2&<$+O2LSMCHuE|fLr~_=%1sMpv=;=>JF2w`J#NAQOoeyT znFASEd%1;M{Yl;A8NjD>02OWl0LB(za13Ua|B$Oq(|HSy0HU;c3C~#;XB~6w#NJV@ z^;vv(>K9Pz^RuP1L8jI>Y&T%Qo+5?=NZMqlLzd07MOhKUGoEUHo@@augXv-e7|Mie zfQng?fEF>|G((KL2Ix2_3&2nj0bY02$)a7u@fxb|w1@!DoEnY*<`Pf9{=Ipu;Tfv{ zfS!FaZz=77wSn+7(0)B4DbD}^-C=o&(oJCp(iEjF+9Gdq4dwkGh=!#P2 gt>Bf@b^CAYHvkjN%^547#sB~S07*qoM6N<$f_i#r9RL6T literal 0 HcmV?d00001 diff --git a/src/components/ResourceBar.astro b/src/components/ResourceBar.astro index 939ce33..d7afa0c 100644 --- a/src/components/ResourceBar.astro +++ b/src/components/ResourceBar.astro @@ -4,7 +4,6 @@ import { getHighestWeightedLanguage, getLocales, getName } from '../lib/utils/la import { getAllResources } from '../lib/db/resources'; import locationManager from '../lib/classes/managers/LocationManager'; import { Resource } from '../lib/classes/managers/abstract/ResourceManager'; -import SystemManager from '../lib/classes/managers/SystemManager'; const resourceTypes = await getAllResources(); @@ -24,74 +23,98 @@ for(const key of planet.resources.resources) { } ---
-
-
-
-
- {planet instanceof SystemManager ? {planet.data.name} : planet.name} -
-
- {resourceArray.map(res => -
x.id === res.id)?.type ?? "solid"} - data-res-id={res.id} - data-res-amount={res.amount} - data-res-mining-rate={res.perHourMiningRate} - style={(resourceTypes.find(x => x.id === res.id)?.type ?? "solid") === "solid" ? "" : "display: none;"} - > -
- x.id === res.id)?.icon ?? "#"} alt={res.id} /> -
-
-
{getName(lang, 'resources', res.id)}
-
[fetching]
-
-
-
{getName(lang, 'general', 'avaliable')} - {Math.floor(res.amount).toString()}
-
{getName(lang, 'general', 'production')} - {res.perHourMiningRate?.toString() ?? "0"}
-
{getName(lang, 'general', 'capacity')} - {'21372137'}
-
-
- )} -
+ {resourceArray.map(res => +
x.id === res.id)?.type ?? "solid"} + data-res-id={res.id} + data-res-amount={res.amount} + data-res-mining-rate={res.perHourMiningRate} + > + x.id === res.id)?.icon ?? "#"} alt={res.id} class="icon" /> +
+ {getName(lang, 'resources', res.id)} + +
+
+
{getName(lang, 'general', 'avaliable')} - {Math.floor(res.amount).toString()}
+
{getName(lang, 'general', 'production')} - {res.perHourMiningRate?.toString() ?? "0"}
+
{getName(lang, 'general', 'capacity')} - {'21372137'}
+
+
+ )}
\ No newline at end of file