From 39227774e14aeb41761e15145b6433a776b8d410 Mon Sep 17 00:00:00 2001 From: Anuken Date: Fri, 19 May 2023 11:08:18 -0400 Subject: [PATCH] Ripple tint change / Minor optimization --- .../sprites/blocks/turrets/ripple.png | Bin 1498 -> 2015 bytes core/src/mindustry/core/ContentLoader.java | 2 +- .../mindustry/entities/comp/BuildingComp.java | 13 +++++++++---- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/core/assets-raw/sprites/blocks/turrets/ripple.png b/core/assets-raw/sprites/blocks/turrets/ripple.png index 92bd3db328fdba385d267986c032eee5fdf9d7a8..4660117fd84fec22acd4247a7a25affcb6b9d6ba 100644 GIT binary patch delta 2002 zcmcb`eV>1Vaym&VUUON`LpNF?E9WpmM8j_pRc6cdUy5z|9gH`?bfbeuxQbuMUOTZx!inl za!AZ;nDYsrt8mTWtj7R-;3Y5_4R*?&sU7P!K$`6JOCS}`}*QdYRtTW{jgKTWg(H9xEo9F87J7lu3r^e)ku))G> zS1w+(VpwoBXTvw!j%6p@uW+oWznZn;YSyDq>3!>5Y-S&nZFZi*Vc;76K7N0luh#r1 zkUIk9b zWnsBt9XFkG(!>ih7i*t9BPgkm8K#kHCa3fM|5?F!M?**ZHs07DB5E6WIC3wqd|I#i zNIS{RiR%R0kvBfR${=;u&j@@JtyFsvIAPbZ*)DTC_U^CFEnjYbM=>{k_0E&feM6+`6*3Hva$Tqu(R;S2>pGy#A=# zdS=$%+Cr)N+v3aT-q!w@d~jw5tIT3{hUw|ojqmr~uW$SK`}{Av$!?6N88)9iFD&Pw zyiaKN5>DdfzjU7U8xB^GKfZ<(LT>n8m>9KHI-=YFx@ zr~drvzIfBp%Kn|pnXP}*@7Lb^zVGtOC)2`fn{Ms9n>YEqDt}NtD8zoccYEEK_wCm5 z6|>$8@9OZl(cKoe{PIZ&^UUs=yaNo?CHNC0pml=FCDYX??zqZJ+ zi^2b`f7EC8&ecjKRF43^5DtkYKxy=;yxU7^68i;yiCCP&)53Z;wQYX zt*Jb)j9U|8A2> z>hGNog%6yv{#4iPkkeo}@BVR#)PStNPj8m4=bYqca-Jp2BuG8Yyv0rI9!p?*?Yh-` zPH9`WJ%ty|x%KNr_WA2Kvk9zW6>TimePI$?Q+h5fc)Lm2wsgDIhgdb4VjgKbwNH1rrTReP;)-yI zXnWUQmO%LjukJW`COYMO6uoqi={CcC7xgyI)Z^DfynHmy7JW%<&22dUwAtj+#7Eg` zs;3neacr1bAaNx8hL6Dgh03;^cUumt>~k_#Oktd0QqRAmE+_khnMiEx?UMDJksEyP zhy~oa9HMa}ZR7sA|7L`gC1%~RS*RV^)2N)Xbh1;XdQy;J@I71M=1WoxM|PgueC83esyRc)d_isL zC3X(`JDnV5S&zQZRyp6)p=!5PSTEOahH=bS!QW}NT(12M4K9`sr>OBb{YkM*lqlcC zbErk6r6WGVPh#5bjvbbXvpJWZ<}~)0Cfw#+bJWq(U2D~x4b58h>OKh*EFXrLzx-*j z1xzn}=J2FtsrgIMg9}e{icjU|Sa^zadP9U|;-!eM4-dDWOLsYPqUWXku{TdX)y2f= znxB3>^{8n^haq>~_S??N%E~*Ro)rA>)_gkGNlxbGlia`Eau!-XEZZIH;}>DBnC2(( z!CuTr?TWO?619RO>@4-Q4Z1=#Eqd~DarQxdhW2_==k|ynavJ=H=mh3lG4(f zUs+gM&Wtw8P&(GzCSdV@$wHn-!JP9r`A@N2FLvgi^n>AXrK4TY><7C(E%bRbzsk=0 zmj4#+%{6LE-e@NYEpB`6nAhYqZ$@ZH%a&QaieCfX-e~FYU;CF~Ge1YAcS&T9aMamj z|NbS-RuKJv<#Xh;9}E{6KHoRvy~Pq+<{9 delta 1481 zcmcc5e~Wv9ay{!pPZ!6Kid%2z+UCg^^0a<;@SN|hQX2GAit)~pGpcuXnF%PUdpz9C zV&^P$UMcwum(WpnyP!)++-08^SKjZ@m^A6xmoHyRX5Fl-{rO zvpM&l3U}Ch|L>=%%z?80)yx~XzVZvmS}(;0LGs`QV9FswP`t&qha z(B5tFY$@Z0Bl?aJ_iH#CMC+Y2{}nNOYj;-2n6pmBj%(pl?yRtEdFvUAJMN!yFk<*} zujY&Q1es51>z}Wf*UPHp@*{&`mf%G81Ajga4-Y6F3HAFGCWKXflj*P8J(NOoj0mh4-i#lg)Y z*s$&P#jbqD1AIpW7;HIu-mTzTV0z?BSN(aW2b@O&7%mE25njZ?kTJiO@qlp0LdS@+ zoY@Q>-#r-*2-T-D1PYvCSkq*{Xb>dG!63rK%AmB5^?+d0)3e)aICVeTGOQ6uVDMm$ zZ{E21D}zVhoVi^Z?URHWuAlgxbHerxLzRFIL!ZC}yLofF0%{hDKdNS!v1@?_gEh;t zAJghXTG$Q*{!wI5Nq@t*K{B|;TWeAJ(jQ_B9=oLC6dtk$M7>o!n7H=ko=^WKRc>0F z#-Pg)$Pgv4rPgc;f7Ts)u7;gzZ&(*JKB$aX>p$^UbH{wX2GjWaOboJHGj6vsoQUY3 zuq}a!F+tKSOEH5nMVG@fcH<((1ljG`zRU{6u71DjCn@qXbsXHEn-}-Q^9|V&q~hwckj-%X}q?Tk)d|Rezh9r2|N$3vGTraaJl*=6jJzjZ zYT7H?qEVNd`b2|a%ikuodZrCCv$C5m#tIk<$z5di6!2kC%06^)=Ylh{HgGniCiA8F zR){jpnzbSAJ;(QJCOr;0A`L4Xcy1m#w$)z1nCl#yfFy7B(RM}|#gwHAZr7M~1fm`} zGnfdtJ*zi*&8Wbz^+P_xh1^pU<^~&e85xTt%gM?4>AueW!TWxisc=h}V0~TL$JpPj zXPFu|mPRi5Val*>Wv8*DMC|v}PJdPdu5%s}of+3KJp8X#y*%`2`2QpAtWCQA_!@W> zohyErhZ#F+Y@4~n>4b>AY{Rm|-ll-dQNQcowQ+5hHCAQdXW0_S!Lsbf)4z+4n*To& z%za4vKn8=YK%)J}jV7Nsnm*1}UuframsOy&Uh|Oe|M?rfv8Vem+L+z`99WkrcXvnN tqjcN*ya!$}nDqAS`}g8^_4@z(e+|xmEYk2k!@$76;OXk;vd$@?2>?b@dEo#6 diff --git a/core/src/mindustry/core/ContentLoader.java b/core/src/mindustry/core/ContentLoader.java index 0fabcc5ce8..de2fe755df 100644 --- a/core/src/mindustry/core/ContentLoader.java +++ b/core/src/mindustry/core/ContentLoader.java @@ -33,7 +33,7 @@ public class ContentLoader{ public ContentLoader(){ for(ContentType type : ContentType.all){ - contentMap[type.ordinal()] = new Seq<>(); + contentMap[type.ordinal()] = new Seq<>(type.contentClass == null ? Object.class : type.contentClass); contentNameMap[type.ordinal()] = new ObjectMap<>(); } } diff --git a/core/src/mindustry/entities/comp/BuildingComp.java b/core/src/mindustry/entities/comp/BuildingComp.java index a1c5f7b766..21614e4e5b 100644 --- a/core/src/mindustry/entities/comp/BuildingComp.java +++ b/core/src/mindustry/entities/comp/BuildingComp.java @@ -1006,15 +1006,20 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc, if(proximity.size == 0) return false; + var allItems = content.items(); + int itemSize = allItems.size; + Item[] itemArray = allItems.items; + for(int i = 0; i < proximity.size; i++){ Building other = proximity.get((i + dump) % proximity.size); if(todump == null){ - for(int ii = 0; ii < content.items().size; ii++){ - Item item = content.item(ii); + for(int ii = 0; ii < itemSize; ii++){ + if(!items.has(ii)) continue; + Item item = itemArray[ii]; - if(other.team == team && items.has(item) && other.acceptItem(self(), item) && canDump(other, item)){ + if(other.acceptItem(self(), item) && canDump(other, item)){ other.handleItem(self(), item); items.remove(item, 1); incrementDump(proximity.size); @@ -1022,7 +1027,7 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc, } } }else{ - if(other.team == team && other.acceptItem(self(), todump) && canDump(other, todump)){ + if(other.acceptItem(self(), todump) && canDump(other, todump)){ other.handleItem(self(), todump); items.remove(todump, 1); incrementDump(proximity.size);