Improve phone ambience and dialogue flow; keep stairwell intact
This commit is contained in:
@@ -1,6 +1,7 @@
|
||||
extends Node3D
|
||||
## Phone prototype: one physical task at a time; only heard facts persist.
|
||||
const Profile = preload("res://scripts/profile.gd")
|
||||
const Soundscape = preload("res://scripts/phone_soundscape.gd")
|
||||
const SAVE_PATH := "user://profile/phone_memory.cfg"
|
||||
const BG := Color("10171d")
|
||||
const CARD := Color("19232c")
|
||||
@@ -31,10 +32,12 @@ var busy_start := 0.0
|
||||
var busy_end := 0.0
|
||||
var reply_at := 0.0
|
||||
var replied := false
|
||||
var speech_until := 0.0
|
||||
var outcome := ""
|
||||
var heard: Array[String] = []
|
||||
var archive: Array = []
|
||||
var voice_cache: Dictionary = {}
|
||||
var voice_levels: Dictionary = {}
|
||||
var voice_enabled := true
|
||||
var master_volume := 0.65
|
||||
var ui: Control
|
||||
@@ -54,7 +57,7 @@ var busy_bar: ProgressBar
|
||||
var cancel_button: Button
|
||||
var last_caption: Label
|
||||
var voice: AudioStreamPlayer
|
||||
var room: AudioStreamPlayer
|
||||
var soundscape: Node
|
||||
var siren: AudioStreamPlayer
|
||||
var effect: AudioStreamPlayer
|
||||
var hum: AudioStreamPlayer
|
||||
@@ -71,6 +74,7 @@ var screen_fade: ColorRect
|
||||
|
||||
func _ready() -> void:
|
||||
story = JSON.parse_string(FileAccess.get_file_as_string("res://data/phone_story.json"))
|
||||
voice_levels = JSON.parse_string(FileAccess.get_file_as_string("res://data/voice_levels.json"))
|
||||
qa_mode = "--phone-qa" in OS.get_cmdline_user_args()
|
||||
if not qa_mode:
|
||||
var saved := Profile.read_profile(SAVE_PATH, story.facts, story.endings)
|
||||
@@ -371,7 +375,7 @@ func show_menu() -> void:
|
||||
box.add_child(button("Позвонить маме" if completed == 0 else "Продолжить · звонок %d" % mini(completed + 1, 10), "start", func(): begin_call(mini(completed + 1, 10), false)))
|
||||
box.add_child(button("Проверка сцен · выбрать любой из 10 звонков", "testing", show_test_menu))
|
||||
box.add_child(button("Звук и титры", "settings", show_settings))
|
||||
box.add_child(label("0.2.2 · Катя: Jessica · Мама: Carol · ElevenLabs\nПрогресс сохраняется после находок и законченных звонков.", 16, MUTED))
|
||||
box.add_child(label("0.2.3 · Катя: Jessica · Мама: Carol · ElevenLabs\nПрогресс сохраняется после находок и законченных звонков.", 16, MUTED))
|
||||
|
||||
func show_settings() -> void:
|
||||
var box := modal()
|
||||
@@ -393,7 +397,17 @@ func show_settings() -> void:
|
||||
master_volume = value
|
||||
AudioServer.set_bus_volume_db(0, linear_to_db(maxf(0.0001, value))))
|
||||
box.add_child(slider)
|
||||
box.add_child(label("Все фразы доступны в субтитрах.\nКатя: Jessica — Playful, Bright, Warm / ElevenLabs, 48 реплик.\nМама: Carol — Relatable, Real, Likeable Grandma / ElevenLabs, 54 реплики.\nВзрыв: Synthesized explosion — qubodup / Iwan Gabovitch, CC0.\nОстальные звуки: оригинальный процедурный синтез проекта.\nПолные источники — AUDIO_CREDITS.md рядом с игрой.", 20, MUTED))
|
||||
box.add_child(label("Фон и звуки окружения", 20))
|
||||
var background := HSlider.new()
|
||||
background.name = "BackgroundVolume"
|
||||
background.min_value = 0
|
||||
background.max_value = 1
|
||||
background.step = 0.05
|
||||
background.value = soundscape.volume
|
||||
background.value_changed.connect(soundscape.set_volume)
|
||||
box.add_child(background)
|
||||
box.add_child(label("Во время речи фон автоматически становится тише.", 16, MUTED))
|
||||
box.add_child(label("Все фразы доступны в субтитрах.\nКатя: Jessica — Playful, Bright, Warm / ElevenLabs, 52 реплики.\nМама: Carol — Relatable, Real, Likeable Grandma / ElevenLabs, 58 реплик.\nВзрыв: Synthesized explosion — qubodup / Iwan Gabovitch, CC0.\nФон и бытовые звуки: ElevenLabs Sound Effects и синтез проекта.\nПолные источники — AUDIO_CREDITS.md рядом с игрой.", 20, MUTED))
|
||||
box.add_child(button("Назад", "back_menu", show_menu))
|
||||
|
||||
func show_test_menu() -> void:
|
||||
@@ -441,10 +455,10 @@ func begin_call(number: int, testing: bool, knowledge: int = 1) -> void:
|
||||
unread = 0
|
||||
refresh_inbox_button()
|
||||
siren.stop()
|
||||
room.play()
|
||||
room.volume_db = -28
|
||||
soundscape.begin_call()
|
||||
screen_fade.color.a = 0
|
||||
elapsed = 0
|
||||
speech_until = 0
|
||||
place = "flat"
|
||||
items = {}
|
||||
done = {}
|
||||
@@ -469,6 +483,7 @@ func begin_call(number: int, testing: bool, knowledge: int = 1) -> void:
|
||||
refresh()
|
||||
|
||||
func _process(_delta: float) -> void:
|
||||
soundscape.update_mix(_delta, voice_enabled and voice.playing)
|
||||
if not running and not impacted: return
|
||||
var second := maxf(0, (Time.get_ticks_msec() - start_tick) / 1000.0)
|
||||
if running:
|
||||
@@ -501,6 +516,7 @@ func advance() -> void:
|
||||
kind = "finish"
|
||||
if next_time > target: break
|
||||
elapsed = next_time
|
||||
soundscape.advance(elapsed, place)
|
||||
match kind:
|
||||
"impact":
|
||||
fired.impact = elapsed
|
||||
@@ -513,9 +529,10 @@ func advance() -> void:
|
||||
"power":
|
||||
fired.power = elapsed
|
||||
system_caption("Свет в квартире погас. Щелчок — гул холодильника исчезает.")
|
||||
room.volume_db = -35
|
||||
soundscape.power_cut(elapsed)
|
||||
if not busy.is_empty() and busy.get("power", false):
|
||||
busy = {}
|
||||
soundscape.cancel_task()
|
||||
say("late_mail")
|
||||
elif busy.is_empty(): say("power")
|
||||
refresh_commands()
|
||||
@@ -531,6 +548,7 @@ func advance() -> void:
|
||||
say(busy.response)
|
||||
"finish": finish_task()
|
||||
elapsed = target
|
||||
soundscape.advance(elapsed, place)
|
||||
refresh_live()
|
||||
|
||||
func command_allowed(action: Dictionary) -> bool:
|
||||
@@ -550,13 +568,15 @@ func command_allowed(action: Dictionary) -> bool:
|
||||
|
||||
func action_duration(action: Dictionary) -> float:
|
||||
var length := maxf(float(action.seconds), voice_length(action.request) + voice_length(action.response) + 0.35)
|
||||
if action.get("needs_light", false) and elapsed >= float(story.timeline.power) and not items.has("lamp"):
|
||||
if action.get("needs_light", false) and (elapsed >= float(story.timeline.power) or place in ["landing", "alcove"]) and not items.has("lamp"):
|
||||
length += 7
|
||||
return length
|
||||
|
||||
func choose_action(id: String) -> void:
|
||||
# Re-check state, time, and the visible control when a queued click arrives.
|
||||
if running: elapsed = (Time.get_ticks_msec() - start_tick) / 1000.0
|
||||
if running: advance()
|
||||
if not can_respond(): return
|
||||
if is_instance_valid(overlay): return
|
||||
var control := action_button(id)
|
||||
if control == null or control.disabled: return
|
||||
@@ -573,14 +593,16 @@ func choose_action(id: String) -> void:
|
||||
busy_end = elapsed + action_duration(selected)
|
||||
reply_at = maxf(elapsed + voice_length(selected.request) + 0.15, busy_end - voice_length(selected.response))
|
||||
replied = false
|
||||
soundscape.schedule_task(id, elapsed + voice_length(selected.request) + 0.12, reply_at)
|
||||
say(selected.request)
|
||||
if selected.get("needs_light", false) and elapsed >= float(story.timeline.power) and not items.has("lamp"):
|
||||
if selected.get("needs_light", false) and (elapsed >= float(story.timeline.power) or place in ["landing", "alcove"]) and not items.has("lamp"):
|
||||
system_caption("Без фонаря мама будет искать на ощупь. Это займёт дольше.")
|
||||
refresh_commands()
|
||||
|
||||
func finish_task() -> void:
|
||||
var action := busy.duplicate(true)
|
||||
busy = {}
|
||||
soundscape.cancel_task()
|
||||
done[action.id] = true
|
||||
for key in action.get("learn", []):
|
||||
if not facts.has(key):
|
||||
@@ -596,7 +618,9 @@ func finish_task() -> void:
|
||||
|
||||
func cancel_task() -> void:
|
||||
if not running or busy.is_empty(): return
|
||||
if not speech_finished(): return
|
||||
busy = {}
|
||||
soundscape.cancel_task()
|
||||
voice.stop()
|
||||
say("cancel")
|
||||
system_caption("Мама остановилась. Потраченное время не вернуть.")
|
||||
@@ -614,7 +638,7 @@ func strike() -> void:
|
||||
busy = {}
|
||||
events.clear()
|
||||
voice.stop()
|
||||
room.stop()
|
||||
soundscape.stop()
|
||||
siren.stop()
|
||||
hum.stop()
|
||||
effect.stream = load("res://assets/audio/impact_cc0.wav")
|
||||
@@ -692,6 +716,7 @@ func refresh_commands() -> void:
|
||||
if not is_instance_valid(command_list): return
|
||||
clear_children(command_list)
|
||||
cancel_button.visible = running and not busy.is_empty()
|
||||
cancel_button.disabled = not speech_finished()
|
||||
if not running:
|
||||
command_list.add_child(label("Линия молчит.", 22, MUTED))
|
||||
return
|
||||
@@ -700,7 +725,7 @@ func refresh_commands() -> void:
|
||||
command_list.add_child(label("Вечер. Знакомый голос. Кажется, на всё ещё есть время.", 20, MUTED))
|
||||
return
|
||||
if not busy.is_empty():
|
||||
command_list.add_child(label("Мама выполняет твою просьбу. Можно дождаться ответа или перебить её.", 22, MUTED))
|
||||
command_list.add_child(label("Мама выполняет твою просьбу. Отменить её можно в паузе после реплики.", 22, MUTED))
|
||||
return
|
||||
var entry: Dictionary = story.chapters[chapter - 1]
|
||||
if not done.has("question"):
|
||||
@@ -712,18 +737,31 @@ func refresh_commands() -> void:
|
||||
command_list.add_child(b)
|
||||
if place == "flat" and not items.has("keys"):
|
||||
command_list.add_child(label("Чтобы открыть входную дверь, мама ищет ключи.", 16, MUTED))
|
||||
update_choice_state()
|
||||
|
||||
func speech_finished() -> bool:
|
||||
return elapsed >= speech_until and (not voice_enabled or not voice.playing)
|
||||
|
||||
func can_respond() -> bool:
|
||||
return running and chapter != 1 and events.is_empty() and speech_finished()
|
||||
|
||||
func update_choice_state() -> void:
|
||||
for child in command_list.get_children():
|
||||
if child is Button: child.disabled = not can_respond()
|
||||
cancel_button.disabled = not speech_finished()
|
||||
|
||||
func refresh_live() -> void:
|
||||
clock_label.text = "Разговор" if chapter == 1 else "%02d:%02d" % [mini(int(elapsed), 90) / 60, mini(int(elapsed), 90) % 60]
|
||||
status_label.text = "Плохая связь" if place == "alcove" and not items.has("connected") else "На линии"
|
||||
if not running: status_label.text = "Соединение прервано"
|
||||
var names := {"flat": "В квартире", "inner": "Внутренний коридор", "landing": "Лестничная площадка", "alcove": "Боковой тамбур"}
|
||||
place_label.text = names[place] + (" · темно" if fired.has("power") else "")
|
||||
place_label.text = names[place] + (" · темно" if fired.has("power") or place in ["landing", "alcove"] else "")
|
||||
var held: Array[String] = []
|
||||
for key in items:
|
||||
held.append({"keys": "ключи", "lamp": "фонарь", "spare": "запасной ключ", "connected": "телефон на полке"}[key])
|
||||
objects_label.text = "У мамы: " + (", ".join(held) if not held.is_empty() else "телефон")
|
||||
task_label.text = str(busy.label) if not busy.is_empty() else "Она слушает тебя"
|
||||
task_label.text = str(busy.label) if not busy.is_empty() else ("Дождись окончания реплики" if not can_respond() else "Она слушает тебя")
|
||||
update_choice_state()
|
||||
busy_bar.visible = not busy.is_empty()
|
||||
if not busy.is_empty(): busy_bar.value = clampf((elapsed - busy_start) / (busy_end - busy_start) * 100, 0, 100)
|
||||
for i in range(wave_bars.size()):
|
||||
@@ -754,12 +792,18 @@ func voice_length(id: String) -> float:
|
||||
func say(id: String) -> void:
|
||||
var entry: Dictionary = story.lines[id]
|
||||
heard.append(id)
|
||||
speech_until = elapsed + voice_length(id) + 0.08
|
||||
update_choice_state()
|
||||
add_caption(entry.speaker, entry.text)
|
||||
voice.stop()
|
||||
if id == "intro_04": soundscape.turn_tv_down()
|
||||
if id == "intro_06": soundscape.world_cue("footsteps", elapsed + voice_length(id) + 0.1)
|
||||
if voice_enabled:
|
||||
voice.bus = "Phone" if entry.speaker == "Мама" else "Master"
|
||||
voice.stream = voice_stream(id)
|
||||
if voice.stream != null: voice.play()
|
||||
if voice.stream != null:
|
||||
soundscape.dialogue_started(float(voice_levels.get(id, -25.0)) - (3.0 if entry.speaker == "Мама" else 0.0))
|
||||
voice.play()
|
||||
|
||||
func system_caption(text: String) -> void:
|
||||
add_caption("", text)
|
||||
@@ -782,12 +826,15 @@ func scroll_to_latest() -> void:
|
||||
|
||||
func make_audio() -> void:
|
||||
voice = AudioStreamPlayer.new()
|
||||
room = AudioStreamPlayer.new()
|
||||
soundscape = Soundscape.new()
|
||||
add_child(soundscape)
|
||||
soundscape.setup()
|
||||
siren = AudioStreamPlayer.new()
|
||||
effect = AudioStreamPlayer.new()
|
||||
hum = AudioStreamPlayer.new()
|
||||
notification_sound = AudioStreamPlayer.new()
|
||||
for player in [voice, room, siren, effect, hum, notification_sound]: add_child(player)
|
||||
for player in [voice, siren, effect, hum, notification_sound]: add_child(player)
|
||||
for player in [siren, effect, hum]: player.bus = "SceneAudio"
|
||||
AudioServer.add_bus()
|
||||
var bus := AudioServer.bus_count - 1
|
||||
AudioServer.set_bus_name(bus, "Phone")
|
||||
@@ -798,10 +845,6 @@ func make_audio() -> void:
|
||||
AudioServer.add_bus_effect(bus, high)
|
||||
AudioServer.add_bus_effect(bus, low)
|
||||
voice.volume_db = -2
|
||||
room.stream = load("res://assets/audio/room.wav")
|
||||
room.volume_db = -28
|
||||
room.finished.connect(func():
|
||||
if running: room.play())
|
||||
siren.stream = load("res://assets/audio/siren.wav")
|
||||
siren.volume_db = -23
|
||||
siren.finished.connect(func():
|
||||
@@ -810,5 +853,5 @@ func make_audio() -> void:
|
||||
hum.stream = load("res://assets/audio/approach.wav")
|
||||
hum.volume_db = -25
|
||||
notification_sound.stream = load("res://assets/audio/click.wav")
|
||||
notification_sound.volume_db = -16
|
||||
notification_sound.volume_db = -22
|
||||
AudioServer.set_bus_volume_db(0, linear_to_db(master_volume))
|
||||
|
||||
Reference in New Issue
Block a user