Bug fixes

* Fixed teleport animation issues
* Reimplemented and fixed 'centered' speaker
* Removed menu yalign params (obsolete)
* Reimplemented side image support for speakers
* Fixed selected item usable state for non-owned items in inventory

game/scripts/characters.rpy

@@ -71,3 +71,6 @@ define dum2 = Character("name_dumbledore_genie", show_side_image=Image("characte
 define dum3 = Character("name_dumbledore_genie", show_side_image=Image("characters/misc/dumbledore/dum_3.webp"), show_icon="dumbledore", dynamic=True)
 define dum4 = Character("name_dumbledore_genie", show_side_image=Image("characters/misc/dumbledore/dum_4.webp"), show_icon="dumbledore", dynamic=True)
 define dum5 = Character("name_dumbledore_genie", show_side_image=Image("characters/misc/dumbledore/dum_5.webp"), show_icon="dumbledore", dynamic=True)
+
+define centered = Character(None, window_style="centered_window", statement_name="say-centered", screen="say_centered")
+# define vcentered = Character(None, what_style="centered_vtext", window_style="centered_window", statement_name="say-centered", screen="say_centered") # Not in use, kept for reference

game/scripts/characters/astoria/events/spells/imperio_tonks.rpy

@@ -1709,7 +1709,7 @@ label ag_st_imperio_E5:
             ton "I..." ("open", "base", "worried", "down")
             gen "Say it!" ("angry", xpos="far_left", ypos="head")
 
-            menu (menu_yalign=0.7):
+            menu:
                 "\"You're a selfish slut!\"":
                     ton @ hair horny "Yes!" ("mad", "wide", "shocked", "stare")
                     ton @ hair horny "I'm a selfish slut!" ("open_wide_tongue", "closed", "worried", "mid")

game/scripts/characters/cho/events/intro.rpy

@@ -336,7 +336,7 @@ label cho_intro_E1:
         call blkfade
         pause 2
 
-        centered "{size=+7}{color=#cbcbcb}Some time later...{/color}{/size}"
+        centered "Some time later..."
 
         pause 1
         call hide_blkfade

game/scripts/characters/cho/events/quidditch/hufflepuff_match.rpy

@@ -146,7 +146,7 @@ label hufflepuff_match:
     nar "Amazed... by the sight, Snape then leads you to the base of one of the towers."
 
     # Pitch entrance
-    centered "{size=+7}{color=#cbcbcb}At the Quidditch pitch...{/color}{/size}"
+    centered "At the Quidditch pitch..."
 
     call room("quidditch_pitch")
     play background "sounds/outskirts.ogg" fadein 2
@@ -722,7 +722,7 @@ label hufflepuff_match:
     call ctc
 
     her @ cheeks blush "" ("open", "wide", "worried", "shocked")
-    qcr "{shudder}!!!{/shudder}" 
+    qcr "{shudder}!!!{/shudder}"
     play background "sounds/crowd.ogg" fadein 2
     mal "..."
     play sound "sounds/murmur.ogg"

game/scripts/characters/cho/events/quidditch/intros.rpy

@@ -200,7 +200,7 @@ label cho_quid_E2:
 
     if len(__chosen1) < 3: # needed because of the bld
         call bld
-        menu (menu_yalign=.8):
+        menu:
             set __chosen1
             gen "Could you..." ("base", xpos="far_left", ypos="head")
             "\"Fly in front of me.\"":
@@ -1315,7 +1315,7 @@ label cho_quid_E12:
     show screen blkfade
     with d5
 
-    centered "{size=+7}{color=#cbcbcb}A few moments later...{/color}{/size}"
+    centered "A few moments later..."
 
     call gen_chibi(flip=False)
     hide screen blkfade

game/scripts/characters/cho/events/quidditch/retrospection.rpy

@@ -137,7 +137,7 @@ label cho_quid_E14_retrospection:
     show screen blkfade
     with d5
 
-    centered "{size=+7}{color=#cbcbcb}Few minutes into the game...{/color}{/size}"
+    centered "Few minutes into the game..."
 
     hide screen blkfade
     call gryffindor_match.introspection3

game/scripts/characters/cho/events/quidditch/slytherin_match.rpy

@@ -192,7 +192,7 @@ label slytherin_match:
     nar "You find Snape waiting for you at the entrance of the Quidditch pitch towers."
 
     # Pitch entrance
-    #centered "{size=+7}{color=#cbcbcb}At the Quidditch pitch...{/color}{/size}"
+    #centered "At the Quidditch pitch..."
 
     #TODO Weather effects:
     # Scene Cloudy/rainy pitch
@@ -666,7 +666,7 @@ label slytherin_match:
     show screen blkfade
     with d1
 
-    centered "{size=+7}{color=#cbcbcb}-\{Intermission\}-{/color}{/size}\n{size=-2}{color=#686868}Please stand by{/color}{/size}{w=5.0}{nw}"
+    centered "-\{Intermission\}-\n{size=-16}{color=#686868}Please stand by{/color}{/size}{w=5.0}{nw}"
 
     stop music fadeout 1
     pause .5
@@ -719,7 +719,7 @@ label slytherin_match:
             sna "{size=-4}10 points to Slytherin.{/size}" ("snape_38")
             $ states.env.slytherin += 10
             gen "Did you say something--" ("base", xpos="far_left", ypos="head")
-            
+
 
     ton @ hair angry "{shudder}Quiet!{/shudder}" ("mad", "base", "angry", "L")
     gen "..." ("base", xpos="far_left", ypos="head")
@@ -1345,7 +1345,7 @@ label slytherin_match:
     stop background fadeout 4
     stop music fadeout 2
 
-    centered "{size=+7}{color=#cbcbcb}After the game...{/color}{/size}"
+    centered "After the game..."
 
     hide screen blkfade
     with d5
@@ -1602,7 +1602,7 @@ label slytherin_match_return:
         ton "I tried to!" ("upset", "base", "worried", "mid")
         ton "You pretty much pushed me onto the podium when I got back..." ("open", "base", "worried", "mid")
         gen "Oh, yeah..." ("base", xpos="far_left", ypos="head")
-        ton "Would you like a show?" ("base", "wide", "annoyed", "mid")    
+        ton "Would you like a show?" ("base", "wide", "annoyed", "mid")
         gen "What kind of show are we--" ("base", xpos="far_left", ypos="head")
 
     else:

game/scripts/characters/cho/events/quidditch/training.rpy

@@ -412,7 +412,7 @@ label cho_tactics:
     scene onlayer dolls
     call bld
 
-    menu (menu_yalign=.74):
+    menu:
         gen "(What directions should I give her?)" ("base", xpos="far_left", ypos="head")
         "\"Fly in front of me.\"" if states.cho.ev.quidditch.position != "front":
             jump cho_tactics.change_front

game/scripts/characters/cho/events/requests/manipulate_boys.rpy

@@ -957,7 +957,7 @@ label cc_pr_manipulate_boys_twins_branch:
 
     call blkfade
     stop music fadeout 1
-    centered "{size=+7}{color=#cbcbcb}{cps=7}...{/cps}{/color}{/size}{w=1.0}{nw}"
+    centered "{cps=2}...{/cps}{w=1.0}{nw}"
     call room("clothing_store")
     play music "music/clothing_store.ogg" fadein 1 if_changed
     call hide_blkfade

game/scripts/characters/hermione/events/tentacles.rpy

@@ -179,7 +179,7 @@ label tentacle_scene_intro:
     stop music fadeout 3.0
     show screen blkfade
     with d5
-    centered "{size=+7}{color=#cbcbcb}A few moments later...{/color}{/size}"
+    centered "A few moments later..."
     call gen_chibi("hide")
     $ desk_OBJ.foreground = "letter_and_plant_on_desk"
     hide screen blkfade
@@ -251,7 +251,7 @@ label tentacle_scene_intro:
     pause 1.5
     play sound "sounds/door.ogg"
     pause 1
-    centered "{size=+7}{color=#cbcbcb}Herbology{/color}{/size}"
+    centered "Herbology"
     pause 1
 
     play music "music/hidden-agenda-by-kevin-macleod.ogg" fadein 1 if_changed

game/scripts/characters/luna/events/favors/inspect_her_body.rpy

@@ -1175,7 +1175,7 @@ label ll_pf_inspect_T2_E3_intro:
     hide luna_main
     hide cg
 
-    centered "{size=+7}{color=#cbcbcb}Some time later...{/color}{/size}"
+    centered "Some time later..."
 
     call lun_chibi("stand", "desk", "base")
     hide screen blkfade
@@ -1437,7 +1437,7 @@ label ll_pf_inspect_T2_E4_repeat:
     nar "Luna, completely exhausted, slumps onto your desk once again."
     nar "You pull your chair back to give her some space."
 
-    centered "{size=+7}{color=#cbcbcb}Some time later...{/color}{/size}"
+    centered "Some time later..."
 
     call lun_chibi("stand", "desk", "base")
 

game/scripts/characters/luna/events/favors/masturbate_for_me.rpy

@@ -546,7 +546,7 @@ label ll_pf_masturbate_T3_E2_intro:
     nar "Luna slowly pulls her finger out and shudders slightly..."
     nar "She looks at her fingers, which glisten in the light, with a relieved expression on her face..."
 
-    centered "{size=+7}{color=#cbcbcb}Some time later...{/color}{/size}"
+    centered "Some time later..."
 
     # End of masturbate section
 
@@ -741,7 +741,7 @@ label ll_pf_masturbate_T3_E3_intro:
     nar "Luna takes her fingers out, and looks up at you with a happy smile spread across her face..."
     gen "Well done [name_luna_genie]."
 
-    centered "{size=+7}{color=#cbcbcb}Some time later...{/color}{/size}"
+    centered "Some time later..."
 
     # End of masturbate section
 

game/scripts/characters/luna/events/intro.rpy

@@ -239,7 +239,7 @@ label luna_intro_E1:
             gen "Uh-oh..." ("base", xpos="far_left", ypos="head")
             call blkfade
             hide pentogram onlayer screens
-            centered "{size=+7}{color=#cbcbcb}20 minutes later...{/color}{/size}"
+            centered "20 minutes later..."
 
             gen "*Ha-ha*... Good one! Alright, talk to you later, Beelzebub!" ("grin", xpos="far_left", ypos="head")
             "Beelzebub" "Ah, don't be so formal, just call me Bub."
@@ -683,7 +683,7 @@ label luna_intro_E2:
             lun "I'm sorry, sir?" ("upset", "narrow", "base", "mid")
             gen "{bounce}*Sigh*{/bounce} I'm talking about the four-dimensional space, {size=-1}a mathematical{/size} {size=-2}extension of the concept{/size} {size=-3}of three-dimensional or 3D space.{/size} {size=-5}Three-dimensional space{/size}{size=-7} is the simplest possible abstraction of the observation that one only needs three numbers, called dimensions, to describe the sizes or locations of objects in the everyday world.{/size}{size=-10}For example, the volume of a rectangular box is found by measuring and multiplying its length, width, and height (often labeled x, y, and z)...{/size}" ("base", xpos="far_left", ypos="head")
             call blkfade
-            centered "{size=+7}{color=#cbcbcb}5 minutes later...{/color}{/size}"
+            centered "5 minutes later..."
             call hide_blkfade
             gen "...and this is how your glasses work, right?" ("base", xpos="far_left", ypos="head")
             lun "I... Maybe?" ("angry", "narrow", "base", "down") # Puzzled

game/scripts/events/ending.rpy

@@ -308,7 +308,7 @@ label ball_ending_E1:
     stop weather
 
     # Outskirts of Hogwarts
-    centered "{size=+7}{color=#cbcbcb}Outskirts of Hogwarts{/color}{/size}"
+    centered "Outskirts of Hogwarts"
 
     play background "sounds/night.ogg" fadein 1
 
@@ -347,21 +347,20 @@ label ball_ending_E1:
 
         play music "music/Plaint.ogg" fadein 1 fadeout 1 #SAD CREDITS MUSIC. if_changed
 
-        centered """{size=+7}{color=#cbcbcb}Congratulations on completing the game!{/color}{/size}\n\n
+        centered "Congratulations on completing the game!\n\n{size=-16}This is ending \"00\" out of \"02\".{/size}{#LINT_IGNORE}"
-                {size=+5}{color=#cbcbcb}This is ending \"00\" out of \"02\".{/color}{/size}{#LINT_IGNORE}"""
 
-        centered "{size=+7}{color=#cbcbcb}Thank you for playing!{/color}{/size}\n\n{#LINT_IGNORE}"
+        centered "Thank you for playing!\n\n{#LINT_IGNORE}"
 
         play sound "sounds/scratch.ogg"
         stop music
         with hpunch
         gen "Wait, I'm still here!" ("angry", xpos="far_left", ypos="head")
 
-        centered "{size=+7}{color=#cbcbcb}WHAT?!{/color}{/size}"
+        centered "WHAT?!"
 
         gen "I said I am still here, dammit!" ("angry", xpos="far_left", ypos="head")
 
-        centered "{size=+7}{color=#cbcbcb}Oh... :({/color}{/size}{#LINT_IGNORE}"
+        centered "Oh... :({#LINT_IGNORE}"
 
         show her_ball outskirts -m1 as cg
         hide screen blkfade
@@ -381,7 +380,7 @@ label ball_ending_E1:
 
     if not persistent.game_complete:
         # First play-through
-        centered "{size=+7}{color=#cbcbcb}Fine whatever...{/color}{/size}"
+        centered "Fine whatever..."
 
     jump ball_ending_E2
 
@@ -392,7 +391,7 @@ label ball_ending_E2:
     call blkfade
     play music "music/court-of-the-queen-by-kevin-macleod.ogg" fadein 1 fadeout 1 if_changed
 
-    centered "{size=+7}{color=#cbcbcb}The Annual Hogwarts Autumn Ball{/color}{/size}"
+    centered "The Annual Hogwarts Autumn Ball"
 
     # Scene Setup
     $ states.env.daytime = True
@@ -2642,7 +2641,7 @@ label ball_ending_E2:
     pause 1
     stop music fadeout 1.0
 
-    centered "{size=+7}{color=#cbcbcb}Outskirts of Hogwarts{/color}{/size}"
+    centered "Outskirts of Hogwarts"
 
     $ states.env.daytime = False
 
@@ -2704,9 +2703,9 @@ label ball_ending_E2:
     stop background fadeout 1.0
 
     if "public" in states.her.ev.yule_ball.variant:
-        centered "{size=+7}{color=#cbcbcb}Congratulations on completing the game!{/color}{/size}\n\n{color=#cbcbcb}This is one of two possible endings (public whore){/color}"
+        centered "Congratulations on completing the game!\n\n{size=-16}This is one of two possible endings (public whore){/size}"
     else:
-        centered "{size=+7}{color=#cbcbcb}Congratulations on completing the game!{/color}{/size}\n\n{color=#cbcbcb}This is one of two possible endings (personal whore){/color}"
+        centered "Congratulations on completing the game!\n\n{size=-16}This is one of two possible endings (personal whore){/size}"
 
     show screen blkfade
     with d7
@@ -2717,7 +2716,7 @@ label ball_ending_E2:
     pause.5
 
     # Dumbledore is back at Hogwarts
-    centered "{size=+7}{color=#cbcbcb}The next morning...{/color}{/size}"
+    centered "The next morning..."
 
     $ states.env.daytime = True
 
@@ -2875,7 +2874,7 @@ Farewell, my little [word_03].{/size}
 
     play sound "sounds/win2.ogg"
 
-    centered "{color=#cbcbcb}This concludes the original Witch Trainer ending{fast}\n\n{size=+7}-\{Thank you for playing!\}-{/size}{/color}"
+    centered "{size=-16}This concludes the original Witch Trainer ending{/size}{fast}\n\n{size=+7}-\{Thank you for playing!\}-{/size}"
 
     pause 2
 

game/scripts/events/ending_after.rpy

@@ -10,7 +10,7 @@ label ending_after:
 
     $ renpy.scene("screens")
 
-    centered "{size=+7}{color=#cbcbcb}Somewhere outside of time and space...{/color}{/size}\n\n{#LINT_IGNORE}"
+    centered "Somewhere outside of time and space...\n\n{#LINT_IGNORE}"
     play music "music/epic-unease-by-kevin-macleod.ogg" fadein 1 fadeout 1 if_changed # noloop
     pause 3
     g2 "Where... where am I...?" with d5
@@ -193,7 +193,7 @@ label ending_after:
                 $ states.env.daytime = True
                 call music_block
 
-                centered "{size=+7}{color=#cbcbcb}The next morning...{/color}{/size}"
+                centered "The next morning..."
                 call hide_blkfade
 
                 # Snape enters and walks up to desk

game/scripts/events/labels.rpy

@@ -144,7 +144,7 @@ label teleport(position=None,effect=True,poof_label=None):
         hide screen blkfade
         show heal_ani onlayer screens zorder teleport_zorder:
             anchor (0.5, 1.0)
-            pos teleport_pos
+            pos (teleport_xpos, teleport_ypos)
             zoom 0.5
         with d3
 
@@ -155,11 +155,11 @@ label teleport(position=None,effect=True,poof_label=None):
         call expression poof_label
     show teleport_ani onlayer screens zorder teleport_zorder:
         anchor (0.5, 0.7)
-        pos teleport_pos
+        pos (teleport_xpos, teleport_ypos)
         zoom 0.5
     with d5
 
-    hide teleport_animation onlayer screens
+    hide teleport_ani onlayer screens
     with d5
 
     if effect == True:
@@ -172,4 +172,4 @@ default hermione_action = None
 
 label set_her_action(action=None, update=None):
     $ hermione_action = action
-    return
+    return

game/scripts/events/map.rpy

@@ -170,7 +170,7 @@ label gryffindor_dormitories:
     show screen blkfade
     with d5
 
-    centered "{size=+7}{color=#cbcbcb}Gryffindor's Dormitory{/color}{/size}"
+    centered "Gryffindor's Dormitory"
 
     menu:
         "-Search the area-":#Cat Hair
@@ -195,7 +195,7 @@ label ravenclaw_dormitories:
     show screen blkfade
     with d5
 
-    centered "{size=+7}{color=#cbcbcb}Ravenclaw's Dormitory{/color}{/size}"
+    centered "Ravenclaw's Dormitory"
 
     menu:
         "-Search the area-":#Luna's Hair
@@ -259,7 +259,7 @@ label outskirts_of_hogwarts:
 
     stop music fadeout 1.0
 
-    centered "{size=+7}{color=#cbcbcb}Outskirts of Hogwarts{/color}{/size}"
+    centered "Outskirts of Hogwarts"
 
     $ renpy.scene("screens")
 

game/scripts/gui/say.rpy

@@ -23,7 +23,7 @@ screen nvl(dialogue, items=None):
 
 #     config.all_character_callbacks.append(next_who)
 
-screen say(who, what, side_doll=None, icon=None):
+screen say(who, what, side_doll=None, side_image=None, icon=None):
     style_prefix "say"
     layer "interface"
     zorder 0
@@ -65,9 +65,23 @@ screen say(who, what, side_doll=None, icon=None):
 
     if side_doll:
         add side_doll
+    elif side_image: # Compat
+        add side_image zoom 0.5 align (0.0, 1.0) xoffset 16
     else:
         add SideImage()
 
+screen say_centered(who, what, icon=None):
+    style_prefix "say"
+    layer "interface"
+    zorder 0
+
+    window:
+        id "textbox"
+        xfill True
+        yfill True
+
+        text what id "what" style "what_centered"
+
 screen hider():
     if states.settings.interface_hidden:
         button action ToggleVariable("states.settings.interface_hidden", True, False) style "empty"
@@ -124,6 +138,14 @@ style what:
     size 24
     justify True
 
+style what_centered:
+    align (0.5, 0.5)
+    text_align 0.5
+    color "#fff"
+    outlines [(2, "#000000", 1, 1)]
+    hinting "bytecode"
+    size 48
+
 style namebox:
     ysize 22 # Halved due to oversampling
     padding (32, 0, 32, 0)

game/scripts/interface/inventory.rpy

@@ -56,6 +56,7 @@ screen inventory():
 
                 textbutton selected_item.caption:
                     if inventory_mode==0:
+                        sensitive selected_item.owned
                         action [selected_item.use, renpy.restart_interaction]
                     elif inventory_mode==1:
                         action Return(selected_item)

game/scripts/interface/letter.rpy

@@ -209,7 +209,7 @@ label letter(text, lbl):
     show screen letter(text)
     with d3
 
-    menu (menu_yalign=.9):
+    menu:
         "-Done reading-":
             pass