From 9928b0f788492bb82e58190adc0bd58419b485a7 Mon Sep 17 00:00:00 2001 From: Anuken Date: Sun, 15 Nov 2020 15:29:31 -0500 Subject: [PATCH] #3412 but not broken --- core/assets/bundles/bundle.properties | 1 + core/assets/maps/fungalPass.msav | Bin 10618 -> 10664 bytes core/src/mindustry/Vars.java | 1 - core/src/mindustry/content/SectorPresets.java | 1 + core/src/mindustry/core/Logic.java | 7 +++++-- core/src/mindustry/type/SectorPreset.java | 1 + .../mindustry/ui/fragments/HudFragment.java | 3 +++ 7 files changed, 11 insertions(+), 3 deletions(-) diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index caa42eb78e..1ee30c7c21 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -290,6 +290,7 @@ cancelbuilding = [accent][[{0}][] to clear plan selectschematic = [accent][[{0}][] to select+copy pausebuilding = [accent][[{0}][] to pause building resumebuilding = [scarlet][[{0}][] to resume building +showui = UI hidden.\nPress [accent][[{0}][] to show UI. wave = [accent]Wave {0} wave.cap = [accent]Wave {0}/{1} wave.waiting = [lightgray]Wave in {0} diff --git a/core/assets/maps/fungalPass.msav b/core/assets/maps/fungalPass.msav index a97ca7706d7146cf7969b56b0aeaaa034bebd66e..f0edb0987b194fa4d8699fa50ed682d210cd2532 100644 GIT binary patch delta 10647 zcmV;IDQMREQm9jZc%0RITZ~*scG$VMZ@(Y&?s<_jLk`K|P&4EVhc8j29;6-tkZa~neAW&|n z*VwJp->h^xkbYbXpR}4CD4xH%b@}4P+U5;JUxjp|x!r7s9Z2p}>YWf$m0tHzvyB`i zJKajR1OA79A3=Jr(oz)1U#r%-&Gyop#8lYn)*8D|+HN+w?Pk3mR`2h(LY%u-uS0G( zZ0ywP-LQ=$-gy_24|}zG75w#02= zzx}WqR`xnKKis_e;YVwiZ+=)qnvGgFd}VL1d9&Mp?u8$Hv_?AVsF$@$w_DkM?<>t} zsNZ`Cdxz$|*9ybxS9J+^PLa7DDcfzv%XJVYW(V2XS-6T7S6G=6K;2J zHjvtXM{63kTG`zV+XAzBaZCNV5(m3i*$&qphP$9MX2X z@}!QuXtWzK5^P+&x>nh1_8Q&zY0*z=A2b_GVe^WRxN`8!kHdO}k*+xGZV1*-YBTQ} z#H@BOu7HWg#-P+hd zQfi=u{e22)3J*I%K-FZlzJ{?LnG< z!kHRLoU+nF>a}_eLsre&VW2|mQKb{E?^GVPYuk|T^xC`OdZk`(?nAcI!YEm9HLFm1 zNEqwe&Ak?iRmI%2->%?9p$C5kiAt@Fb5LYJa=TvJ*@2Xb`AvRa=I0haukiCKKdXIvb|3X&RSJW6LzIn8sCq)3^rNY8bYjR4^4`!cmW6w^D0#!|J+zEmte; z_ego`(f*w3)9sSL==Vgog2w37E4xbQ?U3>%Iu@i+%PQ*y+m8?=^{~>Z)Vq*=)WjsY z{T`aGvb$GNO>MA@p$tK_*2V<5*Q-LRia~)kO`>(t$bq5}bQ;Ykkf`Bg8T@B|UA-nd zk1BP{^=fuxj&iRynQCW=rf%jnP5q(>Xb2)>fO`$;)w1elok^rRkJ`P59h`wCjm*}n zq41iPY6j}xktgJu>)m!3u2;!(bG8GD8gske>yS#*51YMu6&nRb#k>{uTy~HcGjAo9 z$-Lv*(&-qMR69?hQeWSxH*r;en{Zy%s}(c_t(|V?<>>2H^z|wf$Xe^IN+Yb}Qs%y0 zj=XI}-mXO6qExOyPQ9slAl(WdKE$;TBN($*yH-bOl#+D#XQ-`H0JU^TXEXp}7pNtn zpI2`j{w0$q)?2vTlU`^!tMKl0xMkujk|9Qkz<9?_^550QJsMGsBQCTP$gH+(Z2#ueqi9G zZMb%N9+6%qoQ~bvZl%%1q@U?xXsb9x3p7-0(G&ID{1sd^DR`QwX>`fQq0?Eioz*5* zh$B1A_O=UvsRDBy8W*!c20iL=xR1SKqF(8mh`1Jaj#k=xXzi+h?aBN~ud%Hb&JkR! zs=J{bDrrT^dkS4sIbaPt+LYJ1Bh|)*pIiwY3!UX*j~FeIBpBvT)^{<1L#anfu{I>V&dohcdSoxe{NJcyMYG=O?X@7^ZsL-$uV2tX!uFmSN+XqOuhxYk zdb1Wly_QfTT`jwR9?CU?a-Ea}i1P%0?&NTXm{c_P6U)wB&YZ5BLZR z;wOmI!pLo7v{ELN&6ENisoF8c4DYdc1QQ2Wlz7b z7nk&#@#+8qQ-15RIf1c*{%>l7B#cAQP!;sUUb{gj3z;3P5B%6CZB$KSvag{(-U@3}Qj|v7of{~)qkmT)0(8hG7w+Fc8Xzy{c zt=oy6=57{Bkkjt_cGzy}?ZfMJI!h{l?6jN6`|AoG*Y8@B7S-3Wgs~-!vQb$vxPii>X6V&ieqUT@}iyW0St6!n*HMTmDv#uQ37dd!>I?AH?Undh|w_X-D zHm={mk}{-)q#J&%wu8AsW#vlyE>^Vl@cknAsFq%X@@E@u*aY~sIrtm!=TN49gSoo^ z30MX=N3Bh2slFVwvecT5!mUtiV;Ee5T0s=fr&fVlIcm*B;Vw|?wu}aX;ZqAVE@F7p zN>kq|wO*8Y6-Fuwm!ZD%QMjb=T#UkvQp=;(1hrnKR)$(BYAH@jf{_*elr}ukfhSZ7 z)Ov+lY2mq#%1OaU2!D4(j!YDPL(MiXeSQ=pDO~ko%u?UD@S@=I!o7u?6CK$1#Ikk(=hTps^3v1SYpb8FT@^P_@k}|7vPMOe*jciS0NpUVwaLY_DEd(aCTSU-&NsLPx z&DeZI!<9MBDUTQtjEp2?5HHS&c6~t`5m!!0W?huHEC|{fwZ@#q!L$}7ta1YUoEFAV z4z#Y8;hyK@Y%@nrYrM=wn_4tMBr1xtDgp^1upskhMG-51nl-Z;6vQz-Et?^b5dwiW z)H27LqHVgOcbgvydALiz4#EsWs+q?HmXNi70Wu~nK~IaSTIpj$=}zO+)p zX<8DpT|-AChbhyJ%H*C1WBpl?nvtXmqNa?H%8BPp2nUK(Ai%Z`o0E*5kq{cuaAt*= zh%yvN^6*7}q7y1ir{XQy_(X6s4eqiY>_bbOxvDPY!wLnL$^%5i7 zX;G}F=`HJjv;|j%1B+qj^`jUkqB=b%^IF_hZG~mcE~Z0+p=3K7gR$b+ZCNW@&o&oL zEoTJRroI)&i+m$GOtpEDiL24?k`E0 zlCE?id^tKgDWl1#I_)Ug=w3=jM?{WEtyoi(_l>3`448XE<#H6x2C-~CG%s5cE_P#= zaS|DS!YSM<0=Ff4&N->-F6FwrT!z}}LG}G*>H96g_-)6k2KR00+Z0W{EnIC1FE0w^ z8EIXX(chNV9dUVkh+yZn#rsFnSCZK-N?84ja9PtRdX0~`Cc2C>P_Rz^u< zb1e)+$rp9sG6h(K=R}leo0`WDr0k2DN-;zWf~G{66n6|vD%ESAB4u|)qe9BsEhk=o ztb{2Gsf6*m`^vPuUyTs3YsJ|p+Nj83w~VxLzZZzZofA2HJ<+mT6#0Ty7HbuClo`wT zW}^G{j6&6k>w_TLsn6*U9~@N`fT|8RWYnGssw#t)cb$f<+fIpId~rRsBfTzgzVuD$ zzGXVBF}NvFyC<#nXeyl(`;zM33IsQQEpRrR{V489kxEM2@-8pTmP#%vTSC;H z65M1o$=D^q*Xd^2J(-;p4hljAgi6lDjK+OM{K_-Ft1%{|Wly|7w4uE2b&=9;E;53l zGJ_`rUlXB0*vLiEN)n-pwHK&0E($9};cW44L*sc-ge~N9g5iNVCQZw{NeL!@n@_Jf znafblJLyIpV2ee&+UEs>$iL-B>DiQK z!>W%S?~_fR-Bc%pzk+eX`zf7T45{lf(S*a0dv2@i@w7qHCFhvn@(#_EBsLlg;GP%j z-9%dGC3WVyODCU(14YH|fcmI^WQ0meR01NFUAC>c`zWWQ^b{{@r<91QPDu$u@3usW zq9V)tJ4{>shWu#!z9>{k=zB?HT3xhRDoLSYqdO~lz9sZVMOU7*GJ{kgAq4Ez zj4wWv*Rg8Yu%xo$Iriwl))sdAZ&$x9@odUm_hdb~mo$!~qt;%zbQgfui?SF>O((*gQm zo?XBb0ynN(Yb<3#WV0E6?vC*6M{%=JdX_8OXD%uqoIIsuz+M0p#E~qp^)S$XC)N?3Z3HAVTA7sy zqC|THXYawvGHL@t5xAxggUtc9Rb5idlhC;8CdAyQj7y^MqJ~Sa7sJ&V zxiv~e?~kT5R|f8s&`ZiuJBUQrgoBe>5oR{7k<4l66@i_SkG&JDNAu@(0rXx%<1%1nZusJmvk6J zFv@~q^^%KT3fPpJiZVGPhv~1#5ioyIVRjPO^+ISfk}fNl9eP7U6&UyAiv)p~JS z>X*J-P&qmVa7nOdOUt}61qS3nAf&7T?9GaN=66pfch2x;V@S=!5b#BR z_Pfo(;RF_=1mpuuUE)kdQlwVNY}73*u5vi4nsrj}q6AJ$%$yS&dCrt3gFpbn zMpiJ?mTcbPz$h#k#ZY3c3C5gY*fk)C2D`m&DQg=o^Jh$bUv~u2iIht01^1Nn*^k&P zZX$}SbY(Bw`*3YBD;0o)t5j#NwI?)xyLWlThG+?PR4U^l2Sh6XyL?I>ddpVk<54PV zM?WKM_%Q@P2qdEfib7yEhJgL{HzjDZLbM#^U^c1pH^Ai> z;4KLfdpl|VHN}c=63&?^9n3Kp;7jq{BWbr@{ zU($^|UsLK-nee25EQ|iK{Zt~l?}Jl%S=Bs8ta@HzIxDhWh;p?mj+qtD-i(TWK_~7l zbiW(evxRB@2Eyp~96q!7oOQ-PSMa$JGoHX_;EenDEZ{ST&lzX@0zPkZf531)K7rvq ze5Ucaiq99BKEb7&@eDrCJL5^_r|682;?u+D1U_HJli?Q?f4_|HY39qtKgrJo^Fi<_ zmOsUO7$njK5&Xfh^u4D#H z-~K&-DA{h5jgewvXV|xhXi52uCVD(MJoq~}Gy!*T=vzv|w=l2A*d)Tw1pAhW+28dh!xHOD!wgYknX?>ajq|ZeJg$c%6c2`v3E{)T>^g0EnH63+74oxtzX81QVN0QD%J-+t# zzfgD(6?G`)aR(?NU*|-;=x8Q&9D)AypZqO7OeuI;0?Wt1I)Q)3ZEzh;)p5q{4^0sD z(-CT)g`OT{4CTMZ3xZkw5>Ky}U-i_`FoB+le+gZdr??LEgjH8s*JW3RG5z1(J)xPd z<4_h}{XJzG4__g!>kAWQMwNtziSdo0V*I=RW5j^SUmAW-$#M7h6h#mIDZbA6cRv95 z#N;vjbLSuHM(N81w^}fj7HI>N4<6J1{`>DL|I0d4eBup?|CFO2$Bcri;tlhs)NbUs zA58zon>LxuOEO8QRhp92ZT!nLPC1jE=E;%=`pYj5laU%9fB6Uh^Iv+O;U7)+779mO zWG$fCyyO+OS=f%WP6fhHKq-!fPxTEaRHOv(`}j7Cf06HZ5NuVpR=xtuDdEzpU^)Sj zKkppG&Cxmsg)I!z`xh$rGZf|u*RLm87*mdz ziID0C{r3C+f9oF+&9i*4uz3WOAH4iagmR8SR~;^k!%+U<4TCblpoFq40X~TG>DH8C zY>F8ol(Xu@UEVIuU z`ZN3HoB{rRFnmb|Ylp1$>UN*QT6$ocv;5)uUSHCcXjm0bYh-X!BTheCH&OPb(H6#cwJ!mHl2R*^^;6<%jqXSnC7%(5?7t=^iLXnbi-A+@zeVLc(XrE< ze{V{CV>w=)+_4dsA**~t#}f68I%CAkD%{|*HHt?(yuf`WFbC`O6`<`Sdu7=!FEMSi zzw+51zUuT}a^6Yz>p&mBMc>QJ&yBwRDdi`$snh+WL)zd?s&`O1VT9+Uc_x%@b^nWu zPw__i;Wp1hpP*g`QSFKz!U^VUCR4)Ftrk7@BMkc0bl42;Ki zn&KF7;ggOIM^&DQ!kG&IbK!7_ZMw|-c}f;d&*b#9183F_@`-VYVNkM|oI!DUn&}7Z zPxJh)4^^Gbgdf={ealxXSY)Sk@^gag8wkUwIqfxzn>`lNi)WNs-502WbV3)Tf4-^p zl6E@)hXJHTwOU2yJR2bMxN zuiRh5=GmGftjlv?&P=z|QkrvMf0sBU)|jr(DKWu%q>wzr;j`WclTv)?6mXVhxY!4i z<`hjZW+}Vm*kpp~5H6K7iGBw?)~j9~F0su>Hx%A;v0j=~v#}HQ(fMaOi2gNhPzQpD zEIcsnqBAXtJ_|Qk)y6Hqt%~R9^w{<7!O8VHoM45UwP22ObS_qqlo90HfBbiV<~-9f z*9N{r`vf~~f(@S+u0O9{+*xyuNfKbHe46brqZ)lY2lhhP)Y9fMfYuswG3~LVrNqHB z9I(?9>}9a^e~tqa!0cfNM!(-?2>{GViq6{}2jn{I^92rClgIVi5Itv#m(GOO^DLcN zWybh9pr1cLEc2J5^z%iGe}5>%I5T*S)o7N>Q}K+^CuOhx`p3#U1LY)ZLK&2$KU5y~>Q88Ak9u4N-oWt~Uw=xpF_x1~C`!%>clsa$#7useJ_9xVP|k-81@QMh zxy#i;A-uXqJpKU4#|B$qKYGY<{4ak_mwHP5Ck9fRmK*G~d>lZ=e*z?jOZ*=_bIqy- zsLwmDe)PvC^zF@1DeRHy?4@P~GJE5evU!J`9&cFXIf3y)CAt70{nNMtPfH@taHN}1c5oBf{ z>5GpPi<0DmHtWogQrbK~te6Rb*RtqWEP9R2g5KZeIYtUB#YvGu7j*$YeU7IrOHc5d z%p0w%r@-#{a!h-aYoHvP#lR4qJeaMDhI`Ig`)NKZ(wD$~f80B$MhzYO!~~GiMA+bE)6Rt2~oH#Riq zKSi)-IOLw=eemWyu?S{QX*N!JPkf1OWcI2fPL+{y;5I;S9L&DfoV`vkkE6=Y&wLp& z#~cY3ca*0bf9EN$96aT5v${F8Gf$ds+>!8*>7G_Xv!^ywW*rvH)K>w-sm(5Q49qQr zhPej%kRr!pWTXW!A1vr)ATn@e@4m@pziY$JlvKI^$FVr+DshFbBN4 zI;8OnOf$|z=u(31TS76<`G*_J9 zNpP|Ru$AC*U=Nc0zHzf5F+r68T_FS04_MYD>(jvJd3+r70lDYsa~1UI0_klM>_;eP zKyOm$(qIarcgY2n5cHw{HLzbvjdK4C=!%y5=U|Hyj_o&JNYGAy8tmyy33OsNK06Qk zz}IY&Q3_x$h4Y{f<4wgp$9-9bNr1hW$nbc9#|_UpmO0DgCHA#fI3tk!v#iSu_m6>2 z^s}r(vh!_zjx!z8e~a-Zna7hXm-#FUz+52c1;L#7{DPD5A{KvxJ>Z*U->1u|`%eE9 z>y`BQa}Yga8$CkNq`jXwdb1CEq#yi{8qb`Y(enATV2=rg(26}N069e~f!;h*j`}Lc zMN;HCxO`hymDC~Z`aDU3C%FLjwu_k1pMBGDnkmhO^6axM4XGS}#FNjY14Zgs+tee8 z;qlx_&<7Cuiq?Og*17YS21Eh2kmfxJH#paWI@~Gs;SX5xDEw>JK8$=)kvHstI8Sg0 z&J5TkF~jMuEq}j{-8N16a6@YgIt-K)t*Z3c@~+<;fbd(YfOK)J|Isy6Q$X=rg)NJc1a!K zh~{7jd-q54(ULlOJhjbzx!@%8QDXe_ocqKqGO<>3Z^n()=2?rUC3DzMlRlAbnc#nZ zA7~funNP`%2sYaX=J7wjeDLr^cYFMa-5$GlPxkoy9H&PgboF6`I*#f;iE8usuZOCh zI6dps9t(e}h9zh2GveSky72$Ih0cOL99iV#p)U%C%C1hc{~QiG&5kPQ$05+PbmWW6 zEb$W9-`tTX1DC;HuC-70f%*K;k3cMbL`p*~Z*_2*OA0qle^Y110@$yH^if1yrIxZ$ zbfhRb$|+~8-40uLQXIFZ!0aXaB#OHqbZ*=AK~jG-K9<~1a;+L;b^8oDKVKlHSpmkR zWBm%Sx0HjQKqN8OS#m`#<_;;&k5(NIQ6lgGz1~@$Vy08iwhD_~@Q>gZ3F{Z87`5uQ zMf}vE?tHkzCx@vg#T#N$(-N33`j3|6juu1Fdaln$;%>5C9~pCh;6bSMW2AXHYU!K# zkMMtW!GEZNK*HusJQV+FPE9?qN8SfG zMYOVy@wp?!fU^l4bAAxx`hScOLH+$rkA9CPGTVV?Y>^oKJX3P!3(^dyDE$T7Q^(B4 zup6bskFgf?{@;A|MkV1uu`poO&4C+1_t$^1r@jD@hg{Zup?Y}T{htchxba^4`e%)o zI=|CUm$83^LcwQx-e;f1;%H`Hdhsv(7rwyt)sJeu}ZSI0@Lj%9YE9G9B=8=w`JF`xIZ#Mp)SRd3n}0W$M&bIdwwiTTyhuwi8A z*RlN<-JJTX@W<*0Kz`}9AN+&=3&Cffz4qxJzNDVt`)hxRp8byU%>Gyde`~1Q{33Zt$z4rYd{Rgea>X#v3?w_HHmyQ$j(*>$Y&O3n{8yv$TPX(txe5ylp0PSk8GZ!OZ zJ|4fJ&`V%Gpood$p%EP6z(0_KPc4%%xQ4Y1vz71nqf?6PJ{i$ z!-NAn>Cj0refqd(gfB@(!G1I|$(JT`3{&KzOc#be60*Od(*;P8Z}CSM&V21T59T)? z`go@R_Sck@UKaQ=CJFYJ-vmdp(#KPaV1ITr4))jJ^kH)m{l;Vo^an=1qc3-S5zPO9 z!+wOb!g$NDC1;Ta{simL?;9t1S6LqO#p!v5%QC+gcs}!sM)S+|P42(IwrPPr&XZlZ xJl`4zpN>~lwvhcl{<(Vr|Dh_`huA-NGE*xqDb-wj6@Gf@?v>|i{|{HxS+kX8`9c5y delta 10601 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 DkDuwc diff --git a/core/src/mindustry/Vars.java b/core/src/mindustry/Vars.java index 6d94538c3f..c62c621d45 100644 --- a/core/src/mindustry/Vars.java +++ b/core/src/mindustry/Vars.java @@ -389,7 +389,6 @@ public class Vars implements Loadable{ } Locale.setDefault(locale); - Core.bundle = I18NBundle.createBundle(handle, locale); //router diff --git a/core/src/mindustry/content/SectorPresets.java b/core/src/mindustry/content/SectorPresets.java index 808905f967..cacb98406c 100644 --- a/core/src/mindustry/content/SectorPresets.java +++ b/core/src/mindustry/content/SectorPresets.java @@ -58,6 +58,7 @@ public class SectorPresets implements ContentList{ fungalPass = new SectorPreset("fungalPass", serpulo, 21){{ difficulty = 4; + useAI = false; }}; overgrowth = new SectorPreset("overgrowth", serpulo, 134){{ diff --git a/core/src/mindustry/core/Logic.java b/core/src/mindustry/core/Logic.java index 85cb166237..4a5d7175af 100644 --- a/core/src/mindustry/core/Logic.java +++ b/core/src/mindustry/core/Logic.java @@ -101,9 +101,12 @@ public class Logic implements ApplicationListener{ Events.on(WorldLoadEvent.class, e -> { //enable infinite ammo for wave team by default state.rules.waveTeam.rules().infiniteAmmo = true; + if(state.isCampaign()){ - //enable building AI - state.rules.waveTeam.rules().ai = true; + //enable building AI on campaign unless the preset disables it + if(!(state.getSector().preset != null && !state.getSector().preset.useAI)){ + state.rules.waveTeam.rules().ai = true; + } state.rules.waveTeam.rules().infiniteResources = true; } diff --git a/core/src/mindustry/type/SectorPreset.java b/core/src/mindustry/type/SectorPreset.java index ab7f9b234b..997e014c63 100644 --- a/core/src/mindustry/type/SectorPreset.java +++ b/core/src/mindustry/type/SectorPreset.java @@ -15,6 +15,7 @@ public class SectorPreset extends UnlockableContent{ public int captureWave = 0; public Cons rules = rules -> rules.winWave = captureWave; + public boolean useAI = true; /** Difficulty, 0-10. */ public float difficulty; public boolean addStartingItems = false; diff --git a/core/src/mindustry/ui/fragments/HudFragment.java b/core/src/mindustry/ui/fragments/HudFragment.java index 2a6717cde4..01589c3c37 100644 --- a/core/src/mindustry/ui/fragments/HudFragment.java +++ b/core/src/mindustry/ui/fragments/HudFragment.java @@ -180,6 +180,9 @@ public class HudFragment extends Fragment{ cont.update(() -> { if(Core.input.keyTap(Binding.toggle_menus) && !ui.chatfrag.shown() && !Core.scene.hasDialog() && !(Core.scene.getKeyboardFocus() instanceof TextField)){ + Core.settings.getBoolOnce("ui-hidden", () -> { + ui.announce(Core.bundle.format("showui", Core.keybinds.get(Binding.toggle_menus).key.toString(), 10)); + }); toggleMenus(); } });