diff --git a/res/audio/effects/break.ogg b/res/audio/effects/break.ogg new file mode 100644 index 0000000..facd2f1 Binary files /dev/null and b/res/audio/effects/break.ogg differ diff --git a/res/audio/effects/click.ogg b/res/audio/effects/click.ogg new file mode 100644 index 0000000..8f207f0 Binary files /dev/null and b/res/audio/effects/click.ogg differ diff --git a/res/audio/effects/crate.ogg b/res/audio/effects/crate.ogg new file mode 100644 index 0000000..1c323ab Binary files /dev/null and b/res/audio/effects/crate.ogg differ diff --git a/res/audio/effects/door.ogg b/res/audio/effects/door.ogg new file mode 100644 index 0000000..66ead38 Binary files /dev/null and b/res/audio/effects/door.ogg differ diff --git a/res/audio/effects/drop.ogg b/res/audio/effects/drop.ogg new file mode 100644 index 0000000..6070697 Binary files /dev/null and b/res/audio/effects/drop.ogg differ diff --git a/res/audio/effects/eat.ogg b/res/audio/effects/eat.ogg new file mode 100644 index 0000000..5b7803e Binary files /dev/null and b/res/audio/effects/eat.ogg differ diff --git a/res/audio/effects/hurt.ogg b/res/audio/effects/hurt.ogg new file mode 100644 index 0000000..0aa91ce Binary files /dev/null and b/res/audio/effects/hurt.ogg differ diff --git a/res/audio/effects/lose.ogg b/res/audio/effects/lose.ogg new file mode 100644 index 0000000..debb1c4 Binary files /dev/null and b/res/audio/effects/lose.ogg differ diff --git a/res/audio/effects/mouse1.ogg b/res/audio/effects/mouse1.ogg new file mode 100644 index 0000000..9d582eb Binary files /dev/null and b/res/audio/effects/mouse1.ogg differ diff --git a/res/audio/effects/mouse2.ogg b/res/audio/effects/mouse2.ogg new file mode 100644 index 0000000..71bd0f1 Binary files /dev/null and b/res/audio/effects/mouse2.ogg differ diff --git a/res/audio/effects/mouse3.ogg b/res/audio/effects/mouse3.ogg new file mode 100644 index 0000000..f24f731 Binary files /dev/null and b/res/audio/effects/mouse3.ogg differ diff --git a/res/audio/effects/mouse4.ogg b/res/audio/effects/mouse4.ogg new file mode 100644 index 0000000..d2289e5 Binary files /dev/null and b/res/audio/effects/mouse4.ogg differ diff --git a/res/audio/effects/mouse5.ogg b/res/audio/effects/mouse5.ogg new file mode 100644 index 0000000..430850e Binary files /dev/null and b/res/audio/effects/mouse5.ogg differ diff --git a/res/audio/effects/pickup.ogg b/res/audio/effects/pickup.ogg new file mode 100644 index 0000000..e0c145e Binary files /dev/null and b/res/audio/effects/pickup.ogg differ diff --git a/res/audio/shutter.ogg b/res/audio/effects/shutter.ogg similarity index 100% rename from res/audio/shutter.ogg rename to res/audio/effects/shutter.ogg diff --git a/res/audio/effects/win.ogg b/res/audio/effects/win.ogg new file mode 100644 index 0000000..8246b1e Binary files /dev/null and b/res/audio/effects/win.ogg differ diff --git a/res/audio/music/8bit_Dungeon_Boss.ogg b/res/audio/music/8bit_Dungeon_Boss.ogg new file mode 100644 index 0000000..4e884de Binary files /dev/null and b/res/audio/music/8bit_Dungeon_Boss.ogg differ diff --git a/res/audio/music/8bit_Dungeon_Level.ogg b/res/audio/music/8bit_Dungeon_Level.ogg new file mode 100644 index 0000000..ca29709 Binary files /dev/null and b/res/audio/music/8bit_Dungeon_Level.ogg differ diff --git a/res/audio/music/Home_Base_Groove.ogg b/res/audio/music/Home_Base_Groove.ogg new file mode 100644 index 0000000..731e081 Binary files /dev/null and b/res/audio/music/Home_Base_Groove.ogg differ diff --git a/res/audio/music/Lightless Dawn.mp3 b/res/audio/music/Lightless Dawn.mp3 deleted file mode 100644 index 9932a05..0000000 Binary files a/res/audio/music/Lightless Dawn.mp3 and /dev/null differ diff --git a/res/audio/music/Video Dungeon Crawl.mp3 b/res/audio/music/Video Dungeon Crawl.mp3 deleted file mode 100644 index 512dd85..0000000 Binary files a/res/audio/music/Video Dungeon Crawl.mp3 and /dev/null differ diff --git a/src/mightypork/rogue/Launcher.java b/src/mightypork/rogue/Launcher.java index 9a3ca3b..63d65a2 100644 --- a/src/mightypork/rogue/Launcher.java +++ b/src/mightypork/rogue/Launcher.java @@ -76,6 +76,7 @@ public class Launcher { final BaseApp app = new RogueApp(workdir, true); app.opt().setLogLevel(llFile, llSyso); + app.opt().setBusLogging(false);//TODO temporary app.start(); } diff --git a/src/mightypork/rogue/RogueApp.java b/src/mightypork/rogue/RogueApp.java index 987a9d6..b27d281 100644 --- a/src/mightypork/rogue/RogueApp.java +++ b/src/mightypork/rogue/RogueApp.java @@ -127,6 +127,8 @@ public final class RogueApp extends BaseApp implements ViewportChangeListener, S @Override protected void postInit() { + + getEventBus().send(new MainLoopRequest(new Runnable() { @Override @@ -165,10 +167,11 @@ public final class RogueApp extends BaseApp implements ViewportChangeListener, S Res.getSoundEffect("gui.shutter").play(0.8); } + @Override protected void writeLogHeader() { - Log.i("## Starting Rogue v."+Const.VERSION+" ##"); + Log.i("## Starting Rogue v." + Const.VERSION + " ##"); super.writeLogHeader(); } } diff --git a/src/mightypork/rogue/RogueResources.java b/src/mightypork/rogue/RogueResources.java index ccaad9c..ea16563 100644 --- a/src/mightypork/rogue/RogueResources.java +++ b/src/mightypork/rogue/RogueResources.java @@ -41,7 +41,35 @@ public class RogueResources implements ResourceSetup { @Override public void addSounds(SoundRegistry sounds) { - sounds.addEffect("gui.shutter", "/res/audio/shutter.ogg", 1, 1); + + //sounds.addLoop("music.dungeon", "/res/audio/music/Lightless_Dawn.ogg", 1, 1, 3, 1.5); + sounds.addLoop("music.menu", "/res/audio/music/Home_Base_Groove.ogg", 1, 0.7, 3, 1.5); + sounds.addLoop("music.dungeon", "/res/audio/music/8bit_Dungeon_Level.ogg", 1, 0.6, 3, 1.5); + //sounds.addLoop("music.dungeon2.boss", "/res/audio/music/8bit_Dungeon_Boss.ogg", 1, 0.6, 3, 1.5); + + sounds.addEffect("gui.shutter", "/res/audio/effects/shutter.ogg", 1, 1); + sounds.addEffect("gui.click", "/res/audio/effects/click.ogg", 1, 1); + + sounds.addEffect("game.win", "/res/audio/effects/win.ogg", 1, 0.7); + sounds.addEffect("game.lose", "/res/audio/effects/lose.ogg", 1, 1); + + sounds.addEffect("item.drop", "/res/audio/effects/drop.ogg", 1, 1); + sounds.addEffect("item.pickup", "/res/audio/effects/pickup.ogg", 1, 1); + sounds.addEffect("item.break", "/res/audio/effects/break.ogg", 1, 1); + + sounds.addEffect("player.eat", "/res/audio/effects/eat.ogg", 1, 1); + sounds.addEffect("player.hurt", "/res/audio/effects/hurt.ogg", 1, 1); + + sounds.addEffect("crate.open", "/res/audio/effects/crate.ogg", 1, 1); + + sounds.addEffect("door.open", "/res/audio/effects/door.ogg", 1, 1); + sounds.addEffect("door.close", "/res/audio/effects/door.ogg", 0.8, 1); + + sounds.addEffect("rat.sqeak1", "/res/audio/effects/mouse1.ogg", 1, 1); + sounds.addEffect("rat.sqeak2", "/res/audio/effects/mouse2.ogg", 1, 1); + sounds.addEffect("rat.sqeak3", "/res/audio/effects/mouse3.ogg", 1, 1); + sounds.addEffect("rat.sqeak4", "/res/audio/effects/mouse4.ogg", 1, 1); + sounds.addEffect("rat.sqeak5", "/res/audio/effects/mouse5.ogg", 1, 1); } diff --git a/src/mightypork/rogue/screens/game/LayerWin.java b/src/mightypork/rogue/screens/game/LayerWin.java index 0720fef..10d2388 100644 --- a/src/mightypork/rogue/screens/game/LayerWin.java +++ b/src/mightypork/rogue/screens/game/LayerWin.java @@ -15,6 +15,7 @@ import mightypork.gamecore.gui.components.painters.TextPainter; import mightypork.gamecore.gui.screens.impl.FadingLayer; import mightypork.gamecore.input.KeyStroke.Edge; import mightypork.gamecore.resources.Res; +import mightypork.gamecore.resources.audio.SoundSystem; import mightypork.gamecore.resources.fonts.GLFont; import mightypork.gamecore.util.math.color.pal.RGB; import mightypork.gamecore.util.math.constraints.num.Num; @@ -81,4 +82,11 @@ public class LayerWin extends FadingLayer { return 300; } + @Override + protected void onShowFinished() + { + getSoundSystem().fadeOutAllLoops(); + Res.getSoundEffect("game.win").play(1); + } + } diff --git a/src/mightypork/rogue/screens/game/ScreenGame.java b/src/mightypork/rogue/screens/game/ScreenGame.java index 7f94139..294cbf3 100644 --- a/src/mightypork/rogue/screens/game/ScreenGame.java +++ b/src/mightypork/rogue/screens/game/ScreenGame.java @@ -8,8 +8,12 @@ import mightypork.gamecore.core.events.UserQuitRequest; import mightypork.gamecore.core.modules.AppAccess; import mightypork.gamecore.gui.Action; import mightypork.gamecore.gui.ActionGroup; +import mightypork.gamecore.input.KeyStroke; import mightypork.gamecore.input.KeyStroke.Edge; +import mightypork.gamecore.input.Keys; import mightypork.gamecore.logging.Log; +import mightypork.gamecore.resources.Res; +import mightypork.gamecore.resources.audio.SoundSystem; import mightypork.gamecore.util.math.color.Color; import mightypork.rogue.Const; import mightypork.rogue.RogueStateManager.RogueState; @@ -306,6 +310,9 @@ public class ScreenGame extends RogueScreen implements PlayerDeathHandler, GameW setState(GScrState.WORLD); hideAllPopups(); + + getSoundSystem().fadeOutAllLoops(); + Res.getSoundLoop("music.dungeon").fadeIn(); } @@ -314,6 +321,8 @@ public class ScreenGame extends RogueScreen implements PlayerDeathHandler, GameW { super.onScreenLeave(); WorldProvider.get().setListening(false); + + Res.getSoundLoop("music.dungeon").fadeOut(); } diff --git a/src/mightypork/rogue/screens/menu/ScreenMainMenu.java b/src/mightypork/rogue/screens/menu/ScreenMainMenu.java index 5f709dd..abaabab 100644 --- a/src/mightypork/rogue/screens/menu/ScreenMainMenu.java +++ b/src/mightypork/rogue/screens/menu/ScreenMainMenu.java @@ -33,13 +33,6 @@ import mightypork.rogue.screens.RogueScreen; public class ScreenMainMenu extends RogueScreen { - public ScreenMainMenu(AppAccess app) - { - super(app); - - addLayer(new MenuLayer(this)); - } - /** * The layer * @@ -134,4 +127,21 @@ public class ScreenMainMenu extends RogueScreen { } } + + + public ScreenMainMenu(AppAccess app) + { + super(app); + + addLayer(new MenuLayer(this)); + } + + @Override + protected void onScreenEnter() + { + super.onScreenEnter(); + + getSoundSystem().fadeOutAllLoops(); + Res.getSoundLoop("music.menu").fadeIn(); + } }