From 69f59ff803ce5b42dbec11b8c1f158081b2c7c38 Mon Sep 17 00:00:00 2001 From: Anuken Date: Tue, 1 Feb 2022 20:29:45 -0500 Subject: [PATCH] Removed copper drills in loadouts --- .../sprites/blocks/turrets/cyclone.png | Bin 2231 -> 1455 bytes core/src/mindustry/ai/BlockIndexer.java | 10 ++++++---- core/src/mindustry/content/Loadouts.java | 8 +++----- .../maps/planet/AsteroidGenerator.java | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/core/assets-raw/sprites/blocks/turrets/cyclone.png b/core/assets-raw/sprites/blocks/turrets/cyclone.png index ba4e16da977d10b768ce310bd7643fc0ed358caa..7e60d91dbd1f7fee029fa636dee473dce2d2f933 100644 GIT binary patch delta 1438 zcmdlkxSo50ay@IAr;B4q1>@Vf`&Ww?3N-j{6lLK)=qIw~3%{VqnyZz>w zRG}FxYK@)`b_iJ*-fE2BU-(-5?9W$IyGx2U@855K#c;08l-dux^?dPO<@x#VCn&7+ zU9u~Y<;el}4a%MpP7a)ZE~?Bq)UtTWrPbg6wx3`1MWyily?uP8y&R^@DhXPjI{hX+ za4G&Co5-@Iq2EN=lS6TV>YoguUED7i?I*RoV-h%4sJp!3+_U8knhT5@&mBH5X~0^d zcA@fzCG)a|b1YW;_UQ*i7O2-V%x}w_KjoGC*0+{#coxXJ_US0@X}CLgzI$Aeh~2v> zDmFVS#md`tow+AGm_DgTPjL+c_YV#2O)V3cbRN1-zwp%fVZZ)6{kqa8f3_}uUegj0 zeaPp*$MSNyf2W^*+39}PUO&%{Ip{++mbk(OoJb_m}F^Kcphr%8)p%~VP1NDEtJW1m;@bGwB{o$GP zrjY6Pgzm6J9CR=8UQlSS`|?eP-odB)%*FSyr1P4za$l&d-Z#H%;w|UcchdI#-#MQd zFJQB4znUfOS8UmR{G~?zlR0nxZIKkTlZ(=?=S*XAYr7xZ)Y)+7efhpWC2aksIhDWf zOlz&bWTE&v1{O6j`6{c;Hb>5s>jK>-4v^kG5^$GtG6Y6432wGXx zvU_gGzf1e>aBse19-6L~ApKC;fuD03(>BR{(^-reFEyL`NO_-aHhPmC8uett?;A?$ z>Bfu(5%sSg1pQv1U%!g8v?j8f@vZKoB}q%ZeXJ?o=F57ZK}cm~pW5`|fNaAxk3B6t zOG{$T?%K)V(R66h>!2n}_N`)vwe`;SuJeAJ`8tNh!HB_^xli8XUAyWY`JCt)Rlx(* z2is-tvN#m%o5HlRu|N5{gz)imnzK1ya4vd&BU@+|M+ZZ_f)n2)o^r;Cd^SOP8i#!t zWMu3e_VqUFO)b}}jlY!|_W#w-);eym9x| z=Df<}*4!_!*kgr|fz}@np({)#AAT}h`|`A;hkgp~eC8i$-Fc*kHVnRbxbx7KR0ix_;5V=(6;R? z;f$9Ur(XMbJ~7x|ZD)(1of5C^0v5Y2Szo6JMyVglUL2YW*#2b*9pZfOL2!ku0Xen5rugL%ZI_{7Qs?KLqh4hdR~P0L@~K6LKe5Wp#76Z^f1|FQW00PFA9CkV() zJ6%4%Gx^ECa|}sS_WW-Bwqwb!L}?w(f;G*XzHC3Z)c#r7Y{m)!?*%V?4s7#QtuNnw zrSDqwf$hIkRnB&=-_3O(*e9EFTK$KYnq7xC-_R4=P~!FQq(aS_eAR-`H*< zyyb)9vM7dJ4@7Ka5QTdvr>(AJ%0 z7bLUdG~=n?%YH5S_R%8yb{bQH0_Uud?bAfwt$*2Vn3dpJyVOd?JGiT#)1=Ynx6a*t yhi0tg-e9V8K6%bY^+wMGNVy21+QeDvm<68)?d4uOQ;vawfx*+&&t;ucLK6T#K$MOE delta 2220 zcmZ3_y_#r;B4q1>@VfwjHve5^d_75`s*gI$;|^B3o9>6+5<7IB18KR!7H; zj@FFDjR~{vCN1um+A&ojB2r_LPQ;BoDbJng{cU5IIznq;NZf+_c zzx@1Uf16Dkw{6=tqpYm#n{M&HKR;t%3$L1<62!!Dz1{IZT+_A0)Tb)q+#I*seSUN& zg}z-qJ0y&+$JJ1V87#c_H|#n)Jw=Eq>EWTf<#)G<-&nu@@5wiIPD~GebVh%l z)_HZg(!w1LyFTzX@pvwX{rRbW^?Pw&9pP8Z!4m>v82Ala78aZi=a}SRyQQ+`2ixfk z`@{C}QxYaIIX#qad3iBmYu<%*wTWUIsGJvrrdg8msBnKrG3ADw$t6AKu9548t4{1RYc>1WY%e&{S-&uGxr z;>c>kD<5(|I$u7HW$ltf&%dy)Z?gRK@x_l)9^FI(#@s{f@&XT~%d*2W!a42-aMt~a zX`5ou(QxNO{NE?v_cm~xT$W$IYv-;%KNs%xRLsfyDtF7quIBKuXP5f(Uq38$ly&xe z5$iDdgLB3Luel6swHJOA4D@nZ&$O$Je_?%tjnsy3*LN-Y+Z!ZQC49mChXD793k_TM zUlV=%UQ=eU&Hi5a<3+P~d~23> zI%CWEQ?FSB>`Hh&reAm1x-O%>^=akZK=sCIZ~6ESFH{a3YM;WuEq~*nh$Um?miqX| z*F7B=>Px0xh-%=MPhzV1aUtB{SOAlP>OmFV*gg zjhX<)g&!U+;B1({BFd1fVj{L6Ur{Q~L8r!|gULa)g~j2r`Oj+c30(4gs~A2AscA0I ztFbu2bU?+&k3oIcmkt-sxf-93oO@jzvS3~CYp&ARWA)CxcA6Fo#TVaj7TECcjYEgs zA^zTluaoD!^>Cb9XSm{`y35_(B`X*b4&P+-*Rb%v>*tum6Dxk3Sx66ZVp~)m}ATJHpiXo)t7F^Ub_jK=NfP_9%wVZdeCp#gWw{Yk4HUp z<$o2dn-nFt!uY9Cy(FXJy{b3Q_Nr(5XFcbTzs2>yw=!;iL4$zv_48KA?iQ9lVGIwO z+ZHlPuq2iUGH7z{s=FtdoTZ&OiAksCgy4h2?dzBn)D%@1Zh6g^!ys>Wh4aFPh5U>H zlLUkra#cix9WLx@-lD0=c>dnM@DIt#wVVyl<94QI?wP_6z^%ZU zuODPmsNty1Tkg-;bAETM*|N3w6=IIs%SX)hzMt2lcc7i$?m-Nrn4Q3cq{P+>47M_? znr8bvFFfT8`{?-F>Uu4&o9Kdv&cTc_tE+Vs&I>Rxa7rmG)Y{j7ZRYo{7g<_Bv2Vxu zoU_+(8N&qz&dFx{xoy`P>djsocQphQxcNBv{V>?Z@PUyj@lu*W{*N;Lw_l`V4t(3m zKD{o*pOfC>W4!2*Jym_K_!{lU} z#-c@i#eOm2LH>snYc3qHSy+^5Fh41XX%CNoIAcq`fL*~#p6q_A`+ht=Rx9N6-N5-UUtuig3T}ChyN7GM4(TjdwdozBAach`rLshjFjmVt*L4Fenu0H~w6^cCGWA^A9JV`(jvhsNIu; z!O4uX#a~+CpkMlv7Jg?=1}AgQ^lSP$+b(;b;FVWXW|;8d((L#8Wv42hKbm@WetCZM zuGadc566 z#m&|3dXt3`_zhWnAM6s|5_tKW0E_G-huxRLfApN*ySTIEAnS(@iTw{Xb!wUyaNc>w zduzqb8m>cOoLee?@!UT#wIJu|*9W$mu8+SnFYs$>tIroOX}rD1QQCC2zvF{Arq9O& z9!i%A-D=@q%i`eUq*K$p;q9*WZ)QS14)PD1O0m6DyUUH#YE+In_&cJ|4?mYeGotM`bw2OU*g z;*>44Z=%%s$;t~nf4F%$&HkA5MUBB};a1N39KFl0aJ~=<^KhE}(dmm81IJnaEv1bc zgZT3`8EacwS?o)1P8ZnAEy1L6L`}XgPChC6*E0u>ANIzo+!|*PjRJ0sGxaw1*JW?- T{nW$2z`)??>gTe~DWM4ff4t@R diff --git a/core/src/mindustry/ai/BlockIndexer.java b/core/src/mindustry/ai/BlockIndexer.java index f0f5dbe9b3..59709f5ad0 100644 --- a/core/src/mindustry/ai/BlockIndexer.java +++ b/core/src/mindustry/ai/BlockIndexer.java @@ -396,10 +396,12 @@ public class BlockIndexer{ var arr = ores[item.id][qx][qy]; if(arr != null && arr.size > 0){ Tile tile = world.tile(arr.first()); - float dst = Mathf.dst2(xp, yp, tile.worldx(), tile.worldy()); - if(closest == null || dst < minDst){ - closest = tile; - minDst = dst; + if(tile.block() == Blocks.air){ + float dst = Mathf.dst2(xp, yp, tile.worldx(), tile.worldy()); + if(closest == null || dst < minDst){ + closest = tile; + minDst = dst; + } } } } diff --git a/core/src/mindustry/content/Loadouts.java b/core/src/mindustry/content/Loadouts.java index 70be4eb4a8..7724c89b6f 100644 --- a/core/src/mindustry/content/Loadouts.java +++ b/core/src/mindustry/content/Loadouts.java @@ -7,14 +7,12 @@ public class Loadouts{ basicShard, basicFoundation, basicNucleus, - spaceNucleus, basicBastion; public static void load(){ - basicShard = Schematics.readBase64("bXNjaAB4nD2K2wqAIBiD5ymibnoRn6YnEP1BwUMoBL19FuJ2sbFvUFgYZDaJsLeQrkinN9UJHImsNzlYE7WrIUastuSbnlKx2VJJt+8IQGGKdfO/8J5yrGJSMegLg+YUIA=="); - basicFoundation = Schematics.readBase64("bXNjaAB4nD1OSQ6DMBBzFhVu8BG+0X8MQyoiJTNSukj8nlCi2Adbtg/GA4OBF8oB00rvyE/9ykafqOIw58A7SWRKy1ZiShhZ5RcOLZhYS1hefQ1gRIeptH9jq/qW2lvc1d2tgWsOfVX/tOwE86AYBA=="); - basicNucleus = Schematics.readBase64("bXNjaAB4nD2MUQqAIBBEJy0s6qOLdJXuYNtCgikYBd2+LNmdj308hkGHtkId7M4YFns4mk/yfB4a48602eDI+mlNznu0FMPFd0wYKCaewl8F0EOueqM+yKSLVfJrNKWnSw/FZGzEGXFG9sy/px4gEBW1"); + basicShard = Schematics.readBase64("bXNjaAF4nGNgZmBmZmDJS8xNZZDJKCkpKLbS16/MLy0p1UtK1XcNi/Q3cKwwyqkyYOBOSS1OLsosKMnMz2NgYGDLSUxKzSlmYIqOZWTgSs4vStUtzkgsSgFKMYIQkAAAhSEXTA=="); + basicFoundation = Schematics.readBase64("bXNjaAF4nGNgYWBhZmDJS8xNZWBNSk3MK2bgTkktTi7KLCjJzM9jYGBgy0lMSs0pZmCKjmVk4E/OL0rVTcsvzUtJhMozghCQAACx6RHB"); + basicNucleus = Schematics.readBase64("bXNjaAF4nA3CwQ2AIBAEwAXFjxRBA1ZkfCDcgwh3BiTG7iUzMDATZvaFYGOK7pPuLpYXa6QWarqfJAxVsGR/Um7Q+6Fgg1TauIdMvQFQgB7wAza8E4M="); basicBastion = Schematics.readBase64("bXNjaAF4nGNgYWBhZmDJS8xNZWBNzMsEUtwpqcXJRZkFJZn5eQyClfmlCin5Cnn5JQqpFZnFJVwMbDmJSak5xQxM0bGMDDzJ+UWpukmJxWDVDAyMIAQkACMdFqE="); - spaceNucleus = Schematics.readBase64("bXNjaAF4nDXKuwrCQBRF0WMStVDwQyQJAStBrCxEKxsLsZjcXJiBeTEPB/9eQdzlYmOOZY3GCsPYypR83Pd9KaV7u5zyyB050xeRSB5fh+F2ulz9neTujNXEkYLySTkLYKHFyDqiejwrbLzlbERS1E5BaY01ucCtzaQ5x+9d49cMFRr84QNbTSRJ"); } } diff --git a/core/src/mindustry/maps/planet/AsteroidGenerator.java b/core/src/mindustry/maps/planet/AsteroidGenerator.java index 63e3d3159c..8b632af9a9 100644 --- a/core/src/mindustry/maps/planet/AsteroidGenerator.java +++ b/core/src/mindustry/maps/planet/AsteroidGenerator.java @@ -154,7 +154,7 @@ public class AsteroidGenerator extends BlankPlanetGenerator{ @Override public Schematic getDefaultLoadout(){ - return Loadouts.spaceNucleus; + return Loadouts.basicNucleus; } @Override