Commit 1acec375 authored by Vitaliy Vashchenko's avatar Vitaliy Vashchenko

Merge branch 'feature-bonus-sounds' into 'V3.7'

Sounds bonus difficulty seek bar

See merge request !754
parents 9f027a91 a8c26e60
...@@ -43,6 +43,8 @@ public class GamePageAssets { ...@@ -43,6 +43,8 @@ public class GamePageAssets {
public static final String STEP_MEDIUM_EASY = SFX_PATH + "step_2_1.mp3"; public static final String STEP_MEDIUM_EASY = SFX_PATH + "step_2_1.mp3";
public static final String STEP_MEDIUM_HARD = SFX_PATH + "step_2_3.mp3"; public static final String STEP_MEDIUM_HARD = SFX_PATH + "step_2_3.mp3";
public static final String STEP_HARD_MEDIUM = SFX_PATH + "step_3_2.mp3"; public static final String STEP_HARD_MEDIUM = SFX_PATH + "step_3_2.mp3";
public static final String STEP_HARD_BONUS = SFX_PATH + "step_3_4.mp3";
public static final String STEP_BONUS_HARD = SFX_PATH + "step_4_3.mp3";
/// SFX /// /// SFX ///
public static final String INTRO = SFX_PATH + "intro.mp3"; public static final String INTRO = SFX_PATH + "intro.mp3";
......
...@@ -130,6 +130,7 @@ public class GamePageGroup extends Group { ...@@ -130,6 +130,7 @@ public class GamePageGroup extends Group {
//Step sounds assets //Step sounds assets
private Sound step_easy_medium, step_medium_easy; private Sound step_easy_medium, step_medium_easy;
private Sound step_medium_hard, step_hard_medium; private Sound step_medium_hard, step_hard_medium;
private Sound step_hard_bonus, step_bonus_hard;
private int lastDragDifficultyStep = 0; private int lastDragDifficultyStep = 0;
...@@ -173,6 +174,9 @@ public class GamePageGroup extends Group { ...@@ -173,6 +174,9 @@ public class GamePageGroup extends Group {
step_medium_hard = getScreen().getCommonGamePageSound(GamePageAssets.STEP_MEDIUM_HARD); step_medium_hard = getScreen().getCommonGamePageSound(GamePageAssets.STEP_MEDIUM_HARD);
step_hard_medium = getScreen().getCommonGamePageSound(GamePageAssets.STEP_HARD_MEDIUM); step_hard_medium = getScreen().getCommonGamePageSound(GamePageAssets.STEP_HARD_MEDIUM);
step_hard_bonus = getScreen().getCommonGamePageSound(GamePageAssets.STEP_HARD_BONUS);
step_bonus_hard = getScreen().getCommonGamePageSound(GamePageAssets.STEP_BONUS_HARD);
} }
/** /**
...@@ -491,7 +495,6 @@ public class GamePageGroup extends Group { ...@@ -491,7 +495,6 @@ public class GamePageGroup extends Group {
return (rankProgress.getCurrXP() - rankProgress.getMinXP()) + Character.toString(PROGRESS_STATUS_SEPARATOR) + (rankProgress.getNextXP() - rankProgress.getMinXP()); return (rankProgress.getCurrXP() - rankProgress.getMinXP()) + Character.toString(PROGRESS_STATUS_SEPARATOR) + (rankProgress.getNextXP() - rankProgress.getMinXP());
} }
//TODO add new sounds from/to bonus difficulty
private void playStepSound(GameDifficulty previous, GameDifficulty current) { private void playStepSound(GameDifficulty previous, GameDifficulty current) {
switch (previous) { switch (previous) {
case EASY: case EASY:
...@@ -507,10 +510,10 @@ public class GamePageGroup extends Group { ...@@ -507,10 +510,10 @@ public class GamePageGroup extends Group {
if(current == GameDifficulty.MEDIUM) if(current == GameDifficulty.MEDIUM)
step_hard_medium.play(); step_hard_medium.play();
else else
step_medium_hard.play(); step_hard_bonus.play();
break; break;
case BONUS: case BONUS:
step_hard_medium.play(); step_bonus_hard.play();
break; break;
case TUTORIAL: case TUTORIAL:
break; break;
......
...@@ -142,6 +142,8 @@ public class GamePageScreen extends AbstractTablexiaScreen<GamePageScreen.GamePa ...@@ -142,6 +142,8 @@ public class GamePageScreen extends AbstractTablexiaScreen<GamePageScreen.GamePa
sounds.add(GamePageAssets.STEP_MEDIUM_EASY); sounds.add(GamePageAssets.STEP_MEDIUM_EASY);
sounds.add(GamePageAssets.STEP_MEDIUM_HARD); sounds.add(GamePageAssets.STEP_MEDIUM_HARD);
sounds.add(GamePageAssets.STEP_HARD_MEDIUM); sounds.add(GamePageAssets.STEP_HARD_MEDIUM);
sounds.add(GamePageAssets.STEP_HARD_BONUS);
sounds.add(GamePageAssets.STEP_BONUS_HARD);
return sounds; return sounds;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment