From 2c19e3dcb55ae77c544a5ddc4bedc71929363b5c Mon Sep 17 00:00:00 2001
From: = <=>
Date: Fri, 19 Jan 2018 17:41:05 +0100
Subject: [PATCH] implemented all sounds and music
---
.../debug/android/support/v7/appcompat/R.java | 48 +--
.../mergeDebugResources/merger.xml | 6 +-
app/build/intermediates/symbols/debug/R.txt | 371 +++++++++---------
.../main/assets/levelpacks/Icy Mountains.xml | 13 +
.../endlessroll/entities/tools/Magnet.java | 20 +-
.../entities/tools/PowerMushroom.java | 8 +-
.../endlessroll/entities/tools/Spring.java | 6 +-
.../endlessroll/entities/tools/Stasis.java | 28 +-
.../endlessroll/entities/tools/ToolType.java | 43 +-
.../endlessroll/main/DataStorageHandler.java | 21 +-
.../frajul/endlessroll/main/GameActivity.java | 10 +-
.../de/frajul/endlessroll/main/game/Game.java | 37 +-
.../endlessroll/main/game/GameScene.java | 25 +-
.../frajul/endlessroll/main/game/Scene.java | 14 +-
.../endlessroll/main/game/StartScene.java | 5 +-
.../main/game/TestScreenScene.java | 5 +-
.../main/screens/GLTestScreen.java | 2 +-
.../endlessroll/main/screens/GameScreen.java | 3 +-
.../main/screens/LevelsScreen.java | 2 +-
.../main/screens/PlayerShapeShopScreen.java | 2 +-
.../main/screens/SettingsScreen.java | 18 +-
.../endlessroll/main/screens/StartScreen.java | 2 +-
.../main/screens/StartScreenRendering.java | 4 +-
.../main/screens/TestScreenRendering.java | 4 +-
.../main/screens/ToolShopScreen.java | 2 +-
.../main/screens/WorldsScreen.java | 2 +-
.../de/frajul/endlessroll/sounds/Music.java | 81 ++--
.../de/frajul/endlessroll/sounds/Sound.java | 55 +++
.../endlessroll/sounds/SoundManager.java | 135 +++++--
.../endlessroll/sounds/SoundStream.java | 37 ++
.../frajul/endlessroll/views/Countdown.java | 21 +-
.../endlessroll/views/GameOverMessage.java | 3 +
.../frajul/endlessroll/views/GoalMessage.java | 1 +
.../frajul/endlessroll/views/ViewManager.java | 2 +-
app/src/main/res/drawable/guis_music_off.png | Bin 0 -> 17350 bytes
app/src/main/res/drawable/guis_music_on.png | Bin 0 -> 6366 bytes
app/src/main/res/drawable/guis_sound_on.png | Bin 2855 -> 2762 bytes
.../main/res/drawable/xml_selector_music.xml | 10 +
app/src/main/res/layout/settings.xml | 19 +-
app/src/main/res/raw/ramp.wav | Bin 41032 -> 0 bytes
app/src/main/res/raw/sound_collect_energy.wav | Bin 0 -> 183692 bytes
app/src/main/res/raw/sound_collect_star.wav | Bin 0 -> 187228 bytes
app/src/main/res/raw/sound_countdown.wav | Bin 0 -> 223974 bytes
app/src/main/res/raw/sound_die.wav | Bin 0 -> 530908 bytes
app/src/main/res/raw/sound_explosion.wav | Bin 0 -> 182176 bytes
app/src/main/res/raw/sound_firework.wav | Bin 0 -> 586072 bytes
app/src/main/res/raw/sound_goal.wav | Bin 0 -> 531104 bytes
app/src/main/res/raw/sound_magnet.wav | Bin 0 -> 1973520 bytes
app/src/main/res/raw/sound_mushroom.wav | Bin 0 -> 197144 bytes
app/src/main/res/raw/sound_place_tool.wav | Bin 0 -> 25094 bytes
app/src/main/res/raw/sound_spring.wav | Bin 0 -> 113196 bytes
app/src/main/res/raw/sound_stasis.wav | Bin 0 -> 201816 bytes
52 files changed, 686 insertions(+), 379 deletions(-)
create mode 100644 app/src/main/java/de/frajul/endlessroll/sounds/Sound.java
create mode 100644 app/src/main/java/de/frajul/endlessroll/sounds/SoundStream.java
create mode 100644 app/src/main/res/drawable/guis_music_off.png
create mode 100644 app/src/main/res/drawable/guis_music_on.png
create mode 100644 app/src/main/res/drawable/xml_selector_music.xml
delete mode 100644 app/src/main/res/raw/ramp.wav
create mode 100644 app/src/main/res/raw/sound_collect_energy.wav
create mode 100644 app/src/main/res/raw/sound_collect_star.wav
create mode 100644 app/src/main/res/raw/sound_countdown.wav
create mode 100644 app/src/main/res/raw/sound_die.wav
create mode 100644 app/src/main/res/raw/sound_explosion.wav
create mode 100644 app/src/main/res/raw/sound_firework.wav
create mode 100644 app/src/main/res/raw/sound_goal.wav
create mode 100644 app/src/main/res/raw/sound_magnet.wav
create mode 100644 app/src/main/res/raw/sound_mushroom.wav
create mode 100644 app/src/main/res/raw/sound_place_tool.wav
create mode 100644 app/src/main/res/raw/sound_spring.wav
create mode 100644 app/src/main/res/raw/sound_stasis.wav
diff --git a/app/build/generated/source/r/debug/android/support/v7/appcompat/R.java b/app/build/generated/source/r/debug/android/support/v7/appcompat/R.java
index eb879bb..747c59c 100644
--- a/app/build/generated/source/r/debug/android/support/v7/appcompat/R.java
+++ b/app/build/generated/source/r/debug/android/support/v7/appcompat/R.java
@@ -456,7 +456,7 @@ public final class R {
public static final int abc_textfield_search_activated_mtrl_alpha = 0x7f070042;
public static final int abc_textfield_search_default_mtrl_alpha = 0x7f070043;
public static final int abc_textfield_search_material = 0x7f070044;
- public static final int notification_template_icon_bg = 0x7f070063;
+ public static final int notification_template_icon_bg = 0x7f070065;
}
public static final class id {
public static final int action0 = 0x7f080000;
@@ -529,29 +529,29 @@ public final class R {
public static final int search_src_text = 0x7f080071;
public static final int search_voice_btn = 0x7f080072;
public static final int select_dialog_listview = 0x7f080073;
- public static final int shortcut = 0x7f080083;
- public static final int showCustom = 0x7f080088;
- public static final int showHome = 0x7f080089;
- public static final int showTitle = 0x7f08008a;
- public static final int spacer = 0x7f08008b;
- public static final int split_action_bar = 0x7f08008c;
- public static final int src_atop = 0x7f08008d;
- public static final int src_in = 0x7f08008e;
- public static final int src_over = 0x7f08008f;
- public static final int status_bar_latest_event_content = 0x7f080096;
- public static final int submit_area = 0x7f080097;
- public static final int tabMode = 0x7f080098;
- public static final int text = 0x7f08009a;
- public static final int text2 = 0x7f08009b;
- public static final int textSpacerNoButtons = 0x7f08009c;
- public static final int time = 0x7f08009d;
- public static final int title = 0x7f08009e;
- public static final int title_template = 0x7f08009f;
- public static final int topPanel = 0x7f0800bc;
- public static final int up = 0x7f0800ce;
- public static final int useLogo = 0x7f0800cf;
- public static final int withText = 0x7f0800d0;
- public static final int wrap_content = 0x7f0800d9;
+ public static final int shortcut = 0x7f080084;
+ public static final int showCustom = 0x7f080089;
+ public static final int showHome = 0x7f08008a;
+ public static final int showTitle = 0x7f08008b;
+ public static final int spacer = 0x7f08008c;
+ public static final int split_action_bar = 0x7f08008d;
+ public static final int src_atop = 0x7f08008e;
+ public static final int src_in = 0x7f08008f;
+ public static final int src_over = 0x7f080090;
+ public static final int status_bar_latest_event_content = 0x7f080097;
+ public static final int submit_area = 0x7f080098;
+ public static final int tabMode = 0x7f080099;
+ public static final int text = 0x7f08009b;
+ public static final int text2 = 0x7f08009c;
+ public static final int textSpacerNoButtons = 0x7f08009d;
+ public static final int time = 0x7f08009e;
+ public static final int title = 0x7f08009f;
+ public static final int title_template = 0x7f0800a0;
+ public static final int topPanel = 0x7f0800bd;
+ public static final int up = 0x7f0800cf;
+ public static final int useLogo = 0x7f0800d0;
+ public static final int withText = 0x7f0800d1;
+ public static final int wrap_content = 0x7f0800da;
}
public static final class integer {
public static final int abc_config_activityDefaultDur = 0x7f090000;
diff --git a/app/build/intermediates/incremental/mergeDebugResources/merger.xml b/app/build/intermediates/incremental/mergeDebugResources/merger.xml
index a372133..bd81c96 100644
--- a/app/build/intermediates/incremental/mergeDebugResources/merger.xml
+++ b/app/build/intermediates/incremental/mergeDebugResources/merger.xml
@@ -1346,13 +1346,13 @@
- ?android:attr/actionMenuTextAppearance
- @drawable/abc_control_background_material
- "Điều hướng về trang chủ""%1$s, %2$s""%1$s, %2$s, %3$s""Điều hướng lên trên""Thêm tùy chọn""Xong""Xem tất cả""Chọn một ứng dụng""TẮT""BẬT""Tìm kiếm…""Xóa truy vấn""Tìm kiếm truy vấn""Tìm kiếm""Gửi truy vấn""Tìm kiếm bằng giọng nói""Chia sẻ với""Chia sẻ với %s""Thu gọn""999+"3truetrue4192dip5falsefalse- 60%
- 90%
- 50%
- 70%
- 45%
- 72%
192dip5256dip"转到主屏幕""%1$s：%2$s""%1$s - %2$s：%3$s""转到上一层级""更多选项""完成""查看全部""选择应用""关闭""开启""搜索…""清除查询""搜索查询""搜索""提交查询""语音搜索""分享方式""通过%s分享""收起""999+""瀏覽主頁""%1$s：%2$s""%1$s (%2$s)：%3$s""向上瀏覽""更多選項""完成""顯示全部""選擇應用程式""關閉""開啟""搜尋…""清除查詢""搜尋查詢""搜尋""提交查詢""語音搜尋""分享對象""與「%s」分享""收合""999 +""瀏覽首頁""%1$s：%2$s""%1$s - %2$s：%3$s""向上瀏覽""更多選項""完成""查看全部""選擇應用程式""關閉""開啟""搜尋…""清除查詢""搜尋查詢""搜尋""提交查詢""語音搜尋""選擇分享對象""與「%s」分享""收合""999+""Zulazulela ekhaya""%1$s, %2$s""%1$s, %2$s, %3$s""Zulazulela phezulu""Izinketho eziningi""Kwenziwe""Buka konke""Khetha uhlelo lokusebenza""VALIWE""VULIWE""Iyasesha...""Sula inkinga""Umbuzo wosesho""Sesha""Hambisa umbuzo""Ukusesha ngezwi""Yabelana no-""Yabelana no-%s""Goqa""999+"
+ "Điều hướng về trang chủ""%1$s, %2$s""%1$s, %2$s, %3$s""Điều hướng lên trên""Thêm tùy chọn""Xong""Xem tất cả""Chọn một ứng dụng""TẮT""BẬT""Tìm kiếm…""Xóa truy vấn""Tìm kiếm truy vấn""Tìm kiếm""Gửi truy vấn""Tìm kiếm bằng giọng nói""Chia sẻ với""Chia sẻ với %s""Thu gọn""999+"3truetrue4192dip5falsefalse- 60%
- 90%
- 50%
- 70%
- 45%
- 72%
192dip5256dip"转到主屏幕""%1$s：%2$s""%1$s - %2$s：%3$s""转到上一层级""更多选项""完成""查看全部""选择应用""关闭""开启""搜索…""清除查询""搜索查询""搜索""提交查询""语音搜索""分享方式""通过%s分享""收起""999+""瀏覽主頁""%1$s：%2$s""%1$s (%2$s)：%3$s""向上瀏覽""更多選項""完成""顯示全部""選擇應用程式""關閉""開啟""搜尋…""清除查詢""搜尋查詢""搜尋""提交查詢""語音搜尋""分享對象""與「%s」分享""收合""999 +""瀏覽首頁""%1$s：%2$s""%1$s - %2$s：%3$s""向上瀏覽""更多選項""完成""查看全部""選擇應用程式""關閉""開啟""搜尋…""清除查詢""搜尋查詢""搜尋""提交查詢""語音搜尋""選擇分享對象""與「%s」分享""收合""999+""Zulazulela ekhaya""%1$s, %2$s""%1$s, %2$s, %3$s""Zulazulela phezulu""Izinketho eziningi""Kwenziwe""Buka konke""Khetha uhlelo lokusebenza""VALIWE""VULIWE""Iyasesha...""Sula inkinga""Umbuzo wosesho""Sesha""Hambisa umbuzo""Ukusesha ngezwi""Yabelana no-""Yabelana no-%s""Goqa""999+"
- World zer0
- Grasslands
- Icy Mountains
- Testcave
- Mysterious fireworld
- #ffda45#f11e6f#39be27#ffb405#daf10d#db911c0f#dbfff200#e5dc1522#db41e42b#db494b49#715f5f#60715f#db41e42b#b3d700#f0f41e02#f0f28117#f0d7b106#9d000000#5b000000#3d000000170dp170dp70dp60dpEndless RollClick me!I\'m a text!997.585.1%0.0m%.1fm0.0m/s%.1fm/sFps: 00Fps: %d3Task completedLevel UpGAME OVERLEVEL FINISHEDToolsTo menuTry againRestartNext levelRestart level %dNext level: %dLOADING...ContinueRestartExitPlayUnlock all levels (Yes! It\'s magic!)Gain 90 ep (Nope! No magic at all!)Test GL Stuff!!!Time (Lv12)Level: 24Level: %dReset progressToolshopRamp unlockedGreat world21/15%s%s unlocked!New slot unlockedNew shape unlockedLevel: %dBuyUpgradeBallClockHypnoPacmanSmileyWheelSun\?\?\?Keep calm and roll onTick tack!Hypnotizes you for more funPACMAN!Don\'t worry, roll happy!A nice car without the... carShine bright like the sunA new shape for more funEmpty taskCollect %d stars (%d/%d)Collect %d energy (%d/%d)Collect %d starsCollect %d energyFinish the %d. world%d/%dYou will unlock this mysterious tool at level %dRoll up the ramp to gain heightShoots you in the airYou are pulled towards it. Just try it out!Blow up all obstacles near the bombThis will give you super-powers for a few secondsFreezes a certain area which leads to longer in-air time\?\?\?RampSpringMagnetBombMushroomStasisLevel: %d%1$s (Lv%2$d)NoneTimeRadiusForceMax.This is a multiline placeholder\nfor all the tutorials I made!!!\nAwesome! - Isn\'t it?Welcome to Endless Roll!\nHave fun!Click anywhere on the screen to place the rampTry to place your ramp in front of the gapGreat job!\nNow place it in front of the obstacleYou can even set a Tool in mid-air.\nTime carefully!Now try again!Congratulations! You have leveled up!\nNow go to the toolshopFor this level you will need two tools equippedTo select a tool just click on itWell done! Now you can start the next levelFinish the first world!YesThis is a beautiful ConfirmDialog placeholder!Do you really want to reset ALL your progress?NoDo you really want to exit the game?Do you really want to finish the first world?\nYour old progress will be DELETED!Go to the next world:\n%sDrück mich!Ich bin ein Text!ZIEL ERREICHTZum MenüErneut versuchenNeustartNächstes LevelNeustart: Level %dNächstes Level: %dGehe zur nächsten Welt:\n%sLÄDT...WeiterNeustartBeendenSpielenErste Welt abschließen!Zeit (Lv12)Fortschritt zurücksetzenRampe freigeschaltetHammer Welt!%s freigeschaltet!KaufenUpgradeBallUhrHypnosePacmanSmileyReifenSonneLevel: %dLass dich hypnotisieren!Ein krasses Auto ohne ... AutoLass dir die Sonne ins Gesicht scheinenSammle %d Sterne (%d/%d)Sammle %d Energie (%d/%d)Sammle %d SterneSammle %d EnergieBeende die %d. WeltEinfach rollen!Katapultiert dich in die LuftDu wirst von ihm angezogen. Das ist fast schon Magie!Jage Hindernisse in die LuftGibt dir für ein paar Sekunden Superkräfte!Friert die Luft ein, wodurch du länger fliegstRampeFederMagnetBombePilzStaseNichtsZeitRadiusKraftJaNeinDer allerschönste Platzhalter für einen ConfirmDialog!Willst du wirklich das Spiel beenden?Willst du wirklich deinen gesamten Fortschritt zurücksetzen?Willst du wirklich die erste Welt abschließen? Dadurch wird dein alter Fortschritt GELÖSCHT!Das ist ein Platzhalter über mehrere Zeilen - Extra für Tutorials! Das haut dich um!Willkommen bei Endless Roll! Viel Spaß!Klicke irgendwo auf den Bildschirm, um dort die Rampe zu setzenSuper! Jetzt setze sie vor das HindernisVersuch es erneut!Sehr gut! Jetzt schaffst du bestimmt das nächste LevelAufgabe abgeschlossenToolsToolshopNeuer Slot freigeschaltetNeues Aussehen freigeschaltetEin neues Aussehen und noch viel mehr SpaßLeere AufgabeErreiche Level %d, um dieses Tool freizuschaltenDu kannst Tools auch mitten in der Luft setzen. Achte auf das richtige Timing!Glückwunsch! Du bist ein Level aufgestiegen! Jetzt gehe in den ToolshopFür dieses Level müssen zwei Tools ausgerüstet seinUm ein Tool auszuwählen, klicke einfach daraufSetzte die Rampe vor die Lücke
\ No newline at end of file
+ Drück mich!Ich bin ein Text!ZIEL ERREICHTZum MenüErneut versuchenNeustartNächstes LevelNeustart: Level %dNächstes Level: %dGehe zur nächsten Welt:\n%sLÄDT...WeiterNeustartBeendenSpielenErste Welt abschließen!Zeit (Lv12)Fortschritt zurücksetzenRampe freigeschaltetHammer Welt!%s freigeschaltet!KaufenUpgradeBallUhrHypnosePacmanSmileyReifenSonneLevel: %dLass dich hypnotisieren!Ein krasses Auto ohne ... AutoLass dir die Sonne ins Gesicht scheinenSammle %d Sterne (%d/%d)Sammle %d Energie (%d/%d)Sammle %d SterneSammle %d EnergieBeende die %d. WeltEinfach rollen!Katapultiert dich in die LuftDu wirst von ihm angezogen. Das ist fast schon Magie!Jage Hindernisse in die LuftGibt dir für ein paar Sekunden Superkräfte!Friert die Luft ein, wodurch du länger fliegstRampeFederMagnetBombePilzStaseNichtsZeitRadiusKraftJaNeinDer allerschönste Platzhalter für einen ConfirmDialog!Willst du wirklich das Spiel beenden?Willst du wirklich deinen gesamten Fortschritt zurücksetzen?Willst du wirklich die erste Welt abschließen? Dadurch wird dein alter Fortschritt GELÖSCHT!Das ist ein Platzhalter über mehrere Zeilen - Extra für Tutorials! Das haut dich um!Willkommen bei Endless Roll! Viel Spaß!Klicke irgendwo auf den Bildschirm, um dort die Rampe zu setzenSuper! Jetzt setze sie vor das HindernisVersuch es erneut!Sehr gut! Jetzt schaffst du bestimmt das nächste LevelAufgabe abgeschlossenToolsToolshopNeuer Slot freigeschaltetNeues Aussehen freigeschaltetEin neues Aussehen und noch viel mehr SpaßLeere AufgabeErreiche Level %d, um dieses Tool freizuschaltenDu kannst Tools auch mitten in der Luft setzen. Achte auf das richtige Timing!Glückwunsch! Du bist ein Level aufgestiegen! Jetzt gehe in den ToolshopFür dieses Level müssen zwei Tools ausgerüstet seinUm ein Tool auszuwählen, klicke einfach daraufSetzte die Rampe vor die Lücke
\ No newline at end of file
diff --git a/app/build/intermediates/symbols/debug/R.txt b/app/build/intermediates/symbols/debug/R.txt
index 1067ef3..374dba4 100644
--- a/app/build/intermediates/symbols/debug/R.txt
+++ b/app/build/intermediates/symbols/debug/R.txt
@@ -490,81 +490,84 @@ int drawable guis_clock 0x7f070052
int drawable guis_goal 0x7f070053
int drawable guis_lock_locked 0x7f070054
int drawable guis_magnet_field 0x7f070055
-int drawable guis_pausebutton 0x7f070056
-int drawable guis_playerarrow 0x7f070057
-int drawable guis_radius 0x7f070058
-int drawable guis_settings_disabled 0x7f070059
-int drawable guis_settings_enabled 0x7f07005a
-int drawable guis_shape_shop_disabled 0x7f07005b
-int drawable guis_shape_shop_enabled 0x7f07005c
-int drawable guis_sound_off 0x7f07005d
-int drawable guis_sound_on 0x7f07005e
-int drawable guis_splitter 0x7f07005f
-int drawable guis_tick 0x7f070060
-int drawable guis_tool_shop_disabled 0x7f070061
-int drawable guis_tool_shop_enabled 0x7f070062
-int drawable notification_template_icon_bg 0x7f070063
-int drawable obstacles_grass 0x7f070064
-int drawable obstacles_snow 0x7f070065
-int drawable playershapes_ball 0x7f070066
-int drawable playershapes_clock 0x7f070067
-int drawable playershapes_hypno_spiral 0x7f070068
-int drawable playershapes_locked 0x7f070069
-int drawable playershapes_pacman 0x7f07006a
-int drawable playershapes_smiley 0x7f07006b
-int drawable playershapes_sun 0x7f07006c
-int drawable playershapes_wheel 0x7f07006d
-int drawable terrain_c_grass 0x7f07006e
-int drawable terrain_c_ice 0x7f07006f
-int drawable terrain_t_grass 0x7f070070
-int drawable terrain_t_ice 0x7f070071
-int drawable tools_bomb 0x7f070072
-int drawable tools_bomb_button 0x7f070073
-int drawable tools_button_empty 0x7f070074
-int drawable tools_button_locked 0x7f070075
-int drawable tools_button_unlocked 0x7f070076
-int drawable tools_magnet 0x7f070077
-int drawable tools_magnet_button 0x7f070078
-int drawable tools_power_mushroom 0x7f070079
-int drawable tools_power_mushroom_button 0x7f07007a
-int drawable tools_ramp 0x7f07007b
-int drawable tools_ramp_button 0x7f07007c
-int drawable tools_spring 0x7f07007d
-int drawable tools_spring_button 0x7f07007e
-int drawable tools_stasis 0x7f07007f
-int drawable tools_stasis_button 0x7f070080
-int drawable tutorial_place_ramp_air_1 0x7f070081
-int drawable tutorial_place_ramp_air_2 0x7f070082
-int drawable tutorial_place_ramp_gap 0x7f070083
-int drawable tutorial_place_ramp_obstacle 0x7f070084
-int drawable tutorial_place_tools 0x7f070085
-int drawable tutorial_switch_tools 0x7f070086
-int drawable tutorial_to_toolshop 0x7f070087
-int drawable tutorial_toolshop_all_tools 0x7f070088
-int drawable tutorial_toolshop_equip_spring 0x7f070089
-int drawable tutorial_toolshop_inspector 0x7f07008a
-int drawable tutorial_toolshop_select_buy_spring 0x7f07008b
-int drawable tutorial_toolshop_toolbar 0x7f07008c
-int drawable world_previews_grasslands 0x7f07008d
-int drawable world_previews_icymountains 0x7f07008e
-int drawable xml_background_bountymessage 0x7f07008f
-int drawable xml_background_dialog_button 0x7f070090
-int drawable xml_background_exit_confirm_dialog 0x7f070091
-int drawable xml_background_game_over_message_button 0x7f070092
-int drawable xml_background_levelbutton 0x7f070093
-int drawable xml_background_toolslot 0x7f070094
-int drawable xml_background_toolupgrade 0x7f070095
-int drawable xml_background_tutorialimageview 0x7f070096
-int drawable xml_background_tutorialtextview 0x7f070097
-int drawable xml_background_worldbutton 0x7f070098
-int drawable xml_layers_toolprogressbar 0x7f070099
-int drawable xml_selector_gamebutton 0x7f07009a
-int drawable xml_selector_pricebutton 0x7f07009b
-int drawable xml_selector_settingsbutton 0x7f07009c
-int drawable xml_selector_shapeshopbutton 0x7f07009d
-int drawable xml_selector_sound 0x7f07009e
-int drawable xml_selector_toolshopbutton 0x7f07009f
-int drawable xml_shape_inspector_checkbox 0x7f0700a0
+int drawable guis_music_off 0x7f070056
+int drawable guis_music_on 0x7f070057
+int drawable guis_pausebutton 0x7f070058
+int drawable guis_playerarrow 0x7f070059
+int drawable guis_radius 0x7f07005a
+int drawable guis_settings_disabled 0x7f07005b
+int drawable guis_settings_enabled 0x7f07005c
+int drawable guis_shape_shop_disabled 0x7f07005d
+int drawable guis_shape_shop_enabled 0x7f07005e
+int drawable guis_sound_off 0x7f07005f
+int drawable guis_sound_on 0x7f070060
+int drawable guis_splitter 0x7f070061
+int drawable guis_tick 0x7f070062
+int drawable guis_tool_shop_disabled 0x7f070063
+int drawable guis_tool_shop_enabled 0x7f070064
+int drawable notification_template_icon_bg 0x7f070065
+int drawable obstacles_grass 0x7f070066
+int drawable obstacles_snow 0x7f070067
+int drawable playershapes_ball 0x7f070068
+int drawable playershapes_clock 0x7f070069
+int drawable playershapes_hypno_spiral 0x7f07006a
+int drawable playershapes_locked 0x7f07006b
+int drawable playershapes_pacman 0x7f07006c
+int drawable playershapes_smiley 0x7f07006d
+int drawable playershapes_sun 0x7f07006e
+int drawable playershapes_wheel 0x7f07006f
+int drawable terrain_c_grass 0x7f070070
+int drawable terrain_c_ice 0x7f070071
+int drawable terrain_t_grass 0x7f070072
+int drawable terrain_t_ice 0x7f070073
+int drawable tools_bomb 0x7f070074
+int drawable tools_bomb_button 0x7f070075
+int drawable tools_button_empty 0x7f070076
+int drawable tools_button_locked 0x7f070077
+int drawable tools_button_unlocked 0x7f070078
+int drawable tools_magnet 0x7f070079
+int drawable tools_magnet_button 0x7f07007a
+int drawable tools_power_mushroom 0x7f07007b
+int drawable tools_power_mushroom_button 0x7f07007c
+int drawable tools_ramp 0x7f07007d
+int drawable tools_ramp_button 0x7f07007e
+int drawable tools_spring 0x7f07007f
+int drawable tools_spring_button 0x7f070080
+int drawable tools_stasis 0x7f070081
+int drawable tools_stasis_button 0x7f070082
+int drawable tutorial_place_ramp_air_1 0x7f070083
+int drawable tutorial_place_ramp_air_2 0x7f070084
+int drawable tutorial_place_ramp_gap 0x7f070085
+int drawable tutorial_place_ramp_obstacle 0x7f070086
+int drawable tutorial_place_tools 0x7f070087
+int drawable tutorial_switch_tools 0x7f070088
+int drawable tutorial_to_toolshop 0x7f070089
+int drawable tutorial_toolshop_all_tools 0x7f07008a
+int drawable tutorial_toolshop_equip_spring 0x7f07008b
+int drawable tutorial_toolshop_inspector 0x7f07008c
+int drawable tutorial_toolshop_select_buy_spring 0x7f07008d
+int drawable tutorial_toolshop_toolbar 0x7f07008e
+int drawable world_previews_grasslands 0x7f07008f
+int drawable world_previews_icymountains 0x7f070090
+int drawable xml_background_bountymessage 0x7f070091
+int drawable xml_background_dialog_button 0x7f070092
+int drawable xml_background_exit_confirm_dialog 0x7f070093
+int drawable xml_background_game_over_message_button 0x7f070094
+int drawable xml_background_levelbutton 0x7f070095
+int drawable xml_background_toolslot 0x7f070096
+int drawable xml_background_toolupgrade 0x7f070097
+int drawable xml_background_tutorialimageview 0x7f070098
+int drawable xml_background_tutorialtextview 0x7f070099
+int drawable xml_background_worldbutton 0x7f07009a
+int drawable xml_layers_toolprogressbar 0x7f07009b
+int drawable xml_selector_gamebutton 0x7f07009c
+int drawable xml_selector_music 0x7f07009d
+int drawable xml_selector_pricebutton 0x7f07009e
+int drawable xml_selector_settingsbutton 0x7f07009f
+int drawable xml_selector_shapeshopbutton 0x7f0700a0
+int drawable xml_selector_sound 0x7f0700a1
+int drawable xml_selector_toolshopbutton 0x7f0700a2
+int drawable xml_shape_inspector_checkbox 0x7f0700a3
int id action0 0x7f080000
int id action_bar 0x7f080001
int id action_bar_activity_content 0x7f080002
@@ -681,108 +684,109 @@ int id search_plate 0x7f080070
int id search_src_text 0x7f080071
int id search_voice_btn 0x7f080072
int id select_dialog_listview 0x7f080073
-int id settings_reset 0x7f080074
-int id settings_soundtoggle 0x7f080075
-int id settings_topbar 0x7f080076
-int id shape_button_button 0x7f080077
-int id shape_button_textview 0x7f080078
-int id shape_inspector_check_box 0x7f080079
-int id shape_inspector_check_box_image 0x7f08007a
-int id shape_inspector_check_box_text 0x7f08007b
-int id shape_inspector_description 0x7f08007c
-int id shape_inspector_imageview 0x7f08007d
-int id shape_inspector_title 0x7f08007e
-int id shape_shop_bottomRow 0x7f08007f
-int id shape_shop_shape_inspector 0x7f080080
-int id shape_shop_topRow 0x7f080081
-int id shape_shop_topbar 0x7f080082
-int id shortcut 0x7f080083
-int id shortmenu_continue 0x7f080084
-int id shortmenu_exit 0x7f080085
-int id shortmenu_restart 0x7f080086
-int id shortmenu_topbar 0x7f080087
-int id showCustom 0x7f080088
-int id showHome 0x7f080089
-int id showTitle 0x7f08008a
-int id spacer 0x7f08008b
-int id split_action_bar 0x7f08008c
-int id src_atop 0x7f08008d
-int id src_in 0x7f08008e
-int id src_over 0x7f08008f
-int id startscreen_finish_world_1 0x7f080090
-int id startscreen_gain_90_ep 0x7f080091
-int id startscreen_play 0x7f080092
-int id startscreen_settings 0x7f080093
-int id startscreen_to_gl_test_screen 0x7f080094
-int id startscreen_unlock_levels 0x7f080095
-int id status_bar_latest_event_content 0x7f080096
-int id submit_area 0x7f080097
-int id tabMode 0x7f080098
-int id task_completed_unlock_list 0x7f080099
-int id text 0x7f08009a
-int id text2 0x7f08009b
-int id textSpacerNoButtons 0x7f08009c
-int id time 0x7f08009d
-int id title 0x7f08009e
-int id title_template 0x7f08009f
-int id tool_button_animation_layer 0x7f0800a0
-int id tool_button_background_layer 0x7f0800a1
-int id tool_button_progress_bar 0x7f0800a2
-int id tool_inspector_description 0x7f0800a3
-int id tool_inspector_imageview 0x7f0800a4
-int id tool_inspector_level_view 0x7f0800a5
-int id tool_inspector_pricebutton 0x7f0800a6
-int id tool_inspector_title 0x7f0800a7
-int id tool_upgrade_imageview 0x7f0800a8
-int id tool_upgrade_pricebutton 0x7f0800a9
-int id tool_upgrade_title 0x7f0800aa
-int id tool_upgrade_value_new 0x7f0800ab
-int id tool_upgrade_value_old 0x7f0800ac
-int id toolbutton_1 0x7f0800ad
-int id toolbutton_2 0x7f0800ae
-int id toolbutton_3 0x7f0800af
-int id toolbutton_4 0x7f0800b0
-int id toolofferslot_slot 0x7f0800b1
-int id toolofferslot_title 0x7f0800b2
-int id toolshop_slot1 0x7f0800b3
-int id toolshop_slot2 0x7f0800b4
-int id toolshop_slot3 0x7f0800b5
-int id toolshop_slot4 0x7f0800b6
-int id toolshop_tool_offer_bottom_row 0x7f0800b7
-int id toolshop_tool_offer_top_row 0x7f0800b8
-int id toolshop_toolinspector 0x7f0800b9
-int id toolshop_topbar 0x7f0800ba
-int id toolslot_image 0x7f0800bb
-int id topPanel 0x7f0800bc
-int id topbar_energycount 0x7f0800bd
-int id topbar_energycount_decrease 0x7f0800be
-int id topbar_energyview 0x7f0800bf
-int id topbar_layout 0x7f0800c0
-int id topbar_leveldisplay 0x7f0800c1
-int id topbar_levellayout 0x7f0800c2
-int id topbar_levelprogress 0x7f0800c3
-int id topbar_settings 0x7f0800c4
-int id topbar_shapeshop 0x7f0800c5
-int id topbar_starcount 0x7f0800c6
-int id topbar_starcount_decrease 0x7f0800c7
-int id topbar_starview 0x7f0800c8
-int id topbar_toolshop 0x7f0800c9
-int id tutorial_image_view 0x7f0800ca
-int id tutorial_text_view 0x7f0800cb
-int id unlockmessage_message 0x7f0800cc
-int id unlockmessage_toolimage 0x7f0800cd
-int id up 0x7f0800ce
-int id useLogo 0x7f0800cf
-int id withText 0x7f0800d0
-int id worldbutton_energycount 0x7f0800d1
-int id worldbutton_levelcount 0x7f0800d2
-int id worldbutton_lock 0x7f0800d3
-int id worldbutton_preview 0x7f0800d4
-int id worldbutton_starcount 0x7f0800d5
-int id worldbutton_title 0x7f0800d6
-int id worlds_layout 0x7f0800d7
-int id worlds_topbar 0x7f0800d8
-int id wrap_content 0x7f0800d9
+int id settings_musictoggle 0x7f080074
+int id settings_reset 0x7f080075
+int id settings_soundtoggle 0x7f080076
+int id settings_topbar 0x7f080077
+int id shape_button_button 0x7f080078
+int id shape_button_textview 0x7f080079
+int id shape_inspector_check_box 0x7f08007a
+int id shape_inspector_check_box_image 0x7f08007b
+int id shape_inspector_check_box_text 0x7f08007c
+int id shape_inspector_description 0x7f08007d
+int id shape_inspector_imageview 0x7f08007e
+int id shape_inspector_title 0x7f08007f
+int id shape_shop_bottomRow 0x7f080080
+int id shape_shop_shape_inspector 0x7f080081
+int id shape_shop_topRow 0x7f080082
+int id shape_shop_topbar 0x7f080083
+int id shortcut 0x7f080084
+int id shortmenu_continue 0x7f080085
+int id shortmenu_exit 0x7f080086
+int id shortmenu_restart 0x7f080087
+int id shortmenu_topbar 0x7f080088
+int id showCustom 0x7f080089
+int id showHome 0x7f08008a
+int id showTitle 0x7f08008b
+int id spacer 0x7f08008c
+int id split_action_bar 0x7f08008d
+int id src_atop 0x7f08008e
+int id src_in 0x7f08008f
+int id src_over 0x7f080090
+int id startscreen_finish_world_1 0x7f080091
+int id startscreen_gain_90_ep 0x7f080092
+int id startscreen_play 0x7f080093
+int id startscreen_settings 0x7f080094
+int id startscreen_to_gl_test_screen 0x7f080095
+int id startscreen_unlock_levels 0x7f080096
+int id status_bar_latest_event_content 0x7f080097
+int id submit_area 0x7f080098
+int id tabMode 0x7f080099
+int id task_completed_unlock_list 0x7f08009a
+int id text 0x7f08009b
+int id text2 0x7f08009c
+int id textSpacerNoButtons 0x7f08009d
+int id time 0x7f08009e
+int id title 0x7f08009f
+int id title_template 0x7f0800a0
+int id tool_button_animation_layer 0x7f0800a1
+int id tool_button_background_layer 0x7f0800a2
+int id tool_button_progress_bar 0x7f0800a3
+int id tool_inspector_description 0x7f0800a4
+int id tool_inspector_imageview 0x7f0800a5
+int id tool_inspector_level_view 0x7f0800a6
+int id tool_inspector_pricebutton 0x7f0800a7
+int id tool_inspector_title 0x7f0800a8
+int id tool_upgrade_imageview 0x7f0800a9
+int id tool_upgrade_pricebutton 0x7f0800aa
+int id tool_upgrade_title 0x7f0800ab
+int id tool_upgrade_value_new 0x7f0800ac
+int id tool_upgrade_value_old 0x7f0800ad
+int id toolbutton_1 0x7f0800ae
+int id toolbutton_2 0x7f0800af
+int id toolbutton_3 0x7f0800b0
+int id toolbutton_4 0x7f0800b1
+int id toolofferslot_slot 0x7f0800b2
+int id toolofferslot_title 0x7f0800b3
+int id toolshop_slot1 0x7f0800b4
+int id toolshop_slot2 0x7f0800b5
+int id toolshop_slot3 0x7f0800b6
+int id toolshop_slot4 0x7f0800b7
+int id toolshop_tool_offer_bottom_row 0x7f0800b8
+int id toolshop_tool_offer_top_row 0x7f0800b9
+int id toolshop_toolinspector 0x7f0800ba
+int id toolshop_topbar 0x7f0800bb
+int id toolslot_image 0x7f0800bc
+int id topPanel 0x7f0800bd
+int id topbar_energycount 0x7f0800be
+int id topbar_energycount_decrease 0x7f0800bf
+int id topbar_energyview 0x7f0800c0
+int id topbar_layout 0x7f0800c1
+int id topbar_leveldisplay 0x7f0800c2
+int id topbar_levellayout 0x7f0800c3
+int id topbar_levelprogress 0x7f0800c4
+int id topbar_settings 0x7f0800c5
+int id topbar_shapeshop 0x7f0800c6
+int id topbar_starcount 0x7f0800c7
+int id topbar_starcount_decrease 0x7f0800c8
+int id topbar_starview 0x7f0800c9
+int id topbar_toolshop 0x7f0800ca
+int id tutorial_image_view 0x7f0800cb
+int id tutorial_text_view 0x7f0800cc
+int id unlockmessage_message 0x7f0800cd
+int id unlockmessage_toolimage 0x7f0800ce
+int id up 0x7f0800cf
+int id useLogo 0x7f0800d0
+int id withText 0x7f0800d1
+int id worldbutton_energycount 0x7f0800d2
+int id worldbutton_levelcount 0x7f0800d3
+int id worldbutton_lock 0x7f0800d4
+int id worldbutton_preview 0x7f0800d5
+int id worldbutton_starcount 0x7f0800d6
+int id worldbutton_title 0x7f0800d7
+int id worlds_layout 0x7f0800d8
+int id worlds_topbar 0x7f0800d9
+int id wrap_content 0x7f0800da
int integer abc_config_activityDefaultDur 0x7f090000
int integer abc_config_activityShortDur 0x7f090001
int integer abc_max_action_buttons 0x7f090002
@@ -859,7 +863,18 @@ int layout worlds 0x7f0a0043
int mipmap ic_launcher 0x7f0b0000
int raw music_game 0x7f0c0000
int raw music_menu 0x7f0c0001
-int raw ramp 0x7f0c0002
+int raw sound_collect_energy 0x7f0c0002
+int raw sound_collect_star 0x7f0c0003
+int raw sound_countdown 0x7f0c0004
+int raw sound_die 0x7f0c0005
+int raw sound_explosion 0x7f0c0006
+int raw sound_firework 0x7f0c0007
+int raw sound_goal 0x7f0c0008
+int raw sound_magnet 0x7f0c0009
+int raw sound_mushroom 0x7f0c000a
+int raw sound_place_tool 0x7f0c000b
+int raw sound_spring 0x7f0c000c
+int raw sound_stasis 0x7f0c000d
int string abc_action_bar_home_description 0x7f0d0000
int string abc_action_bar_home_description_format 0x7f0d0001
int string abc_action_bar_home_subtitle_description_format 0x7f0d0002
diff --git a/app/src/main/assets/levelpacks/Icy Mountains.xml b/app/src/main/assets/levelpacks/Icy Mountains.xml
index 2d114e8..ee02895 100644
--- a/app/src/main/assets/levelpacks/Icy Mountains.xml
+++ b/app/src/main/assets/levelpacks/Icy Mountains.xml
@@ -435,5 +435,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/java/de/frajul/endlessroll/entities/tools/Magnet.java b/app/src/main/java/de/frajul/endlessroll/entities/tools/Magnet.java
index 95d2234..1db58b4 100644
--- a/app/src/main/java/de/frajul/endlessroll/entities/tools/Magnet.java
+++ b/app/src/main/java/de/frajul/endlessroll/entities/tools/Magnet.java
@@ -8,28 +8,46 @@ import de.frajul.endlessroll.entities.collision.geometry.Geometry;
import de.frajul.endlessroll.entities.particles.ParticleSource;
import de.frajul.endlessroll.entities.particles.ParticleSystem;
import de.frajul.endlessroll.main.game.Timer;
+import de.frajul.endlessroll.sounds.SoundManager;
+import de.frajul.endlessroll.sounds.SoundStream;
/**
* Created by Julian on 11.02.2016.
*/
public class Magnet extends Tool {
+ private SoundManager soundManager;
private ParticleSource particleSource;
+ private SoundStream soundStream;
- public Magnet(Vector position, ParticleSystem particleSystem) {
+ public Magnet(Vector position, ParticleSystem particleSystem, SoundManager soundManager) {
super(ToolType.MAGNET, position, .24f, .24f, false, false);
+ this.soundManager = soundManager;
animation.setRequiredDelta(300);
animation.setIndexSequence(new int[]{1, 1, 0});
animation.setLooping(true);
super.setFloating(true);
particleSource = new ParticleSource(new Vector(position), particleSystem.magnet);
particleSource.start();
+ soundStream = soundManager.playSound(soundManager.magnetSound);
}
@Override
public void destroy(DestroyEffect destroyEffect) {
super.destroy(destroyEffect);
particleSource.kill();
+ soundManager.stopSound(soundStream);
+ }
+
+ public void updateSoundVolume(Player player) {
+ float distanceToPlayer = super.getPosition().vectorTo(player.getPosition()).length();
+ float factor = 1.0f / (distanceToPlayer * distanceToPlayer);
+ if (distanceToPlayer > 2 && player.getPosition().getX() > super.getPosition().getX()) {
+ soundManager.stopSound(soundStream);
+ return;
+ }
+ soundStream.setCurrentVolumeModifier(factor);
+ soundManager.onStreamVolumeChanged(soundStream);
}
@Override
diff --git a/app/src/main/java/de/frajul/endlessroll/entities/tools/PowerMushroom.java b/app/src/main/java/de/frajul/endlessroll/entities/tools/PowerMushroom.java
index b822825..5533d2a 100644
--- a/app/src/main/java/de/frajul/endlessroll/entities/tools/PowerMushroom.java
+++ b/app/src/main/java/de/frajul/endlessroll/entities/tools/PowerMushroom.java
@@ -5,6 +5,8 @@ import de.frajul.endlessroll.entities.DestroyEffect;
import de.frajul.endlessroll.entities.Player;
import de.frajul.endlessroll.entities.collision.geometry.Geometry;
import de.frajul.endlessroll.main.game.Timer;
+import de.frajul.endlessroll.sounds.Sound;
+import de.frajul.endlessroll.sounds.SoundManager;
/**
* Created by Julian on 02.10.2017.
@@ -12,14 +14,18 @@ import de.frajul.endlessroll.main.game.Timer;
public class PowerMushroom extends Tool {
- public PowerMushroom(Vector position) {
+ private SoundManager soundManager;
+
+ public PowerMushroom(Vector position, SoundManager soundManager) {
super(ToolType.POWER_MUSHROOM, position, .35f, .3f, true, true);
animation.disable();
+ this.soundManager = soundManager;
}
@Override
public void onPlayerCollision(Player player, Timer timer) {
player.startSuperPower((long) ToolType.POWER_MUSHROOM.getCurrentUpgradeValue(ToolUpgradeType.DURATION));
+ soundManager.playSound(soundManager.mushroomSound);
super.destroy(DestroyEffect.ENERGY_COLLECT);
}
diff --git a/app/src/main/java/de/frajul/endlessroll/entities/tools/Spring.java b/app/src/main/java/de/frajul/endlessroll/entities/tools/Spring.java
index 8796445..f40329c 100644
--- a/app/src/main/java/de/frajul/endlessroll/entities/tools/Spring.java
+++ b/app/src/main/java/de/frajul/endlessroll/entities/tools/Spring.java
@@ -5,6 +5,7 @@ import de.frajul.endlessroll.entities.Player;
import de.frajul.endlessroll.entities.collision.geometry.Geometry;
import de.frajul.endlessroll.entities.collision.geometry.Quad;
import de.frajul.endlessroll.main.game.Timer;
+import de.frajul.endlessroll.sounds.SoundManager;
/**
* Created by Julian on 04.01.2016.
@@ -12,11 +13,13 @@ import de.frajul.endlessroll.main.game.Timer;
public class Spring extends Tool {
private boolean hasYetCollided = false;
+ private SoundManager soundManager;
- public Spring(Vector position) {
+ public Spring(Vector position, SoundManager soundManager) {
super(ToolType.SPRING, position, .3f, .35f, true, true);
animation.setIndexSequence(new int[]{1, 0, 0, 3, 3, 3, 1});
animation.setRequiredDelta(80);
+ this.soundManager = soundManager;
}
@Override
@@ -29,6 +32,7 @@ public class Spring extends Tool {
public void onPlayerCollision(Player player, Timer timer) {
if (!hasYetCollided) {
hasYetCollided = true;
+ soundManager.playSound(soundManager.springSound);
player.clearAllForces();
player.getMovement().setY(0);
diff --git a/app/src/main/java/de/frajul/endlessroll/entities/tools/Stasis.java b/app/src/main/java/de/frajul/endlessroll/entities/tools/Stasis.java
index caab954..3d68202 100644
--- a/app/src/main/java/de/frajul/endlessroll/entities/tools/Stasis.java
+++ b/app/src/main/java/de/frajul/endlessroll/entities/tools/Stasis.java
@@ -6,25 +6,30 @@ import de.frajul.endlessroll.entities.Player;
import de.frajul.endlessroll.entities.collision.geometry.Geometry;
import de.frajul.endlessroll.entities.particles.ParticleSource;
import de.frajul.endlessroll.entities.particles.ParticleSystem;
-import de.frajul.endlessroll.main.game.GameScene;
import de.frajul.endlessroll.main.game.Timer;
+import de.frajul.endlessroll.sounds.SoundManager;
+import de.frajul.endlessroll.sounds.SoundStream;
/**
* Created by Julian on 11.02.2016.
*/
public class Stasis extends Tool {
+ private SoundManager soundManager;
private ParticleSource particleSource;
private boolean firstCollision = true;
private final static float Y_SLOW_FACTOR = .4f; //Final .2f
private final static float X_SLOW_FACTOR = .9f; //Final .8f
private float forceValue;
- public Stasis(Vector position, ParticleSystem particleSystem) {
+ private SoundStream soundStream;
+
+ public Stasis(Vector position, ParticleSystem particleSystem, SoundManager soundManager) {
super(ToolType.STASIS, position,
.7f * ToolType.STASIS.getCurrentUpgradeValue(ToolUpgradeType.SIZE) / 100,
.7f * ToolType.STASIS.getCurrentUpgradeValue(ToolUpgradeType.SIZE) / 100, false,
false);
+ this.soundManager = soundManager;
animation.setLooping(true);
animation.setRequiredDelta(300);
animation.setIndexSequence(new int[]{1, 1, 2, 3, 2, 4, 4, 3, 2, 2, 3, 3});
@@ -33,12 +38,31 @@ public class Stasis extends Tool {
particleSource.setSpawnSize(new Vector(super.width, super.height));
particleSource.start();
forceValue = ToolType.STASIS.getCurrentUpgradeValue(ToolUpgradeType.FORCE);
+ soundStream = soundManager.playSound(soundManager.stasisSound);
+ }
+
+ public void updateSoundVolume(Player player) {
+ float distanceToPlayer = super.getPosition().getX() - player.getPosition().getX();
+ boolean playerInXRange = (player.getRightEdge() >= super.getLeftEdge() && player
+ .getRightEdge() <= super.getRightEdge()) || (player.getLeftEdge() >= super
+ .getLeftEdge() && player.getLeftEdge() <= super.getRightEdge());
+ float factor = 1.0f;
+ if (!playerInXRange) {
+ factor = 1.0f / (distanceToPlayer * distanceToPlayer);
+ if (distanceToPlayer < -2) {
+ soundManager.stopSound(soundStream);
+ return;
+ }
+ }
+ soundStream.setCurrentVolumeModifier(factor);
+ soundManager.onStreamVolumeChanged(soundStream);
}
@Override
public void destroy(DestroyEffect destroyEffect) {
super.destroy(destroyEffect);
particleSource.kill();
+ soundManager.stopSound(soundStream);
}
@Override
diff --git a/app/src/main/java/de/frajul/endlessroll/entities/tools/ToolType.java b/app/src/main/java/de/frajul/endlessroll/entities/tools/ToolType.java
index 0590c6b..d219354 100644
--- a/app/src/main/java/de/frajul/endlessroll/entities/tools/ToolType.java
+++ b/app/src/main/java/de/frajul/endlessroll/entities/tools/ToolType.java
@@ -11,32 +11,33 @@ import de.frajul.endlessroll.data.Vector;
import de.frajul.endlessroll.entities.particles.ParticleSystem;
import de.frajul.endlessroll.entities.textures.Texture;
import de.frajul.endlessroll.entities.textures.TexturePack;
+import de.frajul.endlessroll.sounds.Sound;
import de.frajul.endlessroll.sounds.SoundManager;
public enum ToolType {
//Check newInstance when new Tool is added!
RAMP(R.string.tool_name_ramp, R.string.tool_description_ramp, R.drawable.tools_ramp,
- R.drawable.tools_ramp_button, R.raw.ramp, 0, 1, 5,
+ R.drawable.tools_ramp_button, 0, 1, 5,
new ToolUpgrade(ToolUpgradeType.COOLDOWN, 3000, 1000)),
SPRING(R.string.tool_name_spring, R.string.tool_description_spring, R.drawable.tools_spring,
- R.drawable.tools_spring_button, R.raw.ramp, 5, 2, 5,
+ R.drawable.tools_spring_button, 5, 2, 5,
new ToolUpgrade(ToolUpgradeType.COOLDOWN, 4000, 2000)),
BOMB(R.string.tool_name_bomb, R.string.tool_description_bomb, R.drawable.tools_bomb,
- R.drawable.tools_bomb_button, R.raw.ramp, 12, 4, 5,
+ R.drawable.tools_bomb_button, 12, 4, 5,
new ToolUpgrade(ToolUpgradeType.COOLDOWN, 6000, 4000),
new ToolUpgrade(ToolUpgradeType.DURATION, 1200, 400),
new ToolUpgrade(ToolUpgradeType.RANGE, 100, 200)),
MAGNET(R.string.tool_name_magnet, R.string.tool_description_magnet, R.drawable.tools_magnet,
- R.drawable.tools_magnet_button, R.raw.ramp, 10, 2, 5,
+ R.drawable.tools_magnet_button, 10, 2, 5,
new ToolUpgrade(ToolUpgradeType.COOLDOWN, 5000, 3000),
new ToolUpgrade(ToolUpgradeType.FORCE, 100, 500)),
POWER_MUSHROOM(R.string.tool_name_power_mushroom, R.string.tool_description_power_mushroom,
- R.drawable.tools_power_mushroom, R.drawable.tools_power_mushroom_button, R.raw.ramp, 5,
+ R.drawable.tools_power_mushroom, R.drawable.tools_power_mushroom_button, 5,
5, 7, new ToolUpgrade(ToolUpgradeType.COOLDOWN, 15000, 11000),
new ToolUpgrade(ToolUpgradeType.DURATION, 5000, 10000)),
STASIS(R.string.tool_name_stasis, R.string.tool_description_stasis, R.drawable.tools_stasis,
- R.drawable.tools_stasis_button, R.raw.ramp, 15, 4, 6,
+ R.drawable.tools_stasis_button, 15, 4, 6,
new ToolUpgrade(ToolUpgradeType.COOLDOWN, 6000, 4000),
new ToolUpgrade(ToolUpgradeType.FORCE, 1, 2),
new ToolUpgrade(ToolUpgradeType.SIZE, 100, 200));
@@ -47,23 +48,20 @@ public enum ToolType {
private final int description;
private final int toolTextureId;
private final int buttonDrawable;
- private final int placingSoundId;
private final int buyPrice;
private final int upgradePrice;
private final int maxUpgradeLevel;
private final List upgrades;
private Texture toolTexture = null;
- private int placingSound = -1;
private boolean bought;
private int currentUpgradeLevel = 1;
- ToolType(@StringRes int name, @StringRes int description, int toolTextureId, int buttonDrawable, int placingSoundId, int buyPrice, int upgradePrice, int maxUpgradeLevel, ToolUpgrade... upgrades) {
+ ToolType(@StringRes int name, @StringRes int description, int toolTextureId, int buttonDrawable, int buyPrice, int upgradePrice, int maxUpgradeLevel, ToolUpgrade... upgrades) {
this.name = name;
this.description = description;
this.toolTextureId = toolTextureId;
this.buttonDrawable = buttonDrawable;
- this.placingSoundId = placingSoundId;
this.buyPrice = buyPrice;
this.upgradePrice = upgradePrice;
this.maxUpgradeLevel = maxUpgradeLevel;
@@ -71,26 +69,26 @@ public enum ToolType {
}
@Nullable
- public Tool newInstance(Vector position, ParticleSystem particleSystem) {
+ public Tool newInstance(Vector position, ParticleSystem particleSystem, SoundManager soundManager) {
Tool tool = null;
switch (this) {
case RAMP:
tool = new Ramp(position);
break;
case SPRING:
- tool = new Spring(position);
+ tool = new Spring(position, soundManager);
break;
case MAGNET:
- tool = new Magnet(position, particleSystem);
+ tool = new Magnet(position, particleSystem, soundManager);
break;
case BOMB:
tool = new Bomb(position);
break;
case POWER_MUSHROOM:
- tool = new PowerMushroom(position);
+ tool = new PowerMushroom(position, soundManager);
break;
case STASIS:
- tool = new Stasis(position,particleSystem);
+ tool = new Stasis(position, particleSystem, soundManager);
break;
}
if (tool != null && tool.isPlacedByRightEdge())
@@ -98,22 +96,11 @@ public enum ToolType {
return tool;
}
- public static void loadAllPlacingSounds(SoundManager soundManager) {
- for (ToolType type : values())
- type.loadPlacingSound(soundManager);
- }
-
public static void loadAllToolTextures(TexturePack texturePack) {
for (ToolType type : values())
type.loadToolTexture(texturePack);
}
- private void loadPlacingSound(SoundManager soundManager) {
- if (placingSoundId == -1)
- return;
- placingSound = soundManager.loadSound(placingSoundId);
- }
-
private void loadToolTexture(TexturePack texturePack) {
if (toolTextureId == -1)
return;
@@ -131,10 +118,6 @@ public enum ToolType {
return buttonDrawable;
}
- public int getPlacingSound() {
- return placingSound;
- }
-
@StringRes
public int getName() {
return name;
diff --git a/app/src/main/java/de/frajul/endlessroll/main/DataStorageHandler.java b/app/src/main/java/de/frajul/endlessroll/main/DataStorageHandler.java
index 0fbfb32..26dffbc 100644
--- a/app/src/main/java/de/frajul/endlessroll/main/DataStorageHandler.java
+++ b/app/src/main/java/de/frajul/endlessroll/main/DataStorageHandler.java
@@ -16,7 +16,8 @@ import de.frajul.endlessroll.user.User;
public class DataStorageHandler {
private final String PREFERENCES_NAME = "GamePreferences";
- private final String SOUND_ON = "Sound";
+ private final String SOUNDS_MUTED = "SoundsMuted";
+ private final String MUSIC_MUTED = "MusicMuted";
private final String USER_EP = "EP";
private final String USER_LEVEL = "Level";
private final String USER_STARS = "Stars";
@@ -37,13 +38,23 @@ public class DataStorageHandler {
database = new MyDatabase(activity);
}
- public boolean readIsSoundOn() {
- return preferences.getBoolean(SOUND_ON, false);
+ public boolean readIsSoundsMuted() {
+ return preferences.getBoolean(SOUNDS_MUTED, false);
}
- public void writeSoundOn(boolean soundOn) {
+ public void writeSoundsMuted(boolean soundsMuted) {
SharedPreferences.Editor editor = preferences.edit();
- editor.putBoolean(SOUND_ON, soundOn);
+ editor.putBoolean(SOUNDS_MUTED, soundsMuted);
+ editor.apply();
+ }
+
+ public boolean readIsMusicMuted() {
+ return preferences.getBoolean(MUSIC_MUTED, false);
+ }
+
+ public void writeMusicMuted(boolean musicMuted) {
+ SharedPreferences.Editor editor = preferences.edit();
+ editor.putBoolean(MUSIC_MUTED, musicMuted);
editor.apply();
}
diff --git a/app/src/main/java/de/frajul/endlessroll/main/GameActivity.java b/app/src/main/java/de/frajul/endlessroll/main/GameActivity.java
index 055606b..30ab461 100644
--- a/app/src/main/java/de/frajul/endlessroll/main/GameActivity.java
+++ b/app/src/main/java/de/frajul/endlessroll/main/GameActivity.java
@@ -91,7 +91,8 @@ public class GameActivity extends Activity implements ExceptionHandler, User.LvU
user = dataStorageHandler.readUserData(this);
soundManager = new SoundManager(this);
- soundManager.setSoundOn(dataStorageHandler.readIsSoundOn());
+ soundManager.setSoundsMuted(dataStorageHandler.readIsSoundsMuted());
+ soundManager.setMusicMuted(dataStorageHandler.readIsMusicMuted());
levelManager = new LevelManager(this, dataStorageHandler);
tutorialManager = new TutorialManager(this);
@@ -138,7 +139,7 @@ public class GameActivity extends Activity implements ExceptionHandler, User.LvU
}
public void flipToScreen(final Screen.ScreenType screen) {
- if (screen != Screen.ScreenType.NONE) {
+ if (screen != Screen.ScreenType.NONE && flipper.getCurrentScreen().getType() != screen) {
runOnUiThread(new Runnable() {
@Override
public void run() {
@@ -271,7 +272,7 @@ public class GameActivity extends Activity implements ExceptionHandler, User.LvU
glSurfaceView.onPause();
if (flipper.getCurrentScreen() == gameScreen)
gameScreen.onPause();
- soundManager.pause();
+ soundManager.activityPause();
super.onPause();
}
@@ -279,7 +280,7 @@ public class GameActivity extends Activity implements ExceptionHandler, User.LvU
protected void onResume() {
GameLog.d("OnResume");
glSurfaceView.onResume();
- soundManager.resume();
+ soundManager.activityResume();
super.onResume();
}
@@ -288,7 +289,6 @@ public class GameActivity extends Activity implements ExceptionHandler, User.LvU
GameLog.d("OnDestroy");
soundManager.destroy();
- dataStorageHandler.writeSoundOn(soundManager.isSoundOn());
super.onDestroy();
}
diff --git a/app/src/main/java/de/frajul/endlessroll/main/game/Game.java b/app/src/main/java/de/frajul/endlessroll/main/game/Game.java
index 84a1135..9b3d576 100644
--- a/app/src/main/java/de/frajul/endlessroll/main/game/Game.java
+++ b/app/src/main/java/de/frajul/endlessroll/main/game/Game.java
@@ -68,7 +68,7 @@ public class Game extends Rendering {
this.timer = timer;
try {
if (isFirstTime) {
- scene = new GameScene(texturePack, particleSystem);
+ scene = new GameScene(gameActivity, texturePack, particleSystem);
firework = new Firework(particleSystem.firework, scene.getCamera());
if (level != null)
startGame(levelPack, level);
@@ -88,6 +88,7 @@ public class Game extends Rendering {
this.level = level;
this.levelPack = levelPack;
if (scene != null) {
+ gameActivity.getSoundManager().gameMusic.reset();
gameState = GameState.COUNTDOWN;
gameActivity.getTutorialManager().resetGameTutorials();
collectedStars.clear();
@@ -106,8 +107,8 @@ public class Game extends Rendering {
}
public void countdownFinished() {
- GameLog.i("Start music");
- gameActivity.getSoundManager().setCurrentMusic(gameActivity.getSoundManager().gameMusic);
+ gameActivity.getSoundManager().resumeAllSounds();
+ gameActivity.getSoundManager().gameMusic.start();
gameState = GameState.RUNNING;
}
@@ -205,6 +206,7 @@ public class Game extends Rendering {
public void tryToPause() {
if (gameState == GameState.GAME_OVER || gameState == GameState.LEVEL_FINISHED || gameState == GameState.PAUSED)
return;
+ gameActivity.getSoundManager().pauseAllSounds();
gameActivity.getSoundManager().gameMusic.pause();
viewManager.showShortMenu();
if (gameState == GameState.COUNTDOWN)
@@ -222,7 +224,7 @@ public class Game extends Rendering {
private void addTool(float x, float y) {
try {
- gameActivity.getSoundManager().playSound(currentTool.getPlacingSound());
+ gameActivity.getSoundManager().playSound(gameActivity.getSoundManager().placeToolSound);
scene.addTool(currentTool, x, y, physics);
} catch (Exception e) {
onException(e);
@@ -230,8 +232,9 @@ public class Game extends Rendering {
}
public void onGameOver(boolean playerExplode) {
- gameActivity.getSoundManager().gameMusic.pause();
- //TODO: Die sound
+ gameActivity.getSoundManager().gameMusic.stop();
+ gameActivity.getSoundManager().stopAllSounds();
+ gameActivity.getSoundManager().playSound(gameActivity.getSoundManager().dieSound);
if (playerExplode) {
scene.getUncategorizedEntities().remove(player);
DestroyEffect.EXPLOSION.createEffect(particleSystem, player.getPosition(),
@@ -242,8 +245,9 @@ public class Game extends Rendering {
}
private void onGoalReached() {
- gameActivity.getSoundManager().gameMusic.pause();
- //TODO: Goal + firework sound
+ gameActivity.getSoundManager().gameMusic.stop();
+ gameActivity.getSoundManager().stopAllSounds();
+ gameActivity.getSoundManager().playSound(gameActivity.getSoundManager().goalSound);
gameState = GameState.LEVEL_FINISHED;
if (!level.isFinished())
@@ -263,6 +267,7 @@ public class Game extends Rendering {
}
firework.start();
+ gameActivity.getSoundManager().playSound(gameActivity.getSoundManager().fireworkSound);
//viewManager.showGameOverMessage(levelPack.isLastLevel(level), MessageType.WIN);
//TODO: fadeInWithDelay something
@@ -290,13 +295,21 @@ public class Game extends Rendering {
}
public void onStarCollision(Star star) {
- scene.onStarCollision(star);
- collectedStars.add(star.getIndex());
+ if (!star.isDestroyed()) {
+ scene.onStarCollision(star);
+ gameActivity.getSoundManager()
+ .playSound(gameActivity.getSoundManager().collectStarSound);
+ collectedStars.add(star.getIndex());
+ }
}
public void onEnergyCollision(Energy energy) {
- scene.onEnergyCollision(energy);
- energyCollected = true;
+ if (!energy.isDestroyed()) {
+ scene.onEnergyCollision(energy);
+ gameActivity.getSoundManager()
+ .playSound(gameActivity.getSoundManager().collectEnergySound);
+ energyCollected = true;
+ }
}
@Override
diff --git a/app/src/main/java/de/frajul/endlessroll/main/game/GameScene.java b/app/src/main/java/de/frajul/endlessroll/main/game/GameScene.java
index 44afb25..10caa95 100644
--- a/app/src/main/java/de/frajul/endlessroll/main/game/GameScene.java
+++ b/app/src/main/java/de/frajul/endlessroll/main/game/GameScene.java
@@ -12,12 +12,14 @@ import de.frajul.endlessroll.entities.particles.ParticleSystem;
import de.frajul.endlessroll.entities.shapes.PlayerShape;
import de.frajul.endlessroll.entities.textures.TexturePack;
import de.frajul.endlessroll.entities.tools.Bomb;
+import de.frajul.endlessroll.entities.tools.Magnet;
import de.frajul.endlessroll.entities.tools.Stasis;
import de.frajul.endlessroll.entities.tools.Tool;
import de.frajul.endlessroll.entities.tools.ToolType;
import de.frajul.endlessroll.levels.Level;
import de.frajul.endlessroll.levels.ObstacleData;
import de.frajul.endlessroll.levels.worlds.World;
+import de.frajul.endlessroll.main.GameActivity;
import de.frajul.endlessroll.main.GameLog;
import de.frajul.endlessroll.main.physics.Physics;
@@ -26,13 +28,15 @@ import de.frajul.endlessroll.main.physics.Physics;
*/
public class GameScene extends Scene {
+ private GameActivity gameActivity;
private World currentWorld;
private CollisionDetector collisionDetector;
private Goal goal;
private float goalX;
- public GameScene(TexturePack texturePack, ParticleSystem particleSystem) throws Exception {
- super(texturePack, particleSystem);
+ public GameScene(GameActivity gameActivity, TexturePack texturePack, ParticleSystem particleSystem) throws Exception {
+ super(gameActivity, texturePack, particleSystem);
+ this.gameActivity = gameActivity;
collisionDetector = new CollisionDetector();
goal = new Goal(textures.goal);
@@ -45,8 +49,8 @@ public class GameScene extends Scene {
terrain.loadData(world, level.getTerrainEdge(), level.getTerrainTiles());
ceiling.loadData(world, level.getCeilingEdge(), level.getCeilingTiles());
uncategorizedEntities.add(goal);
- player.init(playerShape, terrain.getEdge(), level.getStartSpeed(),
- level.getEndSpeed(), particleSystem);
+ player.init(playerShape, terrain.getEdge(), level.getStartSpeed(), level.getEndSpeed(),
+ particleSystem);
uncategorizedEntities.add(player);
collectables.init(level, textures);
for (ObstacleData data : level.getObstacles())
@@ -55,10 +59,10 @@ public class GameScene extends Scene {
goalX = level.getGoalX();
goal.setGoalX(goalX);
- if(world == World.ICY_MOUNTAINS){
+ if (world == World.ICY_MOUNTAINS) {
enviromentParticles = new ParticleSource(new Vector(), particleSystem.snow);
enviromentParticles.start();
- }else if(enviromentParticles != null){
+ } else if (enviromentParticles != null) {
enviromentParticles.kill();
}
GameLog.d("Level " + level.getId() + " successfully loaded");
@@ -79,7 +83,7 @@ public class GameScene extends Scene {
public void addTool(ToolType type, float screenX, float screenY, Physics physics) throws Exception {
Vector position = calcWorldFromScreenCoords(screenX, screenY);
- Tool tool = type.newInstance(position, particleSystem);
+ Tool tool = type.newInstance(position, particleSystem, gameActivity.getSoundManager());
physics.checkSingleToolCollision(tool, this);
if (tool == null)
@@ -123,6 +127,13 @@ public class GameScene extends Scene {
if (bomb.isExploding())
bomb.explode(obstacles, collisionDetector);
}
+ else if (tool instanceof Stasis) {
+ Stasis stasis = (Stasis) tool;
+ stasis.updateSoundVolume(player);
+ } else if(tool instanceof Magnet){
+ Magnet magnet = (Magnet) tool;
+ magnet.updateSoundVolume(player);
+ }
}
}
diff --git a/app/src/main/java/de/frajul/endlessroll/main/game/Scene.java b/app/src/main/java/de/frajul/endlessroll/main/game/Scene.java
index 5479b02..3b4e05f 100644
--- a/app/src/main/java/de/frajul/endlessroll/main/game/Scene.java
+++ b/app/src/main/java/de/frajul/endlessroll/main/game/Scene.java
@@ -8,6 +8,7 @@ import java.util.List;
import de.frajul.endlessroll.data.Vector;
import de.frajul.endlessroll.entities.AnimatedEntity;
import de.frajul.endlessroll.entities.Background;
+import de.frajul.endlessroll.entities.DestroyEffect;
import de.frajul.endlessroll.entities.Entity;
import de.frajul.endlessroll.entities.Obstacle;
import de.frajul.endlessroll.entities.Player;
@@ -19,6 +20,7 @@ import de.frajul.endlessroll.entities.tileLists.Ceiling;
import de.frajul.endlessroll.entities.tileLists.Terrain;
import de.frajul.endlessroll.entities.tools.Tool;
import de.frajul.endlessroll.levels.worlds.World;
+import de.frajul.endlessroll.main.GameActivity;
/**
* Created by Julian on 20.07.2016.
@@ -28,6 +30,8 @@ public abstract class Scene {
//Not sure if needed, this why set on very high value
private final float MAX_Y_MOVEMENT = -1f;
+ private GameActivity gameActivity;
+
protected Camera camera;
private Vector screenSize;
private Entity playerArrow;
@@ -46,7 +50,8 @@ public abstract class Scene {
protected List tools = Collections.synchronizedList(new ArrayList());
protected Collectables collectables = new Collectables();
- public Scene(TexturePack texturePack, ParticleSystem particleSystem) {
+ public Scene(GameActivity gameActivity, TexturePack texturePack, ParticleSystem particleSystem) {
+ this.gameActivity = gameActivity;
this.particleSystem = particleSystem;
setTexturePack(texturePack);
camera = new Camera();
@@ -120,9 +125,14 @@ public abstract class Scene {
moveEnviroment(finalMovement.x);
}
- if (entity.isDestroyed() && entity.getDestroyEffect() != null)
+ if (entity.isDestroyed() && entity.getDestroyEffect() != null) {
+ if (entity.getDestroyEffect() == DestroyEffect.EXPLOSION) {
+ gameActivity.getSoundManager()
+ .playSound(gameActivity.getSoundManager().explosionSound);
+ }
entity.getDestroyEffect().createEffect(particleSystem, new Vector(entity.getPosition()),
new Vector(entity.getWidth(), entity.getHeight())).start();
+ }
if (entity.getRightEdge() - camera.getX() < -3f || entity.isDestroyed()) {
return true;
}
diff --git a/app/src/main/java/de/frajul/endlessroll/main/game/StartScene.java b/app/src/main/java/de/frajul/endlessroll/main/game/StartScene.java
index ab5580f..1c96230 100644
--- a/app/src/main/java/de/frajul/endlessroll/main/game/StartScene.java
+++ b/app/src/main/java/de/frajul/endlessroll/main/game/StartScene.java
@@ -8,6 +8,7 @@ import de.frajul.endlessroll.entities.particles.ParticleSystem;
import de.frajul.endlessroll.entities.shapes.PlayerShape;
import de.frajul.endlessroll.entities.textures.TexturePack;
import de.frajul.endlessroll.levels.worlds.World;
+import de.frajul.endlessroll.main.GameActivity;
public class StartScene extends Scene {
@@ -15,8 +16,8 @@ public class StartScene extends Scene {
private Random random;
private World currentWorld = World.GRASSLANDS;
- public StartScene(TexturePack texturePack, ParticleSystem particleSystem) {
- super(texturePack, particleSystem);
+ public StartScene(GameActivity gameActivity, TexturePack texturePack, ParticleSystem particleSystem) {
+ super(gameActivity, texturePack, particleSystem);
player.init(PlayerShape.BALL, TERRAIN_EDGE, 0.5f, 0.5f, null);
uncategorizedEntities.add(player);
diff --git a/app/src/main/java/de/frajul/endlessroll/main/game/TestScreenScene.java b/app/src/main/java/de/frajul/endlessroll/main/game/TestScreenScene.java
index 9fe6fa4..97f150a 100644
--- a/app/src/main/java/de/frajul/endlessroll/main/game/TestScreenScene.java
+++ b/app/src/main/java/de/frajul/endlessroll/main/game/TestScreenScene.java
@@ -10,11 +10,12 @@ import de.frajul.endlessroll.entities.particles.ParticleSystem;
import de.frajul.endlessroll.entities.textures.TexturePack;
import de.frajul.endlessroll.levels.ObstacleData;
import de.frajul.endlessroll.levels.worlds.World;
+import de.frajul.endlessroll.main.GameActivity;
public class TestScreenScene extends Scene {
- public TestScreenScene(TexturePack texturePack, ParticleSystem particleSystem) {
- super(texturePack, particleSystem);
+ public TestScreenScene(GameActivity gameActivity, TexturePack texturePack, ParticleSystem particleSystem) {
+ super(gameActivity, texturePack, particleSystem);
terrain.createEndless(World.ICY_MOUNTAINS, -1.0f);
background.changeTexture(World.ICY_MOUNTAINS.getBackgroundTexture());
new ParticleSource(new Vector(0, 0.0f), particleSystem.colorChange).start();
diff --git a/app/src/main/java/de/frajul/endlessroll/main/screens/GLTestScreen.java b/app/src/main/java/de/frajul/endlessroll/main/screens/GLTestScreen.java
index 4560fbf..9e30ad2 100644
--- a/app/src/main/java/de/frajul/endlessroll/main/screens/GLTestScreen.java
+++ b/app/src/main/java/de/frajul/endlessroll/main/screens/GLTestScreen.java
@@ -24,7 +24,7 @@ public class GLTestScreen extends GLScreen {
@Override
public void prepareToBeShown() {
- gameActivity.getSoundManager().setCurrentMusic(gameActivity.getSoundManager().menuMusic);
+ gameActivity.getSoundManager().menuMusic.start();
glView.setCurrentRendering(rendering);
}
diff --git a/app/src/main/java/de/frajul/endlessroll/main/screens/GameScreen.java b/app/src/main/java/de/frajul/endlessroll/main/screens/GameScreen.java
index 389ba18..35ac72d 100644
--- a/app/src/main/java/de/frajul/endlessroll/main/screens/GameScreen.java
+++ b/app/src/main/java/de/frajul/endlessroll/main/screens/GameScreen.java
@@ -29,8 +29,7 @@ public class GameScreen extends GLScreen {
@Override
public void prepareToBeShown() {
- gameActivity.getSoundManager().setCurrentMusic(null);
- gameActivity.getSoundManager().menuMusic.reset();
+ gameActivity.getSoundManager().menuMusic.stop();
glView.setCurrentRendering(game);
game.getViewManager().prepareToBeShown();
diff --git a/app/src/main/java/de/frajul/endlessroll/main/screens/LevelsScreen.java b/app/src/main/java/de/frajul/endlessroll/main/screens/LevelsScreen.java
index f614f61..ff9b686 100644
--- a/app/src/main/java/de/frajul/endlessroll/main/screens/LevelsScreen.java
+++ b/app/src/main/java/de/frajul/endlessroll/main/screens/LevelsScreen.java
@@ -62,7 +62,7 @@ public class LevelsScreen extends Screen implements LevelButtonOnC
@Override
public void prepareToBeShown() {
- gameActivity.getSoundManager().setCurrentMusic(gameActivity.getSoundManager().menuMusic);
+ gameActivity.getSoundManager().menuMusic.start();
topBar.update();
build();
diff --git a/app/src/main/java/de/frajul/endlessroll/main/screens/PlayerShapeShopScreen.java b/app/src/main/java/de/frajul/endlessroll/main/screens/PlayerShapeShopScreen.java
index 62e402a..4f7ec62 100644
--- a/app/src/main/java/de/frajul/endlessroll/main/screens/PlayerShapeShopScreen.java
+++ b/app/src/main/java/de/frajul/endlessroll/main/screens/PlayerShapeShopScreen.java
@@ -63,7 +63,7 @@ public class PlayerShapeShopScreen extends Screen implements Pla
@Override
public void prepareToBeShown() {
- gameActivity.getSoundManager().setCurrentMusic(gameActivity.getSoundManager().menuMusic);
+ gameActivity.getSoundManager().menuMusic.start();
createViews();
topBar.update();
diff --git a/app/src/main/java/de/frajul/endlessroll/main/screens/SettingsScreen.java b/app/src/main/java/de/frajul/endlessroll/main/screens/SettingsScreen.java
index cf4faaf..2dfca45 100644
--- a/app/src/main/java/de/frajul/endlessroll/main/screens/SettingsScreen.java
+++ b/app/src/main/java/de/frajul/endlessroll/main/screens/SettingsScreen.java
@@ -19,6 +19,7 @@ public class SettingsScreen extends Screen implements View.OnClick
private final int CALL_ID_CONFIRM_RESET = 1;
private TopBar topBar;
+ private ToggleButton musicToggle;
private ToggleButton soundToggle;
private Button resetButton;
private boolean resetPressed = false;
@@ -28,6 +29,8 @@ public class SettingsScreen extends Screen implements View.OnClick
public SettingsScreen(GameActivity gameActivity) {
super(ScreenType.SETTINGS, gameActivity, R.layout.settings);
topBar = super.createTopBar(R.id.settings_topbar);
+ musicToggle = (ToggleButton) layout.findViewById(R.id.settings_musictoggle);
+ musicToggle.setOnClickListener(this);
soundToggle = (ToggleButton) layout.findViewById(R.id.settings_soundtoggle);
soundToggle.setOnClickListener(this);
resetButton = (Button) layout.findViewById(R.id.settings_reset);
@@ -38,16 +41,21 @@ public class SettingsScreen extends Screen implements View.OnClick
@Override
public void prepareToBeShown() {
- gameActivity.getSoundManager().setCurrentMusic(gameActivity.getSoundManager().menuMusic);
+ gameActivity.getSoundManager().menuMusic.start();
topBar.update();
- soundToggle.setChecked(gameActivity.getSoundManager().isSoundOn());
+ musicToggle.setChecked(!gameActivity.getSoundManager().isMusicMuted());
+ soundToggle.setChecked(!gameActivity.getSoundManager().isSoundsMuted());
resetButton.setEnabled(super.caller != ScreenType.GAME);
resetPressed = false;
}
@Override
public void onBackKeyDown() {
+ gameActivity.getDataStorageHandler()
+ .writeSoundsMuted(gameActivity.getSoundManager().isSoundsMuted());
+ gameActivity.getDataStorageHandler()
+ .writeMusicMuted(gameActivity.getSoundManager().isMusicMuted());
//ResetButton is disabled if caller is GAME, because shortMenu or GoalMessage would still be visible on next level start
if (resetPressed && (super.caller == ScreenType.LEVELS || super.caller == ScreenType.GAME)) {
super.caller = ScreenType.WORLDS;
@@ -57,8 +65,10 @@ public class SettingsScreen extends Screen implements View.OnClick
@Override
public void onClick(View v) {
- if (v.equals(soundToggle)) {
- gameActivity.getSoundManager().setSoundOn(soundToggle.isChecked());
+ if (v.equals(musicToggle)) {
+ gameActivity.getSoundManager().setMusicMuted(!musicToggle.isChecked());
+ } else if (v.equals(soundToggle)) {
+ gameActivity.getSoundManager().setSoundsMuted(!soundToggle.isChecked());
} else if (v.equals(resetButton)) {
resetConfirmDialog.show(CALL_ID_CONFIRM_RESET, R.string.confirm_dialog_reset);
}
diff --git a/app/src/main/java/de/frajul/endlessroll/main/screens/StartScreen.java b/app/src/main/java/de/frajul/endlessroll/main/screens/StartScreen.java
index 7915193..e49754e 100644
--- a/app/src/main/java/de/frajul/endlessroll/main/screens/StartScreen.java
+++ b/app/src/main/java/de/frajul/endlessroll/main/screens/StartScreen.java
@@ -61,7 +61,7 @@ public class StartScreen extends GLScreen implements View.OnClic
@Override
public void prepareToBeShown() {
- gameActivity.getSoundManager().setCurrentMusic(gameActivity.getSoundManager().menuMusic);
+ gameActivity.getSoundManager().menuMusic.start();
glView.setCurrentRendering(rendering);
((StartScene) rendering.getScene()).randomizeWorld();
diff --git a/app/src/main/java/de/frajul/endlessroll/main/screens/StartScreenRendering.java b/app/src/main/java/de/frajul/endlessroll/main/screens/StartScreenRendering.java
index 9aa4a78..36fb03b 100644
--- a/app/src/main/java/de/frajul/endlessroll/main/screens/StartScreenRendering.java
+++ b/app/src/main/java/de/frajul/endlessroll/main/screens/StartScreenRendering.java
@@ -16,11 +16,13 @@ import de.frajul.endlessroll.rendering.Rendering;
*/
public class StartScreenRendering extends Rendering {
+ private GameActivity gameActivity;
private Timer timer;
private ParticleSystem particleSystem;
public StartScreenRendering(GameActivity gameActivity) throws Exception {
super(gameActivity);
+ this.gameActivity = gameActivity;
this.particleSystem = new ParticleSystem(gameActivity);
}
@@ -29,7 +31,7 @@ public class StartScreenRendering extends Rendering {
GameLog.d("init Start Screen Rendering");
this.timer = timer;
if (isFirstTime)
- scene = new StartScene(texturePack, particleSystem);
+ scene = new StartScene(gameActivity, texturePack, particleSystem);
else {
scene.setTexturePack(texturePack);
}
diff --git a/app/src/main/java/de/frajul/endlessroll/main/screens/TestScreenRendering.java b/app/src/main/java/de/frajul/endlessroll/main/screens/TestScreenRendering.java
index e8e6362..5654b58 100644
--- a/app/src/main/java/de/frajul/endlessroll/main/screens/TestScreenRendering.java
+++ b/app/src/main/java/de/frajul/endlessroll/main/screens/TestScreenRendering.java
@@ -17,11 +17,13 @@ import de.frajul.endlessroll.rendering.Rendering;
*/
public class TestScreenRendering extends Rendering {
+ private GameActivity gameActivity;
private Timer timer;
private ParticleSystem particleSystem;
public TestScreenRendering(GameActivity gameActivity) throws Exception{
super(gameActivity);
+ this.gameActivity = gameActivity;
particleSystem = new ParticleSystem(gameActivity);
}
@@ -30,7 +32,7 @@ public class TestScreenRendering extends Rendering {
this.timer = timer;
try {
if (isFirstTime)
- scene = new TestScreenScene(texturePack, particleSystem);
+ scene = new TestScreenScene(gameActivity, texturePack, particleSystem);
else
scene.setTexturePack(texturePack);
}catch (Exception e){
diff --git a/app/src/main/java/de/frajul/endlessroll/main/screens/ToolShopScreen.java b/app/src/main/java/de/frajul/endlessroll/main/screens/ToolShopScreen.java
index 3c6016a..80503d8 100644
--- a/app/src/main/java/de/frajul/endlessroll/main/screens/ToolShopScreen.java
+++ b/app/src/main/java/de/frajul/endlessroll/main/screens/ToolShopScreen.java
@@ -87,7 +87,7 @@ public class ToolShopScreen extends Screen implements View.OnCli
@Override
public void prepareToBeShown() {
- gameActivity.getSoundManager().setCurrentMusic(gameActivity.getSoundManager().menuMusic);
+ gameActivity.getSoundManager().menuMusic.start();
topBar.update();
slotSettings.unlockSlotsIfLevelReached(gameActivity.getUser().getLevelUpBounties());
diff --git a/app/src/main/java/de/frajul/endlessroll/main/screens/WorldsScreen.java b/app/src/main/java/de/frajul/endlessroll/main/screens/WorldsScreen.java
index 2283a52..be381dd 100644
--- a/app/src/main/java/de/frajul/endlessroll/main/screens/WorldsScreen.java
+++ b/app/src/main/java/de/frajul/endlessroll/main/screens/WorldsScreen.java
@@ -42,7 +42,7 @@ public class WorldsScreen extends Screen implements WorldButtonO
@Override
public void prepareToBeShown() {
- gameActivity.getSoundManager().setCurrentMusic(gameActivity.getSoundManager().menuMusic);
+ gameActivity.getSoundManager().menuMusic.start();
topBar.update();
for (WorldButton button : worldButtons)
diff --git a/app/src/main/java/de/frajul/endlessroll/sounds/Music.java b/app/src/main/java/de/frajul/endlessroll/sounds/Music.java
index 02c0af8..1e2e421 100644
--- a/app/src/main/java/de/frajul/endlessroll/sounds/Music.java
+++ b/app/src/main/java/de/frajul/endlessroll/sounds/Music.java
@@ -12,64 +12,57 @@ public class Music {
private ExceptionHandler handler;
private MediaPlayer player;
- private boolean mute;
- private boolean paused = true;
- private int pausedPosition;
+ private boolean started;
+ private boolean muted;
+ private boolean paused;
+ private boolean activityPaused;
public Music(ExceptionHandler handler, Context context, int id) {
this.handler = handler;
player = MediaPlayer.create(context, id);
}
- public void setMute(boolean mute) {
- this.mute = mute;
- if (mute && !paused) {
- stop();
- paused = false;
- }
- if (!mute && !paused)
- start();
- }
-
- public void pause() {
- try {
- if (!paused) {
- player.pause();
- paused = true;
- pausedPosition = player.getCurrentPosition();
- }
- } catch (Exception e) {
- handler.onException(e);
- }
- }
-
public void start() {
- try {
- if (!mute)
- player.start();
- paused = false;
- } catch (Exception e) {
- handler.onException(e);
- }
+ started = true;
+ paused = false;
+ onStateChanged();
}
public void stop() {
- try {
- if (!paused)
- player.pause();
- player.seekTo(0);
- paused = true;
- } catch (Exception e) {
- handler.onException(e);
- }
+ started = false;
+ onStateChanged();
+ reset();
}
+ public void setMuted(boolean muted) {
+ this.muted = muted;
+ onStateChanged();
+ }
- public void resume() {
+ public void pause() {
+ paused = true;
+ onStateChanged();
+ }
+
+ public void activityPause() {
+ activityPaused = true;
+ onStateChanged();
+ }
+
+ public void activityResume() {
+ activityPaused = false;
+ onStateChanged();
+ }
+
+ private void onStateChanged() {
try {
- if (paused) {
- player.seekTo(pausedPosition);
- start();
+ boolean newState = started && !muted && !paused && !activityPaused;
+ if (player.isPlaying()) {
+ if (!newState)
+ player.pause();
+ } else {
+ if (newState)
+ player.start();
}
} catch (Exception e) {
handler.onException(e);
diff --git a/app/src/main/java/de/frajul/endlessroll/sounds/Sound.java b/app/src/main/java/de/frajul/endlessroll/sounds/Sound.java
new file mode 100644
index 0000000..33b3cc1
--- /dev/null
+++ b/app/src/main/java/de/frajul/endlessroll/sounds/Sound.java
@@ -0,0 +1,55 @@
+package de.frajul.endlessroll.sounds;
+
+/**
+ * Created by Julian on 17.01.2018.
+ */
+
+public class Sound {
+
+ private int soundId;
+ private float volume;
+ private boolean looping;
+
+ public Sound(int soundId) {
+ this(soundId, 1.0f);
+ }
+
+ public Sound(int soundId, float volume) {
+ this(soundId, volume, false);
+ }
+
+ public Sound(int soundId, boolean looping) {
+ this(soundId, 1.0f, looping);
+ }
+
+ public Sound(int soundId, float volume, boolean looping) {
+ this.soundId = soundId;
+ this.volume = volume;
+ this.looping = looping;
+ }
+
+ public int getSoundId() {
+ return soundId;
+ }
+
+ public void setSoundId(int soundId) {
+ this.soundId = soundId;
+ }
+
+ public float getVolume() {
+ return volume;
+ }
+
+ public void setVolume(float volume) {
+ this.volume = volume;
+ }
+
+ public boolean isLooping() {
+ return looping;
+ }
+
+ public void setLooping(boolean looping) {
+ this.looping = looping;
+ }
+
+}
diff --git a/app/src/main/java/de/frajul/endlessroll/sounds/SoundManager.java b/app/src/main/java/de/frajul/endlessroll/sounds/SoundManager.java
index 75b2865..659d60b 100644
--- a/app/src/main/java/de/frajul/endlessroll/sounds/SoundManager.java
+++ b/app/src/main/java/de/frajul/endlessroll/sounds/SoundManager.java
@@ -4,8 +4,10 @@ import android.content.Context;
import android.media.AudioManager;
import android.media.SoundPool;
+import java.util.ArrayList;
+import java.util.List;
+
import de.frajul.endlessroll.R;
-import de.frajul.endlessroll.entities.tools.ToolType;
import de.frajul.endlessroll.main.GameActivity;
import de.frajul.endlessroll.main.GameLog;
@@ -16,52 +18,93 @@ public class SoundManager {
private Context context;
private SoundPool soundPool;
- private boolean soundOn;
+ private boolean soundsMuted;
+ private boolean musicMuted;
public final Music menuMusic;
public final Music gameMusic;
- private Music currentMusic;
+
+ public final Sound goalSound;
+ public final Sound dieSound;
+ public final Sound collectStarSound;
+ public final Sound collectEnergySound;
+ public final Sound countdownSound;
+ public final Sound explosionSound;
+ public final Sound fireworkSound;
+ public final Sound stasisSound;
+ public final Sound mushroomSound;
+ public final Sound springSound;
+ public final Sound placeToolSound;
+ public final Sound magnetSound;
+
+ private List allStartedStreams = new ArrayList<>();
public SoundManager(GameActivity activity) {
this.context = activity;
- soundPool = new SoundPool(2, AudioManager.STREAM_MUSIC, 0);
+ soundPool = new SoundPool(10, AudioManager.STREAM_MUSIC, 0);
menuMusic = new Music(activity, activity, R.raw.music_menu);
menuMusic.getPlayer().setLooping(true);
gameMusic = new Music(activity, context, R.raw.music_game);
gameMusic.getPlayer().setLooping(true);
- ToolType.loadAllPlacingSounds(this);
+
+ goalSound = new Sound(loadSound(R.raw.sound_goal));
+ dieSound = new Sound(loadSound(R.raw.sound_die));
+ collectStarSound = new Sound(loadSound(R.raw.sound_collect_star), .7f);
+ collectEnergySound = new Sound(loadSound(R.raw.sound_collect_energy));
+ countdownSound = new Sound(loadSound(R.raw.sound_countdown));
+ explosionSound = new Sound(loadSound(R.raw.sound_explosion), 2);
+ fireworkSound = new Sound(loadSound(R.raw.sound_firework));
+ stasisSound = new Sound(loadSound(R.raw.sound_stasis), 1.3f, true);
+ mushroomSound = new Sound(loadSound(R.raw.sound_mushroom));
+ springSound = new Sound(loadSound(R.raw.sound_spring), 1.5f);
+ placeToolSound = new Sound(loadSound(R.raw.sound_place_tool), 1.5f);
+ magnetSound = new Sound(loadSound(R.raw.sound_magnet), 1.2f, true);
}
- public void setCurrentMusic(Music music) {
- if (currentMusic != null && !currentMusic.equals(music)) {
- currentMusic.pause();
+ public void setSoundsMuted(boolean soundsMuted) {
+ this.soundsMuted = soundsMuted;
+ for (SoundStream stream : allStartedStreams) {
+ float systemVolume = getSystemVolume();
+ soundPool.setVolume(stream.getId(), systemVolume * stream.getModifiedVolume(),
+ systemVolume * stream.getModifiedVolume());
}
- this.currentMusic = music;
- if (music != null)
- currentMusic.start();
}
- public void setSoundOn(boolean on) {
- this.soundOn = on;
- menuMusic.setMute(!on);
- gameMusic.setMute(!on);
+ public void setMusicMuted(boolean musicMuted) {
+ this.musicMuted = musicMuted;
+ menuMusic.setMuted(musicMuted);
+ gameMusic.setMuted(musicMuted);
}
- public boolean isSoundOn() {
- return soundOn;
+ public boolean isSoundsMuted() {
+ return soundsMuted;
}
- public void pause() {
+ public boolean isMusicMuted() {
+ return musicMuted;
+ }
+
+ public void activityPause() {
soundPool.autoPause();
- if (currentMusic != null)
- currentMusic.pause();
+ gameMusic.activityPause();
+ menuMusic.activityPause();
}
- public void resume() {
+ public void activityResume() {
soundPool.autoResume();
- if (currentMusic != null)
- currentMusic.resume();
+ gameMusic.activityResume();
+ menuMusic.activityResume();
+ }
+
+ public void pauseAllSounds() {
+ for (SoundStream stream : allStartedStreams)
+ soundPool.pause(stream.getId());
+ }
+
+ public void resumeAllSounds() {
+ for (SoundStream stream : allStartedStreams)
+ soundPool.resume(stream.getId());
}
public void destroy() {
@@ -75,21 +118,43 @@ public class SoundManager {
return sound;
}
- public void playSound(int id) {
- float volume = getVolume();
- int feedback = soundPool.play(id, volume, volume, 1, 0, 1);
- if (feedback == 0)
- GameLog.e("SoundId: " + id + " cannot be played");
+ public SoundStream playSound(Sound sound) {
+ float systemVolume = getSystemVolume();
+ int streamId = soundPool.play(sound.getSoundId(), systemVolume * sound.getVolume(),
+ systemVolume * sound.getVolume(), 1, sound.isLooping() ? -1 : 0, 1);
+ if (streamId == 0)
+ GameLog.e("SoundId: " + sound.getSoundId() + " cannot be played");
+ SoundStream soundStream = new SoundStream(streamId, sound.getVolume());
+ allStartedStreams.add(soundStream);
+ return soundStream;
}
- private float getVolume() {
- if (soundOn) {
- AudioManager manager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
- float volume = manager.getStreamVolume(AudioManager.STREAM_MUSIC);
- float maxVolume = manager.getStreamMaxVolume(AudioManager.STREAM_MUSIC);
- return volume / maxVolume;
+ public void onStreamVolumeChanged(SoundStream stream) {
+ if (!soundsMuted) {
+ float systemVolume = getSystemVolume();
+ soundPool.setVolume(stream.getId(), systemVolume * stream.getModifiedVolume(),
+ systemVolume * stream.getModifiedVolume());
}
- return 0;
+ }
+
+ public void stopSound(SoundStream stream) {
+ allStartedStreams.remove(stream);
+ soundPool.stop(stream.getId());
+ }
+
+ public void stopAllSounds() {
+ for (SoundStream stream : allStartedStreams)
+ soundPool.stop(stream.getId());
+ allStartedStreams.clear();
+ }
+
+ private float getSystemVolume() {
+ if (soundsMuted)
+ return 0;
+ AudioManager manager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
+ float volume = manager.getStreamVolume(AudioManager.STREAM_MUSIC);
+ float maxVolume = manager.getStreamMaxVolume(AudioManager.STREAM_MUSIC);
+ return volume / maxVolume;
}
}
diff --git a/app/src/main/java/de/frajul/endlessroll/sounds/SoundStream.java b/app/src/main/java/de/frajul/endlessroll/sounds/SoundStream.java
new file mode 100644
index 0000000..abf4240
--- /dev/null
+++ b/app/src/main/java/de/frajul/endlessroll/sounds/SoundStream.java
@@ -0,0 +1,37 @@
+package de.frajul.endlessroll.sounds;
+
+/**
+ * Created by Julian on 19.01.2018.
+ */
+
+public class SoundStream {
+
+ private int id;
+ private float soundVolume;
+ private float currentVolumeModifier;
+
+ public SoundStream(int id, float soundVolume) {
+ this.id = id;
+ this.soundVolume = soundVolume;
+ }
+
+ public float getModifiedVolume() {
+ return soundVolume * currentVolumeModifier;
+ }
+
+ public int getId() {
+ return id;
+ }
+
+ public float getSoundVolume() {
+ return soundVolume;
+ }
+
+ public float getCurrentVolumeModifier() {
+ return currentVolumeModifier;
+ }
+
+ public void setCurrentVolumeModifier(float currentVolumeModifier) {
+ this.currentVolumeModifier = currentVolumeModifier;
+ }
+}
diff --git a/app/src/main/java/de/frajul/endlessroll/views/Countdown.java b/app/src/main/java/de/frajul/endlessroll/views/Countdown.java
index 844e11f..d2d9d1b 100644
--- a/app/src/main/java/de/frajul/endlessroll/views/Countdown.java
+++ b/app/src/main/java/de/frajul/endlessroll/views/Countdown.java
@@ -1,7 +1,6 @@
package de.frajul.endlessroll.views;
import android.graphics.Typeface;
-import android.view.View;
import android.view.animation.Animation;
import android.view.animation.AnimationSet;
import android.view.animation.AnimationUtils;
@@ -9,6 +8,8 @@ import android.widget.TextView;
import de.frajul.endlessroll.R;
import de.frajul.endlessroll.main.game.Game;
+import de.frajul.endlessroll.sounds.SoundManager;
+import de.frajul.endlessroll.sounds.SoundStream;
/**
* Created by Julian on 31.07.2016.
@@ -18,26 +19,35 @@ public class Countdown implements Animation.AnimationListener {
private Game game;
private AnimationSet animations;
private TextView textView;
+ private SoundManager soundManager;
+ private SoundStream soundStream;
private boolean firstHalfRepeated = true;
private int repeatCount = 0;
- public Countdown(Game game, Typeface typeface, TextView textView) {
+ public Countdown(Game game, SoundManager soundManager, Typeface typeface, TextView textView) {
this.game = game;
+ this.soundManager = soundManager;
this.textView = textView;
this.textView.setTypeface(typeface);
- animations = (AnimationSet) AnimationUtils.loadAnimation(game.getContext(), R.anim.countdown);
+ animations = (AnimationSet) AnimationUtils
+ .loadAnimation(game.getContext(), R.anim.countdown);
for (Animation animation : animations.getAnimations())
animation.setAnimationListener(this);
}
public void start() {
- reset();
- textView.startAnimation(animations);
+ if (textView.getAnimation() == null || !textView.getAnimation().isInitialized()) {
+ reset();
+ textView.startAnimation(animations);
+ soundStream = soundManager.playSound(soundManager.countdownSound);
+ }
}
public void stop() {
textView.clearAnimation();
+ if (soundStream != null)
+ soundManager.stopSound(soundStream);
}
private void reset() {
@@ -59,6 +69,7 @@ public class Countdown implements Animation.AnimationListener {
public void onAnimationRepeat(Animation animation) {
if (!firstHalfRepeated)
repeatCount++;
+
firstHalfRepeated = !firstHalfRepeated;
textView.setText((3 - repeatCount) + "");
if (repeatCount == 1) {
diff --git a/app/src/main/java/de/frajul/endlessroll/views/GameOverMessage.java b/app/src/main/java/de/frajul/endlessroll/views/GameOverMessage.java
index 09abf77..08a4e0b 100644
--- a/app/src/main/java/de/frajul/endlessroll/views/GameOverMessage.java
+++ b/app/src/main/java/de/frajul/endlessroll/views/GameOverMessage.java
@@ -18,6 +18,7 @@ import de.frajul.endlessroll.main.screens.Screen;
public class GameOverMessage implements View.OnClickListener {
private Animation fadeIn;
+ private GameActivity gameActivity;
private Game game;
private View layout;
@@ -27,6 +28,7 @@ public class GameOverMessage implements View.OnClickListener {
public GameOverMessage(Game game, GameActivity gameActivity, View layout) {
this.game = game;
+ this.gameActivity = gameActivity;
this.layout = layout;
layout.setVisibility(View.GONE);
Typeface typeface = gameActivity.getTypeface();
@@ -61,6 +63,7 @@ public class GameOverMessage implements View.OnClickListener {
private void hide() {
layout.clearAnimation();
layout.setVisibility(View.GONE);
+ gameActivity.getSoundManager().stopAllSounds();
}
@Override
diff --git a/app/src/main/java/de/frajul/endlessroll/views/GoalMessage.java b/app/src/main/java/de/frajul/endlessroll/views/GoalMessage.java
index 2e89a32..b3e1339 100644
--- a/app/src/main/java/de/frajul/endlessroll/views/GoalMessage.java
+++ b/app/src/main/java/de/frajul/endlessroll/views/GoalMessage.java
@@ -87,6 +87,7 @@ public class GoalMessage implements GoalMessageLevelButtonOnClickListener, View.
private void hide() {
layout.clearAnimation();
layout.setVisibility(View.GONE);
+ gameActivity.getSoundManager().stopAllSounds();
}
@Override
diff --git a/app/src/main/java/de/frajul/endlessroll/views/ViewManager.java b/app/src/main/java/de/frajul/endlessroll/views/ViewManager.java
index c2d644f..2c45b72 100644
--- a/app/src/main/java/de/frajul/endlessroll/views/ViewManager.java
+++ b/app/src/main/java/de/frajul/endlessroll/views/ViewManager.java
@@ -51,7 +51,7 @@ public class ViewManager implements View.OnClickListener {
gameOverMessage = new GameOverMessage(game, gameActivity,
layout.findViewById(R.id.game_game_over_message));
goalMessage = new GoalMessage(game, gameActivity, layout.findViewById(R.id.game_goal_message));
- countdown = new Countdown(game, gameActivity.getTypeface(),
+ countdown = new Countdown(game, gameActivity.getSoundManager(), gameActivity.getTypeface(),
(TextView) layout.findViewById(R.id.game_countdown));
}
});
diff --git a/app/src/main/res/drawable/guis_music_off.png b/app/src/main/res/drawable/guis_music_off.png
new file mode 100644
index 0000000000000000000000000000000000000000..5fbc686fc6d4b46a043b3b6ceb4bd712f5e78f0d
GIT binary patch
literal 17350
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 `TkBR~)nB
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
IM6N<$f@m}!y#N3J
delta 2848
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
diff --git a/app/src/main/res/drawable/xml_selector_music.xml b/app/src/main/res/drawable/xml_selector_music.xml
new file mode 100644
index 0000000..4c8f62c
--- /dev/null
+++ b/app/src/main/res/drawable/xml_selector_music.xml
@@ -0,0 +1,10 @@
+
+
+
+