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 committed Mar 17, 2024
1 parent 72a2f10 commit 1a93a18
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 7 deletions.
3 changes: 2 additions & 1 deletion Update/onik_001.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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("<color=#5ec69a>魅音</color>", NULL, "<color=#5ec69a>Mion</color>", NULL, Line_ContinueAfterTyping); }
Expand Down
4 changes: 2 additions & 2 deletions Update/onik_003.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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("<color=#f0953d>レナ</color>", NULL, "<color=#f0953d>Rena</color>", NULL, Line_ContinueAfterTyping); }
Expand All @@ -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("<color=#6972c1>梨花</color>", NULL, "<color=#6972c1>Rika</color>", NULL, Line_ContinueAfterTyping); }
Expand Down
4 changes: 2 additions & 2 deletions Update/onik_005.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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");}
Expand Down Expand Up @@ -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("<color=#f0953d>レナ</color>", NULL, "<color=#f0953d>Rena</color>", NULL, Line_ContinueAfterTyping); }
Expand Down
4 changes: 2 additions & 2 deletions Update/onik_009_02.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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("<color=#945c44>富竹</color>", NULL, "<color=#945c44>Tomitake</color>", NULL, Line_ContinueAfterTyping); }
Expand Down Expand Up @@ -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("<color=#f5e6d3>女性</color>", NULL, "<color=#f5e6d3>Woman</color>", NULL, Line_ContinueAfterTyping); }
Expand Down

0 comments on commit 1a93a18

Please sign in to comment.