From 67b2441c3ca80b89a2378a86e66815f0f02c2be1 Mon Sep 17 00:00:00 2001 From: andy5995 Date: Mon, 22 Apr 2019 13:32:46 -0500 Subject: [PATCH] tech worker:remove "build advanced" from menu merged the options from the "build advanced" menu to the "build" menu, as it is with the other 6 factions. The icon for the build advanced menu is a castle, which is confusing, annoying, and non-intuitive. Additionally, there are only 2 items on that menu, so I merged them into the worker's plain build menu, as is the case for the other 6 factions. --- .../factions/tech/units/technician/technician.xml | 4 +-- .../{worker_build_basic.bmp => worker_build.bmp} | Bin .../units/worker/images/worker_build_advanced.bmp | Bin 12342 -> 0 bytes .../megapack/factions/tech/units/worker/worker.xml | 28 ++++----------------- 4 files changed, 7 insertions(+), 25 deletions(-) rename techs/megapack/factions/tech/units/worker/images/{worker_build_basic.bmp => worker_build.bmp} (100%) delete mode 100644 techs/megapack/factions/tech/units/worker/images/worker_build_advanced.bmp diff --git a/techs/megapack/factions/tech/units/technician/technician.xml b/techs/megapack/factions/tech/units/technician/technician.xml index 29b6d0be..ada85f6e 100644 --- a/techs/megapack/factions/tech/units/technician/technician.xml +++ b/techs/megapack/factions/tech/units/technician/technician.xml @@ -288,8 +288,8 @@ - - + + diff --git a/techs/megapack/factions/tech/units/worker/images/worker_build_basic.bmp b/techs/megapack/factions/tech/units/worker/images/worker_build.bmp similarity index 100% rename from techs/megapack/factions/tech/units/worker/images/worker_build_basic.bmp rename to techs/megapack/factions/tech/units/worker/images/worker_build.bmp diff --git a/techs/megapack/factions/tech/units/worker/images/worker_build_advanced.bmp b/techs/megapack/factions/tech/units/worker/images/worker_build_advanced.bmp deleted file mode 100644 index a7debc31de117be891773e3d27b8a53997af733e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcwPel00001 literal 12342 zcwV)7XKm9`^M>A$8nSG zxFwctS?s+Rk+Qnv#OZ5qvYTv@&3p%BobTt(?99G%h`IM|c<#B+dCob4422Tj6MKgQ z{uuD5`^Vqcp2*(60N0U8`+r{@2jk;oQd48n5C>9_hf-0oX{fk#G}wV;#MhD$a3(rU zLmx~*#=s3}sF+mb!LJ5zb36han}&wl4#g)NJQQ~@HZC?P87{>nB_B8xcOd2v*ul7j zLrJMI$?0GRlhfnVPzi|WR~(8yo{@;mNphVMNHE$0?9vK3nv#-o=19vE z{|Cpvo;{kCfxiCkoA18%(*Jbt|K{jyZGnwQO-&u`JqA;x+?=T^MyZNYL^ia{fsoi@ zIfitxIaB6H=NnL54VtgZlv+?CQ` zJs~sinadYGeCrh)fiyEcoq)*96B{u~JJnoDF_(}`rDSUv!&Sp{*HVjuBxen)xQ^)w zQ(Uz~XOQ9wVr-Rodlku1ou&6>Ydl%1qI8iZU1&%b=+gwIB(4qsA8u=n(hq?eK79hF z1g(~6tH2scGnIu%u>~PCCUEsI$dp-8JS~zTK+y#mJT+RV&k`B(6joRQ)lx<_`-vtW z%~npe1#(q|xk@Ki?IIaV&0QRi0$2GgazHlGu~wg=m#0Q*1=yskuCP9#4@;V&o~* z7^5F+DaYHZagHFZxQXFwVfb5#?g-WyBo~Ef-Uf=Nk?5#FGQ|*>5Q%6io2d6t?UhV# z9o$SUX(|Y`<(GHmR~}ypQz~^FLIV0K1HiM zN(yx0OWSk3t$Ci-9ElMnj^b}^Zcaq!Bq1}0_we(rRzaXCN$f}vSklBcU=dQ`LWztS zL|PV>AhDMyipm7G5*(9<*Lz9!O7IN1ur}XYU*Kz^xa&xTA*!b?-y30+wotr{G;f4m zd6=fP(~WM1#mBIh6%hxjRE{4XHLRY=5#7* zno`BKG_eI}pC&XTq&5Ug&QzI9rBwtP!y9aHR@Mp4g;bf0URc8@s)cwqwB9HDv4>R<{qTI|ofiM@>gB%9{HGb*FgYURJP&UU7ur@4#q1xf(YB z?mpa^l7&f5O}%vHI82Rhx1p{ffoDkJ8;~M1FdrqgWpNZDv$MRRy}7H0!RD1mS~P{F zOqH7H4gr2{NxiVV1(5T~TEyk8f zS6I{9b+WJjXzy7TUno@RSx!Hvq@G_Ikp!Bg6)lqT7FlJRtg>BF*{-NPDzy|!t!^Nj z#Oaf{E9IpjWuQS*)uOFw)75rr>w5sdvGuI&aKHV?ps{nndSuAaJz_aBY&kk?>KZn{ zTB2Jp0QhakMm24H+V%^|=5ze;NmflagbdYI4k8oPpNqa*B>vM9(~t#vm#OK9 zwy;!F^2W3Ly553d539PHWDVr$ivjSl!-q3)#H6I8 zkv;yn3JYD42xx2?Plpibv!&Ktr5&So5p`a=(ZjL(_;w$eBPuQ{d+zyXpMBxk7hZh+ z#g~5Y?PtF8;*VZ<_W5W1l~p;Ed}sR^L!`~4pT)cW7nXmYe?IA zUfyt8THhpt?t+>gvaKAm=l`y+{D1L$RDbM#e_>-IQm9Aq^%)`~;Ln!Z zaGFBMH4Il3=(EUIpD$50cOG7yzp*lRV{+`;C)a;^BUKZ(<)SVE7dibH^0GnA2)}3E{jASd%))w!@?_o5CfIuKF z_Md^NwX)I~45B4Al+Xwi%9fh3DkolBM7Neft`P;AB)&SX(s1H*@50P=Kt478;nwoR z-ObsZ)v1ZGYbQ_lW)Udv&NC%P`h493{+>a9S8s9iQJz$Jy!Yht{MgR=?A*+ax!JLW z`H983iBC7@*H>nyXC}rcZ;Vfk&CO3vOphNw*N0_rASjfLy^6>Qakz&U>;{=Fs5(aV zwc6<3HYCDtpE|iVKejk?ePeO_&c+NZVRvnMa{R*+r+Tvql(M6Jfnyi^N6(jaUnpzs z_P3u9tF*^Y^=>Xt&rRQ0oF89ZoLXC&ez?1Gb8T*VdTeQ7dS_$)*4E5^eBbD3 zHnl+2(5q@VDGT=qYL5wmJ)D}OM0W$h)0pR~$9tP`CLdZA)z7Z>wzO<)N=D9b{{@%| zO)itoo~gJvvWU!RKYRYn^!T+~>od1EW>@BKtS*eL z&X0|aUF$j3n@6Hm_4HRB2OA8Y>`mA^1Yi& zv$Nw{YjgK^SMKeu%+F83Ml3DOoE{j+CebxbrX(g%nc>+2W_z%DJ9eadEA*B&hP& zNez~hr%$fV-Pl~30M5@%eY89~cK!MXb5qy*2QFa9v{3JG-Pud^=daYC>~A5^3tl z30dfvD0qxnahT$3Be-huh2dOVO}48pr>HSgS(GNRMeB#ACg>Vcqxkz_s_<6I?Ve1L z5giR)3qj=|KqaOvoGtYf5 zHZH#Y)Nt$IHyTb2G@l!7Ja;j2_9BSlzdZe|TO0F>^OH;SlfV`TSb(~_xp;efX?J6B zd1+>Hdi?hG^8CWok=|Yuj-smXk%o>*YP(q#os2*y*iZUn570GmjQBr%dAX@)) zwlqT%l$wp*$FD1?Dyj)0`1*7Kl*cxL!b;W^(JiHXPqoY!R+L5bRZU`z;rxa3AAR^9 z`2X(K958=(Z3g0ZYV3oFPkv@|I{0d1%g{Gl&tL2uc(Q%qDU-)i;L5`p`JCE^IVLZf=AgEhw}p+ zl+sqLyCK6CN;g(PVUR8~0pR9_NK7g!H3vJihu>BbaD|#vnNk!-iIEtIY6o6ZNHdpm zoD~vJwJK0=sA&cNw|2I#EsU=(j^A9F++3cT9{+HD>LWO_u{iPSD=)?;CI*l6b`5^L zbLi_$XGh}`5?;Of>h}8Fo$bZt#p#XJ+2zHVm8F@jwfWU3g=W@P=Qh{ow>K6yR_E7N z=6cVc2mIQ|ab+0rALCaYru$lHrL9CyL#{o9Fjc1L$`L|y>K^{OaQILfIz1OZG!Vt_ z2sXPyku;_R%~9qFbr^|(ps?f{iujg7xyPriXfoBbN_D0)=S~CE*{SQxvo}`e#~~2_ z_?v6fOLJp0lh=)A3r8Y9I`S`FBj1!6Z5F$IV`XM{V*%U_u)+TzIN<8tttI%}TKxy| z)#bV6<=K7w8F-4J;e-Y#6g*N;)I^9^FW++FBENLS1zW;$gX}S2p z{(-3emsUDMt?5j8mOzVDT1jdLRqJHw?OeS>V)dxqWwvmKTyO3lI1hpY{NGxh0{_oU zT;E)pyuCTUx-hXYbK{LSUyF%3lmz8LO6tLwn2$et|Mu3>{M^Jo)i+k=)>mfNSLb&& z7h_^#$Ye4Gg8|yCuFP+)FYIhCof{m;Bv8yvC$)9QWHpDmfmW8knd+&>I%;#RHJRqB zOlu9acnGN#0Jk+Z0{-M|Z2umA%z;{SAcSHoviWMP!b;S*sQRJ;os(~I%N(VuqB3)J zlT2rVJT*D?!PNM*)%o$6$&VLiZ`|ElxVbvLI6DTLa(`#}laGJ)=3B47{mvUO*jSyL zp9jsHUt699|F101g4^LFEaBk6gB_Q?%jI&n))zO{7M7OgcDGlKpE;9Fq#7HJt3yZR zHHSI=7G_B!rKk?;2ZAJ8*l;Kf^-uhk^02j{4pkt_;VUr;D?#s} z8H!lOA|Z4x?sBcS(o|6|)f&4`bnmnM&eq(-*oP|%6AyPlL9T;AkOKa>nX#?4+50;y zp!2KCGmG<6U^h3xy^HHBQMT_BKAM28d=HDo!dlkX7WS4fd*tNFECLnyqYfR7;`cS> z7e@d;&QXhVhO=$KOiL96ZvtDpk00VUEtfDdI0REuAmpr$WUysfJOxgyC2JgjpKJGt zU1h40YIRACv8-0AG4!11{&Zs&ikY!bK3JN)@o;x}dh%n)t-BlZcefW|@L*@<;jNWB zHu0HA0GV{RKIX$abad=X7bMN z>cGed;I}rP)P#>osyl%{tkQpMK^Ayk=TA|WB(XJ#EHymdP+t%FgTxXq?%}tUhn-as z6rG>R6z6c|umvQUiK?{lOhrAt`nqF^noe1D2iM=sE{V|HVZ5Uz%Uprd`O-Bdsa#DmTl3HOMdT4ihNAqj z1ZrJX^=T9qg3isz7h-sFs?5MtSwMfpHm|D4Z;IkKoIZ03WOH|Yc4uvNZu*mrrK#In z3#$v0>&w$1@}M@0bCaKLFW%c(`E+{;Rs?AmA{R0gXy)c#@NTRwfZ9Zr6O?CpZe?X| zYj3=>wS4M)9~9yGaF@EK13EjdFT(VM$b?8W=?8?#-oJ8w)ofD{U?;FHGHpVqkd|m;?A9+*-Z2ySBTz1hKIGmB_~3T zMdt!wqrni9f{aT^FUY4q-GBV$?|j|ra3tjsGuiSChA@{S#S7KMy)6(~Jt}XNp)4ej zD!O})L7rM)oLZh62j)Zz$ko}!x$*hgaUjf{?d6BJ*MTz+Z>@cHXA^2mh+Ghs+dH60 zt2Z~7b~l%AMneFczW@n$VIIIwZEh@YZ?8RmcxUMH6*QKp4<7;Yu#4+i-f(_lkZ7yG zm;zCbc=34%-p#c|kj;1Bdy7h^gQIK?=Xaj@?&9L?r#l;;Kf3eq z!R?=a_Hgj>lh6_>%IbwBA)YtHE~=r~E3hViuFjjSD@m6+VvsrC>OYyCn|J-)H*fs( z?E|s#af!*VeCyH&S6`yh8A}TbvB_zfENK>7mdjV}QOLwpTljj1z~qv;E5s_@;iFws z6Cch^Ux!_QguAgkH99(!ha=Q?b_=EQD_1T(yuI=0&IT;u?D=zfcmkF{8oe|M)fzD8 z!KWKP``Npw%&eA^=U80+;K=ae()`-m^1}yr|NZyB{`IeZak6g!@XITjWPt`@X&tMm zhGZ$r(--F`9a(BOl>LX0Ip4e3ckRtra&vN47w4adiA_SFeQwvQ&;IN9M<2u|CM9I# zrBHcD8b606#&YFkkt$!V2vmC4g^ON) zpnquK_I6ZxZmutkTpA%Wm{cbF^tp3e8w>Y#*B{>A{P5a)*%(~c(AS-A@A-kj)wPwi z&Glb?{_{Wm@yo4GZ=dQPMCRh8zOcYk!*K>^CNExFh&L2t)UGUv2_euYVCg)8@U<7d z_rcq5CM6{vj8B64-(-rGquE$|fkc&HOW?4%`Mdb#Y zv;A-fFlTZ0#`4_6`qDHg|M3$i2vkPbz!kW9?m}Ob=Nk(kmBS-LfS*>tIe*~-5dO~2 z>ZdzvH?CjH%*li9MxoW8>btPEv3~3Jtv~G?xvp8coLb(WLj-jv&G_c zIf0OT^2`W7hN{aMpuDyabd z$zbpygwYHkhAqy^=Mlu30%H-^QY>`(p@i_&HTy%2rJ;u6V8j=0u4rnn?>N?S{ERnH z<#f4*M+VQFJu@;o^7U^#`Sou+_2iRR`Ud(3h6W%mE?&Mka_J&eIL@LXky>BdbJqIs5LmcavB^&z6`_UXVcgyp)6f& zO_NwrGH0s9o{&R`%OOSm9}XT$PEX0f_wV&D&QP1Jsy-e=L6DdkR2CXf%VkTjJQ;x} zC-EdKy{o|FmKFw--fE36WGSn)`YPSEO}>VXK%}j<{ixd)7#$r3+JmZt1U1#l3LP5X0*(Pl-biH_B56%E(-^Mn}Stei%$mpg9C$6{*>3*E9+Bn zlr%g8O=ZIpka%hqQju7oZ(2rX`@-7B#aY70xD*>O~aOX^xGTDpRrJq~Xv zkY{@x>a?Z%x7MRo{mR_u4?kU7UE005`QZMYd-v}?eE8s(zx>tEmN2o8wP(){GsUO)2d&+e?QE^TbC-Me@Dv(FwqeDv@) zzx~a>eevbl{vj-hTG`R#YwU8>Hk$%rgRe$jUMuuPqOxBSrr0ZJ_HvTZn_A*XTHZhO$Lg!Hlmy~3F!8x$Br!h?OG&{}QA9>I zm6;2%0OhDu$5I-(I-AVlRoT57PnpRZC@c>a*VIEGs}1Ji;eol?3BV7W-&kK-TLbVL zTRYoN>>dC1#TWnn$3On|cfT9FcnM3Ql(!!7gj=EGF!^hAo`B5mQ3M(!zIs++HPPaa z{u-!uBSe-|t`5o9r}K5NkW{`g8H~<2n3xi+|I14cq#)D(iQivi^adb*C1&9e1O@^} zNym`Ucxncbp34;E(O5L8wm@ZMs?2P)S!{7DY;JvFsoh`Yt`3*fHmVJ#lf5Sw=B6Ip z-gf`QXuGm=0aMgdvjsjU7e7Mtgb4R8pySl}Jr4 ziNV5k*8ubL9TgOFS+2G?OX0|rm=Sz!Do2&bQl)UTu!Iz*B$g`vXZ?)$3cuM`4X;Yf z%uCG1rDDlx7;k(4Pn*J4C*;cy<;&t(>Li*lmLk~4 ze;_&P|9`}i>tFu<_rLGs-`?K-^w!PK zAKx1q8P3HK-N8mjMaWv!pf0PE`$8hMLFfq<*vp_)AVAHa_hu;zGnFoc*qScTr?6G= z3~7A6EU`ctN8%nLa-#a#*ziO$0)Zh8@AqH6Drb2xK9`t^qXPL8v#@Cx5(-PoBv6oe z8k$H46{QN~RDmpCtl+B*a%-W=?$$bsO~nCsRUKC-zI^5K=Rbe+>tB8TUw`_Kzy0;U z{{Hv>{_ns2?LYqm*75tBJ6r2(D>t{-Z||%h>p7N#BRDJTY!yLcpiWjC1h)%4HQb^q zqRySGuoKnJT!jrOv1BQo=@J-NlR4VBd^v0Z1n(gn^AN5e8o!YU_#g0J9FF$C(0nf>_BDS4!nJR*1=O`wAF(RfM*DIY`4Cvrqoo|w*;up~->#w0a6l~$+P?zR*MiYh`h zChJ^Z-@W_yfHVL7x4(kh|N58z`r{wIym$A`#^(CU^1|}c?4!He(4(C?butHwhjPVQ zQK$3Q%8P46o*J>YhUcmv>O6S06DPN13iat6b$Wp;i7rZGO4HaXP@!aw8nz$?$2^E( zKC#!o1AY{ad~vUSfK(3e1i?h@VMa%3L(3#Z;}=&TATZcOwvfyb(s^R0SP3f1)0$)^ zyUJQurmqNEFvwJlAldx)KlO1m%sewuYdXzQ2&cB|LwOwe{_Fmd*lA??OR(b z(4gJfT3nj>Wa9dJotWE0D;IX7j1D=ih$+r@#5luOB^r`18jPe)p@- ze*Wn8#_9rqpB(!L`u&~NsnwZ}*QT%i;MsreY;RJlimVe>geu9&F=o>-VdDO;>yisZl?o>I?Ko1{9k!t7Mpigd1GzF2bV-1++t?tl5^ z?|<{_UwnN1a}sc$@(M^9wRV(_d3 z*!=zYJ(z;bCefd|d^sAwRdw#_`YcL5j$S~>2eu2SLV1D4%-5K>aYKIqYAC$24we*k5F zIua$5OF#U{i`Reh!}$+h3e^O%umrAB4}_%3^;DUGATwa));zfl$&@7F^Hb@<_!I<5 ztd-lmjaRa4bZIv)h~{Y!n7pZ;;V1XWpIJ{d9(r?lM6a2 zG&;l@gTiQ4nQU^SRc^2Xf!!q{y1NcE92lw>fQxz(%4x>rT zY&r)+D}aCnso|=Pe1%4&F$gsVxxu0|*<=7)Ym(^9QoUIYX0Vh7%3X!7t|MJTL;b@; z{Z5CCNMjHvbb~?H)L7rz(r~1+IW8eVpwi><*rV-{=16r#pjag05$FX>wK-p5q)Ii= zYh*G-D2@^(&?9JEM1eGo#!tY}0d`ClAtr|$i(^KW6IXC3ha8hb+0S24Km1caORK}) zn)-AcC5OSyrZ96T3=D%!5y5MYHNujrR{N<%( z0h`mMH<{&1m0Yc{6cszXKDkCGkjR7*nL=xD6#JbOA+6QL6^ioN+-P6V=5aJ;w$=*x zi9!{YE6pwtWpEUke04gFo0cz0ATVReTu4<>hvS)XM0O0G9Yf^AVe{i~`TPDqxcBep zmq(-ct0FCx4Q)sqIg7@IT|i>V8AKX%Ko|yx#1`ZWA?+%m!DmU;Y`KQ7)C<&lq1qtP z8euJBjS)6Q7Tpf3(rgD)TU~lb5k!a9;nBMNn!-}G4XW;Pg{=sP$5)#{1UO1VzS2mN zXfa%QHdBD6^Rsx$OqLYQ6s40nh5ZSQ=RxFW|KoiB2c}a}u{}62o zR_xWE#LIj9uW9Y7>pYeYH3ONMj;AK)U^8&!Tsk|0#K@&EaZDbLE2E2)48DXaR4`;Z zwo=DZXxR!aPp$zC;VX5(5Xj3A5pt7VZg!}wE~&vPf~6U(GHa32?twK5ZN+Srfhksj z2-8F=9A62QIkZTbG)@Mcmn&4G$SfpNjG%H;DIDNW5|NciVkc4f>0C8f8dsCblBcm0 z0JyO#0R0Q%tNy*Q=gjf`(NrwuP&P3ZjY-VRh0+x2AJks`mPKRYIbt$jP8Q1XJSmYQ zgmgd?tLP#*ODxY9Nb^CgWEze_3wkB7dKIoxrL$CMuz^B~R5}nYk=`oMTj^pIRbga^ zlfu%0ISEvL3QLg?E#4GhscaRD z0dS?mmnZ1 zv&lRui4P`&qMFJTQ6O0WwWKPJ&LOfCaW&>#8Vi|&Md#x3$aDxImRw7hs7O31MQ);t z6!-!jwt$zH&9QRD)s($k5|)I1UbLrNsFQb;UF0kK#bN-zl$Xi+Ktpug23)HuiH+7abwwE`wRYqDWA}uwohiluqYL1=?cb^3=QK+;Ze0}h> zXTIrnyVYiUWn)`Kb5~h&S9Nnobw^L2uDK)_0mbmtgbM>T_R>m2S*^xiq_w%sRSouv zu)QK=EDPD{4m%@Vws4cavQb`In{V|IG=-Vsz2C1R;X}#k;NB;ndBZsZ{F3wfC?8^c^yzprWoBd{W(fxV)~h>TqvaU9+bu z?5z%iD+SSvy(6llYh5}~=)m%a~cyeSG z02~fh$D|;#2$biZd;W?4gX23xr#`s)Qf^Mp)YvEg)4l(jqahrMO-JVuDbGFq&1ar_ z;o_C228V`$OM`<$qa!1iE{_9vSQ(>hB*J92g$x2XJr_27PBv9qsBGK5---nVFo9geAZ(0Fl5zaL~A@ z!2t9Jq8qt)e*a9`o+7~*q!kQu2ND~7WdDZfNqp2Y@#OSeTzo1bHX$iCF)0O!&cG7U zdk^lv6CR1aHje-g!XP91a^l{15s-O=lx!^M1~M0i$i=4T;NVqYX*oDJ50;*b2TRJr LBxPb^5|aNPx`d;P diff --git a/techs/megapack/factions/tech/units/worker/worker.xml b/techs/megapack/factions/tech/units/worker/worker.xml index df1b94ec..edbd2369 100644 --- a/techs/megapack/factions/tech/units/worker/worker.xml +++ b/techs/megapack/factions/tech/units/worker/worker.xml @@ -232,38 +232,20 @@ - - + + - + - - - - - - - - - - - - - - - - - - - - + + -- 2.11.4.GIT