Merge remote-tracking branch 'origin/interface2' into kinetic_text

game/scripts/gui/credits.rpy

@@ -202,7 +202,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!
@@ -266,6 +266,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
@@ -292,6 +296,8 @@ screen credits():
     layer "interface"
     zorder 0
     modal True
+    predict False
+    style_prefix "credits"
     
     default duration = 180
     default pauses = 13
@@ -315,8 +321,6 @@ 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))
 

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"}
@@ -40,7 +42,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):