From bc0b9e9eb3b6caa60ec34e82c301128e4ef041f6 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Mon, 25 Oct 2021 20:51:45 -0400
Subject: [PATCH] plasma bore

---
 .../sprites/blocks/drills/beam-drill-top.png  | Bin 451 -> 0 bytes
 .../sprites/blocks/drills/beam-drill.png      | Bin 687 -> 0 bytes
 .../sprites/blocks/drills/plasma-bore-top.png | Bin 0 -> 450 bytes
 .../sprites/blocks/drills/plasma-bore.png     | Bin 0 -> 1153 bytes
 core/assets/icons/icons.properties            |   1 +
 core/assets/logicids.dat                      | Bin 2926 -> 2927 bytes
 core/src/mindustry/content/Blocks.java        |   8 ++++----
 .../world/blocks/production/BeamDrill.java    |  16 +++++++++++-----
 8 files changed, 16 insertions(+), 9 deletions(-)
 delete mode 100644 core/assets-raw/sprites/blocks/drills/beam-drill-top.png
 delete mode 100644 core/assets-raw/sprites/blocks/drills/beam-drill.png
 create mode 100644 core/assets-raw/sprites/blocks/drills/plasma-bore-top.png
 create mode 100644 core/assets-raw/sprites/blocks/drills/plasma-bore.png

diff --git a/core/assets-raw/sprites/blocks/drills/beam-drill-top.png b/core/assets-raw/sprites/blocks/drills/beam-drill-top.png
deleted file mode 100644
index fcc4ecbced8cb4da8a8693ca1de1c418f5bbaac1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 451
zcmeAS@N?(olHy`uVBq!ia0y~yU~m9o4mJh`hE<t`_ZS!$7>k44ofy`glX=O&z*y_)
z;uumf=k2W1yoU^U+JcV=@f_qUc*rHKXx5}Hexp%QV(}cM&@iDn%j&LtEO*h^^#6wE
z8!MLMg)+wt5C7QNXZl}$1<%BUSARC_Usz+T?2z@`P-%w10+Db3U2f>)^XYH3<d59T
zpt{SiaUH+on$OQNZ24tgFHt)3Mb|)ex?C(rfR*$a?ho%1OmrEZg&F8Fw7p}!5u{gF
zzb{fwZTjWJZ>Rfpn0Cy`Z*^f<dv1AF%h6zl*MBO%JFWluLoWTc@JUgRoOXqh9miHm
zZ48>S%2|wY5wnm|$Mz!&9?nrp_{Fq@=?Tv?ANGz}?GvVOWU)+e>SefdJ*g$6Va~!2
z<(ki(6FL|&43>Y+I`uGP$B}cZGdn!mYCqmiynIS>NB6=QOCDK&+a3?41xxLgw`|p2
z7s|qs>7K!>w4##3^C6Rmv_ofw<r>D1Z5?d8WM?$|U}!CU_GZJ(J2R|RQk@#s9e)ya
zEXCQNj(62dj=)P*$Jg7jD#iAncCU#s`;mRVQ0Dl`hwP_*Y%*#0UuM9-z`)??>gTe~
HDWM4fmKwhx

diff --git a/core/assets-raw/sprites/blocks/drills/beam-drill.png b/core/assets-raw/sprites/blocks/drills/beam-drill.png
deleted file mode 100644
index 040474476fd9c9be06336ae2ca2fb9bdb96305ae..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 687
zcmeAS@N?(olHy`uVBq!ia0y~yU~m9o4mJh`hE<t`_ZS$M$~;{hLn`LHy=Ca<Y{<j*
zpxo_<rGRp>dtbv0O9mn7qz5)KO^XyHcOEOuIbP`SX+q~0%m3HE9j$#>QBh-MzklEE
z<Ihj8v`$+$JM{66owjrLa!5W5zy6EugF;GMeB@{L15F#0|E#(t&Jfko|9khl1=qXf
zg5C-=2s-_ambMmHGHb&+fd)Ayk(-SRINv+IU<zP~QV~8VbgxT+iQ!Pj8kY|(+Z9?E
z&X@(y6WqG)VYq|wrfm)q0s2gidpM&Gy?@1=Cb;YN0`))Z{0i6}GCg?v%d50_;-U9H
zbQid0+<bA1PezWxjl)2nJ2Aw)nPDebfccBSi#z*SE;t{U`QjI!Ob1f{i&ePOg*yH8
z_vVXlneflGW?^8_tKnC)+9Te0`VrHDcwx@O&<bs*-xcjl83JML*Od<JJ<M~#sYriG
z^wV=6lv!#%KPkE}`&HxN!z{m&ZfU&byYIYUH~aL)cRK8R{pt_63+_I8_d%rbw%yLJ
zm*0L3*FF=g@`(NND#fq-cWxaGn=$*sv3k}A*P<C%1F)d44ol=ZuR33>(ureNR&-B}
z<e0YjrvZb;9_fQcCikDUGkg)7(7V8LYME^R<^FR0J?xIJ<aL}^Ewr5Vo-xM6N#ww<
zyf;h-I4;f7WVp?F=;$8#lcEom%M};|q7%KVXN%gcVt=^n=*#*kXSnV=&*0Q&st^ck
zU(T`lVLO9Z%bE|@N<ANjGR#VfIn0>6rQza)b#vJi6xZ<BH#c0DWjdgk((+xQ;58rP
z0gjmubvZ8Wa%Q-7Lolv+LFH#B1|#bOFK&q(WZl56xJu2ffH_6k<vLS~W`j;ksHxN;
a@jTh1HBZ<1cQP<AFnGH9xvX<aXaWG1J0!vY

diff --git a/core/assets-raw/sprites/blocks/drills/plasma-bore-top.png b/core/assets-raw/sprites/blocks/drills/plasma-bore-top.png
new file mode 100644
index 0000000000000000000000000000000000000000..c0bd11535689ac8b5822f744096c4a37f476db42
GIT binary patch
literal 450
zcmeAS@N?(olHy`uVBq!ia0y~yU~m9o4mJh`hE<t`_ZS!$7>k44ofy`glX=O&z*yty
z;uumf=k2W1yoU^U+MJIH-HB}HwFvLIXc%xl=YZ9nn@kq2PGOU*eE+U^{5~Rd>R)xg
zoa>4feUB~rB<;?>jQ;$u@st4Pzq#^y!l%rQnU;jfDK~L4dfl$`Y)Pyxu2|VydEy<b
z#>G;Ol3I?Wx#sS#D<4FtSB7~=C^_oc>=IZoL!(ei>ENY<8Bq*p)+R(T@Z9AtSn}sb
zZQTYHwe25wS$$T%%@}iTyOUBw*z;i1L(dc&O6zR)UbsK!{`0HfT#8tQZYy%gt}9&S
zwnk*>s|l_RFB)1n9_bopSS;t5v5#RTgJrYoVa7#jf|G<Cdl`aO2sZqV>Y2bb!C1s@
zdXXJVn=AwGvywPpOBvqj5tXLAf+ut1g&Lo*GnE@o(QaS(c;%6f6!tAwo=@4Z?daAn
z2F14=Zyi}oJ12<fHEdy=(lPz8lt6w*#)8|8oE`iD5$R{SW_R{(bq-Qvc~RxFF4f13
z<?;0ev-$*7*Ovcz=d5t)>yDZu$5WfrtNR{X`0?5wblF%U=sh=wfq{X+)78&qol`;+
E0A!lDt^fc4

literal 0
HcmV?d00001

diff --git a/core/assets-raw/sprites/blocks/drills/plasma-bore.png b/core/assets-raw/sprites/blocks/drills/plasma-bore.png
new file mode 100644
index 0000000000000000000000000000000000000000..35d8889be82b2820ff7bb51080b977bf375cc671
GIT binary patch
literal 1153
zcmeAS@N?(olHy`uVBq!ia0y~yU~m9o4mJh`hE<t`_ZS!$7>k44ofy`glX=O&z+&y`
z;uumf=k4shS<;Rot^MYGvvZ%Ym>+u}vWeT-fW_1^b;4>EAt!|;pQJ6G2>#)#WDbAF
zv@W+`xm&M5prWoK)8a!4kt}AdK2JmvpWM7V)4Kdyx>~DW>ifQTcRpwSUt%2f^Uu>K
zb@}W2_RKQ<eXBNm`tF^tcg<4nV2k}y6}V1(w?Y0Y*RKZx85k-Rb{L&s8Oh?L@NYxo
zgIhMs%i=gzf3m;0fSbV}R`}dG_gl4FyWj7WdYC1(KKr|D>$eZhU)U~ByztsJgJ=7e
z-^<&7v2}N?x+{_Qbl0?028Jq*PiEHze4e%DC~7b=L~^V;v`(SmEcZ=^h|0gu4%?b8
z*!THP#FD+WYww2d-jQm)c+%R+$T`nvhd$<LlRB*XH|71Q8H(EHcHepJ>c(*^nBl?R
z-wXlv^Tg{EHeOtF)BSJ7IjL->rK}0bad~U9P8LsLbmUa%uUx35xFSoubpnF{@AEgS
z%}onM1y;<8;aL7LblEwk112>ZPO(=R7udd<;NR@9Q@~=Yk3fol(Ow3RS>byXHr8JG
z`Q1G`r{zJE6^E8S)1gzV``=GK&!|6N?cdb*Te&~4{5bz!UYePE{7LDatvlK)tKMz-
zS+f3^o-5<hN{337DY^HyEo(@%n##z=@Ze$aqA;Nrtuy++Hmo@NcUpJsMltEOZO5k0
z5`T0i@$+1lMNztZ1tM}8?7;$3vwy$w?CxrEn7KaoPTDtpt&`7k6nB{DFKJ3JS}!He
zkQE%mVRwf6q`;16mmf2~+F<5r5GO8^@wVvttv!FD7Bh1l`mcAcT=3t0r}I%vAMQ5f
z>oWexJFtBkLyh@^Xm5sn(jV5UGTi6=aZRY<JzGsS=YewOeW@%3Qt>-qEEXzE+UGEp
zi!<=q@`o`qHFjQGb5nh>G1s9rH?O-Vt9^F5b>K+jj*EM^nk3fqxbJ+{TH~;x_gN~(
z%z_d_jXBY?#fvx<^G)n+W3C^6tX6ogTwLH(-?K=D9olXUS&BDYKHphd<i?;Rx1G~r
zRl|gpo(=+yotcud3~R1Ea;UCY&TV4${pPb<i~TYWc7FSk-CNj}@@#(J8L7j%xjy?i
z+@@5{Z<}{s!$;H2Wc{a29mkHex!g;)D6tSY)pPb#$Fo%bnFS&9I(BcF+7#fL7U5=6
zFCzEiabe^!QN<%iLfMwNE~>oSC0Ml8!o7%D@6scii#A(h+TPq?YdXDRj~M&X8SE0P
zk1lq+{zKu)y?t!kuFl`pb?o&n_s?eQBEMHo=2|bbc-o?=8@DyAay%=`yK9Yn)5iX2
z(Uw(bi?dc%O{g|?++bDs^w7F9#aXBJuDGYcb!hS2yL*LayQxi<{!>x7{BHcyNwfZL
zO@DFcZ^%38t91{{t5?*%O(|-&|9t$$jfzP(=Dk-pUc0gEdgUM8aL;Wg`k#JbT>C3F
zWnHy+>FL#<s-0GueK(t9CtGxXPpq@X;XM<07G79?Y(@X2%LQ?Nk0(B<|0S~gaD2!E
WgG$}JhyVr#1_n=8KbLh*2~7YFF(^&|

literal 0
HcmV?d00001

diff --git a/core/assets/icons/icons.properties b/core/assets/icons/icons.properties
index bec00ed84d..ffe341fdc9 100755
--- a/core/assets/icons/icons.properties
+++ b/core/assets/icons/icons.properties
@@ -408,3 +408,4 @@
 63300=scuttler|unit-scuttler-ui
 63299=breach|block-breach-ui
 63298=core-bastion|block-core-bastion-ui
+63297=plasma-bore|block-plasma-bore-ui
diff --git a/core/assets/logicids.dat b/core/assets/logicids.dat
index 0a7a8904db7860cdf4d65ca69352fdeebf39491b..adb153965d62d6bf558091fdb25e28914a6b4f4b 100644
GIT binary patch
delta 25
gcmaDS_FinmKMo%5f}F(S+(g}^{G!y&oSdml0EwvyRsaA1

delta 24
fcmaDa_D*cWKMroLq}0S*-ISutoSe;EoT*FzeYptR

diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java
index 5843eeaaad..225d96c73b 100644
--- a/core/src/mindustry/content/Blocks.java
+++ b/core/src/mindustry/content/Blocks.java
@@ -81,7 +81,7 @@ public class Blocks implements ContentList{
 
     //production
     mechanicalDrill, pneumaticDrill, laserDrill, blastDrill, waterExtractor, oilExtractor, cultivator,
-    cliffCrusher, beamDrill,
+    cliffCrusher, plasmaBore,
 
     //storage
     coreShard, coreFoundation, coreNucleus, vault, container, unloader,
@@ -1603,12 +1603,12 @@ public class Blocks implements ContentList{
             output = Items.sand;
         }};
 
-        beamDrill = new BeamDrill("beam-drill"){{
-            requirements(Category.production, with(Items.copper, 10));
+        plasmaBore = new BeamDrill("plasma-bore"){{
+            requirements(Category.production, with(Items.graphite, 20, Items.beryllium, 10, Items.lead, 20));
             consumes.power(0.2f);
             tier = 4;
             size = 2;
-            range = 4;
+            range = 2;
         }};
 
         //endregion
diff --git a/core/src/mindustry/world/blocks/production/BeamDrill.java b/core/src/mindustry/world/blocks/production/BeamDrill.java
index 238028e8ed..73af805a08 100644
--- a/core/src/mindustry/world/blocks/production/BeamDrill.java
+++ b/core/src/mindustry/world/blocks/production/BeamDrill.java
@@ -23,6 +23,7 @@ public class BeamDrill extends Block{
 
     public @Load("drill-laser") TextureRegion laser;
     public @Load("drill-laser-end") TextureRegion laserEnd;
+    public @Load("drill-laser-center") TextureRegion laserCenter;
     public @Load("@-top") TextureRegion topRegion;
 
     public float drillTime = 200f;
@@ -33,7 +34,7 @@ public class BeamDrill extends Block{
     public Color sparkColor = Color.valueOf("fd9e81"), glowColor = Color.white;
     public float glowIntensity = 0.2f, pulseIntensity = 0.07f;
     public float glowScl = 3f;
-    public int sparks = 11;
+    public int sparks = 8;
     public float sparkRange = 10f, sparkLife = 27f, sparkRecurrence = 4f, sparkSpread = 45f, sparkSize = 3.5f;
 
     public BeamDrill(String name){
@@ -189,12 +190,11 @@ public class BeamDrill extends Block{
             super.updateTile();
 
             if(lasers[0] == null) updateLasers();
-            boolean cons = shouldConsume();
 
             warmup = Mathf.approachDelta(warmup, Mathf.num(consValid()), 1f / 60f);
             lastItem = null;
             boolean multiple = false;
-            int dx = Geometry.d4x(rotation), dy = Geometry.d4y(rotation), ddx = Geometry.d4x(rotation + 1), ddy = Geometry.d4y(rotation + 1);
+            int dx = Geometry.d4x(rotation), dy = Geometry.d4y(rotation);
 
             //update facing tiles
             for(int p = 0; p < size; p++){
@@ -262,13 +262,19 @@ public class BeamDrill extends Block{
                     Point2 p = lasers[i];
                     float lx = face.worldx() - (dir.x/2f)*tilesize, ly = face.worldy() - (dir.y/2f)*tilesize;
 
+                    float width = (laserWidth + Mathf.absin(Time.time + i*5 + id*9, glowScl, pulseIntensity)) * warmup;
+
                     Draw.z(Layer.power - 1);
                     Draw.mixcol(glowColor, Mathf.absin(Time.time + i*5 + id*9, glowScl, glowIntensity));
-                    Drawf.laser(team, laser, laserEnd,
+                    if(Math.abs(p.x - face.x) + Math.abs(p.y - face.y) == 0){
+                        Draw.rect(laserCenter, lx, ly, width * laserCenter.width * Draw.scl, width * laserCenter.height * Draw.scl);
+                    }else{
+                        Drawf.laser(team, laser, laserEnd,
                         (p.x - dir.x/2f) * tilesize,
                         (p.y - dir.y/2f) * tilesize,
                         lx, ly,
-                        (laserWidth + Mathf.absin(Time.time + i*5 + id*9, glowScl, pulseIntensity)) * warmup);
+                        width);
+                    }
                     Draw.mixcol();
 
                     Draw.z(Layer.effect);