Some instance concerns

1 files changed, 7 insertions, 1 deletions

diff --git a/npc/annuals/xmas/2021.txt b/npc/annuals/xmas/2021.txt
index fb65092b..4a73c35e 100644
--- a/npc/annuals/xmas/2021.txt
+++ b/npc/annuals/xmas/2021.txt
@@ -34,13 +34,15 @@ function	script	X21ED1_DOCLEAR	{
 }
 
 function	script	X21SEED_CHECK	{
-    if (XMAS2021 & X21_PLANTPUZZLE) return false;
     /* Protip: You don't have to fill all spots
      * 
      * If you plant a "L" it also works
      * This is because "L" is the first letter of "Lazy"
      * And I was particularly lazy to make a proper script
      */
+    if ('XMAS21TREE) return false;
+    // NOTE: We could check here if player already finished this
+    // And skip the challenge after planting one tree?
     if (!'XMAS21TREE_X[116]) return false;
     if (!'XMAS21TREE_X[117]) return false;
     if (!'XMAS21TREE_X[118]) return false;
@@ -49,6 +51,10 @@ function	script	X21SEED_CHECK	{
     if (!'XMAS21TREE_Y[168]) return false;
     if (!'XMAS21TREE_Y[169]) return false;
     if (!'XMAS21TREE_Y[170]) return false;
+    // This instance challenge is over
+    'XMAS21TREE = true;
+    // Record on player as well, just to be safe.
+    if (XMAS2021 & X21_PLANTPUZZLE) return true;
     XMAS2021 = (XMAS2021 | X21_PLANTPUZZLE);
     return true;
 }