salmon-engine-projects/shadow-over-bishkek001
14
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Dialog fixing

Browse Source
This commit is contained in:
Vladislav Khorev committed 2026-05-22 22:32:05 +03:00
1 parent 8c200974c2
commit 84c8a7a27a
13 files changed
+169 -43
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

resources/dialogue/uni_interior_dialogues.json
+13 -9
View File
@@ -55,6 +55,7 @@
{
"id": "aiperi_dialog001",
"start": "line_1",
"uninterruptible": true,
"nodes": [
{
"id": "line_1",
@@ -325,6 +326,7 @@
{
"id": "teacher_dialog002",
"start": "line_1",
"uninterruptible": true,
"nodes": [
{
"id": "line_1",
@@ -475,6 +477,7 @@
{
"id": "teacher_dialog005",
"start": "line_1",
"uninterruptible": true,
"nodes": [
{
"id": "line_1",
@@ -513,7 +516,7 @@
"type": "Line",
"speaker": "Аида Дженибековна",
"portrait": "resources/w/avatar_teacher.png",
"text": "Вот держи зачетку с оценкой, положи ее обратно в шкаф.",
"text": "Вот держи зачетку с оценкой.",
"next": "line_6"
},
{
@@ -521,7 +524,7 @@
"type": "Line",
"speaker": "Бекзат",
"portrait": "resources/w/gg/gg2_s_podsvetkoy5.png",
"text": "Хорошо!",
"text": "Спасибо!",
"next": "end_1"
},
{
@@ -610,6 +613,7 @@
},
{
"id": "dialog_with_ghost001",
"uninterruptible": true,
"start": "line_1",
"nodes": [
{
@@ -678,6 +682,7 @@
},
{
"id": "end_1",
"luaCallback" : "on_first_ghost_dialog_over",
"type": "End"
}
]
@@ -786,6 +791,7 @@
},
{
"id": "end_1",
"luaCallback" : "on_quest_over",
"type": "End"
}
]
@@ -1061,10 +1067,9 @@
]
},
{
"id": "test_cutscene_02",
"background": "resources/black.png",
"backgroundWidth" : 1280,
"backgroundHeight" : 720,
"id": "computer_cutscene001",
"onFadeInCallback": "on_sleep_cutscene",
"background": "resources/test_cutscene001.png",
"durationMs": 5000,
"fadeOutMs": 500,
"fadeInMs": 500,
@@ -1108,9 +1113,8 @@
},
{
"id": "darklands_exit001",
"background": "resources/black.png",
"backgroundWidth" : 1280,
"backgroundHeight" : 720,
"onFadeInCallback": "on_darklands_over",
"background": "resources/test_cutscene001.png",
"durationMs": 5000,
"fadeOutMs": 500,
"fadeInMs": 500,
resources/start_uni_interior.lua
+40 -28
View File
@@ -25,6 +25,7 @@ function lection_hall_zone001_enter_callback()
--game_api.start_dialogue("")
--Start cutscene
if (lection_is_over == false) then
game_api.player_stop()
game_api.start_cutscene("test_cutscene_01")
end
end
@@ -180,25 +181,38 @@ function on_npc_interact(npc_index)
local report_card_signed = game_api.getIntValue("report_card_signed")
if (report_card_signed==1) then
game_api.start_dialogue("dialog_with_ghost003")
ghost_gone = true
game_api.set_npc_enabled(2, false)
game_api.set_npc_enabled(3, false)
game_api.set_npc_enabled(4, false)
game_api.set_npc_enabled(5, false)
else
game_api.start_dialogue("dialog_with_ghost002")
end
else
game_api.start_dialogue("dialog_with_ghost001")
player_ghost_aware = true
end
end
end
function on_quest_over()
ghost_gone = true
game_api.set_npc_enabled(2, false)
game_api.set_npc_enabled(3, false)
game_api.set_npc_enabled(4, false)
game_api.set_npc_enabled(5, false)
end
function on_first_ghost_dialog_over()
player_ghost_aware = true
end
function on_darklands_over()
game_api.set_player_hp(10)
game_api.resetPlayerAfterDeath()
end
function teacher_zone001_enter_callback()
game_api.start_dialogue("teacher_dialog002")
game_api.set_trigger_zone_enabled(2, false)
teacher_told_about_book = true
game_api.player_stop()
end
function on_library_door_click()
@@ -406,7 +420,7 @@ print("on_computer_clicked--")
print("on_computer_clicked--3")
if (player_hold_book) then
print("on_computer_clicked--4")
game_api.start_cutscene("test_cutscene_02")
game_api.start_cutscene("computer_cutscene001")
else
print("on_computer_clicked--5")
game_api.start_dialogue("book_dialog002")
@@ -422,25 +436,7 @@ print("on_computer_clicked--")
end
end
function on_teacher_arrived_intermediate()
game_api.rotate_object("Room_N_2_Leaf001", -90, 0.5, nil)
game_api.fade_object("Room_Cover_North_3_001", 0, 0.5, function()
game_api.deactivate_interactive_object("Room_Cover_North_3_001")
end)
game_api.switch_navigation(2)
game_api.npc_walk_to(0, 3.19574, 0, 6.45595, on_teacher_arrived)
teacher_arrived = true
end
game_api.set_cutscene_callback("test_cutscene_01", function()
print("Cutscene done!")
lection_is_over = true
game_api.set_npc_enabled(1, true)
game_api.npc_walk_to(0, 0.758123, 0, 6.50063, on_teacher_arrived_intermediate)
end)
game_api.set_cutscene_callback("test_cutscene_02", function()
function on_sleep_cutscene()
print("Cutscene 2 done!")
night_time = true
--game_api.set_trigger_zone_enabled(1, false)
@@ -462,9 +458,27 @@ game_api.set_cutscene_callback("test_cutscene_02", function()
game_api.set_object_alpha("Room_Cover_North_1_001", 1)
game_api.set_object_alpha("Room_Cover_Main_Hall_001", 1)
game_api.activate_interactive_object("Note001")
end
function on_teacher_arrived_intermediate()
game_api.rotate_object("Room_N_2_Leaf001", -90, 0.5, nil)
game_api.fade_object("Room_Cover_North_3_001", 0, 0.5, function()
game_api.deactivate_interactive_object("Room_Cover_North_3_001")
end)
game_api.switch_navigation(2)
game_api.npc_walk_to(0, 3.19574, 0, 6.45595, on_teacher_arrived)
teacher_arrived = true
end
game_api.set_cutscene_callback("test_cutscene_01", function()
print("Cutscene done!")
lection_is_over = true
game_api.set_npc_enabled(1, true)
game_api.npc_walk_to(0, 0.758123, 0, 6.50063, on_teacher_arrived_intermediate)
end)
function on_note_pickup()
game_api.start_dialogue("note_dialog001")
game_api.pickup_item("note_spell")
@@ -542,11 +556,9 @@ game_api.set_darklands_callbacks(
game_api.set_npc_enabled(5, false)
game_api.setIntValue("day", 1)
game_api.setIntValue("need_sleep", 1)
game_api.set_player_hp(10)
player_left_darklands = true
morning_did_open_door_index = 0
setDay1MorningSetup()
--game_api.switch_navigation(7)
local px = game_api.get_player_x()