From 8644844b7de679405e053410dd98ec111f5c74aa Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Tue, 13 Jul 2021 19:11:54 -0400
Subject: [PATCH] beam drill visual improvements

---
 .../sprites/effects/drill-laser-end.png       | Bin 500 -> 538 bytes
 .../sprites/effects/drill-laser.png           | Bin 128 -> 131 bytes
 .../world/blocks/production/BeamDrill.java    |  75 ++++++++++++++----
 3 files changed, 61 insertions(+), 14 deletions(-)

diff --git a/core/assets-raw/sprites/effects/drill-laser-end.png b/core/assets-raw/sprites/effects/drill-laser-end.png
index 29bd7a5cee5c35135282f03eb61cc29f961f4541..cb80e5478e97d8f81d6dc52188f63a9da62a8a66 100644
GIT binary patch
delta 499
zcmeyuJd0(5Vf__P7srr_Id5k>`W-e9a8(y&f55lmPPg)bz7Qv-&JE4d2ljSUwZ}0W
zIwjOK>CBON_7fNXpEmXN6@6pB9Di31#TEf45D_GPcAEJAx;^>2Z}aZkS$)Z$sT?yQ
z^pwoSO@~;fc1a4WuG+;R)ht%(P$t*7{e$6EZlQx-MgAKT>m`<CKHL4*e#Y#_Uso?Z
zUtDh)c}sTp_q><4EMs<lQ`@AWo+xUZx4!e$?e;L2nCD9_c>a3+x$?sccj2d&g}XT~
zJ!{+=xL8p2q-(&IIW8?KKZ1Ew+3%JwvS^yNNIi)`>GZ@9Dc5)Y8;?j?w(nkk@_haN
zxHH!`?c-XrRHMmjak}4`dWmk05D~{`3jUVYwyh|+m$GuBo8QTDn-hK;cYc|*Yx2D2
z%a?NXt`=R+5$_IFxysq)xAhf^tFt4Q$Pxz-5inQb^{+GCuUK4}BiCfTUUa8?=8Nqa
z6ML03)O{BPYcmR_+?*Y0{NU2tKA{Bbu8GoVN;AF)F}~B7_xtoot(7LVIRO`yg$h<R
z-ka|B&b^z(=hBJY-EXW9HaoM**=pwmIZT!Ioi^o@-ioB3-A-RsD>y?m@9BxHK4EqA
z73;!oi%7OL0e5A#+;;k;ne{`P2^JYnS&#YoR37nXy;-l!z`(%Z>FVdQ&MBb@0GIOS
AQ2+n{

delta 461
zcmbQm@`ZVVVf{K!7srr_Id5kl3_R?><C@yW^rEp*O`|dE0UJA?%mcQo0Zy|TJo#5L
z6yNGr?@P(vZ<Bb>IxQ#nTjVE;O-XDF5b*ryhNqA2`|~G1*>U^(`Lp}de;x|dEDkxX
z6|JM4<~3F0r_$b|K7rkn*uqa|YN(!M3O|{-LZy`7s;_?WUmN?jCo%V9Ta(_Ew_hkU
z&zC=J@a1k$x#Pq$on1491g~08-o^I$$r@4Pqrz8%gSI<_7D<Ip+QqVR+T|4!N+$9?
zSU72M-(3%ByQ#LK(gxOZJ#XslIy0xHOSMSvU3_2Nzu#Y_;<SHhY?w0TZqBzeoil|5
zm!48OX}e<ioEIBc71d9>zocJpmxJH4IdW_K_U`=jX<bU$;<%k>r{20{bX%qQTxXD@
z?WrZZuAER{XR%Z`!RW}xQKTU%@;7&B-$oXr6ONyfL%*8D{uRmH7Ra_%bMmW8SspB|
zRmR?Cb8^d5CX|Y3OQ)sH`eY<rCh~o^b41X#nvk2xVIRVr?@kZ<w)iZUTi&Hpt5^5j
zeQ<Ok^ZI$R5^)6ye~vaXYO%Y0kdb&)lE8DL(XojAUl$~p85sWe*vl=wUM{fpS^`MO
M)78&qol`;+0NuIND*ylh

diff --git a/core/assets-raw/sprites/effects/drill-laser.png b/core/assets-raw/sprites/effects/drill-laser.png
index 5c83b76090231635f34acebf14bdd5b5311a19fb..026737d529fa0cfcffb3b4846a75fa31368d006b 100644
GIT binary patch
delta 89
zcmZo*Y-XHb7-Z||;uxYaF*#uYW5S-$$cR>*11;;Cq?mM0tzuehvb}W!!{h(||NrM_
wDi;t;`v1(Fm#h5F-oFcHJ==DHg@IvWDbK3^w<g?SU|?YIboFyt=akR{0DpxhF8}}l

delta 86
zcmZo>Y+#&V=x^oe;uxYaF*#uYW5S-$$RF~N4V<y8rYsRt*0Qe1(~xB9`Tzg_^1b;h
sg_8bnGvnndzhnEW@!PfwEDQ`ABzRm^B6Qst7#J8lUHx3vIVCg!0DO}l<NyEw

diff --git a/core/src/mindustry/world/blocks/production/BeamDrill.java b/core/src/mindustry/world/blocks/production/BeamDrill.java
index 0825369155..de8ad973ad 100644
--- a/core/src/mindustry/world/blocks/production/BeamDrill.java
+++ b/core/src/mindustry/world/blocks/production/BeamDrill.java
@@ -6,9 +6,8 @@ import arc.graphics.g2d.*;
 import arc.math.*;
 import arc.math.geom.*;
 import arc.util.*;
+import arc.util.io.*;
 import mindustry.annotations.Annotations.*;
-import mindustry.content.*;
-import mindustry.entities.*;
 import mindustry.entities.units.*;
 import mindustry.gen.*;
 import mindustry.graphics.*;
@@ -19,6 +18,8 @@ import mindustry.world.meta.*;
 import static mindustry.Vars.*;
 
 public class BeamDrill extends Block{
+    protected Rand rand = new Rand();
+
     public @Load("drill-laser") TextureRegion laser;
     public @Load("drill-laser-end") TextureRegion laserEnd;
     public @Load("@-top") TextureRegion topRegion;
@@ -26,9 +27,13 @@ public class BeamDrill extends Block{
     public float drillTime = 200f;
     public int range = 5;
     public int tier = 1;
-    public float laserWidth = 0.7f;
-    /** Effect randomly played while drilling. */
-    public Effect updateEffect = Fx.mineSmall;
+    public float laserWidth = 0.65f;
+
+    public Color sparkColor = Color.valueOf("fd9e81"), glowColor = Color.white;
+    public float glowIntensity = 0.2f, pulseIntensity = 0.07f;
+    public float glowScl = 3f;
+    public int sparks = 12;
+    public float sparkRange = 10f, sparkLife = 27f, sparkRecurrence = 4f, sparkSpread = 45f, sparkSize = 3.5f;
 
     public BeamDrill(String name){
         super(name);
@@ -44,7 +49,7 @@ public class BeamDrill extends Block{
 
     @Override
     public void init(){
-        clipSize = Math.max(clipSize, size * tilesize + (range + 1) * tilesize);
+        clipSize = Math.max(clipSize, size * tilesize + (range + 2) * tilesize);
         super.init();
     }
 
@@ -165,13 +170,14 @@ public class BeamDrill extends Block{
             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);
 
             //update facing tiles
             for(int p = 0; p < size; p++){
                 Point2 l = lasers[p];
                 Tile dest = null;
                 for(int i = 0; i < range; i++){
-                    int rx = l.x + Geometry.d4x(rotation)*i, ry = l.y + Geometry.d4y(rotation)*i;
+                    int rx = l.x + dx*i, ry = l.y + dy*i;
                     Tile other = world.tile(rx, ry);
                     if(other != null){
                         if(other.solid()){
@@ -189,9 +195,6 @@ public class BeamDrill extends Block{
                 }
 
                 facing[p] = dest;
-                if(cons && dest != null && Mathf.chanceDelta(0.05 * warmup)){
-                    updateEffect.at(dest.worldx() + Mathf.range(4f), dest.worldy() + Mathf.range(4f), dest.wallDrop().color);
-                }
             }
 
             //when multiple items are present, count that as no item
@@ -226,18 +229,41 @@ public class BeamDrill extends Block{
             Draw.rect(block.region, x, y);
             Draw.rect(topRegion, x, y, rotdeg());
 
-            Draw.z(Layer.power - 1);
             var dir = Geometry.d4(rotation);
+            int ddx = Geometry.d4x(rotation + 1), ddy = Geometry.d4y(rotation + 1);
 
             for(int i = 0; i < size; i++){
                 Tile face = facing[i];
                 if(face != null){
                     Point2 p = lasers[i];
-                    Drawf.laser(team, laser, laserEnd, (p.x - dir.x/2f) * tilesize, (p.y - dir.y/2f) * tilesize,
-                        face.worldx() - (dir.x/2f)*(tilesize), face.worldy() - (dir.y/2f)*(tilesize),
-                    (laserWidth + Mathf.absin(Time.time + i*4 + (id%20)*6, 3f, 0.07f)) * warmup);
+                    float lx = face.worldx() - (dir.x/2f)*tilesize, ly = face.worldy() - (dir.y/2f)*tilesize;
+
+                    Draw.z(Layer.power - 1);
+                    Draw.mixcol(glowColor, Mathf.absin(Time.time + i*5 + id*9, glowScl, glowIntensity));
+                    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);
+                    Draw.mixcol();
+
+                    Draw.z(Layer.effect);
+                    Lines.stroke(warmup);
+                    rand.setState(i, id);
+                    Color col = face.wallDrop().color;
+                    for(int j = 0; j < 16; j++){
+                        float fin = (Time.time / sparkLife + rand.random(sparkRecurrence + 1f)) % sparkRecurrence;
+                        float or = rand.range(2f);
+                        Tmp.v1.set(sparkRange * fin, 0).rotate(rotdeg() + rand.range(sparkSpread));
+
+                        Draw.color(sparkColor, col, fin);
+                        float px = Tmp.v1.x, py = Tmp.v1.y;
+                        if(fin <= 1f) Lines.lineAngle(lx + px + or * ddx, ly + py + or * ddy, Angles.angle(px, py), Mathf.slope(fin) * sparkSize);
+                    }
+                    Draw.reset();
                 }
             }
+            Draw.blend();
             Draw.reset();
         }
 
@@ -253,5 +279,26 @@ public class BeamDrill extends Block{
                 getLaserPos(tileX(), tileY(), rotation, i, lasers[i]);
             }
         }
+
+        @Override
+        public byte version(){
+            return 1;
+        }
+
+        @Override
+        public void write(Writes write){
+            super.write(write);
+            write.f(time);
+            write.f(warmup);
+        }
+
+        @Override
+        public void read(Reads read, byte revision){
+            super.read(read, revision);
+            if(revision >= 1){
+                time = read.f();
+                warmup = read.f();
+            }
+        }
     }
 }