Fixing bugs, navigations, adding cutscenes

This commit is contained in:
Vladislav Khorev committed 2026-06-21 20:00:04 +03:00
1 parent 130e4411cb
commit 51977a9eea
28 files changed
+8163 -7510

No files matched your search

+3 -4
View File
@@ -448,12 +448,11 @@ namespace ZL
}
}
LocationSetup uniExteriorParams = uniInteriorParams;
uniExteriorParams.gameObjectsJsonPath = "resources/config2/gameobjects_uni_exterior_x.json";
uniExteriorParams.interactiveObjectsJsonPath = "resources/config2/interactive_objects_uni_exterior_x.json";
//uniExteriorParams.navigationJsonPaths = {"resources/navigation/uni_exterior2_all.txt"};
uniExteriorParams.navigationJsonPaths = { "resources/navigation/uni_exterior2_all.json" };
//uniExteriorParams.navigationJsonPaths = {"resources/navigation/uni_exterior3_all.json"};
uniExteriorParams.navigationJsonPaths = { "resources/navigation/uni_exterior3_trees_car.txt" };
uniExteriorParams.teleportsJsonPath = "resources/config2/teleports_uni_exterior.json";
uniExteriorParams.triggerZonesJsonPath = "resources/config2/trigger_zones_uni_exterior.json";
uniExteriorParams.lightsJsonPath = "resources/config2/lights_uni_exterior.json";
@@ -487,7 +486,6 @@ namespace ZL
params_dorm.npcsJsonPath = "resources/config2/npcs_dorm.json";
params_dorm.dialoguesJsonPath = "resources/dialogue/dorm_dialogues.json";
/*
params_dorm.navigationJsonPaths = {
"resources/navigation/dorm3_bca.json",
@@ -507,6 +505,7 @@ namespace ZL
"resources/navigation/dorm3_all_open.txt", //5
};
/*
params_dorm.navigationJsonPaths = {
"resources/navigation/dorm0_large.json",
+2 -1
View File
@@ -168,9 +168,10 @@ namespace ZL
dialogueSystem.init(renderer, CONST_ZIP_FILE);
dialogueSystem.loadDatabase(params.dialoguesJsonPath);
dialogueSystem.loadCutsceneDatabase("resources/dialogue/cutscenes005.json");
dialogueSystem.loadCutsceneDatabase("resources/dialogue/cutscenes006.json");
dialogueSystem.setQuestJournal(journal);
npcNameText = std::make_unique<TextRenderer>();
if (!npcNameText->init(renderer, "resources/fonts/DroidSans.ttf", 24, CONST_ZIP_FILE)) {
std::cerr << "Failed to init NPC name TextRenderer" << std::endl;
+1 -1
View File
@@ -453,7 +453,7 @@ namespace ZL
data.rotationY = rotDist(rng);
data.rotationZ = 0.0f;
data.positionX = loc.player->state.position.x();
data.positionY = loc.player->state.position.y()-0.1;
data.positionY = loc.player->state.position.y();//-0.1;
data.positionZ = loc.player->state.position.z();
data.scale = scaleDist(rng);