some bad sounds

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

@@ -1323,6 +1323,7 @@ public class Blocks implements ContentList{
             shootCone = 35f;
 
             health = 200 * size * size;
+            shootSound = Sounds.shootSnap;
         }};
 
         scorch = new ItemTurret("scorch"){{

core/src/io/anuke/mindustry/core/Control.java

@@ -1,7 +1,7 @@
 package io.anuke.mindustry.core;
 
-import io.anuke.arc.*;
 import io.anuke.arc.Application.*;
+import io.anuke.arc.*;
 import io.anuke.arc.graphics.*;
 import io.anuke.arc.graphics.g2d.*;
 import io.anuke.arc.input.*;

core/src/io/anuke/mindustry/entities/type/TileEntity.java

@@ -12,9 +12,9 @@ import io.anuke.mindustry.entities.bullet.Bullet;
 import io.anuke.mindustry.entities.impl.BaseEntity;
 import io.anuke.mindustry.entities.traits.HealthTrait;
 import io.anuke.mindustry.entities.traits.TargetTrait;
+import io.anuke.mindustry.game.*;
 import io.anuke.mindustry.game.EventType.BlockDestroyEvent;
-import io.anuke.mindustry.game.Team;
-import io.anuke.mindustry.gen.Call;
+import io.anuke.mindustry.gen.*;
 import io.anuke.mindustry.world.*;
 import io.anuke.mindustry.world.modules.*;
 
@@ -45,6 +45,7 @@ public class TileEntity extends BaseEntity implements TargetTrait, HealthTrait{
     private boolean dead = false;
     private boolean sleeping;
     private float sleepTime;
+    private @Nullable SoundLoop sound;
 
     @Remote(called = Loc.server, unreliable = true)
     public static void onTileDamage(Tile tile, float health){
@@ -69,6 +70,9 @@ public class TileEntity extends BaseEntity implements TargetTrait, HealthTrait{
         x = tile.drawx();
         y = tile.drawy();
         block = tile.block();
+        if(block.idleSound != Sounds.none){
+            sound = new SoundLoop(block.idleSound, block.idleSoundVolume);
+        }
 
         health = block.health;
         timer = new Interval(block.timers);
@@ -231,6 +235,13 @@ public class TileEntity extends BaseEntity implements TargetTrait, HealthTrait{
         return proximity;
     }
 
+    @Override
+    public void removed(){
+        if(sound != null){
+            sound.stop();
+        }
+    }
+
     @Override
     public void health(float health){
         this.health = health;
@@ -286,6 +297,10 @@ public class TileEntity extends BaseEntity implements TargetTrait, HealthTrait{
             return; //no need to update anymore
         }
 
+        if(sound != null){
+            sound.update(x, y, block.shouldIdleSound(tile));
+        }
+
         Block previous = block;
         block.update(tile);
         if(block == previous && cons != null){

core/src/io/anuke/mindustry/game/SoundLoop.java

@@ -1,4 +1,49 @@
 package io.anuke.mindustry.game;
 
+import io.anuke.arc.audio.*;
+import io.anuke.arc.math.*;
+import io.anuke.arc.util.*;
+
+/** A simple class for playing a looping sound at a position.*/
 public class SoundLoop{
+    private static final float fadeSpeed = 0.05f;
+
+    private final Sound sound;
+    private long id = -1;
+    private float volume, baseVolume;
+
+    public SoundLoop(Sound sound, float baseVolume){
+        this.sound = sound;
+        this.baseVolume = baseVolume;
+    }
+
+    public void update(float x, float y, boolean play){
+        if(baseVolume < 0) return;
+
+        if(id < 0){
+            if(play){
+                id = sound.loop(sound.calcVolume(x, y) * volume * baseVolume, 1f, sound.calcPan(x, y));
+            }
+        }else{
+            //fade the sound in or out
+            if(play){
+                volume = Mathf.clamp(volume + fadeSpeed * Time.delta());
+            }else{
+                volume = Mathf.clamp(volume - fadeSpeed * Time.delta());
+                if(volume <= 0.001f){
+                    sound.stop(id);
+                    id = -1;
+                }
+            }
+            sound.setPan(id, sound.calcPan(x, y), sound.calcVolume(x, y) * volume * baseVolume);
+        }
+    }
+
+    public void stop(){
+        if(id != -1){
+            sound.stop(id);
+            id = -1;
+            volume = baseVolume = -1;
+        }
+    }
 }

core/src/io/anuke/mindustry/input/InputHandler.java

@@ -160,6 +160,7 @@ public abstract class InputHandler implements InputProcessor{
             if(((!frag.config.isShown() && tile.block().shouldShowConfigure(tile, player)) //if the config fragment is hidden, show
             //alternatively, the current selected block can 'agree' to switch config tiles
             || (frag.config.isShown() && frag.config.getSelectedTile().block().onConfigureTileTapped(frag.config.getSelectedTile(), tile)))){
+                Sounds.click.at(tile);
                 frag.config.showConfig(tile);
             }
             //otherwise...

core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java

@@ -184,6 +184,7 @@ public class SettingsMenuDialog extends SettingsDialog{
             @Override
             public void add(SettingsTable table){
                 table.addButton("$tutorial.retake", () -> {
+                    hide();
                     control.playTutorial();
                 }).size(220f, 60f).pad(6).left();
                 table.add();

core/src/io/anuke/mindustry/ui/fragments/HudFragment.java

@@ -638,15 +638,17 @@ public class HudFragment extends Fragment{
     }
 
     private boolean canSkipWave(){
-        return state.rules.waves && ((Net.server() || player.isAdmin) || !Net.active()) && state.enemies() == 0 && !world.spawner.isSpawning();
+        return state.rules.waves && ((Net.server() || player.isAdmin) || !Net.active()) && state.enemies() == 0 && !world.spawner.isSpawning() && !state.rules.tutorial;
     }
 
     private void addPlayButton(Table table){
         table.right().addImageButton("icon-play", "right", 30f, () -> {
             if(Net.client() && player.isAdmin){
                 Call.onAdminRequest(player, AdminAction.wave);
-            }else{
+            }else if(inLaunchWave()){
                 ui.showConfirm("$confirm", "$launch.skip.confirm", () -> !canSkipWave(), () -> state.wavetime = 0f);
+            }else{
+                state.wavetime = 0f;
             }
         }).growY().fillX().right().width(40f)
         .visible(this::canSkipWave);

core/src/io/anuke/mindustry/world/Block.java

@@ -99,7 +99,11 @@ public class Block extends BlockStorage{
     /** Whether this block has a shadow under it. */
     public boolean hasShadow = true;
     /** Sounds made when this block breaks.*/
-    public Sound breakSound = Sounds.die;
+    public Sound breakSound = Sounds.boom;
+    /** The sound that this block makes while active.*/
+    public Sound idleSound = Sounds.none;
+    /** Idle sound base volume. */
+    public float idleSoundVolume = 0.5f;
 
     /** Cost of constructing this block. */
     public ItemStack[] buildRequirements = new ItemStack[]{};
@@ -207,6 +211,11 @@ public class Block extends BlockStorage{
         return progressIncrease;
     }
 
+    /** @return whether this block should play its idle sound.*/
+    public boolean shouldIdleSound(Tile tile){
+        return canProduce(tile);
+    }
+
     public void drawLayer(Tile tile){
     }
 

core/src/io/anuke/mindustry/world/blocks/defense/Door.java

@@ -1,17 +1,17 @@
 package io.anuke.mindustry.world.blocks.defense;
 
 import io.anuke.annotations.Annotations.*;
-import io.anuke.arc.Core;
-import io.anuke.arc.Graphics.Cursor;
-import io.anuke.arc.Graphics.Cursor.SystemCursor;
+import io.anuke.arc.*;
+import io.anuke.arc.Graphics.*;
+import io.anuke.arc.Graphics.Cursor.*;
 import io.anuke.arc.graphics.g2d.*;
-import io.anuke.arc.math.geom.Rectangle;
-import io.anuke.mindustry.content.Fx;
+import io.anuke.arc.math.geom.*;
+import io.anuke.mindustry.content.*;
 import io.anuke.mindustry.entities.*;
-import io.anuke.mindustry.entities.Effects.Effect;
+import io.anuke.mindustry.entities.Effects.*;
 import io.anuke.mindustry.entities.type.*;
-import io.anuke.mindustry.gen.Call;
-import io.anuke.mindustry.world.Tile;
+import io.anuke.mindustry.gen.*;
+import io.anuke.mindustry.world.*;
 
 import java.io.*;
 
@@ -45,6 +45,7 @@ public class Door extends Wall{
             }else{
                 Effects.effect(door.closefx, tile.drawx(), tile.drawy());
             }
+            Sounds.door.at(tile);
         }
     }
 

core/src/io/anuke/mindustry/world/blocks/production/Drill.java

@@ -64,6 +64,9 @@ public class Drill extends Block{
         hasLiquids = true;
         liquidCapacity = 5f;
         hasItems = true;
+
+        //idleSound = Sounds.drill;
+        //idleSoundVolume = 0.5f;
     }
 
     @Override

desktop-sdl/src/io/anuke/mindustry/desktopsdl/DesktopPlatform.java

@@ -17,6 +17,7 @@ import java.util.*;
 
 import static io.anuke.mindustry.Vars.*;
 
+
 public class DesktopPlatform extends Platform{
     static boolean useDiscord = OS.is64Bit;
     final static String applicationId = "610508934456934412";

tools/build.gradle

@@ -320,7 +320,7 @@ task pack(dependsOn: classes){
 
         //antialias everything except UI elements
         fileTree(dir: '../core/assets-raw/sprites_out/', include: "**/*.png").visit{ file ->
-            if(file.isDirectory() || (file.toString().replace("\\", "/").contains("/ui/"))) return
+            if(file.isDirectory() || (file.toString().replace("\\", "/").contains("/ui/") && !file.toString().contains("icon-small") && !file.toString().contains("icon-medium") && !file.toString().contains("icon-large"))) return
 
             antialias(file.file)
         }