v0.9.4: added new music!

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/Assets.java

@@ -110,9 +110,11 @@ public class Assets {
 	}
 
 	public static class Music {
-		public static final String GAME		= "music/game.ogg";
-		public static final String SURFACE	= "music/surface.ogg";
-		public static final String THEME	= "music/theme.ogg";
+		public static final String THEME_1  	= "music/theme_1.ogg";
+		public static final String THEME_2	    = "music/theme_2.ogg";
+
+		public static final String SEWERS_1		= "music/sewers_1.ogg";
+		public static final String SEWERS_2		= "music/sewers_2.ogg";
 	}
 
 	public static class Sounds {

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/BadgesScene.java

@@ -40,7 +40,10 @@ public class BadgesScene extends PixelScene {
 
 		super.create();
 
-		Music.INSTANCE.play( Assets.Music.THEME, true );
+		Music.INSTANCE.playTracks(
+				new String[]{Assets.Music.THEME_1, Assets.Music.THEME_2},
+				new float[]{1, 1},
+				false);
 
 		uiCamera.visible = false;
 

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/ChangesScene.java

@@ -56,7 +56,10 @@ public class ChangesScene extends PixelScene {
 	public void create() {
 		super.create();
 
-		Music.INSTANCE.play( Assets.Music.THEME, true );
+		Music.INSTANCE.playTracks(
+				new String[]{Assets.Music.THEME_1, Assets.Music.THEME_2},
+				new float[]{1, 1},
+				false);
 
 		int w = Camera.main.width;
 		int h = Camera.main.height;

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/GameScene.java

@@ -180,7 +180,10 @@ public class GameScene extends PixelScene {
 			return;
 		}
 		
-		Music.INSTANCE.play( Assets.Music.GAME, true );
+		Music.INSTANCE.playTracks(
+				new String[]{Assets.Music.SEWERS_1, Assets.Music.SEWERS_2, Assets.Music.SEWERS_2},
+				new float[]{1, 1, 0.5f},
+				false);
 
 		SPDSettings.lastClass(Dungeon.hero.heroClass.ordinal());
 		

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/RankingsScene.java

@@ -59,7 +59,10 @@ public class RankingsScene extends PixelScene {
 		
 		super.create();
 
-		Music.INSTANCE.play( Assets.Music.THEME, true );
+		Music.INSTANCE.playTracks(
+				new String[]{Assets.Music.THEME_1, Assets.Music.THEME_2},
+				new float[]{1, 1},
+				false);
 
 		uiCamera.visible = false;
 		

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/SurfaceScene.java

@@ -85,7 +85,10 @@ public class SurfaceScene extends PixelScene {
 		
 		super.create();
 
-		Music.INSTANCE.play( Assets.Music.SURFACE, true );
+		Music.INSTANCE.playTracks(
+				new String[]{Assets.Music.THEME_2, Assets.Music.THEME_1},
+				new float[]{1, 1},
+				false);
 		
 		uiCamera.visible = false;
 		

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/TitleScene.java

@@ -58,7 +58,10 @@ public class TitleScene extends PixelScene {
 		
 		super.create();
 
-		Music.INSTANCE.play( Assets.Music.THEME, true );
+		Music.INSTANCE.playTracks(
+				new String[]{Assets.Music.THEME_1, Assets.Music.THEME_2},
+				new float[]{1, 1},
+				false);
 
 		uiCamera.visible = false;
 		

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/WelcomeScene.java

@@ -58,6 +58,11 @@ public class WelcomeScene extends PixelScene {
 			return;
 		}
 
+		Music.INSTANCE.playTracks(
+				new String[]{Assets.Music.THEME_1, Assets.Music.THEME_2},
+				new float[]{1, 1},
+				false);
+
 		uiCamera.visible = false;
 
 		int w = Camera.main.width;