From 8d1a8b4ffaa306c6aa399cb6bc730a8c7bc6583a Mon Sep 17 00:00:00 2001
From: LoafyLemon <loafylemon@gmail.com>
Date: Fri, 24 Mar 2023 16:23:23 +0000
Subject: [PATCH] Refactor

* Removed nonfunctional transform from gui_fade
* Removed unused asyncio import
* Unified the use of interface fade
* Replaced function call with a Renpythonic text display in confirm context
---
 game/scripts/doll/main.rpy    |  2 --
 game/scripts/gui/_images_.rpy | 10 +---------
 game/scripts/gui/misc.rpy     | 15 ++-------------
 3 files changed, 3 insertions(+), 24 deletions(-)

diff --git a/game/scripts/doll/main.rpy b/game/scripts/doll/main.rpy
index 192161af..369f110a 100644
--- a/game/scripts/doll/main.rpy
+++ b/game/scripts/doll/main.rpy
@@ -1,6 +1,4 @@
 init python:
-    import asyncio
-
     class Doll(DollMethods):
         # 0 - 50 = Skin/Body Layers
         # 51 - 100 = Face Layers
diff --git a/game/scripts/gui/_images_.rpy b/game/scripts/gui/_images_.rpy
index 40f2e515..6b8ed217 100644
--- a/game/scripts/gui/_images_.rpy
+++ b/game/scripts/gui/_images_.rpy
@@ -3,15 +3,7 @@
 #
 
 image gui_fade:
-    Solid("#000")
-    alpha 0.0
-
-    on appear:
-        alpha 0.5
-    on show:
-        linear 0.1 alpha 0.5
-    on hide:
-        linear 0.1 alpha 0.0
+    Solid("#00000080")
 
 image game_menu:
     contains:
diff --git a/game/scripts/gui/misc.rpy b/game/scripts/gui/misc.rpy
index 6d8c957a..2e80c161 100644
--- a/game/scripts/gui/misc.rpy
+++ b/game/scripts/gui/misc.rpy
@@ -18,7 +18,7 @@ screen confirm(message, yes_action=Return(True), no_action=Return(False)):
 
     style_prefix gui.theme()
 
-    add "confirm_fade"
+    add "gui_fade"
 
     frame:
         padding (34, 34, 34, 34)
@@ -28,7 +28,7 @@ screen confirm(message, yes_action=Return(True), no_action=Return(False)):
         vbox:
             spacing 25
 
-            text _(message):
+            text "[message!t]":
                 xalign 0.5
                 text_align 0.5
 
@@ -42,17 +42,6 @@ screen confirm(message, yes_action=Return(True), no_action=Return(False)):
     ## Right-click and escape answer "no".
     key "game_menu" action no_action
 
-image confirm_fade:
-    Solid("#000")
-    alpha 0.0
-
-    on appear:
-        alpha 0.5
-    on show:
-        linear 0.3 alpha 0.5
-    on hide:
-        linear 0.3 alpha 0.0
-
 style confirm_frame is gui_frame:
     padding (34, 34, 34, 34)
     xalign 0.5