From b5a63fb6ee7da5120092bbac6ce31b42c98a3b67 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Mon, 7 Feb 2022 23:48:46 -0500
Subject: [PATCH] Very WIP effect drones

---
 .../sprites/blocks/units/drone-center.png     | Bin 0 -> 1379 bytes
 .../assets-raw/sprites/units/effect-drone.png | Bin 0 -> 475 bytes
 core/assets/icons/icons.properties            |   2 +
 core/assets/logicids.dat                      | Bin 3987 -> 4015 bytes
 core/src/mindustry/content/Blocks.java        |  12 ++
 core/src/mindustry/content/UnitTypes.java     |  27 ++-
 core/src/mindustry/ui/SearchBar.java          |   6 -
 .../world/blocks/defense/BaseShield.java      |  11 +-
 .../world/blocks/units/DroneCenter.java       | 168 ++++++++++++++++++
 9 files changed, 208 insertions(+), 18 deletions(-)
 create mode 100644 core/assets-raw/sprites/blocks/units/drone-center.png
 create mode 100644 core/assets-raw/sprites/units/effect-drone.png
 delete mode 100644 core/src/mindustry/ui/SearchBar.java
 create mode 100644 core/src/mindustry/world/blocks/units/DroneCenter.java

diff --git a/core/assets-raw/sprites/blocks/units/drone-center.png b/core/assets-raw/sprites/blocks/units/drone-center.png
new file mode 100644
index 0000000000000000000000000000000000000000..4e1478888aa09071aeff90a5241618ab6d736046
GIT binary patch
literal 1379
zcmeAS@N?(olHy`uVBq!ia0y~yU`POA4mJh`hDS5XEf^RW7>k44ofy`glX=O&z$)wM
z;uumf=k45$c_M}aZF5ES9T*oyl$?z%4)U7tVgaj_9Fyk60IjSnEvX3=Tr7*)`8vNX
z$<CYY5w1|dxWcLNn?YJ`|J(Xwk5lY5gNh=n)1L4DSato|uNOCOc6WcR%8YvOa<A;m
z9oyr>&dhu8qV4XnobArJ_KO0V=U3(AS|#^f)N}H4h!$KZU4K#UQ0mgn|7W;Pcs}d*
z!40=1l6zKGCYJ4IvHul6p~|GpY}ZQu>@=q3vAs8KH5&{|T_$W;?%VQzmcs0a;w^Xi
z+LHxz!jEs*<y2GgpD*lsQEAMTEtSRzN2YVWc+kIX$HNahRaP%z@{xSVu`joq+i!lc
zD~Flmx``|ATNb?jU-vgG&9=xqdFNjDAht6XPMl;ZV%s4u-T7^oYmjl{6vn&{*IzG<
z=wIp@WTdFouzt2_w?Lbg(-uyyrI&u#Z@0Yl{`}&$*k5%MW0tXS%D3NDyCotT-*VUI
zgyqIbMU%E!)U<qQauf8D{W7)w-`D7(*nLJZcF&kzx7GdoA{fN)#Io+e;@5_13#FwV
zoqZkNk;V7s`}4_fbN$qAlq!AvIm4@vZ9%hr6OY98udIRkD$GF}_M2`LcBnb6;pp{|
zv-ibf4)YmP9!z6VG5rxTe?kZ618YM)!J?-5kA%4d8I#mo#1^Xj(6m!b5O1hb(hw9l
z=x@7@C5$o1e?bUK%7@~9|JJqQQ(jlx*Z0`F_|C54(}iFAo-ximb%rUV&6mN~U&j0O
zvoD>d%t5l#cW_^QCR{D-V$0b3m{G`1l)Ip)O3b!xb$Bq-A@y&|7oNUqm>IL#rA6vs
z|4ld6`9k*V8NL}PPv<age*c+K^3TM8KYem`RYihYInFa*A2PLD(0b*;ZJ(q3b%N9C
z=4f*s-?`DI>%pGV?YTERZaW{m#{2Y4%gS9#-!8OBIdFP+eY(Q^J)es|J&@l1cXRJ@
zG56vWCk=^7-`-U040vRIY;||2+tKZM;y>RmyrP=OFS(vCaAx#MZY2%P(t=yg$5;QF
zVGtgfS-mr4uIRzgWz+V`g!Hp}n8%t1=pG175L;lhnPF<6F2kc`UWbLR3oK$P@HM=W
zq|a{17{#?@2}kV7MeO4DPk&l6Tgb2aMMdcfFU#inLDO4oQ}#SiPWrYwVMox-@?zE8
z^X^v#HwwPw43knX2~3a_yliohE3yCaMm8JfE#G&03q-H5{i-H%rKe+GyiDDe36F$b
zTc-SAjlU(Xo#V_~_u{=&fv(JwWBNB(0^`gQed0bO&-XsCw;<q2s;uh4<^Se0zie%`
zn-#UB-D$G_S=~$8uCx7LsikGkNjUm)@~e*xs}JZnq~5s3`TX9l>1WPAuljvzkH>i>
zGxIHN{;DQhJ@`${zXa)CTCA{FflsmNiu2J|$%kTA3wpZ<$O?;XPWd5rWa^Z)dkX^o
z%q`SZ@0caMYU$3IPALn^_%3l<XI<q!*)aLC@rzF(^H(gb_Ef5M>EznYw!mni$&ZD}
zfp+)mKS%`i8$ReRc*&{MB(L54LGb6Rx(a=b?<_mlsd_}0Sx(`&n0=tkS|#5{S@KMb
zfZeZe{t^p0rtIy%aYnvoro-I_y4ms@XVw?GdfbfFuar0JwVsr9;O>(SuS>2K=U8k`
znkNa(yzr>*(7SJa7iy2hSQsxn`nToo1LyC8pARZJb^qr4ZD!W`R#`0RM((;lb%zu+
z&Td^5DX9BS-DjitDV9(siObLG4vFlx6FkD6qOoPi`~sf%;w5^_dd9&s4Y(D0w4H>R
t6uwWo(xB@k%p}o#(>q9bF~@$!mVGvNb;MVEU|?Wi@O1TaS?83{1OQ{tbK(F1

literal 0
HcmV?d00001

diff --git a/core/assets-raw/sprites/units/effect-drone.png b/core/assets-raw/sprites/units/effect-drone.png
new file mode 100644
index 0000000000000000000000000000000000000000..e7e43313d18521775f7a2f053185ac24a1a2e565
GIT binary patch
literal 475
zcmeAS@N?(olHy`uVBq!ia0y~yU{C{L4mJh`h84Ci*D)|KFct^7J29*~C-ahlfpMy*
zi(^Pc>)YuY{SG_uwDB4Txo`7(DYTM*!d`<07N-u*v?=agR@;L^6(=Mxe6w*_s&n?p
zv5qTyefnhPKi(a;=)$7k%U{%N+kbE8bL)l$3l`L`%CWkgcKPPE)fMjRg!T3ES1-w5
ze|nZYyO+FtR@vF@q7uAkgiY289m?Fd_P~+@D^|ajzWV*?&y^R`nuB|D7X<7pIPQ0G
z=Aw%dU5mDy)9w;lbn%Az(RT?Z6WQEz?FzIc;<GdlrWq7UJ>IuXYV$e?wh38TGnTM%
z)GhAiN-p`do@IqR=MGn!k2im6GBDKaslR?~|0f;>hDR2wj{UHF&Z;&yxMsBg*U^W5
zb#}cw%q*_1*ecQTI6%g)si-mAWXG4iPu|6CecruO*F|~Gb<1n*eEHg@JM8uAIM=Oz
zd}!sd4T6`=nmGf1Cgq7(&u!ip6}<e`%UjA@mn2S-iry;e!&AV}P_%c|zUZwgb#E6o
z1_u50NWK%kJ1Fv?%0-qfc{^74{&F;{oSXc#YN^x0M;4!&m@KZWHqFwPR~CwqKfnFl
jm9Nd_8X6h*zi{_Dy(^jNea41?fq}u()z4*}Q$iB}$$Zvm

literal 0
HcmV?d00001

diff --git a/core/assets/icons/icons.properties b/core/assets/icons/icons.properties
index 612d00e5bc..87f7fec7cc 100755
--- a/core/assets/icons/icons.properties
+++ b/core/assets/icons/icons.properties
@@ -528,3 +528,5 @@
 63175=carbon-vent|block-carbon-vent-ui
 63174=shield-projector|block-shield-projector-ui
 63173=beam-link|block-beam-link-ui
+63172=drone-center|block-drone-center-ui
+63171=effect-drone|unit-effect-drone-ui
diff --git a/core/assets/logicids.dat b/core/assets/logicids.dat
index 1c6082c1b8a074ba32b294caa93470465177e97a..81f0eb070c406074e63eae1f39025e460e852d12 100644
GIT binary patch
delta 51
zcmbO%zh0h+;l@U$8$A3xDMk5tsk+Ijc_pbu42GL;^OQ33@}#Dvr6!l?g5@^*^SLkr
E0L57mGynhq

delta 23
fcmZ24KUtoM;rd3V8$65#n_u#jGH%Y{b7lkpVZaBm

diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java
index b3f2362d99..e6752d0b5b 100644
--- a/core/src/mindustry/content/Blocks.java
+++ b/core/src/mindustry/content/Blocks.java
@@ -142,6 +142,8 @@ public class Blocks{
     //TODO maybe making it 5x5 would be more appropriate, seems kinda cheap.
     basicAssemblerModule,
 
+    droneCenter,
+
     //payloads
     payloadConveyor, payloadRouter, payloadPropulsionTower, smallDeconstructor, deconstructor, constructor, largeConstructor, payloadLoader, payloadUnloader,
 
@@ -3531,6 +3533,16 @@ public class Blocks{
             size = 3;
         }};
 
+        //TODO setup, sprite, balance...
+        droneCenter = new DroneCenter("drone-center"){{
+            requirements(Category.units, with(Items.graphite, 10));
+
+            size = 3;
+            consumes.power(3f);
+
+            droneType = UnitTypes.effectDrone;
+        }};
+
         //endregion
         //region payloads
 
diff --git a/core/src/mindustry/content/UnitTypes.java b/core/src/mindustry/content/UnitTypes.java
index 9dc92b446c..c46c3cd63d 100644
--- a/core/src/mindustry/content/UnitTypes.java
+++ b/core/src/mindustry/content/UnitTypes.java
@@ -70,7 +70,7 @@ public class UnitTypes{
     public static @EntityDef({Unitc.class, BlockUnitc.class}) UnitType block;
 
     //special tethered (has payload capability, because it's necessary sometimes)
-    public static @EntityDef({Unitc.class, BuildingTetherc.class, Payloadc.class}) UnitType manifold, assemblyDrone;
+    public static @EntityDef({Unitc.class, BuildingTetherc.class, Payloadc.class}) UnitType manifold, assemblyDrone, effectDrone;
 
     //tank
     public static @EntityDef({Unitc.class, Tankc.class}) UnitType vanquish, conquer;
@@ -3190,7 +3190,7 @@ public class UnitTypes{
             mineFloor = false;
             mineHardnessScaling = false;
             flying = true;
-            mineSpeed = 5f;
+            mineSpeed = 4.5f;
             mineTier = 4;
             buildSpeed = 1.1f;
             drag = 0.08f;
@@ -3258,11 +3258,11 @@ public class UnitTypes{
             mineFloor = false;
             mineHardnessScaling = false;
             flying = true;
-            mineSpeed = 6f;
+            mineSpeed = 5f;
             mineTier = 4;
             buildSpeed = 1.4f;
             drag = 0.08f;
-            speed = 7.2f;
+            speed = 7.3f;
             rotateSpeed = 8f;
             accel = 0.08f;
             itemCapacity = 110;
@@ -3288,7 +3288,7 @@ public class UnitTypes{
                 beamWidth = 0.7f;
                 repairSpeed = 0.2f;
                 aimDst = 0f;
-                shootCone = 16f;
+                shootCone = 40f;
                 fractionRepair = true;
                 mirror = true;
 
@@ -3369,6 +3369,23 @@ public class UnitTypes{
             envDisabled = Env.none;
         }};
 
+        effectDrone = new ErekirUnitType("effect-drone"){{
+            flying = true;
+            drag = 0.08f;
+            speed = 3f;
+            drawCell = false;
+            logicControllable = playerControllable = allowedInPayloads = isCounted = false;
+            hidden = true;
+
+            engineSize = 0f;
+            float es = 2.5f, ew = 14.5f / 4f;
+
+            setEnginesMirror(
+            new UnitEngine(ew, ew, es, 45f),
+            new UnitEngine(ew, -ew, es, 315f)
+            );
+        }};
+
         //payloadDrone = new UnitType("payload-drone"){{
 
         //}};
diff --git a/core/src/mindustry/ui/SearchBar.java b/core/src/mindustry/ui/SearchBar.java
deleted file mode 100644
index 8185fe746c..0000000000
--- a/core/src/mindustry/ui/SearchBar.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package mindustry.ui;
-
-//TODO remove, unlikely to be used anywhere else.
-public class SearchBar{
-
-}
diff --git a/core/src/mindustry/world/blocks/defense/BaseShield.java b/core/src/mindustry/world/blocks/defense/BaseShield.java
index 6989525569..455452d9fb 100644
--- a/core/src/mindustry/world/blocks/defense/BaseShield.java
+++ b/core/src/mindustry/world/blocks/defense/BaseShield.java
@@ -80,12 +80,11 @@ public class BaseShield extends Block{
 
         @Override
         public void updateTile(){
-            broken = efficiency() <= 0.0001f;
-            smoothRadius = Mathf.lerpDelta(smoothRadius, radius * efficiency(), 0.04f);
+            smoothRadius = Mathf.lerpDelta(smoothRadius, radius * efficiency(), 0.05f);
 
             float rad = radius();
 
-            if(rad > 0 && !broken){
+            if(rad > 1){
                 paramBuild = this;
                 //paramEffect = absorbEffect;
                 Groups.bullet.intersect(x - rad, y - rad, rad * 2f, rad * 2f, bulletConsumer);
@@ -94,7 +93,6 @@ public class BaseShield extends Block{
         }
 
         public float radius(){
-            //TODO bad rule?
             return smoothRadius;
         }
 
@@ -125,10 +123,9 @@ public class BaseShield extends Block{
                 }else{
                     Lines.stroke(1.5f);
                     Draw.alpha(0.09f + Mathf.clamp(0.08f * hit));
-                    Fill.circle(x, y, radius);
+                    Fill.poly(x, y, sides, radius);
                     Draw.alpha(1f);
-                    //TODO
-                    Lines.poly(x, y, 60, radius);
+                    Lines.poly(x, y, sides, radius);
                     Draw.reset();
                 }
             }
diff --git a/core/src/mindustry/world/blocks/units/DroneCenter.java b/core/src/mindustry/world/blocks/units/DroneCenter.java
new file mode 100644
index 0000000000..ab83c588de
--- /dev/null
+++ b/core/src/mindustry/world/blocks/units/DroneCenter.java
@@ -0,0 +1,168 @@
+package mindustry.world.blocks.units;
+
+import arc.graphics.g2d.*;
+import arc.math.*;
+import arc.struct.*;
+import arc.util.*;
+import arc.util.io.*;
+import mindustry.content.*;
+import mindustry.entities.*;
+import mindustry.entities.units.*;
+import mindustry.gen.*;
+import mindustry.graphics.*;
+import mindustry.type.*;
+import mindustry.world.*;
+
+import static mindustry.Vars.*;
+
+public class DroneCenter extends Block{
+    public int unitsSpawned = 4;
+    public UnitType droneType;
+    public StatusEffect status = StatusEffects.overdrive;
+    public float droneConstructTime = 60f * 3f;
+    public float statusDuration = 60f * 2f;
+    public float droneRange = 50f;
+
+    public DroneCenter(String name){
+        super(name);
+
+        update = solid = true;
+        configurable = true;
+    }
+
+    @Override
+    public void init(){
+        super.init();
+
+        droneType.defaultController = EffectDroneAI::new;
+    }
+
+    public class DroneCenterBuild extends Building{
+        protected IntSeq readUnits = new IntSeq();
+        protected int readTarget = -1;
+
+        public Seq<Unit> units = new Seq<>();
+        public @Nullable Unit target;
+        public float droneProgress, droneWarmup, totalDroneProgress;
+
+        @Override
+        public void updateTile(){
+            if(!readUnits.isEmpty()){
+                units.clear();
+                readUnits.each(i -> {
+                    var unit = Groups.unit.getByID(i);
+                    if(unit != null){
+                        units.add(unit);
+                    }
+                });
+                readUnits.clear();
+            }
+
+            units.removeAll(u -> !u.isAdded() || u.dead);
+
+            droneWarmup = Mathf.lerpDelta(droneWarmup, units.size < unitsSpawned ? efficiency() : 0f, 0.1f);
+            totalDroneProgress += droneWarmup * Time.delta;
+
+            if(readTarget != 0){
+                target = Groups.unit.getByID(readTarget);
+                readTarget = 0;
+            }
+
+            //TODO better effects?
+            if(units.size < unitsSpawned && (droneProgress += edelta() / droneConstructTime) >= 1f){
+                var unit = droneType.create(team);
+                if(unit instanceof BuildingTetherc bt){
+                    bt.building(this);
+                }
+                unit.set(x, y);
+                unit.rotation = 90f;
+                unit.add();
+
+                Fx.spawn.at(unit);
+                units.add(unit);
+                droneProgress = 0f;
+            }
+
+            if(target != null && !target.isValid()){
+                target = null;
+            }
+
+            //TODO no autotarget, bad
+            if(target == null){
+                target = Units.closest(team, x, y, u -> !u.spawnedByCore && u.type != droneType);
+            }
+        }
+
+        @Override
+        public void drawConfigure(){
+            Drawf.square(x, y, tile.block().size * tilesize / 2f + 1f + Mathf.absin(Time.time, 4f, 1f));
+
+            if(target != null){
+                Drawf.square(target.x, target.y, target.hitSize * 0.8f);
+            }
+        }
+
+        @Override
+        public void draw(){
+            super.draw();
+
+            //TODO draw more stuff
+
+            if(droneWarmup > 0){
+                Draw.draw(Layer.blockOver + 0.2f, () -> {
+                    Drawf.construct(this, droneType.fullIcon, Pal.accent, 0f, droneProgress, droneWarmup, totalDroneProgress, 14f);
+                });
+            }
+        }
+
+        @Override
+        public void write(Writes write){
+            super.write(write);
+
+            write.i(target == null ? -1 : target.id);
+
+            write.s(units.size);
+            for(var unit : units){
+                write.i(unit.id);
+            }
+        }
+
+        @Override
+        public void read(Reads read, byte revision){
+            super.read(read, revision);
+
+            readTarget = read.i();
+
+            int count = read.s();
+            readUnits.clear();
+            for(int i = 0; i < count; i++){
+                readUnits.add(read.i());
+            }
+        }
+    }
+
+    public static class EffectDroneAI extends AIController{
+        //TODO non static?
+
+        @Override
+        public void updateUnit(){
+            if(!(unit instanceof BuildingTetherc tether)) return;
+            if(!(tether.building() instanceof DroneCenterBuild build)) return;
+            if(build.target == null) return;
+
+            DroneCenter block = (DroneCenter)build.block;
+
+            target = build.target;
+
+            //TODO what angle?
+            moveTo(target, build.target.hitSize / 1.8f + block.droneRange - 10f);
+
+            unit.lookAt(target);
+
+            //TODO low power? status effects may not be the best way to do this...
+            if(unit.within(target, block.droneRange + build.target.hitSize)){
+                build.target.apply(block.status, block.statusDuration);
+            }
+        }
+    }
+}