Raise siren volume and simplify the call screen

This commit is contained in:
Codex
2026-10-30 12:26:10 +02:00
parent 5b8d60b1f6
commit 1a90e1ad21
10 changed files with 59 additions and 39 deletions
+2 -5
View File
@@ -49,7 +49,6 @@ var transcript_scroll: ScrollContainer
var journal: RichTextLabel
var clock_label: Label
var status_label: Label
var place_label: Label
var objects_label: Label
var task_label: Label
var title_label: Label
@@ -316,7 +315,7 @@ func show_menu() -> void:
box.add_child(button("Позвонить маме" if completed == 0 else "Продолжить · звонок %d" % mini(completed + 1, 10), "start", func(): dial_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.5 · Катя: Jessica · Мама: Carol · ElevenLabs\nПрогресс сохраняется после находок и законченных звонков.", 16, MUTED))
box.add_child(label("0.2.6 · Катя: Jessica · Мама: Carol · ElevenLabs\nПрогресс сохраняется после находок и законченных звонков.", 16, MUTED))
func show_settings() -> void:
var box := modal()
@@ -722,11 +721,9 @@ func refresh_live() -> void:
if running and fired.has("alarm"):
var rise := clampf((elapsed-float(story.timeline.alarm))/6.0,0.0,1.0)
rise = rise*rise*(3.0-2.0*rise)
siren.volume_db = linear_to_db(lerpf(db_to_linear(-70),db_to_linear(-23),rise))
siren.volume_db = linear_to_db(lerpf(db_to_linear(-70),db_to_linear(-8),rise))
status_label.text = "Плохая связь" if place == "alcove" and not items.has("connected") else "На линии"
if not running: status_label.text = "Соединение прервано" if impacted else "Готова позвонить"
var names := {"flat": "В квартире", "inner": "Внутренний коридор", "landing": "Лестничная площадка", "alcove": "Боковой тамбур"}
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])
+5 -5
View File
@@ -304,13 +304,13 @@ func run(target: Node) -> void:
check(game.fired.get("alarm") == 24.0, "Same siren time: " + str(number))
check(game.siren.playing and game.siren.volume_db < -60, "Siren starts softly: " + str(number))
at(27)
check(game.siren.volume_db > -40 and game.siren.volume_db < -25, "Siren rises gradually: " + str(number))
check(game.siren.volume_db > -20 and game.siren.volume_db < -10, "Siren rises gradually: " + str(number))
at(30)
check(absf(game.siren.volume_db+23)<0.1, "Siren reaches quiet background level: " + str(number))
check(absf(game.siren.volume_db+8)<0.1, "Siren reaches audible background level: " + str(number))
at(44.99)
check(not game.fired.has("power") and "темно" not in game.place_label.text, "Lights stay on until 45: " + str(number))
check(not game.fired.has("power") and game.soundscape.powered, "Lights stay on until 45: " + str(number))
at(45.01)
check(game.fired.get("power") == 45.0 and "темно" in game.place_label.text, "Same visible blackout: " + str(number))
check(game.fired.get("power") == 45.0 and game.archive.any(func(line): return line.text.begins_with("Свет в квартире погас.")), "Same visible blackout: " + str(number))
check("power" in game.heard, "Mother acknowledges blackout: " + str(number))
at(59.95)
check_clocks("00:59", "before minute rollover")
@@ -341,7 +341,7 @@ func run(target: Node) -> void:
click("keys_search")
at(45.01)
check(not game.busy.is_empty() and "power" not in game.heard, "Blackout does not interrupt an unrelated spoken task")
check(game.fired.get("power") == 45.0 and "темно" in game.place_label.text, "Busy task cannot postpone blackout")
check(game.fired.get("power") == 45.0 and not game.soundscape.powered, "Busy task cannot postpone blackout")
for number in range(1, 11):
start(number)
check(game.chapter == number and game.place == "flat" and game.items.is_empty(), "Fresh chapter " + str(number))
+3 -19
View File
@@ -53,9 +53,9 @@ func build(target: Node) -> void:
var header := HBoxContainer.new()
header.add_theme_constant_override("separation",12)
root.add_child(header)
var brand: Label = game.label("ДО ОТБОЯ / не клади трубку",18,Color("aaa3b9"))
brand.size_flags_horizontal = Control.SIZE_EXPAND_FILL
header.add_child(brand)
var header_space := Control.new()
header_space.size_flags_horizontal = Control.SIZE_EXPAND_FILL
header.add_child(header_space)
memory_button = game.button("Память", "memory", game.show_memory)
memory_button.custom_minimum_size.x = 140
memory_button.size_flags_vertical = Control.SIZE_SHRINK_CENTER
@@ -87,14 +87,6 @@ func build(target: Node) -> void:
screen_text(screen,"Мама",224,43,32,Color("f5eaf1"))
game.status_label = screen_text(screen,"Нет соединения",273,27,15,Color("c9a9c2"))
game.clock_label = screen_text(screen,"",303,31,23,Color("ddd3e2"))
var katya_tag := centered("КАТЯ",13,PINK)
katya_tag.position = Vector2(0,591)
katya_tag.size = Vector2(288,24)
left.add_child(katya_tag)
var katya_note := centered("у себя дома",13,Color("706a80"))
katya_note.position = Vector2(0,615)
katya_note.size = Vector2(288,20)
left.add_child(katya_note)
center_region = game.column(body)
center_region.size_flags_horizontal = Control.SIZE_EXPAND_FILL
center_region.add_theme_constant_override("separation",10)
@@ -153,14 +145,6 @@ func build(target: Node) -> void:
screen_text(lcd,"Доченька",37,34,22,lcd_ink)
mother_status = screen_text(lcd,"Нет звонка",79,26,14,lcd_ink)
mother_clock = screen_text(lcd,"",110,25,18,lcd_ink)
var mother_tag := centered("МАМА",13,VIOLET)
mother_tag.position = Vector2(0,539)
mother_tag.size = Vector2(240,24)
right.add_child(mother_tag)
game.place_label = centered("Квартира · вечер",15,Color("9991a6"))
game.place_label.position = Vector2(0,567)
game.place_label.size = Vector2(240,42)
right.add_child(game.place_label)
game.objects_label = centered("",13,Color("777080"))
game.objects_label.position = Vector2(0,612)
game.objects_label.size = Vector2(240,55)