From 6f67ea1742a018798bc3226e6ef1a7a29940d476 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Mon, 20 Dec 2021 10:54:09 -0500
Subject: [PATCH] "Better" build tower sprite / Assembly cleanup

---
 .../blocks/defense/build-tower-glow.png       | Bin 0 -> 2079 bytes
 .../sprites/blocks/defense/build-tower.png    | Bin 1742 -> 2513 bytes
 core/src/mindustry/graphics/Drawf.java        |  10 +++-
 .../world/blocks/defense/BuildTurret.java     |  16 +++++++
 .../world/blocks/units/UnitAssembler.java     |  44 ------------------
 .../blocks/units/UnitAssemblerModule.java     |   2 +-
 tools/build.gradle                            |  41 ----------------
 7 files changed, 26 insertions(+), 87 deletions(-)
 create mode 100644 core/assets-raw/sprites/blocks/defense/build-tower-glow.png

diff --git a/core/assets-raw/sprites/blocks/defense/build-tower-glow.png b/core/assets-raw/sprites/blocks/defense/build-tower-glow.png
new file mode 100644
index 0000000000000000000000000000000000000000..757d26de8e6b16466b91238b3be33ffaf7addac9
GIT binary patch
literal 2079
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

literal 0
HcmV?d00001

diff --git a/core/assets-raw/sprites/blocks/defense/build-tower.png b/core/assets-raw/sprites/blocks/defense/build-tower.png
index 867a67b561b33502706e4171ec851cf908e54551..b78d473bfce0af8bb34e811f7621c385e2037d9e 100644
GIT binary patch
literal 2513
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
ZZesaZ)2J`_l7WGN!PC{xWt~$(695HMVtN1o

delta 1727
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

diff --git a/core/src/mindustry/graphics/Drawf.java b/core/src/mindustry/graphics/Drawf.java
index 4be76ffd71..6d0af50c69 100644
--- a/core/src/mindustry/graphics/Drawf.java
+++ b/core/src/mindustry/graphics/Drawf.java
@@ -95,10 +95,18 @@ public class Drawf{
         }
     }
 
+    public static void additive(TextureRegion region, Color color, float x, float y, float rotation){
+        additive(region, color, x, y, rotation, Layer.blockAdditive);
+    }
+
     public static void additive(TextureRegion region, Color color, float x, float y, float rotation, float layer){
+        additive(region, color, 1f, x, y, rotation, layer);
+    }
+
+    public static void additive(TextureRegion region, Color color, float alpha, float x, float y, float rotation, float layer){
         float pz = Draw.z();
         Draw.z(layer);
-        Draw.color(color);
+        Draw.color(color, alpha * color.a);
         Draw.blend(Blending.additive);
         Draw.rect(region, x, y, rotation);
         Draw.blend();
diff --git a/core/src/mindustry/world/blocks/defense/BuildTurret.java b/core/src/mindustry/world/blocks/defense/BuildTurret.java
index aaa1425a97..92282d16df 100644
--- a/core/src/mindustry/world/blocks/defense/BuildTurret.java
+++ b/core/src/mindustry/world/blocks/defense/BuildTurret.java
@@ -1,6 +1,8 @@
 package mindustry.world.blocks.defense;
 
+import arc.graphics.*;
 import arc.graphics.g2d.*;
+import arc.math.*;
 import arc.struct.*;
 import arc.util.*;
 import arc.util.io.*;
@@ -25,11 +27,13 @@ public class BuildTurret extends BaseTurret{
     public int targetInterval = 30;
 
     public @Load(value = "@-base", fallback = "block-@size") TextureRegion baseRegion;
+    public @Load("@-glow") TextureRegion glowRegion;
     public float buildSpeed = 1f;
     public float buildBeamOffset = 5f;
     //created in init()
     public @Nullable UnitType unitType;
     public float elevation = -1f;
+    public Color heatColor = Pal.accent.cpy().a(0.9f);
 
     public BuildTurret(String name){
         super(name);
@@ -70,6 +74,7 @@ public class BuildTurret extends BaseTurret{
         public BlockUnitc unit = (BlockUnitc)unitType.create(team);
         public @Nullable Unit following;
         public @Nullable BlockPlan lastPlan;
+        public float warmup;
 
         {
             unit.rotation(90f);
@@ -103,6 +108,8 @@ public class BuildTurret extends BaseTurret{
             unit.buildSpeedMultiplier(efficiency() * timeScale);
             unit.speedMultiplier(efficiency() * timeScale);
 
+            warmup = Mathf.lerpDelta(warmup, unit.activelyBuilding() ? 1f : 0f, 0.1f);
+
             if(!isControlled()){
                 unit.updateBuilding(true);
 
@@ -210,9 +217,18 @@ public class BuildTurret extends BaseTurret{
             Drawf.shadow(region, x - elevation, y - elevation, rotation - 90);
             Draw.rect(region, x, y, rotation - 90);
 
+            if(glowRegion.found()){
+                Drawf.additive(glowRegion, heatColor, warmup, x, y, rotation - 90f, Layer.turretHeat);
+            }
+
             unit.drawBuilding();
         }
 
+        @Override
+        public float warmup(){
+            return warmup;
+        }
+
         @Override
         public void write(Writes write){
             super.write(write);
diff --git a/core/src/mindustry/world/blocks/units/UnitAssembler.java b/core/src/mindustry/world/blocks/units/UnitAssembler.java
index 0a637790e9..c663259176 100644
--- a/core/src/mindustry/world/blocks/units/UnitAssembler.java
+++ b/core/src/mindustry/world/blocks/units/UnitAssembler.java
@@ -26,13 +26,6 @@ import mindustry.world.meta.*;
 
 import static mindustry.Vars.*;
 
-/**
- * Steps:
- * 0. place the assembler with the rectangle indicating build area
- * 1. wait for power/consValid
- * 2. print / create the 3-5 drones for free, make sure they're tethered - build speed depends on drone active fraction
- * 3.
- * */
 public class UnitAssembler extends PayloadBlock{
     public @Load("@-side1") TextureRegion sideRegion1;
     public @Load("@-side2") TextureRegion sideRegion2;
@@ -66,7 +59,6 @@ public class UnitAssembler extends PayloadBlock{
         Tmp.r1.x += Geometry.d4x(rotation) * len;
         Tmp.r1.y += Geometry.d4y(rotation) * len;
 
-        //TODO better visuals here? dashLine looks bad
         Drawf.dashRect(valid ? Pal.accent : Pal.remove, Tmp.r1);
     }
 
@@ -237,26 +229,8 @@ public class UnitAssembler extends PayloadBlock{
             for(var module : modules){
                 Drawf.selected(module, Pal.accent);
             }
-
-            //TODO draw area when no power
         }
 
-        //is this necessary? wastes a lot of space
-        /*
-        @Override
-        public void displayConsumption(Table table){
-            super.displayConsumption(table);
-            table.row();
-
-            table.table(t -> {
-                t.left();
-                for(var mod : modules){
-                    //TODO crosses for missing reqs?
-                    t.image(mod.block.uiIcon).size(iconMed).padRight(4).padTop(4);
-                }
-            }).fillX().row();
-        }*/
-
         @Override
         public void display(Table table){
             super.display(table);
@@ -311,8 +285,6 @@ public class UnitAssembler extends PayloadBlock{
                 droneProgress = 0f;
             }
 
-            //TODO units should pick up and move payloads into position
-
             Vec2 spawn = getUnitSpawn();
 
             if(moveInPayload() && !wasOccupied){
@@ -341,14 +313,11 @@ public class UnitAssembler extends PayloadBlock{
                 warmup = Mathf.lerpDelta(warmup, efficiency(), 0.1f);
 
                 if((progress += edelta() * eff / plan.time) >= 1f){
-                    //TODO ???? should this even be part of a trigger
                     consume();
 
-                    //TODO actually just goes poof
                     var unit = plan.unit.create(team);
                     unit.set(spawn.x + Mathf.range(0.001f), spawn.y + Mathf.range(0.001f));
                     unit.rotation = 90f;
-                    //TODO annoying so nothing is created yet
                     unit.add();
                     progress = 0f;
 
@@ -359,8 +328,6 @@ public class UnitAssembler extends PayloadBlock{
             }else{
                 warmup = Mathf.lerpDelta(warmup, 0f, 0.1f);
             }
-
-            //TODO drones need to indicate that they are in position and actually play an animation
         }
 
         @Override
@@ -387,7 +354,6 @@ public class UnitAssembler extends PayloadBlock{
 
             //draw drone construction
             if(droneWarmup > 0){
-                //TODO draw it - better animations?
                 Draw.draw(Layer.blockOver + 0.2f, () -> {
                     Drawf.construct(this, droneType.fullIcon, Pal.accent, 0f, droneProgress, droneWarmup, totalDroneProgress, 14f);
                 });
@@ -411,16 +377,6 @@ public class UnitAssembler extends PayloadBlock{
                 Draw.color();
             });
 
-            /*
-            Tmp.tr1.set(plan.unit.fullIcon);
-            Tmp.tr1.setY(Tmp.tr1.getY() + plan.unit.fullIcon.height * (1f - progress));
-
-            //TODO what if building animation
-            Draw.rect(Tmp.tr1, spawn.x, spawn.y + (Tmp.tr1.height/2f - plan.unit.fullIcon.height/2f) * Draw.scl, Tmp.tr1.width * Draw.scl, Tmp.tr1.height * Draw.scl);
-            Lines.stroke(1f, Pal.accent);
-            Draw.alpha(warmup);
-            Lines.lineAngleCenter(spawn.x, spawn.y - plan.unit.fullIcon.height/2f * Draw.scl + plan.unit.fullIcon.height * progress * Draw.scl, 0f, plan.unit.fullIcon.width * 0.9f * Draw.scl);*/
-
             Draw.reset();
 
             Draw.z(Layer.buildBeam);
diff --git a/core/src/mindustry/world/blocks/units/UnitAssemblerModule.java b/core/src/mindustry/world/blocks/units/UnitAssemblerModule.java
index 5522e00298..e379d50d6a 100644
--- a/core/src/mindustry/world/blocks/units/UnitAssemblerModule.java
+++ b/core/src/mindustry/world/blocks/units/UnitAssemblerModule.java
@@ -106,7 +106,7 @@ public class UnitAssemblerModule extends PayloadBlock{
 
         @Override
         public void drawSelect(){
-            //TODO draw area
+            //TODO draw area?
             if(link != null){
                 Drawf.selected(link, Pal.accent);
             }
diff --git a/tools/build.gradle b/tools/build.gradle
index 56758d2ed0..e0e0725c1b 100644
--- a/tools/build.gradle
+++ b/tools/build.gradle
@@ -133,47 +133,6 @@ def antialias = { File file ->
     new Fi(file).writePng(out)
 }
 
-def tileImage = { File file ->
-    def image = new Pixmap(new Fi(file))
-
-    for(x in 0..image.width-1){
-        for(y in 0..image.height-1){
-            if(x > (image.height - 1 - y)){
-                def rx = image.height - 1 - y
-                def ry = x
-
-                image.setRaw(x, y, image.getRaw(rx, image.height - 1 - ry))
-            }
-        }
-    }
-
-    def result = new Pixmap(image.width * 2, image.height * 2)
-
-    result.draw(image.flipX(), 0, 0)
-    result.draw(image, image.width, 0)
-    result.draw(image.flipX().flipY(), 0, image.height)
-    result.draw(image.flipY(), image.width, image.height)
-
-    for(x in 0..result.width-1){
-        for(y in 0..result.height-1){
-            int p = result.getRaw(x, y)
-            if(x <= y){
-                List<Color> list = colorMap.get(p)
-                int index = colorIndexMap.get(p, -1)
-
-                if(index != -1){
-                    int resultIndex = (x == y ? 1 : index == 2 ? 0 : index == 0 ? 2 : 1);
-                    result.setRaw(x, y, list[resultIndex].rgba())
-                }
-            }
-        }
-    }
-
-    new Fi(file).writePng(result)
-    result.dispose()
-    image.dispose()
-}
-
 task antialiasImages(){
     doLast{
         for(def img : project.getProperty("images").split(",")){