Say box

* Unify say box

game/scripts/gui/_styles_.rpy

@@ -203,7 +203,6 @@ style say_label is default:
     bold False
     text_align 0.5
     align (0.5, 0.5)
-    #outlines [(1, settings.get('text_outline'), 1, 0)]
 
 style dark_say_label:
     color settings.get('text_color_night')
@@ -211,22 +210,19 @@ style dark_say_label:
 style light_say_label:
     color settings.get('text_color_day')
 
-style say_label_alt is say_dialogue_alt
+style say_label is say_dialogue
 
 # Say dialogue
 
-style say_dialogue is default:
-    outlines [(1, settings.get('text_outline'), 1, 0)]
-
 style dark_say_dialogue:
     color settings.get('text_color_night')
 
 style light_say_dialogue:
     color settings.get('text_color_day')
 
-style say_dialogue_alt:
+style say_dialogue is default:
     color "#ffffff"
-    outlines [(1, "#000000", 1, 0)]
+    outlines [(2, "#000000", 0, 0)]
 
 style say_thought is say_dialogue
 style dark_say_thought is dark_say_dialogue
@@ -248,12 +244,6 @@ style light_window is light_gui_frame:
 
 # Say window
 
-style say_window:
-    ysize 143
-    padding (250, 40, 250, 0)
-    top_margin 22
-    yalign 1.0
-
 style dark_say_window is dark_window:
     take say_window
     background "interface/frames/gray/frame.webp"
@@ -262,8 +252,11 @@ style light_say_window is light_window:
     take say_window
     background "interface/frames/gold/frame.webp"
 
-style say_window_alt:
+style say_window:
-    take say_window
+    ysize 143
+    padding (250, 40, 250, 0)
+    top_margin 22
+    yalign 1.0
     background "fade_gradient"
 
 # Namebox
@@ -283,9 +276,6 @@ style light_namebox is light_gui_frame:
     take namebox
     # background Transform(Frame("gui/light_namebox.png", 8, 8))
 
-style namebox_alt:
-    take namebox
-
 # Text
 
 style dark_text:

game/scripts/gui/say.rpy

@@ -36,12 +36,12 @@ screen say(who, what, side_image=None, icon=None):
 
     # TODO: While this works, there might be a better way to add effects based on contents of the dialogue.
 
-    if text_inner_thought(what) and not renpy.showing("cg"):
+    if text_inner_thought(what):
         add "fade_gradient"
-    elif renpy.showing("cg"):
+
-        add "interface/bld.webp":
+    add "interface/bld.webp":
-            if _windows_hidden:
+        if _windows_hidden:
-                ypos 1000
+            ypos 1000
 
     if side_image:
         add side_image yalign 1.0 zoom 0.5
@@ -49,32 +49,18 @@ screen say(who, what, side_image=None, icon=None):
         add SideImage()
 
     window id "window":
-        if renpy.showing("cg"):
+        style "say_window"
-            style "say_window_alt"
 
-            if who:
+        if who:
-                window:
+            window:
-                    id "namebox"
+                id "namebox"
-                    style "namebox_alt"
+                style "namebox"
-                    text who:
+                text who:
-                        style "say_label_alt"
+                    style "say_label"
 
-            text what:
+        text what:
-                id "what"
+            id "what"
-                style "say_dialogue_alt"
+            style "say_dialogue"
-        else:
-            style gui.theme("say_window")
-
-            if who:
-                window:
-                    id "namebox"
-                    style gui.theme("namebox")
-                    text who:
-                        style gui.theme("say_label")
-
-            text what:
-                id "what"
-                style gui.theme("say_dialogue")
 
         if _windows_hidden:
                 ypos 1000
@@ -108,10 +94,7 @@ screen say(who, what, side_image=None, icon=None):
 
 screen quick_menu():
     hbox:
-        if renpy.showing("cg"):
+        style_prefix "quick"
-            style_prefix "quick_alt"
-        else:
-            style_prefix "quick"
         xalign 1.0
         yoffset -30
 
@@ -128,24 +111,14 @@ style quick_button is default:
     xpadding 8
     ypadding 8
 
-style quick_button_text is default:
+style quick_button_text:
     size 10
     idle_color "#8888"
-    hover_color "#ccc"
-    selected_idle_color "#cc08"
-    selected_hover_color "#cc0"
-    insensitive_color "#4448"
-
-style quick_alt_button is quick_button
-
-style quick_alt_button_text:
-    take quick_button_text
-    idle_color "#8888"
     hover_color "#fff"
+    insensitive_color "#4448"
     idle_outlines [(1, "#0008", 1, 1)]
     hover_outlines [(1, "#000", 1, 1)]
 
-
 # Choice screen
 #
 # This screen is used to display the in-game choices presented by the menu