From df08498d70aa8fd24d9cd6d800f12b64d4d89d47 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Sat, 23 May 2020 19:14:48 -0400
Subject: [PATCH] Bugfixes

---
 core/assets/shaders/unitbuild.frag                       | 7 +++----
 core/src/mindustry/content/Blocks.java                   | 3 ++-
 core/src/mindustry/world/blocks/units/Reconstructor.java | 6 +++---
 core/src/mindustry/world/blocks/units/UnitBlock.java     | 5 +++++
 core/src/mindustry/world/blocks/units/UnitFactory.java   | 1 +
 gradle.properties                                        | 2 +-
 6 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/core/assets/shaders/unitbuild.frag b/core/assets/shaders/unitbuild.frag
index eff888a827..572168a49b 100644
--- a/core/assets/shaders/unitbuild.frag
+++ b/core/assets/shaders/unitbuild.frag
@@ -41,10 +41,7 @@ void main() {
     vec2 v = vec2(1.0/u_texsize.x, 1.0/u_texsize.y);
 
 	vec4 c = texture2D(u_texture, v_texCoord.xy);
-
-    if(1.0-abs(coords.x - 0.5)*2.0 < 1.0-u_progress){
-    //    c = vec4(0.0);
-    }
+    float alpha = c.a;
 
     c.a *= u_progress;
 
@@ -57,5 +54,7 @@ void main() {
         c = mix(c, u_color, f * u_color.a);
     }
 
+    c.a *= alpha;
+
     gl_FragColor = c * v_color;
 }
diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java
index e9e6a58694..2e6d181b72 100644
--- a/core/src/mindustry/content/Blocks.java
+++ b/core/src/mindustry/content/Blocks.java
@@ -1672,7 +1672,7 @@ public class Blocks implements ContentList{
         groundFactory = new UnitFactory("ground-factory"){{
             requirements(Category.units, ItemStack.with(Items.copper, 30, Items.lead, 70));
             plans = new UnitPlan[]{
-                new UnitPlan(UnitTypes.dagger, 500f, ItemStack.with(Items.silicon, 10)),
+                new UnitPlan(UnitTypes.dagger, 200f, ItemStack.with(Items.silicon, 10)),
                 new UnitPlan(UnitTypes.titan, 800f, ItemStack.with(Items.silicon, 20, Items.titanium, 10)),
             };
             size = 3;
@@ -1706,6 +1706,7 @@ public class Blocks implements ContentList{
             consumes.power(3f);
             consumes.items(ItemStack.with(Items.silicon, 30, Items.graphite, 30));
             itemCapacity = 30;
+            constructTime = 200f;
         }};
 
         repairPoint = new RepairPoint("repair-point"){{
diff --git a/core/src/mindustry/world/blocks/units/Reconstructor.java b/core/src/mindustry/world/blocks/units/Reconstructor.java
index ba55faed3b..1904e8585e 100644
--- a/core/src/mindustry/world/blocks/units/Reconstructor.java
+++ b/core/src/mindustry/world/blocks/units/Reconstructor.java
@@ -5,13 +5,12 @@ import arc.math.*;
 import arc.util.*;
 import mindustry.annotations.Annotations.*;
 import mindustry.content.*;
+import mindustry.entities.*;
 import mindustry.entities.units.*;
 import mindustry.gen.*;
 import mindustry.graphics.*;
-import mindustry.type.*;
 import mindustry.ui.*;
 import mindustry.world.blocks.payloads.*;
-import mindustry.world.consumers.*;
 
 import static mindustry.Vars.state;
 
@@ -104,7 +103,8 @@ public class Reconstructor extends UnitBlock{
                         if(progress >= constructTime){
                             payload.unit = payload.unit.type().upgrade.create(payload.unit.team());
                             progress = 0;
-                            Fx.unitSpawn.at(this);
+                            Effects.shake(2f, 3f, this);
+                            Fx.producesmoke.at(this);
                             consume();
                         }
                     }
diff --git a/core/src/mindustry/world/blocks/units/UnitBlock.java b/core/src/mindustry/world/blocks/units/UnitBlock.java
index c3e7c8e185..e723a48ca8 100644
--- a/core/src/mindustry/world/blocks/units/UnitBlock.java
+++ b/core/src/mindustry/world/blocks/units/UnitBlock.java
@@ -4,6 +4,7 @@ import arc.*;
 import arc.math.*;
 import arc.util.*;
 import mindustry.annotations.Annotations.*;
+import mindustry.content.*;
 import mindustry.game.EventType.*;
 import mindustry.gen.*;
 import mindustry.world.*;
@@ -36,6 +37,9 @@ public class UnitBlock extends PayloadAcceptor{
         public void spawned(){
             progress = 0f;
 
+            Tmp.v1.trns(rotdeg(), size * tilesize/2f);
+            Fx.smeltsmoke.at(x + Tmp.v1.x, y + Tmp.v1.y);
+
             if(!net.client() && payload != null){
                 Unitc unit = payload.unit;
                 unit.set(x, y);
@@ -48,6 +52,7 @@ public class UnitBlock extends PayloadAcceptor{
             }
 
             payload = null;
+            payloadPos = 0f;
         }
 
         public void outputPayload(){
diff --git a/core/src/mindustry/world/blocks/units/UnitFactory.java b/core/src/mindustry/world/blocks/units/UnitFactory.java
index af8a099d61..0436fba58f 100644
--- a/core/src/mindustry/world/blocks/units/UnitFactory.java
+++ b/core/src/mindustry/world/blocks/units/UnitFactory.java
@@ -198,6 +198,7 @@ public class UnitFactory extends UnitBlock{
 
                     payloadPos = 0f;
                     payload = new UnitPayload(plan.unit.create(team));
+                    payVector.setZero();
                     consume();
                 }
 
diff --git a/gradle.properties b/gradle.properties
index 4b46ba4407..f6bced3e19 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,3 +1,3 @@
 org.gradle.daemon=true
 org.gradle.jvmargs=-Xms256m -Xmx1024m
-archash=84c3889593afe0fc98a5f9f9efde501899338d76
+archash=88bbf067bd128651ebfa797ba64425658258e2c7