Initial dialog, updated girl model
This commit is contained in:
1 parent
8214342248
commit
d4bc73f732
9 files changed
+201028
-13
No files matched your search
+7
-5
@@ -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:
|
||||
|
||||
Reference in new issue
Block a user