Merged current master into branch (with manual changes)

core/src/io/anuke/mindustry/content/AmmoTypes.java

@@ -14,7 +14,7 @@ public class AmmoTypes implements ContentList{
         bulletDenseBig, bulletPyratiteBig, bulletThoriumBig,
         shock, bombExplosive, bombIncendiary, bombOil, shellCarbide, flamerThermite, weaponMissile, weaponMissileSwarm, bulletMech,
         healBlaster, bulletGlaive,
-        /*flakCopper, */flakExplosive, flakPlastic, flakSurge,
+        flakExplosive, flakPlastic, flakSurge,
         missileExplosive, missileIncindiary, missileSurge,
         artilleryDense, artilleryPlastic, artilleryHoming, artilleryIncindiary, artilleryExplosive, unitArtillery,
         basicFlame, lancerLaser, lightning, meltdownLaser, burstLaser,

core/src/io/anuke/mindustry/content/UnitTypes.java

@@ -43,7 +43,6 @@ public class UnitTypes implements ContentList{
             speed = 0.2f;
             maxVelocity = 0.8f;
             range = 50f;
-            healSpeed = 0.22f;
             health = 60;
         }};
 
@@ -115,6 +114,7 @@ public class UnitTypes implements ContentList{
         }};
 
         phantom = new UnitType("phantom", Phantom.class, Phantom::new){{
+            weapon = Weapons.healBlasterDrone2;
             isFlying = true;
             drag = 0.01f;
             mass = 2f;
@@ -125,7 +125,6 @@ public class UnitTypes implements ContentList{
             health = 220;
             buildPower = 0.9f;
             minePower = 1.1f;
-            healSpeed = 0.5f;
             toMine = ObjectSet.with(Items.lead, Items.copper, Items.titanium);
         }};
     }

core/src/io/anuke/mindustry/content/Weapons.java

@@ -8,7 +8,7 @@ import io.anuke.mindustry.type.Weapon;
 
 public class Weapons implements ContentList{
     public static Weapon blaster, blasterSmall, glaiveBlaster, droneBlaster, healBlaster, healBlasterDrone, chainBlaster, shockgun,
-    sapper, swarmer, bomber, bomberTrident, flakgun, flamethrower, missiles, artillery, laserBurster;
+    sapper, swarmer, bomber, bomberTrident, flakgun, flamethrower, missiles, artillery, laserBurster, healBlasterDrone2;
 
     @Override
     public void load(){
@@ -179,6 +179,16 @@ public class Weapons implements ContentList{
             recoil = 2f;
             ammo = AmmoTypes.healBlaster;
         }};
+
+        healBlasterDrone2 = new Weapon("heal-blaster"){{
+            length = 1.5f;
+            reload = 20f;
+            width = 0.5f;
+            roundrobin = true;
+            ejectEffect = Fx.none;
+            recoil = 2f;
+            ammo = AmmoTypes.healBlaster;
+        }};
     }
 
     @Override

core/src/io/anuke/mindustry/content/blocks/CraftingBlocks.java

@@ -135,13 +135,13 @@ public class CraftingBlocks extends BlockList implements ContentList{
         melter = new PowerCrafter("melter"){{
             health = 200;
             outputLiquid = Liquids.lava;
-            outputLiquidAmount = 0.75f;
-            itemCapacity = 50;
+            outputLiquidAmount = 1f;
+            itemCapacity = 20;
             craftTime = 10f;
             hasLiquids = hasPower = true;
 
             consumes.powerDirect(0.1f);
-            consumes.item(Items.stone, 2);
+            consumes.item(Items.stone, 1);
         }};
 
         separator = new Separator("separator"){{

core/src/io/anuke/mindustry/content/blocks/DebugBlocks.java

@@ -90,8 +90,11 @@ public class DebugBlocks extends BlockList implements ContentList{
             @Override
             public void update(Tile tile){
                 SorterEntity entity = tile.entity();
+                if(entity.sortItem == null) return;
+
                 entity.items.set(entity.sortItem, 1);
                 tryDump(tile, entity.sortItem);
+                entity.items.set(entity.sortItem, 0);
             }
 
             @Override
@@ -142,8 +145,8 @@ public class DebugBlocks extends BlockList implements ContentList{
                     if(!control.unlocks.isUnlocked(items.get(i))) continue;
 
                     final int f = i;
-                    ImageButton button = cont.addImageButton("liquid-icon-" + items.get(i).name, "toggle", 24,
-                            () -> Call.setLiquidSourceLiquid(null, tile, items.get(f))).size(38, 42).padBottom(-5.1f).group(group).get();
+                    ImageButton button = cont.addImageButton("liquid-icon-" + items.get(i).name, "clear-toggle", 24,
+                            () -> Call.setLiquidSourceLiquid(null, tile, items.get(f))).size(38).group(group).get();
                     button.setChecked(entity.source.id == f);
 
                     if(i % 4 == 3){

core/src/io/anuke/mindustry/content/blocks/PowerBlocks.java

@@ -19,8 +19,8 @@ public class PowerBlocks extends BlockList implements ContentList{
         }};
 
         thermalGenerator = new LiquidHeatGenerator("thermal-generator"){{
-            maxLiquidGenerate = 4f;
-            powerProduction = 8f;
+            maxLiquidGenerate = 2f;
+            powerProduction = 4f;
             generateEffect = BlockFx.redgeneratespark;
             size = 2;
         }};