From e9306f75ecb45987eb2144c1a5cb20f1c85870bf Mon Sep 17 00:00:00 2001 From: drojf <1249449+drojf@users.noreply.github.com> Date: Sun, 17 Mar 2024 12:22:55 +1100 Subject: [PATCH 1/4] 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/wata_003.txt | 4 ++-- Update/wata_005.txt | 4 ++-- Update/wata_010_03.txt | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Update/wata_003.txt b/Update/wata_003.txt index 667f47c..e6c4bb9 100644 --- a/Update/wata_003.txt +++ b/Update/wata_003.txt @@ -4190,10 +4190,10 @@ void main() NULL, " Rice Culture!!!!!\"", Line_Continue); DisableWindow(); DrawScene("white", 10 ); - DrawBustshot(5, "background/furiker_b", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 10, 50, TRUE ); + DrawBustshot(5, "background/furiker_b", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 10, 50, TRUE ); //ERROR_EXISTING: Priority 10 on layer 5 used here. Conflict is 3 lines away (line 4196) PlaySE( 3, "wa_007", 56, 64 ); ShakeScreen( 1, 50, 20, 3, 0, ); - ModDrawCharacter(2, 22, "sprite/tie_2_", "0", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 10, 0, FALSE ); + ModDrawCharacter(2, 22, "sprite/tie_2_", "0", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 11, 0, FALSE ); //ERROR: Priority 10 already in use 3 lines ago (line 4193). Existing Layer: 5 Conflicting Layer: 2 Suggested Priority: 11 DrawSceneWithMask("background/gr1", "up", 0, 0, 800 ); OutputLineAll(NULL, "", GetGlobalFlag(GLinemodeSp)); diff --git a/Update/wata_005.txt b/Update/wata_005.txt index 4214eda..63bb046 100644 --- a/Update/wata_005.txt +++ b/Update/wata_005.txt @@ -3620,7 +3620,7 @@ void main() DisableWindow(); ModSetLayerFilter(3, 256, "none"); - ModDrawCharacterWithFiltering(3, 2, "sprite/re2b_kaii_b1_", "2", "right", 1, 0, 0, FALSE, 0, 0, 0, 0, 0, 10, 300, TRUE ); + ModDrawCharacterWithFiltering(3, 2, "sprite/re2b_kaii_b1_", "2", "right", 1, 0, 0, FALSE, 0, 0, 0, 0, 0, 10, 300, TRUE ); //ERROR_EXISTING: Priority 10 on layer 3 used here. Conflict is 37 lines away (line 3660) //　レナがふらふらと現れ、彼らに注意（？）する￥ if (GetGlobalFlag(GADVMode)) { OutputLineAll("", NULL, Line_ContinueAfterTyping); } @@ -3657,7 +3657,7 @@ void main() ClearMessage(); DisableWindow(); ModSetLayerFilter(2, 256, "none"); - ModDrawCharacter(2, 4, "sprite/sa2a_akuwarai_a1_", "1", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 10, 100, FALSE ); + ModDrawCharacter(2, 4, "sprite/sa2a_akuwarai_a1_", "1", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 11, 100, FALSE ); //ERROR: Priority 10 already in use 37 lines ago (line 3623). Existing Layer: 3 Conflicting Layer: 2 Suggested Priority: 11 DrawScene("background/res1", 300 ); //「さすがはレナさん...＠...いつ見ても恐ろしいキレですわね。＠ diff --git a/Update/wata_010_03.txt b/Update/wata_010_03.txt index 70b94fd..6ed4ff5 100644 --- a/Update/wata_010_03.txt +++ b/Update/wata_010_03.txt @@ -2541,8 +2541,8 @@ void main() DisableWindow(); - ModDrawCharacter(2, 3, "portrait/me2_hig_maji_a1_", "0", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 10, 0, FALSE ); - DrawBustshot(1, "e1", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 10, 0, FALSE ); + ModDrawCharacter(2, 3, "portrait/me2_hig_maji_a1_", "0", 0, 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 2545) + DrawBustshot(1, "e1", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 11, 0, FALSE ); //ERROR: Priority 10 already in use 1 lines ago (line 2544). Existing Layer: 2 Conflicting Layer: 1 Suggested Priority: 11 DrawSceneWithMask("background/yhu2", "up", 0, 0, 300 ); // DrawBustshotWithFiltering( 3, "e1", "right", 1, 0, 0, FALSE, 0, 0, 0, 0, 0, 20, 300, TRUE ); From 6238b1daee45b9cda257c2776927609d5b53c3c8 Mon Sep 17 00:00:00 2001 From: Aurian Date: Sun, 17 Mar 2024 09:33:55 +0100 Subject: [PATCH 2/4] Update wata_003.txt fix layer --- Update/wata_003.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Update/wata_003.txt b/Update/wata_003.txt index e6c4bb9..02aa124 100644 --- a/Update/wata_003.txt +++ b/Update/wata_003.txt @@ -4190,10 +4190,10 @@ void main() NULL, " Rice Culture!!!!!\"", Line_Continue); DisableWindow(); DrawScene("white", 10 ); - DrawBustshot(5, "background/furiker_b", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 10, 50, TRUE ); //ERROR_EXISTING: Priority 10 on layer 5 used here. Conflict is 3 lines away (line 4196) + DrawBustshot(5, "background/furiker_b", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 5, 50, TRUE ); PlaySE( 3, "wa_007", 56, 64 ); ShakeScreen( 1, 50, 20, 3, 0, ); - ModDrawCharacter(2, 22, "sprite/tie_2_", "0", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 11, 0, FALSE ); //ERROR: Priority 10 already in use 3 lines ago (line 4193). Existing Layer: 5 Conflicting Layer: 2 Suggested Priority: 11 + ModDrawCharacter(2, 22, "sprite/tie_2_", "0", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 10, 0, FALSE ); DrawSceneWithMask("background/gr1", "up", 0, 0, 800 ); OutputLineAll(NULL, "", GetGlobalFlag(GLinemodeSp)); From f87ff1b4d6016278be99b9899482621b8575a74b Mon Sep 17 00:00:00 2001 From: Aurian Date: Sun, 17 Mar 2024 09:37:30 +0100 Subject: [PATCH 3/4] Update wata_010_03.txt fix layer --- Update/wata_010_03.txt | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/Update/wata_010_03.txt b/Update/wata_010_03.txt index 6ed4ff5..c92a160 100644 --- a/Update/wata_010_03.txt +++ b/Update/wata_010_03.txt @@ -2541,13 +2541,9 @@ void main() DisableWindow(); - ModDrawCharacter(2, 3, "portrait/me2_hig_maji_a1_", "0", 0, 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 2545) - DrawBustshot(1, "e1", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 11, 0, FALSE ); //ERROR: Priority 10 already in use 1 lines ago (line 2544). Existing Layer: 2 Conflicting Layer: 1 Suggested Priority: 11 - + ModDrawCharacter(2, 3, "portrait/me2_hig_maji_a1_", "0", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 10, 0, FALSE ); + DrawBustshot(1, "e1", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 20, 0, FALSE ); DrawSceneWithMask("background/yhu2", "up", 0, 0, 300 ); -// DrawBustshotWithFiltering( 3, "e1", "right", 1, 0, 0, FALSE, 0, 0, 0, 0, 0, 20, 300, TRUE ); -// DrawBustshotWithFiltering( 1, "night/me_si_him_a1_zoom", "left", 1, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 300, TRUE ); - //　ハシゴの下の魅音に振り返り、聞きなおす￥ From 37efa7c8fd2d49a2cd5f1fce595cd2d902498cb1 Mon Sep 17 00:00:00 2001 From: Aurian Date: Sun, 17 Mar 2024 09:39:04 +0100 Subject: [PATCH 4/4] Update wata_005.txt fix layer --- Update/wata_005.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Update/wata_005.txt b/Update/wata_005.txt index 63bb046..eeeae04 100644 --- a/Update/wata_005.txt +++ b/Update/wata_005.txt @@ -3620,7 +3620,7 @@ void main() DisableWindow(); ModSetLayerFilter(3, 256, "none"); - ModDrawCharacterWithFiltering(3, 2, "sprite/re2b_kaii_b1_", "2", "right", 1, 0, 0, FALSE, 0, 0, 0, 0, 0, 10, 300, TRUE ); //ERROR_EXISTING: Priority 10 on layer 3 used here. Conflict is 37 lines away (line 3660) + ModDrawCharacterWithFiltering(3, 2, "sprite/re2b_kaii_b1_", "2", "right", 1, 0, 0, FALSE, 0, 0, 0, 0, 0, 20, 300, TRUE ); //　レナがふらふらと現れ、彼らに注意（？）する￥ if (GetGlobalFlag(GADVMode)) { OutputLineAll("", NULL, Line_ContinueAfterTyping); } @@ -3657,7 +3657,7 @@ void main() ClearMessage(); DisableWindow(); ModSetLayerFilter(2, 256, "none"); - ModDrawCharacter(2, 4, "sprite/sa2a_akuwarai_a1_", "1", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 11, 100, FALSE ); //ERROR: Priority 10 already in use 37 lines ago (line 3623). Existing Layer: 3 Conflicting Layer: 2 Suggested Priority: 11 + ModDrawCharacter(2, 4, "sprite/sa2a_akuwarai_a1_", "1", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 10, 100, FALSE ); DrawScene("background/res1", 300 ); //「さすがはレナさん...＠...いつ見ても恐ろしいキレですわね。＠