From 411b6d74601d75b5da528cda7336fc062625118b Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Mon, 11 Jul 2022 14:37:57 -0400
Subject: [PATCH] Shockwave tower block

---
 .../blocks/defense/shockwave-tower-heat.png   | Bin 0 -> 5535 bytes
 .../blocks/defense/shockwave-tower.png        | Bin 0 -> 3124 bytes
 core/assets/bundles/bundle.properties         |   1 +
 core/assets/icons/icons.properties            |   1 +
 core/assets/logicids.dat                      | Bin 4580 -> 4597 bytes
 core/src/mindustry/content/Blocks.java        |   9 +-
 .../src/mindustry/content/ErekirTechTree.java |   2 +
 core/src/mindustry/content/Fx.java            |   8 ++
 core/src/mindustry/logic/LStatements.java     |   3 +-
 .../world/blocks/defense/ShockwaveTower.java  | 118 ++++++++++++++++++
 gradle.properties                             |   2 +-
 tools/src/mindustry/tools/Generators.java     |   2 +-
 12 files changed, 141 insertions(+), 5 deletions(-)
 create mode 100644 core/assets-raw/sprites/blocks/defense/shockwave-tower-heat.png
 create mode 100644 core/assets-raw/sprites/blocks/defense/shockwave-tower.png
 create mode 100644 core/src/mindustry/world/blocks/defense/ShockwaveTower.java

diff --git a/core/assets-raw/sprites/blocks/defense/shockwave-tower-heat.png b/core/assets-raw/sprites/blocks/defense/shockwave-tower-heat.png
new file mode 100644
index 0000000000000000000000000000000000000000..f949af1f2d3045ccbaea1f444bfd90348781af45
GIT binary patch
literal 5535
zcmV;Q6=3R#P)<h;3K|Lk000e1NJLTq003|R003|Z1^@s6#^Cfz00001b5ch_0Itp)
z=>Px~SxH1eRCt{2ooiPV$+Cu@<|YUT;%yZ7=<M15|NoqI&Wx8C$3ax&CZIr_4;gP~
zRCd;_yQ^tu6KmCKZK^XPBk~&YM&y7wprR-S?!SYo*M=_)21Ug?{|G+1P!*Fip`s`j
zj0b)Cr}S#_Tm!{mFu49F@i7kFhytyrF91uxvOP=oorGBW2|-xbz$NhAo=f0*+>tOZ
zd`v<!SD*=P5m*7%fV=jr+IJG3CkgEva1MO6=ghvl>MFc>;bT&osRB)COTZmq1K0v~
zfNkI&L3kPgp48*dfMehQ_zWBZC%^?Agy)o(@^K&7Bq+3wk8|J%_>$q{a+XS5npH)K
z@-~47z)!$a;0Zx^cL~#&pT0D0eFshn0^1`fdx1DAu5lZT1{zpBcdg!^fL-Hb2Uu_5
z<13*P?E&xY-Qi#;iehF;oQVPx<=q1w5(M@F_?e)@9qJYMjiA7N!l)S#gn41lWl<DG
zli=LwTefl@0MCJc+vg*K0yT|RDeyCSWgl5RGf`si3QVS}O@i{C1HTZ2_JYv!x2c}G
zt_XrVv3IWR-v{<A6O`DN7VI}`R_|lr8KE;hCMb5<`1a(d@*Qi>9ed9!+L~VUz9!CM
z1TGMIvwHh3L3#hN&t3a|!`}14fFO`7!U$X>2ydOZ*^t7u?Qas8-qY@L#mZVIC}hh%
zn|KiqzQYZV7WR2z@ApQ%D$veXON5@jMObTI5JuiF#3^f&AdE#uM_)nc^;bjzekTZV
zxP>R4%^KMv3Rp)0m8CkgJ6&RQqj&B8<`sPHc++!b(|T{`#J)$M-z@A9*1DewO57zV
zFSq;j)6o^>HSi1YiMabaBM7UDkhGSaSs9<L%!h=IwoaHDVRRkzXGH(~C1J#!+Vj=^
zf7yYr&eWR%-62^D+$OAb+I2o4jyyjNjub^)cfJ502s^($!uofL_4YRF&0sJnilWd+
zIVJ8Uw+TB^O`&VXd+F!)shMS!*vZZbN1V^VNBcYhE{dY)?U0{NSJNi#K354N?LP6`
zw?RAQ`JJB>xJTHHezEVr)BXsda($WmR_2GK%&Mb_Uqe@|E!)Jiq@PuKJ!{WGf!f5Z
z60IF;#7#n#@<bYe>fv7qqvnt>f;wA3>|Jd}POYp1EBn~$x}?5SsBKNwoPUG@)lk_S
zy}hxHGy)}TZ@xOG!_+y#SXAQoOu65PYj0E8YKL#zBIUKRH|kq~lThJ4{m%1((Ou&t
zb+jq_#@$9$)VBh?_5O;uZNGHi*OA|vrvmPBbg1Lcud_KNw&BqqNp$4tYTg@*W~IPN
z>pl5Krc>t`)l=N0R5e9UgU8+#*!MZmZ$OTSUIf_?wM$FQXWr_6LbUoHSUGJr8UG|6
zE2%dH+IcHI0_+iOh_bv4C~vvbUFRpF)qjs<n?K3<>PO(QiDoeZz4iV*(aPb^NCjp0
z&;_9v?*s3EH^5u_{b$BI`%TIt_MLc?@@BzfCH1Pn!C-J*6osrPheX(dw|V-tWZ6DX
z3BCF+;5G0&K|p^K&1aX>urW69m>vhN?K^o!J`$Aos!ty4sFMN{)Yb@9OcmP1oKOZ1
zLEOe)5~i&+`~M+95N`>>c|%a9%v0JROp82^I<xBBs%OD?lSkyU@$?4x&G>vr=y<g}
zjw#11wNhXWY6~1n%hr>U_1)PX<*&=RXS9>MXWz+W_7_1Y?+JoArXzf!4JAAtQ#O;W
z6U~0tM5pZ@L3ytTv&5f-5n0LOByy~xS_QU1Z9xX5WmD2{@iqa;Dt~031NW(o!FNIr
zKeFf0o@2tA(i?EdDe;@tb?oXFKLbK%`vm+!P~2-mC;MpcjNoFXCC409DzGJLOBH9&
zP~Ib*DDlLVeV5R~Hwc@ARoa`eW<h?9z96*ofM@{U$9W#eD{pFYOew3tmgq6T4dhD6
zqO?3V#BJNv%OnsTnB_lQBYMZTtj^)KybboHD<y)yYjvuA?_QFZUBbSg0vp<w96gOF
zumgHbzrCa-N-LR4)FaoEXVc2RV$^Uw9F@}q4b`-Hmw=UdZ0%mO`aQq$tSk|xy=&Lj
zUgYR`FDY;g^cb{9X<gfQ@}KRPV4m9Zn23!jj1Ns+>6AJ(<X26bUlL#+KNAGMMVukz
zhB~3_c`tx-*VaDdSZec7fn%b_pc$owHT2Scvq6ATs6j7*e-Sa6YxbKJ;^ro&q=}VS
zp*%qhe>L8A?fbiquhe+$JJ%p->$K#UMZ5VC*cCmNF1|UGmKvnP?}{;~vVV1DKXi<X
zw<cfO*h*}nycBfh`5G2OxpS$^Z-mj~+d7FHE75LC)|g4qV^t_E-?$a4bd4}ozF<^&
z>7rf-v+(8X>@*IveucO`X_TbOtK%zGpr*|;`+P(g#kmgAR*to3H}$4*(PLsdhtks8
zHL!Be3BBtnaeZk*rmZqc{=6hB&ZN-#r{p_qTfWrxB`fpP-g#neokWhcXt$*)p~q5`
zmKX4VFkNVRcuH9F(vg>Ikjf+}SN=CWlS1o-%6?)0?!p&Dp{vYO!f1MA<*LlCa%@Dq
z`4Kn?dMrh0UD@xy86z9^-8x|keNrK$ss`yCrJdR#!5Z?>J|}_JZy7I-?ejj-sL)2x
zo|deQr-V*&pSU?2M~;nXx25EVlc2|ZITFr2g3#~S-_{8|-uv6?8k9Cl{H<D<%gOJx
zYi;5&HEqcPl!NOx@ublLQHH0)j(d-21n45eR%kbAQa{Ss>vC}SD)MG04^v;Y@;0qe
zYs77GTV$H1&T}#r5GI4x%OWJJkT0`N;1cv5`;BIa0nx7O_XBOpOv|o|9v=7+=#{vT
zya@G`dVy%cJtUZfj*NNrq_!K4v`j@KeI$4)J~BOMy~^Ao9<H?$Y#NOz&$5}G5jsRc
zREElFGs5**rIXSWnk%3!!!R1T`ibDr`(XdSCXBu-;#BAxk&eP5Q|3pa|Lv{)TfVn(
zq4g(L#u{alm=|u{H1CbvTAS4w<d(W;ZScF~s#uUpwyWOh;?PYol3sa!x3o_Xu7rGO
z?`{zqDW962+)gi5-af(K<~`r<2_te+X#D|ks;UATH}QB(>|nm#18cV|QJN(LA@NH{
zo0)Eesubwg6a8Cj+I8|N%e;E?JA#i)9_m9YM+(e=ajO7Bsq*Cc{?qFEVs&={4kf<7
zW6C|eN`P&6tZMfu<#qLn(Rj$z*$bmO7@?))h3n+e;;YJ2@T#UFMGnbJ?MKP6)uE}R
z3Qg?+Lmt%RmG?W*^L+q(8w>_x1yEKvnVYB$kFN>KhsxX}LJTF#bD}NO<8RW?1Hbw4
z&rqRDj4Ce;dX%rugICX!zk5X2TOx+#ll=|K5kDzu%e`dv3ow*Z-h2D|*vb=iRAO5m
zg^Tg+_8nfZ4S6G02ukxuIIYK3!K_0i`VlB&>KV~&BhPt346gJMJc6R9eyqO<3O%-W
zpgvqnyTTQF|A5c|ykK6Lz)pbkY54*>D6tKX9v73g+s7n+Ci(;K5S6z{7@6CIGxLDZ
zUg<+<@u3{O0{w#gnJ_i1*^jP>KqDVRr#OPTyeS$bb?|gKGgqywkHo3?6+J0W)S$$+
zJW6@O#iZ?42ROC&WK~%qC{bq2$M$R!29Gv|8W1JK_fiI(tdX=~m9E?0K2eU0705_K
zyf$-DQ4}R-tRs#5LnoXMgsJ#90(hu5<%t@USjXcVMwNG&wA(9C%Z-$$=~ISvt?v))
zZ>NNj?&Us2eESiY7OvsDYRoIa&b~Fo!yJ6%Q5GLkAs~(XGeQTsV*=3HBDB{RFO<G$
z3?Ba?LLRe-v;?xK&lAd4u4RIpw}{Ks4neW%Ebqu5zL%_$6rH?aFCADR-zi724&&0v
z94)Hwj2QuGOMPYnSvFy53fFWzv&=^=d6Yap5o97PXqHa}liFyMWyv2I<Q<W_=!l?9
z!8erHVFd9#Jo6-w3PJtk@|SW|fp(^)^GQdCsw^^TU0NrGc$1sR0@%Q#<RKov(V>$i
z$ZVZKJt9tEsa#zp&~WL{n)u4}=-gBC2u}%2R9Dvp@ckxpan6}MvUQDE9jqV~rXlXV
z3{%5oHq~{L$`j3#JaTna+TGkRANts4km|Viy2hnjdEC-1-O?@H(k<Q6E#1;B-O?@H
z(mc@ZLB1u;t32k~ls3(}#-(|e$2=Rer&iaGz~jWm>^X8LP2{SX7X2vhq^bzr`vjN%
zHXR(gZ4%UEg8x;Q9GE$0=}fP)>5Io=G|^A$&|RmTd_8sOE)eA1Dnj=;0bG+pD(=z%
zsi;a&lL>2nK!_Jq{G5j?tPw%4GrP{F4<3{39J#<D52<)W3`z5lie+5fWmAOiE+Ja=
z8D&tDAaAWeO+M_oCMNv_@yZ(y7}6A?>85uj_Q7Kk&YcStOF>NvuJxcMW$rk~1++pw
zLRW=6H>MSoqTt7ebbu8apa<gm>IL%)F>}L1C!8(H2>?XBDX~U*<MNocyDHI78(852
zL7qw|TN|OfX_Y*(g0^57oT4G#1nkug$^%@LP#~8L;u)cH2sEn%IJt<RsVlK%#)>XH
z=GwhOKG9DTuvggJ50ryq2au1@_1Tj)>_>~lEJ_ckhSvK8HJaZAF~3VpU*ZMx+yv%f
z>*@ei)OVtvT)L6AJW7^nyPuIy^wR{bS7^G=3e_q?*B7i|t{i5$;FdH&je<3NaLZ4?
zOY*5aeBel$C@4p>Nc1xfk6Mm=aEs4^@q%)qpSs`{<(pYazHc3&>kEb$Pwugxx$D^U
zn^nqTR!VyFl6)!;Sst2{Cz@5FpSC<|!&2AoG|^98c$pH+P86Z*l?(CUuFqV88ja+2
z$^o8A=h2iOCYJ$1<m(?kGf4E)hDVjFqt+m4_cN*!{S1=NYesc2LR}(s(+YrL{CBBW
z5EZyVImG%gVH$19nc_1*q;!*seyVu%ooT_!^&!@3_k&EC(0;}lp*9h^b(AV>)qTHU
z|My7_WMR<mt13%{AI0;M=%;GE^XA7b<8P6847f+wA9P8rGQu_$`e=&K^}V`oZSn%Y
zL$uCl8n~dG`JoM^WzJKgpE{nU&;|R{@ylOj&{U?Ed6iCvw$N00X_S!^QMax44e*<v
z0Wkr>h1H{7Rb7^fT$%Hf=ttzURLJ0bL`?LfO^?6AplxTUjQXM>LN^!Zr?W?!p5t?{
zDCNij@jT<x@egQ!3FJH_`tiT_St@jiq))Y_wN_`ird_u8|25vpl#9@9bAM3EK-wUg
zef9_en)}3~hB7vI%BAtZl{pWIesX;I95(N)t?!A+?sQj%&eBcEgK~1Ly^|>yq1)#E
zpt=V6oGEVzSsV6<=_Zw!Cmk_q**PKIbfTXeU%Gndm9<q0T($BG%6VwI$g%NGrm6_t
zraO+(M5Sq>AKfLSM(q<5zA9@&Zpy35;yw?Fewz6D&G`C2O!)ehsK7KCZWlSerQ%Me
zstDbxJC1yU8eegm=tm8DO$-fIhKCEv)15y*7R1!XO2<)`=toB5&Uff`O!SlE%io*i
zuip7gG=a&Wowl)y9Mxg7cQW~Npf4ab>G+{tm8?5W^dmtlL4gv159jYp<5V7mo>rAB
zrt+4QwlqeL7$rSdsCBBmKM9@9w>3>_G_D*g?_?S(u;z{<^_Vn4O)g!&PxO;sN27IC
z4NAB2n!@C~JS5&;HdW;%ZLU+IKbq*;ffM59?6qs_KGDslw)&Z7QaNVtWGY!=Dgyj{
zeiNUd#`m0Dq91=*)ur1kofCIr9zeBD#NS*Q({G9EXzl$(<5JDNPX0W*K(w$N5!Si)
z_Ix0wK|W8~sxqf4N6-I=DJ^Lb#05W1P}Azl7++~}^-h`<N{=iz{`RuQhD<_9n`Ofk
zPDKz1Sy)njbyhCnfcli9r>rg1RqlIEnxH0Kd}|Z^Ko;C{$Cam)UOJzpw};L8_OkT$
zv~40POrDI?A~d{u$CWvCIeMz}Ml>X-@!Rbx6I|0pP=akdu}|3`7p)Op%uaohpH6kG
zx=)aW$A!w|Sn^L!TaGE!x|3=W)TG;DZ=M>#g;qFEcL@&8mjqA16XFGs1*5lz&HDDT
z^!7CIBUh9*H>rPg#K}A@Ip(O9KTrj^g}Lgz5uqlC@AOWlUx_Xpe+BCT(Uf#bG#?FZ
zo?RTcO_bqLSkPVK?PWUz1<GNoX+QO_6tUPckCVu;in=&-$Bo7jSgP($CIN<)i7*09
zCwkK4r#>U#q~v+rAp($oA>LjlyYM1qvs-Fmxptpf9;Z2bbW&hfsz7|dp!!ZG0fw|$
zkg`00YUKW)9(jC8P^NCLk)JPjmxlP9I*)bKs{$!Q7uwv(q;(~olC*AQ?+>~`9{tGc
zlgCQxO@SH2cbhwzpbQw2^`iFvpb24xbIoHD&0++qp<V7|@_3lW`-A=qc&wy0Fo{V>
zJ-q9kO#bXu6%^9tN}xLO^-P<`-p{hLQlJ`|8m^n_*YAX*Q5=E4NNN%Rd3;Q+jy9b{
z?eJ~$VB8;Cfs>H;&s8b03(Bpkjy7eFTSqVJo~OPQm>vcE#Uc8>j?!t$PjR{tZ7~U1
zZpT;|ADWii<;uO(1m@4JUBJd;(X13$X{4pOk$#h*@GAj?<$~&@#Kdg2Ze`uKvPVL=
z8rtU3W8OodBSddIQ0RXbIw{&Mx6OY{%w(S$lG_T(pZ&IpMs)>N%F)^e>gds9pNMxl
zosxLZ`=H(wI3e223rz}MBPvkI76hU_XFO>AI_0otDKHJ49{$`ub11y`1m9(fmisXk
zXfz4h&6AEI%Hp7FT(_7Gw0?(}l|$3Ack_5k(PJM7@QU9l!#=(;gY+o9DsW7+Th6*K
zTWGp#oEEe`-Fa$VQ=KU<9zFI40kiYJ1O@8uz!ZJg3-vt$VLY^3Ito1y_n0_srZD(6
zz1{oVJY4_O%9cw@3QgOhOF#|@Gs^G4{{a6-7=6NS&Lpo*?+P3f?Y5A-r%rH6ydhMV
za7_xW*QH(?R___*X*A`-1A_k~C{TAi>DsxOB_*202<(b>t5TqUcaJhwa#Cphvek1!
zP^J<!q<nbH%mHBp{z3V!#F?fAn~4IU6H2QtW<X#k9Y+qC99l0Q<hhl(Nq#EVkx0Kg
zviEhT(ae<xHvk%Hk+~>mBbBwIGiqy!eE37V!qLRT)S-@T=|)grHMzs848Yzb*9o;X
zB|fzAkvVV#=5bRgF>e&Mm&x9jBDIFECQobB)|B{2>mFKtZaN|DJm4;K`7^Vx4PWR#
h)p3rGxlmY2{|{M1NgOU~e=Pt2002ovPDHLkV1k`B-Y@_F

literal 0
HcmV?d00001

diff --git a/core/assets-raw/sprites/blocks/defense/shockwave-tower.png b/core/assets-raw/sprites/blocks/defense/shockwave-tower.png
new file mode 100644
index 0000000000000000000000000000000000000000..dff1d431182881a8dcfdea53ec296dba12be38cb
GIT binary patch
literal 3124
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
DzZ8a+

literal 0
HcmV?d00001

diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties
index c4f0726835..83a22a0561 100644
--- a/core/assets/bundles/bundle.properties
+++ b/core/assets/bundles/bundle.properties
@@ -1563,6 +1563,7 @@ block.shielded-wall.name = Shielded Wall
 block.radar.name = Radar
 block.build-tower.name = Build Tower
 block.regen-projector.name = Regen Projector
+block.shockwave-tower.name = Shockwave Tower
 block.shield-projector.name = Shield Projector
 block.large-shield-projector.name = Large Shield Projector
 block.armored-duct.name = Armored Duct
diff --git a/core/assets/icons/icons.properties b/core/assets/icons/icons.properties
index baa9a70758..b4df3089f8 100755
--- a/core/assets/icons/icons.properties
+++ b/core/assets/icons/icons.properties
@@ -575,3 +575,4 @@
 63109=underflow-duct|block-underflow-duct-ui
 63108=malign|block-malign-ui
 63107=smite|block-smite-ui
+63106=shockwave-tower|block-shockwave-tower-ui
diff --git a/core/assets/logicids.dat b/core/assets/logicids.dat
index a3f5da8dc84490eca6b0021ecb095e32a5d094a9..d568dc39476ec8de3c465e48d75f4e4b4c961a82 100644
GIT binary patch
delta 32
ocmaE&{8gEW;paxC$9w|(#Tog@+2x64sk$Zk<*7xBpYSmQ0Mru<p8x;=

delta 16
YcmeyW{6v|F;m1a%$9$W=@%?8406)hEb^rhX

diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java
index 22bf2960f8..1f91e6c36f 100644
--- a/core/src/mindustry/content/Blocks.java
+++ b/core/src/mindustry/content/Blocks.java
@@ -92,7 +92,7 @@ public class Blocks{
     //defense - erekir
     radar,
     buildTower,
-    regenProjector, barrierProjector,
+    regenProjector, barrierProjector, shockwaveTower,
     //campaign only
     shieldProjector,
     largeShieldProjector,
@@ -1826,6 +1826,13 @@ public class Blocks{
             consumePower(4f);
         }};
 
+        shockwaveTower = new ShockwaveTower("shockwave-tower"){{
+            requirements(Category.effect, with(Items.surgeAlloy, 50, Items.silicon, 150, Items.oxide, 30, Items.tungsten, 100));
+            size = 3;
+            consumeLiquids(LiquidStack.with(Liquids.cyanogen, 1f / 60f));
+            consumePower(80f / 60f);
+        }};
+
         //TODO 5x5??
         shieldProjector = new BaseShield("shield-projector"){{
             requirements(Category.effect, BuildVisibility.editorOnly, with());
diff --git a/core/src/mindustry/content/ErekirTechTree.java b/core/src/mindustry/content/ErekirTechTree.java
index 759fb8e3e2..23c8c06d7a 100644
--- a/core/src/mindustry/content/ErekirTechTree.java
+++ b/core/src/mindustry/content/ErekirTechTree.java
@@ -161,7 +161,9 @@ public class ErekirTechTree{
                     node(regenProjector, () -> {
                         //TODO more tiers of build tower or "support" structures like overdrive projectors
                         node(buildTower, Seq.with(new OnSector(four)), () -> {
+                            node(shockwaveTower, () -> {
 
+                            });
                         });
                     });
                 });
diff --git a/core/src/mindustry/content/Fx.java b/core/src/mindustry/content/Fx.java
index c1b50d78af..3a5ee1ed08 100644
--- a/core/src/mindustry/content/Fx.java
+++ b/core/src/mindustry/content/Fx.java
@@ -198,6 +198,14 @@ public class Fx{
         rect(block.fullIcon, e.x, e.y);
     }).layer(Layer.turret - 5f),
 
+    pointShockwave = new Effect(20, e -> {
+        color(e.color);
+        stroke(e.fout() * 2f);
+        Lines.circle(e.x, e.y, e.finpow() * e.rotation);
+        randLenVectors(e.id + 1, 8, 1f + 23f * e.finpow(), (x, y) ->
+            lineAngle(e.x + x, e.y + y, Mathf.angle(x, y), 1f + e.fout() * 3f));
+    }),
+
     moveCommand = new Effect(20, e -> {
         color(Pal.command);
         stroke(e.fout() * 5f);
diff --git a/core/src/mindustry/logic/LStatements.java b/core/src/mindustry/logic/LStatements.java
index a6df7dcac6..cb10027821 100644
--- a/core/src/mindustry/logic/LStatements.java
+++ b/core/src/mindustry/logic/LStatements.java
@@ -11,7 +11,6 @@ import mindustry.*;
 import mindustry.annotations.Annotations.*;
 import mindustry.ctype.*;
 import mindustry.gen.*;
-import mindustry.graphics.*;
 import mindustry.logic.LCanvas.*;
 import mindustry.logic.LExecutor.*;
 import mindustry.type.*;
@@ -1264,7 +1263,7 @@ public class LStatements{
 
             fields(table, unit, str -> unit = str);
 
-            if(!clear){
+            if(!clear && !(content.statusEffect(effect) != null && content.statusEffect(effect).permanent)){
 
                 table.add(" for ");
 
diff --git a/core/src/mindustry/world/blocks/defense/ShockwaveTower.java b/core/src/mindustry/world/blocks/defense/ShockwaveTower.java
new file mode 100644
index 0000000000..ec93ed7de6
--- /dev/null
+++ b/core/src/mindustry/world/blocks/defense/ShockwaveTower.java
@@ -0,0 +1,118 @@
+package mindustry.world.blocks.defense;
+
+import arc.math.*;
+import arc.util.*;
+import arc.struct.*;
+import arc.graphics.*;
+import arc.graphics.g2d.*;
+import arc.audio.*;
+import mindustry.content.*;
+import mindustry.gen.*;
+import mindustry.graphics.*;
+import mindustry.world.meta.*;
+import mindustry.world.*;
+import mindustry.entities.*;
+import mindustry.annotations.Annotations.Load;
+
+import static mindustry.Vars.*;
+
+public class ShockwaveTower extends Block{
+    public int timerCheck = timers ++;
+
+    public float range = 90f;
+    public float reload = 60f * 2f;
+    public float bulletDamage = 150;
+    public float falloffCount = 20f;
+    public float shake = 2f;
+    //checking for bullets every frame is costly, so only do it at intervals even when ready.
+    public float checkInterval = 8f;
+    public Sound shootSound = Sounds.bang;
+    public Color waveColor = Pal.accent, heatColor = Pal.turretHeat, shapeColor = Color.valueOf("f29c83");
+    public float cooldownMultiplier = 1f;
+    public Effect waveEffect = Fx.pointShockwave;
+
+    public float shapeRotateSpeed = 1f, shapeRadius = 6f;
+    public int shapeSides = 4;
+
+    public @Load("@-heat") TextureRegion heatRegion;
+
+    public ShockwaveTower(String name){
+        super(name);
+        update = true;
+        solid = true;
+    }
+
+    @Override
+    public void setStats(){
+        super.setStats();
+
+        stats.add(Stat.damage, bulletDamage, StatUnit.none);
+        stats.add(Stat.range, range / tilesize, StatUnit.blocks);
+        stats.add(Stat.reload, 60f / reload, StatUnit.perSecond);
+    }
+
+    @Override
+    public void drawPlace(int x, int y, int rotation, boolean valid){
+        super.drawPlace(x, y, rotation, valid);
+
+        Drawf.dashCircle(x * tilesize + offset, y * tilesize + offset, range, waveColor);
+    }
+
+    public class ShockwaveTowerBuild extends Building{
+        public float reloadCounter = Mathf.random(reload);
+        public float heat = 0f;
+        public Seq<Bullet> targets = new Seq<>();
+
+        @Override
+        public void updateTile(){
+            if(potentialEfficiency > 0 && (reloadCounter += Time.delta) >= reload && timer(timerCheck, checkInterval)){
+                targets.clear();
+                Groups.bullet.intersect(x - range, y - range, range * 2, range * 2, b -> {
+                    if(b.team != team && b.type.hittable){
+                        targets.add(b);
+                    }
+                });
+
+                if(targets.size > 0){
+                    heat = 1f;
+                    reloadCounter = 0f;
+                    waveEffect.at(x, y, range, waveColor);
+                    shootSound.at(this);
+                    Effect.shake(shake, shake, this);
+                    float waveDamage = Math.min(bulletDamage, bulletDamage * falloffCount / targets.size);
+
+                    for(var target : targets){
+                        if(target.damage > waveDamage){
+                            target.damage -= waveDamage;
+                        }else{
+                            target.remove();
+                        }
+                    }
+                }
+            }
+
+            heat = Mathf.clamp(heat - Time.delta / reload * cooldownMultiplier);
+        }
+
+        @Override
+        public float warmup(){
+            return heat;
+        }
+
+        @Override
+        public boolean shouldConsume(){
+            return targets.size != 0;
+        }
+
+        @Override
+        public void draw(){
+            super.draw();
+            Drawf.additive(heatRegion, heatColor, heat, x, y, 0f, Layer.blockAdditive);
+
+            Draw.z(Layer.effect);
+            Draw.color(shapeColor, waveColor, Mathf.pow(heat, 2f));
+            Fill.poly(x, y, shapeSides, shapeRadius * potentialEfficiency, Time.time * shapeRotateSpeed);
+            Draw.color();
+        }
+    }
+}
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index 1ecdb11d3e..77ed3793fc 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -25,4 +25,4 @@ org.gradle.caching=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=29a4391826
+archash=b1b88883e2
diff --git a/tools/src/mindustry/tools/Generators.java b/tools/src/mindustry/tools/Generators.java
index b5702a9945..c15bf06a22 100644
--- a/tools/src/mindustry/tools/Generators.java
+++ b/tools/src/mindustry/tools/Generators.java
@@ -382,7 +382,7 @@ public class Generators{
                     save(image, "../editor/" + block.name + "-icon-editor");
 
                     if(block.buildVisibility != BuildVisibility.hidden){
-                        saveScaled(image, block.name + "-icon-logic", logicIconSize);
+                        saveScaled(image, block.name + "-icon-logic", Math.min(32 * 3, image.width));
                     }
                     saveScaled(image, "../ui/block-" + block.name + "-ui", Math.min(image.width, maxUiIcon));