From 3fa90f89d3884c6c9e5e13d98c73c50621c6f06e Mon Sep 17 00:00:00 2001 From: drojf <1249449+drojf@users.noreply.github.com> Date: Mon, 18 Mar 2024 20:27:33 +1100 Subject: [PATCH 1/3] 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/&toketu2.txt | 6 +++--- Update/_mina_015_1.txt | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Update/&toketu2.txt b/Update/&toketu2.txt index 79aa743..9b1c44d 100644 --- a/Update/&toketu2.txt +++ b/Update/&toketu2.txt @@ -4,17 +4,17 @@ void main() { DisableWindow(); PlaySE( 0, "s_chisibuki", 56, 64 ); - DrawBustshot( 27, "Toketu1a", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 26, 10, TRUE ); + DrawBustshot( 27, "Toketu1a", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 26, 10, TRUE ); //ERROR_EXISTING: Priority 26 on layer 27 used here. Conflict is 5 lines away (line 12) SetValidityOfInput( FALSE ); Wait( 1800 ); SetValidityOfInput( TRUE ); PlaySE( 0, "s_chisibuki", 56, 64 ); - DrawBustshot( 28, "Toketu1b", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 26, 10, TRUE ); + DrawBustshot( 28, "Toketu1b", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 27, 10, TRUE ); //ERROR: Priority 26 already in use 5 lines ago (line 7). Existing Layer: 27 Conflicting Layer: 28 Suggested Priority: 27ERROR_EXISTING: Priority 26 on layer 28 used here. Conflict is 5 lines away (line 17) SetValidityOfInput( FALSE ); Wait( 2300 ); SetValidityOfInput( TRUE ); PlaySE( 0, "s_chisibuki", 56, 64 ); - DrawBustshot( 29, "Toketu1c", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 26, 10, TRUE ); + DrawBustshot( 29, "Toketu1c", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 28, 10, TRUE ); //ERROR: Priority 26 already in use 5 lines ago (line 12). Existing Layer: 28 Conflicting Layer: 29 Suggested Priority: 28 SetValidityOfInput( FALSE ); Wait( 3000 ); SetValidityOfInput( TRUE ); diff --git a/Update/_mina_015_1.txt b/Update/_mina_015_1.txt index 80ffdb3..93a730a 100644 --- a/Update/_mina_015_1.txt +++ b/Update/_mina_015_1.txt @@ -1178,8 +1178,8 @@ void main() NULL, "Rika-chan hushed Satoko and whispered into her ear.", Line_Normal); ClearMessage(); - ModDrawCharacter(2, 5, "sprite/ri1_komaru_a2_", "0", 160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 10, 0, FALSE ); - ModDrawCharacter(1, 4, "sprite/sa1b_sakebu_b1_", "2", -160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 10, 0, FALSE ); + ModDrawCharacter(2, 5, "sprite/ri1_komaru_a2_", "0", 160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 10, 0, FALSE ); //ERROR_EXISTING: Priority 10 on layer 2 used here. Conflict is 1 lines away (line 1182) + ModDrawCharacter(1, 4, "sprite/sa1b_sakebu_b1_", "2", -160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 11, 0, FALSE ); //ERROR: Priority 10 already in use 1 lines ago (line 1181). Existing Layer: 2 Conflicting Layer: 1 Suggested Priority: 11 DrawScene( "background/gk3", 400 ); if (GetGlobalFlag(GADVMode)) { OutputLine("梨花", NULL, "Rika", NULL, Line_ContinueAfterTyping); } @@ -1204,7 +1204,7 @@ void main() if (GetGlobalFlag(GADVMode)) { ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); } DisableWindow(); - ModDrawCharacter(1, 4, "sprite/sa1a_naku_a1_", "2", -160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 10, 200, TRUE ); + ModDrawCharacter(1, 4, "sprite/sa1a_naku_a1_", "2", -160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 10, 200, TRUE ); //ERROR_EXISTING: Priority 10 on layer 1 used here. Conflict is 9 lines away (line 1216) if (GetGlobalFlag(GADVMode)) { OutputLine("沙都子", NULL, "Satoko", NULL, Line_ContinueAfterTyping); } ModPlayVoiceLS(4, 4, "org/satoko6007", 256, TRUE); @@ -1213,7 +1213,7 @@ void main() if (GetGlobalFlag(GADVMode)) { ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); } DisableWindow(); - ModDrawCharacter(2, 5, "sprite/ri1_majime_a1_", "2", 160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 10, 200, TRUE ); + ModDrawCharacter(2, 5, "sprite/ri1_majime_a1_", "2", 160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 11, 200, TRUE ); //ERROR: Priority 10 already in use 9 lines ago (line 1207). Existing Layer: 1 Conflicting Layer: 2 Suggested Priority: 11ERROR_EXISTING: Priority 10 on layer 2 used here. Conflict is 12 lines away (line 1228) if (GetGlobalFlag(GADVMode)) { OutputLine("梨花", NULL, "Rika", NULL, Line_ContinueAfterTyping); } ModPlayVoiceLS(4, 5, "ps3/s12/05/180500685", 256, TRUE); @@ -1225,7 +1225,7 @@ void main() if (GetGlobalFlag(GADVMode)) { ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); } DisableWindow(); - ModDrawCharacter(1, 4, "sprite/sa1b_sakebu_b1_", "2", -160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 10, 200, TRUE ); + ModDrawCharacter(1, 4, "sprite/sa1b_sakebu_b1_", "2", -160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 12, 200, TRUE ); //ERROR: Priority 10 already in use 12 lines ago (line 1216). Existing Layer: 2 Conflicting Layer: 1 Suggested Priority: 12 if (GetGlobalFlag(GADVMode)) { OutputLine("沙都子", NULL, "Satoko", NULL, Line_ContinueAfterTyping); } ModPlayVoiceLS(4, 4, "org/satoko6008", 256, TRUE); From e853c778c5fc8daa9ed48532cc9ddb9540021b72 Mon Sep 17 00:00:00 2001 From: Aurian Date: Mon, 18 Mar 2024 19:42:48 +0100 Subject: [PATCH 2/3] prio fix --- Update/&toketu2.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Update/&toketu2.txt b/Update/&toketu2.txt index 9b1c44d..ad10451 100644 --- a/Update/&toketu2.txt +++ b/Update/&toketu2.txt @@ -4,17 +4,17 @@ void main() { DisableWindow(); PlaySE( 0, "s_chisibuki", 56, 64 ); - DrawBustshot( 27, "Toketu1a", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 26, 10, TRUE ); //ERROR_EXISTING: Priority 26 on layer 27 used here. Conflict is 5 lines away (line 12) + DrawBustshot( 27, "Toketu1a", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 26, 10, TRUE ); SetValidityOfInput( FALSE ); Wait( 1800 ); SetValidityOfInput( TRUE ); PlaySE( 0, "s_chisibuki", 56, 64 ); - DrawBustshot( 28, "Toketu1b", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 27, 10, TRUE ); //ERROR: Priority 26 already in use 5 lines ago (line 7). Existing Layer: 27 Conflicting Layer: 28 Suggested Priority: 27ERROR_EXISTING: Priority 26 on layer 28 used here. Conflict is 5 lines away (line 17) + DrawBustshot( 28, "Toketu1b", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 27, 10, TRUE ); SetValidityOfInput( FALSE ); Wait( 2300 ); SetValidityOfInput( TRUE ); PlaySE( 0, "s_chisibuki", 56, 64 ); - DrawBustshot( 29, "Toketu1c", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 28, 10, TRUE ); //ERROR: Priority 26 already in use 5 lines ago (line 12). Existing Layer: 28 Conflicting Layer: 29 Suggested Priority: 28 + DrawBustshot( 29, "Toketu1c", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 28, 10, TRUE ); SetValidityOfInput( FALSE ); Wait( 3000 ); SetValidityOfInput( TRUE ); From 5471d4c1ad953bf883698a23b81febe7f05daf86 Mon Sep 17 00:00:00 2001 From: Aurian Date: Mon, 18 Mar 2024 19:44:38 +0100 Subject: [PATCH 3/3] prio fix --- Update/_mina_015_1.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Update/_mina_015_1.txt b/Update/_mina_015_1.txt index 93a730a..8a8f80c 100644 --- a/Update/_mina_015_1.txt +++ b/Update/_mina_015_1.txt @@ -1178,8 +1178,8 @@ void main() NULL, "Rika-chan hushed Satoko and whispered into her ear.", Line_Normal); ClearMessage(); - ModDrawCharacter(2, 5, "sprite/ri1_komaru_a2_", "0", 160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 10, 0, FALSE ); //ERROR_EXISTING: Priority 10 on layer 2 used here. Conflict is 1 lines away (line 1182) - ModDrawCharacter(1, 4, "sprite/sa1b_sakebu_b1_", "2", -160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 11, 0, FALSE ); //ERROR: Priority 10 already in use 1 lines ago (line 1181). Existing Layer: 2 Conflicting Layer: 1 Suggested Priority: 11 + ModDrawCharacter(2, 5, "sprite/ri1_komaru_a2_", "0", 160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 10, 0, FALSE ); + ModDrawCharacter(1, 4, "sprite/sa1b_sakebu_b1_", "2", -160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 0, 0, FALSE ); DrawScene( "background/gk3", 400 ); if (GetGlobalFlag(GADVMode)) { OutputLine("梨花", NULL, "Rika", NULL, Line_ContinueAfterTyping); } @@ -1192,7 +1192,7 @@ void main() if (GetGlobalFlag(GADVMode)) { ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); } DisableWindow(); - ModDrawCharacter(1, 4, "sprite/sa1b_hannbeso_b1_", "0", -160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 10, 200, TRUE ); + ModDrawCharacter(1, 4, "sprite/sa1b_hannbeso_b1_", "0", -160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 0, 200, TRUE ); if (GetGlobalFlag(GADVMode)) { OutputLine("沙都子", NULL, "Satoko", NULL, Line_ContinueAfterTyping); } ModPlayVoiceLS(4, 4, "org/satoko6005", 256, TRUE); @@ -1204,7 +1204,7 @@ void main() if (GetGlobalFlag(GADVMode)) { ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); } DisableWindow(); - ModDrawCharacter(1, 4, "sprite/sa1a_naku_a1_", "2", -160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 10, 200, TRUE ); //ERROR_EXISTING: Priority 10 on layer 1 used here. Conflict is 9 lines away (line 1216) + ModDrawCharacter(1, 4, "sprite/sa1a_naku_a1_", "2", -160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 0, 200, TRUE ); if (GetGlobalFlag(GADVMode)) { OutputLine("沙都子", NULL, "Satoko", NULL, Line_ContinueAfterTyping); } ModPlayVoiceLS(4, 4, "org/satoko6007", 256, TRUE); @@ -1213,7 +1213,7 @@ void main() if (GetGlobalFlag(GADVMode)) { ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); } DisableWindow(); - ModDrawCharacter(2, 5, "sprite/ri1_majime_a1_", "2", 160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 11, 200, TRUE ); //ERROR: Priority 10 already in use 9 lines ago (line 1207). Existing Layer: 1 Conflicting Layer: 2 Suggested Priority: 11ERROR_EXISTING: Priority 10 on layer 2 used here. Conflict is 12 lines away (line 1228) + ModDrawCharacter(2, 5, "sprite/ri1_majime_a1_", "2", 160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 10, 200, TRUE ); if (GetGlobalFlag(GADVMode)) { OutputLine("梨花", NULL, "Rika", NULL, Line_ContinueAfterTyping); } ModPlayVoiceLS(4, 5, "ps3/s12/05/180500685", 256, TRUE); @@ -1225,7 +1225,7 @@ void main() if (GetGlobalFlag(GADVMode)) { ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); } DisableWindow(); - ModDrawCharacter(1, 4, "sprite/sa1b_sakebu_b1_", "2", -160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 12, 200, TRUE ); //ERROR: Priority 10 already in use 12 lines ago (line 1216). Existing Layer: 2 Conflicting Layer: 1 Suggested Priority: 12 + ModDrawCharacter(1, 4, "sprite/sa1b_sakebu_b1_", "2", -160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 0, 200, TRUE ); if (GetGlobalFlag(GADVMode)) { OutputLine("沙都子", NULL, "Satoko", NULL, Line_ContinueAfterTyping); } ModPlayVoiceLS(4, 4, "org/satoko6008", 256, TRUE);