From f362ab759f93c5685734eb978c30c29ee65ee4ef Mon Sep 17 00:00:00 2001 From: drojf <1249449+drojf@users.noreply.github.com> Date: Mon, 18 Mar 2024 20:28:26 +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/&toketu2.txt | 6 +++--- Update/_mats_009.txt | 4 ++-- Update/_mats_013.txt | 4 ++-- Update/_mats_016.txt | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Update/&toketu2.txt b/Update/&toketu2.txt index 5e16c0c..2d56159 100644 --- a/Update/&toketu2.txt +++ b/Update/&toketu2.txt @@ -4,17 +4,17 @@ void main() { DisableWindow(); PlaySE( 0, "s_chisibuki", 128, 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", 128, 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", 128, 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/_mats_009.txt b/Update/_mats_009.txt index e88753c..3e1206d 100644 --- a/Update/_mats_009.txt +++ b/Update/_mats_009.txt @@ -561,7 +561,7 @@ void main() ClearMessage(); DisableWindow(); - ModDrawCharacter(0, 12, "sprite/ha3a_au_", "2", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 9, 200, TRUE ); + ModDrawCharacter(0, 12, "sprite/ha3a_au_", "2", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 9, 200, TRUE ); //ERROR_EXISTING: Priority 9 on layer 0 used here. Conflict is 36 lines away (line 600) SetSpeedOfMessage( TRUE, 128 ); if (GetGlobalFlag(GADVMode)) { OutputLine("羽入", NULL, "Hanyuu", NULL, Line_ContinueAfterTyping); } @@ -597,7 +597,7 @@ void main() SetSpeedOfMessage( FALSE, 0 ); DisableWindow(); - ModDrawCharacterWithFiltering(1, 5, "sprite/ri1_warai_a1_", "2", "maskright", 1, 240, 0, FALSE, 0, 0, 0, 0, 0, 9, 300, TRUE ); + ModDrawCharacterWithFiltering(1, 5, "sprite/ri1_warai_a1_", "2", "maskright", 1, 240, 0, FALSE, 0, 0, 0, 0, 0, 10, 300, TRUE ); //ERROR: Priority 9 already in use 36 lines ago (line 564). Existing Layer: 0 Conflicting Layer: 1 Suggested Priority: 10 if (GetGlobalFlag(GADVMode)) { OutputLine("梨花", NULL, "Rika", NULL, Line_ContinueAfterTyping); } ModPlayVoiceLS(4, 5, "ps3/s13/05/ds41050005", 128, TRUE); diff --git a/Update/_mats_013.txt b/Update/_mats_013.txt index 94d8ac8..5b6104b 100644 --- a/Update/_mats_013.txt +++ b/Update/_mats_013.txt @@ -38,7 +38,7 @@ void main() ClearMessage(); DisableWindow(); - ModDrawCharacter(0, 4, "sprite/sa1a_akireru_a1_", "0", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 8, 200, TRUE ); + ModDrawCharacter(0, 4, "sprite/sa1a_akireru_a1_", "0", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 8, 200, TRUE ); //ERROR_EXISTING: Priority 8 on layer 0 used here. Conflict is 20 lines away (line 61) if (GetGlobalFlag(GADVMode)) { OutputLine("沙都子", NULL, "Satoko", NULL, Line_ContinueAfterTyping); } ModPlayVoiceLS(4, 4, "ps3/s13/04/ds41040050", 128, TRUE); @@ -58,7 +58,7 @@ void main() DisableWindow(); ModSetLayerFilter(1, 256, "none"); - ModDrawCharacterWithFiltering(1, 12, "sprite/ha3a_warai_", "2", "maskleft", 1, -240, 0, FALSE, 0, 0, 0, 0, 0, 8, 300, TRUE ); + ModDrawCharacterWithFiltering(1, 12, "sprite/ha3a_warai_", "2", "maskleft", 1, -240, 0, FALSE, 0, 0, 0, 0, 0, 9, 300, TRUE ); //ERROR: Priority 8 already in use 20 lines ago (line 41). Existing Layer: 0 Conflicting Layer: 1 Suggested Priority: 9 if (GetGlobalFlag(GADVMode)) { OutputLine("羽入", NULL, "Hanyuu", NULL, Line_ContinueAfterTyping); } ModPlayVoiceLS(4, 12, "ps3/s13/12/ds41070129", 128, TRUE); diff --git a/Update/_mats_016.txt b/Update/_mats_016.txt index a5b3802..fa23537 100644 --- a/Update/_mats_016.txt +++ b/Update/_mats_016.txt @@ -1882,7 +1882,7 @@ void main() if (GetGlobalFlag(GADVMode)) { ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); } DisableWindow(); - ModDrawCharacter(2, 12, "sprite/ha2a_def_", "0", 160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 10, 200, TRUE ); + ModDrawCharacter(2, 12, "sprite/ha2a_def_", "0", 160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 10, 200, TRUE ); //ERROR_EXISTING: Priority 10 on layer 2 used here. Conflict is 10 lines away (line 1895) if (GetGlobalFlag(GADVMode)) { OutputLine("羽入", NULL, "Hanyuu", NULL, Line_ContinueAfterTyping); } ModPlayVoiceLS(4, 12, "ps3/s13/12/ds41070287", 128, TRUE); @@ -1892,7 +1892,7 @@ void main() DisableWindow(); FadeBustshotWithFiltering( 1, "maskright" , 7, FALSE, 0, 0, 300, TRUE ); - ModDrawCharacterWithFiltering(1, 4, "sprite/sa2a_akuwarai_a1_", "2", "maskleft", 7, -160, 0, FALSE, 0, 0, 0, 0, 0, 10, 300, TRUE ); + ModDrawCharacterWithFiltering(1, 4, "sprite/sa2a_akuwarai_a1_", "2", "maskleft", 7, -160, 0, FALSE, 0, 0, 0, 0, 0, 11, 300, TRUE ); //ERROR: Priority 10 already in use 10 lines ago (line 1885). Existing Layer: 2 Conflicting Layer: 1 Suggested Priority: 11 if (GetGlobalFlag(GADVMode)) { OutputLine("沙都子", NULL, "Satoko", NULL, Line_ContinueAfterTyping); } ModPlayVoiceLS(4, 4, "ps3/s13/04/ds41040138", 128, TRUE); From 7cb5ea96ec3051126d09dd7949c126d7a80e8677 Mon Sep 17 00:00:00 2001 From: Aurian Date: Mon, 18 Mar 2024 19:37:57 +0100 Subject: [PATCH 2/5] prio fix --- Update/&toketu2.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Update/&toketu2.txt b/Update/&toketu2.txt index 2d56159..814185b 100644 --- a/Update/&toketu2.txt +++ b/Update/&toketu2.txt @@ -4,17 +4,17 @@ void main() { DisableWindow(); PlaySE( 0, "s_chisibuki", 128, 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", 128, 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", 128, 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 690e86f6127f080a857c93db764d406fe8d0e60c Mon Sep 17 00:00:00 2001 From: Aurian Date: Mon, 18 Mar 2024 19:39:48 +0100 Subject: [PATCH 3/5] prio fix --- Update/_mats_009.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Update/_mats_009.txt b/Update/_mats_009.txt index 3e1206d..21384dd 100644 --- a/Update/_mats_009.txt +++ b/Update/_mats_009.txt @@ -561,7 +561,7 @@ void main() ClearMessage(); DisableWindow(); - ModDrawCharacter(0, 12, "sprite/ha3a_au_", "2", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 9, 200, TRUE ); //ERROR_EXISTING: Priority 9 on layer 0 used here. Conflict is 36 lines away (line 600) + ModDrawCharacter(0, 12, "sprite/ha3a_au_", "2", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 9, 200, TRUE ); SetSpeedOfMessage( TRUE, 128 ); if (GetGlobalFlag(GADVMode)) { OutputLine("羽入", NULL, "Hanyuu", NULL, Line_ContinueAfterTyping); } @@ -597,7 +597,7 @@ void main() SetSpeedOfMessage( FALSE, 0 ); DisableWindow(); - ModDrawCharacterWithFiltering(1, 5, "sprite/ri1_warai_a1_", "2", "maskright", 1, 240, 0, FALSE, 0, 0, 0, 0, 0, 10, 300, TRUE ); //ERROR: Priority 9 already in use 36 lines ago (line 564). Existing Layer: 0 Conflicting Layer: 1 Suggested Priority: 10 + ModDrawCharacterWithFiltering(1, 5, "sprite/ri1_warai_a1_", "2", "maskright", 1, 240, 0, FALSE, 0, 0, 0, 0, 0, 0, 300, TRUE ); if (GetGlobalFlag(GADVMode)) { OutputLine("梨花", NULL, "Rika", NULL, Line_ContinueAfterTyping); } ModPlayVoiceLS(4, 5, "ps3/s13/05/ds41050005", 128, TRUE); From 2d39d763445061c96404d7ead36d59b330b70d80 Mon Sep 17 00:00:00 2001 From: Aurian Date: Mon, 18 Mar 2024 19:41:00 +0100 Subject: [PATCH 4/5] prio fix --- Update/_mats_013.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Update/_mats_013.txt b/Update/_mats_013.txt index 5b6104b..ca3bbaf 100644 --- a/Update/_mats_013.txt +++ b/Update/_mats_013.txt @@ -38,7 +38,7 @@ void main() ClearMessage(); DisableWindow(); - ModDrawCharacter(0, 4, "sprite/sa1a_akireru_a1_", "0", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 8, 200, TRUE ); //ERROR_EXISTING: Priority 8 on layer 0 used here. Conflict is 20 lines away (line 61) + ModDrawCharacter(0, 4, "sprite/sa1a_akireru_a1_", "0", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 8, 200, TRUE ); if (GetGlobalFlag(GADVMode)) { OutputLine("沙都子", NULL, "Satoko", NULL, Line_ContinueAfterTyping); } ModPlayVoiceLS(4, 4, "ps3/s13/04/ds41040050", 128, TRUE); @@ -58,7 +58,7 @@ void main() DisableWindow(); ModSetLayerFilter(1, 256, "none"); - ModDrawCharacterWithFiltering(1, 12, "sprite/ha3a_warai_", "2", "maskleft", 1, -240, 0, FALSE, 0, 0, 0, 0, 0, 9, 300, TRUE ); //ERROR: Priority 8 already in use 20 lines ago (line 41). Existing Layer: 0 Conflicting Layer: 1 Suggested Priority: 9 + ModDrawCharacterWithFiltering(1, 12, "sprite/ha3a_warai_", "2", "maskleft", 1, -240, 0, FALSE, 0, 0, 0, 0, 0, 0, 300, TRUE ); if (GetGlobalFlag(GADVMode)) { OutputLine("羽入", NULL, "Hanyuu", NULL, Line_ContinueAfterTyping); } ModPlayVoiceLS(4, 12, "ps3/s13/12/ds41070129", 128, TRUE); From c7b496f2b9a6bd94991c609a736aab9863f88528 Mon Sep 17 00:00:00 2001 From: Aurian Date: Mon, 18 Mar 2024 19:41:58 +0100 Subject: [PATCH 5/5] prio fix --- Update/_mats_016.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Update/_mats_016.txt b/Update/_mats_016.txt index fa23537..eecc712 100644 --- a/Update/_mats_016.txt +++ b/Update/_mats_016.txt @@ -1882,7 +1882,7 @@ void main() if (GetGlobalFlag(GADVMode)) { ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); } DisableWindow(); - ModDrawCharacter(2, 12, "sprite/ha2a_def_", "0", 160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 10, 200, TRUE ); //ERROR_EXISTING: Priority 10 on layer 2 used here. Conflict is 10 lines away (line 1895) + ModDrawCharacter(2, 12, "sprite/ha2a_def_", "0", 160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 10, 200, TRUE ); if (GetGlobalFlag(GADVMode)) { OutputLine("羽入", NULL, "Hanyuu", NULL, Line_ContinueAfterTyping); } ModPlayVoiceLS(4, 12, "ps3/s13/12/ds41070287", 128, TRUE); @@ -1892,7 +1892,7 @@ void main() DisableWindow(); FadeBustshotWithFiltering( 1, "maskright" , 7, FALSE, 0, 0, 300, TRUE ); - ModDrawCharacterWithFiltering(1, 4, "sprite/sa2a_akuwarai_a1_", "2", "maskleft", 7, -160, 0, FALSE, 0, 0, 0, 0, 0, 11, 300, TRUE ); //ERROR: Priority 10 already in use 10 lines ago (line 1885). Existing Layer: 2 Conflicting Layer: 1 Suggested Priority: 11 + ModDrawCharacterWithFiltering(1, 4, "sprite/sa2a_akuwarai_a1_", "2", "maskleft", 7, -160, 0, FALSE, 0, 0, 0, 0, 0, 8, 300, TRUE ); if (GetGlobalFlag(GADVMode)) { OutputLine("沙都子", NULL, "Satoko", NULL, Line_ContinueAfterTyping); } ModPlayVoiceLS(4, 4, "ps3/s13/04/ds41040138", 128, TRUE);