game/scripts/events/DayNight.rpy

@@ -86,8 +86,7 @@ label day_start:
 
         # Randomisers
         random_gold = renpy.random.randint(8, 40)
-        map_randomobj.seed()
+        map_randomobj = renpy.random.Random()
-        door_randomobj.seed()
 
         # Send salary every 7th day
         if game.day % 7 == 0:
@@ -195,8 +194,7 @@ label night_start:
 
         # Randomisers
         random_gold = renpy.random.randint(8, 40)
-        map_randomobj.seed()
+        map_randomobj = renpy.random.Random()
-        door_randomobj.seed()
 
     # Update map locations
     call set_all_map_locations

game/scripts/interface/door.rpy

@@ -3,29 +3,28 @@
 ####################################
 
 default summon_show_busy = True
-default door_randomobj = renpy.random.Random()
 
-init python:
+label summon:
-    def __choice(seq):
+    $ gui.in_context("summon_menu")
-        seed = door_randomobj.getstate()
+    jump main_room_menu
-        rv = door_randomobj.choice(seq)
-        door_randomobj.setstate(seed)
-        return rv
 
-define map_transcript_loc = dict(
+label summon_menu(xx=723, yy=90):
-    library = "Library",
+
-    room_g = "Gryffindor Dormitory",
+    $ renpy.dynamic(
-    room_s = "Slytherin Dormitory",
+        map_transcript_loc = {
-    room_r = "Ravenclaw Dormitory",
+            "library": "Library",
-    room_h = "Hufflepuff Dormitory",
+            "room_g": "Gryffindor Dormitory",
-    great_hall = "Great Hall",
+            "room_s": "Slytherin Dormitory",
-    courtyard = "Courtyard",
+            "room_r": "Ravenclaw Dormitory",
-    forest = "Forest",
+            "room_h": "Hufflepuff Dormitory",
-    greenhouse = "Greenhouse",
+            "great_hall": "Great Hall",
-    defense = "D.A.D.A Classroom",
+            "courtyard": "Courtyard",
-    training_grounds = "Training Grounds",
+            "forest": "Forest",
-    Lake = "Lake",
+            "greenhouse": "Greenhouse",
-    randomstudent = functools.partial(__choice, (
+            "defense": "D.A.D.A Classroom",
+            "training_grounds": "Training Grounds",
+            "Lake": "Lake",
+            "randomstudent": renpy.random.choice((
                 "Classroom",
                 "Bathroom",
                 "Hagrid's Hut",
@@ -33,7 +32,7 @@ define map_transcript_loc = dict(
                 "Mafkin's Store",
                 "Broom Cupboard",
                 "Attic")),
-    randomsnape = functools.partial(__choice, (
+            "randomsnape": renpy.random.choice((
                 "Classroom",
                 "Boathouse",
                 "Bathroom",
@@ -49,7 +48,7 @@ define map_transcript_loc = dict(
                 "Staircase",
                 "Behind your door",
                 "Room of Doom")),
-    randomtonks = functools.partial(__choice, (
+            "randomtonks": renpy.random.choice((
                 "Classroom",
                 "Bathroom",
                 "Hall",
@@ -58,7 +57,7 @@ define map_transcript_loc = dict(
                 "Hufflepuff Dormitory",
                 "Ravenclaw Dormitory",
                 "Training Grounds",
-        "Tonks's Room",
+                "Tonks' Room",
                 "Quidditch Pitch",
                 "Infirmary",
                 "Sex Dungeon",
@@ -67,15 +66,8 @@ define map_transcript_loc = dict(
                 "Lake",
                 "Greenhouse",
                 "Mafkin's Store")),
-)
+        },
 
-label summon:
-    $ gui.in_context("summon_menu")
-    jump main_room_menu
-
-label summon_menu(xx=723, yy=90):
-
-    $ renpy.dynamic(
         # Door dictionary
         summon_dict = {
             # the order will be the one in the menu
@@ -187,8 +179,7 @@ screen summon_menu():
                                 xysize (48, 48)
                                 add crop_image_zoom("interface/icons/head/"+char_dict["ico"]+".webp", 42, 42, char_dict["busy"]) align (0.5, 0.5)
 
-                            $ loc = map_transcript_loc[char_dict["loc"]]
+                            text map_transcript_loc[char_dict["loc"]] size 10 xcenter 0.6 yalign 0.9
-                            text (loc() if callable(loc) else loc) size 10 xcenter 0.6 yalign 0.9
 
         if not states.sna.unlocked:
             text "You don't know anyone" size 12 at truecenter