Skip to content

Commit

Permalink
upstream update
Browse files Browse the repository at this point in the history
  • Loading branch information
@Singulariity
Singulariity committed Sep 30, 2024
1 parent 04c1ca3 commit 84876d6
Show file tree
Hide file tree
Showing 143 changed files with 1,295 additions and 646 deletions.
32 changes: 1 addition & 31 deletions manager.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,39 +5,9 @@

// exclude empty files
$exclude = [
'zonik_001_vm00_n01.txt',
'zonik_001_vm0x_n01.txt',
'zonik_002_vm00_n01.txt',
'zonik_002_vm0x_n01.txt',
'zonik_009_02_vm00_n01.txt',
'zonik_009_02_vm0x_n01.txt',
'zonik_012_vm00_n01.txt',
'zonik_012_vm0x_n01.txt',
'zonik_tips_01_vm00_n01.txt',
'zonik_tips_01_vm0x_n01.txt',
'zonik_tips_02_vm00_n01.txt',
'zonik_tips_02_vm0x_n01.txt',
'zonik_tips_17_vm00_n01.txt',
'zonik_tips_17_vm0x_n01.txt',
'zwata_010_02_vm00_n01.txt',
'zwata_010_02_vm0x_n01.txt',
'zwata_012_02_vm00_n01.txt',
'zwata_012_02_vm0x_n01.txt',
'zwata_012_vm00_n01.txt',
'zwata_012_vm0x_n01.txt',
'zwata_tips_01_vm00_n01.txt',
'zwata_tips_01_vm0x_n01.txt',
'zwata_tips_22_vm00_n01.txt',
'zwata_tips_22_vm0x_n01.txt',
'_zmeak_008_vm00_n01.txt',
'_zmeak_008_vm0x_n01.txt',
'_zmeak_012_vm00_n01.txt',
'_zmeak_012_vm0x_n01.txt',
'_zmeak_016_2_vm00_n01.txt',
'_zmeak_016_2_vm0x_n01.txt',
'zwata_00x_vm00_n01.txt',
'flow.txt',
'init.txt',
'zwata_00x_vm00_n01.txt',
'&choicesdialog.txt',
'&endroll_sion.txt',
'&endroll_staff5.txt',
Expand Down
58 changes: 31 additions & 27 deletions scripts/ch1/onik_001.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3076,7 +3076,7 @@ void main()
//　始めはとても恥ずかしかったが、そんなのはすぐに薄れた＠
if (GetGlobalFlag(GADVMode)) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
OutputLine(NULL, "　初めはとても恥ずかしかったが、そんなのはすぐに薄れた。",
NULL, "At first. this was kinda embarrassing, but I got used to it pretty fast.", GetGlobalFlag(GLinemodeSp));
NULL, "At first, this was kinda embarrassing, but I got used to it pretty fast.", GetGlobalFlag(GLinemodeSp));
if (GetGlobalFlag(GADVMode)) { ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); }


Expand Down Expand Up @@ -3125,8 +3125,8 @@ void main()
ClearMessage();

DisableWindow();
if (GetGlobalFlag(GHideCG)) {DrawSceneWithMask("background/gk3", "m1", 0, 0, 1300 );}

// DrawSceneWithMask( "bg_108", "m1", 0, 0, 1300 );
DrawSceneWithMask("scene/008", "m1", 0, 0, 1300 );


Expand Down Expand Up @@ -3186,7 +3186,8 @@ void main()
NULL, "As the fruit of my efforts(?), I can now reach over and take sides from anybody's lunch.", Line_Normal);
ClearMessage();

// DrawBustshot( 3, "sa_se_de_a1", 160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 20, 400, TRUE ); DrawBustshot( 3, "sa_se_de_a1", 160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 20, 400, TRUE );
if (GetGlobalFlag(GHideCG)) {DisableWindow();}
if (GetGlobalFlag(GHideCG)) {ModDrawCharacter(3, 4, "sprite/sa1a_def_a1_", "1", 160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 20, 300, TRUE );}

//「あらあら、圭一さんのお弁当は今日は大奮発ではございませんことぉ？＠
if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#fcdb77>沙都子</color>", NULL, "<color=#fcdb77>Satoko</color>", NULL, Line_ContinueAfterTyping); }
Expand Down Expand Up @@ -3245,9 +3246,9 @@ void main()



// DisableWindow();
// FadeBustshotWithFiltering( 3, "m1", 1, FALSE, 0, 0, 300, TRUE );
// DrawBustshot( 2, "ri_se_ni_a1", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 10, 400, TRUE );
if (GetGlobalFlag(GHideCG)) {DisableWindow();}
if (GetGlobalFlag(GHideCG)) {FadeBustshotWithFiltering( 3, "m1", 1, FALSE, 0, 0, 200, TRUE );}
if (GetGlobalFlag(GHideCG)) {ModDrawCharacter(2, 5, "sprite/ri1_niko_a1_", "0", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 10, 200, TRUE );}

//「...昨夜のお夕食の煮物を少し取っておきましたですよ。￥
if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#6972c1>梨花</color>", NULL, "<color=#6972c1>Rika</color>", NULL, Line_ContinueAfterTyping); }
Expand Down Expand Up @@ -3305,9 +3306,9 @@ void main()
NULL, "That's not easy to do.", Line_Normal);
ClearMessage();

// DisableWindow();
// DrawSceneWithMask( "bg_108", "left", 0, 0, 300 );
// DrawBustshot( 3, "me_se_de_a1", 160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 20, 200, TRUE );
if (GetGlobalFlag(GHideCG)) {DisableWindow();}
if (GetGlobalFlag(GHideCG)) {DrawSceneWithMask("background/gk1", "left", 0, 0, 300 );}
if (GetGlobalFlag(GHideCG)) {ModDrawCharacter(3, 3, "sprite/me1a_def_a1_", "0", 160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 20, 200, TRUE );}

//「梨花ちゃんって何気にそーゆうの得意なんだよなぁ。＠
if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#5ec69a>魅音</color>", NULL, "<color=#5ec69a>Mion</color>", NULL, Line_ContinueAfterTyping); }
Expand All @@ -3317,8 +3318,8 @@ void main()
if (GetGlobalFlag(GADVMode)) { ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); }


// DisableWindow();
// DrawBustshotWithFiltering( 1, "re_se_wa_b1", "left", 1, -160, 0, FALSE, 0, 0, 0, 0, 0, 0, 300, TRUE );
if (GetGlobalFlag(GHideCG)) {DisableWindow();}
if (GetGlobalFlag(GHideCG)) {ModDrawCharacterWithFiltering(1, 2, "sprite/re1b_warai_b1_", "2", "left", 1, -160, 0, FALSE, 0, 0, 0, 0, 0, 0, 300, TRUE );}

//「お裁縫とかお洗濯とかも上手なの＠すごいよね＠すごいよね！＠
if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#f0953d>レナ</color>", NULL, "<color=#f0953d>Rena</color>", NULL, Line_ContinueAfterTyping); }
Expand All @@ -3334,9 +3335,9 @@ void main()
if (GetGlobalFlag(GADVMode)) { ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); }


// DisableWindow();
// FadeBustshot( 3, FALSE, 0, 0, 0, 0, 200, TRUE );
// DrawBustshot( 3, "sa_se_aw_a1", 160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 20, 400, TRUE );
if (GetGlobalFlag(GHideCG)) {DisableWindow();}
if (GetGlobalFlag(GHideCG)) {FadeBustshot( 3, FALSE, 0, 0, 0, 0, 200, TRUE );}
if (GetGlobalFlag(GHideCG)) {ModDrawCharacter(3, 4, "sprite/sa1a_akuwarai_a1_", "1", 160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 20, 200, TRUE );}

//「梨花はいろいろとすごいんですのよ＠をーっほっほっほ！＠
if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#fcdb77>沙都子</color>", NULL, "<color=#fcdb77>Satoko</color>", NULL, Line_ContinueAfterTyping); }
Expand All @@ -3358,9 +3359,9 @@ void main()
if (GetGlobalFlag(GADVMode)) { ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); }


// DisableWindow();
// FadeBustshot( 1, FALSE, 0, 0, 0, 0, 1000, TRUE );
// DrawBustshot( 1, "ri_se_de_a1", -160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 0, 400, TRUE );
if (GetGlobalFlag(GHideCG)) {DisableWindow();}
if (GetGlobalFlag(GHideCG)) {FadeBustshot( 1, FALSE, 0, 0, 0, 0, 400, TRUE );}
if (GetGlobalFlag(GHideCG)) {ModDrawCharacter(1, 5, "sprite/ri1_def_a1_", "0", -160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 0, 400, TRUE );}

//「...ボクより、レナの方がお料理は上手です。＠
if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#6972c1>梨花</color>", NULL, "<color=#6972c1>Rika</color>", NULL, Line_ContinueAfterTyping); }
Expand All @@ -3369,10 +3370,9 @@ void main()
NULL, "\"...Rena's actually better at cooking than I am.\"", GetGlobalFlag(GLinemodeSp));
if (GetGlobalFlag(GADVMode)) { ClearMessage(); } else { OutputLineAll(NULL, "\n\n", Line_ContinueAfterTyping); }


// DisableWindow();
// DrawSceneWithMask( "bg_108", "m1", 0, 0, 300 );
// DrawBustshotWithFiltering( 2, "re_se_bi_a1", "m1", 1, 0, 0, FALSE, 0, 0, 0, 0, 0, 10, 300, TRUE );
if (GetGlobalFlag(GHideCG)) {DisableWindow();}
if (GetGlobalFlag(GHideCG)) {DrawSceneWithMask("background/gk1", "m1", 0, 0, 300 );}
if (GetGlobalFlag(GHideCG)) {ModDrawCharacterWithFiltering(2, 2, "sprite/re1a_bikkuri_a1_", "2", "m1", 1, 0, 0, FALSE, 0, 0, 0, 0, 0, 10, 300, TRUE );}


//「......え、!w800あ、!w800...その......ね☆＠
Expand Down Expand Up @@ -3424,9 +3424,10 @@ void main()
if (GetGlobalFlag(GADVMode)) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
OutputLine(NULL, "　みんなもレナの弁当箱には進んで箸を伸ばす。",
NULL, "Everyone else pulled from Rena's lunch box constantly.", Line_Normal);
// ClearMessage();
// DisableWindow();
// DrawBustshot( 2, "re_se_ha_a1", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 10, 200, TRUE );
ClearMessage();

if (GetGlobalFlag(GHideCG)) {DisableWindow();}
if (GetGlobalFlag(GHideCG)) {ModDrawCharacter(2, 2, "sprite/re1a_hau_a1_", "1", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 10, 200, TRUE );}

//「これ、前に評判良かったからいっぱい作ってみたの＠...おいしいかな？!d800...かな？＠
if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#f0953d>レナ</color>", NULL, "<color=#f0953d>Rena</color>", NULL, Line_ContinueAfterTyping); }
Expand Down Expand Up @@ -3863,29 +3864,32 @@ void main()
PlaySE( 4, "wa_005", 56, 64 );
ShakeScreen( 1, 20, 20, 5, 0, );
DrawBustshot(5, "scene/001a", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 25, 50, TRUE );
if (GetGlobalFlag(GHideCG)) {DrawBustshot(5, "background/furiker_a", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 25, 50, TRUE );}


DrawScene("black", 100 );

PlaySE( 4, "wa_005", 56, 64 );
ShakeScreen( 1, 20, 20, 5, 0, );
DrawBustshot(5, "scene/001a", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 25, 50, TRUE );
if (GetGlobalFlag(GHideCG)) {DrawBustshot(5, "background/furiker_b", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 25, 50, TRUE );}

PlaySE( 4, "wa_005", 56, 64 );
DrawBustshot(5, "scene/001a", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 25, 50, TRUE );
if (GetGlobalFlag(GHideCG)) {DrawBustshot(5, "background/furiker_a", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 25, 50, TRUE );}

PlaySE( 4, "wa_005", 56, 64 );
DrawBustshot(5, "scene/001b", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 25, 50, TRUE );
if (GetGlobalFlag(GHideCG)) {DrawBustshot(5, "background/furiker_b", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 25, 50, TRUE );}

PlaySE( 4, "wa_005", 56, 64 );
DrawBustshot(5, "scene/001b", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 25, 50, TRUE );
if (GetGlobalFlag(GHideCG)) {DrawBustshot(5, "background/furiker_a", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 25, 50, TRUE );}

PlaySE( 4, "wa_005", 56, 64 );
ShakeScreen( 1, 20, 20, 5, 0, );
DrawBustshot(5, "scene/001b", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 25, 50, TRUE );


// DrawScene( "black", 100 );
if (GetGlobalFlag(GHideCG)) {DrawBustshot(5, "background/furiker_b", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 25, 50, TRUE );}


//　すぱぱーん！＠
Expand Down
9 changes: 4 additions & 5 deletions scripts/ch1/onik_002.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1404,7 +1404,7 @@ void main()
NULL, "It didn't change how much there was, but the implication behind it was different.", Line_Normal);
ClearMessage();
DisableWindow();
// DrawBustshot( 2, "sa_si_aw_a1", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 10, 400, TRUE );
if (GetGlobalFlag(GHideCG)) {ModDrawCharacter(2, 4, "sprite/sa2a_akuwarai_a1_", "1", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 10, 400, TRUE );}
DrawScene("scene/101", 1000 );


Expand Down Expand Up @@ -1433,8 +1433,8 @@ void main()
if (GetGlobalFlag(GADVMode)) { ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); }


// DisableWindow();
// DrawBustshot( 2, "sa_si_bi_a1", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 10, 200, TRUE );
if (GetGlobalFlag(GHideCG)) {DisableWindow();}
if (GetGlobalFlag(GHideCG)) {ModDrawCharacter(2, 4, "sprite/sa2a_odoroki_a1_", "1", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 10, 200, TRUE );}

//「襟首を掴むのも反則でございますー！！！￥
if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#fcdb77>沙都子</color>", NULL, "<color=#fcdb77>Satoko</color>", NULL, Line_ContinueAfterTyping); }
Expand All @@ -1444,7 +1444,6 @@ void main()
ClearMessage();

DisableWindow();
// FadeBustshot( 2, FALSE, 0, 0, 0, 0, 200, TRUE );
DrawScene("background/jt1", 1000 );

//　激しい戦いは、豊富な運動量と肘によるブロックで序盤、沙都子が優位に立つかに見えたが、箸さばきの致命的な差が形勢を一気にひっくり返す＠
Expand Down Expand Up @@ -3371,7 +3370,7 @@ void main()
//　富竹さんは意味深に笑って見せると、夕闇へ溶けこむように去って行った＠
if (GetGlobalFlag(GADVMode)) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
OutputLine(NULL, "　富竹さんは意味深に笑って見せると、夕闇へ溶けこむように去って行った。",
NULL, "Tomitake-san chortled suggestively, then disappeared into the twilight.", GetGlobalFlag(GLinemodeSp));
NULL, "Tomitake-san chortled suggestively, then disappeared into the twilight.", GetGlobalFlag(GLinemodeSp));
if (GetGlobalFlag(GADVMode)) { ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); }


Expand Down
2 changes: 1 addition & 1 deletion scripts/ch1/onik_004.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3164,7 +3164,7 @@ void main()
//　今日にはお持ち帰りできるたろうからな、きっと笑いが隠せないのだろう￥
if (GetGlobalFlag(GADVMode)) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
OutputLine(NULL, "　今日にはお持ち帰りできるだろうからな、きっと笑いが隠せないのだろう。",
NULL, "I expect that she was grinning in anticipation of taking Colonel Randy home.", Line_Normal);
NULL, "I expect that she was grinning in anticipation of taking Colonel Sanders home.", Line_Normal);
ClearMessage();


Expand Down
2 changes: 1 addition & 1 deletion scripts/ch1/onik_009.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2812,7 +2812,7 @@ void main()
NULL, "\"...He said he made it long ago for one of his summer school assignments.", Line_WaitForInput);
ModPlayVoiceLS(3, 5, "ps3/s19/05/500500299", 256, TRUE);
OutputLine(NULL, "恥ずかしいので滅多に人に見せないとも言ってますですよ。」",
NULL, " He said he doesn't show it other often because it's embarrassing.\"", GetGlobalFlag(GLinemodeSp));
NULL, " He said he doesn't show it to others often because it's embarrassing.\"", GetGlobalFlag(GLinemodeSp));
if (GetGlobalFlag(GADVMode)) { ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); }


Expand Down
32 changes: 15 additions & 17 deletions scripts/ch1/onik_009_02.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -714,8 +714,9 @@ void main()
DisableWindow();
DrawScene("black", 500 );
DrawSceneWithMask("scene/103a", "down", 0, 0, 1300 );

// DrawBustshotWithFiltering( 1, "night/ta_si_wa_a1", "left", 1, -160, 0, FALSE, 0, 0, 0, 0, 0, 0, 300, TRUE );
if (GetGlobalFlag(GHideCG)) {ModDrawCharacter(1, 9, "sprite/ta1_warai_", "1", -160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 0, 0, FALSE );}
if (GetGlobalFlag(GHideCG)) {ModDrawCharacter(3, 8, "sprite/tomi1_def_", "0", 160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 20, 0, FALSE );}
if (GetGlobalFlag(GHideCG)) {DrawSceneWithMask("background/y_kawa3", "down", 0, 0, 1300 );}

//「若い人たちはそうは思わなかったみたいだけれど…＠お年寄りたちはオヤシロさまの祟りだと疑わなかったみたいね。＠
if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#f5e6d3>女性</color>", NULL, "<color=#f5e6d3>Woman</color>", NULL, Line_ContinueAfterTyping); }
Expand All @@ -735,16 +736,17 @@ void main()
NULL, "The woman with Tomitake-san chuckled mischievously.", GetGlobalFlag(GLinemodeSp));
if (GetGlobalFlag(GADVMode)) { ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); }


if (GetGlobalFlag(GHideCG)) {DisableWindow();}
if (GetGlobalFlag(GHideCG)) {ModDrawCharacter(3, 8, "sprite/tomi1_warai_", "1", 160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 20, 200, TRUE );}

//　合わせて富竹さんも笑ったので、俺もつられて笑うことにする￥
if (GetGlobalFlag(GADVMode)) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
OutputLine(NULL, "　合わせて富竹さんも笑ったので、俺もつられて笑うことにする。",
NULL, "Tomitake-san began laughing with her. It was so infectious I ended up laughing as well.", Line_Normal);
ClearMessage();

// DisableWindow();
// DrawBustshot( 1, "night/ta_si_de_a1", -160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 0, 200, TRUE );
if (GetGlobalFlag(GHideCG)) {DisableWindow();}
if (GetGlobalFlag(GHideCG)) {ModDrawCharacter(1, 9, "sprite/ta1_def_", "0", -160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 0, 200, TRUE );}

//「…でも、…今ではどうかしらね＠結構いるんじゃないかしら＠若い人にも。＠
if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#f5e6d3>女性</color>", NULL, "<color=#f5e6d3>Woman</color>", NULL, Line_ContinueAfterTyping); }
Expand All @@ -768,10 +770,8 @@ void main()
NULL, "\"A few... what?\"", GetGlobalFlag(GLinemodeSp));
if (GetGlobalFlag(GADVMode)) { ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); }



// DisableWindow();
// DrawBustshot( 3, "night/tm_si_de_a1", 160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 20, 200, TRUE );
if (GetGlobalFlag(GHideCG)) {DisableWindow();}
if (GetGlobalFlag(GHideCG)) {ModDrawCharacter(3, 8, "sprite/tomi1_def_", "0", 160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 20, 200, TRUE );}

//「信じてる人だよ＠…オヤシロさまの、祟り。＠
if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#945c44>富竹</color>", NULL, "<color=#945c44>Tomitake</color>", NULL, Line_ContinueAfterTyping); }
Expand Down Expand Up @@ -824,7 +824,7 @@ void main()

DisableWindow();
DrawSceneWithMask("scene/103b", "down", 0, 0, 1300 );
// DrawBustshot( 3, "night/tm_si_ko_a1", 160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 20, 200, TRUE );
if (GetGlobalFlag(GHideCG)) {ModDrawCharacter(3, 8, "sprite/tomi1_komaru_", "1", 160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 20, 200, TRUE );}

//「毎年…綿流しの日になるとね。!w1500/
if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#945c44>富竹</color>", NULL, "<color=#945c44>Tomitake</color>", NULL, Line_ContinueAfterTyping); }
Expand Down Expand Up @@ -960,8 +960,8 @@ void main()
NULL, "With that in mind, could the housewife have been involved in some way, too?", Line_Normal);
ClearMessage();

// DisableWindow();
// DrawBustshot( 1, "night/ta_si_wa_a1", -160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 0, 200, TRUE );
if (GetGlobalFlag(GHideCG)) {DisableWindow();}
if (GetGlobalFlag(GHideCG)) {ModDrawCharacter(1, 9, "sprite/ta1_warai_", "1", -160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 0, 200, TRUE );}

//「その通りよ。＠
if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#f5e6d3>女性</color>", NULL, "<color=#f5e6d3>Woman</color>", NULL, Line_ContinueAfterTyping); }
Expand Down Expand Up @@ -1000,9 +1000,8 @@ void main()
NULL, " happened to be that of the younger brother of the dam supporter who fell to his death two years before.\"", GetGlobalFlag(GLinemodeSp));
if (GetGlobalFlag(GADVMode)) { ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); }



// DrawBustshot( 3, "night/tm_si_de_a1", 160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 20, 200, TRUE );
if (GetGlobalFlag(GHideCG)) {DisableWindow();}
if (GetGlobalFlag(GHideCG)) {ModDrawCharacter(3, 8, "sprite/tomi1_def_", "0", 160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 20, 200, TRUE );}

//「弟本人はまだ生きてるらしいね＠でもやはり……かなり気にしてね。近隣の町に引っ越してったらしいよ。￥
if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#945c44>富竹</color>", NULL, "<color=#945c44>Tomitake</color>", NULL, Line_ContinueAfterTyping); }
Expand All @@ -1016,8 +1015,7 @@ void main()

DisableWindow();
FadeOutBGM( 2, 1000, TRUE );
DrawBustshotWithFiltering(5, "black", "down", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 25, 1300, TRUE );

DrawSceneWithMask("black", "down", 0, 0, 1300 );


//　…しばらくの間、開いた口を閉じることができなかった￥
Expand Down
9 changes: 2 additions & 7 deletions scripts/ch1/onik_011.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2963,12 +2963,7 @@ void main()
PlaySE( 4, "wa_027", 56, 64 );
ModPlayVoiceLS(3, 2, "ps3/s01/02/120200139a", 256, TRUE);

// Replace CG with angry Rena sprite (originally re_se_hii_a1) if CGs are disabled (like the original Ryukishi game).
// For now, the LIES text and negative effect is still overlaid on the sprite to make this easier to implement.
if (GetGlobalFlag(GHideCG) == 1)
{
ModDrawCharacter(2, 2, "portrait/re1a_hig_okoru_a1_", "0", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 10, 200, TRUE );
}
if (GetGlobalFlag(GHideCG)) {ModDrawCharacter(2, 2, "portrait/re1a_hig_okoru_a1_", "0", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 10, 50, FALSE );}

DrawBG("scene/002b", 0, FALSE);
DrawBustshot(1, "text/oni_usoda", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 1, 0, FALSE );
Expand Down Expand Up @@ -3003,7 +2998,7 @@ void main()
ClearMessage();

// Reset Rena's sprite back to normal
if (GetGlobalFlag(GHideCG) == 1)
if (GetGlobalFlag(GHideCG))
{
DisableWindow();
ModDrawCharacter(2, 2, "portrait/re1a_hig_def_a1_", "0", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 10, 200, TRUE );
Expand Down
Loading

0 comments on commit 84876d6

Please sign in to comment.