From 1a93a18e8f56acbcd635b4cee5d0fd26643137c0 Mon Sep 17 00:00:00 2001 From: drojf <1249449+drojf@users.noreply.github.com> Date: Sun, 17 Mar 2024 12:04:53 +1100 Subject: [PATCH 1/5] 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/onik_001.txt | 3 ++- Update/onik_003.txt | 4 ++-- Update/onik_005.txt | 4 ++-- Update/onik_009_02.txt | 4 ++-- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/Update/onik_001.txt b/Update/onik_001.txt index 7c4d7e3..50a51d1 100644 --- a/Update/onik_001.txt +++ b/Update/onik_001.txt @@ -2882,7 +2882,8 @@ 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 ); +// drojf - Instead of changing priority, the layer should change to 2, as mion was previously drawn on layer 2, but it was incorrectly using layer 1 before. Delete this comment if it is OK + ModDrawCharacter(2, 3, "sprite/me1a_warai_a1_", "1", -160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 10, 600, TRUE ); //「圭ちゃん、おしまいおしまい＠　さぁ楽しいランチタ～イム！＠ if (GetGlobalFlag(GADVMode)) { OutputLine("魅音", NULL, "Mion", NULL, Line_ContinueAfterTyping); } diff --git a/Update/onik_003.txt b/Update/onik_003.txt index 78da2d6..47a57a1 100644 --- a/Update/onik_003.txt +++ b/Update/onik_003.txt @@ -274,7 +274,7 @@ void main() ClearMessage(); DisableWindow(); FadeBustshot( 2, FALSE, 0, 0, 0, 0, 200, TRUE ); - ModDrawCharacter(3, 2, "sprite/re1a_warai_a1_", "2", 240, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 20, 400, TRUE ); + ModDrawCharacter(3, 2, "sprite/re1a_warai_a1_", "2", 240, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 20, 400, TRUE ); //ERROR_EXISTING: Priority 20 on layer 3 used here. Conflict is 25 lines away (line 302) //「レナは異議な～し！＠ if (GetGlobalFlag(GADVMode)) { OutputLine("レナ", NULL, "Rena", NULL, Line_ContinueAfterTyping); } @@ -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, 21, 400, TRUE ); //ERROR: Priority 20 already in use 25 lines ago (line 277). Existing Layer: 3 Conflicting Layer: 2 Suggested Priority: 21 //「…ボクも沙都子も賛成しますですよ。＠ if (GetGlobalFlag(GADVMode)) { OutputLine("梨花", NULL, "Rika", NULL, Line_ContinueAfterTyping); } diff --git a/Update/onik_005.txt b/Update/onik_005.txt index cf9048f..c6a3998 100644 --- a/Update/onik_005.txt +++ b/Update/onik_005.txt @@ -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, 10, 200, TRUE ); //ERROR_EXISTING: Priority 10 on layer 3 used here. Conflict is 59 lines away (line 1769) //VoiceMatching if(GetGlobalFlag(GCensor) >= 2){ModCallScriptSection("zonik_005_vm0x_n01","dialog004");} @@ -1766,7 +1766,7 @@ void main() DisableWindow(); ModSetLayerFilter(2, 256, "none"); - ModDrawCharacter(2, 2, "sprite/re1a_nande_a1_", "1", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 10, 400, TRUE ); + ModDrawCharacter(2, 2, "sprite/re1a_nande_a1_", "1", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 21, 400, TRUE ); //ERROR: Priority 10 already in use 59 lines ago (line 1710). Existing Layer: 3 Conflicting Layer: 2 Suggested Priority: 21 //「戦後の日本の教育の乱れを憂いて教育者に転向したんだって…。＠ if (GetGlobalFlag(GADVMode)) { OutputLine("レナ", NULL, "Rena", NULL, Line_ContinueAfterTyping); } diff --git a/Update/onik_009_02.txt b/Update/onik_009_02.txt index 112456a..4166704 100644 --- a/Update/onik_009_02.txt +++ b/Update/onik_009_02.txt @@ -1245,7 +1245,7 @@ void main() ClearMessage(); DisableWindow(); - ModDrawCharacter(3, 8, "sprite/tomi1_def_", "0", 160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 20, 200, TRUE ); + ModDrawCharacter(3, 8, "sprite/tomi1_def_", "0", 160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 20, 200, TRUE ); //ERROR_EXISTING: Priority 20 on layer 3 used here. Conflict is 819 lines away (line 2067) //「別にはぐらかしたつもりはないんだよ圭一くん＠つまり……その翌年の綿流しってのはつまり…、￥ if (GetGlobalFlag(GADVMode)) { OutputLine("富竹", NULL, "Tomitake", NULL, Line_ContinueAfterTyping); } @@ -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, 26, 200, TRUE ); //ERROR: Priority 20 already in use 819 lines ago (line 1248). Existing Layer: 3 Conflicting Layer: 1 Suggested Priority: 26 //「じゃあね、おやすみなさい圭一くん＠…ジロウさんもね。また後ほど。＠ if (GetGlobalFlag(GADVMode)) { OutputLine("女性", NULL, "Woman", NULL, Line_ContinueAfterTyping); } From 5991ef4732d31b4db346bf2ce50c636e18c333c7 Mon Sep 17 00:00:00 2001 From: Aurian Date: Sun, 17 Mar 2024 09:46:01 +0100 Subject: [PATCH 2/5] priority fix --- Update/onik_001.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Update/onik_001.txt b/Update/onik_001.txt index 50a51d1..557cc8f 100644 --- a/Update/onik_001.txt +++ b/Update/onik_001.txt @@ -2882,8 +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(); -// drojf - Instead of changing priority, the layer should change to 2, as mion was previously drawn on layer 2, but it was incorrectly using layer 1 before. Delete this comment if it is OK - ModDrawCharacter(2, 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("魅音", NULL, "Mion", NULL, Line_ContinueAfterTyping); } From 325f99392139d1475b1d686e1e10a2d386b80b78 Mon Sep 17 00:00:00 2001 From: Aurian Date: Sun, 17 Mar 2024 09:47:59 +0100 Subject: [PATCH 3/5] priority fix --- Update/onik_003.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Update/onik_003.txt b/Update/onik_003.txt index 47a57a1..c3de9a5 100644 --- a/Update/onik_003.txt +++ b/Update/onik_003.txt @@ -274,7 +274,7 @@ void main() ClearMessage(); DisableWindow(); FadeBustshot( 2, FALSE, 0, 0, 0, 0, 200, TRUE ); - ModDrawCharacter(3, 2, "sprite/re1a_warai_a1_", "2", 240, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 20, 400, TRUE ); //ERROR_EXISTING: Priority 20 on layer 3 used here. Conflict is 25 lines away (line 302) + ModDrawCharacter(3, 2, "sprite/re1a_warai_a1_", "2", 240, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 20, 400, TRUE ); //「レナは異議な～し！＠ if (GetGlobalFlag(GADVMode)) { OutputLine("レナ", NULL, "Rena", NULL, Line_ContinueAfterTyping); } @@ -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, 21, 400, TRUE ); //ERROR: Priority 20 already in use 25 lines ago (line 277). Existing Layer: 3 Conflicting Layer: 2 Suggested Priority: 21 + 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("梨花", NULL, "Rika", NULL, Line_ContinueAfterTyping); } From 9e92f2cdf5dc31f6ceb5f53be76447ff3bfad7fd Mon Sep 17 00:00:00 2001 From: Aurian Date: Sun, 17 Mar 2024 09:51:22 +0100 Subject: [PATCH 4/5] priority fix --- Update/onik_009_02.txt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Update/onik_009_02.txt b/Update/onik_009_02.txt index 4166704..08a1d72 100644 --- a/Update/onik_009_02.txt +++ b/Update/onik_009_02.txt @@ -1245,7 +1245,7 @@ void main() ClearMessage(); DisableWindow(); - ModDrawCharacter(3, 8, "sprite/tomi1_def_", "0", 160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 20, 200, TRUE ); //ERROR_EXISTING: Priority 20 on layer 3 used here. Conflict is 819 lines away (line 2067) + 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("富竹", NULL, "Tomitake", NULL, Line_ContinueAfterTyping); } @@ -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("富竹", NULL, "Tomitake", NULL, Line_ContinueAfterTyping); } @@ -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 ); //「……例えば、一番最初のバラバラ殺人＠言ったよね＠　犯人は１人を残して全員逮捕されてる＠残った１人だって時間の問題さ＠動機だって、酒の上での口論からと判明してる＠祟りなんかじゃない＠……だろ？＠ if (GetGlobalFlag(GADVMode)) { OutputLine("富竹", NULL, "Tomitake", NULL, Line_ContinueAfterTyping); } @@ -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("富竹", NULL, "Tomitake", NULL, Line_ContinueAfterTyping); } @@ -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("富竹", NULL, "Tomitake", NULL, Line_ContinueAfterTyping); } @@ -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 ); //　富竹さんが明るく笑う￥ @@ -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, 26, 200, TRUE ); //ERROR: Priority 20 already in use 819 lines ago (line 1248). Existing Layer: 3 Conflicting Layer: 1 Suggested Priority: 26 + 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("女性", NULL, "Woman", NULL, Line_ContinueAfterTyping); } From b7c1330176a4cd089f3946d612ff61b6d1daed41 Mon Sep 17 00:00:00 2001 From: Aurian Date: Sun, 17 Mar 2024 09:53:12 +0100 Subject: [PATCH 5/5] priority fix --- Update/onik_005.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Update/onik_005.txt b/Update/onik_005.txt index c6a3998..3754ef2 100644 --- a/Update/onik_005.txt +++ b/Update/onik_005.txt @@ -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 ); //ERROR_EXISTING: Priority 10 on layer 3 used here. Conflict is 59 lines away (line 1769) + 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");} @@ -1766,7 +1766,7 @@ void main() DisableWindow(); ModSetLayerFilter(2, 256, "none"); - ModDrawCharacter(2, 2, "sprite/re1a_nande_a1_", "1", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 21, 400, TRUE ); //ERROR: Priority 10 already in use 59 lines ago (line 1710). Existing Layer: 3 Conflicting Layer: 2 Suggested Priority: 21 + ModDrawCharacter(2, 2, "sprite/re1a_nande_a1_", "1", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 10, 400, TRUE ); //「戦後の日本の教育の乱れを憂いて教育者に転向したんだって…。＠ if (GetGlobalFlag(GADVMode)) { OutputLine("レナ", NULL, "Rena", NULL, Line_ContinueAfterTyping); }