Allowed Steam name change / T4+5 reconstructor cost increase

core/src/mindustry/content/Blocks.java

@@ -1766,11 +1766,11 @@ public class Blocks implements ContentList{
         }};
 
         multiplicativeReconstructor = new Reconstructor("multiplicative-reconstructor"){{
-            requirements(Category.units, with(Items.lead, 650, Items.silicon, 350, Items.titanium, 350, Items.thorium, 650));
+            requirements(Category.units, with(Items.lead, 650, Items.silicon, 450, Items.titanium, 350, Items.thorium, 650));
 
             size = 5;
             consumes.power(6f);
-            consumes.items(with(Items.silicon, 130, Items.titanium, 80, Items.metaglass, 30));
+            consumes.items(with(Items.silicon, 130, Items.titanium, 80, Items.metaglass, 40));
 
             constructTime = 60f * 30f;
 
@@ -1785,11 +1785,11 @@ public class Blocks implements ContentList{
         }};
 
         exponentialReconstructor = new Reconstructor("exponential-reconstructor"){{
-            requirements(Category.units, with(Items.lead, 2000, Items.silicon, 750, Items.titanium, 950, Items.thorium, 450, Items.plastanium, 350, Items.phasefabric, 450));
+            requirements(Category.units, with(Items.lead, 2000, Items.silicon, 1000, Items.titanium, 2000, Items.thorium, 750, Items.plastanium, 450, Items.phasefabric, 600));
 
             size = 7;
             consumes.power(13f);
-            consumes.items(with(Items.silicon, 450, Items.titanium, 550, Items.plastanium, 550));
+            consumes.items(with(Items.silicon, 850, Items.titanium, 750, Items.plastanium, 650));
             consumes.liquid(Liquids.cryofluid, 1f);
 
             constructTime = 60f * 60f * 1.5f;
@@ -1803,11 +1803,11 @@ public class Blocks implements ContentList{
         }};
 
         tetrativeReconstructor = new Reconstructor("tetrative-reconstructor"){{
-            requirements(Category.units, with(Items.lead, 4000, Items.silicon, 1500, Items.thorium, 500, Items.plastanium, 450, Items.phasefabric, 600, Items.surgealloy, 500));
+            requirements(Category.units, with(Items.lead, 4000, Items.silicon, 3000, Items.thorium, 1000, Items.plastanium, 600, Items.phasefabric, 600, Items.surgealloy, 800));
 
             size = 9;
             consumes.power(25f);
-            consumes.items(with(Items.silicon, 350, Items.plastanium, 550, Items.surgealloy, 350, Items.phasefabric, 150));
+            consumes.items(with(Items.silicon, 1000, Items.plastanium, 600, Items.surgealloy, 500, Items.phasefabric, 350));
             consumes.liquid(Liquids.cryofluid, 3f);
 
             constructTime = 60f * 60f * 4;
@@ -1927,7 +1927,7 @@ public class Blocks implements ContentList{
         logicProcessor = new LogicBlock("logic-processor"){{
             requirements(Category.logic, with(Items.lead, 320, Items.silicon, 100, Items.graphite, 60, Items.thorium, 50));
 
-            instructionsPerTick = 5;
+            instructionsPerTick = 8;
 
             range = 8 * 22;
 

core/src/mindustry/content/UnitTypes.java

@@ -151,7 +151,7 @@ public class UnitTypes implements ContentList{
                 inaccuracy = 3f;
                 shotDelay = 4f;
 
-                bullet = new BasicBulletType(7f, 40){{
+                bullet = new BasicBulletType(7f, 45){{
                     width = 11f;
                     height = 20f;
                     lifetime = 25f;
@@ -160,7 +160,7 @@ public class UnitTypes implements ContentList{
                     lightningLength = 6;
                     lightningColor = Pal.surge;
                     //standard bullet damage is far too much for lightning
-                    lightningDamage = 17;
+                    lightningDamage = 25;
                 }};
             }},
 
@@ -208,7 +208,7 @@ public class UnitTypes implements ContentList{
                 bullet = new BasicBulletType(13f, 55){{
                     pierce = true;
                     width = 14f;
-                    height = 32f;
+                    height = 33f;
                     lifetime = 15f;
                     shootEffect = Fx.shootBig;
                     fragVelocityMin = 0.4f;
@@ -1036,6 +1036,7 @@ public class UnitTypes implements ContentList{
             hitsize = 15f;
             engineSize = 3f;
             payloadCapacity = 4 * (8 * 8);
+            buildSpeed = 2.5f;
 
             weapons.add(
             new Weapon("heal-weapon-mount"){{

core/src/mindustry/logic/LExecutor.java

@@ -274,6 +274,8 @@ public class LExecutor{
                         exec.setobj(to, objOut);
                     }
                 }
+            }else{
+                exec.setnum(to, 0);
             }
         }
     }

core/src/mindustry/ui/dialogs/JoinDialog.java

@@ -262,14 +262,10 @@ public class JoinDialog extends BaseDialog{
         cont.clear();
         cont.table(t -> {
             t.add("@name").padRight(10);
-            if(!steam){
+            t.field(Core.settings.getString("name"), text -> {
-                t.field(Core.settings.getString("name"), text -> {
+                player.name(text);
-                    player.name(text);
+                Core.settings.put("name", text);
-                    Core.settings.put("name", text);
+            }).grow().pad(8).addInputDialog(maxNameLength);
-                }).grow().pad(8).addInputDialog(maxNameLength);
-            }else{
-                t.add(player.name).update(l -> l.setColor(player.color())).grow().pad(8);
-            }
 
             ImageButton button = t.button(Tex.whiteui, Styles.clearFulli, 40, () -> {
                 new PaletteDialog().show(color -> {

core/src/mindustry/world/blocks/liquid/Conduit.java

@@ -65,7 +65,7 @@ public class Conduit extends LiquidBlock implements Autotiler{
 
     @Override
     public boolean blends(Tile tile, int rotation, int otherx, int othery, int otherrot, Block otherblock){
-        return otherblock.hasLiquids && otherblock.outputsLiquid && lookingAtEither(tile, rotation, otherx, othery, otherrot, otherblock);
+        return otherblock.hasLiquids && (otherblock.outputsLiquid || (lookingAt(tile, rotation, otherx, othery, otherblock))) && lookingAtEither(tile, rotation, otherx, othery, otherrot, otherblock);
     }
 
     @Override