Merge remote-tracking branch 'origin/master'

core/src/mindustry/logic/LAssembler.java

@@ -62,7 +62,9 @@ public class LAssembler{
         int index = 0;
         for(String line : lines){
             //comments
-            if(line.startsWith("#") || line.isEmpty()) continue;
+            int commentIdx = line.indexOf('#');
+            if(commentIdx != -1) line = line.substring(0, commentIdx).trim();
+            if(line.isEmpty()) continue;
             //remove trailing semicolons in case someone adds them in for no reason
             if(line.endsWith(";")) line = line.substring(0, line.length() - 1);
 

core/src/mindustry/logic/LStatements.java

@@ -387,13 +387,15 @@ public class LStatements{
     public static class RadarStatement extends LStatement{
         public RadarTarget target1 = RadarTarget.enemy, target2 = RadarTarget.any, target3 = RadarTarget.any;
         public RadarSort sort = RadarSort.distance;
-        public String radar = "turret1", sortOrder = "1", output = "result";
+        public String radar = "0", sortOrder = "1", output = "result";
 
         @Override
         public void build(Table table){
             table.defaults().left();
 
             if(buildFrom()){
+                radar = "turret1";
+
                 table.add(" from ");
 
                 fields(table, radar, v -> radar = v);

core/src/mindustry/world/blocks/campaign/LaunchPad.java

@@ -1,6 +1,7 @@
 package mindustry.world.blocks.campaign;
 
 import arc.*;
+import arc.audio.*;
 import arc.Graphics.*;
 import arc.Graphics.Cursor.*;
 import arc.graphics.*;
@@ -28,6 +29,7 @@ public class LaunchPad extends Block{
     public final int timerLaunch = timers++;
     /** Time inbetween launches. */
     public float launchTime;
+    public Sound launchSound = Sounds.none;
 
     public @Load("@-light") TextureRegion lightRegion;
     public @Load("launchpod") TextureRegion podRegion;
@@ -119,6 +121,7 @@ public class LaunchPad extends Block{
 
             //launch when full and base conditions are met
             if(items.total() >= itemCapacity && efficiency() >= 1f && timer(timerLaunch, launchTime / timeScale)){
+                launchSound.at(x, y);
                 LaunchPayload entity = LaunchPayload.create();
                 items.each((item, amount) -> entity.stacks.add(new ItemStack(item, amount)));
                 entity.set(this);