From d1345a051d80facdb1eceb56eb353cf993a62c78 Mon Sep 17 00:00:00 2001
From: Gouvernathor <44340603+Gouvernathor@users.noreply.github.com>
Date: Fri, 17 Nov 2023 03:31:07 +0100
Subject: [PATCH] Make variables dynamic

or constant, in one case

(cherry picked from commit 1918def870d185cf970ca4904447b30424350f51)
---
 game/scripts/interface/door.rpy | 85 ++++++++++++++++++++++++++-------
 1 file changed, 69 insertions(+), 16 deletions(-)

diff --git a/game/scripts/interface/door.rpy b/game/scripts/interface/door.rpy
index ed6a11c3..796ac0c0 100644
--- a/game/scripts/interface/door.rpy
+++ b/game/scripts/interface/door.rpy
@@ -3,6 +3,7 @@
 ####################################
 
 default summon_show_busy = True
+define summon_categories_sorted = ("Snape", "Tonks", "Hermione", "Cho", "Luna", "Astoria", "Susan") #"Ginny", "Daphne", "Padma", "Patil", "Myrtle", "Mafkin"
 
 label summon:
     $ gui.in_context("summon_menu")
@@ -10,23 +11,75 @@ label summon:
 
 label summon_menu(xx=723, yy=90):
 
-    $ map_transcript_loc = {"library": "Library", "room_g": "Gryffindor Dormitory", "room_s": "Slytherin Dormitory", "room_r": "Ravenclaw Dormitory", "room_h": "Hufflepuff Dormitory", "great_hall": "Great Hall", "courtyard": "Courtyard", "forest": "Forest", "greenhouse": "Greenhouse", "defense": "D.A.D.A Classroom", "training_grounds": "Training Grounds", "Lake": "Lake", "randomstudent": renpy.random.choice(["Classroom", "Bathroom", "Hagrid's Hut", "Weasley's Store", "Mafkin's Store", "Broom Cupboard", "Attic"]), "randomsnape": renpy.random.choice(["Classroom", "Boathouse", "Bathroom", "Snape's Office", "Hall", "Slytherin Dormitory", "Library", "Attic", "Forest", "Lake", "Dungeons", "Quidditch Cave", "Staircase", "Behind your door", "Room of Doom"]), "randomtonks": renpy.random.choice(["Classroom", "Bathroom", "Hall", "Gryffindor Dormitory", "Slytherin Dormitory", "Hufflepuff Dormitory", "Ravenclaw Dormitory", "Training Grounds", "Tonks' Room", "Quidditch Pitch", "Infirmary", "Sex Dungeon", "Hospital Wing", "Forest", "Lake", "Greenhouse", "Mafkin's Store"])}
+    $ renpy.dynamic(
+        map_transcript_loc = {
+            "library": "Library",
+            "room_g": "Gryffindor Dormitory",
+            "room_s": "Slytherin Dormitory",
+            "room_r": "Ravenclaw Dormitory",
+            "room_h": "Hufflepuff Dormitory",
+            "great_hall": "Great Hall",
+            "courtyard": "Courtyard",
+            "forest": "Forest",
+            "greenhouse": "Greenhouse",
+            "defense": "D.A.D.A Classroom",
+            "training_grounds": "Training Grounds",
+            "Lake": "Lake",
+            "randomstudent": renpy.random.choice((
+                "Classroom",
+                "Bathroom",
+                "Hagrid's Hut",
+                "Weasley's Store",
+                "Mafkin's Store",
+                "Broom Cupboard",
+                "Attic")),
+            "randomsnape": renpy.random.choice((
+                "Classroom",
+                "Boathouse",
+                "Bathroom",
+                "Snape's Office",
+                "Hall",
+                "Slytherin Dormitory",
+                "Library",
+                "Attic",
+                "Forest",
+                "Lake",
+                "Dungeons",
+                "Quidditch Cave",
+                "Staircase",
+                "Behind your door",
+                "Room of Doom")),
+            "randomtonks": renpy.random.choice((
+                "Classroom",
+                "Bathroom",
+                "Hall",
+                "Gryffindor Dormitory",
+                "Slytherin Dormitory",
+                "Hufflepuff Dormitory",
+                "Ravenclaw Dormitory",
+                "Training Grounds",
+                "Tonks' Room",
+                "Quidditch Pitch",
+                "Infirmary",
+                "Sex Dungeon",
+                "Hospital Wing",
+                "Forest",
+                "Lake",
+                "Greenhouse",
+                "Mafkin's Store")),
+        },
 
-    # Door dictionary
-    $ summon_dict = {
-                    "Snape": {"ico": "snape", "flag": states.sna.unlocked, "busy": states.sna.busy, "loc": "randomsnape"},
-                    "Tonks": {"ico": "tonks", "flag": states.ton.unlocked, "busy": states.ton.busy, "loc": "randomtonks"},
-                    "Hermione": {"ico": "hermione", "flag": states.her.unlocked, "busy": states.her.busy, "loc": states.her.map_location },
-                    "Cho": {"ico": "cho", "flag": states.cho.unlocked, "busy": states.cho.busy, "loc": states.cho.map_location},
-                    "Luna": {"ico": "luna", "flag": states.lun.unlocked, "busy": states.lun.busy, "loc": states.lun.map_location},
-                    "Astoria": {"ico": "astoria", "flag": states.ast.unlocked, "busy": states.ast.busy, "loc": states.ast.map_location },
-                    "Susan": {"ico": "susan", "flag": states.sus.unlocked, "busy": states.sus.busy, "loc": states.sus.map_location}
-                    }
-
-    $ summon_categories_sorted = ["Snape", "Tonks", "Hermione", "Cho", "Luna", "Astoria", "Susan"] #"Ginny", "Daphne", "Padma", "Patil", "Myrtle", "Mafkin"
-    $ summon_categories_sorted_length = len(summon_categories_sorted)
-
-    $ current_sorting = summon_show_busy
+        # Door dictionary
+        summon_dict = {
+            "Snape": {"ico": "snape", "flag": states.sna.unlocked, "busy": states.sna.busy, "loc": "randomsnape"},
+            "Tonks": {"ico": "tonks", "flag": states.ton.unlocked, "busy": states.ton.busy, "loc": "randomtonks"},
+            "Hermione": {"ico": "hermione", "flag": states.her.unlocked, "busy": states.her.busy, "loc": states.her.map_location },
+            "Cho": {"ico": "cho", "flag": states.cho.unlocked, "busy": states.cho.busy, "loc": states.cho.map_location},
+            "Luna": {"ico": "luna", "flag": states.lun.unlocked, "busy": states.lun.busy, "loc": states.lun.map_location},
+            "Astoria": {"ico": "astoria", "flag": states.ast.unlocked, "busy": states.ast.busy, "loc": states.ast.map_location },
+            "Susan": {"ico": "susan", "flag": states.sus.unlocked, "busy": states.sus.busy, "loc": states.sus.map_location}
+        },
+    )
 
     call screen summon(xx, yy)