higurashi-cs/onikakushi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into lip-sync

Browse Source 
# Conflicts:
#	Update/onik_001.txt
#	Update/onik_009.txt
#	Update/onik_009_02.txt
This commit is contained in:
Jáchym Toušek
2018-03-18 20:31:07 +01:00
parent d32443301c 6ab484eb1e
commit 2e7957ec9e
12 changed files with 24 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Update/onik_001.txt
View File

@@ -2077,11 +2077,11 @@ void main()
ModPlayVoiceLS(3, 4, "s19/04/990400007", 256, TRUE);
OutputLine(NULL, "「言い掛かりでございますわぁ！",
NULL, "\"Nothing but lies and slander!", Line_WaitForInput);
ModPlayVoiceLS(3, 4, "s19/04/990400008", 256, TRUE);
OutputLine(NULL, "　何の証拠があって",
NULL, " Exactly what proof—", Line_ContinueAfterTyping);
Wait( 300 );
ModPlayVoiceLS(3, 4, "s19/04/990400010", 256, TRUE);
OutputLine(NULL, "…ふわッ！」",
NULL, " ...Uwah!\"", GetGlobalFlag(GLinemodeSp));
if (GetGlobalFlag(GADVMode)) { ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); }
@@ -2142,11 +2142,10 @@ void main()
//「ぼぅ、暴力反対ですのー！！!w600　証拠もないのにぃ～！！＠
if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#fcdb77>沙都子</color>", NULL, "<color=#fcdb77>Satoko</color>", NULL, Line_ContinueAfterTyping); }
ModPlayVoiceLS(3, 4, "s19/04/990400008", 256, TRUE);
ModPlayVoiceLS(3, 4, "s19/04/990400009", 256, TRUE);
OutputLine(NULL, "「ぼぅ、暴力反対ですのー！！",
NULL, "\"I-I'm against violence!!", Line_WaitForInput);
ModPlayVoiceLS(3, 4, "s19/04/990400009", 256, TRUE);
OutputLine(NULL, "　証拠もないのにぃ〜！！」",
NULL, " You don't even have any proof!!\"", GetGlobalFlag(GLinemodeSp));
if (GetGlobalFlag(GADVMode)) { ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); }
@@ -2333,7 +2332,6 @@ void main()
OutputLine(NULL, "「…ひぅ！",
NULL, "\"...Huu!", Line_WaitForInput);
ModPlayVoiceLS(3, 2, "s19/02/990200034", 256, TRUE);
OutputLine(NULL, "　…だってだって…こんなにかぁいいよぅ？」",
NULL, " ...But, but... they're sho kyute?\"", GetGlobalFlag(GLinemodeSp));
if (GetGlobalFlag(GADVMode)) { ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); }
@@ -2348,7 +2346,7 @@ void main()
//「でも...ちょっとくらいなら......だめかな？!d300だめかな？＠
if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#f0953d>レナ</color>", NULL, "<color=#f0953d>Rena</color>", NULL, Line_ContinueAfterTyping); }
ModPlayVoiceLS(3, 2, "s19/02/990200035", 256, TRUE);
ModPlayVoiceLS(3, 2, "s19/02/990200034", 256, TRUE);
OutputLine(NULL, "「でも…ちょっとくらいなら……だめかな？",
NULL, "\"But... just for a bit... is fine?", Line_Continue);
@@ -2394,6 +2392,7 @@ void main()
ModPlayVoiceLS(3, 2, "s19/02/990200035", 256, TRUE);
OutputLine(NULL, "「じゃあ見てるだけ。見てるだけだよ…。",
NULL, "\"Then I can just look. Just looking...", Line_WaitForInput);
ModPlayVoiceLS(3, 2, "s19/02/990200036", 256, TRUE);
OutputLine(NULL, "それならいいよね。よね？」",
NULL, " that should be fine, right? Right?\"", Line_Normal);
if (GetGlobalFlag(GADVMode)) { ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); }
@@ -4854,7 +4853,7 @@ void main()
Wait( 1000 );
SetValidityOfInput( TRUE );
DrawSceneWithMask("text/onik001", "mask_1900", 7, 0, 300 );
DrawSceneWithMask("tips/onik001", "mask_1900", 7, 0, 300 );
SetValidityOfInput( FALSE );
Wait( 5000 );
SetValidityOfInput( TRUE );

2
Update/onik_002.txt
View File

@@ -3750,7 +3750,7 @@ void main()
Wait( 1000 );
SetValidityOfInput( TRUE );
DrawSceneWithMask("text/onik002", "mask_1900", 7, 0, 300 );
DrawSceneWithMask("tips/onik002", "mask_1900", 7, 0, 300 );
SetValidityOfInput( FALSE );
Wait( 5000 );
SetValidityOfInput( TRUE );

2
Update/onik_003.txt
View File

@@ -4859,7 +4859,7 @@ void main()
Wait( 1000 );
SetValidityOfInput( TRUE );
DrawSceneWithMask("text/onik003", "mask_1900", 7, 0, 300 );
DrawSceneWithMask("tips/onik003", "mask_1900", 7, 0, 300 );
SetValidityOfInput( FALSE );
Wait( 5000 );
SetValidityOfInput( TRUE );

2
Update/onik_004.txt
View File

@@ -4495,7 +4495,7 @@ void main()
Wait( 1000 );
SetValidityOfInput( TRUE );
DrawSceneWithMask("text/onik004", "mask_1900", 7, 0, 300 );
DrawSceneWithMask("tips/onik004", "mask_1900", 7, 0, 300 );
SetValidityOfInput( FALSE );
Wait( 5000 );
SetValidityOfInput( TRUE );

2
Update/onik_005.txt
View File

@@ -5205,7 +5205,7 @@ void main()
Wait( 1000 );
SetValidityOfInput( TRUE );
DrawSceneWithMask("text/onik005", "mask_1900", 7, 0, 300 );
DrawSceneWithMask("tips/onik005", "mask_1900", 7, 0, 300 );
SetValidityOfInput( FALSE );
Wait( 5000 );
SetValidityOfInput( TRUE );

13
Update/onik_009.txt
View File

@@ -2189,35 +2189,35 @@ void main()
NULL, " Loli!", Line_Continue);
PlaySE( 4, "wa_010", 128, 64 );
OutputLineAll(NULL, "\n", Line_WaitForInput);
if (GetGlobalFlag(GADVMode)) { OutputLineAll(NULL, "", Line_WaitForInput); } else { OutputLineAll(NULL, "\n", Line_WaitForInput); }
//巫女！/
ModPlayVoiceLS(3, 1, "s19/01/hr_kei33830_02", 256, TRUE);
OutputLine(NULL, "巫女！",
NULL, " Shrine maiden!", Line_Continue);
PlaySE( 4, "wa_029", 128, 64 );
OutputLineAll(NULL, "\n", Line_WaitForInput);
if (GetGlobalFlag(GADVMode)) { OutputLineAll(NULL, "", Line_WaitForInput); } else { OutputLineAll(NULL, "\n", Line_WaitForInput); }
//半涙！/
ModPlayVoiceLS(3, 1, "s19/01/hr_kei33830_03", 256, TRUE);
OutputLine(NULL, "半涙！",
NULL, " Brink of crying!", Line_Continue);
PlaySE( 4, "wa_012", 128, 64 );
OutputLineAll(NULL, "\n", Line_WaitForInput);
if (GetGlobalFlag(GADVMode)) { OutputLineAll(NULL, "", Line_WaitForInput); } else { OutputLineAll(NULL, "\n", Line_WaitForInput); }
//みぃ！/
ModPlayVoiceLS(3, 1, "s19/01/hr_kei33830_04", 256, TRUE);
OutputLine(NULL, "みぃ！",
NULL, " Mew!", Line_Continue);
PlaySE( 4, "wa_016", 128, 64 );
OutputLineAll(NULL, "\n", Line_WaitForInput);
if (GetGlobalFlag(GADVMode)) { OutputLineAll(NULL, "", Line_WaitForInput); } else { OutputLineAll(NULL, "\n", Line_WaitForInput); }
//完璧だッ！！/
ModPlayVoiceLS(3, 1, "s19/01/hr_kei33830_05", 256, TRUE);
OutputLine(NULL, "完璧だッ！！",
NULL, " It was perfect!!", Line_Continue);
PlaySE( 4, "wa_007", 128, 64 );
OutputLineAll(NULL, "\n", Line_WaitForInput);
if (GetGlobalFlag(GADVMode)) { OutputLineAll(NULL, "", Line_WaitForInput); } else { OutputLineAll(NULL, "\n", Line_WaitForInput); }
//ただのコケを萌えにまで昇華した…!w500これぞまさに芸術と呼ぶに相応しいッ！！＠
ModPlayVoiceLS(3, 1, "s19/01/hr_kei33830_06", 256, TRUE);
@@ -4289,9 +4289,6 @@ void main()
DisableWindow();
ModDrawCharacterWithFiltering(3, 8, "sprite/normal/tomi1_warai_", "1", "right", 1, 160, 0, FALSE, 0, 0, 0, 0, 0, 20, 300, TRUE );
//「沙都子ちゃんがんばれ～ッ！！＠
if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#f0953d>レナ</color>", NULL, "<color=#f0953d>Rena</color>", NULL, Line_ContinueAfterTyping); }
ModPlayVoiceLS(3, 2, "s19/02/500200864", 256, TRUE);

8
Update/onik_009_02.txt
View File

@@ -5,20 +5,22 @@ void main()
//■沢のほとりにて…昔話
////*Onikakusi_day9_2
DrawScene("monologue_oni1", 1000 );
DrawScene("text/monologue_oni1", 1000 );
ModPlayVoiceLS(3, 0, "s00/n/oni001", 256, TRUE);
Wait( 4000 );
ModPlayVoiceLS(3, 0, "s00/n/oni002", 256, TRUE);
Wait( 4000 );
ModPlayVoiceLS(3, 0, "s00/n/oni003", 256, TRUE);
Wait( 10000 );
DrawScene("monologue_oni2", 1000 );
DrawScene("text/monologue_oni2", 1000 );
ModPlayVoiceLS(3, 0, "s00/n/oni004", 256, TRUE);
Wait( 5000 );
ModPlayVoiceLS(3, 0, "s00/n/oni005", 256, TRUE);
Wait( 5000 );
DrawScene("title_oni", 1000 );
ModPlayVoiceLS(3, 0, "s00/n/oni007", 256, TRUE);
Wait( 2000 );
DrawScene("text/monologue_oni3", 1000 );
ModPlayVoiceLS(3, 0, "s00/n/oni008", 256, TRUE);
Wait( 3000 );
ModPlayVoiceLS(3, 0, "s00/n/oni009", 256, TRUE);
@@ -2958,7 +2960,7 @@ void main()
Wait( 1000 );
SetValidityOfInput( TRUE );
DrawSceneWithMask("text/onik009_02", "mask_1900", 7, 0, 300 );
DrawSceneWithMask("tips/onik009_02", "mask_1900", 7, 0, 300 );
SetValidityOfInput( FALSE );
Wait( 5000 );
SetValidityOfInput( TRUE );

2
Update/onik_010.txt
View File

@@ -4717,7 +4717,7 @@ void main()
Wait( 1000 );
SetValidityOfInput( TRUE );
DrawSceneWithMask("text/onik010", "mask_1900", 7, 0, 300 );
DrawSceneWithMask("tips/onik010", "mask_1900", 7, 0, 300 );
SetValidityOfInput( FALSE );
Wait( 5000 );
SetValidityOfInput( TRUE );

2
Update/onik_011.txt
View File

@@ -5194,7 +5194,7 @@ void main()
Wait( 1000 );
SetValidityOfInput( TRUE );
DrawSceneWithMask("text/onik011", "mask_1900", 7, 0, 300 );
DrawSceneWithMask("tips/onik011", "mask_1900", 7, 0, 300 );
SetValidityOfInput( FALSE );
Wait( 5000 );
SetValidityOfInput( TRUE );

2
Update/onik_012.txt
View File

@@ -5483,7 +5483,7 @@ void main()
Wait( 1000 );
SetValidityOfInput( TRUE );
DrawSceneWithMask("text/onik012", "mask_1900", 7, 0, 300 );
DrawSceneWithMask("tips/onik012", "mask_1900", 7, 0, 300 );
SetValidityOfInput( FALSE );
Wait( 5000 );
SetValidityOfInput( TRUE );

2
Update/onik_013.txt
View File

@@ -4684,7 +4684,7 @@ void main()
Wait( 1000 );
SetValidityOfInput( TRUE );
DrawSceneWithMask("text/onik013", "mask_1900", 7, 0, 300 );
DrawSceneWithMask("tips/onik013", "mask_1900", 7, 0, 300 );
SetValidityOfInput( FALSE );
Wait( 5000 );
SetValidityOfInput( TRUE );

2
Update/onik_014_02.txt
View File

@@ -7221,7 +7221,7 @@ void main()
Wait( 1000 );
SetValidityOfInput( TRUE );
DrawSceneWithMask("text/onik014_02", "mask_1900", 7, 0, 300 );
DrawSceneWithMask("tips/onik014_02", "mask_1900", 7, 0, 300 );
SetValidityOfInput( FALSE );
Wait( 5000 );
SetValidityOfInput( TRUE );