From 74bea015d7f934977688e73f161792dac1e8db6c Mon Sep 17 00:00:00 2001 From: drojf <1249449+drojf@users.noreply.github.com> Date: Mon, 18 Mar 2024 20:32:09 +1100 Subject: [PATCH 1/6] Priority Fixes for review - Includes automatically fixed priority on lines with error - Please delete //ERROR_EXISTING: comments, those are just to indicate where priority was last used --- Update/busstop01.txt | 24 ++++++++++++------------ Update/outbreak01_1.txt | 6 +++--- Update/outbreak02_1.txt | 12 ++++++------ Update/staffroom.txt | 4 ++-- Update/staffroom15.txt | 4 ++-- 5 files changed, 25 insertions(+), 25 deletions(-) diff --git a/Update/busstop01.txt b/Update/busstop01.txt index e3852bb..6d9e304 100644 --- a/Update/busstop01.txt +++ b/Update/busstop01.txt @@ -5816,7 +5816,7 @@ void main() ClearMessage(); DisableWindow(); - ModDrawCharacter(6, 54, "sprite/hyos1a_13_", "0", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 2, 200, TRUE ); + ModDrawCharacter(6, 54, "sprite/hyos1a_13_", "0", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 2, 200, TRUE ); //ERROR_EXISTING: Priority 2 on layer 6 used here. Conflict is 14 lines away (line 5833) ModPlayVoiceLS(4, 54, "ps3/s26/54/tyos_1400", 128, TRUE); OutputLine("吉村 ", "「……あれ、…ひょっとして失禁しました…？……恥ずかしいなぁ…。」", "Yoshimura ", "\"......Huh? ...Did you wet yourself, by chance...? ......How embarrassing...\"", Line_Normal); @@ -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 ); //ERROR: Priority 2 already in use 14 lines ago (line 5819). Existing Layer: 6 Conflicting Layer: 2 Suggested Priority: 4 ModDrawCharacter(3, 52, "sprite/hri2a_01_", "0", 240, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 3, 400, TRUE ); Wait( 1000 ); @@ -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, 2, 200, TRUE ); //ERROR_EXISTING: Priority 2 on layer 1 used here. Conflict is 7 lines away (line 9105) ModPlayVoiceLS(4, 52, "ps3/s26/52/trik_1470", 128, TRUE); OutputLine("梨花 ", "「耳を貸しちゃ駄目。…………よく思い出して。…今日、私と一緒に学校をさぼって遊びに行ったでしょ？…あなた、その事を誰かに言った？」", "Rika ", "\"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, 4, 400, TRUE ); //ERROR: Priority 2 already in use 7 lines ago (line 9098). Existing Layer: 1 Conflicting Layer: 3 Suggested Priority: 4ERROR_EXISTING: Priority 2 on layer 3 used here. Conflict is 7 lines away (line 9112) ModPlayVoiceLS(4, 53, "ps3/s26/53/tmio_2430", 128, TRUE); OutputLine("魅音 ", "「……学校さぼるってわざわざ公言する訳、ないじゃないですか。」", "Mion ", "\"......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, 5, 200, TRUE ); //ERROR: Priority 2 already in use 7 lines ago (line 9105). Existing Layer: 3 Conflicting Layer: 1 Suggested Priority: 5ERROR_EXISTING: Priority 2 on layer 1 used here. Conflict is 7 lines away (line 9119) ModPlayVoiceLS(4, 52, "ps3/s26/52/trik_1480", 128, TRUE); OutputLine("梨花 ", "「…つまり、…今日のあなたの動向を知る者はひとりもいない、って事よね。」", "Rika ", "\"...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, 6, 200, TRUE ); //ERROR: Priority 2 already in use 7 lines ago (line 9112). Existing Layer: 1 Conflicting Layer: 3 Suggested Priority: 6ERROR_EXISTING: Priority 2 on layer 3 used here. Conflict is 7 lines away (line 9126) ModPlayVoiceLS(4, 53, "ps3/s26/53/tmio_2440", 128, TRUE); OutputLine("魅音 ", "「……そりゃそうですよ。…誰にも言ってないんですから。」", "Mion ", "\"......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, 7, 200, TRUE ); //ERROR: Priority 2 already in use 7 lines ago (line 9119). Existing Layer: 3 Conflicting Layer: 1 Suggested Priority: 7ERROR_EXISTING: Priority 2 on layer 1 used here. Conflict is 7 lines away (line 9133) ModPlayVoiceLS(4, 52, "ps3/s26/52/trik_1490", 128, TRUE); OutputLine("梨花 ", "「……今日、あなたが着てきてくれたその服。…私がリクエストしたのよね。」", "Rika ", "\"......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, 8, 200, TRUE ); //ERROR: Priority 2 already in use 7 lines ago (line 9126). Existing Layer: 1 Conflicting Layer: 3 Suggested Priority: 8ERROR_EXISTING: Priority 2 on layer 3 used here. Conflict is 7 lines away (line 9140) ModPlayVoiceLS(4, 53, "ps3/s26/53/tmio_2450", 128, TRUE); OutputLine("魅音 ", "「…梨花さんがこの服が一番可愛いって言ってくれたから、わざわざ着てきたんじゃないですか。」", "Mion ", "\"...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, 9, 200, TRUE ); //ERROR: Priority 2 already in use 7 lines ago (line 9133). Existing Layer: 3 Conflicting Layer: 1 Suggested Priority: 9ERROR_EXISTING: Priority 2 on layer 1 used here. Conflict is 7 lines away (line 9147) ModPlayVoiceLS(4, 52, "ps3/s26/52/trik_1500", 128, TRUE); OutputLine("梨花 ", "「…つまり、…今日のあなたの服装は事前に把握されていた、って事よね。」", "Rika ", "\"...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, 10, 200, TRUE ); //ERROR: Priority 2 already in use 7 lines ago (line 9140). Existing Layer: 1 Conflicting Layer: 3 Suggested Priority: 10 ModPlayVoiceLS(4, 53, "ps3/s26/53/tmio_2460", 128, TRUE); OutputLine("魅音 ", "「……そりゃそうですよ。…梨花さんのリクエストなんですから。」", "Mion ", "\"......Well, sure. ...You asked me to wear it.\"", Line_Normal); @@ -9353,7 +9353,7 @@ void main() ClearMessage(); DisableWindow(); - ModDrawCharacter(2, 52, "sprite/hri2a_05_", "2", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 2, 200, TRUE ); + ModDrawCharacter(2, 52, "sprite/hri2a_05_", "2", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 2, 200, TRUE ); //ERROR_EXISTING: Priority 2 on layer 2 used here. Conflict is 10 lines away (line 9366) ModPlayVoiceLS(4, 52, "ps3/s26/52/trik_1650", 128, TRUE); OutputLine("梨花 ", "「…こいつらは厚生省なんて名乗ってるけど、実際の所属は違う。…こいつらは国家、」", "Rika ", "\"...These people claim they're from the Ministry of Health, but they're actually with a different organization! ...These people are from the National P-\"", Line_Normal); @@ -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, 3, 0, FALSE ); //ERROR: Priority 2 already in use 10 lines ago (line 9356). Existing Layer: 2 Conflicting Layer: 1 Suggested Priority: 3 DrawScene( "background/hina_bus_01", 50 ); PlaySE( 1, "a5_10316", 70, 64 ); PlayBGM( 3, "me/rain4_long", 70, 0 ); diff --git a/Update/outbreak01_1.txt b/Update/outbreak01_1.txt index d609d29..ba3be4f 100644 --- a/Update/outbreak01_1.txt +++ b/Update/outbreak01_1.txt @@ -5276,7 +5276,7 @@ void main() DisableWindow(); - ModDrawCharacter(1, 2, "sprite/re2a_hig_muhyou_a1_", "0", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 3, 200, TRUE ); + ModDrawCharacter(1, 2, "sprite/re2a_hig_muhyou_a1_", "0", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 3, 200, TRUE ); //ERROR_EXISTING: Priority 3 on layer 1 used here. Conflict is 11 lines away (line 5290) PlayBGM( 1, "me/a5_14446", 70, 0 ); if (GetGlobalFlag(GADVMode)) { OutputLine("レナ", NULL, "Rena", NULL, Line_ContinueAfterTyping); } @@ -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 ); //ERROR: Priority 3 already in use 11 lines ago (line 5279). Existing Layer: 1 Conflicting Layer: 3 Suggested Priority: 4ERROR_EXISTING: Priority 3 on layer 3 used here. Conflict is 29 lines away (line 5319) if (GetGlobalFlag(GADVMode)) { OutputLine("圭一", NULL, "Keiichi", NULL, Line_ContinueAfterTyping); } ModPlayVoiceLS(4, 1, "ps3/s24/01/nkei_0400", 128, TRUE); OutputLine(NULL, "「……そ、そうだ！　それは俺も思ってた！！　沙都子はどうしたんだよ魅音！　状況的には俺やレナよりもずっとまずいんだろ？！　沙都子だけ置いてなんかいけないぞ！！」", @@ -5316,7 +5316,7 @@ void main() ClearMessage(); DisableWindow(); - ModDrawCharacter(1, 2, "sprite/re2a_okoru_a1_", "0", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 3, 200, TRUE ); + ModDrawCharacter(1, 2, "sprite/re2a_okoru_a1_", "0", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 5, 200, TRUE ); //ERROR: Priority 3 already in use 29 lines ago (line 5290). Existing Layer: 3 Conflicting Layer: 1 Suggested Priority: 5 ShakeScreen( 2, 6, 100 , 2, 50, ); if (GetGlobalFlag(GADVMode)) { OutputLine("レナ", NULL, "Rena", NULL, Line_ContinueAfterTyping); } diff --git a/Update/outbreak02_1.txt b/Update/outbreak02_1.txt index 28f1a1e..943f644 100644 --- a/Update/outbreak02_1.txt +++ b/Update/outbreak02_1.txt @@ -11305,7 +11305,7 @@ void main() DisableWindow(); PlaySE( 0, "wav/down3", 25, 64 ); - ModDrawCharacter(1, 6, "sprite/si1a_ikari_a1_", "2", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 2, 200, TRUE ); + ModDrawCharacter(1, 6, "sprite/si1a_ikari_a1_", "2", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 2, 200, TRUE ); //ERROR_EXISTING: Priority 2 on layer 1 used here. Conflict is 41 lines away (line 11349) PlaySE( 0, "a5_10316", 70, 64 ); ShakeScreen( 0, 9, 100, 5, 20, ); @@ -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, 6, 400, TRUE ); //ERROR: Priority 2 already in use 41 lines ago (line 11308). Existing Layer: 1 Conflicting Layer: 2 Suggested Priority: 6 //;【鷹野】 if (GetGlobalFlag(GADVMode)) { OutputLine("鷹野", NULL, "Takano", NULL, Line_ContinueAfterTyping); } ModPlayVoiceLS(4, 9, "ps3/s25/09/ntak_0280", 128, TRUE); @@ -15544,7 +15544,7 @@ void main() ModDrawCharacter(3, 51, "sprite/tamura1a_11_", "2", 240, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 3, 400, FALSE ); ModDrawCharacter(2, 12, "sprite/ha1_shinken_", "0", -240, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 1, 400, TRUE ); Wait( 500 ); - ModDrawCharacter(1, 4, "sprite/sa1a_odoroki_a1_", "2", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 2, 400, FALSE ); + ModDrawCharacter(1, 4, "sprite/sa1a_odoroki_a1_", "2", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 2, 400, FALSE ); //ERROR_EXISTING: Priority 2 on layer 1 used here. Conflict is 39 lines away (line 15586) FadeBustshot( 3, FALSE, 0, 0, 0, 0, 400, FALSE ); FadeBustshot( 2, FALSE, 0, 0, 0, 0, 400, TRUE ); @@ -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 ); //ERROR: Priority 2 already in use 39 lines ago (line 15547). Existing Layer: 1 Conflicting Layer: 2 Suggested Priority: 4 DrawScene( "background/gk3", 50 ); PlaySE( 0, "tataku", 70, 64 ); ShakeScreen( 2, 6, 100 , 2, 50, ); @@ -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, 2, 400, TRUE ); //ERROR_EXISTING: Priority 2 on layer 1 used here. Conflict is 16 lines away (line 16499) Wait( 300 ); //;wait 500 @@ -16496,7 +16496,7 @@ void main() //;■羽入、マヌケな罰ゲーム衣装で嘆く - ModDrawCharacter(4, 12, "sprite/ha5_muhyou_", "0", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 2, 0, FALSE ); + ModDrawCharacter(4, 12, "sprite/ha5_muhyou_", "0", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 3, 0, FALSE ); //ERROR: Priority 2 already in use 16 lines ago (line 16483). Existing Layer: 1 Conflicting Layer: 4 Suggested Priority: 3 DrawScene( "background/gk3", 50 ); PlaySE( 0, "b1", 20, 64 ); diff --git a/Update/staffroom.txt b/Update/staffroom.txt index c6ff354..46dabfd 100644 --- a/Update/staffroom.txt +++ b/Update/staffroom.txt @@ -397,7 +397,7 @@ void main() ClearMessage(); DisableWindow(); - ModDrawCharacterWithFiltering(2, 11, "sprite/oisi2_6_", "0", "effect/left", 0, -160, 0, FALSE, 0, 0, 0, 0, 0, 1, 300, TRUE ); + ModDrawCharacterWithFiltering(2, 11, "sprite/oisi2_6_", "0", "effect/left", 0, -160, 0, FALSE, 0, 0, 0, 0, 0, 1, 300, TRUE ); //ERROR_EXISTING: Priority 1 on layer 2 used here. Conflict is 13 lines away (line 413) if (GetGlobalFlag(GADVMode)) { OutputLine("八咫桜", NULL, "Yatazakura", NULL, Line_ContinueAfterTyping); } @@ -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, 2, 300, TRUE ); //ERROR: Priority 1 already in use 13 lines ago (line 400). Existing Layer: 2 Conflicting Layer: 1 Suggested Priority: 2 PlayBGM( 0, "bgm0/4", 120, 0 ); diff --git a/Update/staffroom15.txt b/Update/staffroom15.txt index fc880c0..5104a02 100644 --- a/Update/staffroom15.txt +++ b/Update/staffroom15.txt @@ -1396,7 +1396,7 @@ void main() DisableWindow(); //;■以下の梨花の「え？」@には、＠や￥は不要で、そのまま次のレナのセリフが続きます。 //;【梨花】 - ModDrawCharacter(20, 5, "sprite/ri2_majime_a1_", "2", -160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 1, 200, TRUE ); + ModDrawCharacter(20, 5, "sprite/ri2_majime_a1_", "2", -160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 1, 200, TRUE ); //ERROR_EXISTING: Priority 1 on layer 20 used here. Conflict is 15 lines away (line 1414) if (GetGlobalFlag(GADVMode)) { OutputLine("梨花", NULL, "Rika", NULL, Line_ContinueAfterTyping); } OutputLine(NULL, "「え？」", NULL, "\"Huh?\"", GetGlobalFlag(GLinemodeSp)); @@ -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 ); //ERROR: Priority 1 already in use 15 lines ago (line 1399). Existing Layer: 20 Conflicting Layer: 2 Suggested Priority: 5 if (GetGlobalFlag(GADVMode)) { OutputLine("圭一", NULL, "Keiichi", NULL, Line_ContinueAfterTyping); } OutputLine(NULL, "「なるほどなぁ。", NULL, "\"I see.", Line_WaitForInput); From 951e2f77bfc4a9449854953158b2327b9cdab5e9 Mon Sep 17 00:00:00 2001 From: Aurian Date: Mon, 18 Mar 2024 19:50:31 +0100 Subject: [PATCH 2/6] prio fix --- Update/staffroom15.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Update/staffroom15.txt b/Update/staffroom15.txt index 5104a02..f21a916 100644 --- a/Update/staffroom15.txt +++ b/Update/staffroom15.txt @@ -1396,7 +1396,7 @@ void main() DisableWindow(); //;■以下の梨花の「え？」@には、＠や￥は不要で、そのまま次のレナのセリフが続きます。 //;【梨花】 - ModDrawCharacter(20, 5, "sprite/ri2_majime_a1_", "2", -160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 1, 200, TRUE ); //ERROR_EXISTING: Priority 1 on layer 20 used here. Conflict is 15 lines away (line 1414) + ModDrawCharacter(20, 5, "sprite/ri2_majime_a1_", "2", -160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 1, 200, TRUE ); if (GetGlobalFlag(GADVMode)) { OutputLine("梨花", NULL, "Rika", NULL, Line_ContinueAfterTyping); } OutputLine(NULL, "「え？」", NULL, "\"Huh?\"", GetGlobalFlag(GLinemodeSp)); @@ -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, 5, 400, TRUE ); //ERROR: Priority 1 already in use 15 lines ago (line 1399). Existing Layer: 20 Conflicting Layer: 2 Suggested Priority: 5 + 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("圭一", NULL, "Keiichi", NULL, Line_ContinueAfterTyping); } OutputLine(NULL, "「なるほどなぁ。", NULL, "\"I see.", Line_WaitForInput); @@ -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("圭一", NULL, "Keiichi", 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); From 347267414c79a3ce58b6a1464189e5898d86ae60 Mon Sep 17 00:00:00 2001 From: Aurian Date: Mon, 18 Mar 2024 19:52:36 +0100 Subject: [PATCH 3/6] prio fix --- Update/staffroom.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Update/staffroom.txt b/Update/staffroom.txt index 46dabfd..eb732c9 100644 --- a/Update/staffroom.txt +++ b/Update/staffroom.txt @@ -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 ); @@ -397,7 +397,7 @@ void main() ClearMessage(); DisableWindow(); - ModDrawCharacterWithFiltering(2, 11, "sprite/oisi2_6_", "0", "effect/left", 0, -160, 0, FALSE, 0, 0, 0, 0, 0, 1, 300, TRUE ); //ERROR_EXISTING: Priority 1 on layer 2 used here. Conflict is 13 lines away (line 413) + ModDrawCharacterWithFiltering(2, 11, "sprite/oisi2_6_", "0", "effect/left", 0, -160, 0, FALSE, 0, 0, 0, 0, 0, 1, 300, TRUE ); if (GetGlobalFlag(GADVMode)) { OutputLine("八咫桜", NULL, "Yatazakura", NULL, Line_ContinueAfterTyping); } @@ -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, 2, 300, TRUE ); //ERROR: Priority 1 already in use 13 lines ago (line 400). Existing Layer: 2 Conflicting Layer: 1 Suggested Priority: 2 + 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 ); From beb2be2ab094b89c99afffda0feacaed307f8365 Mon Sep 17 00:00:00 2001 From: Aurian Date: Mon, 18 Mar 2024 20:00:28 +0100 Subject: [PATCH 4/6] prio fix --- Update/busstop01.txt | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/Update/busstop01.txt b/Update/busstop01.txt index 6d9e304..68e661d 100644 --- a/Update/busstop01.txt +++ b/Update/busstop01.txt @@ -5816,7 +5816,7 @@ void main() ClearMessage(); DisableWindow(); - ModDrawCharacter(6, 54, "sprite/hyos1a_13_", "0", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 2, 200, TRUE ); //ERROR_EXISTING: Priority 2 on layer 6 used here. Conflict is 14 lines away (line 5833) + ModDrawCharacter(6, 54, "sprite/hyos1a_13_", "0", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 2, 200, TRUE ); ModPlayVoiceLS(4, 54, "ps3/s26/54/tyos_1400", 128, TRUE); OutputLine("吉村 ", "「……あれ、…ひょっとして失禁しました…？……恥ずかしいなぁ…。」", "Yoshimura ", "\"......Huh? ...Did you wet yourself, by chance...? ......How embarrassing...\"", Line_Normal); @@ -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, 4, 400, FALSE ); //ERROR: Priority 2 already in use 14 lines ago (line 5819). Existing Layer: 6 Conflicting Layer: 2 Suggested Priority: 4 + 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 ); @@ -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 ); @@ -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 ); //ERROR_EXISTING: Priority 2 on layer 1 used here. Conflict is 7 lines away (line 9105) + 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("梨花 ", "「耳を貸しちゃ駄目。…………よく思い出して。…今日、私と一緒に学校をさぼって遊びに行ったでしょ？…あなた、その事を誰かに言った？」", "Rika ", "\"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, 4, 400, TRUE ); //ERROR: Priority 2 already in use 7 lines ago (line 9098). Existing Layer: 1 Conflicting Layer: 3 Suggested Priority: 4ERROR_EXISTING: Priority 2 on layer 3 used here. Conflict is 7 lines away (line 9112) + 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("魅音 ", "「……学校さぼるってわざわざ公言する訳、ないじゃないですか。」", "Mion ", "\"......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, 5, 200, TRUE ); //ERROR: Priority 2 already in use 7 lines ago (line 9105). Existing Layer: 3 Conflicting Layer: 1 Suggested Priority: 5ERROR_EXISTING: Priority 2 on layer 1 used here. Conflict is 7 lines away (line 9119) + 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("梨花 ", "「…つまり、…今日のあなたの動向を知る者はひとりもいない、って事よね。」", "Rika ", "\"...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, 6, 200, TRUE ); //ERROR: Priority 2 already in use 7 lines ago (line 9112). Existing Layer: 1 Conflicting Layer: 3 Suggested Priority: 6ERROR_EXISTING: Priority 2 on layer 3 used here. Conflict is 7 lines away (line 9126) + 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("魅音 ", "「……そりゃそうですよ。…誰にも言ってないんですから。」", "Mion ", "\"......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, 7, 200, TRUE ); //ERROR: Priority 2 already in use 7 lines ago (line 9119). Existing Layer: 3 Conflicting Layer: 1 Suggested Priority: 7ERROR_EXISTING: Priority 2 on layer 1 used here. Conflict is 7 lines away (line 9133) + 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("梨花 ", "「……今日、あなたが着てきてくれたその服。…私がリクエストしたのよね。」", "Rika ", "\"......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, 8, 200, TRUE ); //ERROR: Priority 2 already in use 7 lines ago (line 9126). Existing Layer: 1 Conflicting Layer: 3 Suggested Priority: 8ERROR_EXISTING: Priority 2 on layer 3 used here. Conflict is 7 lines away (line 9140) + 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("魅音 ", "「…梨花さんがこの服が一番可愛いって言ってくれたから、わざわざ着てきたんじゃないですか。」", "Mion ", "\"...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, 9, 200, TRUE ); //ERROR: Priority 2 already in use 7 lines ago (line 9133). Existing Layer: 3 Conflicting Layer: 1 Suggested Priority: 9ERROR_EXISTING: Priority 2 on layer 1 used here. Conflict is 7 lines away (line 9147) + 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("梨花 ", "「…つまり、…今日のあなたの服装は事前に把握されていた、って事よね。」", "Rika ", "\"...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, 10, 200, TRUE ); //ERROR: Priority 2 already in use 7 lines ago (line 9140). Existing Layer: 1 Conflicting Layer: 3 Suggested Priority: 10 + 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("魅音 ", "「……そりゃそうですよ。…梨花さんのリクエストなんですから。」", "Mion ", "\"......Well, sure. ...You asked me to wear it.\"", Line_Normal); @@ -9353,7 +9353,7 @@ void main() ClearMessage(); DisableWindow(); - ModDrawCharacter(2, 52, "sprite/hri2a_05_", "2", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 2, 200, TRUE ); //ERROR_EXISTING: Priority 2 on layer 2 used here. Conflict is 10 lines away (line 9366) + ModDrawCharacter(2, 52, "sprite/hri2a_05_", "2", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 2, 200, TRUE ); ModPlayVoiceLS(4, 52, "ps3/s26/52/trik_1650", 128, TRUE); OutputLine("梨花 ", "「…こいつらは厚生省なんて名乗ってるけど、実際の所属は違う。…こいつらは国家、」", "Rika ", "\"...These people claim they're from the Ministry of Health, but they're actually with a different organization! ...These people are from the National P-\"", Line_Normal); @@ -9363,7 +9363,7 @@ void main() - ModDrawCharacter(1, 57, "sprite/hnit1a_06_", "0", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 3, 0, FALSE ); //ERROR: Priority 2 already in use 10 lines ago (line 9356). Existing Layer: 2 Conflicting Layer: 1 Suggested Priority: 3 + 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 ); @@ -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 ); From d81de1945d0f38cffd4d529f3396c12bcab2c4dc Mon Sep 17 00:00:00 2001 From: Aurian Date: Mon, 18 Mar 2024 20:03:47 +0100 Subject: [PATCH 5/6] prio fix --- Update/outbreak01_1.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Update/outbreak01_1.txt b/Update/outbreak01_1.txt index ba3be4f..60cc067 100644 --- a/Update/outbreak01_1.txt +++ b/Update/outbreak01_1.txt @@ -5276,7 +5276,7 @@ void main() DisableWindow(); - ModDrawCharacter(1, 2, "sprite/re2a_hig_muhyou_a1_", "0", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 3, 200, TRUE ); //ERROR_EXISTING: Priority 3 on layer 1 used here. Conflict is 11 lines away (line 5290) + ModDrawCharacter(1, 2, "sprite/re2a_hig_muhyou_a1_", "0", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 3, 200, TRUE ); PlayBGM( 1, "me/a5_14446", 70, 0 ); if (GetGlobalFlag(GADVMode)) { OutputLine("レナ", NULL, "Rena", NULL, Line_ContinueAfterTyping); } @@ -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, 4, 400, TRUE ); //ERROR: Priority 3 already in use 11 lines ago (line 5279). Existing Layer: 1 Conflicting Layer: 3 Suggested Priority: 4ERROR_EXISTING: Priority 3 on layer 3 used here. Conflict is 29 lines away (line 5319) + 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("圭一", NULL, "Keiichi", NULL, Line_ContinueAfterTyping); } ModPlayVoiceLS(4, 1, "ps3/s24/01/nkei_0400", 128, TRUE); OutputLine(NULL, "「……そ、そうだ！　それは俺も思ってた！！　沙都子はどうしたんだよ魅音！　状況的には俺やレナよりもずっとまずいんだろ？！　沙都子だけ置いてなんかいけないぞ！！」", @@ -5316,7 +5316,7 @@ void main() ClearMessage(); DisableWindow(); - ModDrawCharacter(1, 2, "sprite/re2a_okoru_a1_", "0", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 5, 200, TRUE ); //ERROR: Priority 3 already in use 29 lines ago (line 5290). Existing Layer: 3 Conflicting Layer: 1 Suggested Priority: 5 + ModDrawCharacter(1, 2, "sprite/re2a_okoru_a1_", "0", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 3, 200, TRUE ); ShakeScreen( 2, 6, 100 , 2, 50, ); if (GetGlobalFlag(GADVMode)) { OutputLine("レナ", NULL, "Rena", NULL, Line_ContinueAfterTyping); } From ceaa2d9e6bc079ecd83de8aca0507f0f98d73516 Mon Sep 17 00:00:00 2001 From: Aurian Date: Mon, 18 Mar 2024 20:08:51 +0100 Subject: [PATCH 6/6] prio fix --- Update/outbreak02_1.txt | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Update/outbreak02_1.txt b/Update/outbreak02_1.txt index 943f644..01d8edd 100644 --- a/Update/outbreak02_1.txt +++ b/Update/outbreak02_1.txt @@ -11305,7 +11305,7 @@ void main() DisableWindow(); PlaySE( 0, "wav/down3", 25, 64 ); - ModDrawCharacter(1, 6, "sprite/si1a_ikari_a1_", "2", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 2, 200, TRUE ); //ERROR_EXISTING: Priority 2 on layer 1 used here. Conflict is 41 lines away (line 11349) + ModDrawCharacter(1, 6, "sprite/si1a_ikari_a1_", "2", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 2, 200, TRUE ); PlaySE( 0, "a5_10316", 70, 64 ); ShakeScreen( 0, 9, 100, 5, 20, ); @@ -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, 6, 400, TRUE ); //ERROR: Priority 2 already in use 41 lines ago (line 11308). Existing Layer: 1 Conflicting Layer: 2 Suggested Priority: 6 + 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("鷹野", NULL, "Takano", NULL, Line_ContinueAfterTyping); } ModPlayVoiceLS(4, 9, "ps3/s25/09/ntak_0280", 128, TRUE); @@ -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("鷹野", NULL, "Takano", NULL, Line_ContinueAfterTyping); } ModPlayVoiceLS(4, 9, "ps3/s25/09/ntak_0290", 128, TRUE); @@ -15544,7 +15544,7 @@ void main() ModDrawCharacter(3, 51, "sprite/tamura1a_11_", "2", 240, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 3, 400, FALSE ); ModDrawCharacter(2, 12, "sprite/ha1_shinken_", "0", -240, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 1, 400, TRUE ); Wait( 500 ); - ModDrawCharacter(1, 4, "sprite/sa1a_odoroki_a1_", "2", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 2, 400, FALSE ); //ERROR_EXISTING: Priority 2 on layer 1 used here. Conflict is 39 lines away (line 15586) + ModDrawCharacter(1, 4, "sprite/sa1a_odoroki_a1_", "2", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 2, 400, FALSE ); FadeBustshot( 3, FALSE, 0, 0, 0, 0, 400, FALSE ); FadeBustshot( 2, FALSE, 0, 0, 0, 0, 400, TRUE ); @@ -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, 4, 0, FALSE ); //ERROR: Priority 2 already in use 39 lines ago (line 15547). Existing Layer: 1 Conflicting Layer: 2 Suggested Priority: 4 + 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, ); @@ -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("ウネ", NULL, "UNE", NULL, Line_ContinueAfterTyping); } ModPlayVoiceLS(4, 50, "ps3/s25/50/nune_1000", 128, TRUE); @@ -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 ); //ERROR_EXISTING: Priority 2 on layer 1 used here. Conflict is 16 lines away (line 16499) + 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 @@ -16496,7 +16496,7 @@ void main() //;■羽入、マヌケな罰ゲーム衣装で嘆く - ModDrawCharacter(4, 12, "sprite/ha5_muhyou_", "0", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 3, 0, FALSE ); //ERROR: Priority 2 already in use 16 lines ago (line 16483). Existing Layer: 1 Conflicting Layer: 4 Suggested Priority: 3 + ModDrawCharacter(4, 12, "sprite/ha5_muhyou_", "0", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 2, 0, FALSE ); DrawScene( "background/gk3", 50 ); PlaySE( 0, "b1", 20, 64 );