Bug fixes

* Fixed CGController incompatibility with Ren'py automatic image definition system causing issues with Cho handjob/blowjob CG scenes
* Converted introductory CGs into show statements
* Converted quidditch CGs into show statements
* Converted potions CGs into show statements
* Reviewed and removed redundant CG code

game/scripts/cg/camera.rpy

@@ -43,12 +43,18 @@ init python:
             self.child = None
 
         def set_imagepath(self, path):
-            self.imagepath = "images/CG/{}/".format(path)
+            self.imagepath = f"images/CG/{path}/".replace("//", "/")
 
         def set_image(self, img, trans=d1):
             p = max(0, self.get_pause())
 
             self.last_image = self.image
+
+            if isinstance( (vid := renpy.get_registered_image(img)), Movie ):
+                self.image = vid
+            elif isinstance(img, str) and self.imagepath:
+                self.image = f"{self.imagepath}{img}.webp"
+            else:
                 self.image = img
 
             # Reset last variables to new variables to not redraw the transform.
@@ -66,7 +72,13 @@ init python:
                 renpy.with_statement(trans)
 
         def set_overlay(self, overlay):
-            self.overlay = overlay
+            if (img := renpy.get_registered_image(overlay)):
+                self.overlay = img
+            elif self.imagepath and isinstance(img, str):
+                self.overlay = f"{self.imagepath}{overlay}.webp"
+            else:
+                self.overlay = img
+
             self.redraw(0)
 
         def set_zoom(self, n):
@@ -112,17 +124,9 @@ init python:
                 renpy.pause(t)
 
         def redraw(self, t):
-            if self.image is None:
+            if (d := self.image) is None:
                 return
 
-            if isinstance(self.image, str):
-                d = renpy.get_registered_image(self.image)
-            else:
-                d = self.image
-
-            if d is None and self.imagepath:
-                d = Image("{}{}.webp".format(self.imagepath, self.image))
-
             if isinstance(d, Movie):
                 self.scale = 2.0
                 self.last_type = self.type
@@ -133,7 +137,7 @@ init python:
                 self.type = 0
 
             if self.overlay:
-                overlay = Transform("{}{}.webp".format(self.imagepath, self.overlay), zoom=1.0/self.scale)
+                overlay = Transform(self.overlay, zoom=1.0/self.scale)
                 d = Fixed(d, overlay, fit_first=True)
 
             last_zoom = self.last_zoom * self.scale
@@ -145,10 +149,11 @@ init python:
             return self.child
 
         def get_pause(self):
-            if self.image is None:
+            d = self.image
+
+            if d is None:
                 return 0
 
-            d = renpy.get_registered_image(self.image)
             if isinstance(d, Movie) and renpy.music.is_playing(d.channel):
                 p = renpy.music.get_pos(d.channel) or 0.0
                 t = renpy.music.get_duration(d.channel)

game/scripts/cg/common.rpy

@@ -55,39 +55,6 @@ image CG susan = Fixed(
     AlphaMask(Composite((2160, 1200), (880, -180), Transform("CG sus_doll", zoom=1.2)), "images/CG/common/mask.webp"),
     )
 
-# TODO: Review the code below.
-
-
-
-
-
-
-
-
-
-
-# Miscellaneous CG code
-
-label cg_scene(layer=None, folder=None, trans=d5):
-    hide screen cg
-
-    if folder != None:
-        $ cg_path = "images/CG/"+folder+"/"
-
-    if layer != None:
-        $ cg_image = cg_path+layer+".webp"
-
-    show screen cg
-    with trans
-    return
-
-screen cg():
-    # Used by label cg_scene
-    tag cg_screen
-    zorder 14
-
-    add cg_image xpos 540 xanchor 0.5 ypos 0 # At Screen Center
-
 # Snape CG
 screen snape_groping():
     add "images/CG/scene_01.webp" zoom 0.5

game/scripts/characters/astoria/events/intro.rpy

@@ -492,21 +492,16 @@ label astoria_intro_E3:
 
     $ astoria.set_face(mouth="base", eyes="base", eyebrows="base", pupils="mid")
     $ hermione.set_face(mouth="normal", eyes="closed", eyebrows="base", pupils="mid")
-    $ camera.set_imagepath("common/")
+
-    $ camera.set_image("CG ast_intro astoria hermione")
+    show CG ast_intro astoria hermione as cg zorder 17:
-    if game.daytime:
+        zoom 0.5
-        $ camera.set_overlay("day_overlay")
-    else:
-        $ camera.set_overlay("night_overlay")
-    $ camera.set(zoom=0.5, pos=(-270, -150), initialize=True)
-    show screen animatedCG
     with fade
 
     ast "..." ("annoyed", "base", "worried", "R", xpos="right", ypos="base")
 
     gen "..."
     gen "And who's this?"
-    her "Astoria Greengrass, Sir." ("open", "narrow", "annoyed", "mid")
+    her "Astoria Greengrass, Sir." ("open", "narrow", "annoyed", "mid", flip=False, xpos="base", ypos="base")
     her "You asked me to bring you the person who cast the unforgivable curse, Sir." ("soft", "narrow", "annoyed", "R")
     her "And here she is." ("grin", "base", "angry", "mid")
     gen "I thought it would be some angsty girl who listens to death metal - or something..."
@@ -542,10 +537,9 @@ label astoria_intro_E3:
             $ d_flag_01 = True
             pass
 
-    hide screen animatedCG
+    hide cg
     with fade
-
+    her "But Sir, I'd really like to know what her punishment is going to be!" ("angry", "base", "base", "mid")
-    her "But Sir, I'd really like to know what her punishment is going to be!" ("angry", "base", "base", "mid", flip=False, xpos="base", ypos="base", trans=dissolve)
 
     gen "That's none of your concern." ("base", xpos="far_left", ypos="head")
     her "Yes it is! And I demand to be rewarded!" ("angry", "closed", "angry", "mid")

game/scripts/characters/cho/events/intro.rpy

@@ -51,14 +51,9 @@ label cho_intro_E1:
     play music "music/fuzzball-parade-by-kevin-macleod.ogg" fadein 1 if_changed
 
     $ cho.set_face(mouth="base", eyes="base", eyebrows="base", pupils="mid")
-    $ camera.set_imagepath("common/")
+
-    $ camera.set_image("CG cho")
+    show CG cho as cg zorder 17:
-    if game.daytime:
+        zoom 0.5
-        $ camera.set_overlay("day_overlay")
-    else:
-        $ camera.set_overlay("night_overlay")
-    $ camera.set(zoom=0.5, pos=(-270, -150), initialize=True)
-    show screen animatedCG
     with fade
 
     cho "Good morning, Sir." ("base", "base", "base", "mid", xpos="mid", ypos="base")
@@ -122,7 +117,7 @@ label cho_intro_E1:
            gen "..."
            cho "Anyway..." ("open", "closed", "base", "mid")
 
-    hide screen animatedCG
+    hide cg
     with fade
 
     cho "I'm terribly sorry for bothering you, Sir.{w=0.8} I hope I'm not interrupting anything important." ("open", "base", "worried", "mid")

game/scripts/characters/hermione/events/favors/lets_have_sex.rpy

@@ -393,9 +393,6 @@ label hg_sex_1:
         rotate (15)
         zoom 1.0
 
-    #$ camera.set(zoom=1.0, pos=(-190, -435), initialize=True)
-    # show screen animatedCG
-
     hide screen blkfade
     with d5
 
@@ -884,7 +881,6 @@ label hg_sex_2:
     # Hermione Setup
     hide hermione_main
 
-    # $ camera.set(zoom=1.0, pos=(-190, -435), initialize=True)
     if _temp_outfit_choice == "naked":
         show her_sex_personal lean_back hold mouth_open eyebrows_base eyes_wide_stare cheeks_blush as cg
     else:

game/scripts/characters/hermione/events/potions/breast_expand.rpy

@@ -402,15 +402,8 @@ label her_potion_breasts_give:
             gen "About time you noticed..." ("base", xpos="far_left", ypos="head")
             her "Hold on... This means you have..." ("angry", "base", "base", "mid")
 
-            $ camera.set_imagepath("common/")
+            show CG hermione as cg zorder 17:
-            $ camera.set_image("CG hermione")
+                zoom 0.5
-            if game.daytime:
-                $ camera.set_overlay("day_overlay")
-            else:
-                $ camera.set_overlay("night_overlay")
-            $ camera.set(zoom=0.5, pos=(-270, -150), initialize=True)
-            hide hermione_main
-            show screen animatedCG
             with fade
 
             # Strip top/bra
@@ -461,15 +454,8 @@ label her_potion_breasts_give:
             her "Oh my!" ("angry", "wide", "base", "mid", cheeks="blush")
             her "But this means..." ("soft", "wide", "base", "stare", cheeks="blush")
 
-            $ camera.set_imagepath("common/")
+            show CG hermione as cg zorder 17:
-            $ camera.set_image("CG hermione")
+                zoom 0.5
-            if game.daytime:
-                $ camera.set_overlay("day_overlay")
-            else:
-                $ camera.set_overlay("night_overlay")
-            $ camera.set(zoom=0.5, pos=(-270, -150), initialize=True)
-            hide hermione_main
-            show screen animatedCG
             with fade
 
             her "" ("soft", "wide", "base", "down", cheeks="blush")
@@ -638,7 +624,7 @@ label her_potion_breasts_give:
             gen "They don't call me the potions master for nothing..." ("grin", xpos="far_left", ypos="head")
             gen "Now then..." ("base", xpos="far_left", ypos="head")
 
-    hide screen animatedCG
+    hide cg
     with fade
 
     ##Genie asks to touch her breasts##

game/scripts/characters/hermione/events/potions/polyjuice_luna.rpy

@@ -234,22 +234,18 @@ label her_potion_luna_give:
     pause 2
 
     play music "music/wallpaper-by-kevin-macleod.ogg" fadein 1 if_changed
-    $ camera.set_imagepath("common/")
-    $ camera.set_image("CG luna")
-    if game.daytime:
-        $ camera.set_overlay("day_overlay")
-    else:
-        $ camera.set_overlay("night_overlay")
-    $ camera.set(zoom=0.5, pos=(-270, -150), initialize=True)
 
+    show CG luna as cg zorder 17:
+        zoom 0.5
+
+    $ luna.set_face(mouth="disgust", eyes="closed", eyebrows="base", pupils="mid")
     hide screen blkfade
-    show screen animatedCG
     with fade
 
-    pause 2
+    pause 1
 
     if not states.her.ev.potions.polyjuice_luna_drank:
-        lun "*Ughhh*... My head..." ("disgust", "closed", "base", "mid", trans=d3)
+        lun "*Ughhh*... My head..."
         lun "I feel like I'm going to throw up!" ("mad", "narrow", "base", "mid")
         gen "Well you look fine to me!" ("grin", xpos="far_left", ypos="head")
 
@@ -560,7 +556,7 @@ label her_potion_luna_give:
     with d5
     pause .8
     $ luna.wear("all")
-    hide screen animatedCG
+    hide cg
     hide luna_main
     hide screen blkfade
     with d5

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

@@ -457,8 +457,8 @@ label tentacle_1: #Public path
     mal "What a slut..."
     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
+    hide cg
     with d9
     pause.8
     nar "You place Hermione back onto the desk as the plant that you are occupying slowly wilts and dies."
@@ -493,7 +493,6 @@ label tentacle_1: #Public path
 
     show screen blkfade
     with d9
-    hide cg
     pause.8
 
     return

game/scripts/characters/luna/events/favors/inspect_her_body.rpy

@@ -176,15 +176,11 @@ label ll_pf_inspect_T2_E1_intro:
 
     lun "Do you think I'll be able to expel them from here, [name_genie_luna]?" ("open", "base", "raised", "mid", cheeks="blush", flip=True)
 
-    $ camera.set_imagepath("lun_intro/")
+    show CG lun_intro luna bendover naked as cg zorder 17:
-    $ camera.set_image("CG lun_intro luna bendover naked")
+        subpixel True
-    if game.daytime:
+        zoom 0.5
-        $ camera.set_overlay("day_overlay")
+        pos (0, 0)
-    else:
+        easein_quad 15.0 zoom 1.0 pos (-1040, -600)
-        $ camera.set_overlay("night_overlay")
-    $ camera.set(zoom=0.5, pos=(-270, -150), initialize=True)
-    $ camera.set(zoom=1.0, pos=(-1040, -600), t=30.0)
-    show screen animatedCG
     with fade
 
     gen "[name_luna_genie]!"
@@ -200,16 +196,15 @@ label ll_pf_inspect_T2_E1_intro:
     gen "*Ah*, Yes...{w=0.4} both of those areas do appear to be very susceptible...{w=0.4} To spurts."
     lun "I knew it!"
 
-
+    lun "" ("grin", "base", "base", "mid", cheeks="blush", flip=False)
     call hide_characters
     call lun_chibi(flip=False)
-    hide screen animatedCG
+    hide cg
     with fade
 
-    lun "" ("grin", "base", "base", "mid", cheeks="blush", flip=False, trans=dissolve)
     nar "Luna turns back around, and as you get a full view of her front, you feel yourself getting close to the edge."
 
-    lun "So that's how you came up with the idea of rubbing your penis, [name_genie_luna]!" ("grin", "wink", "base", "mid", cheeks="blush")
+    lun "So that's how you came up with the idea of rubbing your penis, [name_genie_luna]!" ("grin", "wink", "base", "mid", cheeks="blush", trans=dissolve)
     lun "To bait the Wrackspurts to one spot!" ("crooked_smile", "base", "base", "mid", cheeks="blush")
     lun "Since your penis is a sensitive area, rubbing it gets the Wrackspurts all excited..." ("smile", "closed", "base", "mid", cheeks="blush")
 

game/scripts/characters/susan/events/intro.rpy

@@ -106,14 +106,8 @@ label susan_intro_E1:
     pause.8
 
     $ susan.set_face(mouth="base", eyes="base", eyebrows="base", pupils="mid")
-    $ camera.set_imagepath("common/")
+    show CG susan as cg zorder 17:
-    $ camera.set_image("CG susan")
+        pos (-1045, -390)
-    if game.daytime:
-        $ camera.set_overlay("day_overlay")
-    else:
-        $ camera.set_overlay("night_overlay")
-    $ camera.set(zoom=1.0, pos=(-1045, -390), initialize=True)
-    show screen animatedCG
     with fade
 
     play sound "sounds/boing03.ogg" #Big boobas
@@ -122,23 +116,35 @@ label susan_intro_E1:
 
     menu:
         "\"Hello, Gorgeous!\"":
-            $ camera.set(zoom=0.5, pos=(-270, -150), t=3.0)
+            show CG susan as cg zorder 17:
+                pos (-1045, -390)
+                ease_quad 3.0 pos (-1045, -150)
+
             sus "*Ehm*..." ("soft", "happy", "base", "downR", cheeks="blush") # Embarrassed.
             sus "H-Hello..." ("open", "happy", "base", "downL", cheeks="blush")
 
         "\"Susan! How great to see you!\"" if d_flag_01:
-            $ camera.set(zoom=0.5, pos=(-270, -150), t=3.0)
+            show CG susan as cg zorder 17:
+                pos (-1045, -390)
+                ease_quad 3.0 pos (-1045, -150)
+
             gen "Where have you been all my life?"
             sus "I--{w=0.4} I've been here at school for a couple of years now, Sir." ("open", "happy", "base", "mid", cheeks="blush")
             gen "You don't say..."
 
         "\"My day just got a whole lot brighter!\"":
-            $ camera.set(zoom=0.5, pos=(-270, -150), t=3.0)
+            show CG susan as cg zorder 17:
+                pos (-1045, -390)
+                ease_quad 3.0 pos (-1045, -150)
+
             sus "Sir?" ("open", "happy", "base", "downL", cheeks="blush")
             gen "(Or should say darker?)"
-            show screen blktone
             gen "(Those tits must cast a huge-ass shadow...)"
-            hide screen blktone
+
+    show CG susan as cg zorder 17:
+        zoom 1.0
+        pos (-1045, -150)
+        ease_quad 3.0 zoom 0.5 pos (0, 0)
 
     sus "Professor Tonks said you wanted to see me?" ("soft", "happy", "base", "downL", cheeks="blush")
     gen "Did she now?"
@@ -164,7 +170,8 @@ label susan_intro_E1:
         sus "I shall return to my dormitory then." ("open", "happy", "base", "right")
         sus "Good--{w=0.4} Good night, sir." ("open", "happyCl", "base", "mid")
 
-    hide screen animatedCG
+    $ susan.hide()
+    hide cg
     with fade
 
     call sus_walk(action="leave")

game/scripts/characters/tonks/events/intro.rpy

@@ -71,23 +71,24 @@ label tonks_intro_E1:
     pause.5
 
     $ tonks.set_face(mouth="base", eyes="base", eyebrows="base", pupils="mid")
-    $ camera.set_imagepath("common/")
+    show CG tonks as cg zorder 17:
-    $ camera.set_image("CG tonks")
+        pos (-1040, -35)
-    if game.daytime:
-        $ camera.set_overlay("day_overlay")
-    else:
-        $ camera.set_overlay("night_overlay")
-    $ camera.set(zoom=1.0, pos=(-1040, -35), initialize=True)
-    show screen animatedCG
     with fade
 
     play music "music/scheming-weasel-slower-version-by-kevin-macleod.ogg" fadein 1 if_changed
     ton "Thank you, Professor." ("base", "base", "base", "mid", xpos="right", ypos="base", trans=d3)
 
-    $ camera.set(zoom=1.0, pos=(-1040, -600), t=5.0)
+    show CG tonks as cg zorder 17:
+        pos (-1040, -35)
+        ease_quad 5.0 pos (-1040, -600)
+
     gen "(Oh shit,{w=0.1} she's hot...)"
 
-    $ camera.set(zoom=0.5, pos=(-270, -150), t=3.0)
+    show CG tonks as cg zorder 17:
+        zoom 1.0
+        pos (-1040, -600)
+        ease_quad 5.0 pos (0, 0) zoom 0.5
+
     ton "I apologise for arriving unannounced...{w=0.8} And a couple of days late..." ("open", "base", "base", "R")
     gen "Please, I'm glad you could make it."
     ton "I was occupied with some unfinished ministry business. Took me a lot longer to solve than I had anticipated..." ("normal", "narrow", "base", "mid")
@@ -104,7 +105,7 @@ label tonks_intro_E1:
             $ states.gen.masturbating = True
             $ jerked_off_during_tonks_intro = True
             call gen_chibi("jerk_off_behind_desk")
-            hide screen animatedCG
+            hide cg
             with fade
 
             nar "You take out your cock and start jerking off."
@@ -114,7 +115,7 @@ label tonks_intro_E1:
         "-Pay attention-":
             $ states.gen.masturbating = False
             $ jerked_off_during_tonks_intro = False
-            hide screen animatedCG
+            hide cg
             with fade
             gen "Tell me about it..." ("base", xpos="far_left", ypos="head")
 

game/scripts/events/ending.rpy

@@ -1982,8 +1982,6 @@ label ball_ending_E2:
 
     else:
 
-        label testcg:
-
         # Personal whore ending
         sna "Miss Granger...?" ("snape_03", ypos="head")
         sna "You decided to show up after all? What an unpleasant surprise..." ("snape_04")