From ce435cb69c340f7e6823d637531a93c9ae16d268 Mon Sep 17 00:00:00 2001
From: LoafyLemon <loafylemon@gmail.com>
Date: Tue, 4 Jul 2023 15:55:11 +0100
Subject: [PATCH] Bug fixes

* Disabled DollChibi place method default pause (unintended)
* Load audio before fades during retrospection
* Simplify achievements if block
---
 .../cho/events/quidditch/intros.rpy           |  6 ++--
 game/scripts/doll/chibi.rpy                   |  2 +-
 game/scripts/utility/periodic_functions.rpy   | 35 +++++++++----------
 3 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/game/scripts/characters/cho/events/quidditch/intros.rpy b/game/scripts/characters/cho/events/quidditch/intros.rpy
index 3790296c..5f34cf90 100644
--- a/game/scripts/characters/cho/events/quidditch/intros.rpy
+++ b/game/scripts/characters/cho/events/quidditch/intros.rpy
@@ -1528,11 +1528,11 @@ label cho_quid_E12:
         hoo @ cheeks blush "" ("base", "narrow", "base", "R", xpos=100, ypos="base", flip=True)
         cho @ cheeks heavy_blush "" ("horny", "narrow", "base", "mid", xpos=460, ypos="base", flip=False)
 
-        hide screen blkfade
-        with d5
-
         play background "sounds/outskirts.ogg" fadein 2
         play music "music/march-of-the-spoons-by-kevin-macleod-from-filmmusic-io.ogg" fadein 1 fadeout 1 if_changed
+        
+        hide screen blkfade
+        with d5
 
     hoo @ cheeks blush "And all those feelings are imbued into this very broom..." ("base", "narrow", "base", "R")
     hoo @ cheeks blush_heavy "I remember using it at the Quidditch world cup finals... Thousands of people watching..." ("grin", "closed", "worried", "mid")
diff --git a/game/scripts/doll/chibi.rpy b/game/scripts/doll/chibi.rpy
index ca0ec0fe..d5e2bddf 100644
--- a/game/scripts/doll/chibi.rpy
+++ b/game/scripts/doll/chibi.rpy
@@ -151,7 +151,7 @@ init 5 python:
             self.pose = pose
             self.update()
 
-        def place(self, pos=None, speed=1.0, pause=True, at_list=[], pose=None, xzoom=None):
+        def place(self, pos=None, speed=1.0, pause=False, at_list=[], pose=None, xzoom=None):
             self.set_pose(pose or self.idle)
 
             self.atl_time = 0
diff --git a/game/scripts/utility/periodic_functions.rpy b/game/scripts/utility/periodic_functions.rpy
index 744ff691..bb36b19a 100644
--- a/game/scripts/utility/periodic_functions.rpy
+++ b/game/scripts/utility/periodic_functions.rpy
@@ -1,32 +1,31 @@
 init python:
     def periodic_achievements():
-        if not hasattr(store, "achievements"):
+        if not hasattr(store, "achievements") or _in_replay:
             return
 
-        if _in_replay is None:
-            if not achievements.status('gold') and game.gold >= 10000:
-                achievements.unlock("gold")
+        if not achievements.status('gold') and game.gold >= 10000:
+            achievements.unlock("gold")
 
-            if not achievements.status('drunkard') and wine_ITEM.owned >= 25:
-                achievements.unlock("drunkard")
+        if not achievements.status('drunkard') and wine_ITEM.owned >= 25:
+            achievements.unlock("drunkard")
 
-            if not achievements.status('peta') and (game.day-states.bird_fed_times) >= 50:
-                achievements.unlock("peta")
+        if not achievements.status('peta') and (game.day-states.bird_fed_times) >= 50:
+            achievements.unlock("peta")
 
-            if not achievements.status('petpal') and states.bird_petted_times >= 25:
-                achievements.unlock("petpal")
+        if not achievements.status('petpal') and states.bird_petted_times >= 25:
+            achievements.unlock("petpal")
 
-            if not achievements.status('bros') and states.sna.level >= 100:
-                achievements.unlock("bros")
+        if not achievements.status('bros') and states.sna.level >= 100:
+            achievements.unlock("bros")
 
-            if not achievements.status('overwhored') and states.her.level >= 24:
-                achievements.unlock("overwhored")
+        if not achievements.status('overwhored') and states.her.level >= 24:
+            achievements.unlock("overwhored")
 
-            if not achievements.status('fireplace') and states.fireplace_started_times >= 5:
-                achievements.unlock("fireplace")
+        if not achievements.status('fireplace') and states.fireplace_started_times >= 5:
+            achievements.unlock("fireplace")
 
-            if not achievements.status('workaholic') and states.paperwork_reports_times >= 5:
-                achievements.unlock("workaholic")
+        if not achievements.status('workaholic') and states.paperwork_reports_times >= 5:
+            achievements.unlock("workaholic")
 
     def periodic_callbacks():
         """Call functions that need to be checked periodically (i.e. achievement unlocks) at around 20Hz"""