Skip to content

Commit

Permalink
Merge pull request #6 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
orian34 committed Mar 18, 2024
2 parents 5b4b4d3 + ceaa2d9 commit 0a6f9d2
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 22 deletions.
24 changes: 12 additions & 12 deletions Update/busstop01.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5830,7 +5830,7 @@ void main()
PlaySE( 1, "searchlight", 70, 64 );

ModDrawCharacter(1, 56, "sprite/hton1a_05_", "2", -240, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 1, 400, FALSE );
ModDrawCharacter(2, 53, "sprite/hmi2a_06_", "0", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 2, 400, FALSE );
ModDrawCharacter(2, 53, "sprite/hmi2a_06_", "0", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 4, 400, FALSE );
ModDrawCharacter(3, 52, "sprite/hri2a_01_", "0", 240, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 3, 400, TRUE );
Wait( 1000 );

Expand Down Expand Up @@ -9076,7 +9076,7 @@ void main()
StopAllSound();
//CallScriptSection( "util", "RainOff" );

ModDrawCharacter(1, 52, "sprite/hri2a_08_", "0", -160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 2, 0, FALSE );
ModDrawCharacter(1, 52, "sprite/hri2a_08_", "0", -160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 1, 0, FALSE );
DrawScene( "background/hina_bus_02", 400 );

PlayBGM( 0, "bgm1/urameshikodama", 70, 0 );
Expand All @@ -9095,56 +9095,56 @@ void main()
DisableWindow();

FadeBustshot( 2, FALSE, 0, 0, 0, 0, 200, FALSE );
ModDrawCharacter(1, 52, "sprite/hri2a_12_", "0", -160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 2, 200, TRUE );
ModDrawCharacter(1, 52, "sprite/hri2a_12_", "0", -160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 1, 200, TRUE );
ModPlayVoiceLS(4, 52, "ps3/s26/52/trik_1470", 128, TRUE);
OutputLine("<color=#6972c1>梨花</color> ", "「耳を貸しちゃ駄目。…………よく思い出して。…今日、私と一緒に学校をさぼって遊びに行ったでしょ？…あなた、その事を誰かに言った？」",
"<color=#6972c1>Rika</color> ", "\"Don't listen to them. ............Think back. ...You skipped school with me today to come play around, right? ...Did you say anything about that to anyone else?\"", Line_Normal);
if (GetGlobalFlag(GADVMode) == 0) { ClearMessage(); }
DisableWindow();

ModDrawCharacter(3, 53, "sprite/hmi2a_08_", "2", 160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 2, 400, TRUE );
ModDrawCharacter(3, 53, "sprite/hmi2a_08_", "2", 160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 3, 400, TRUE );
ModPlayVoiceLS(4, 53, "ps3/s26/53/tmio_2430", 128, TRUE);
OutputLine("<color=#5ec69a>魅音</color> ", "「……学校さぼるってわざわざ公言する訳、ないじゃないですか。」",
"<color=#5ec69a>Mion</color> ", "\"......Why would I ever make a point of publicly declaring that I was skipping school?\"", Line_Normal);
if (GetGlobalFlag(GADVMode) == 0) { ClearMessage(); }
DisableWindow();

ModDrawCharacter(1, 52, "sprite/hri2a_09_", "0", -160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 2, 200, TRUE );
ModDrawCharacter(1, 52, "sprite/hri2a_09_", "0", -160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 1, 200, TRUE );
ModPlayVoiceLS(4, 52, "ps3/s26/52/trik_1480", 128, TRUE);
OutputLine("<color=#6972c1>梨花</color> ", "「…つまり、…今日のあなたの動向を知る者はひとりもいない、って事よね。」",
"<color=#6972c1>Rika</color> ", "\"...Which means... that no one knows what you've been doing today, right?\"", Line_Normal);
if (GetGlobalFlag(GADVMode) == 0) { ClearMessage(); }
DisableWindow();

ModDrawCharacter(3, 53, "sprite/hmi2a_09_", "0", 160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 2, 200, TRUE );
ModDrawCharacter(3, 53, "sprite/hmi2a_09_", "0", 160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 3, 200, TRUE );
ModPlayVoiceLS(4, 53, "ps3/s26/53/tmio_2440", 128, TRUE);
OutputLine("<color=#5ec69a>魅音</color> ", "「……そりゃそうですよ。…誰にも言ってないんですから。」",
"<color=#5ec69a>Mion</color> ", "\"......Well, sure. ...I didn't tell anyone, after all.\"", Line_Normal);
if (GetGlobalFlag(GADVMode) == 0) { ClearMessage(); }
DisableWindow();

ModDrawCharacter(1, 52, "sprite/hri2a_10_", "0", -160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 2, 200, TRUE );
ModDrawCharacter(1, 52, "sprite/hri2a_10_", "0", -160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 1, 200, TRUE );
ModPlayVoiceLS(4, 52, "ps3/s26/52/trik_1490", 128, TRUE);
OutputLine("<color=#6972c1>梨花</color> ", "「……今日、あなたが着てきてくれたその服。…私がリクエストしたのよね。」",
"<color=#6972c1>Rika</color> ", "\"......Those clothes you're wearing today. ...I asked you to wear them, right?\"", Line_Normal);
if (GetGlobalFlag(GADVMode) == 0) { ClearMessage(); }
DisableWindow();

ModDrawCharacter(3, 53, "sprite/hmi2a_01_", "0", 160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 2, 200, TRUE );
ModDrawCharacter(3, 53, "sprite/hmi2a_01_", "0", 160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 3, 200, TRUE );
ModPlayVoiceLS(4, 53, "ps3/s26/53/tmio_2450", 128, TRUE);
OutputLine("<color=#5ec69a>魅音</color> ", "「…梨花さんがこの服が一番可愛いって言ってくれたから、わざわざ着てきたんじゃないですか。」",
"<color=#5ec69a>Mion</color> ", "\"...You told me I looked cutest in this outfit, so I made a point of wearing it for you.\"", Line_Normal);
if (GetGlobalFlag(GADVMode) == 0) { ClearMessage(); }
DisableWindow();

ModDrawCharacter(1, 52, "sprite/hri2a_12_", "0", -160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 2, 200, TRUE );
ModDrawCharacter(1, 52, "sprite/hri2a_12_", "0", -160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 1, 200, TRUE );
ModPlayVoiceLS(4, 52, "ps3/s26/52/trik_1500", 128, TRUE);
OutputLine("<color=#6972c1>梨花</color> ", "「…つまり、…今日のあなたの服装は事前に把握されていた、って事よね。」",
"<color=#6972c1>Rika</color> ", "\"...Which means... the outfit you'd be wearing today was known beforehand, right?\"", Line_Normal);
if (GetGlobalFlag(GADVMode) == 0) { ClearMessage(); }
DisableWindow();

ModDrawCharacter(3, 53, "sprite/hmi2a_08_", "2", 160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 2, 200, TRUE );
ModDrawCharacter(3, 53, "sprite/hmi2a_08_", "2", 160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 3, 200, TRUE );
ModPlayVoiceLS(4, 53, "ps3/s26/53/tmio_2460", 128, TRUE);
OutputLine("<color=#5ec69a>魅音</color> ", "「……そりゃそうですよ。…梨花さんのリクエストなんですから。」",
"<color=#5ec69a>Mion</color> ", "\"......Well, sure. ...You asked me to wear it.\"", Line_Normal);
Expand Down Expand Up @@ -9363,7 +9363,7 @@ void main()



ModDrawCharacter(1, 57, "sprite/hnit1a_06_", "0", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 2, 0, FALSE );
ModDrawCharacter(1, 57, "sprite/hnit1a_06_", "0", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 4, 0, FALSE );
DrawScene( "background/hina_bus_01", 50 );
PlaySE( 1, "a5_10316", 70, 64 );
PlayBGM( 3, "me/rain4_long", 70, 0 );
Expand All @@ -9382,7 +9382,7 @@ void main()
ClearMessage();
DisableWindow();

ModDrawCharacter(1, 57, "sprite/hnit1a_07_", "0", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 2, 200, TRUE );
ModDrawCharacter(1, 57, "sprite/hnit1a_07_", "0", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 4, 200, TRUE );

PlayBGM( 0, "bgm1/out2", 70, 0 );

Expand Down
2 changes: 1 addition & 1 deletion Update/outbreak01_1.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5287,7 +5287,7 @@ void main()

DisableWindow();

ModDrawCharacter(3, 1, "sprite/kei2_ikari2_", "2", 240, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 3, 400, TRUE );
ModDrawCharacter(3, 1, "sprite/kei2_ikari2_", "2", 240, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 4, 400, TRUE );
if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#956f6e>圭一</color>", NULL, "<color=#956f6e>Keiichi</color>", NULL, Line_ContinueAfterTyping); }
ModPlayVoiceLS(4, 1, "ps3/s24/01/nkei_0400", 128, TRUE);
OutputLine(NULL, "「……そ、そうだ！　それは俺も思ってた！！　沙都子はどうしたんだよ魅音！　状況的には俺やレナよりもずっとまずいんだろ？！　沙都子だけ置いてなんかいけないぞ！！」",
Expand Down
10 changes: 5 additions & 5 deletions Update/outbreak02_1.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11346,7 +11346,7 @@ void main()
DisableWindow();


ModDrawCharacter(2, 9, "sprite/ta3_warai_", "2", 160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 2, 400, TRUE );
ModDrawCharacter(2, 9, "sprite/ta3_warai_", "2", 160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 3, 400, TRUE );
//;【鷹野】
if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#f6d9a8>鷹野</color>", NULL, "<color=#f6d9a8>Takano</color>", NULL, Line_ContinueAfterTyping); }
ModPlayVoiceLS(4, 9, "ps3/s25/09/ntak_0280", 128, TRUE);
Expand All @@ -11366,7 +11366,7 @@ void main()
ClearMessage();
DisableWindow();

ModDrawCharacter(2, 9, "sprite/ta3_akuwarai_", "2", 160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 2, 200, TRUE );
ModDrawCharacter(2, 9, "sprite/ta3_akuwarai_", "2", 160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 3, 200, TRUE );
//;【鷹野】
if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#f6d9a8>鷹野</color>", NULL, "<color=#f6d9a8>Takano</color>", NULL, Line_ContinueAfterTyping); }
ModPlayVoiceLS(4, 9, "ps3/s25/09/ntak_0290", 128, TRUE);
Expand Down Expand Up @@ -15583,7 +15583,7 @@ void main()
Wait( 100 );


ModDrawCharacter(2, 50, "sprite/une1b_09_", "2", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 2, 0, FALSE );
ModDrawCharacter(2, 50, "sprite/une1b_09_", "2", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 4, 0, FALSE );
DrawScene( "background/gk3", 50 );
PlaySE( 0, "tataku", 70, 64 );
ShakeScreen( 2, 6, 100 , 2, 50, );
Expand Down Expand Up @@ -15625,7 +15625,7 @@ void main()
DisableWindow();


ModDrawCharacter(2, 50, "sprite/une1a_11_", "1", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 2, 200, TRUE );
ModDrawCharacter(2, 50, "sprite/une1a_11_", "1", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 4, 200, TRUE );
//;【ウネ】
if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#85e6e0>ウネ</color>", NULL, "<color=#85e6e0>UNE</color>", NULL, Line_ContinueAfterTyping); }
ModPlayVoiceLS(4, 50, "ps3/s25/50/nune_1000", 128, TRUE);
Expand Down Expand Up @@ -16480,7 +16480,7 @@ void main()

//;se1v 56,50
DrawSceneWithMask("white", "effect/maskc", 0, 0, 3000 );
ModDrawCharacter(1, 12, "sprite/ha6_au_", "2", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 2, 400, TRUE );
ModDrawCharacter(1, 12, "sprite/ha6_au_", "2", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 1, 400, TRUE );
Wait( 300 );

//;wait 500
Expand Down
4 changes: 2 additions & 2 deletions Update/staffroom.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -349,7 +349,7 @@ void main()

PlaySE( 0, "wav/kyupirn", 128, 64 );
DrawScene( "white", 200 );
ModDrawCharacter(1, 14, "sprite/oko3_niyari_", "2", 160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 0, 0, FALSE );
ModDrawCharacter(1, 14, "sprite/oko3_niyari_", "2", 160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 3, 0, FALSE );
DrawScene( "background/ke_shiryou1_02", 500 );


Expand Down Expand Up @@ -410,7 +410,7 @@ void main()
DisableWindow();

FadeOutBGM( 0, 300, TRUE );
ModDrawCharacter(1, 14, "sprite/oko3_def_", "0", 160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 0, 300, TRUE );
ModDrawCharacter(1, 14, "sprite/oko3_def_", "0", 160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 3, 300, TRUE );
PlayBGM( 0, "bgm0/4", 120, 0 );


Expand Down
4 changes: 2 additions & 2 deletions Update/staffroom15.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1411,7 +1411,7 @@ void main()
ClearMessage();
DisableWindow();
//;【圭一】
ModDrawCharacter(2, 1, "sprite/kei2_warai_", "2", -320, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 1, 400, TRUE );
ModDrawCharacter(2, 1, "sprite/kei2_warai_", "2", -320, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 5, 400, TRUE );
if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#956f6e>圭一</color>", NULL, "<color=#956f6e>Keiichi</color>", NULL, Line_ContinueAfterTyping); }
OutputLine(NULL, "「なるほどなぁ。",
NULL, "\"I see.", Line_WaitForInput);
Expand All @@ -1420,7 +1420,7 @@ void main()
ClearMessage();
DisableWindow();
//;【圭一】
ModDrawCharacter(2, 1, "sprite/kei2_def1_", "0", -320, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 1, 200, TRUE );
ModDrawCharacter(2, 1, "sprite/kei2_def1_", "0", -320, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 5, 200, TRUE );
if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#956f6e>圭一</color>", NULL, "<color=#956f6e>Keiichi</color>", NULL, Line_ContinueAfterTyping); }
OutputLine(NULL, "「俺はてっきり、原作者ってのは、全部全部、知り尽くしていて、アニメ放映時には目を瞑っていてもシーンがわかるのかと思っていたぜ」",
NULL, "\"I always thought the authors knew everything about the production process, and could tell which scene was which with their eyes closed by the time it ended up on TV.\"", Line_Normal);
Expand Down

0 comments on commit 0a6f9d2

Please sign in to comment.