fix timetyper and dialog start by click on npc
This commit is contained in:
parent
422ff1fbe3
commit
db8b9b7a18
@ -32,7 +32,12 @@ end
|
||||
|
||||
function on_npc_interact(npc_index)
|
||||
print("[Lua] NPC interaction! Index: " .. tostring(npc_index))
|
||||
game_api.receive_npc_gift(npc_index)
|
||||
|
||||
if npc_index == 1 then
|
||||
game_api.start_dialogue("test_line_dialogue")
|
||||
else
|
||||
game_api.receive_npc_gift(npc_index)
|
||||
end
|
||||
end
|
||||
|
||||
print("Lua script loaded successfully!")
|
||||
16
src/Game.cpp
16
src/Game.cpp
@ -219,14 +219,14 @@ namespace ZL
|
||||
|
||||
dialogueSystem.init(renderer, CONST_ZIP_FILE);
|
||||
dialogueSystem.loadDatabase("resources/dialogue/sample_dialogues.json");
|
||||
dialogueSystem.addTriggerZone({
|
||||
/*dialogueSystem.addTriggerZone({
|
||||
"ghost_room_trigger",
|
||||
"test_line_dialogue",
|
||||
Eigen::Vector3f(0.0f, 0.0f, -8.5f),
|
||||
2.0f,
|
||||
true,
|
||||
false
|
||||
});
|
||||
});*/
|
||||
|
||||
scriptEngine.init(this);
|
||||
|
||||
@ -487,7 +487,11 @@ namespace ZL
|
||||
|
||||
lastTickCount = newTickCount;
|
||||
|
||||
if (player) player->update(delta);
|
||||
//if (player) player->update(delta);
|
||||
if (player) {
|
||||
player->update(delta);
|
||||
dialogueSystem.update(static_cast<int>(delta), player->position);
|
||||
}
|
||||
for (auto& npc : npcs) npc->update(delta);
|
||||
|
||||
// Check if player reached target interactive object
|
||||
@ -518,9 +522,9 @@ namespace ZL
|
||||
}
|
||||
|
||||
//for (auto& npc : npcs) npc->update(delta);
|
||||
if (player) {
|
||||
dialogueSystem.update(static_cast<int>(delta), player->position);
|
||||
}
|
||||
//if (player) {
|
||||
// dialogueSystem.update(static_cast<int>(delta), player->position);
|
||||
//}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user