From 756bed5df8f51446e7f8dcf8bb48246b90e4953e Mon Sep 17 00:00:00 2001 From: deepFlaw <59459967+deepFlaw@users.noreply.github.com> Date: Sat, 25 Jul 2020 14:37:43 -0400 Subject: [PATCH 1/4] Inconsistent translation fix Onikakushi now uses "director" instead of "manager", from a year-old change (commit 270946caf41bd5ef8143bf690ee9b103300e9e18). --- Update/omake_02.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Update/omake_02.txt b/Update/omake_02.txt index 6f4b0ba8..67ea84c5 100644 --- a/Update/omake_02.txt +++ b/Update/omake_02.txt @@ -1510,7 +1510,7 @@ void main() NULL, "\"That's right.", Line_WaitForInput); ModPlayVoiceLS(4, 3, "ps3/s20/03/440300348", 256, TRUE); OutputLine(NULL, "「鬼隠し」のシナリオで名前だけ登場した「監督」ってのがかなり怪しいかな！」", - NULL, " The manager who only appeared by name in the last story is pretty suspicious, if you ask me!\"", GetGlobalFlag(GLinemodeSp)); + NULL, " The director who only appeared by name in the last story is pretty suspicious, if you ask me!\"", GetGlobalFlag(GLinemodeSp)); if (GetGlobalFlag(GADVMode)) { ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); } From c91dde00b25dab251800667972aca73f9ba5bea6 Mon Sep 17 00:00:00 2001 From: deepFlaw <59459967+deepFlaw@users.noreply.github.com> Date: Sat, 25 Jul 2020 15:34:57 -0400 Subject: [PATCH 2/4] Re-add PC version line to Cast Review Console line assumes players have also read Taraimawashi and so should not be default, especially when other lines refer to a singular previous scenario --- Update/omake_02.txt | 14 ++++++++------ Update/zomake_02_vm00_n01.txt | 11 +++++++++++ Update/zomake_02_vm0x_n01.txt | 11 +++++++++++ 3 files changed, 30 insertions(+), 6 deletions(-) diff --git a/Update/omake_02.txt b/Update/omake_02.txt index 67ea84c5..095298e9 100644 --- a/Update/omake_02.txt +++ b/Update/omake_02.txt @@ -676,8 +676,8 @@ void main() //「意見も何も...、今回のシナリオで解明編なのではありませんことー＠　犯人は魅音さん＠　諸悪の根源はぜ～んぶ園崎家＠　それで決着でございませんの。＠ //VoiceMatching - if(GetGlobalFlag(GCensor) >= 2){ModCallScriptSection("zomake_02_vm0x_n01","dialog000");} - if(GetGlobalFlag(GCensor) <= 1){ModCallScriptSection("zomake_02_vm00_n01","dialog000");} + if(GetGlobalFlag(GCensor) >= 2){ModCallScriptSection("zomake_02_vm0x_n01","dialog001");} + if(GetGlobalFlag(GCensor) <= 1){ModCallScriptSection("zomake_02_vm00_n01","dialog001");} //VoiceMatchingEnd ModPlayVoiceLS(4, 4, "ps3/s20/04/440400180", 256, TRUE); @@ -1853,9 +1853,12 @@ void main() ModPlayVoiceLS(4, 9, "ps3/s20/09/440900117", 256, TRUE); OutputLine(NULL, "圭一くん以外の人の死には何かしら理由が見つけられるんだけど、…圭一くんだけなぜかいつも曖昧。", NULL, " We can find some kind of reason for everyone but Keiichi-kun to die... but for some reason, Keiichi-kun's death is always vague.", Line_WaitForInput); - ModPlayVoiceLS(4, 9, "ps3/s20/09/440900118", 256, TRUE); - OutputLine(NULL, "…「鬼隠し」でも「たらいまわし」でも、そして今回の「綿流し」でも。", - NULL, " ...Last time in Onikakushi and Taraimawashi. And now in Watanagashi. ", GetGlobalFlag(GLinemodeSp)); + + //VoiceMatching + if(GetGlobalFlag(GCensor) >= 3){ModCallScriptSection("zomake_02_vm0x_n01","dialog002");} + if(GetGlobalFlag(GCensor) <= 2){ModCallScriptSection("zomake_02_vm00_n01","dialog002");} + //VoiceMatchingEnd + if (GetGlobalFlag(GADVMode)) { OutputLine("鷹野", NULL, "Takano", NULL, Line_ContinueAfterTyping); } ModPlayVoiceLS(4, 9, "ps3/s20/09/440900119", 256, TRUE); OutputLine(NULL, "祭具殿に踏み入るのとは無関係に狙われてる。」", @@ -1863,7 +1866,6 @@ void main() if (GetGlobalFlag(GADVMode)) { ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); } - //＜鷹野 DisableWindow(); FadeBustshotWithFiltering( 3, "left", 1, FALSE, 0, 0, 300, TRUE ); diff --git a/Update/zomake_02_vm00_n01.txt b/Update/zomake_02_vm00_n01.txt index 8ba2a617..0eba765c 100644 --- a/Update/zomake_02_vm00_n01.txt +++ b/Update/zomake_02_vm00_n01.txt @@ -3,9 +3,20 @@ void main() } void dialog000() +{ +} + +void dialog001() { if (GetGlobalFlag(GADVMode)) { OutputLine("沙都子", NULL, "Satoko", NULL, Line_ContinueAfterTyping); } ModPlayVoiceLS(4, 4, "ps3/s20/04/440400179", 256, TRUE); OutputLine(NULL, "「意見も何も…、今回のシナリオで解明編なのではありませんことー？", NULL, "\"An honest opinion... was the story this time not an answer chapter?", Line_WaitForInput); } + +void dialog002() +{ + ModPlayVoiceLS(4, 9, "ps3/s20/09/440900118", 256, TRUE); + OutputLine(NULL, "…前回と今回。", + NULL, " ...Both this time and last time. ", GetGlobalFlag(GLinemodeSp)); +} \ No newline at end of file diff --git a/Update/zomake_02_vm0x_n01.txt b/Update/zomake_02_vm0x_n01.txt index 5d73cff2..384402fd 100644 --- a/Update/zomake_02_vm0x_n01.txt +++ b/Update/zomake_02_vm0x_n01.txt @@ -3,9 +3,20 @@ void main() } void dialog000() +{ +} + +void dialog001() { if (GetGlobalFlag(GADVMode)) { OutputLine("沙都子", NULL, "Satoko", NULL, Line_ContinueAfterTyping); } ModPlayVoiceLS(4, 4, "ps3/s20/04/440400179", 256, TRUE); OutputLine(NULL, "「意見も何も…、今回のシナリオで謎は全て解けたのではありませんことー？", NULL, "\"What is there to say?... weren't all of the mysteries solved in this chapter?", Line_WaitForInput); } + +void dialog002() +{ + ModPlayVoiceLS(4, 9, "ps3/s20/09/440900118", 256, TRUE); + OutputLine(NULL, "…「鬼隠し」でも「たらいまわし」でも、そして今回の「綿流し」でも。", + NULL, " ...Last time in Onikakushi and Taraimawashi. And now in Watanagashi. ", GetGlobalFlag(GLinemodeSp)); +} From 715f5461f5824b0c2b34e31175e218923256933e Mon Sep 17 00:00:00 2001 From: deepFlaw <59459967+deepFlaw@users.noreply.github.com> Date: Sun, 16 Aug 2020 00:33:09 -0400 Subject: [PATCH 3/4] Update zwata_001_vm00_n01.txt --- Update/zwata_001_vm00_n01.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Update/zwata_001_vm00_n01.txt b/Update/zwata_001_vm00_n01.txt index 5b821e24..7defc5a8 100644 --- a/Update/zwata_001_vm00_n01.txt +++ b/Update/zwata_001_vm00_n01.txt @@ -73,7 +73,7 @@ void dialog005() { if (GetGlobalFlag(GADVMode)) { OutputLineAll("", NULL, Line_ContinueAfterTyping); } - OutputLine(NULL, "　百万長者ゲーム。", + OutputLine(NULL, "　百億兆者ゲーム。", NULL, "It was a game called \"Billionaire.\"", GetGlobalFlag(GLinemodeSp)); if (GetGlobalFlag(GADVMode)) { ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); } From d5e15194a5aceffdfebe3a2fd61285c316235a95 Mon Sep 17 00:00:00 2001 From: deepFlaw <59459967+deepFlaw@users.noreply.github.com> Date: Sun, 16 Aug 2020 00:35:49 -0400 Subject: [PATCH 4/4] Revert "Update zwata_001_vm00_n01.txt" This reverts commit 715f5461f5824b0c2b34e31175e218923256933e. --- Update/zwata_001_vm00_n01.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Update/zwata_001_vm00_n01.txt b/Update/zwata_001_vm00_n01.txt index 7defc5a8..5b821e24 100644 --- a/Update/zwata_001_vm00_n01.txt +++ b/Update/zwata_001_vm00_n01.txt @@ -73,7 +73,7 @@ void dialog005() { if (GetGlobalFlag(GADVMode)) { OutputLineAll("", NULL, Line_ContinueAfterTyping); } - OutputLine(NULL, "　百億兆者ゲーム。", + OutputLine(NULL, "　百万長者ゲーム。", NULL, "It was a game called \"Billionaire.\"", GetGlobalFlag(GLinemodeSp)); if (GetGlobalFlag(GADVMode)) { ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); }