Kinetic text

* Fixed performance regression due to dynamic displayable in long text

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

@@ -78,7 +78,7 @@ label cc_gt_return:
 
     cho "[_gold]!" ("clench", "closed", "base", "mid")
     play sound "sounds/gulp.ogg"
-    gen "*Gulp*..." ("angry", xpos="far_left", ypos="head")
+    gen "{bounce}*Gulp*{/bounce}" ("angry", xpos="far_left", ypos="head")
     gen "Surely there must be some spare brooms around the castle." ("angry", xpos="far_left", ypos="head")
     cho "I assure you... Even the brooms provided for flying lessons are terrible." ("disgust", "narrow", "angry", "mid")
     gen "I'm sure they're fine..." ("base", xpos="far_left", ypos="head")

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

@@ -278,7 +278,7 @@ label hufflepuff_match:
     call her_chibi("stand", 300, 400, flip=True) # Temp Bugfix
     pause .5
 
-    her "Good Morning everyone, and welcome to the i-inaugural--" ("soft", "base", "worried", "mid", flip=True, xpos=290, ypos="base", trans=d3)
+    her "Good morning everyone, and welcome to the i-inaugural--" ("soft", "base", "worried", "mid", flip=True, xpos=290, ypos="base", trans=d3)
     her "" ("normal", "base", "worried", "mid")
     sna "Speak up girl! And would it kill you to enunciate?!" ("snape_03", ypos="head")
     her "*Grrr*" ("mad", "narrow", "angry", "R")
@@ -495,7 +495,7 @@ label hufflepuff_match:
             call gen_chibi("stand", 240, 400, flip=True)
             with d3
 
-            gen "But they'll never take away our freedom!" ("angry")
+            gen "But they'll never take away {shake}our freedom!{/shake}" ("angry")
 
             hide genie
             call quidditch_stands(crowd_react=[None, None, None], spotlight=False)
@@ -528,7 +528,7 @@ label hufflepuff_match:
             with d3
 
             nar "A confused murmur falls over the crowd."
-            gen "Ugh..." ("base")
+            gen "*Ugh*..." ("base")
 
             play sound "sounds/microphone_feedback.ogg"
             gen "Is this thing on?" ("base")
@@ -586,7 +586,7 @@ label hufflepuff_match:
     with d3
     pause .8
 
-    her "Ugh... thank you for that, professor Dumbledore..." ("soft", "narrow", "base", "R_soft", flip=True, xpos=290, ypos="base", trans=d3)
+    her "*Ugh*... Thank you for that, professor Dumbledore..." ("soft", "narrow", "base", "R_soft", flip=True, xpos=290, ypos="base", trans=d3)
     her "Now, to get this game underway!" ("open", "closed", "base", "mid")
 
     # Player introduction
@@ -619,7 +619,7 @@ label hufflepuff_match:
     with d3
     pause .1
 
-    her "*grrrrr*"
+    her "*Grrrrr*"
 
     call quidditch_stands(crowd_react=[None, None, None])
     with d3
@@ -672,7 +672,7 @@ label hufflepuff_match:
     qcr "START THE GAME! START THE GAME!"
     nar "Hermione's voice eventually gets drowned out by the growing restlessness of the crowd."
     her "" ("normal", "base", "base", "mid", xpos=290, ypos="base", flip=True)
-    her "Ugh, fine...{w=0.3} If everyone wants us to begin play without knowing {b}a single thing{/b}...{w=0.8} then that's {b}OK!{/b}" ("annoyed", "narrow", "annoyed", "R", trans=d3)
+    her "*Ugh*, fine...{w=0.3} If everyone wants us to begin play without knowing {b}a single thing{/b}...{w=0.8} then that's {b}OK!{/b}" ("annoyed", "narrow", "annoyed", "R", trans=d3)
     her "A good commentator knows when to accommodate for a crowd's impatience!" ("soft", "closed", "base", "mid")
     hide hermione_main
     with d3
@@ -722,7 +722,7 @@ label hufflepuff_match:
     call ctc
 
     her @ cheeks blush "" ("open", "wide", "worried", "shocked")
-    qcr "!!!" # [screenshake?]
+    qcr "{shudder}!!!{/shudder}" 
     play background "sounds/crowd.ogg" fadein 2
     mal "..."
     play sound "sounds/murmur.ogg"
@@ -868,7 +868,7 @@ label hufflepuff_match:
     with d3
 
     her "Oh no!" ("clench", "happyCl", "worried", "mid")
-    sna "{size=+4}HA-HA-HA-HA!!{/size}" ("snape_28", ypos="head")
+    sna "{shake}HA-HA-HA-HA!!{/shake}" ("snape_28", ypos="head")
     her "Somebody on the Ravenclaw team just got hit by a bludger!" ("open", "base", "worried", "L")
     gen "What an amazing turn of events!" ("grin", xpos="far_left", ypos="head")
     sna "See, I told you!" ("snape_22", ypos="head")
@@ -954,7 +954,7 @@ label hufflepuff_match:
     her "playing the game?" ("smile", "closed", "base", "mid")
     cho "The game is over, you dipstick!" ("scream", "narrow", "angry", "L")
     cho "" ("mad", "narrow", "angry", "L")
-    her "What? Already?" ("shock", "wide", "worried", "stare")
+    her "{shudder}What?{/shudder} Already?" ("shock", "wide", "worried", "stare")
     her "But who caught the Snitch?" ("open", "wide", "base", "stare")
     cho "" ("upset", "narrow", "angry", "L")
 
@@ -983,7 +983,6 @@ label hufflepuff_match:
     cho "" ("annoyed", "narrow", "angry", "L")
     her "Cho Chang managed to catch the snitch..." ("smile", "happyCl", "base", "mid")
     her "With the help of her ridiculously short skirt!" ("crooked_smile", "base", "angry", "mid")
-    #cho "{size=+10}!!!{/size}" ("clench", "closed", "angry", "mid")
     hide hermione_main
     with d3
     cho @ cheeks heavy_blush "" ("normal", "wide", "base", "L")

game/scripts/gui/_styles_.rpy

@@ -57,6 +57,9 @@ style bar:
     ysize gui.scrollbar_size
     base_bar Frame("scrollbar_horizontal_[prefix_]bar", gui.slider_borders, tile=gui.slider_tile)
     thumb Frame("scrollbar_horizontal_[prefix_]thumb", gui.slider_borders, tile=gui.slider_tile)
+    hover_sound "sounds/qubodup-hover1.ogg"
+    activate_sound "sounds/qubodup-click2.ogg"
+    mouse "button"
 
 # style vbar:
 #     unscrollable gui.unscrollable
@@ -69,12 +72,18 @@ style scrollbar:
     ysize gui.scrollbar_size
     base_bar Frame("scrollbar_horizontal_[prefix_]bar", gui.slider_borders, tile=gui.slider_tile)
     thumb Frame("scrollbar_horizontal_[prefix_]thumb", gui.slider_borders, tile=gui.slider_tile)
+    hover_sound "sounds/qubodup-hover1.ogg"
+    activate_sound "sounds/qubodup-click2.ogg"
+    mouse "button"
 
 style vscrollbar:
     unscrollable gui.unscrollable
     xsize gui.scrollbar_size
     base_bar Frame("scrollbar_vertical_[prefix_]bar", gui.slider_borders, tile=gui.slider_tile)
     thumb Frame("scrollbar_vertical_[prefix_]thumb", gui.slider_borders, tile=gui.slider_tile)
+    hover_sound "sounds/qubodup-hover1.ogg"
+    activate_sound "sounds/qubodup-click2.ogg"
+    mouse "button"
 
 # style dark_vscrollbar:
 #     unscrollable gui.unscrollable

game/scripts/gui/credits.rpy

@@ -34,9 +34,9 @@ define credits_images = [] # TODO: Add images once new chibis are in.
 #     (Transform("hj", zoom=2, crop=(225,200,200,235)), 25, 8, True),
 # )
 
-define credits_mods = "\n\n## Game Mods\n\n" + "\n\n".join(["### " + i[1]["Name"] + "\n- " + i[1]["Author"] for i in mods_list.items()]) if mods_list else ""
+define credits_mods = _("\n\n## Game Mods\n\n") + "\n\n".join(["### " + i[1]["Name"] + "\n- " + i[1]["Author"] for i in mods_list.items()]) if mods_list else ""
 
-define credits = credits.convert(f"""{{image=game_logo}}{{vspace=10}}
+define credits = credits.convert(_(f"""{{image=game_logo}}{{vspace=10}}
 ## Development Team
 
 ### Project Lead
@@ -101,7 +101,7 @@ define credits = credits.convert(f"""{{image=game_logo}}{{vspace=10}}
 - MedicBear
 - perniciousducks
 
-### Mirror of Erised 
+### Mirror of Erised
 ### Content Creators
 - Livvypoo
 - NotTera
@@ -172,6 +172,7 @@ define credits = credits.convert(f"""{{image=game_logo}}{{vspace=10}}
 - CaptainNemo
 - Darwin7
 - That one Disney employee
+- Johnny28
 
 ### Miscellaneous Sound Effects
 - LoafyLemon
@@ -202,7 +203,7 @@ define credits = credits.convert(f"""{{image=game_logo}}{{vspace=10}}
 ### Servers & Websites
 - LoafyLemon
 
-## {{hearts}}Special Thanks{{hearts}}
+## Special Thanks
 
 ### Akabur
 - The creator of the original Witch Trainer and other awesome games!
@@ -226,10 +227,10 @@ define credits = credits.convert(f"""{{image=game_logo}}{{vspace=10}}
 
 {{image=engine_logo}}
 ### Ren'Py Engine v[renpy.version_only]
-- [renpy.license!t]{{vspace=300}}
-
-# Thank you for playing!{{vspace=300}}
-""")
+- [renpy.license!t]
+{{vspace=400}}
+# Thank you for playing!{{vspace=400}}
+"""))
 
 style credits_header1:
     color "#ffffff"
@@ -266,6 +267,10 @@ style credits_you is credits_header1:
     size 48
     xoffset -240
 
+style credits_text:
+    color "#fff"
+    outlines [(2, "#000", 0, 0)]
+
 transform credits_scroll(duration):
     subpixel True
     yanchor 0.0
@@ -278,7 +283,7 @@ transform credits_scroll(duration):
     parallel:
         linear (duration - 1) ypos (config.screen_height)
     pause 7
-        
+
     linear 1.0 alpha 0.0
 
 transform credits_fade_image(start, duration):
@@ -292,7 +297,9 @@ screen credits():
     layer "interface"
     zorder 0
     modal True
-    
+    predict False
+    style_prefix "credits"
+
     default duration = 180
     default pauses = 13
 
@@ -315,9 +322,7 @@ screen credits():
         at credits_scroll(duration)
         xalign 0.5
         text_align 0.5 # Note: This is different from setting xalign inside the style.
-        color "#fff"
-        outlines [(2, "#000", 0, 0)]
 
     use player((0.025, 0.88))
 
-    timer duration+pauses action Hide("credits")
+    timer duration+pauses action [Hide("credits"), Function(achievements.unlock, "Credits")]

game/scripts/gui/misc.rpy

@@ -1,16 +1,5 @@
-#
-# Additional screens
-#
-
 init offset = -1
 
-# Confirm screen
-#
-# The confirm screen is called when Ren'Py wants to ask the player a yes or no
-# question.
-#
-# https://www.renpy.org/doc/html/screen_special.html#confirm
-
 screen confirm(message, yes_action=Return(True), no_action=Return(False)):
     modal True
     layer "interface"
@@ -23,13 +12,13 @@ screen confirm(message, yes_action=Return(True), no_action=Return(False)):
         at gui_modal_popup
 
         vbox:
-            text message
+            text message:
+                text_align 0.5
 
             hbox:
                 textbutton _("Yes") action yes_action
                 textbutton _("No") action no_action
 
-    ## Right-click and escape answer "no".
     key "game_menu" action no_action
 
 style confirm_frame is frame
@@ -43,13 +32,6 @@ style confirm_button_text is frame_button_text
 style confirm_text is frame_text:
     size 20
 
-# Skip indicator screen
-#
-# The skip_indicator screen is displayed to indicate that skipping is in
-# progress.
-#
-# https://www.renpy.org/doc/html/screen_special.html#skip-indicator
-
 screen skip_indicator():
     zorder 100
 
@@ -64,13 +46,6 @@ style skip_text is default:
     color "#fff"
     outlines [(1, "#00000080", 1, 0)]
 
-# Notify screen
-#
-# The notify screen is used to show the player a message. (For example, when
-# the game is quicksaved or a screenshot has been taken.)
-#
-# https://www.renpy.org/doc/html/screen_special.html#notify-screen
-
 screen notify(message):
     layer "interface"
     sensitive False
@@ -90,7 +65,6 @@ transform notify_appear:
     on hide:
         linear .5 alpha 0.0
 
-
 style notify_text is gui_text
 
 style notify_frame is empty:

game/scripts/gui/player.rpy

@@ -10,7 +10,7 @@ screen player(pos=(0.025, 0.2)):
     frame style "empty":
         pos pos
 
-        text "{bounce}Currently Playing{/bounce}"
+        text _("{bounce}Currently Playing{/bounce}")
         bar value AudioPositionValue() ypos 20
         text "[renpy.music.get_playing()!i]" style "player_text_title" ypos 40
 

game/scripts/gui/saves.rpy

@@ -47,7 +47,7 @@ screen file_slots(title):
                             action FileSave(i)
 
                         # FileSaveName sometimes returns an empty string regardless of 'empty' parameter. /shrugs
-                        $ file_name = (FileSaveName(i) or f"Slot {i}")
+                        $ file_name = (FileSaveName(i) or _(f"Slot {i}"))
                         text "[file_name]" style "file_description_text" ypos 2
 
                         vbox style "file_vbox":
@@ -58,7 +58,7 @@ screen file_slots(title):
                                 $ playtime = FileJson(i, "playtime", missing=0)
                                 $ minutes, seconds = divmod(int(playtime), 60)
                                 $ hours, minutes = divmod(minutes, 60)
-                                text f"Playtime: {hours}H {minutes}M {seconds}S" style "file_description_text"
+                                text _(f"Playtime: {hours}H {minutes}M {seconds}S") style "file_description_text"
 
 
     frame style "navigation_page_right":
@@ -93,7 +93,7 @@ screen file_slots(title):
                             action FileSave(i)
 
                         # FileSaveName sometimes returns an empty string regardless of 'empty' parameter. /shrugs
-                        $ file_name = (FileSaveName(i) or f"Slot {i}")
+                        $ file_name = (FileSaveName(i) or _(f"Slot {i}"))
                         text "[file_name]" style "file_description_text" ypos 2
 
                         vbox style "file_vbox":
@@ -104,7 +104,7 @@ screen file_slots(title):
                                 $ playtime = FileJson(i, "playtime", missing=0)
                                 $ minutes, seconds = divmod(int(playtime), 60)
                                 $ hours, minutes = divmod(minutes, 60)
-                                text f"Playtime: {hours}H {minutes}M {seconds}S" style "file_description_text"
+                                text _(f"Playtime: {hours}H {minutes}M {seconds}S") style "file_description_text"
 
 transform file_hover:
     on hover:

game/scripts/interface/achievements.rpy

@@ -243,7 +243,7 @@ screen achievements(xx, yy):
     zorder 15
     modal True
 
-    add "gui_fade"
+    # add "gui_fade"
 
     if renpy.mobile:
         use close_button_background

game/scripts/utility/text_tags.rpy

@@ -1,6 +1,8 @@
 # Custom text tags
 # https://www.renpy.org/doc/html/custom_text_tags.html
 
+image text_tag_hearts_image = Fixed(love_heart((15, 0), 12, 0.1), love_heart((20, -10), 6, 0.5), love_heart((10, 10), 6, 1), fit_first=True, xsize=32)
+
 init python:
     def convert_tags_to_kwargs(contents):
         kwargs = {"style": "what"}
@@ -26,6 +28,11 @@ init python:
 
         return kwargs
 
+    @renpy.pure
+    def text_tag_icon(tag, argument):
+        """Insert a unicode heart symbol. Usage {heart}"""
+        return [(renpy.TEXT_DISPLAYABLE, Transform(argument, xysize=(32, 32)))]
+
     @renpy.pure
     def text_tag_unicode(tag, argument, contents):
         """Render contents using a font that supports all/most Unicode characters. Usage {unicode}☺{/unicode}"""
@@ -40,7 +47,7 @@ init python:
     @renpy.pure
     def text_tag_hearts(tag, argument):
         """Insert multiple unicode heart symbols. Usage {hearts}"""
-        return [(renpy.TEXT_DISPLAYABLE, Fixed(love_heart((15, 0), 12, 0.1), love_heart((20, -10), 6, 0.5), love_heart((10, 10), 6, 1), fit_first=True, xsize=32))]
+        return [(renpy.TEXT_DISPLAYABLE, Transform("text_tag_hearts_image"))]
 
     @renpy.pure
     def text_tag_number(tag, argument):
@@ -271,6 +278,7 @@ define config.custom_text_tags = {
 }
 
 define config.self_closing_custom_text_tags = {
+    "icon": text_tag_icon,
     "heart": text_tag_heart,
     "hearts": text_tag_hearts,
     "number": text_tag_number,