v2.2.0: added five new 'tense' soundtracks, which play during ascent

This commit is contained in:
Evan Debenham
2023-09-02 16:44:46 -04:00
parent dc6749f43e
commit 54c19b0842
16 changed files with 49 additions and 20 deletions

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@@ -118,22 +118,27 @@ 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 SEWERS_TENSE = "music/sewers_tense.ogg";
public static final String SEWERS_BOSS = "music/sewers_boss.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 PRISON_TENSE = "music/prison_tense.ogg";
public static final String PRISON_BOSS = "music/prison_boss.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 CAVES_TENSE = "music/caves_tense.ogg";
public static final String CAVES_BOSS = "music/caves_boss.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 CITY_TENSE = "music/city_tense.ogg";
public static final String CITY_BOSS = "music/city_boss.ogg";
public static final String HALLS_1 = "music/halls_1.ogg";
public static final String HALLS_2 = "music/halls_2.ogg";
public static final String HALLS_TENSE = "music/halls_tense.ogg";
public static final String HALLS_BOSS = "music/halls_boss.ogg";
}

View File

@@ -23,6 +23,7 @@ package com.shatteredpixel.shatteredpixeldungeon.levels;
import com.shatteredpixel.shatteredpixeldungeon.Assets;
import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
import com.shatteredpixel.shatteredpixeldungeon.Statistics;
import com.shatteredpixel.shatteredpixeldungeon.actors.Actor;
import com.shatteredpixel.shatteredpixeldungeon.actors.Char;
import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero;
@@ -73,11 +74,15 @@ public class CavesLevel extends RegularLevel {
@Override
public void playLevelMusic() {
if (Statistics.amuletObtained){
Music.INSTANCE.play(Assets.Music.CAVES_TENSE, true);
} else {
Music.INSTANCE.playTracks(
new String[]{Assets.Music.CAVES_1, Assets.Music.CAVES_2, Assets.Music.CAVES_2},
new float[]{1, 1, 0.5f},
false);
}
}
@Override
protected ArrayList<Room> initRooms() {

View File

@@ -23,6 +23,7 @@ package com.shatteredpixel.shatteredpixeldungeon.levels;
import com.shatteredpixel.shatteredpixeldungeon.Assets;
import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
import com.shatteredpixel.shatteredpixeldungeon.Statistics;
import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.npcs.Imp;
import com.shatteredpixel.shatteredpixeldungeon.levels.painters.CityPainter;
import com.shatteredpixel.shatteredpixeldungeon.levels.painters.Painter;
@@ -61,11 +62,15 @@ public class CityLevel extends RegularLevel {
@Override
public void playLevelMusic() {
if (Statistics.amuletObtained){
Music.INSTANCE.play(Assets.Music.CITY_TENSE, true);
} else {
Music.INSTANCE.playTracks(
new String[]{Assets.Music.CITY_1, Assets.Music.CITY_2, Assets.Music.CITY_2},
new float[]{1, 1, 0.5f},
false);
}
}
@Override
protected int standardRooms(boolean forceMax) {

View File

@@ -23,6 +23,7 @@ package com.shatteredpixel.shatteredpixeldungeon.levels;
import com.shatteredpixel.shatteredpixeldungeon.Assets;
import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
import com.shatteredpixel.shatteredpixeldungeon.Statistics;
import com.shatteredpixel.shatteredpixeldungeon.items.Torch;
import com.shatteredpixel.shatteredpixeldungeon.levels.painters.HallsPainter;
import com.shatteredpixel.shatteredpixeldungeon.levels.painters.Painter;
@@ -70,11 +71,15 @@ public class HallsLevel extends RegularLevel {
@Override
public void playLevelMusic() {
if (Statistics.amuletObtained){
Music.INSTANCE.play(Assets.Music.HALLS_TENSE, true);
} 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);
}
}
@Override
protected ArrayList<Room> initRooms() {

View File

@@ -23,6 +23,7 @@ package com.shatteredpixel.shatteredpixeldungeon.levels;
import com.shatteredpixel.shatteredpixeldungeon.Assets;
import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
import com.shatteredpixel.shatteredpixeldungeon.Statistics;
import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.npcs.Wandmaker;
import com.shatteredpixel.shatteredpixeldungeon.effects.particles.FlameParticle;
import com.shatteredpixel.shatteredpixeldungeon.levels.painters.Painter;
@@ -62,11 +63,15 @@ public class PrisonLevel extends RegularLevel {
@Override
public void playLevelMusic() {
if (Statistics.amuletObtained){
Music.INSTANCE.play(Assets.Music.PRISON_TENSE, true);
} else {
Music.INSTANCE.playTracks(
new String[]{Assets.Music.PRISON_1, Assets.Music.PRISON_2, Assets.Music.PRISON_2},
new float[]{1, 1, 0.5f},
false);
}
}
@Override
protected ArrayList<Room> initRooms() {

View File

@@ -67,11 +67,15 @@ public class SewerLevel extends RegularLevel {
}
public void playLevelMusic(){
if (Statistics.amuletObtained){
Music.INSTANCE.play(Assets.Music.SEWERS_TENSE, true);
} else {
Music.INSTANCE.playTracks(
new String[]{Assets.Music.SEWERS_1, Assets.Music.SEWERS_2, Assets.Music.SEWERS_2},
new float[]{1, 1, 0.5f},
false);
}
}
@Override
protected int standardRooms(boolean forceMax) {

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.