diff --git a/core/src/main/assets/music/game.ogg b/core/src/main/assets/music/game.ogg deleted file mode 100644 index 61795d48f..000000000 Binary files a/core/src/main/assets/music/game.ogg and /dev/null differ diff --git a/core/src/main/assets/music/sewers_1.ogg b/core/src/main/assets/music/sewers_1.ogg new file mode 100644 index 000000000..13cf4767e Binary files /dev/null and b/core/src/main/assets/music/sewers_1.ogg differ diff --git a/core/src/main/assets/music/sewers_2.ogg b/core/src/main/assets/music/sewers_2.ogg new file mode 100644 index 000000000..4954e1f5d Binary files /dev/null and b/core/src/main/assets/music/sewers_2.ogg differ diff --git a/core/src/main/assets/music/surface.ogg b/core/src/main/assets/music/surface.ogg deleted file mode 100644 index 228b83d58..000000000 Binary files a/core/src/main/assets/music/surface.ogg and /dev/null differ diff --git a/core/src/main/assets/music/theme.ogg b/core/src/main/assets/music/theme.ogg deleted file mode 100644 index d8ccea06d..000000000 Binary files a/core/src/main/assets/music/theme.ogg and /dev/null differ diff --git a/core/src/main/assets/music/theme_1.ogg b/core/src/main/assets/music/theme_1.ogg new file mode 100644 index 000000000..7b89cd3fe Binary files /dev/null and b/core/src/main/assets/music/theme_1.ogg differ diff --git a/core/src/main/assets/music/theme_2.ogg b/core/src/main/assets/music/theme_2.ogg new file mode 100644 index 000000000..4af385816 Binary files /dev/null and b/core/src/main/assets/music/theme_2.ogg differ diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/Assets.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/Assets.java index 517e5386d..7fb8b46bf 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/Assets.java +++ b/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 { diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/BadgesScene.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/BadgesScene.java index 99a302370..5f7392bc6 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/BadgesScene.java +++ b/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; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/ChangesScene.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/ChangesScene.java index 4262c7515..1703a0d6c 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/ChangesScene.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/ChangesScene.java @@ -55,8 +55,11 @@ public class ChangesScene extends PixelScene { @Override 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; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/GameScene.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/GameScene.java index a018d6fe4..96c4106cc 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/GameScene.java +++ b/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()); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/RankingsScene.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/RankingsScene.java index d4bf04c6b..8eb95f6d4 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/RankingsScene.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/RankingsScene.java @@ -58,8 +58,11 @@ public class RankingsScene 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); uiCamera.visible = false; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/SurfaceScene.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/SurfaceScene.java index 34db2e2f9..b28010120 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/SurfaceScene.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/SurfaceScene.java @@ -84,8 +84,11 @@ public class SurfaceScene extends PixelScene { public void create() { 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; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/TitleScene.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/TitleScene.java index 74dda83c1..245f8a154 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/TitleScene.java +++ b/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; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/WelcomeScene.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/WelcomeScene.java index 124091e08..fb4ecd210 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/WelcomeScene.java +++ b/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; diff --git a/ios/assets/music/game.mp3 b/ios/assets/music/game.mp3 deleted file mode 100644 index 2854b80ee..000000000 Binary files a/ios/assets/music/game.mp3 and /dev/null differ diff --git a/ios/assets/music/sewers_1.mp3 b/ios/assets/music/sewers_1.mp3 new file mode 100644 index 000000000..c8828c335 Binary files /dev/null and b/ios/assets/music/sewers_1.mp3 differ diff --git a/ios/assets/music/sewers_2.mp3 b/ios/assets/music/sewers_2.mp3 new file mode 100644 index 000000000..0693e81e3 Binary files /dev/null and b/ios/assets/music/sewers_2.mp3 differ diff --git a/ios/assets/music/surface.mp3 b/ios/assets/music/surface.mp3 deleted file mode 100644 index 441b8ec16..000000000 Binary files a/ios/assets/music/surface.mp3 and /dev/null differ diff --git a/ios/assets/music/theme.mp3 b/ios/assets/music/theme.mp3 deleted file mode 100644 index 98db261f7..000000000 Binary files a/ios/assets/music/theme.mp3 and /dev/null differ diff --git a/ios/assets/music/theme_1.mp3 b/ios/assets/music/theme_1.mp3 new file mode 100644 index 000000000..7c6fe27bc Binary files /dev/null and b/ios/assets/music/theme_1.mp3 differ diff --git a/ios/assets/music/theme_2.mp3 b/ios/assets/music/theme_2.mp3 new file mode 100644 index 000000000..470ce91e8 Binary files /dev/null and b/ios/assets/music/theme_2.mp3 differ