Skip to content

Commit

Permalink
Priority Fixes for review
Browse files Browse the repository at this point in the history 
 - Includes automatically fixed priority on lines with error
 - Please delete //ERROR_EXISTING: comments, those are just to indicate where priority was last used
  • Loading branch information
@drojf
drojf committed Mar 18, 2024
1 parent 8df8e1d commit 3fa90f8
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
6 changes: 3 additions & 3 deletions Update/&toketu2.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 );
Expand Down
10 changes: 5 additions & 5 deletions Update/_mina_015_1.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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("<color=#6972c1>梨花</color>", NULL, "<color=#6972c1>Rika</color>", NULL, Line_ContinueAfterTyping); }
Expand All @@ -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("<color=#fcdb77>沙都子</color>", NULL, "<color=#fcdb77>Satoko</color>", NULL, Line_ContinueAfterTyping); }
ModPlayVoiceLS(4, 4, "org/satoko6007", 256, TRUE);
Expand All @@ -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("<color=#6972c1>梨花</color>", NULL, "<color=#6972c1>Rika</color>", NULL, Line_ContinueAfterTyping); }
ModPlayVoiceLS(4, 5, "ps3/s12/05/180500685", 256, TRUE);
Expand All @@ -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("<color=#fcdb77>沙都子</color>", NULL, "<color=#fcdb77>Satoko</color>", NULL, Line_ContinueAfterTyping); }
ModPlayVoiceLS(4, 4, "org/satoko6008", 256, TRUE);
Expand Down

0 comments on commit 3fa90f8

Please sign in to comment.