added music to the main game

chrisj42 · Apr 17, 2018 · cd29d70 · cd29d70
1 parent 0b66080
commit cd29d70
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 1 deletion.
diff --git a/core/client/src/miniventure/game/client/GameClient.java b/core/client/src/miniventure/game/client/GameClient.java
@@ -12,6 +12,7 @@
 import miniventure.game.screen.ErrorScreen;
 import miniventure.game.screen.MainMenu;
 import miniventure.game.screen.MenuScreen;
+import miniventure.game.util.MyUtils;
 import miniventure.game.util.ProgressLogger;
 import miniventure.game.world.Chunk;
 import miniventure.game.world.Chunk.ChunkData;
@@ -27,6 +28,8 @@
 import miniventure.game.world.tile.ClientTile;
 
 import com.badlogic.gdx.Gdx;
+import com.badlogic.gdx.audio.Music;
+import com.badlogic.gdx.math.MathUtils;
 import com.badlogic.gdx.math.Vector2;
 import com.esotericsoftware.kryonet.Client;
 import com.esotericsoftware.kryonet.Connection;
@@ -69,6 +72,12 @@ public void received (Connection connection, Object object) {
 					SpawnData data = (SpawnData) object;
 					world.spawnPlayer(data);
 					ClientCore.setScreen(null);
+					Music song = ClientCore.setMusicTrack(Gdx.files.internal("audio/music/game.mp3"));
+					song.setOnCompletionListener(music -> {
+						music.stop();
+						MyUtils.delay(MathUtils.random(10_000, 30_000), music::play);
+					});
+					MyUtils.delay(1_000, song::play);
 				}
 
 				if(object instanceof TileUpdate) {

diff --git a/core/client/src/miniventure/game/screen/MainMenu.java b/core/client/src/miniventure/game/screen/MainMenu.java
@@ -112,7 +112,7 @@ public void clicked(InputEvent e, float x, float y) {
 			music.stop();
 			music.play();
 		}));*/
-		song.setVolume(0.5f);
+		//song.setVolume(0.5f);
 		//MyUtils.delay(100, song::play);
 		song.setLooping(true);
 		song.play();

diff --git a/core/game/assets/audio/music/game.mp3 b/core/game/assets/audio/music/game.mp3
diff --git a/notes/to-do.txt b/notes/to-do.txt
@@ -35,3 +35,7 @@ level system; note that levels will not solely be identified by depth (though th
 
 ****
 
+make some mobs hurt you, once I get more mob sprites.
+
+****
+