Merge branch 'master' of https://github.com/Anuken/Mindustry

core/src/mindustry/graphics/Pal.java

@@ -3,7 +3,7 @@ package mindustry.graphics;
 import arc.graphics.Color;
 
 public class Pal{
-    public static final Color
+    public static Color
 
     items = Color.valueOf("2ea756"),
     command = Color.valueOf("eab678"),

core/src/mindustry/world/blocks/defense/Wall.java

@@ -1,6 +1,7 @@
 package mindustry.world.blocks.defense;
 
 import arc.*;
+import arc.audio.*;
 import arc.graphics.*;
 import arc.graphics.g2d.*;
 import arc.math.*;
@@ -20,11 +21,13 @@ public class Wall extends Block{
     public float lightningDamage = 20f;
     public int lightningLength = 17;
     public Color lightningColor = Pal.surge;
+    public Sound lightningSound = Sounds.spark;
 
     public float chanceDeflect = 10f;
     public boolean flashHit;
     public Color flashColor = Color.white;
     public boolean deflect;
+    public Sound deflectSound = Sounds.none;
 
     public Wall(String name){
         super(name);
@@ -94,6 +97,7 @@ public class Wall extends Block{
             if(lightningChance > 0){
                 if(Mathf.chance(lightningChance)){
                     Lightning.create(team, lightningColor, lightningDamage, x, y, bullet.rotation() + 180f, lightningLength);
+                    lightningSound.at(tile, Mathf.random(0.9f, 1.1f));
                 }
             }
 
@@ -105,6 +109,9 @@ public class Wall extends Block{
                 //bullet reflection chance depends on bullet damage
                 if(!Mathf.chance(chanceDeflect / bullet.damage())) return true;
 
+                //make sound
+                deflectSound.at(tile, Mathf.random(0.9f, 1.1f));
+
                 //translate bullet back to where it was upon collision
                 bullet.trns(-bullet.vel.x, -bullet.vel.y);