diff --git a/core/src/main/assets/music/caves_1.ogg b/core/src/main/assets/music/caves_1.ogg new file mode 100644 index 000000000..d2c62db12 Binary files /dev/null and b/core/src/main/assets/music/caves_1.ogg differ diff --git a/core/src/main/assets/music/caves_2.ogg b/core/src/main/assets/music/caves_2.ogg new file mode 100644 index 000000000..c7f7164b6 Binary files /dev/null and b/core/src/main/assets/music/caves_2.ogg differ diff --git a/core/src/main/assets/music/city_1.ogg b/core/src/main/assets/music/city_1.ogg new file mode 100644 index 000000000..66100dec4 Binary files /dev/null and b/core/src/main/assets/music/city_1.ogg differ diff --git a/core/src/main/assets/music/city_2.ogg b/core/src/main/assets/music/city_2.ogg new file mode 100644 index 000000000..a7c226613 Binary files /dev/null and b/core/src/main/assets/music/city_2.ogg differ diff --git a/core/src/main/assets/music/halls_1.ogg b/core/src/main/assets/music/halls_1.ogg new file mode 100644 index 000000000..522fbf3fe Binary files /dev/null and b/core/src/main/assets/music/halls_1.ogg differ diff --git a/core/src/main/assets/music/halls_2.ogg b/core/src/main/assets/music/halls_2.ogg new file mode 100644 index 000000000..7804a7765 Binary files /dev/null and b/core/src/main/assets/music/halls_2.ogg differ diff --git a/core/src/main/assets/music/prison_1.ogg b/core/src/main/assets/music/prison_1.ogg new file mode 100644 index 000000000..93e9d30f4 Binary files /dev/null and b/core/src/main/assets/music/prison_1.ogg differ diff --git a/core/src/main/assets/music/prison_2.ogg b/core/src/main/assets/music/prison_2.ogg new file mode 100644 index 000000000..668741c5b Binary files /dev/null and b/core/src/main/assets/music/prison_2.ogg differ diff --git a/core/src/main/assets/music/sewers_1.ogg b/core/src/main/assets/music/sewers_1.ogg index 13cf4767e..b515e3ddb 100644 Binary files a/core/src/main/assets/music/sewers_1.ogg 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 index 4954e1f5d..c3eee6f72 100644 Binary files a/core/src/main/assets/music/sewers_2.ogg and b/core/src/main/assets/music/sewers_2.ogg differ diff --git a/core/src/main/assets/music/theme_1.ogg b/core/src/main/assets/music/theme_1.ogg index 7b89cd3fe..fb0b2382a 100644 Binary files a/core/src/main/assets/music/theme_1.ogg 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 index 4af385816..006686986 100644 Binary files a/core/src/main/assets/music/theme_2.ogg 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 2923325c0..33c65a1c2 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/Assets.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/Assets.java @@ -117,6 +117,18 @@ public class Assets { public static final String SEWERS_1 = "music/sewers_1.ogg"; public static final String SEWERS_2 = "music/sewers_2.ogg"; + + public static final String PRISON_1 = "music/prison_1.ogg"; + public static final String PRISON_2 = "music/prison_2.ogg"; + + public static final String CAVES_1 = "music/caves_1.ogg"; + public static final String CAVES_2 = "music/caves_2.ogg"; + + public static final String CITY_1 = "music/city_1.ogg"; + public static final String CITY_2 = "music/city_2.ogg"; + + public static final String HALLS_1 = "music/halls_1.ogg"; + public static final String HALLS_2 = "music/halls_2.ogg"; } public static class Sounds { 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 8a4698318..4b4a6fad1 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/GameScene.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/GameScene.java @@ -184,11 +184,33 @@ public class GameScene extends PixelScene { ShatteredPixelDungeon.switchNoFade(TitleScene.class); return; } - - Music.INSTANCE.playTracks( - new String[]{Assets.Music.SEWERS_1, Assets.Music.SEWERS_2, Assets.Music.SEWERS_2}, - new float[]{1, 1, 0.5f}, - false); + + if (Dungeon.depth <= 5) { + Music.INSTANCE.playTracks( + new String[]{Assets.Music.SEWERS_1, Assets.Music.SEWERS_2, Assets.Music.SEWERS_2}, + new float[]{1, 1, 0.5f}, + false); + } else if (Dungeon.depth <= 10) { + Music.INSTANCE.playTracks( + new String[]{Assets.Music.PRISON_1, Assets.Music.PRISON_2, Assets.Music.PRISON_2}, + new float[]{1, 1, 0.5f}, + false); + } else if (Dungeon.depth <= 15) { + Music.INSTANCE.playTracks( + new String[]{Assets.Music.CAVES_1, Assets.Music.CAVES_2, Assets.Music.CAVES_2}, + new float[]{1, 1, 0.5f}, + false); + } else if (Dungeon.depth <= 20) { + Music.INSTANCE.playTracks( + new String[]{Assets.Music.CITY_1, Assets.Music.CITY_2, Assets.Music.CITY_2}, + new float[]{1, 1, 0.5f}, + false); + } else { + Music.INSTANCE.playTracks( + new String[]{Assets.Music.HALLS_1, Assets.Music.HALLS_2, Assets.Music.HALLS_2}, + new float[]{1, 1, 0.5f}, + false); + } SPDSettings.lastClass(Dungeon.hero.heroClass.ordinal()); diff --git a/ios/assets/music/caves_1.mp3 b/ios/assets/music/caves_1.mp3 new file mode 100644 index 000000000..670b90036 Binary files /dev/null and b/ios/assets/music/caves_1.mp3 differ diff --git a/ios/assets/music/caves_2.mp3 b/ios/assets/music/caves_2.mp3 new file mode 100644 index 000000000..bc83da191 Binary files /dev/null and b/ios/assets/music/caves_2.mp3 differ diff --git a/ios/assets/music/city_1.mp3 b/ios/assets/music/city_1.mp3 new file mode 100644 index 000000000..a8a384eb5 Binary files /dev/null and b/ios/assets/music/city_1.mp3 differ diff --git a/ios/assets/music/city_2.mp3 b/ios/assets/music/city_2.mp3 new file mode 100644 index 000000000..7b40dd764 Binary files /dev/null and b/ios/assets/music/city_2.mp3 differ diff --git a/ios/assets/music/halls_1.mp3 b/ios/assets/music/halls_1.mp3 new file mode 100644 index 000000000..30dbb8fad Binary files /dev/null and b/ios/assets/music/halls_1.mp3 differ diff --git a/ios/assets/music/halls_2.mp3 b/ios/assets/music/halls_2.mp3 new file mode 100644 index 000000000..590a760b5 Binary files /dev/null and b/ios/assets/music/halls_2.mp3 differ diff --git a/ios/assets/music/prison_1.mp3 b/ios/assets/music/prison_1.mp3 new file mode 100644 index 000000000..7a0487dca Binary files /dev/null and b/ios/assets/music/prison_1.mp3 differ diff --git a/ios/assets/music/prison_2.mp3 b/ios/assets/music/prison_2.mp3 new file mode 100644 index 000000000..b293a2b41 Binary files /dev/null and b/ios/assets/music/prison_2.mp3 differ diff --git a/ios/assets/music/sewers_1.mp3 b/ios/assets/music/sewers_1.mp3 index c8828c335..5abf3eba5 100644 Binary files a/ios/assets/music/sewers_1.mp3 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 index 0693e81e3..7dd1b1e27 100644 Binary files a/ios/assets/music/sewers_2.mp3 and b/ios/assets/music/sewers_2.mp3 differ diff --git a/ios/assets/music/theme_1.mp3 b/ios/assets/music/theme_1.mp3 index 7c6fe27bc..99c30f4a0 100644 Binary files a/ios/assets/music/theme_1.mp3 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 index 470ce91e8..0fa1299bf 100644 Binary files a/ios/assets/music/theme_2.mp3 and b/ios/assets/music/theme_2.mp3 differ