Consolidate rewind, expand spar

game/chapters/chapter1/arrival.rpy

@@ -1,5 +1,5 @@
 # ── Persistent flags ──────────────────────────────────────────────────────────
-default checkpoint_set    = False
+# `checkpoint` (the rewind destination) is defined globally in script.rpy.
 default rewind_used       = False
 default purpose_chosen    = False
 default silence_chosen    = False # here Sara learns that Luno asks everyone the same question
@@ -31,38 +31,28 @@ label arrival:
     jump .choice_screen
 
 label .rewind_choice:
-    if not checkpoint_set:
+    if checkpoint is None:
+        # No checkpoint created yet — can't rewind, move on.
         jump .kaeros_arrives
 
+    # The shared screen handles both buttons:
+    #   Rewind   -> .do_rewind -> rewind_to(checkpoint)  (teal wash, then lands here)
+    #   Continue  -> hides the screen, and we resume below.
     show screen rewind_prompt
-    menu:
-        "[[ Rewind ]":
-            hide screen rewind_prompt
-            $ rewind_used = True
-            scene black
-            with dissolve
-            show screen teal_wash
-            "The world pulls back."
-            "Colour drains to teal. Sound slows to nothing."
-            hide screen teal_wash
-            scene bg training_yard
-            with dissolve
-            show sara neutral at left
-            show luno curious at right
-            thinking "Let's try this again."
-            jump .choice_screen
-        "[[ Continue ]":
-            hide screen rewind_prompt
-            # reset flags
-            $ checkpoint_set = False
-            $ rewind_used = False
-            jump .kaeros_arrives 
+    hide screen rewind_prompt
+
+    # Resuming after "Continue": clear the checkpoint and move on.
+    $ checkpoint = None
+    $ rewind_used = False
+    jump .kaeros_arrives
 
 label .choice_screen:
     menu:
         "Why are you here?"
-        "[[ Create Checkpoint ]" if not checkpoint_set:
-            $ checkpoint_set = True
+        "[[ Create Checkpoint ]" if checkpoint is None:
+            # Store where a rewind should land, plus what to reset on rewind.
+            $ checkpoint = ".choice_screen"
+            $ rewind_reset = ["rewind_used = True"]
             scene black
             with dissolve
             "A flash. Sara's hand, signing something. A contract. The ink is red."