Merge pull request Monika-After-Story#416 from Backdash/issue408-fix

Fixed no more topics issue
Knight-Of-Balance · Dec 12, 2017 · f4d96b0 · f4d96b0
2 parents a90e0b0 + 4a30410
commit f4d96b0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/Monika After Story/game/script-ch30.rpy b/Monika After Story/game/script-ch30.rpy
@@ -566,7 +566,10 @@ label ch30_loop:
         # Pick a random Monika topic
         label pick_random_topic:
         python:
-            if monika_random_topics:        # If we're out of random topics, just stay in the loop
+            if len(monika_random_topics) > 0:  # still have topics
+                pushEvent(renpy.random.choice(monika_random_topics))
+            else: # no topics left
+                monika_random_topics = list(all_random_topics)
                 pushEvent(renpy.random.choice(monika_random_topics))
 
     $_return = None

diff --git a/Monika After Story/game/script-topics.rpy b/Monika After Story/game/script-topics.rpy
@@ -27,14 +27,14 @@ init -1 python:
 
 init 11 python:
     #List of all random topics
-    all_random_topics = monika_random_topics
+    all_random_topics = list(monika_random_topics)
 
     #Remove all previously seen random topics.
     remove_seen_topics()
 
     #If there are no unseen topics, you can repeat seen ones
     if len(monika_random_topics) == 0:
-        monika_random_topics=all_random_topics
+        monika_random_topics=list(all_random_topics)
 
 #BEGIN ORIGINAL TOPICS