Working on main menu and tutorials

src/Game.cpp

@@ -210,7 +210,7 @@ namespace ZL
 			"resources/navigation/uni_interior4_n2_lr_hall.txt",
 			"resources/navigation/uni_interior4_n2_lr_tr_hall.txt",
 			"resources/navigation/uni_interior3_n2_lr_tr_hall_aiperi.txt",
-			"resources/navigation/uni_interior3_darklands_all_open.txt",
+			"resources/navigation/uni_interior3_darklands_all_open.txt", //5
 			"resources/navigation/uni_interior3_unlocked_hall.txt",
 			"resources/navigation/uni_interior3_unlocked_n3.txt",
 			"resources/navigation/uni_interior3_unlocked_s1.txt",
@@ -223,9 +223,9 @@ namespace ZL
 			"resources/navigation/uni_interior4_unlocked_s3_s2.txt",
 			"resources/navigation/uni_interior4_unlocked_s3_s1.txt",
 			"resources/navigation/uni_interior4_locked.txt" //17
-		};*/
+		};
+		*/
 		
-
 		uniInteriorParams.navigationJsonPaths = {
 			"resources/navigation/uni_interior4_unlocked_n2_new.json", //0
 			"resources/navigation/uni_interior3_n2_hall.json",
@@ -280,6 +280,10 @@ namespace ZL
 		locations["uni_interior"]->requestDarklandsTransition = [this]() { return startDarklandsTransition(); };
 		locations["uni_interior"]->requestAdvanceDarklandsHud = [this]() { menuManager.advanceUniIntDarklandsHud(); };
 		locations["uni_interior"]->requestClosePhone = [this]() { menuManager.closePhoneEntirely(); };
+		locations["uni_interior"]->requestReturnToMainMenu = [this]() {
+			this->currentLocation = nullptr;
+			menuManager.showMainMenu();
+			};
 		if (locations["uni_interior"]->player)
 			locations["uni_interior"]->player->onDeathAnimComplete = [this]() { startDarklandsTransition(); };
 		for (auto& npc : locations["uni_interior"]->npcs) {
@@ -309,6 +313,7 @@ namespace ZL
 		locations["uni_exterior"]->requestNightDayTransition = [this](bool isNight, bool isDawn) { this->menuManager.isNight = isNight; this->menuManager.isDawn = isDawn; };
 		locations["uni_exterior"]->requestDarklandsTransition = [this]() { return startDarklandsTransition(); };
 		locations["uni_exterior"]->requestClosePhone = [this]() { menuManager.closePhoneEntirely(); };
+		locations["uni_exterior"]->requestReturnToMainMenu = [this]() { menuManager.showMainMenu(); };
 		if (locations["uni_exterior"]->player)
 			locations["uni_exterior"]->player->onDeathAnimComplete = [this]() { startDarklandsTransition(); };
 
@@ -352,6 +357,7 @@ namespace ZL
 		locations["location_dorm"]->requestNightDayTransition = [this](bool isNight, bool isDawn) { this->menuManager.isNight = isNight; this->menuManager.isDawn = isDawn; };
 		locations["location_dorm"]->requestDarklandsTransition = [this]() { return startDarklandsTransition(); };
 		locations["location_dorm"]->requestClosePhone = [this]() { menuManager.closePhoneEntirely(); };
+		locations["location_dorm"]->requestReturnToMainMenu = [this]() { menuManager.showMainMenu(); };
 		if (locations["location_dorm"]->player)
 			locations["location_dorm"]->player->onDeathAnimComplete = [this]() { startDarklandsTransition(); };