New Textbox

* Implemented new textbox
* Implemented nickname handling for the namebox
* Implemented new reworked fonts
* Implemented PC parts of the textbox
* Recalculated sprite positions, offsets and zooms.

game/scripts/characters/astoria/common.rpy

@@ -83,8 +83,16 @@ 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, **kwargs)
+            character.astoria_say(what, who_prefix=name_prefix, who_suffix=name_suffix, **kwargs)
 
         if temp_face:
             astoria.set_face(**last_face)

game/scripts/characters/cho/common.rpy

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

game/scripts/characters/genie/vars.rpy

@@ -5,12 +5,12 @@ default states.gen.masturbating = False
 
 # Image states
 
-default states.gen.image.xpos = 200
+default states.gen.image.xpos = 0
 default states.gen.image.ypos = 0
-default states.gen.image.offset = (0, 600)
+default states.gen.image.offset = (0, 0)
 default states.gen.image.zorder = 15
 default states.gen.image.xzoom = 1
-default states.gen.image.zoom = 0.2
+default states.gen.image.zoom = 0.42
 
 # Event flags
 

game/scripts/characters/genie/wardrobe.rpy

@@ -5,6 +5,7 @@ init python:
         trans.zoom = states.gen.image.zoom
         trans.xzoom = states.gen.image.xzoom
         trans.offset = states.gen.image.offset
+        trans.anchor = (0.5, 1.0)
         return 0
 
 layeredimage genie_stats:

game/scripts/characters/hermione/common.rpy

@@ -76,8 +76,16 @@ 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, **kwargs)
+            character.hermione_say(what, who_prefix=name_prefix, who_suffix=name_suffix, **kwargs)
 
         if temp_face:
             hermione.set_face(**last_face)

game/scripts/characters/luna/common.rpy

@@ -79,8 +79,16 @@ 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, **kwargs)
+            character.luna_say(what, who_prefix=name_prefix, who_suffix=name_suffix, **kwargs)
 
         if temp_face:
             luna.set_face(**last_face)

game/scripts/characters/susan/common.rpy

@@ -78,8 +78,16 @@ 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, **kwargs)
+            character.susan_say(what, who_prefix=name_prefix, who_suffix=name_suffix, **kwargs)
 
         if temp_face:
             susan.set_face(**last_face)

game/scripts/characters/tonks/common.rpy

@@ -98,8 +98,16 @@ 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, **kwargs)
+            character.tonks_say(what, who_prefix=name_prefix, who_suffix=name_suffix, **kwargs)
 
         if temp_face:
             tonks.set_face(**last_face)

game/scripts/doll/main.rpy

@@ -70,7 +70,7 @@ init python:
 
             # Transform properties
             self.pos = (0, 0)
-            self.zoom = 0.5
+            self.zoom = 1.0
             self.xzoom = 1
 
             self.modpath = "mods/" + posixpath.normpath(modpath) if modpath else ""

game/scripts/doll/transforms.rpy

@@ -2,4 +2,4 @@ transform doll_transform(pos, zoom, xzoom):
     pos pos
     zoom zoom
     xzoom xzoom
-    #align align Need to recalculate base positions
+    align (0.5, 1.0)

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/CreativeBlockRegular.ttf"
-define gui.bold_font = "gui/CreativeBlockBold.ttf"
-define gui.glyph_font = "DejaVuSans.ttf"
+define gui.text_font = "gui/creamy_pumpkin_pie/fonts/creativeblock-bb.regular.ttf"
+define gui.bold_font = "gui/creamy_pumpkin_pie/fonts/creativeblock-bb.bold.ttf"
+define gui.glyph_font = "gui/creamy_pumpkin_pie/fonts/MaterialDesignIconsDesktop.ttf"
 
 # Main and game menus
 define gui.main_menu_background = "main_menu"
@@ -139,3 +139,7 @@ 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"

game/scripts/utility/dialogue.rpy

@@ -3,22 +3,21 @@
 
 define sprite_pos = {
     "x": {
-        "base": 640,
-        "default": 640,
-        "far_right": 650,
-        "mid": 300,
-        "left": 200,
-        "far_left": 25,
-        "right": 400,
-        "wardrobe": 540,
-        "close": 540
+        "base": 1480,
+        "default": 1480,
+        "far_right": 1490,
+        "mid": 1140,
+        "left": 1040,
+        "far_left": 250,
+        "right": 1240,
+        "close": 1380
     },
 
     "y": {
         "base": 0,
         "default": 0,
-        "head": 200,
-        "low": 170
+        "head": 900,
+        "low": 650
     }
 }