konsthol/shattered-pixel-dungeon-web-port
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v2.2.0: added a third segment to each region's track

Browse Source
This commit is contained in:
Evan Debenham
2023-09-03 16:31:06 -04:00
parent bae770407f
commit db782a5a90
21 changed files with 41 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
core/src/main/assets/music/caves_3.ogg Normal file
View File

Binary file not shown.

BIN
core/src/main/assets/music/city_3.ogg Normal file
View File

Binary file not shown.

BIN
core/src/main/assets/music/halls_3.ogg Normal file
View File

Binary file not shown.

BIN
core/src/main/assets/music/prison_3.ogg Normal file
View File

Binary file not shown.

BIN
core/src/main/assets/music/sewers_3.ogg Normal file
View File

Binary file not shown.

5
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/Assets.java
View File

@@ -119,28 +119,33 @@ 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_3 = "music/sewers_3.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_3 = "music/prison_3.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_3 = "music/caves_3.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 CAVES_BOSS_FINALE = "music/caves_boss_finale.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_3 = "music/city_3.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 CITY_BOSS_FINALE = "music/city_boss_finale.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_3 = "music/halls_3.ogg";
public static final String HALLS_TENSE = "music/halls_tense.ogg";
public static final String HALLS_BOSS = "music/halls_boss.ogg";
public static final String HALLS_BOSS_FINALE = "music/halls_boss_finale.ogg";

5
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/CavesBossLevel.java
View File

@@ -87,10 +87,7 @@ public class CavesBossLevel extends Level {
} else if (map[14 + 13*width()] == Terrain.CUSTOM_DECO){
Music.INSTANCE.end();
} 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);
Music.INSTANCE.playTracks(CavesLevel.CAVES_TRACK_LIST, CavesLevel.CAVES_TRACK_CHANCES, false);
}
}

10
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/CavesLevel.java
View File

@@ -72,15 +72,17 @@ public class CavesLevel extends RegularLevel {
color2 = 0xb9d661;
}
public static final String[] CAVES_TRACK_LIST
= new String[]{Assets.Music.CAVES_1, Assets.Music.CAVES_2, Assets.Music.CAVES_2,
Assets.Music.CAVES_1, Assets.Music.CAVES_3, Assets.Music.CAVES_3};
public static final float[] CAVES_TRACK_CHANCES = new float[]{1f, 1f, 0.5f, 0.25f, 1f, 0.5f};
@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);
Music.INSTANCE.playTracks(CAVES_TRACK_LIST, CAVES_TRACK_CHANCES, false);
}
}

5
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/CityBossLevel.java
View File

@@ -98,10 +98,7 @@ public class CityBossLevel extends Level {
} else if (map[topDoor] == Terrain.LOCKED_DOOR){
Music.INSTANCE.end();
} 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);
Music.INSTANCE.playTracks(CityLevel.CITY_TRACK_LIST, CityLevel.CITY_TRACK_CHANCES, false);
}
}

10
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/CityLevel.java
View File

@@ -60,15 +60,17 @@ public class CityLevel extends RegularLevel {
color2 = 0xf2f2f2;
}
public static final String[] CITY_TRACK_LIST
= new String[]{Assets.Music.CITY_1, Assets.Music.CITY_2, Assets.Music.CITY_2,
Assets.Music.CITY_1, Assets.Music.CITY_3, Assets.Music.CITY_3};
public static final float[] CITY_TRACK_CHANCES = new float[]{1f, 1f, 0.5f, 0.25f, 1f, 0.5f};
@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);
Music.INSTANCE.playTracks(CITY_TRACK_LIST, CITY_TRACK_CHANCES, false);
}
}

5
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/HallsBossLevel.java
View File

@@ -89,10 +89,7 @@ public class HallsBossLevel extends Level {
} else if (map[exit()] != Terrain.EXIT || Statistics.amuletObtained){
Music.INSTANCE.end();
} 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);
Music.INSTANCE.playTracks(HallsLevel.HALLS_TRACK_LIST, HallsLevel.HALLS_TRACK_CHANCES, false);
}
}

11
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/HallsLevel.java
View File

@@ -69,15 +69,18 @@ public class HallsLevel extends RegularLevel {
color2 = 0xa68521;
}
public static final String[] HALLS_TRACK_LIST
= new String[]{Assets.Music.HALLS_1, Assets.Music.HALLS_2, Assets.Music.HALLS_2,
Assets.Music.HALLS_1, Assets.Music.HALLS_3, Assets.Music.HALLS_3};
public static final float[] HALLS_TRACK_CHANCES = new float[]{1f, 1f, 0.5f, 0.25f, 1f, 0.5f};
@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);
Music.INSTANCE.playTracks(HALLS_TRACK_LIST, HALLS_TRACK_CHANCES, false);
}
}

5
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/PrisonBossLevel.java
View File

@@ -94,10 +94,7 @@ public class PrisonBossLevel extends Level {
if (state == State.START){
Music.INSTANCE.end();
} else if (state == State.WON) {
Music.INSTANCE.playTracks(
new String[]{Assets.Music.PRISON_1, Assets.Music.PRISON_2, Assets.Music.PRISON_2},
new float[]{1, 1, 0.5f},
false);
Music.INSTANCE.playTracks(PrisonLevel.PRISON_TRACK_LIST, PrisonLevel.PRISON_TRACK_CHANCES, false);
} else {
Music.INSTANCE.play(Assets.Music.PRISON_BOSS, true);
}

10
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/PrisonLevel.java
View File

@@ -64,15 +64,17 @@ public class PrisonLevel extends RegularLevel {
color2 = 0x88924c;
}
public static final String[] PRISON_TRACK_LIST
= new String[]{Assets.Music.PRISON_1, Assets.Music.PRISON_2, Assets.Music.PRISON_2,
Assets.Music.PRISON_1, Assets.Music.PRISON_3, Assets.Music.PRISON_3};
public static final float[] PRISON_TRACK_CHANCES = new float[]{1f, 1f, 0.5f, 0.25f, 1f, 0.5f};
@Override
public void playLevelMusic() {
if (Wandmaker.Quest.active() || 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);
Music.INSTANCE.playTracks(PRISON_TRACK_LIST, PRISON_TRACK_CHANCES, false);
}
wandmakerQuestWasActive = Wandmaker.Quest.active();
}

5
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/SewerBossLevel.java
View File

@@ -76,10 +76,7 @@ public class SewerBossLevel extends SewerLevel {
if (gooAlive){
Music.INSTANCE.end();
} 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);
Music.INSTANCE.playTracks(SewerLevel.SEWER_TRACK_LIST, SewerLevel.SEWER_TRACK_CHANCES, false);
}
}

10
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/SewerLevel.java
View File

@@ -66,6 +66,11 @@ public class SewerLevel extends RegularLevel {
color2 = 0x59994a;
}
public static final String[] SEWER_TRACK_LIST
= new String[]{Assets.Music.SEWERS_1, Assets.Music.SEWERS_2, Assets.Music.SEWERS_2,
Assets.Music.SEWERS_1, Assets.Music.SEWERS_3, Assets.Music.SEWERS_3};
public static final float[] SEWER_TRACK_CHANCES = new float[]{1f, 1f, 0.5f, 0.25f, 1f, 0.5f};
public void playLevelMusic(){
if (Ghost.Quest.active() || Statistics.amuletObtained){
if (Statistics.amuletObtained && Dungeon.depth == 1){
@@ -74,10 +79,7 @@ public class SewerLevel extends RegularLevel {
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);
Music.INSTANCE.playTracks(SEWER_TRACK_LIST, SEWER_TRACK_CHANCES, false);
}
}

BIN
ios/assets/music/caves_3.mp3 Normal file
View File

Binary file not shown.

BIN
ios/assets/music/city_3.mp3 Normal file
View File

Binary file not shown.

BIN
ios/assets/music/halls_3.mp3 Normal file
View File

Binary file not shown.

BIN
ios/assets/music/prison_3.mp3 Normal file
View File

Binary file not shown.

BIN
ios/assets/music/sewers_3.mp3 Normal file
View File

Binary file not shown.