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
07th-mod · Mar 18, 2024 · f362ab7 · f362ab7
1 parent 6c638bf
commit f362ab7
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git 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
@@ -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("<color=#8676cf>羽入</color>", NULL, "<color=#8676cf>Hanyuu</color>", 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("<color=#6972c1>梨花</color>", NULL, "<color=#6972c1>Rika</color>", NULL, Line_ContinueAfterTyping); }
 	ModPlayVoiceLS(4, 5, "ps3/s13/05/ds41050005", 128, TRUE);

diff --git 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("<color=#fcdb77>沙都子</color>", NULL, "<color=#fcdb77>Satoko</color>", 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("<color=#8676cf>羽入</color>", NULL, "<color=#8676cf>Hanyuu</color>", NULL, Line_ContinueAfterTyping); }
 	ModPlayVoiceLS(4, 12, "ps3/s13/12/ds41070129", 128, TRUE);

diff --git 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("<color=#8676cf>羽入</color>", NULL, "<color=#8676cf>Hanyuu</color>", 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("<color=#fcdb77>沙都子</color>", NULL, "<color=#fcdb77>Satoko</color>", NULL, Line_ContinueAfterTyping); }
 	ModPlayVoiceLS(4, 4, "ps3/s13/04/ds41040138", 128, TRUE);