Initial dialog, updated girl model

src/Game.cpp

@@ -190,12 +190,13 @@ namespace ZL
 		params_dorm.roomTexturePath = "";
 		params_dorm.gameObjectsJsonPath = "resources/config2/gameobjects_dorm.json";
 		params_dorm.npcsJsonPath = "resources/config2/npcs_dorm.json";
-		params_dorm.dialoguesJsonPath = "resources/dialogue/sample_dialogues.json";
+		params_dorm.dialoguesJsonPath = "resources/dialogue/dorm_dialogues.json";
 		params_dorm.navigationJsonPath = "resources/config2/navigation_dorm.json";
 		params_dorm.teleportsJsonPath = "resources/config2/teleports_dorm.json";
 		params_dorm.scriptPath = "resources/start_dorm.lua";
 		params_dorm.playerPosition = Eigen::Vector3f(6.0357, 0, -16.0581);
 
+
 		locations["location_dorm"] = std::make_shared<Location>(renderer, inventory);
 		locations["location_dorm"]->setup(params_dorm);
 
@@ -516,15 +517,16 @@ namespace ZL
 				case SDLK_o:
 					//y = y + 0.002;
 					//currentLocation->player->hp = 200;
-					//currentLocation->npcs[3]->walkSpeed += 0.02f;
-					//std::cout << "Walk speed: " << currentLocation->npcs[3]->walkSpeed << std::endl;
+					currentLocation->npcs[0]->walkSpeed += 0.02f;
+					std::cout << "Walk speed: " << currentLocation->npcs[0]->walkSpeed << std::endl;
+
 					break;
 
 				case SDLK_k:
 					//y = y - 0.002;
 					std::cout << "Player pos: " << currentLocation->player->position.transpose() << std::endl;
-					//currentLocation->npcs[3]->walkSpeed -= 0.02f;
-					//std::cout << "Walk speed: " << currentLocation->npcs[3]->walkSpeed << std::endl;
+					currentLocation->npcs[0]->walkSpeed -= 0.02f;
+					std::cout << "Walk speed: " << currentLocation->npcs[0]->walkSpeed << std::endl;
 					break;
 
 				case SDLK_p:

src/Location.cpp

@@ -145,8 +145,6 @@ namespace ZL
 
 		setupNavigation(params.navigationJsonPath);
 
-		scriptEngine.init(this, &inventory, params.scriptPath);
-
 		dialogueSystem.init(renderer, CONST_ZIP_FILE);
 		dialogueSystem.loadDatabase(params.dialoguesJsonPath);
 
@@ -155,7 +153,7 @@ namespace ZL
 			std::cerr << "Failed to init NPC name TextRenderer" << std::endl;
 			npcNameText.reset();
 		}
-		dialogueSystem.loadDatabase("resources/dialogue/sample_dialogues.json");
+		//dialogueSystem.loadDatabase("resources/dialogue/sample_dialogues.json");
 		/*dialogueSystem.addTriggerZone({
 			"ghost_room_trigger",
 			"test_line_dialogue",
@@ -165,6 +163,8 @@ namespace ZL
 			false
 		});*/
 
+		scriptEngine.init(this, &inventory, params.scriptPath);
+
 
 	}