From 8a69fd6c2dadc04077fa8961ed920c17e579c0c6 Mon Sep 17 00:00:00 2001
From: Mark <mark@remarkablemark.org>
Date: Wed, 11 Sep 2024 22:21:28 -0400
Subject: [PATCH] refactor(story): tidy variables

---
 game/story/day_2_lord_intro.rpy          |  2 +-
 game/story/inside/explore_inside_day.rpy |  4 ++--
 game/story/inside/kitchen.rpy            |  4 ++--
 game/story/meet_lord.rpy                 |  2 +-
 game/story/variables.rpy                 | 12 ++++++------
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/game/story/day_2_lord_intro.rpy b/game/story/day_2_lord_intro.rpy
index 3951ce3..24225b8 100644
--- a/game/story/day_2_lord_intro.rpy
+++ b/game/story/day_2_lord_intro.rpy
@@ -1,6 +1,6 @@
 label day_2_lord_intro:
 
-    $ meet_lord_day_2 = True
+    $ day2_meet_lord = True
 
     scene bg hallway day with dissolve
 
diff --git a/game/story/inside/explore_inside_day.rpy b/game/story/inside/explore_inside_day.rpy
index 4039b87..8f98360 100644
--- a/game/story/inside/explore_inside_day.rpy
+++ b/game/story/inside/explore_inside_day.rpy
@@ -3,7 +3,7 @@ label explore_inside_day:
     if not meet_lord:
         jump meet_lord
     
-    if day == 2 and not night and not meet_lord_day_2:
+    if day == 2 and not night and not day2_meet_lord:
         jump day_2_lord_intro
 
     if night:
@@ -11,7 +11,7 @@ label explore_inside_day:
     else:
         scene bg interior entrance day with dissolve
 
-    if day == 1 and night and not whisper:
+    if day == 1 and night and not day1_whisper:
         player "Why are the lights off?"
         player "Are they trying to save electricity?"
 
diff --git a/game/story/inside/kitchen.rpy b/game/story/inside/kitchen.rpy
index 20bb3fb..4d65862 100644
--- a/game/story/inside/kitchen.rpy
+++ b/game/story/inside/kitchen.rpy
@@ -22,8 +22,8 @@ label kitchen:
             jump explore_inside_day
 
 label kitchen_dialogue:
-    if day == 1 and night and not whisper:
-        $ whisper = True
+    if day == 1 and night and not day1_whisper:
+        $ day1_whisper = True
 
         player "Time to grab something to eat!"
 
diff --git a/game/story/meet_lord.rpy b/game/story/meet_lord.rpy
index e7d4078..c03c645 100644
--- a/game/story/meet_lord.rpy
+++ b/game/story/meet_lord.rpy
@@ -1,6 +1,6 @@
 label meet_lord:
 
-    $ meet_lord = True
+    $ day1_meet_lord = True
 
     play music the_old_castle
 
diff --git a/game/story/variables.rpy b/game/story/variables.rpy
index 0906380..0e50cc2 100644
--- a/game/story/variables.rpy
+++ b/game/story/variables.rpy
@@ -2,6 +2,9 @@
 default player_name = "Morgan"
 default surname = "Kasper"
 
+# items
+default item = Item()
+
 # time
 default day = 1
 default night = False
@@ -11,10 +14,7 @@ default sleep = False
 default basement_locked = True
 default basement_visit = 0
 
-# items
-default item = Item()
-
 # events
-default meet_lord = False
-default whisper = False
-default meet_lord_day_2 = False
+default day1_meet_lord = False
+default day1_whisper = False
+default day2_meet_lord = False