From 8ee3f2b2e630bd5317923a576ea4efbff385d713 Mon Sep 17 00:00:00 2001 From: Patrick 'Quezler' Mounier Date: Wed, 25 Nov 2020 09:38:04 +0100 Subject: [PATCH 01/16] Remove stray newline --- core/src/mindustry/world/blocks/distribution/StackConveyor.java | 1 - 1 file changed, 1 deletion(-) diff --git a/core/src/mindustry/world/blocks/distribution/StackConveyor.java b/core/src/mindustry/world/blocks/distribution/StackConveyor.java index b35f1630fb..4d6ca5d614 100644 --- a/core/src/mindustry/world/blocks/distribution/StackConveyor.java +++ b/core/src/mindustry/world/blocks/distribution/StackConveyor.java @@ -178,7 +178,6 @@ public class StackConveyor extends Block implements Autotiler{ } proxUpdating = false; } - } @Override From 51790e0bf90b31ab61e679d8a61b6c87bea31f9b Mon Sep 17 00:00:00 2001 From: Wiki Updater <57631841+Catchears@users.noreply.github.com> Date: Wed, 25 Nov 2020 19:52:36 +0100 Subject: [PATCH 02/16] fix ai schematics with power weapons and steam gens --- core/assets/baseparts/1591385293703.msch | Bin 122 -> 140 bytes core/assets/baseparts/1591385372367.msch | Bin 239 -> 252 bytes core/assets/baseparts/1599594352859.msch | Bin 389 -> 404 bytes core/assets/baseparts/1603215272794.msch | Bin 258 -> 277 bytes core/assets/baseparts/1603215415778.msch | 5 +++-- core/assets/baseparts/1603219511695.msch | Bin 104 -> 117 bytes core/assets/baseparts/1603222833941.msch | Bin 251 -> 263 bytes core/assets/baseparts/1605279968000.msch | Bin 237 -> 252 bytes core/assets/baseparts/1605281215706.msch | Bin 341 -> 340 bytes core/assets/baseparts/1605284013998.msch | Bin 313 -> 349 bytes core/assets/baseparts/752921320802746461.msch | Bin 401 -> 455 bytes core/assets/baseparts/753646105383927950.msch | Bin 177 -> 230 bytes core/assets/baseparts/753938078997151744.msch | Bin 180 -> 201 bytes core/assets/baseparts/773974064850272309.msch | Bin 279 -> 312 bytes core/assets/baseparts/774013552553754635.msch | Bin 534 -> 546 bytes 15 files changed, 3 insertions(+), 2 deletions(-) diff --git a/core/assets/baseparts/1591385293703.msch b/core/assets/baseparts/1591385293703.msch index d48006b7be1a024ec549e8beeb3b92213d65fcd5..a4e028a60bf63a5c689a5320203151a22e67f552 100644 GIT binary patch literal 140 zcmc~TPR?Mgn4{Wzk?XJmk8A!_LrKwB?LPuBy6L%8l*w6O8sM zzw7KX4K%tC5?}G=sc`m*)YLCaKKFd(uAkDIbwl&GZozaVhU4O5Sxs$QSH;@gV_2J@ x@@zuC7^_lY{?&k6M<=EFo;2ov)v`@qdRKi^%emyn*W6aGw|e|xPgo_h7XUYbLdF09 literal 122 zcmc~TPR?Mgn4{X`$aUC&hebWi`>vBhU59+C&|~i`_U9LlPoLz)>5)_(rqgIpu=?fP z$|+m)RYe_x=2zyvom{;p_hif7wJVS7Uftsss>F_u&(B=*oBzTi$y5Mkg*Scx diff --git a/core/assets/baseparts/1591385372367.msch b/core/assets/baseparts/1591385372367.msch index a45bad9e2dd44d8d149751aba79ee91caedc2055..c49595751cbc927b72fc9f3664eb672b85add973 100644 GIT binary patch literal 252 zcmc~TPR?Mgn4{a5o!4w2&~n@+$77aS`-^z_Q?0oUOwy9eJK3+I0VAqXHfgrC37IHqZeDWBx5sIUXuoWz+uVi5K5mmQF1piv^JInkCjXey!}i;*%Z23E z|1q19tG#5Y(9SlEtgr97?{LbjQrYmd|0w%SljhT$JLV+5ncHs@a#&*lkKL0Mg{MwU M*7(mTbJ2Vk0R69c2><{9 literal 239 zcmc~TPR?Mgn4{bG(67Znpk=v(_s-8YwQTj@7iz6x=iIVH#DD(X8O76oE&iRVzWMS& zV?Qq658MZPZXY-36WiARaPq$7L#4c1^zHojN?$TLzoPcl$4$qqRmC4U zoLnZs=9O?XNZh+v#!#!!%!bc|b=LurEv(xXIM=d#R()(Acw6e(M{b)sm8Fw7POHUw x9(=rd+X1nXrml;g=RD2MJ}_g-OO|jyY0Q7sNK2zxUC>nTXrx|yJ)e2K+EiQ2b-KZcZ)x$yPxpgvY^OA(B));db)q;9$O#L51C8e zUGsRrugCf6Xl>ODMVJ4-nw0!rTUGDLx%_Ne=KnYC8}9rq@31)f_E!AgM~iPql<{x> zdE@tb-Cd4qey{EB?|E^&_SOuMGOh&sZ>cwyZFrEsFW~ z{IdscR(jbL29=zP-=~YOm)lx${r{Jnv7)zdN@tKW`uVjjOKa=ihNZ&9z`+ z+{4J}mBMKhvBYMTLaQSeN0Fe!%rhNc7dtiuFrV#;Ie2o;iU}N9u8T87)sIFlT6;s) z{`x5o{b>)`CG>7btkrT|n=#>Jp8K+?27*&Axv2VvxFk1BIz3g#d6z@j<@kute=7gk z)lc|ndOrRp|FmmSYj~$_-4g6wZiZ_^68gPiu87D QSnQG@qB`ln#jU7p00q0qCjbBd literal 389 zcmc~TPR?Mgn4>x&F|XNxr!~I8p&@A3TbVyMdCR77Eb8kN5@C9KE-rI!Z|j52YoDhl z?|Hmv!r5=n7F5gMdCpoXF+H`YqC0uZ=N)%<-8;Yg_g6;Wj_dDUrHSV(*|PWc3#aFD zhBxMMpWWoUI{EL0-idSmxG~L`pZo6di}acwcUu*EcE6tXp#ILq)NPfY$`l@^ek?bd z^Y_87lWnV=k9wEB-pBQCC z@^8XK2W3VHNp2JIU?d=69u<_F_vQ7^U)8n~FRhNRx8Z0LTfbwg zQtDAR(c49L8WwfMcm#D<_X_WPy=2*n#E+diL2hannqnOGAMloXD;Js<-b6Rc#gPbN5e$M(y-E9iCaZuvf&Hn`=e=(!1fd0J*oo AZU6uP diff --git a/core/assets/baseparts/1603215272794.msch b/core/assets/baseparts/1603215272794.msch index b2351a38574f4c924aef5dddeceb5d3940902246..1e953643c8d496975d0b997f215197e6522b7b31 100644 GIT binary patch literal 277 zcmc~TPR?MgnBzO~ZeELmKr4Gd%JsC}zXkR_S-9d7Z)cNZ&TjvGA zR?-h#JUnuoOY4&|obUcyyhB>@%>%y5ng<1uh9#{JOLecC%;WYvDJu5jm4A5su3wk0 m&R=KMd-0XQA*RDG8ulGEIeL_vv)P_`yShu;6aD$;oQ(ksDTzk_ literal 258 zcmc~TPR?MgnBzOaJMV~sfD3nz;l{-$&q!{17H~pMS%pVz+h@zlvY92$Vvz@4$6r+a z(6hS5EAQ)!d*|-vuRHR>&QP~*zW0s33Bn&*GVM>_y{%mT!^yL6-Ho%V@`cui9tK&2 zTR;EuZhz6i)6@R!+@*Y`OjFS<#{AmNDdPE_mEU*#t$wuLr1kLnvh(RPZAE4`Dq64m z#TfT8!Q=%Ci>oNp+$Y=#E2e$r-IbWJ!phT1@zt6MESE}IgbXr*1l^pU9yf10&cAns zmE3CXklEof1|`i8S#7^pX~in2mPag@t$bJJ]6!NÎÐüæ0,‚)܇&Ù²öbKqùó~È$œÿ+À‘­Vh¶•ò ¹} ¶U +êwZÐ'È;¤$´ ]ÑUô´…]P,(²»Š‘¡k¥¹úŶ,e \ No newline at end of file diff --git a/core/assets/baseparts/1603219511695.msch b/core/assets/baseparts/1603219511695.msch index ad1b2081190d43f46eec12e1de164b38c6b6d725..743c38b4012e7500b5fde78e792b1e4e9eb45b64 100644 GIT binary patch literal 117 zcmc~TPR?Mgn4{|(&DCrmAhTGp%l?~!<&`jT!6YHG#!I`!A5SZLmM&+&+f*BC#_?-H=@Qz`nSU-<2#eHQY#+^PExZAe)8cxL$|z@tij^U Y`DH7&U9e8QzPcnJeg8YQ9bxin0Pn;yRR910 literal 104 zcmc~TPR?Mgn4{Yj$kl8h!m`|O(W8D_55BJ*{DMhBLI+Pzzcr<-zU)RMn_6>kk;YK|DCeDDyJayqnaiAd@BJhLCX8oZUpb7z{n zcAGiBdwX`_){XHwTR!LPPnNoWktgr%<1I@xD;6A^y8Z5pJ>6!l9Y$@sJ3FqMsJ>qQ z_S)Bj^}DRSXKC%xd3gHhx%Pvln|l{Ke_h}Hb3^Cma+Bl=msrgMD{8tf*{*YKO7ex}oFL8s3zjhjxjk_W~BnDQj&0C|%t&bLK;l@1Z8rE1Di;_q-8I Y?seOw{%T5tuDFeI`o$ITv3kxr072@6;s5{u literal 251 zcmc~TPR?Mgm}5F2JFitiptb+O>RZwI;ulnZEcRBiGE|8%=%`(@H}j2SFvrhlh0lDL z*m$^>n)4q_c(i3!#vJ2#L*4f;(r+%yxSrC?KCd9TH0Fr6iKfdH!#AEvag%+I-TrIn zcd-71dGxHX9qS(kKYDRkXR&di;Fka2UTi;bX@`_P-(F+s*5WOFoxYzWwr@D@$*||4 z&8h~glhF>VjV%`HPZ3|m{k8R()9i(uQ%hTx@m)xrwp};-)ep%4%7*rLZAR*70zjx61i9DRKoC zk|vsGSa$1~h%5`=G4WdC@})kOjC^IBGD$q~7KJ;1X{$a8FnYY_nZyl!#lSB`v7FD1 zrcPLv`_0);zGQO9fBT-tlk7WdPbn{~=Uyss|3cxtCk@?+qQy@%-S(WB;w{@r?OiJaZ?viEj9{Ik#OQriyI4Zj{UT4~S@nU;z L$S-E*)1FcQ2d#D_ literal 237 zcmc~TPR?Mgn4{ZsHm}8ir-hwK(R<6(Zx@cASlBPp*c#NzGV{Xx@b$NX(zo07*nX>N zJG#|%`X4WY-)_N)RgH5q=Ue2cK4IxGn4K=a`2T^aryq%V9od(1Ecg7y&9`e7y-11T z*e=xN|1je2l*`h!URgitdkRm#Kce?^<^oIkRtd9Tv1P{X5+An&&ANN+XDEYWuEv&K zw(>TD4e57Q=ek&}5aaEM$P`;UX`%b=lS>^JFIe?@Y3Abd@mrqvXYiIjH~(_Co-^dL wSN9i(QmIvwgd|*i{w`Tyo^C65d;>mzwjR_5Ehc;(CH@ss5=)7PDq=>NOL; z`sGrb=&Jo3eC97J!seelbxpGS@RKPrvsPa^+W`AklHMu(XY{5Kr z`(yiic1;(~j>|b7`Rd%tg)`6OM3+f#oyGogS6Qa(_O}F+uRN!oc6Kdqd6ZJQF0)i)Q*+0)Rfi@APSoKJirTWa zWa;AttD3W(hra&4b!${u)%#GTGpaSy+I1=_8@8_g5F31M8jFU45!Z{SEjkWzO;5P; zA{%4^`zC3A@v4`VtB|$xNIkhfW_3th&_?OiSH7&8a$Tv6XTrVDg-;IfdmhTU2>{k| Br;-2w literal 341 zcmc~TPR?MgnByB1o!4w25R((vXtQ+Qg8zTMxbZ~@3f(v{W691cq0V!+0;3hHuWjDE zJDJ<+Qd~gRl@*$y>;5jyM=TbU0(}-6gGUUyk%wbW!;l1J`*(+G@tHj zOXD=))D#pg4aqrO6Ki>V*Von$f>FiM)80ntE)G9=m8a51RPa#B$;q1^L_RyQM9^!} zo~MFb5{r2MJlOK^w&4TQ87)Q4rx&ebaR^#ysCLC7w4%W$&rxCT;r)REe;Jb2mox$Z D)d8w+ diff --git a/core/assets/baseparts/1605284013998.msch b/core/assets/baseparts/1605284013998.msch index 31c282985c3b8371e85cc44cb593b393f0dbcefb..f08053df8747ad6968acbc4b2675ec904b17465e 100644 GIT binary patch literal 349 zcmc~TPR?Mgn4=qTJFLY(z**GzYG;CdOw|4oFUC znQ0u}efTQhvd;(iEqM2KE%##?_xBCLUAJ>~OXzfk3oqu4w`jB2(p+jb;{~%{`0HO~ zeE)h&ZC*bRzqT;u&J$n#i#bg*)jl5xmRVf*xG2~9z1>^!)B2nD-@agV|8|*C;)aYP z927opF}PiLwV1#q^DCJEmP`@w+l%SrwP2Qv6^3nBtF?n;g28S1$e)Sht*E KrTu!Ah;{%}PpGQ^ literal 313 zcmc~TPR?Mgn4=pQUDRyA6Vs7Auks7m-|znUPZ;@~y>qgBCd=(xsvV@VM>}%!BnI)A zVvYQKzN=?>w{c(GyYS`ROGgX+l0O{aJZiLC&$T_+r&)4N`Nd@dh5Ib;&$etUk2Ahz zxaOqml-2W_-nO1KyOp_#f6o%bNc(l>ms$Tm-4|Im_wZfU$IkE1q&$9b!K?o9^}M3j zOtz8t1D_Oa4>5f=anar1CYOKg?AyEW0ejb$H8BY+AGlI7CZwM5e8DdDlX0m_m+F%) z$z6v8ZA7w?4mvDkHSz3=dE^}F{q~!;-m-1-8T(X?mulonzt^58`nXB`Z^z~>m(GVp zv1xMTY8pRHX57;x81H7i##Kxrx8iNGo3$;$rvvfbf%p z`iIn|*V*k@XZ!o()w@eu>q{S|e%SskY4KshZx{Ri7X1ysIET&p_%`mp1_70ewmt~Z zd;B2R{cP9Ni{DH-5BEwfEX_B(QQA=T$y}~yUvb8-7wg`h5w|d&A#RnocuAn2*^R^v z`3!c6f459xb(^62#9)?&u$BgME1O#K7VjJ0ej8mlwJbw4m#b`VymLkB)9e_r1qwzl zCfzvTal}nX)IjuLooS%w+GP@RXFfTjlCBnOux80z9@7xE!ekb&qM1+3{%CHTS~Npe zIq#c`Vs3FKUra{%=_0wVB;|G9JJqFLYb@>gHHEUGN}G%k0Zxho>`zS=*E5vgJo-O*_-G?Rk#HoRxw-)%^$K zo~=u(UzYr7t@B-X^I5I4=Vj<&?-`o9q@9t^ueA3jk zc4=w)AN5*!Vo{XPg7ujnFAD55nKb#%hpYwJ%Pwn5Z9Nm|aktTT@}e7cZ=?U)ZgSc7 z_ujs3=ihpZ1^q6VqLsQJTC$&kt@#Hm4{n|IYYD?aT*dFk6FkamivOvk@uHOA?dis-F z>v`_y^OW7tobiJB;p5#C_}#na$6q!nmB`;0Q1&Hy(|qq!65)(@W-6uXv%mLV_~6=> zr!z0itx5dH|Jd}BSWRTw_sP>wv;MYhy}WIj>e2ttN>8U3sovFKw)oK0D6}zvYu0MF zBa1HTICF2=)z~uWO1R{asXOE#n0FT`d@ifl5R{00wJUJYkx6f!e{=dgpow@$yT~S`C z);rPe7WOmOR8QD{clSE&i+R&DrG6D`VQ%lZeB{X)p=%Zbe0x(T?$5YCFD$)M>WsGE z=bqOBG5hswSo7UJiM*AIyJj)z;f6q#f{AX7YbPw!OF3(l(dZTOcV*k96RcK&oO8d$ ko}N7IQ&7~DyFqH)DKZPWKBkIpvGM0T;d{nDTvojW0QZ1S*8l(j diff --git a/core/assets/baseparts/753938078997151744.msch b/core/assets/baseparts/753938078997151744.msch index 6a666a246c8b74b23bfff80cb6cb1ab3e3f7ef47..cba3746e5b7d988a23fe6b1f0a54fa4a699df899 100644 GIT binary patch literal 201 zcmc~TPR?Mgn4{Vgopsni!1eu!Ps*G}FVu2;n(Q!rv6gUhfr{~@$0Z+^PMz{|#^Kt6 zLI?K?_v|F(r7iErB=B{&*GAO6%c-j&-RK#{r-R}$r@jon0O_B^@@Gr Jmy0%z0050WTsQy# literal 180 zcmc~TPR?Mgn4{YBm+O!L&k_CT?+cZxCms41_@OYX*J#G;6ISN(aa(4#e0Z!^evnV~ zAkVv#7ID`;$IkH2wblz-{3&tA*;tp&J5D53_CBiNX*$M!J^H-!ly`Ra6788hhss3e zslEAo=lHv)CY3YNDmU~dCWDMo|3rk$vVkRmtXIbpF%uIF0+3?(L nCwaP-bOdC%PgG*nN-?dqUm3FKT62>_Xw%Qd41XDX^L6C_lATvL diff --git a/core/assets/baseparts/773974064850272309.msch b/core/assets/baseparts/773974064850272309.msch index b9109ca782ce11fe85fd9316de7b65e14f8375c6..8455943a23099ac36fbbcca14059d8b6d3490bd1 100644 GIT binary patch literal 312 zcmc~TPR?MgnBzL(bzX~tK&yLT;`O~ZZ!hD2c;3$cu$HMx7u&{{W-l*)vCU4O5$Eu! za>n5^3^s=}ThF{a=#Xmt{m-T|$9!+S-giAeU|U+=p1Do3vIp3nxV9(!5nWaJX6t(O zw?6TYZ$@4f3dzfaWd+`5i6F1CnPKvCwR0ahW62T(ck9dQtT2^dZqEURLZ)3WQg!{41K*KzV?JS)qiuS#f&DGekd>QwV WexW6D5pyle{)I~XW;^`M_ZR?$c9aSL literal 279 zcmc~TPR?MgnB&^lo!6ou;JThE>w0PV+w9BrEAC$jNagKZ2Du=VQf4+ z_q5H2hG3qTCHVojuGz*;JGmpU`flkj(aPjyw{911Yi2f@a`{4LeDAH9>lTG)D>$?D zoxf+ccIB&sduMDvsQi2N#4pE8k1d|_cFo+_U;q7g&h?G=J^UzJ%g}1`m#S^0S1WFp zGRQS@RPIocdEvk&>b$_?dgcusQ>^f~%W{E(2!$qOoT?v^iW zrI3zuGX?Yda;`&p;zUN_(TZkMp}`?8haw!Lk(j_DKIT+aJ^S>~VMt8;S>+eMVD zE3Cf%&wowT_1V{A{X{qSfAjoh%MvdCHhNKw_Z9K$mrpOP+;Xt?`OiJOS-ke{IDF`% z%ZuFDQag|DA5TxoOh2zSDcH@9qayf>q7@9PJ%*jAT&9hHse`OwL2%(Gu6O3>BpnekI8=j5iA z`cAhgrXpS{oQG9~R>q|(uefbo@Y`3nb>H8qSt}2)1vTo1oVq(#B~)fv%8UgPzm9py zn#!8$&a!x*V0h55sql!3QuhqEGfG7(dNkBNMqQ{nRbaRCZl3M+^^Usnhv#PRpUZtbPoL-{Nf~yZs4P|WP@Zw8Q(dERQi|hZ=1D7-20nhiWAbc9rn-;(5r$qY Mnv?3QY&Mnw0RJ!+DF6Tf literal 534 zcmc~TPR?MgnBzOKwrIA2z|r{($p#YjyI(5qa9V#Uu;)=0n{s%300pI4$yCvhz z))~#Pj-LK3`uW#|#d6)vmrE-Re4oEP{4~R0@AcU9KgwzErOuVc?moWBcIGTgov7&B z&DsCBSD!1}wQ+i|=hrN`r62chzj|>G=h4{#u{rL+(|={{`FrkjWc5d%(j;N-)580V zLvLE?-+eq?Gc)_#t=9*?`36^(_wRf>v;EfHQ_992@qOnkm(!K4u#RO(ymSnvN8frIcPW=3B&0wJaONq<-!PZij`{k`w;=j;<=>mT}?ChwS_IML^PhfSczultVYY7H4D zC7ippMYnS`Pd_`amB>>M+V?Q8y}smBJjUeN56y2y#tsM8|6$a2Td3glgTJt2rz8N1stG~> From 4ac26d86f5f761519c9a6ef3630c8a041bdae3e1 Mon Sep 17 00:00:00 2001 From: Antsiferov Andrew Date: Wed, 25 Nov 2020 20:04:32 +0000 Subject: [PATCH 03/16] Remove unused imports --- core/src/mindustry/content/Blocks.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index 8fa2510a57..3f7652b00d 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -14,8 +14,6 @@ import mindustry.world.blocks.*; import mindustry.world.blocks.campaign.*; import mindustry.world.blocks.defense.*; import mindustry.world.blocks.defense.turrets.*; -import mindustry.world.blocks.defense.turrets.PointDefenseTurret; -import mindustry.world.blocks.defense.turrets.TractorBeamTurret; import mindustry.world.blocks.distribution.*; import mindustry.world.blocks.environment.*; import mindustry.world.blocks.experimental.*; From c874089f27b264123f17735f9ce8d6f471ddd02a Mon Sep 17 00:00:00 2001 From: Anuken Date: Wed, 25 Nov 2020 15:42:51 -0500 Subject: [PATCH 04/16] Bugfixes --- core/src/mindustry/content/Blocks.java | 6 +++--- core/src/mindustry/ctype/UnlockableContent.java | 2 +- desktop/src/mindustry/desktop/steam/SAchievement.java | 3 +-- gradle.properties | 2 +- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index 8fa2510a57..b48fccd272 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -1221,13 +1221,13 @@ public class Blocks implements ContentList{ solarPanel = new SolarGenerator("solar-panel"){{ requirements(Category.power, with(Items.lead, 10, Items.silicon, 15)); - powerProduction = 0.08f; + powerProduction = 0.1f; }}; largeSolarPanel = new SolarGenerator("solar-panel-large"){{ - requirements(Category.power, with(Items.lead, 100, Items.silicon, 145, Items.phaseFabric, 15)); + requirements(Category.power, with(Items.lead, 80, Items.silicon, 110, Items.phaseFabric, 15)); size = 3; - powerProduction = 1f; + powerProduction = 1.3f; }}; thoriumReactor = new NuclearReactor("thorium-reactor"){{ diff --git a/core/src/mindustry/ctype/UnlockableContent.java b/core/src/mindustry/ctype/UnlockableContent.java index 7848882206..9a87e622b4 100644 --- a/core/src/mindustry/ctype/UnlockableContent.java +++ b/core/src/mindustry/ctype/UnlockableContent.java @@ -110,7 +110,7 @@ public abstract class UnlockableContent extends MappableContent{ /** Makes this piece of content unlocked; if it already unlocked, nothing happens. */ public void unlock(){ - if(!unlocked()){ + if(!net.client() && !unlocked()){ unlocked = true; Core.settings.put(name + "-unlocked", true); diff --git a/desktop/src/mindustry/desktop/steam/SAchievement.java b/desktop/src/mindustry/desktop/steam/SAchievement.java index 092f486249..af83f545ce 100644 --- a/desktop/src/mindustry/desktop/steam/SAchievement.java +++ b/desktop/src/mindustry/desktop/steam/SAchievement.java @@ -3,8 +3,7 @@ package mindustry.desktop.steam; public enum SAchievement{ kill1kEnemies(SStat.unitsDestroyed, 1000), kill100kEnemies(SStat.unitsDestroyed, 100_000), - launch10kItems(SStat.itemsLaunched, 10_000), - launch1milItems(SStat.itemsLaunched, 1_000_000), + launch100kItems(SStat.itemsLaunched, 100_000), produce1kMin(SStat.maxProduction, 1000), produce20kMin(SStat.maxProduction, 20_000), diff --git a/gradle.properties b/gradle.properties index 151ff7ea34..e5c7e5fe4d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ org.gradle.daemon=true org.gradle.jvmargs=-Xms256m -Xmx1024m -archash=6742c2b110eeecd1934c42b5b1c87b00c911ecc4 +archash=7a2a357f6cfdc3725ce581093a0ced91f4474222 From aabc094dd93f5ba9d04acfe4a9f00daf21a249bb Mon Sep 17 00:00:00 2001 From: Anuken Date: Wed, 25 Nov 2020 15:47:44 -0500 Subject: [PATCH 05/16] Testing BE builds --- desktop/src/mindustry/desktop/steam/SAchievement.java | 1 + 1 file changed, 1 insertion(+) diff --git a/desktop/src/mindustry/desktop/steam/SAchievement.java b/desktop/src/mindustry/desktop/steam/SAchievement.java index af83f545ce..8f7ad64330 100644 --- a/desktop/src/mindustry/desktop/steam/SAchievement.java +++ b/desktop/src/mindustry/desktop/steam/SAchievement.java @@ -61,6 +61,7 @@ public enum SAchievement{ enablePixelation, openWiki, useAccelerator, + ; private final SStat stat; From 709f43b83ca9ff0e121a296bf9d78e2331113205 Mon Sep 17 00:00:00 2001 From: Anuken Date: Wed, 25 Nov 2020 16:00:35 -0500 Subject: [PATCH 06/16] Testing BE builds --- desktop/src/mindustry/desktop/steam/SAchievement.java | 1 - 1 file changed, 1 deletion(-) diff --git a/desktop/src/mindustry/desktop/steam/SAchievement.java b/desktop/src/mindustry/desktop/steam/SAchievement.java index 8f7ad64330..af83f545ce 100644 --- a/desktop/src/mindustry/desktop/steam/SAchievement.java +++ b/desktop/src/mindustry/desktop/steam/SAchievement.java @@ -61,7 +61,6 @@ public enum SAchievement{ enablePixelation, openWiki, useAccelerator, - ; private final SStat stat; From b841af3a488f1e929737a3375a9472b7e18f5fb5 Mon Sep 17 00:00:00 2001 From: Anuken Date: Wed, 25 Nov 2020 16:09:11 -0500 Subject: [PATCH 07/16] Testing BE builds --- desktop/src/mindustry/desktop/steam/SAchievement.java | 1 + 1 file changed, 1 insertion(+) diff --git a/desktop/src/mindustry/desktop/steam/SAchievement.java b/desktop/src/mindustry/desktop/steam/SAchievement.java index af83f545ce..8f7ad64330 100644 --- a/desktop/src/mindustry/desktop/steam/SAchievement.java +++ b/desktop/src/mindustry/desktop/steam/SAchievement.java @@ -61,6 +61,7 @@ public enum SAchievement{ enablePixelation, openWiki, useAccelerator, + ; private final SStat stat; From 25cb2b0abf6f798145ecc0270113e57d0f59e4ca Mon Sep 17 00:00:00 2001 From: Antsiferov Andrew Date: Thu, 26 Nov 2020 00:09:17 +0300 Subject: [PATCH 08/16] Add workflow_dispatch event --- .github/workflows/push.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index cf01e4bc68..56d3fe6dd7 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -1,6 +1,6 @@ name: Tests -on: [push] +on: [push, workflow_dispatch] jobs: buildJava14: From 93313664f0bbb0ccb86d06973cb832a5fda36672 Mon Sep 17 00:00:00 2001 From: Anuken Date: Wed, 25 Nov 2020 16:14:39 -0500 Subject: [PATCH 09/16] Testing BE builds --- desktop/src/mindustry/desktop/steam/SAchievement.java | 1 - 1 file changed, 1 deletion(-) diff --git a/desktop/src/mindustry/desktop/steam/SAchievement.java b/desktop/src/mindustry/desktop/steam/SAchievement.java index 8f7ad64330..af83f545ce 100644 --- a/desktop/src/mindustry/desktop/steam/SAchievement.java +++ b/desktop/src/mindustry/desktop/steam/SAchievement.java @@ -61,7 +61,6 @@ public enum SAchievement{ enablePixelation, openWiki, useAccelerator, - ; private final SStat stat; From 977b55bf3246bc6601a72bb06fb0685dda6fadcf Mon Sep 17 00:00:00 2001 From: Anuken Date: Wed, 25 Nov 2020 16:25:39 -0500 Subject: [PATCH 10/16] Testing BE builds --- desktop/src/mindustry/desktop/steam/SAchievement.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/desktop/src/mindustry/desktop/steam/SAchievement.java b/desktop/src/mindustry/desktop/steam/SAchievement.java index af83f545ce..845334a539 100644 --- a/desktop/src/mindustry/desktop/steam/SAchievement.java +++ b/desktop/src/mindustry/desktop/steam/SAchievement.java @@ -13,11 +13,7 @@ public enum SAchievement{ launch30Times(SStat.timesLaunched, 30), captureBackground, survive100Waves(SStat.maxWavesSurvived, 100), - //this seems near-impossible? - //survive500Waves(SStat.maxWavesSurvived, 500), researchAll, - //TODO - //useAllUnits, shockWetEnemy, killEnemyPhaseWall, researchRouter, @@ -61,6 +57,7 @@ public enum SAchievement{ enablePixelation, openWiki, useAccelerator, + ; private final SStat stat; From 2b8c11c45126120a0133d3c3a004714f1de33263 Mon Sep 17 00:00:00 2001 From: Leonwang4234 <62972692+Leonwang4234@users.noreply.github.com> Date: Wed, 25 Nov 2020 14:19:56 -0800 Subject: [PATCH 11/16] projectors blockgroup --- core/src/mindustry/world/blocks/defense/ForceProjector.java | 1 + core/src/mindustry/world/blocks/defense/MendProjector.java | 1 + core/src/mindustry/world/blocks/defense/OverdriveProjector.java | 1 + core/src/mindustry/world/meta/BlockGroup.java | 2 +- 4 files changed, 4 insertions(+), 1 deletion(-) diff --git a/core/src/mindustry/world/blocks/defense/ForceProjector.java b/core/src/mindustry/world/blocks/defense/ForceProjector.java index 078bc02807..f17ac79b96 100644 --- a/core/src/mindustry/world/blocks/defense/ForceProjector.java +++ b/core/src/mindustry/world/blocks/defense/ForceProjector.java @@ -48,6 +48,7 @@ public class ForceProjector extends Block{ super(name); update = true; solid = true; + group = BlockGroup.projectors; hasPower = true; hasLiquids = true; hasItems = true; diff --git a/core/src/mindustry/world/blocks/defense/MendProjector.java b/core/src/mindustry/world/blocks/defense/MendProjector.java index 1c171edfdc..1c0231f434 100644 --- a/core/src/mindustry/world/blocks/defense/MendProjector.java +++ b/core/src/mindustry/world/blocks/defense/MendProjector.java @@ -31,6 +31,7 @@ public class MendProjector extends Block{ super(name); solid = true; update = true; + group = BlockGroup.projectors; hasPower = true; hasItems = true; } diff --git a/core/src/mindustry/world/blocks/defense/OverdriveProjector.java b/core/src/mindustry/world/blocks/defense/OverdriveProjector.java index 7e645e5a2e..cc2c60288e 100644 --- a/core/src/mindustry/world/blocks/defense/OverdriveProjector.java +++ b/core/src/mindustry/world/blocks/defense/OverdriveProjector.java @@ -32,6 +32,7 @@ public class OverdriveProjector extends Block{ super(name); solid = true; update = true; + group = BlockGroup.projectors; hasPower = true; hasItems = true; canOverdrive = false; diff --git a/core/src/mindustry/world/meta/BlockGroup.java b/core/src/mindustry/world/meta/BlockGroup.java index 240e164ab3..8b73938ec8 100644 --- a/core/src/mindustry/world/meta/BlockGroup.java +++ b/core/src/mindustry/world/meta/BlockGroup.java @@ -1,5 +1,5 @@ package mindustry.world.meta; public enum BlockGroup{ - none, walls, turrets, transportation, power, liquids, drills, storage, units, logic + none, walls, projectors, turrets, transportation, power, liquids, drills, storage, units, logic } From 488147759a88ed2a28cf85de216bc46129e6da32 Mon Sep 17 00:00:00 2001 From: Skat <55407440+skykatik@users.noreply.github.com> Date: Thu, 26 Nov 2020 02:04:08 +0300 Subject: [PATCH 12/16] Some typos --- core/src/mindustry/core/NetClient.java | 4 ++-- core/src/mindustry/core/NetServer.java | 2 +- core/src/mindustry/ctype/Content.java | 2 +- core/src/mindustry/mod/Mods.java | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/core/src/mindustry/core/NetClient.java b/core/src/mindustry/core/NetClient.java index 841e7e42a7..2627180d0c 100644 --- a/core/src/mindustry/core/NetClient.java +++ b/core/src/mindustry/core/NetClient.java @@ -41,7 +41,7 @@ public class NetClient implements ApplicationListener{ private boolean connecting = false; /** If true, no message will be shown on disconnect. */ private boolean quiet = false; - /** Whether to supress disconnect events completely.*/ + /** Whether to suppress disconnect events completely.*/ private boolean quietReset = false; /** Counter for data timeout. */ private float timeoutTime = 0f; @@ -340,7 +340,7 @@ public class NetClient implements ApplicationListener{ ui.showInfoToast(message, duration); } - + @Remote(variants = Variant.both) public static void warningToast(int unicode, String text){ if(text == null || Fonts.icon.getData().getGlyph((char)unicode) == null) return; diff --git a/core/src/mindustry/core/NetServer.java b/core/src/mindustry/core/NetServer.java index 959874e82d..c7f3e8d72d 100644 --- a/core/src/mindustry/core/NetServer.java +++ b/core/src/mindustry/core/NetServer.java @@ -422,7 +422,7 @@ public class NetServer implements ApplicationListener{ currentlyKicking[0] = session; } }else{ - player.sendMessage("[scarlet]No player[orange]'" + args[0] + "'[scarlet] found."); + player.sendMessage("[scarlet]No player [orange]'" + args[0] + "'[scarlet] found."); } } }); diff --git a/core/src/mindustry/ctype/Content.java b/core/src/mindustry/ctype/Content.java index c56f465824..71bf965e3f 100644 --- a/core/src/mindustry/ctype/Content.java +++ b/core/src/mindustry/ctype/Content.java @@ -31,7 +31,7 @@ public abstract class Content implements Comparable, Disposable{ */ public void load(){} - /** @return whether an error ocurred during mod loading. */ + /** @return whether an error occurred during mod loading. */ public boolean hasErrored(){ return minfo.error != null; } diff --git a/core/src/mindustry/mod/Mods.java b/core/src/mindustry/mod/Mods.java index 706815d3b3..8e80777d18 100644 --- a/core/src/mindustry/mod/Mods.java +++ b/core/src/mindustry/mod/Mods.java @@ -677,7 +677,7 @@ public class Mods implements Loadable{ public Seq missingDependencies = new Seq<>(); /** Script files to run. */ public Seq scripts = new Seq<>(); - /** Content with intialization code. */ + /** Content with initialization code. */ public ObjectSet erroredContent = new ObjectSet<>(); /** Current state of this mod. */ public ModState state = ModState.enabled; @@ -708,7 +708,7 @@ public class Mods implements Loadable{ return !erroredContent.isEmpty(); } - /** @return whether this mod is supported by the game verison */ + /** @return whether this mod is supported by the game version */ public boolean isSupported(){ if(isOutdated()) return false; From a70e29127b120405b5d03a319bfa4ffa9b9a6074 Mon Sep 17 00:00:00 2001 From: Sunny Kim <58885089+sk7725@users.noreply.github.com> Date: Thu, 26 Nov 2020 09:59:07 +0900 Subject: [PATCH 13/16] [KO]quick patch --- core/assets/bundles/bundle_ko.properties | 186 +++++++++++------------ 1 file changed, 93 insertions(+), 93 deletions(-) diff --git a/core/assets/bundles/bundle_ko.properties b/core/assets/bundles/bundle_ko.properties index 0cc0f1d3b7..8ac9086c9e 100644 --- a/core/assets/bundles/bundle_ko.properties +++ b/core/assets/bundles/bundle_ko.properties @@ -19,8 +19,8 @@ screenshot.invalid = ë§µì´ ë„ˆë¬´ 커서 스í¬ë¦°ìƒ·ì— ì‚¬ìš©ë  ë©”ëª¨ë¦¬ê°€ gameover = 게임 오버 gameover.pvp = [accent]{0}[] íŒ€ì´ ìŠ¹ë¦¬í–ˆìŠµë‹ˆë‹¤! highscore = [accent]새로운 최고 ì ìˆ˜! -copied = 복사ë¨. -indev.popup = 현재 [accent]v6[] ë²„ì „ì€ [accent]알파[] 단계입니다.\n[lightgray]ì´ ë§ì€:[]\n- [scarlet]캠페ì¸ì´ ì•„ì§ ì™„ì „ížˆ 개발ë˜ì§€ ì•ŠìŒ[]\n- 몇몇 컨í…츠가 ë¹ ì§\n- ëŒ€ë¶€ë¶„ì˜ [scarlet]유닛 AI[]ê°€ ìž‘ë™í•˜ì§€ ì•ŠìŒ\n- ë§Žì€ ìœ ë‹›ë“¤ì´ ì•„ì§ ë¯¸ì™„ì„±\n- ë³´ì´ëŠ” ê²ƒì€ ëª¨ë‘ ë°”ë€Œê±°ë‚˜ ì œê±°ë  ìˆ˜ 있ìŒ\n\n[accent]Github[] ì—ì„œ 버그 ë˜ëŠ” 강제종료 오류를 ì‹ ê³  í•´ 주세요. +copied = 복사 +indev.popup = 현재 [accent]v6[] ë²„ì „ì€ [accent]베타[] 단계입니다.\n\n[accent]Github[] ì—ì„œ 버그 ë˜ëŠ” 강제종료 오류를 ì‹ ê³  í•´ 주세요. indev.notready = ì´ ë¶€ë¶„ì€ ì•„ì§ ì¤€ë¹„ê°€ ë˜ì§€ 않았습니다. load.sound = 소리 @@ -71,15 +71,15 @@ map.delete = ì •ë§ë¡œ "[accent]{0}[]" ë§µì„ ì‚­ì œí•˜ì‹œê² ìŠµë‹ˆê¹Œ? level.highscore = 최고 ì ìˆ˜: [accent]{0} level.select = 맵 ì„ íƒ level.mode = 게임 모드: -coreattack = < 코어가 공격 받고 있습니다! > -nearpoint = [[ [scarlet]즉시 스í°ì§€ì ì—ì„œ 떠나세요[] ]\n전멸 ìž„ë°• +coreattack = < 코어가 ê³µê²©ì„ ë°›ê³  있습니다! > +nearpoint = [[ [scarlet]즉시 스í°ì§€ì ì—ì„œ 떠나세요[] ]\nì¸ê·¼ 건물들과 ìœ ë‹›ë“¤ì€ ì´ˆí† í™”ë©ë‹ˆë‹¤! database = 코어 ë°ì´í„°ë² ì´ìŠ¤ savegame = 게임 저장 loadgame = 게임 불러오기 joingame = 게임 참여 customgame = ì‚¬ìš©ìž ì§€ì • 게임 newgame = 새 게임 -none = <ì—†ìŒ> +none = < ì—†ìŒ > minimap = 미니맵 position = 위치 close = 닫기 @@ -291,8 +291,8 @@ waiting = [lightgray]대기중... waiting.players = ìƒëŒ€ 플레ì´ì–´ë¥¼ 기다리는 중... wave.enemies = [lightgray]ì  ìœ ë‹› {0}명 ë‚¨ìŒ wave.enemy = [lightgray]{0}명 ë‚¨ìŒ -wave.guardianwarn = [accent]{0}[] 단계 í›„ì— ê°€ë””ì–¸ì´ ì ‘ê·¼í•©ë‹ˆë‹¤. -wave.guardianwarn.one = [accent]{0}[] 단계 í›„ì— ê°€ë””ì–¸ì´ ì ‘ê·¼í•©ë‹ˆë‹¤. +wave.guardianwarn = [accent]{0}[] 단계 í›„ì— ìˆ˜í˜¸ìžê°€ 접근합니다. +wave.guardianwarn.one = [accent]{0}[] 단계 í›„ì— ìˆ˜í˜¸ìžê°€ 접근합니다. loadimage = 사진 불러오기 saveimage = 사진 저장 unknown = ì•Œ 수 ì—†ìŒ @@ -335,13 +335,13 @@ editor.center = 중앙 workshop = 창작마당 waves.title = 단계 waves.remove = ì‚­ì œ -waves.never = 여기까지 유닛ìƒì„± +waves.never = 여기까지 유닛 ìƒì„± waves.every = 매 waves.waves = 단계마다 waves.perspawn = 마리 ìƒì„± -waves.shields = 보호막/단계 +waves.shields = 방어막/단계 waves.to = 부터 -waves.guardian = 가디언 +waves.guardian = ìˆ˜í˜¸ìž waves.preview = 미리보기 waves.edit = 편집 waves.copy = í´ë¦½ë³´ë“œë¡œ 복사 @@ -495,7 +495,7 @@ zone.objective = [lightgray]목표: [accent]{0} zone.objective.survival = ìƒì¡´ zone.objective.attack = ì  ì½”ì–´ 파괴 add = 추가... -boss.health = 보스 ì²´ë ¥ +boss.health = ìˆ˜í˜¸ìž ì²´ë ¥ connectfail = [scarlet]ì—°ê²° 오류:\n\n[accent]{0} error.unreachable = ì„œë²„ì— ì—°ê²°í•˜ì§€ 못했습니다.\n서버 주소가 정확히 ìž…ë ¥ë˜ì—ˆë‚˜ìš”? @@ -525,8 +525,8 @@ sectors.nonelaunch = [lightgray]ì—†ìŒ (sun) sectors.rename = Rename Sector sector.missingresources = [scarlet]Insufficient Core Resources -planet.serpulo.name = Serpulo -planet.sun.name = Sun +planet.serpulo.name = 세르플 +planet.sun.name = 태양 sector.groundZero.name = 전초기지 sector.craters.name = í¬ë ˆì´í„° @@ -561,26 +561,26 @@ settings.controls = ì¡°ìž‘ settings.game = 게임 settings.sound = 소리 settings.graphics = 그래픽 -settings.cleardata = 게임 ë°ì´í„° 초기화... -settings.clear.confirm = ì •ë§ë¡œ ì´ ë°ì´í„°ë¥¼ 지우시겠습니까?\nì™„ë£Œëœ ìž‘ì—…ì€ ì·¨ì†Œí•  수 없습니다! +settings.cleardata = 게임 ë°ì´í„° 초기화 +settings.clear.confirm = ì •ë§ë¡œ ì´ ë°ì´í„°ë¥¼ 지우시겠습니까?\në˜ëŒë¦´ 수 없습니다! settings.clearall.confirm = [scarlet]경고![]\nì´ ìž‘ì—…ì€ ì €ìž¥ëœ ë§µ, 맵파ì¼, 잠금 í•´ì œëœ ëª©ë¡ê³¼ 키 매핑, 그리고 모든 ë°ì´í„°ë¥¼ 삭제합니다.\ní™•ì¸ ë²„íŠ¼ì„ ë‹¤ì‹œ 눌러 모든 ë°ì´í„°ë¥¼ 삭제하고 게임ì—ì„œ 나갑니다. -settings.clearsaves.confirm = ì •ë§ë¡œ 모든 ì €ìž¥ì„ ì‚­ì œ 하시겠습니까? +settings.clearsaves.confirm = ì •ë§ë¡œ 모든 ì €ìž¥ëœ íŒŒì¼ë“¤ì„ 삭제하시겠습니까? settings.clearsaves = 저장 초기화 -settings.clearresearch = Clear Research -settings.clearresearch.confirm = Are you sure you want to clear all of your campaign research? -settings.clearcampaignsaves = Clear Campaign Saves -settings.clearcampaignsaves.confirm = Are you sure you want to clear all of your campaign saves? +settings.clearresearch = 연구 초기화 +settings.clearresearch.confirm = ì •ë§ë¡œ 모든 연구를 삭제하시겠습니까? +settings.clearcampaignsaves = ìº íŽ˜ì¸ ë§µ 초기화 +settings.clearcampaignsaves.confirm = ì •ë§ë¡œ 캠페ì¸ì„ 초기화하시겠습니까? paused = [accent]< ì¼ì‹œì •ì§€ > clear = 초기화 banned = [scarlet]ì°¨ë‹¨ë¨ -unplaceable.sectorcaptured = [scarlet]ì ë ¹ëœ êµ¬ì—­ì´ í•„ìš”í•©ë‹ˆë‹¤ +unplaceable.sectorcaptured = [scarlet]구역 ì ë ¹ í•„ìš” yes = 예 no = 아니오 info.title = ì •ë³´ error.title = [scarlet]오류가 ë°œìƒí–ˆìŠµë‹ˆë‹¤. error.crashtitle = 오류가 ë°œìƒí–ˆìŠµë‹ˆë‹¤ -unit.nobuild = [scarlet]ì´ ìœ ë‹›ì€ ê±´ì„¤í•  수 없습니다. -lastaccessed = [lightgray]마지막 ì ‘ê·¼: {0} +unit.nobuild = [scarlet]건설 불가 +lastaccessed = [lightgray]마지막 ì¡°ìž‘: {0} block.unknown = [lightgray]??? stat.input = ìž…ë ¥ @@ -588,70 +588,70 @@ stat.output = 출력 stat.booster = ê°€ì† stat.tiles = 필요한 íƒ€ì¼ stat.affinities = 친화력 -stat.powercapacity = Power Capacity -stat.powershot = Power/Shot -stat.damage = Damage -stat.targetsair = Targets Air -stat.targetsground = Targets Ground -stat.itemsmoved = Move Speed -stat.launchtime = Time Between Launches -stat.shootrange = Range -stat.size = Size -stat.displaysize = Display Size -stat.liquidcapacity = Liquid Capacity -stat.powerrange = Power Range -stat.linkrange = Link Range -stat.instructions = Instructions -stat.powerconnections = Max Connections -stat.poweruse = Power Use -stat.powerdamage = Power/Damage -stat.itemcapacity = Item Capacity -stat.memorycapacity = Memory Capacity -stat.basepowergeneration = Base Power Generation -stat.productiontime = Production Time -stat.repairtime = Block Full Repair Time -stat.speedincrease = Speed Increase -stat.range = Range -stat.drilltier = Drillables -stat.drillspeed = Base Drill Speed -stat.boosteffect = Boost Effect -stat.maxunits = Max Active Units -stat.health = Health -stat.buildtime = Build Time -stat.maxconsecutive = Max Consecutive -stat.buildcost = Build Cost -stat.inaccuracy = Inaccuracy -stat.shots = Shots -stat.reload = Shots/Second -stat.ammo = Ammo -stat.shieldhealth = Shield Health -stat.cooldowntime = Cooldown Time -stat.explosiveness = Explosiveness -stat.basedeflectchance = Base Deflect Chance -stat.lightningchance = Lightning Chance -stat.lightningdamage = Lightning Damage -stat.flammability = Flammability -stat.radioactivity = Radioactivity -stat.heatcapacity = HeatCapacity -stat.viscosity = Viscosity -stat.temperature = Temperature -stat.speed = Speed -stat.buildspeed = Build Speed -stat.minespeed = Mine Speed -stat.minetier = Mine Tier -stat.payloadcapacity = Payload Capacity -stat.commandlimit = Command Limit -stat.abilities = Abilities +stat.powercapacity = 전력량 +stat.powershot = 전력량/ë°œ +stat.damage = 공격력 +stat.targetsair = 공중 공격 +stat.targetsground = ì§€ìƒ ê³µê²© +stat.itemsmoved = ì´ë™ ì†ë„ +stat.launchtime = 발사 간격 +stat.shootrange = 사거리 +stat.size = í¬ê¸° +stat.displaysize = 화면 í¬ê¸° +stat.liquidcapacity = ì•¡ì²´ 수용량 +stat.powerrange = ì „ì„  ê¸¸ì´ +stat.linkrange = ê°ì§€ ê¸¸ì´ +stat.instructions = 최대 명령어 수 +stat.powerconnections = 최대 ì—°ê²° 개수 +stat.poweruse = ì „ë ¥ 요구량 +stat.powerdamage = 전력량/피해량 +stat.itemcapacity = ìžì› 수용량 +stat.memorycapacity = 변수 개수 +stat.basepowergeneration = 기본 발전량 +stat.productiontime = 소요 시간 +stat.repairtime = 건물 완전 복구 시간 +stat.speedincrease = ì†ë„ ì¦ê°€ +stat.range = 사거리 +stat.drilltier = 채굴 가능 ìžì› +stat.drillspeed = 기본 채굴 ì†ë„ +stat.boosteffect = 버프 효과 +stat.maxunits = 최대 유닛 수 +stat.health = ì²´ë ¥ +stat.buildtime = 건설 시간 +stat.maxconsecutive = 최대 ì²´ì¸ ê¸¸ì´ +stat.buildcost = 건설 비용 +stat.inaccuracy = ì˜¤ì°¨ê° +stat.shots = 발사 당 탄 +stat.reload = ë°œ/ì´ˆ +stat.ammo = 탄약 +stat.shieldhealth = 보호막 ì²´ë ¥ +stat.cooldowntime = 쿨타임 +stat.explosiveness = í­ë°œì„± +stat.basedeflectchance = 기본 반사 확률 +stat.lightningchance = 전격 확률 +stat.lightningdamage = 전격 공격량 +stat.flammability = 휘발성 +stat.radioactivity = 방사성 +stat.heatcapacity = 열용량 +stat.viscosity = ì ì„± +stat.temperature = ì˜¨ë„ +stat.speed = ì†ë„ +stat.buildspeed = 건설 ì†ë„ +stat.minespeed = 채굴 ì†ë„ +stat.minetier = 채굴 í‹°ì–´ +stat.payloadcapacity = 화물 수용량 +stat.commandlimit = 지휘 한계 +stat.abilities = 능력 -ability.forcefield = Force Field -ability.repairfield = Repair Field -ability.statusfield = Status Field -ability.unitspawn = {0} Factory -ability.shieldregenfield = Shield Regen Field +ability.forcefield = 보호막 +ability.repairfield = 수리장 +ability.statusfield = 버프장 +ability.unitspawn = {0} 공장 +ability.shieldregenfield = 방어막 복구장 bar.drilltierreq = ë” ì¢‹ì€ ë“œë¦´ì´ í•„ìš” bar.noresources = ìžì› 부족 -bar.corereq = 코어 기지 í•„ìš” +bar.corereq = 코어 í•„ìš” bar.drillspeed = 드릴 ì†ë„: {0}/s bar.pumpspeed = 펌프 ì†ë„: {0}/s bar.efficiency = 효율: {0}% @@ -688,7 +688,7 @@ bullet.multiplier = [stat]{0}[lightgray]x 탄약 배수 bullet.reload = [stat]{0}[lightgray]x 발사 ì†ë„ unit.blocks = ë¸”ë¡ -unit.blockssquared = blocks² +unit.blockssquared = 블ë¡Â² unit.powersecond = ì „ë ¥/ì´ˆ unit.liquidsecond = ì•¡ì²´/ì´ˆ unit.itemssecond = ê°œ/ì´ˆ @@ -701,7 +701,7 @@ unit.persecond = /ì´ˆ unit.perminute = /분 unit.timesspeed = x ë°° unit.percent = % -unit.shieldhealth = 보호막 ì²´ë ¥ +unit.shieldhealth = 방어막 ì²´ë ¥ unit.items = ìžì› unit.thousands = 천 unit.millions = 백만 @@ -711,7 +711,7 @@ category.power = ì „ë ¥ category.liquids = ì•¡ì²´ category.items = ìžì› category.crafting = ìž…ë ¥/출력 -category.function = Function +category.function = 기능 category.optional = ë³´ì¡° ìžì› setting.landscape.name = 가로화면 잠금 setting.shadows.name = ê·¸ë¦¼ìž @@ -722,7 +722,7 @@ setting.flow.name = ìžì› í름량 표시 setting.buildautopause.name = 건설 ìžë™ ì¼ì‹œì •ì§€ setting.animatedwater.name = ì•¡ì²´ 애니메ì´ì…˜ 효과 setting.animatedshields.name = 보호막 애니메ì´ì…˜ 효과 -setting.antialias.name = 안티 ì—ì¼ë¦¬ì–´ì‹±[lightgray] (재시작 í•„ìš”)[] +setting.antialias.name = 위신호 제거 í•„í„°[lightgray] (재시작 í•„ìš”)[] setting.playerindicators.name = 플레ì´ì–´ 위치 표시기 setting.indicators.name = ì  ìœ„ì¹˜ 표시기 setting.autotarget.name = ìžë™ 조준 @@ -734,10 +734,10 @@ setting.fpscap.text = {0} FPS setting.uiscale.name = UI 스케ì¼ë§[lightgray] (재시작 í•„ìš”)[] setting.swapdiagonal.name = í•­ìƒ ëŒ€ê°ì„  배치 setting.difficulty.training = 훈련 -setting.difficulty.easy = 쉬움 +setting.difficulty.easy = 무난 setting.difficulty.normal = 보통 -setting.difficulty.hard = 어려움 -setting.difficulty.insane = 미침 +setting.difficulty.hard = í˜¼ëˆ +setting.difficulty.insane = 박멸 setting.difficulty.name = ë‚œì´ë„: setting.screenshake.name = 화면 í”들림 setting.effects.name = 효과 ë³´ìž„ @@ -769,7 +769,7 @@ setting.savecreate.name = ìžë™ 저장 활성화 setting.publichost.name = ë©€í‹°í”Œë ˆì´ ê³µìš© 서버로 표시 setting.playerlimit.name = 플레ì´ì–´ 제한 setting.chatopacity.name = 채팅창 íˆ¬ëª…ë„ -setting.lasersopacity.name = ì „ë ¥ ë ˆì´ì € íˆ¬ëª…ë„ +setting.lasersopacity.name = ì „ì„  íˆ¬ëª…ë„ setting.bridgeopacity.name = í„°ë„ íˆ¬ëª…ë„ setting.playerchat.name = 채팅 ë§í’ì„  표시 public.confirm = ê²Œìž„ì„ ëª¨ë‘ì—게 공개하시겠습니까?\n[accent]모든 플레ì´ì–´ê°€ ê²Œìž„ì— ì°¸ì—¬í•  수 있습니다.\n[lightgray]설정->게임->ë©€í‹°í”Œë ˆì´ ê³µìš© 서버로 표시ì—ì„œ ë‚˜ì¤‘ì— ë³€ê²½í•  수 있습니다.\n\n[sky]ë²ˆì—­ìž ì¶”ê°€[]\n[accent]친구ë¼ë¦¬ 하려고 ì´ ê¸°ëŠ¥ì„ í™œì„±í™” í•œ ë’¤ì—, 친구 ì™¸ì— ë‹¤ë¥¸ 플레ì´ì–´ê°€ ë“¤ì–´ì™”ì„ ë•Œ\n해당 플레ì´ì–´ë¥¼ 차단하는 행위는 비매너를 넘어서는 얌체 행위 ê·¸ ìžì²´ìž…니다.\nì •ë§ë¡œ [scarlet]ë§Žì€ ë‹¤ë¥¸ 플레ì´ì–´ë“¤ì´ 오길 ì›í•œë‹¤[]ë©´ 확ì¸í•˜ì„¸ìš”. @@ -794,8 +794,8 @@ keybind.clear_building.name = ì„¤ê³„ë„ ì´ˆê¸°í™” keybind.press = 키를 누르세요... keybind.press.axis = 마우스 휠 ë˜ëŠ” 키를 누르세요... keybind.screenshot.name = 맵 스í¬ë¦°ìƒ· -keybind.toggle_power_lines.name = ì „ë ¥ ë ˆì´ì € 토글 -keybind.toggle_block_status.name = ë¸”ë¡ ìƒíƒœ 토글 +keybind.toggle_power_lines.name = ì „ì„  ê°€ì‹œë„ ì„¤ì • +keybind.toggle_block_status.name = ë¸”ë¡ ìƒíƒœ ê°€ì‹œë„ keybind.move_x.name = X축 ì´ë™ keybind.move_y.name = Y축 ì´ë™ keybind.mouse_move.name = 커서를 ë”°ë¼ì„œ ì´ë™ From dd9c3fc8d6ffc441f4c35b38feaa4aa942451191 Mon Sep 17 00:00:00 2001 From: Sunny Kim <58885089+sk7725@users.noreply.github.com> Date: Thu, 26 Nov 2020 10:01:15 +0900 Subject: [PATCH 14/16] Update bundle_ko.properties --- core/assets/bundles/bundle_ko.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/assets/bundles/bundle_ko.properties b/core/assets/bundles/bundle_ko.properties index 8ac9086c9e..975aa49558 100644 --- a/core/assets/bundles/bundle_ko.properties +++ b/core/assets/bundles/bundle_ko.properties @@ -522,8 +522,8 @@ sectors.resume = 재개 sectors.launch = 출격 sectors.select = ì„ íƒ sectors.nonelaunch = [lightgray]ì—†ìŒ (sun) -sectors.rename = Rename Sector -sector.missingresources = [scarlet]Insufficient Core Resources +sectors.rename = 구역 명명 +sector.missingresources = [scarlet]ìžì› 부족 planet.serpulo.name = 세르플 planet.sun.name = 태양 From 38471d68d75d218bf70eb2bec391856db8967b55 Mon Sep 17 00:00:00 2001 From: Anuken Date: Wed, 25 Nov 2020 20:23:17 -0500 Subject: [PATCH 15/16] Fixed Salt Flats being deadlocked --- core/assets-raw/fontgen/extra/planet.svg | 55 ++++++++++++++++++ core/assets-raw/icons/planet.png | Bin 0 -> 578 bytes core/src/mindustry/content/TechTree.java | 3 +- .../mindustry/desktop/steam/SAchievement.java | 3 +- .../src/mindustry/desktop/steam/SStats.java | 9 +-- 5 files changed, 58 insertions(+), 12 deletions(-) create mode 100644 core/assets-raw/fontgen/extra/planet.svg create mode 100644 core/assets-raw/icons/planet.png diff --git a/core/assets-raw/fontgen/extra/planet.svg b/core/assets-raw/fontgen/extra/planet.svg new file mode 100644 index 0000000000..17cd9fc3cd --- /dev/null +++ b/core/assets-raw/fontgen/extra/planet.svg @@ -0,0 +1,55 @@ + + + + + + image/svg+xml + + + + + + + + + diff --git a/core/assets-raw/icons/planet.png b/core/assets-raw/icons/planet.png new file mode 100644 index 0000000000000000000000000000000000000000..6a5c136add32189c84ea9a0884da3a44a05484d6 GIT binary patch literal 578 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7TQZ%U13aCb6$*;-(=u~X z85lGs)=sqbIP4&EG(LE%(p0`O0l_l?b9FkpEV4wq0u--st+kpF^Gner(<3NGhV^<= zvwU|byLfu6Yz(X82j(M3uX~WM1{$IAPh}mj3z!U%j6M zo!H9g)>j#_z_IM_gZdA>tK6tcisb=+or+gRwr<_>!#>;V*(?W(l^Dmk|ZP*vRApPp=wLAMS zvnx2qF3oFbc1~F0aWmWQ{ky#PZ|@tQ{a45ETcN0&>v;Gr1_p*oPZ!4!i{7chj(i6c zIHFJf`~UPEOJM{{wNqwxGh;u4=c;Ok8}GCf8GL#c6>O?RmggMMptRqp09av z(~VcMnKF9ro0~ZO%(Z5(%c@&6FIvw0{`;8pkq_3*S!^nt49jK-Z@gZnH1Ehd&FPxU jPjriwiU-bI`-8zkF#T87N{%)L1_lOCS3j3^P6sDB literal 0 HcmV?d00001 diff --git a/core/src/mindustry/content/TechTree.java b/core/src/mindustry/content/TechTree.java index cf77c5819b..98ff7fd6e8 100644 --- a/core/src/mindustry/content/TechTree.java +++ b/core/src/mindustry/content/TechTree.java @@ -512,8 +512,7 @@ public class TechTree implements ContentList{ new Research(groundFactory), new Research(additiveReconstructor), new Research(airFactory), - new Research(door), - new Research(waterExtractor) + new Research(door) ), () -> { }); diff --git a/desktop/src/mindustry/desktop/steam/SAchievement.java b/desktop/src/mindustry/desktop/steam/SAchievement.java index 845334a539..71e04a2c3c 100644 --- a/desktop/src/mindustry/desktop/steam/SAchievement.java +++ b/desktop/src/mindustry/desktop/steam/SAchievement.java @@ -38,13 +38,12 @@ public enum SAchievement{ buildAllUnits(SStat.unitTypesBuilt, 30), buildT5, pickupT5, - activeAllT5, active10Polys, dieExclusion, drown, fillCoreAllCampaign, hostServer10(SStat.maxPlayersServer, 10), - buildMeltdownSpectreForeshadow, + buildMeltdownSpectre, //technically inaccurate launchItemPad, chainRouters, circleConveyor, diff --git a/desktop/src/mindustry/desktop/steam/SStats.java b/desktop/src/mindustry/desktop/steam/SStats.java index 822efe33cc..49bed6a511 100644 --- a/desktop/src/mindustry/desktop/steam/SStats.java +++ b/desktop/src/mindustry/desktop/steam/SStats.java @@ -65,13 +65,6 @@ public class SStats implements SteamUserStatsCallback{ active10Polys.complete(); } - tmpSet.clear(); - tmpSet.addAll(t5s); - Groups.unit.each(u -> tmpSet.remove(u.type)); - if(tmpSet.size == 0){ - activeAllT5.complete(); - } - for(Building entity : player.team().cores()){ if(!content.items().contains(i -> entity.items.get(i) < entity.block.itemCapacity)){ fillCoreAllCampaign.complete(); @@ -141,7 +134,7 @@ public class SStats implements SteamUserStatsCallback{ if(blocksBuilt.add(e.tile.block().name)){ if(blocksBuilt.contains("meltdown") && blocksBuilt.contains("spectre") && blocksBuilt.contains("foreshadow")){ - buildMeltdownSpectreForeshadow.complete(); + buildMeltdownSpectre.complete(); } save(); From e1ddf115e063329f89cf36980706e9d6d0643769 Mon Sep 17 00:00:00 2001 From: Anuken Date: Wed, 25 Nov 2020 20:41:38 -0500 Subject: [PATCH 16/16] Merged turret types --- core/src/mindustry/content/Blocks.java | 2 +- .../blocks/defense/turrets/ChargeTurret.java | 63 ------------------- .../world/blocks/defense/turrets/Turret.java | 51 +++++++++++++-- 3 files changed, 46 insertions(+), 70 deletions(-) delete mode 100644 core/src/mindustry/world/blocks/defense/turrets/ChargeTurret.java diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index 2625e478d5..363256dc83 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -1513,7 +1513,7 @@ public class Blocks implements ContentList{ flags = EnumSet.of(BlockFlag.turret, BlockFlag.extinguisher); }}; - lancer = new ChargeTurret("lancer"){{ + lancer = new PowerTurret("lancer"){{ requirements(Category.turret, with(Items.copper, 25, Items.lead, 50, Items.silicon, 45)); range = 165f; chargeTime = 40f; diff --git a/core/src/mindustry/world/blocks/defense/turrets/ChargeTurret.java b/core/src/mindustry/world/blocks/defense/turrets/ChargeTurret.java deleted file mode 100644 index 15feaf0379..0000000000 --- a/core/src/mindustry/world/blocks/defense/turrets/ChargeTurret.java +++ /dev/null @@ -1,63 +0,0 @@ -package mindustry.world.blocks.defense.turrets; - -import arc.audio.*; -import arc.math.*; -import arc.util.*; -import mindustry.content.*; -import mindustry.entities.*; -import mindustry.entities.bullet.*; -import mindustry.type.*; -import mindustry.gen.*; - -import static mindustry.Vars.*; - -public class ChargeTurret extends PowerTurret{ - public float chargeTime = 30f; - public int chargeEffects = 5; - public float chargeMaxDelay = 10f; - public Effect chargeEffect = Fx.none; - public Effect chargeBeginEffect = Fx.none; - public Sound chargeSound = Sounds.none; - - public ChargeTurret(String name){ - super(name); - } - - public class ChargeTurretBuild extends PowerTurretBuild{ - public boolean shooting; - - @Override - public void shoot(BulletType ammo){ - useAmmo(); - - tr.trns(rotation, size * tilesize / 2f); - chargeBeginEffect.at(x + tr.x, y + tr.y, rotation); - chargeSound.at(x + tr.x, y + tr.y, 1); - - for(int i = 0; i < chargeEffects; i++){ - Time.run(Mathf.random(chargeMaxDelay), () -> { - if(!isValid()) return; - tr.trns(rotation, size * tilesize / 2f); - chargeEffect.at(x + tr.x, y + tr.y, rotation); - }); - } - - shooting = true; - - Time.run(chargeTime, () -> { - if(!isValid()) return; - tr.trns(rotation, size * tilesize / 2f); - recoil = recoilAmount; - heat = 1f; - bullet(ammo, rotation + Mathf.range(inaccuracy)); - effects(); - shooting = false; - }); - } - - @Override - public boolean shouldTurn(){ - return !shooting; - } - } -} diff --git a/core/src/mindustry/world/blocks/defense/turrets/Turret.java b/core/src/mindustry/world/blocks/defense/turrets/Turret.java index 3d1af1e5ce..9e41023c01 100644 --- a/core/src/mindustry/world/blocks/defense/turrets/Turret.java +++ b/core/src/mindustry/world/blocks/defense/turrets/Turret.java @@ -40,6 +40,7 @@ public abstract class Turret extends ReloadTurret{ public Effect ammoUseEffect = Fx.none; public Sound shootSound = Sounds.shoot; + //general info public int maxAmmo = 30; public int ammoPerShot = 1; public float ammoEjectBack = 1f; @@ -61,6 +62,14 @@ public abstract class Turret extends ReloadTurret{ public boolean targetAir = true; public boolean targetGround = true; + //charging + public float chargeTime = -1f; + public int chargeEffects = 5; + public float chargeMaxDelay = 10f; + public Effect chargeEffect = Fx.none; + public Effect chargeBeginEffect = Fx.none; + public Sound chargeSound = Sounds.none; + public Sortf unitSort = Unit::dst2; protected Vec2 tr = new Vec2(); @@ -136,7 +145,7 @@ public abstract class Turret extends ReloadTurret{ public @Nullable Posc target; public Vec2 targetPos = new Vec2(); public BlockUnitc unit = Nulls.blockUnit; - public boolean wasShooting; + public boolean wasShooting, charging; @Override public void created(){ @@ -313,7 +322,7 @@ public abstract class Turret extends ReloadTurret{ } public boolean shouldTurn(){ - return true; + return !charging; } /** Consume ammo and return a type. */ @@ -352,11 +361,37 @@ public abstract class Turret extends ReloadTurret{ } protected void shoot(BulletType type){ - recoil = recoilAmount; - heat = 1f; - //when burst spacing is enabled, use the burst pattern - if(burstSpacing > 0.0001f){ + //when charging is enabled, use the charge shoot pattern + if(chargeTime > 0){ + useAmmo(); + + tr.trns(rotation, size * tilesize / 2f); + chargeBeginEffect.at(x + tr.x, y + tr.y, rotation); + chargeSound.at(x + tr.x, y + tr.y, 1); + + for(int i = 0; i < chargeEffects; i++){ + Time.run(Mathf.random(chargeMaxDelay), () -> { + if(!isValid()) return; + tr.trns(rotation, size * tilesize / 2f); + chargeEffect.at(x + tr.x, y + tr.y, rotation); + }); + } + + charging = true; + + Time.run(chargeTime, () -> { + if(!isValid()) return; + tr.trns(rotation, size * tilesize / 2f); + recoil = recoilAmount; + heat = 1f; + bullet(type, rotation + Mathf.range(inaccuracy)); + effects(); + charging = false; + }); + + //when burst spacing is enabled, use the burst pattern + }else if(burstSpacing > 0.0001f){ for(int i = 0; i < shots; i++){ Time.run(burstSpacing * i, () -> { if(!isValid() || !hasAmmo()) return; @@ -367,6 +402,8 @@ public abstract class Turret extends ReloadTurret{ bullet(type, rotation + Mathf.range(inaccuracy)); effects(); useAmmo(); + recoil = recoilAmount; + heat = 1f; }); } @@ -388,6 +425,8 @@ public abstract class Turret extends ReloadTurret{ shotCounter++; + recoil = recoilAmount; + heat = 1f; effects(); useAmmo(); }