Gate phone dialogue on heard discoveries and fix memory display
This commit is contained in:
@@ -0,0 +1,90 @@
|
||||
extends RefCounted
|
||||
## Regressions for information that used to appear before mom revealed it.
|
||||
func run(qa: RefCounted) -> void:
|
||||
var game: Node = qa.game
|
||||
for number in range(2,11):
|
||||
qa.start(number)
|
||||
qa.wait_for_speech()
|
||||
qa.check(not game.facts.has("mail") and not game.facts.has("code"),"Chapter alone grants no letter or code: " + str(number))
|
||||
qa.check(game.action_button("read_mail") == null and game.action_button("safe") == null,"Unheard letter and safe stay hidden: " + str(number))
|
||||
qa.check("call_04_k" not in game.heard and "call_05_k" not in game.heard,"No knowledgeable opening on an empty profile: " + str(number))
|
||||
qa.check("письм" not in game.action_button("mail_hint").text.to_lower(),"Discovery choice does not reveal the letter")
|
||||
|
||||
qa.start(2)
|
||||
qa.click("memory")
|
||||
await qa.capture("phone-memory-empty")
|
||||
qa.check(game.memory_content.get_parsed_text().contains("Мама ещё не рассказала"),"Empty memory explains that nothing has been learned")
|
||||
qa.click("close_memory")
|
||||
qa.click("look")
|
||||
qa.at(game.reply_at+0.1)
|
||||
qa.check(not game.facts.has("entry") and not game.facts.has("lamp_location"),"A started answer is not yet learned")
|
||||
qa.click("memory")
|
||||
qa.at(maxf(game.busy_end,game.speech_until)+0.1)
|
||||
qa.check(game.memory_content.text.contains("лишь предположила") and game.memory_content.text.contains("фонарь"),"Open memory updates when the mother finishes")
|
||||
qa.check(not game.facts.has("keys_exact"),"A guess about the jacket is not an exact pocket location")
|
||||
qa.click("close_memory")
|
||||
qa.check(game.action_button("keys_fast") == null and game.action_button("keys_search") != null,"Looking around does not unlock the exact key instruction")
|
||||
game.say("keys_fast_k")
|
||||
qa.check("keys_fast_k" not in game.heard,"Direct line dispatch cannot bypass knowledge")
|
||||
qa.perform("keys_search")
|
||||
qa.check(game.facts.has("keys_exact"),"Exact pocket is learned only after finding keys")
|
||||
qa.click("memory")
|
||||
await qa.capture("phone-memory-learned")
|
||||
qa.check(game.memory_content.get_parsed_text().contains("правом кармане"),"Learned knowledge is visible in the notebook")
|
||||
qa.click("close_memory")
|
||||
|
||||
qa.start(2)
|
||||
qa.perform("mail_hint")
|
||||
qa.check(game.facts.has("mail") and not game.facts.has("code"),"Email conversation reveals a marked letter but not its code")
|
||||
qa.check(game.heard.has("mail_hint_k") and game.heard.has("mail_hint_m"),"Letter discovery is a complete conversation")
|
||||
qa.perform("read_mail")
|
||||
qa.check(game.facts.has("code") and game.elapsed < 45,"Letter can be discovered and read before power loss")
|
||||
qa.finish("flat")
|
||||
qa.click("next")
|
||||
qa.check(game.facts.has("mail") and game.facts.has("code") and game.items.is_empty(),"Heard letter details survive a redial")
|
||||
|
||||
# Cut the mother midway through reading the code, not just the request.
|
||||
qa.start(4,2)
|
||||
game.facts.erase("code")
|
||||
qa.wait_for_speech()
|
||||
var mail: Dictionary
|
||||
for action in game.story.actions:
|
||||
if action.id == "read_mail": mail = action
|
||||
qa.at(45-game.action_duration(mail)+game.voice_length(mail.response)/2)
|
||||
qa.click("read_mail")
|
||||
qa.at(game.reply_at+0.1)
|
||||
qa.check(game.heard[-1] == "read_mail_m" and not game.facts.has("code"),"Partial spoken code does not count as a complete discovery")
|
||||
qa.at(45.01)
|
||||
qa.check(not game.facts.has("code") and game.heard[-1] == "late_mail","Interrupted mother answer grants no code")
|
||||
|
||||
# A real test redial must retain knowledge before choosing its introduction.
|
||||
game.qa_mode = false
|
||||
game.begin_call(4,true,1,{"mail":true})
|
||||
qa.check(game.events[0].line == "call_04_k","Retained test knowledge selects the correct opening before dialogue starts")
|
||||
game.qa_mode = true
|
||||
|
||||
qa.start(5,2)
|
||||
qa.wait_for_speech()
|
||||
qa.check(game.action_button("question") == null,"Remembering a plan does not put it in mother's hands")
|
||||
qa.perform("safe")
|
||||
qa.check(game.action_button("question") != null,"Plan question unlocks after physically opening the safe")
|
||||
qa.perform("question")
|
||||
qa.finish("flat")
|
||||
for number in [3,4,6,7]:
|
||||
qa.start(number,2)
|
||||
if number == 3: qa.perform("lamp_fast")
|
||||
elif number in [6,7]:
|
||||
qa.perform("keys_fast")
|
||||
qa.perform("front")
|
||||
qa.perform("question")
|
||||
qa.check(game.story.chapters[number-1].answer in game.heard,"Contextual question remains reachable: " + str(number))
|
||||
qa.finish("landing" if number in [6,7] else "flat")
|
||||
|
||||
qa.start(8,2)
|
||||
qa.click("memory")
|
||||
await qa.capture("phone-memory-full")
|
||||
for text in game.story.facts.values():
|
||||
qa.check(game.memory_content.get_parsed_text().contains(text),"Every known clue is available in scrollable memory")
|
||||
qa.click("close_memory")
|
||||
var legacy: Dictionary = game.Profile.valid_flags({"keys":true,"mail":true,"code":true},game.story.facts)
|
||||
qa.check(not legacy.has("keys_exact") and legacy.has("code"),"Legacy guessed keys are not upgraded to confirmed knowledge")
|
||||
@@ -36,6 +36,8 @@ var busy_end := 0.0
|
||||
var reply_at := 0.0
|
||||
var replied := false
|
||||
var speech_until := 0.0
|
||||
var pending_line := ""
|
||||
var pending_line_end := 0.0
|
||||
var outcome := ""
|
||||
var heard: Array[String] = []
|
||||
var archive: Array = []
|
||||
@@ -51,6 +53,7 @@ var command_list: Container
|
||||
var transcript: VBoxContainer
|
||||
var transcript_scroll: ScrollContainer
|
||||
var journal: RichTextLabel
|
||||
var memory_content: RichTextLabel
|
||||
var clock_label: Label
|
||||
var status_label: Label
|
||||
var objects_label: Label
|
||||
@@ -172,6 +175,7 @@ func clear_children(parent: Node) -> void:
|
||||
child.queue_free()
|
||||
|
||||
func close_overlay() -> void:
|
||||
memory_content = null
|
||||
menu_screen = ""
|
||||
menu_content = null
|
||||
stage.set_menu_mode(false)
|
||||
@@ -307,7 +311,9 @@ func show_memory() -> void:
|
||||
var text := RichTextLabel.new()
|
||||
text.custom_minimum_size = Vector2(640,410)
|
||||
text.add_theme_font_size_override("normal_font_size",20)
|
||||
text.text = journal.text
|
||||
text.name = "MemoryText"
|
||||
text.text = memory_text()
|
||||
memory_content = text
|
||||
box.add_child(text)
|
||||
box.add_child(button("Вернуться к звонку","close_memory",close_overlay))
|
||||
|
||||
@@ -423,10 +429,10 @@ func show_test_menu() -> void:
|
||||
menu_action(box,"Начать проверку","test_start",func(): dial_call(choices.selected+1,true,knowledge.selected),true)
|
||||
menu_action(box,"Назад","back_menu",show_menu)
|
||||
|
||||
func dial_call(number: int, testing: bool, knowledge: int = 1, animate_in_qa: bool = false) -> void:
|
||||
func dial_call(number: int, testing: bool, knowledge: int = 1, animate_in_qa: bool = false, retained_facts: Variant = null) -> void:
|
||||
if dialing: return
|
||||
if qa_mode and not animate_in_qa:
|
||||
begin_call(number,testing,knowledge)
|
||||
begin_call(number,testing,knowledge,retained_facts)
|
||||
return
|
||||
dial_epoch += 1
|
||||
var epoch := dial_epoch
|
||||
@@ -445,9 +451,9 @@ func dial_call(number: int, testing: bool, knowledge: int = 1, animate_in_qa: bo
|
||||
stage.begin_dial()
|
||||
await get_tree().create_timer(2.4).timeout
|
||||
if epoch != dial_epoch: return
|
||||
begin_call(number,testing,knowledge)
|
||||
begin_call(number,testing,knowledge,retained_facts)
|
||||
|
||||
func begin_call(number: int, testing: bool, knowledge: int = 1) -> void:
|
||||
func begin_call(number: int, testing: bool, knowledge: int = 1, retained_facts: Variant = null) -> void:
|
||||
dial_epoch += 1
|
||||
dialing = false
|
||||
# A test never writes the normal profile, including learned facts.
|
||||
@@ -457,6 +463,7 @@ func begin_call(number: int, testing: bool, knowledge: int = 1) -> void:
|
||||
endings = saved.endings
|
||||
completed = mini(saved.loops, 10)
|
||||
test_mode = testing
|
||||
if retained_facts != null: facts = retained_facts.duplicate()
|
||||
if testing and knowledge == 0: facts = {}
|
||||
if testing and knowledge == 2:
|
||||
facts = {}
|
||||
@@ -479,6 +486,7 @@ func begin_call(number: int, testing: bool, knowledge: int = 1) -> void:
|
||||
screen_fade.mouse_filter = Control.MOUSE_FILTER_IGNORE
|
||||
elapsed = 0
|
||||
speech_until = 0
|
||||
pending_line = ""
|
||||
place = "flat"
|
||||
items = {}
|
||||
done = {}
|
||||
@@ -495,7 +503,7 @@ func begin_call(number: int, testing: bool, knowledge: int = 1) -> void:
|
||||
if chapter == 1:
|
||||
for beat in story.intro: events.append(beat.duplicate())
|
||||
else:
|
||||
var entry: Dictionary = story.chapters[chapter - 1]
|
||||
var entry: Dictionary = opening_for(chapter)
|
||||
var opening_at := voice_length("greeting") + 0.2
|
||||
events.append({"at": opening_at, "line": entry.opening})
|
||||
events.append({"at": opening_at + 0.3 + voice_length(entry.opening), "line": entry.reply})
|
||||
@@ -525,6 +533,9 @@ func advance() -> void:
|
||||
if not fired.has(id) and float(story.timeline[id]) < next_time:
|
||||
next_time = story.timeline[id]
|
||||
kind = id
|
||||
if not pending_line.is_empty() and pending_line_end < next_time:
|
||||
next_time = pending_line_end
|
||||
kind = "heard"
|
||||
if not events.is_empty() and float(events[0].at) < next_time:
|
||||
next_time = events[0].at
|
||||
kind = "dialogue"
|
||||
@@ -539,6 +550,7 @@ func advance() -> void:
|
||||
elapsed = next_time
|
||||
soundscape.advance(elapsed, place)
|
||||
match kind:
|
||||
"heard": complete_line()
|
||||
"impact":
|
||||
fired.impact = elapsed
|
||||
strike()
|
||||
@@ -586,11 +598,42 @@ func advance() -> void:
|
||||
soundscape.advance(elapsed, place)
|
||||
refresh_live()
|
||||
|
||||
func has_facts(required: Array) -> bool:
|
||||
for key in required:
|
||||
if not facts.has(key): return false
|
||||
return true
|
||||
|
||||
func line_allowed(id: String) -> bool:
|
||||
var rule: Dictionary = story.line_rules.get(id,{})
|
||||
if not has_facts(rule.get("facts",[])): return false
|
||||
if rule.has("places") and place not in rule.places: return false
|
||||
for key in rule.get("items",[]):
|
||||
if not items.has(key): return false
|
||||
return true
|
||||
|
||||
func opening_for(number: int) -> Dictionary:
|
||||
var entry: Dictionary = story.chapters[number-1]
|
||||
return entry if has_facts(entry.get("opening_facts",[])) else story.fallback_opening
|
||||
|
||||
func complete_line() -> void:
|
||||
var id := pending_line
|
||||
pending_line = ""
|
||||
var learned := false
|
||||
for key in story.line_rules.get(id,{}).get("learn",[]):
|
||||
if not facts.has(key):
|
||||
facts[key] = true
|
||||
learned = true
|
||||
system_caption("Ты запомнила: " + str(story.facts[key]))
|
||||
if learned:
|
||||
save_progress()
|
||||
refresh()
|
||||
|
||||
func command_allowed(action: Dictionary) -> bool:
|
||||
if not running or chapter == 1 or fired.has("hum") or elapsed >= float(story.timeline.hum) or not busy.is_empty(): return false
|
||||
if action.get("once", false) and done.has(action.id): return false
|
||||
if action.has("places") and place not in action.places: return false
|
||||
if action.get("power", false) and elapsed >= float(story.timeline.power): return false
|
||||
if not line_allowed(action.request): return false
|
||||
for key in action.get("facts", []):
|
||||
if not facts.has(key): return false
|
||||
for key in action.get("unknown", []):
|
||||
@@ -639,10 +682,6 @@ func finish_task() -> void:
|
||||
busy = {}
|
||||
soundscape.cancel_task()
|
||||
done[action.id] = true
|
||||
for key in action.get("learn", []):
|
||||
if not facts.has(key):
|
||||
facts[key] = true
|
||||
system_caption("Ты запомнила: " + str(story.facts[key]))
|
||||
for key in action.get("give", []): items[key] = true
|
||||
if action.has("move"):
|
||||
place = action.move
|
||||
@@ -662,6 +701,7 @@ func strike() -> void:
|
||||
running = false
|
||||
busy = {}
|
||||
events.clear()
|
||||
pending_line = ""
|
||||
voice.stop()
|
||||
soundscape.stop()
|
||||
siren.stop()
|
||||
@@ -748,10 +788,7 @@ func continue_call(retry: bool = false) -> void:
|
||||
var remembered := facts.duplicate()
|
||||
var number := chapter if retry else mini(chapter + 1, 10)
|
||||
var was_test := test_mode
|
||||
await dial_call(number, was_test)
|
||||
if was_test:
|
||||
facts = remembered
|
||||
refresh()
|
||||
await dial_call(number, was_test, 1, false, remembered if was_test else null)
|
||||
|
||||
func show_transcript() -> void:
|
||||
var box := menu_page("transcript")
|
||||
@@ -764,14 +801,19 @@ func show_transcript() -> void:
|
||||
box.add_child(text)
|
||||
box.add_child(button("Назад", "back_ending", show_outcome))
|
||||
|
||||
func memory_text() -> String:
|
||||
var entries: PackedStringArray = []
|
||||
for key in story.facts:
|
||||
if facts.has(key): entries.append("• " + str(story.facts[key]))
|
||||
return "Мама ещё не рассказала ничего, что поможет действовать иначе.\n\nСпрашивай и дослушивай ответы — услышанное появится здесь." if entries.is_empty() else "\n\n".join(entries)
|
||||
|
||||
func refresh() -> void:
|
||||
if not is_instance_valid(journal): return
|
||||
var entry: Dictionary = story.chapters[chapter - 1]
|
||||
title_label.text = entry.title
|
||||
title_label.text = entry.title if has_facts(entry.get("title_facts",[])) else "Снова звонок"
|
||||
phase_label.text = ("ПРОВЕРКА · " if test_mode else "") + "ЗВОНОК %02d / 10" % chapter
|
||||
journal.text = "Пока только её голос." if facts.is_empty() else ""
|
||||
for key in story.facts:
|
||||
if facts.has(key): journal.append_text(str(story.facts[key]) + "\n\n")
|
||||
journal.text = memory_text()
|
||||
if is_instance_valid(memory_content): memory_content.text = memory_text()
|
||||
refresh_commands()
|
||||
refresh_live()
|
||||
|
||||
@@ -791,9 +833,9 @@ func refresh_commands() -> void:
|
||||
return
|
||||
if not busy.is_empty(): return
|
||||
var entry: Dictionary = story.chapters[chapter - 1]
|
||||
if not done.has("question"):
|
||||
if not done.has("question") and line_allowed(entry.question):
|
||||
command_list.add_child(stage.chip("«"+str(story.lines[entry.question].text)+"»","question",func():choose_action("question")))
|
||||
var names := {"look":"У входной двери", "keys_search":"Найти ключи", "keys_fast":"Ключи в куртке", "lamp_search":"Проверить фонарь", "lamp_fast":"Повернуть батарейку", "mail_hint":"Вспомнить письмо", "read_mail":"Прочитать почту", "safe":"Сейф · 0417", "front":"На площадку", "stairs":"Проверить лестницу", "side_try":"Боковая дверь", "side_open":"Ручку вверх и ключ", "inner":"Во внутренний коридор", "back":"Вернуться в квартиру", "neighbor":"Постучать соседке", "phone_test":"Проверить связь", "phone_shelf":"Телефон на полку", "speak_here":"Мам, я здесь", "speak_love":"Я люблю тебя"}
|
||||
var names := {"look":"У входной двери", "keys_search":"Найти ключи", "keys_fast":"Ключи в куртке", "lamp_search":"Поискать фонарь", "lamp_fast":"Повернуть батарейку", "mail_hint":"Спросить о почте", "read_mail":"Прочитать письмо", "safe":"Сейф · 0417", "front":"На площадку", "stairs":"Проверить лестницу", "side_try":"Боковая дверь", "side_open":"Ручку вверх и ключ", "inner":"Подальше от окон", "back":"Вернуться в квартиру", "neighbor":"Постучать соседке", "phone_test":"Проверить связь", "phone_shelf":"Телефон на полку", "speak_here":"Мам, я здесь", "speak_love":"Я люблю тебя"}
|
||||
for action in story.actions:
|
||||
if command_allowed(action):
|
||||
var id: String = action.id
|
||||
@@ -853,12 +895,19 @@ func voice_length(id: String) -> float:
|
||||
|
||||
func say(id: String) -> void:
|
||||
if running and fired.has("hum") and id != "hum": return
|
||||
if not line_allowed(id): return
|
||||
var entry: Dictionary = story.lines[id]
|
||||
heard.append(id)
|
||||
stage.speaker = entry.speaker
|
||||
speech_until = elapsed + voice_length(id) + 0.08
|
||||
pending_line = id if running else ""
|
||||
pending_line_end = speech_until
|
||||
update_choice_state()
|
||||
add_caption(entry.speaker, entry.text)
|
||||
archive[-1]["line"] = id
|
||||
archive[-1]["known"] = facts.keys()
|
||||
archive[-1]["items"] = items.keys()
|
||||
archive[-1]["place"] = place
|
||||
voice.stop()
|
||||
if id == "intro_04": soundscape.turn_tv_down()
|
||||
if id == "intro_06": soundscape.world_cue("footsteps", elapsed + voice_length(id) + 0.1)
|
||||
|
||||
@@ -47,7 +47,7 @@ func perform(id: String) -> void:
|
||||
check(not game.busy.is_empty(), "Command accepted: " + id)
|
||||
if not game.busy.is_empty():
|
||||
at(game.reply_at + 0.02)
|
||||
at(game.busy_end + 0.03)
|
||||
at(maxf(game.busy_end,game.speech_until) + 0.03)
|
||||
|
||||
func start(number: int, knowledge: int = 0) -> void:
|
||||
game.show_test_menu()
|
||||
@@ -94,6 +94,12 @@ func finish(expected: String) -> void:
|
||||
check(game.busy.is_empty() and game.events.is_empty(), "Strike clears pending work")
|
||||
check(not game.voice.playing, "Strike cuts dialogue")
|
||||
check(game.outcome == expected, "Expected " + expected + ", got " + game.outcome)
|
||||
for entry in game.archive:
|
||||
if not entry.has("line"): continue
|
||||
var rule: Dictionary = game.story.line_rules.get(entry.line,{})
|
||||
for key in rule.get("facts",[]): check(key in entry.known,"Spoken line has prior evidence: " + entry.line + "/" + key)
|
||||
for key in rule.get("items",[]): check(key in entry.items,"Spoken line uses a held item: " + entry.line + "/" + key)
|
||||
if rule.has("places"): check(entry.place in rule.places,"Spoken line matches current place: " + entry.line)
|
||||
results.append({"chapter": game.chapter, "outcome": game.outcome, "facts": game.facts.keys()})
|
||||
# Fast route checks skip the production epilogue; separate checks below
|
||||
# wait for the real audio and verify that it gates the redial control.
|
||||
@@ -274,6 +280,8 @@ func run(target: Node) -> void:
|
||||
carol_count += 1
|
||||
check(jessica_count == 52, "All 52 Katya lines use Jessica")
|
||||
check(carol_count == 58, "All 58 mother lines use Carol")
|
||||
for id in game.story.lines:
|
||||
check(voices[id].text == game.story.lines[id].text,"Audio manifest matches corrected dialogue: " + id)
|
||||
check(game.voice_length("greeting") <= game.story.intro[0].at, "Greeting fits before prologue")
|
||||
check(45 + game.voice_length("power") <= 51, "Blackout reaction fits before conversation resumes")
|
||||
var warning_at: float = game.story.timeline.hum
|
||||
@@ -507,9 +515,13 @@ func run(target: Node) -> void:
|
||||
check(opening_at >= game.voice_length("greeting"), "Greeting is not truncated")
|
||||
at(opening_at + 0.01)
|
||||
at(reply_time + 0.01)
|
||||
check(entry.opening in game.heard and entry.reply in game.heard, "Unique opening " + str(number))
|
||||
perform("question")
|
||||
check(entry.question in game.heard and entry.answer in game.heard, "Unique exchange " + str(number))
|
||||
var opening: Dictionary = game.opening_for(number)
|
||||
check(opening.opening in game.heard and opening.reply in game.heard, "Knowledge-aware opening " + str(number))
|
||||
if game.line_allowed(entry.question):
|
||||
perform("question")
|
||||
check(entry.question in game.heard and entry.answer in game.heard, "Contextual exchange " + str(number))
|
||||
else:
|
||||
check(game.action_button("question") == null,"No context-free question " + str(number))
|
||||
at(warning_at + 0.01)
|
||||
check(game.heard[-1] == "hum", "Hum before strike")
|
||||
finish("flat")
|
||||
@@ -522,12 +534,12 @@ func run(target: Node) -> void:
|
||||
game.choose_action("safe")
|
||||
check(game.busy.is_empty(), "Hidden action rejected")
|
||||
perform("keys_search")
|
||||
check(game.facts.has("keys") and game.items.has("keys"), "Key discovery")
|
||||
check(game.facts.has("keys_exact") and game.items.has("keys"), "Key discovery")
|
||||
perform("lamp_search")
|
||||
check(game.facts.has("lamp") and game.items.has("lamp"), "Lamp discovery")
|
||||
finish("flat")
|
||||
click("next")
|
||||
check(game.chapter == 3 and game.facts.has("keys") and game.items.is_empty(), "Redial remembers knowledge only")
|
||||
check(game.chapter == 3 and game.facts.has("keys_exact") and game.items.is_empty(), "Redial remembers knowledge only")
|
||||
check(game.action_button("keys_fast") != null and game.action_button("keys_search") == null, "Shortcut replaces slow search")
|
||||
|
||||
start(4)
|
||||
@@ -579,7 +591,7 @@ func run(target: Node) -> void:
|
||||
at(89.99)
|
||||
check(game.heard[-1] == "hum" and game.heard.count("hum") == 1 and not game.can_respond(), "Nothing replaces the final line: " + str(number))
|
||||
finish("flat")
|
||||
check(not game.items.has("keys") and not game.facts.has("keys"), "Interrupted request grants nothing: " + str(number))
|
||||
check(not game.items.has("keys") and not game.facts.has("keys_exact"), "Interrupted request grants nothing: " + str(number))
|
||||
start(2)
|
||||
wait_for_speech()
|
||||
var search: Dictionary = game.story.actions.filter(func(action): return action.id == "keys_search")[0]
|
||||
@@ -728,6 +740,8 @@ func run(target: Node) -> void:
|
||||
click("resume")
|
||||
check(game.menu_screen.is_empty() and game.action_button("next") != null, "Menu returns to the completed call outcome")
|
||||
game.qa_mode = true
|
||||
var continuity = load("res://scripts/phone_continuity_qa.gd").new()
|
||||
await continuity.run(self)
|
||||
await realtime_final_check()
|
||||
if "--phone-real-time" in OS.get_cmdline_user_args():
|
||||
await realtime_check()
|
||||
|
||||
Reference in New Issue
Block a user