From 7ba42cb26e6af46eecebcb81f8c838c1ae8ee0a2 Mon Sep 17 00:00:00 2001 From: Anuken Date: Fri, 11 Feb 2022 12:19:15 -0500 Subject: [PATCH] Crash fix --- .../blocks/turrets/disperse/disperse.png | Bin 2028 -> 2064 bytes core/src/mindustry/content/Blocks.java | 1 + core/src/mindustry/type/Sector.java | 4 ++++ .../mindustry/ui/dialogs/PlanetDialog.java | 1 + .../world/blocks/defense/turrets/Turret.java | 18 +++++++++++------- gradle.properties | 2 +- 6 files changed, 18 insertions(+), 8 deletions(-) diff --git a/core/assets-raw/sprites/blocks/turrets/disperse/disperse.png b/core/assets-raw/sprites/blocks/turrets/disperse/disperse.png index b474041e8ff01dc81adb3cb10fc170e8827171fc..0ddae61f6a60ab846b026d9e4fed83e9bb4c21fa 100644 GIT binary patch delta 2037 zcmV>D_p0IgIy zjie?jWf@Qx-9UyKt;+~7bOX7Q4v<^C6b2VB&mGdK}LGFCX8K+y&@# zI-O3Z)9Gv-3+({7I66KXd_RAAe%k!|%ldOtf8XrC-CS#DcYo=9&8LrNP2}z;?Ep9k ziQihA5>#&hO(9w^LDdGB6JR|2Q<=L)?Ix(&05Lekm$;TSnlylfV6B>Z7pQs`P1ib?7tK<$rFIauhsssSt{ zKpX8Gs2QL{$A3!{f;iALf%+|A3Rl7{7J@83Mw&8!slO5svH3D|iqa@}G zK%KRh6o%TCm1qAkrVLPn__=LbGl3Zc)Fggx+m=jV!T>djpBsY}6PPdn1q0#1n{&FbWwY=T}27Nlf_uBB>V z69&)_q<<9?RBr%HAzCnj%E^@2%30|CKRy{W48s867ht*=H0IAgeoN}_Uw{AOjW4tq zJo0a_NHyDbYQ zV1G3Lwt`io_}pz`bHH6CWHZ1viO=1(rU_UKP>c8}LnwBbt=$CK2B<}RM@(SqJ+@{O zWEr3~@f|||&6pgeO+YpPrs2JV!=mEHDsAigThi}Rs&||w2pv)Pkz)dq0kGn8fl07W zu$aKH*I>4Db52T2m;h~n8pL;ug-a3N_kUW-UjCX)Ahs63DSi$+yGxY#j`jVmnS&gX zxfC&g74ZS`CZ3j-ouzWhZUAba5(OO&0VPa8?W=?dOza4$MO zU;my$*ROhcjlby~#UX%kwgs8#h=HD3D^zL#ZSkA2~-O~m;`8_qQ!uTRr?K~ zW&ldZYcK&NMokkG`Jl+@^X!NBuYbL-Ti@SCkB0$#Pq3AB`Y9>mhxR7;zUidIQqKJ=a8-sc!aLmQcLvS%>&IEf0hgpeD<>KaH zc9aXnx;i<}im{qXAT`i`XZ8$)5<3<|(gfpchfFYM)VV%}sAes|fekn{G1CNN>kL#< zp3_qcR9F*Kw;Je34IG;gmw#vr2T)uL*y?0zpQWpTl->HuEAk~oE(`v9zG?f zgOmj4n1J%PIVLDAK7jD?a87a(OA#{1IHix6s~rz7Wde?bVg%*5b(Atet_InYKu!}Z zJW%%t`bZI$B7STSps!Ep1_E&8Uj1_d=ZJOE!WqF>45e?A6o1Sc0Kl#ZY8M}%5(5C( zGeHaD15{*yIZB$q!mWo376VvudwT(jN+asre7nsiI#^p*RK z#y$t21eltT8b+Da7%3)@=)cG$5ECdi5tdDWjSbUxseYSH<{Y6t@N<>Cxk()L?=2fM zMzxQDmJ)6$7H%xn20n-Hdw^3P;e4Y&tCQ3wJLMRg0Q>wtHbJZ612k>`fbS-t7H?jj zpPCjQpyD||DmenSEW7vPN&o9bUK|*XB+tsv%QbS Tkl|gv00000NkvXXu0mjfEYPY^ delta 2001 zcmV;?2QK)K5bO_-F@L5>L_t(|ob8=YP8~-O#)~M2@Bv_FZh$N~OFJ9n+`!o(@n@NA zfK6BuBC!iMz+wYl2Fcm=~tEylBBuf_XW~%D@Ue9z*_j>?? z!C){L3lY^XI3>m;Zmh`&5+gyZ0Ynj(@eewH^JNzy3VwqIN%M z2f#r}{NBzffqMgJ3ekfJTpPfG02X4P;MxF7%&-5N$FNMd2H+H~XA^X3013f*H9>a< zkQAy%6Le>Q0gfNF0|5B`PCE8ZD{bOfVctv%tTvS_G?Uav0PoW%3Knu#9RVZ?u=*~e zUbj=NU@rC#Pk$!Okw9$(u;6|xXx2jg5-`xkoB?{AY6UFjX37BE1+v%*wq^n|2C!Uc z%dt^0VE_*W_7GzYCJZpp!>s`{pOf5fG6>5W3XldGY0S|e!#N{Oc=nk_yMmbFwqC#cYzZ|7)`a-T<0H^k4#&)u_3LIjP}) zzAs>!rhf?_EZ18|8S!{fssD<)9C3G^sF*SRfp162*+S$wV- zv`wHs0@Pwb{D7rcurx71YD!d##e#Fk#9gx#;(x8+Tp~3s;LroG$TUsUycdw7v?cuR z{f9~Va}h*G0B#ps7C*opqx481HUeM+zc@dJ_doxV{C#O*Ej$jMrfJIMa&dl)>KjOo z1R^6qjrbgRdK`?+S!yI;H$czgbDztC30Mt)?O=HnpZlEH8gO?B*$l8w;&Y!{(*!IA z@P8tH$qS#nlS}ho1oeNm=o{p?ll!Z*J-=E zy{`IQN%xM^1gS0RF(@XeG5}V5E-(d-36>K$_cxf;yqq_sElhwmfCupdbKy$FkNs`U zQf^Ns5PKHDDL#eGt!CIftmp>AN#kZ0hUhohy9HcVS7+CAACG?kujp1eBc6llYjw;eyKq zlx^i=_W<1DYj2^#fQglRB)}qK0I7Gr2NTr9sA&Rr1H=N|+1-Ozuiw1EW3xHn}P{ap_*QCWmHBkfP66nbU65O+Yfh z^V4H8`I5kUFoC4_fmAJX^)H2G1Xv9M~E{78F1FJRV%A4&H5CWPtZm~&%jGJg#$>)r8!HA4?y^cn6M^b z>89l2=JFe%YKOo%xetWaV1H+KFZ->cDPpylucs&xe{*Xa_7ArgzqK?4d23jS^FtzB z;#-9ywos!|@dK(`!!RbGKq)Zh-AP#!z+nQc_yN_eVbXK;R^n4$6QIOO?Ji@8_RG`(TlQi2K$e9pzYZjK0V{zVew)|)sv;io)P&g9f`g%5r zV{n*&QX`Xl16QFWSbtMsiV0eOiFIr70fhGkazZI=jgS=MwBG8iwl}bq2{;Oh5tQT7 z(aHo=4ahfvoF>?aP`gGjMv1UB;^)=?#&SZRAOT11)juR^iCmHvKFHD9w}E3ZZvX(h zCh#skfD;1%*fT*7;sZD`z!EJ@VBylk1&aZ!IKG82R>bG3Ie*&-V8sOM0B5aPF9DRm zq`xEA5|muI-)QXj05t)Y7R19SQyOE92_*6txe3GsiYUKt9`v?W9D!>4YX8nOR->a8~75jFM%wb!o@~`UT;#nOe!!p0e1dAH$kuB19WZx zfd5TU+q`*xdP?kCd;rJy0Hsg_>|K0-H5dT`*qyVUZ|pFvMUsJ16ReB)gTY`h7z_r3 j!C){L3 u == null)){ + info.resources = info.resources.select(u -> u != null); + } } /** Removes any sector info. */ diff --git a/core/src/mindustry/ui/dialogs/PlanetDialog.java b/core/src/mindustry/ui/dialogs/PlanetDialog.java index 3d09b34f3f..9bc7753a99 100644 --- a/core/src/mindustry/ui/dialogs/PlanetDialog.java +++ b/core/src/mindustry/ui/dialogs/PlanetDialog.java @@ -837,6 +837,7 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{ c.add("@sectors.resources").left().row(); c.table(t -> { for(UnlockableContent uc : sector.info.resources){ + if(uc == null) continue; t.image(uc.uiIcon).padRight(3).size(iconSmall); } }).padLeft(10f).left().row(); diff --git a/core/src/mindustry/world/blocks/defense/turrets/Turret.java b/core/src/mindustry/world/blocks/defense/turrets/Turret.java index 1c3aaeae30..e814efee5d 100644 --- a/core/src/mindustry/world/blocks/defense/turrets/Turret.java +++ b/core/src/mindustry/world/blocks/defense/turrets/Turret.java @@ -86,7 +86,7 @@ public class Turret extends ReloadTurret{ /** Ticks between shots if shots > 1. */ public float burstSpacing = 0; /** An inflexible and terrible idea. */ - public boolean alternate = false; + public boolean alternate = false, widthSpread = false; /** If true, this turret will accurately target moving targets with respect to charge time. */ public boolean accurateDelay = false; @@ -544,21 +544,25 @@ public class Turret extends ReloadTurret{ }else{ //otherwise, use the normal shot pattern(s) - if(alternate){ - float i = (shotCounter % shots) - (shots-1)/2f; + if(alternate || widthSpread){ + int count = !widthSpread ? 1 : shots; - bulletOffset.trns(rotation - 90, (spread) * i + Mathf.range(xRand), shootLength); - bullet(type, rotation + Mathf.range(inaccuracy + type.inaccuracy)); + for(int c = 0; c < count; c++){ + float i = (shotCounter % shots) - (shots-1)/2f; + + bulletOffset.trns(rotation - 90, (spread) * i + Mathf.range(xRand), shootLength); + bullet(type, rotation + Mathf.range(inaccuracy + type.inaccuracy)); + shotCounter ++; + } }else{ bulletOffset.trns(rotation, shootLength, Mathf.range(xRand)); for(int i = 0; i < shots; i++){ bullet(type, rotation + Mathf.range(inaccuracy + type.inaccuracy) + (i - (int)(shots / 2f)) * spread); + shotCounter ++; } } - shotCounter++; - recoil = recoilAmount; heat = 1f; effects(); diff --git a/gradle.properties b/gradle.properties index 120d869fe2..da169c95f9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -24,4 +24,4 @@ android.useAndroidX=true #used for slow jitpack builds; TODO see if this actually works org.gradle.internal.http.socketTimeout=100000 org.gradle.internal.http.connectionTimeout=100000 -archash=502eb9934e +archash=985a940948