music qol

Kade-github · May 18, 2024 · 36febe6 · 36febe6
1 parent 5100414
commit 36febe6
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 40 deletions.
diff --git a/src/Game/MusicManager.cpp b/src/Game/MusicManager.cpp
@@ -1,6 +1,8 @@
 #include "MusicManager.h"
 #include "Game.h"
 
+#include "Scenes/Gameplay.h"
+
 #include <filesystem>
 #include <bass.h>
 #include "Data/Settings.h"
@@ -44,6 +46,18 @@ void MusicManager::GenerateTrackList()
 
 	trackList.clear();
 
+	Gameplay* gp = (Gameplay*)Game::instance->currentScene;
+
+
+	Chunk* c = WorldManager::instance->GetChunk(gp->player->position.x, gp->player->position.z);
+
+	Region& r = WorldManager::instance->GetRegion(gp->player->position.x, gp->player->position.z);
+
+	if (c != nullptr && r.loaded && r.data.doesBlockExistInRange(gp->player->position.x, gp->player->position.y, gp->player->position.z, RUINED_COBBLESTONE, 32))
+		trackList.push_back("ruins");
+	else if (c != nullptr && gp->player->position.y < c->GetHighestBlock(gp->player->position.x, gp->player->position.z))
+		trackList.push_back("cave");
+
 	std::string path = "Assets/Music/tracks/";
 
 	for (const auto& entry : std::filesystem::directory_iterator(path))
@@ -67,6 +81,17 @@ void MusicManager::GenerateAmbientTrackList()
 {
 	trackList.clear();
 
+	Gameplay* gp = (Gameplay*)Game::instance->currentScene;
+
+	Chunk* c = WorldManager::instance->GetChunk(gp->player->position.x, gp->player->position.z);
+
+	Region& r = WorldManager::instance->GetRegion(gp->player->position.x, gp->player->position.z);
+
+	if (c != nullptr && r.loaded && r.data.doesBlockExistInRange(gp->player->position.x, gp->player->position.y, gp->player->position.z, RUINED_COBBLESTONE, 32))
+		trackList.push_back("ruins");
+	else if (c != nullptr && gp->player->position.y < c->GetHighestBlock(gp->player->position.x, gp->player->position.z))
+		trackList.push_back("cave");
+
 	trackList.push_back("ambientocclusion");
 	trackList.push_back("imsotired");
 	trackList.push_back("somethinglurks");
@@ -117,7 +142,7 @@ void MusicManager::PlayMusic(std::string path, float fadeDuration)
 {
 	std::string rPath = "Assets/Music/tracks/" + path + ".mp3";
 
-	if (ambient)
+	if (ambient || path.find("caves") != std::string::npos || path.find("ruins") != std::string::npos)
 		rPath = "Assets/Music/amb/" + path + ".mp3";
 
 	if (currentSong == rPath)

diff --git a/src/Game/Objects/Base/Player.cpp b/src/Game/Objects/Base/Player.cpp
@@ -837,7 +837,6 @@ void Player::Draw()
 						{
 							Data::InventoryItem item = { Data::ITEM_KNOWLEDGEMENT_TABLET, 1 };
 
-							item.SetNBT("used", "false");
 							item.SetNBT("hint", "-1");
 
 							Gameplay* scene = (Gameplay*)Game::instance->currentScene;

diff --git a/src/Game/Scenes/Gameplay.cpp b/src/Game/Scenes/Gameplay.cpp
@@ -590,14 +590,7 @@ void Gameplay::UnloadChunk(Chunk* c)
 
 void Gameplay::KeyPress(int key)
 {
-
-	if (key == GLFW_KEY_F3)
-		MusicManager::GetInstance()->PlayNext();
-
 	if (key == GLFW_KEY_F5)
-		wm->SaveWorldNow();
-
-	if (key == GLFW_KEY_F6)
 	{
 		Chunk* c = wm->GetChunk(player->position.x, player->position.z);
 
@@ -606,16 +599,7 @@ void Gameplay::KeyPress(int key)
 	}
 
 
-	if (key == GLFW_KEY_Y)
-	{
-		Data::InventoryItem it(Data::ITEM_TORCH, 4);
-
-		for (int i = 0; i < 4; i++)
-			player->playerData.GiveItem(it);
-
-	}
-
-	if (key == GLFW_KEY_P)
+	/*if (key == GLFW_KEY_P)
 	{
 		recordBlockData = !recordBlockData;
 	}
@@ -672,27 +656,7 @@ void Gameplay::KeyPress(int key)
 			firstBlock = glm::vec3(0, 0, 0);
 
 		blockData.clear();
-	}
-
-	if (key == GLFW_KEY_O)
-	{
-		mm->lastWave = glfwGetTime() - 30;
-	}
-
-	if (key == GLFW_KEY_F7)
-		player->freeCam = !player->freeCam;
-
-	if (key == GLFW_KEY_F10)
-		LightingManager::GetInstance()->sun.angle += 25;
-
-	if (key == GLFW_KEY_F11)
-	{
-		Camera* camera = Game::instance->GetCamera();
-
-		glm::vec3 dir = camera->cameraFront;
-
-		player->Launch(dir, 35, 1.0f);
-	}
+	}*/
 
 	if (key == GLFW_KEY_F12)
 	{