Skip to content

Commit

Permalink
Merge pull request #207 from 07th-mod/f-fix-priority
Browse files Browse the repository at this point in the history
Priority Fixes for review
  • Loading branch information
orian34 authored Mar 17, 2024
2 parents 72a2f10 + b7c1330 commit 24c8f58
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion Update/onik_001.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2882,7 +2882,7 @@ void main()
NULL, "In place of a chime, the sound of the principal waving a hand bell drifted through the classroom.", Line_Normal);
ClearMessage();
DisableWindow();
ModDrawCharacter(1, 3, "sprite/me1a_warai_a1_", "1", -160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 10, 600, TRUE );
ModDrawCharacter(2, 3, "sprite/me1a_warai_a1_", "1", -160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 10, 200, TRUE );

//「圭ちゃん、おしまいおしまい@ さぁ楽しいランチタ~イム!@
if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#5ec69a>魅音</color>", NULL, "<color=#5ec69a>Mion</color>", NULL, Line_ContinueAfterTyping); }
Expand Down
2 changes: 1 addition & 1 deletion Update/onik_003.txt
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@ void main()


DisableWindow();
ModDrawCharacter(2, 5, "sprite/ri1_warai_a1_", "1", -240, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 20, 400, TRUE );
ModDrawCharacter(2, 5, "sprite/ri1_warai_a1_", "1", -240, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 10, 400, TRUE );

//「…ボクも沙都子も賛成しますですよ。@
if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#6972c1>梨花</color>", NULL, "<color=#6972c1>Rika</color>", NULL, Line_ContinueAfterTyping); }
Expand Down
2 changes: 1 addition & 1 deletion Update/onik_005.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1707,7 +1707,7 @@ void main()


DisableWindow();
ModDrawCharacter(3, 4, "sprite/sa1a_akuwarai_a1_", "1", 240, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 10, 200, TRUE );
ModDrawCharacter(3, 4, "sprite/sa1a_akuwarai_a1_", "1", 240, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 20, 200, TRUE );

//VoiceMatching
if(GetGlobalFlag(GCensor) >= 2){ModCallScriptSection("zonik_005_vm0x_n01","dialog004");}
Expand Down
12 changes: 6 additions & 6 deletions Update/onik_009_02.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1563,7 +1563,7 @@ void main()
ClearMessage();

DisableWindow();
ModDrawCharacter(3, 8, "sprite/tomi1_warai_", "1", 160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 0, 300, TRUE );
ModDrawCharacter(3, 8, "sprite/tomi1_warai_", "1", 160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 20, 300, TRUE );

//「まさか圭一くん、祟りなんて信じてるわけじゃないだろ?@
if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#945c44>富竹</color>", NULL, "<color=#945c44>Tomitake</color>", NULL, Line_ContinueAfterTyping); }
Expand Down Expand Up @@ -1618,7 +1618,7 @@ void main()
ClearMessage();

DisableWindow();
ModDrawCharacter(3, 8, "sprite/tomi1_def_", "0", 160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 0, 200, TRUE );
ModDrawCharacter(3, 8, "sprite/tomi1_def_", "0", 160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 20, 200, TRUE );

//「……例えば、一番最初のバラバラ殺人@言ったよね@ 犯人は1人を残して全員逮捕されてる@残った1人だって時間の問題さ@動機だって、酒の上での口論からと判明してる@祟りなんかじゃない@……だろ?@
if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#945c44>富竹</color>", NULL, "<color=#945c44>Tomitake</color>", NULL, Line_ContinueAfterTyping); }
Expand Down Expand Up @@ -1681,7 +1681,7 @@ void main()
ClearMessage();

DisableWindow();
ModDrawCharacter(3, 8, "sprite/tomi1_warai_", "1", 160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 0, 200, TRUE );
ModDrawCharacter(3, 8, "sprite/tomi1_warai_", "1", 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 @@ -1743,7 +1743,7 @@ void main()
ClearMessage();

DisableWindow();
ModDrawCharacter(3, 8, "sprite/tomi1_def_", "0", 160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 0, 200, TRUE );
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 @@ -1901,7 +1901,7 @@ void main()


DisableWindow();
ModDrawCharacter(3, 8, "sprite/tomi1_warai_", "1", 160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 0, 200, TRUE );
ModDrawCharacter(3, 8, "sprite/tomi1_warai_", "1", 160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 20, 200, TRUE );


// 富竹さんが明るく笑う¥
Expand Down Expand Up @@ -2064,7 +2064,7 @@ void main()


DisableWindow();
ModDrawCharacter(1, 9, "sprite/ta1_warai_", "1", -160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 20, 200, TRUE );
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

0 comments on commit 24c8f58

Please sign in to comment.