Bug fixes

* Fix `fem` caller unnecessary arguments (Caused by regex most likely)
* Fixed xray displayable opaque Render flag (superseded by internal Ren'py changes)
* Fixed Doll animation concatenation to list

game/scripts/cg/xray.rpy

@@ -50,7 +50,7 @@ init python:
             overlay = renpy.render(self.overlay, width, height, st, at)
             mask = renpy.render(self.mask, width, height, st, at)
 
-            rv = renpy.Render(width, height, opaque=False)
+            rv = renpy.Render(width, height)
 
             rv.operation = renpy.display.render.IMAGEDISSOLVE
             rv.operation_alpha = 1.0

game/scripts/characters/cho/events/quidditch/gryffindor_match.rpy

@@ -564,7 +564,7 @@ label gryffindor_match:
     $ renpy.sound.play("sounds/wolf_whistle2.ogg")
     call quidditch_stands(crowd_react=["emo8", None, None])
 
-    fem "Shake that booty, sister!" ("base", xpos="far_left", ypos="head")
+    fem "Shake that booty, sister!"
     stop bg_sounds fadeout 3.0
     call play_sound("kick")
     with hpunch
@@ -1666,7 +1666,6 @@ label gryffindor_match_return:
     gen "...{w=0.8}{nw}" ("base", xpos="far_left", ypos="head")
     gen "...{w=0.8}{nw}" ("angry", xpos="far_left", ypos="head")
 
-
     hoo "Prison? No, not that, thank heavens." ("open", "shocked", "shocked", "mid")
     hoo "But she could kiss getting into any sort of professional league goodbye." ("open", "shocked", "base", "down")
     gen "Kiss--" ("base", xpos="far_left", ypos="head")

game/scripts/characters/cho/events/quidditch/hufflepuff_match.rpy

@@ -731,7 +731,7 @@ label hufflepuff_match:
     $ renpy.sound.play("sounds/giggle2_loud.ogg")
     hide hermione_main
     with d3
-    fem "What a slut!" ("base", xpos="far_left", ypos="head")
+    fem "What a slut!"
     call ctc
 
     # Pack to stands.
@@ -779,7 +779,7 @@ label hufflepuff_match:
     call quidditch_stands(crowd_react=["emo8", "emo7", "sur"])
     with d3
 
-    fem "We want to see them!" ("base", xpos="far_left", ypos="head")
+    fem "We want to see them!"
 
     $ renpy.sound.play("sounds/crowd_cheer.ogg")
     call quidditch_stands(crowd_react=["emo8", "emo7", "emo8"])

game/scripts/characters/hermione/events/tentacles.rpy

@@ -297,7 +297,7 @@ label tentacle_scene_intro:
     ">Slinking your slimy tentacles under her top and skirt."
     if not hermione.is_worn("panties"):
         mal "Hey, look, look! She doesn't have panties on!"
-        fem "Oh my gosh, so the rumours about her were true?!" ("base", xpos="far_left", ypos="head")
+        fem "Oh my gosh, so the rumours about her were true?!"
         mal2 "And she brought her own plant sample, I bet she planned this out, what a total slut!"
     her "Oh no..."
     $ renpy.sound.play("sounds/cloth_rip.ogg")
@@ -310,7 +310,7 @@ label tentacle_scene_intro:
     if hermione.is_worn("panties"):
         ">The tentacles slowly remove her panties, revealing her pussy to the entire class."
     mal "Wow..."
-    fem "This is horrible, someone should do something!" ("base", xpos="far_left", ypos="head")
+    fem "This is horrible, someone should do something!"
     mal2 "Professor Sprout says as long as she doesn't move she'll be released."
     $ renpy.sound.play("sounds/plant_slithering.ogg")
     ">You position a large, flowered tentacle above Hermione's head."
@@ -455,7 +455,7 @@ label tentacle_1: #Public path
     $ renpy.sound.play("sounds/slick_02.ogg")
     ">The sensations proved to much for Hermione and she faints, going limp in your tentacles."
     mal "What a slut..."
-    fem "That's what I've been telling you!" ("base", xpos="far_left", ypos="head")
+    fem "That's what I've been telling you!"
     mal2 "Man, I'm going to have to join Gryffindor."
     hide screen cg
     show screen blkfade
@@ -526,7 +526,7 @@ label tentacle_2: # Personal path
     ">You start to rotate the tentacles in her vagina."
     gen "!!! *HMMMMM*"
     mal "Wow, I think she's starting to enjoy it."
-    fem "Hermione? No way, she's too stuck-up to let boys kiss her, not to mention enjoying sex. {size=-6}With a plant but still..{/size}" ("base", xpos="far_left", ypos="head")
+    fem "Hermione? No way, she's too stuck-up to let boys kiss her, not to mention enjoying sex. {size=-6}With a plant but still..{/size}"
     mal2 "I don't know man, she doesn't look like she hates it."
     play bg_sounds "sounds/slickloopfast.ogg" fadein 2 fadeout 2
     ">You increase the speed of the tentacles in her vagina."
@@ -576,7 +576,7 @@ label tentacle_2: # Personal path
     $ renpy.sound.play("sounds/slick_02.ogg")
     mal "Told you she was a slut."
     $ renpy.sound.play("sounds/slick_02.ogg")
-    fem "I guess you were right..." ("base", xpos="far_left", ypos="head")
+    fem "I guess you were right..."
     hide screen cg
     show screen blkfade
     with d9
@@ -586,9 +586,9 @@ label tentacle_2: # Personal path
     her "..................*Ah*"
     spo ".... She's breathing, thank be Merlin."
     spo "You! Yes, you girls! Take her to the hospital wing at once!"
-    fem "W-wha-- But..." ("base", xpos="far_left", ypos="head")
+    fem "W-wha-- But..."
     spo "What are you waiting for!"
-    fem "{size=-4}Fine...{/size}" ("base", xpos="far_left", ypos="head")
+    fem "{size=-4}Fine...{/size}"
 
     call play_sound("running")
     pause 3.0

game/scripts/doll/main.rpy

@@ -48,8 +48,12 @@ init python:
                 return
 
             base_transform = doll_transform(self.pos, self.zoom, self.xzoom)
+            animation = self.animation
 
-            renpy.show(name=self.tag, at_list=[base_transform] + self.animation, layer=self.layer, what=self.get_image(), zorder=self.zorder)
+            if not isinstance(animation, list):
+                animation = [animation]
+
+            renpy.show(name=self.tag, at_list=[base_transform] + animation, layer=self.layer, what=self.get_image(), zorder=self.zorder)
 
         def hide(self):
             renpy.hide(name=self.tag, layer=self.layer)

game/scripts/minigames/mirror/events/panty_raid.rpy

@@ -588,7 +588,7 @@ label panty_raid:
         call play_sound("knocking")
         "*Knock-knock-knock*"
         pause 1.0
-        fem "Who is it?" ("base", xpos="far_left", ypos="head")
+        fem "Who is it?"
         pause 0.5
         her "It's me... Hermione granger."
         call play_sound("door")