From d0fbd2820c20d50faf7b53df814ff4cac1fcc51c Mon Sep 17 00:00:00 2001 From: drojf <1249449+drojf@users.noreply.github.com> Date: Mon, 18 Mar 2024 20:24:45 +1100 Subject: [PATCH 1/2] 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 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Update/&toketu2.txt b/Update/&toketu2.txt index 88b14fc..3b8bcfc 100644 --- a/Update/&toketu2.txt +++ b/Update/&toketu2.txt @@ -4,17 +4,17 @@ void main() { DisableWindow(); PlaySE( 0, "Thisikuki", 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, "Thisikuki", 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, "Thisikuki", 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 ); From 56394b2162821a0cf646bf09bcfde81542bff26c Mon Sep 17 00:00:00 2001 From: Aurian Date: Mon, 18 Mar 2024 19:37:11 +0100 Subject: [PATCH 2/2] prio fix --- Update/&toketu2.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Update/&toketu2.txt b/Update/&toketu2.txt index 3b8bcfc..ca0c519 100644 --- a/Update/&toketu2.txt +++ b/Update/&toketu2.txt @@ -4,17 +4,17 @@ void main() { DisableWindow(); PlaySE( 0, "Thisikuki", 56, 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, "Thisikuki", 56, 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, "Thisikuki", 56, 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 );