From a3e2b2eaee7432d449ab5c63ad89c161f670e922 Mon Sep 17 00:00:00 2001
From: LoafyLemon <loafylemon@gmail.com>
Date: Thu, 8 Feb 2024 18:05:43 +0000
Subject: [PATCH] New border, transform transition and a bug fix

* Added a new decorative frame for vertical CGs.
* Added a new transition/transform.
* Fixed CG say box fade not being hidden when it should be.
---
 game/interface/frames/cg_frame.webp              |  3 +++
 game/scripts/animations/transforms.rpy           | 13 +++++++++++++
 game/scripts/cg/luna.rpy                         |  7 +++++++
 .../luna/events/favors/inspect_her_body.rpy      | 16 +++++++++++-----
 game/scripts/gui/say.rpy                         |  4 +++-
 5 files changed, 37 insertions(+), 6 deletions(-)
 create mode 100644 game/interface/frames/cg_frame.webp

diff --git a/game/interface/frames/cg_frame.webp b/game/interface/frames/cg_frame.webp
new file mode 100644
index 00000000..9c755278
--- /dev/null
+++ b/game/interface/frames/cg_frame.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:24053c3eecbcd83dcc7351ea9cd0772efe152742688c9e3aa2309983b6c83228
+size 213180
diff --git a/game/scripts/animations/transforms.rpy b/game/scripts/animations/transforms.rpy
index 20fc2e3e..19657f26 100644
--- a/game/scripts/animations/transforms.rpy
+++ b/game/scripts/animations/transforms.rpy
@@ -17,6 +17,19 @@ transform move_fade:
         xoffset 0
         easeout_back 1.0 alpha 0.0 xoffset absolute(200)
 
+transform cg_transition:
+    on show, appear, start:
+        xalign 0.5
+        alpha 0.0
+        xzoom 0.0
+        easein_back 0.7 alpha 1.0 xzoom 1.0
+
+    on hide:
+        xalign 0.5
+        alpha 1.0
+        xzoom 1.0
+        easeout_back 0.5 alpha 0.0 xzoom 0.0
+
 transform fade_show(t):
     alpha 0
     on show:
diff --git a/game/scripts/cg/luna.rpy b/game/scripts/cg/luna.rpy
index d1b45b75..134233cf 100644
--- a/game/scripts/cg/luna.rpy
+++ b/game/scripts/cg/luna.rpy
@@ -347,6 +347,13 @@ layeredimage lun_grind:
         attribute resting_spread "lun_grind_resting_spread"
         attribute spring_out "lun_grind_spring_out" # animation
 
+image lun_grind_border:
+    fit "contain"
+
+    HBox("interface/frames/cg_frame.png",
+        Null(2878, 3840),
+        Transform("interface/frames/cg_frame.png", xzoom=-1))
+
 image lun_grind_idle:
     Fixed(
         "lun_grind_body_idle",
diff --git a/game/scripts/characters/luna/events/favors/inspect_her_body.rpy b/game/scripts/characters/luna/events/favors/inspect_her_body.rpy
index 1a28dc76..16e34b43 100644
--- a/game/scripts/characters/luna/events/favors/inspect_her_body.rpy
+++ b/game/scripts/characters/luna/events/favors/inspect_her_body.rpy
@@ -557,12 +557,16 @@ label ll_pf_inspect_T2_E2_intro:
     #TODO add dark overlay across base CG, add borders around Ass shot CG
     show lun_inspect as cg zorder 15
     #TODO cock against butthole
+
+    show image "#00000080" as cg_effect1 zorder 15
+    with d3
+    show lun_grind_border as cg_effect2 zorder 15 at cg_transition
     if game.daytime:
-        show lun_grind resting as cg2 zorder 16
-        with d4
+        show lun_grind resting as cg2 zorder 16 at cg_transition
     else:
-        show lun_grind grind as cg2 zorder 16 at color_temperature(1.0)
-        with d4
+        show lun_grind grind as cg2 zorder 16 at color_temperature(1.0), cg_transition
+
+    pause 1
 
     nar "Suddenly, Luna's thighs tighten around your legs, as she pushes her ass back towards your abdomen."
     nar "Her cheeks lightly grace your hardening cock, and as they do, it manages to wiggle its way to rest against her butthole."
@@ -622,7 +626,9 @@ label ll_pf_inspect_T2_E2_intro:
     nar "While you return to your senses, your semen slowly begins sliding down her crack."
 
     show lun_inspect eyebrows_shocked eyes_halflid_right as cg
-    hide cg2 with d3
+    hide cg2
+    hide cg_effect2
+    hide cg_effect1 with d3
     #TODO hide dark overlay
 
     gen "*Ah*...{w=0.4} *Ah*...{w=0.4} *Ah*..."
diff --git a/game/scripts/gui/say.rpy b/game/scripts/gui/say.rpy
index 5b176fb2..e5c51366 100644
--- a/game/scripts/gui/say.rpy
+++ b/game/scripts/gui/say.rpy
@@ -39,7 +39,9 @@ screen say(who, what, side_image=None, icon=None):
     if text_inner_thought(what) and not renpy.showing("cg"):
         add "fade_gradient"
     elif renpy.showing("cg"):
-        add "interface/bld.webp"
+        add "interface/bld.webp":
+            if _windows_hidden:
+                ypos 1000
 
     if side_image:
         add side_image yalign 1.0 yanchor 1.0 zoom 0.5