game/scripts/characters/astoria/common.rpy

@@ -83,16 +83,8 @@ init python:
         if redraw:
             show()
 
-        # Figure out nickname
-        if name_astoria_genie != "Astoria":
-            name_prefix = "Astoria {size=-20}\""
-            name_suffix = "\"{/size}"
-        else:
-            name_prefix = ""
-            name_suffix = ""
-
         if what:
-            character.astoria_say(what, who_prefix=name_prefix, who_suffix=name_suffix, **kwargs)
+            character.astoria_say(what, **kwargs)
 
         if temp_face:
             astoria.set_face(**last_face)

game/scripts/characters/cho/common.rpy

@@ -81,16 +81,8 @@ init python in character:
         if redraw:
             show()
 
-        # Figure out nickname
-        if renpy.store.name_cho_genie != "Cho":
-            name_prefix = "Cho {size=-20}\""
-            name_suffix = "\"{/size}"
-        else:
-            name_prefix = ""
-            name_suffix = ""
-
         if what:
-            cho_say(what, who_prefix=name_prefix, who_suffix=name_suffix, **kwargs)
+            cho_say(what, **kwargs)
 
         if temp_face:
             renpy.store.cho.set_face(**last_face)

game/scripts/characters/hermione/common.rpy

@@ -76,16 +76,8 @@ init python:
         if redraw:
             show()
 
-        # Figure out nickname
-        if name_hermione_genie != "Hermione":
-            name_prefix = "Hermione {size=-20}\""
-            name_suffix = "\"{/size}"
-        else:
-            name_prefix = ""
-            name_suffix = ""
-
         if what:
-            character.hermione_say(what, who_prefix=name_prefix, who_suffix=name_suffix, **kwargs)
+            character.hermione_say(what, **kwargs)
 
         if temp_face:
             hermione.set_face(**last_face)

game/scripts/characters/luna/common.rpy

@@ -79,16 +79,8 @@ init python:
         if redraw:
             show()
 
-        # Figure out nickname
-        if name_luna_genie != "Luna":
-            name_prefix = "Luna {size=-20}\""
-            name_suffix = "\"{/size}"
-        else:
-            name_prefix = ""
-            name_suffix = ""
-
         if what:
-            character.luna_say(what, who_prefix=name_prefix, who_suffix=name_suffix, **kwargs)
+            character.luna_say(what, **kwargs)
 
         if temp_face:
             luna.set_face(**last_face)

game/scripts/characters/susan/common.rpy

@@ -78,16 +78,8 @@ init python:
         if redraw:
             show()
 
-        # Figure out nickname
-        if name_susan_genie != "Susan":
-            name_prefix = "Susan {size=-20}\""
-            name_suffix = "\"{/size}"
-        else:
-            name_prefix = ""
-            name_suffix = ""
-
         if what:
-            character.susan_say(what, who_prefix=name_prefix, who_suffix=name_suffix, **kwargs)
+            character.susan_say(what, **kwargs)
 
         if temp_face:
             susan.set_face(**last_face)

game/scripts/characters/tonks/common.rpy

@@ -98,16 +98,8 @@ init python:
         if redraw:
             show()
 
-        # Figure out nickname
-        if name_tonks_genie != "Tonks":
-            name_prefix = "Tonks {size=-20}\""
-            name_suffix = "\"{/size}"
-        else:
-            name_prefix = ""
-            name_suffix = ""
-
         if what:
-            character.tonks_say(what, who_prefix=name_prefix, who_suffix=name_suffix, **kwargs)
+            character.tonks_say(what, **kwargs)
 
         if temp_face:
             tonks.set_face(**last_face)

game/scripts/gui/_gui_.rpy

@@ -97,9 +97,9 @@ define gui.muted_color = "#88888844" # "#512800"
 define gui.hover_muted_color = "#ee770044" # "#7a3d00"
 
 # Fonts
-define gui.text_font = "gui/creamy_pumpkin_pie/fonts/creativeblock-bb.regular.ttf"
+define gui.text_font = "gui/CreativeBlockRegular.ttf"
-define gui.bold_font = "gui/creamy_pumpkin_pie/fonts/creativeblock-bb.bold.ttf"
+define gui.bold_font = "gui/CreativeBlockBold.ttf"
-define gui.glyph_font = "gui/creamy_pumpkin_pie/fonts/MaterialDesignIconsDesktop.ttf"
+define gui.glyph_font = "DejaVuSans.ttf"
 
 # Main and game menus
 define gui.main_menu_background = "main_menu"
@@ -139,7 +139,3 @@ define gui.slider_tile = False
 define gui.slider_borders = Borders(10, 10, 10, 10)
 
 define gui.unscrollable = "hide"
-
-style default:
-    font gui.text_font
-    color "#ffffff"