fixing rewind flow

.vscode/settings.json

@@ -5,6 +5,6 @@
         "**/*.rpymc": true,
         "**/cache/": true
     },
-    "renpyWarp.sdkPath": "/Applications/renpy-8.5.2-sdk",
+    "renpyWarp.sdkPath": "/Users/dynamitos/Library/Application Support/Code/User/globalStorage/paisleysoftworks.renpywarp/file-downloader-downloads/8.5.3",
     "renpyWarp.renpyExtensionsEnabled": "Enabled"
 }

game/script.rpy

@@ -3,13 +3,15 @@
 
 define sara = Character("Sara", color="#c8a882")
 define luno = Character("Luno", color="#82b4c8")
-define narrator = Character(None, kind=nvl)
+define narrator = Character(None)
 
 # ── Persistent flags ──────────────────────────────────────────────────────────
 default checkpoint_set    = False
 default rewind_used       = False
-default branches_explored = 0
+default purpose_chosen    = False
-default luno_suspicion    = 0
+default silence_chosen    = False # here Sara learns that Luno asks everyone the same question
+default timer_left        = 20
+default timer_max         = 20
 
 # ── Entry point ───────────────────────────────────────────────────────────────
 label start:
@@ -39,9 +41,31 @@ label luno_greeting:
     luno "So. Money, glory, or are you just bored?"
     jump choice_screen
 
+label rewind_choice(continue_label=None):
+    if checkpoint_set:
+        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
+                "Sara is standing at the choice again. Luno's question still in the air."
+                jump choice_screen
+            "\[ Continue \]":
+                hide screen rewind_prompt
+                jump scene_continues
+
 label choice_screen:
-    $ branches_explored += 1
+    show screen timer_bar
-    #show screen timer_bar(20)
 
     menu:
         "Why are you here?"
@@ -59,10 +83,14 @@ label choice_screen:
             jump choice_screen
 
         "For the money, like anyone.":
-            hide screen timer_bar
+            if rewind_used:
-            jump branch_money
+                hide screen timer_bar
+                jump branch_money_post_rewind
+            else:
+                hide screen timer_bar
+                jump branch_money
 
-        "To find something worth doing.":
+        "To find something worth doing." if not purpose_chosen:
             hide screen timer_bar
             jump branch_purpose
 
@@ -70,12 +98,11 @@ label choice_screen:
             hide screen timer_bar
             jump branch_silence
 
-        "[ You asked the others the same thing, didn't you. ]" if checkpoint_set and branches_explored >= 3:
+        "\[ You asked the others the same thing, didn't you. \]" if checkpoint_set and silence_chosen:
             hide screen timer_bar
             jump branch_sharp
 
 label branch_money:
-    $ luno_suspicion += 1
     sara "Same reason as everyone else, I'd assume."
     luno "Honest. I can work with that."
     show luno amused at right
@@ -85,10 +112,25 @@ label branch_money:
     luno "Sure."
     "A pause. Just a half-beat too long."
     luno "They can be."
-    "She doesn't push. But her eyes stay on Sara a moment after the conversation moves on."
+    "She doesn't push. But her eyes stay on Sara for another moment"
+    jump rewind_choice
+    jump scene_continues
+
+label branch_money_post_rewind:
+    sara "Same reason as everyone else."
+    luno "Sure."
+    "Unremarkable. Fine."
+    "But when Sara finishes speaking, Luno's eyes linger — just a half-second longer than they should."
+    show luno linger at right
+    "Not suspicion. Not quite. More like the feeling of reaching for something that moved."
+    show luno neutral at right
+    "She shakes it off. Probably nothing."
+    "Sara knows it wasn't nothing."
+    jump rewind_choice
     jump scene_continues
 
 label branch_purpose:
+    $ purpose_chosen = True
     sara "I'm not looking for money exactly. More... something to point myself at."
     "A beat. Something opens in Luno's expression — not warm, but something."
     show luno curious at right
@@ -103,73 +145,18 @@ label branch_purpose:
     "She can feel it land — can feel Luno actually {i}looking{/i} at her now, not just watching."
     show luno soft at right
     luno "...Yeah. I know that feeling."
-    "A real moment. Brief. Neither of them knows what to do with it."
+    "Sara can step back. Give the safer answer. Luno will never know what she almost said."
-
+    jump rewind_choice
-    if checkpoint_set:
-        show screen rewind_prompt
-        "The rewind option surfaces at the edge of the screen, glowing faintly."
-        "Sara can step back. Give the safer answer. Luno will never know what she almost said."
-        menu:
-            "[ ↺ Rewind ] (14 seconds remaining)":
-                hide screen rewind_prompt
-                $ rewind_used = True
-                $ luno_suspicion += 1
-                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
-                "Sara is standing at the choice again. Luno's question still in the air."
-                jump choice_after_rewind
-            "[ Continue ]":
-                hide screen rewind_prompt
-
-    jump scene_continues
-
-label choice_after_rewind:
-    menu (caption="— Why are you here? —"):
-        "For the money, like anyone.":
-            jump branch_money_post_rewind
-        "I'd rather not say.":
-            jump branch_silence_post_rewind
-
-label branch_money_post_rewind:
-    sara "Same reason as everyone else."
-    luno "Sure."
-    "Unremarkable. Fine."
-    "But when Sara finishes speaking, Luno's eyes linger — just a half-second longer than they should."
-    show luno linger at right
-    "Not suspicion. Not quite. More like the feeling of reaching for something that moved."
-    show luno neutral at right
-    "She shakes it off. Probably nothing."
-    "Sara knows it wasn't nothing."
-    $ luno_suspicion += 1
-    jump scene_continues
-
-label branch_silence_post_rewind:
-    sara "I'd rather not say."
-    luno "Fair enough."
-    "But when Sara finishes speaking, Luno's eyes linger — just a half-second longer than they should."
-    show luno linger at right
-    "Not suspicion. Not quite. More like the feeling of reaching for something that moved."
-    show luno neutral at right
-    "She shakes it off. Probably nothing."
-    "Sara knows it wasn't nothing."
-    $ luno_suspicion += 1
     jump scene_continues
 
 label branch_silence:
+    $ silence_chosen = True
     sara "That's a fairly personal question for someone I've known thirty seconds."
     luno "Fair. I ask everyone. You don't have to answer."
     sara "...Then I won't."
     luno "That's an answer too."
     "She's not unfriendly. But Sara just became a question mark in Luno's mental ledger."
-    $ luno_suspicion += 1
+    jump rewind_choice
     jump scene_continues
 
 label branch_sharp:
@@ -189,8 +176,7 @@ label branch_sharp:
     show luno laugh at right
     "But her eyes are sharper now, not warmer."
     show luno sharp at right
-    "This is not a win. It's a different kind of exposure."
+    jump rewind_choice
-    $ luno_suspicion += 2
     jump scene_continues
 
 label scene_continues:
@@ -200,24 +186,24 @@ label scene_continues:
 
 # ── Screens ───────────────────────────────────────────────────────────────────
 
-screen timer_bar(duration):
+screen timer_bar:
     zorder 10
-    timer duration action Hide("timer_bar")
+    timer timer_left action Hide("timer_bar")
     vbox:
         xalign 0.5
         yalign 0.02
         bar:
-            value AnimatedValue(duration, duration)
+            value AnimatedValue(timer_left, timer_max, 0.1)
             xsize 400
             ysize 14
-        text "Respond within [duration]s":
+        text "Respond within [timer_left]s":
             xalign 0.5
             color "#c8c8c8"
             size 18
 
 screen rewind_prompt():
     zorder 10
-    text "[ ↺ Rewind available ]":
+    text "Rewind available":
         xalign 0.05
         yalign 0.95
         color "#4ab8b8"

project.json

@@ -0,0 +1,12 @@
+{
+  "build_update": false,
+  "packages": [
+    "pc"
+  ],
+  "add_from": true,
+  "force_recompile": true,
+  "android_build": "Release",
+  "tutorial": false,
+  "renamed_all": true,
+  "renamed_steam": true
+}