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

game/scripts/gui/_styles_.rpy

@@ -64,17 +64,17 @@ style bar:
 #     base_bar "scrollbar_horizontal_[prefix_]bar" #Frame("scrollbar_vertical_[prefix_]bar", gui.slider_borders, tile=gui.slider_tile)
 #     thumb "scrollbar_vertical_[prefix_]thumb" #Frame("scrollbar_vertical_[prefix_]thumb", gui.slider_borders, tile=gui.slider_tile)
 
-# style scrollbar:
-#     unscrollable gui.unscrollable
-#     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)
+style scrollbar:
+    unscrollable gui.unscrollable
+    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)
 
-# 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)
+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)
 
 # style dark_vscrollbar:
 #     unscrollable gui.unscrollable

game/scripts/gui/about.rpy

@@ -1,59 +0,0 @@
-## About screen ################################################################
-##
-## This screen gives credit and copyright information about the game and Ren'Py.
-##
-## There's nothing special about this screen, and hence it also serves as an
-## example of how to make a custom screen.
-
-init offset = -1
-
-# Not in use
-screen about():
-
-    tag menu
-
-    ## This use statement includes the game_menu screen inside this one. The
-    ## vbox child is then included inside the viewport inside the game_menu
-    ## screen.
-    use game_menu(_("About"), scroll="viewport"):
-
-        style_prefix gui.theme("about")
-
-        vbox:
-            spacing gui.pref_spacing
-
-            if config.window_title:
-                label "[config.window_title]"
-            else:
-                label "[config.name!t]"
-            #text _("Version [config.version!t]\n")
-
-            ## gui.about is usually set in options.rpy.
-            if gui.about:
-                text "[gui.about!t]\n"
-
-            text _("Made with {a=https://www.renpy.org/}Ren'Py{/a} [renpy.version_only].\n\n[renpy.license!t]") size 12
-
-
-style about_label is gui_label
-style about_label_text is gui_label_text
-style dark_about_label_text is dark_label_text
-style light_about_label_text is light_label_text
-
-style about_text is gui_text
-style dark_about_text is dark_gui_text
-style light_about_text is light_gui_text
-
-style smallcredits is about_text:
-    color '#000'
-    size 14
-    kerning 0.7
-
-style about_name is about_text:
-    font gui.bold_font
-    color "#f9a001"
-    outlines [(2, "#000", 0, 0)]
-
-define gui.about = """{b}Witch Trainer: Silver{/b} is a complete rework of the popular game known as Witch Trainer.
-
-The mod is developed by {a=https://www.silverstudiogames.com/}Silver Studio Games{/a} -- a group of people from around the world who work on this project in their free time."""

game/scripts/gui/help.rpy

@@ -4,34 +4,34 @@ init offset = -1
 screen help(page='tutorials'):
     tag menu
 
-    use game_menu(_("Help"), scroll="viewport"):
+    # use game_menu(_("Help"), scroll="viewport"):
 
-        style_prefix "help"
+    #     style_prefix "help"
 
-        vbox:
-            spacing 8
-            null # Tab margin
+    #     vbox:
+    #         spacing 8
+    #         null # Tab margin
 
-            if page == 'tutorials':
-                use tutorials_help
-            elif page == "controls":
-                use controls_help
-            elif page == "gamepad":
-                use gamepad_help
-            elif page == "about":
-                use about_help
+    #         if page == 'tutorials':
+    #             use tutorials_help
+    #         elif page == "controls":
+    #             use controls_help
+    #         elif page == "gamepad":
+    #             use gamepad_help
+    #         elif page == "about":
+    #             use about_help
 
-    hbox:
-        style_prefix gui.theme("tab")
-        pos (25 + 15, 100)
-        yanchor 0.5
+    # hbox:
+    #     style_prefix gui.theme("tab")
+    #     pos (25 + 15, 100)
+    #     yanchor 0.5
 
-        textbutton _("Tutorials") action [SelectedIf(page == 'tutorials'), Show("help", config.intra_transition, "tutorials")]
-        if not renpy.mobile:
-            textbutton _("Controls") action [SelectedIf(page == 'controls'), Show("help", config.intra_transition, "controls")]
-        if GamepadExists():
-            textbutton _("Gamepad") action [SelectedIf(page == 'gamepad'), Show("help", config.intra_transition, "gamepad")]
-        textbutton _("About") action [SelectedIf(page == 'about'), Show("help", config.intra_transition, "about")]
+    #     textbutton _("Tutorials") action [SelectedIf(page == 'tutorials'), Show("help", config.intra_transition, "tutorials")]
+    #     if not renpy.mobile:
+    #         textbutton _("Controls") action [SelectedIf(page == 'controls'), Show("help", config.intra_transition, "controls")]
+    #     if GamepadExists():
+    #         textbutton _("Gamepad") action [SelectedIf(page == 'gamepad'), Show("help", config.intra_transition, "gamepad")]
+    #     textbutton _("About") action [SelectedIf(page == 'about'), Show("help", config.intra_transition, "about")]
 
 screen tutorials_help():
     for entry, tutorial in tutorial_dict.items():

game/scripts/gui/history.rpy

@@ -16,47 +16,47 @@ screen history():
     # Avoid predicting this screen, as it can be very large
     predict False
 
-    use game_menu(_("History"), scroll=("vpgrid" if gui.history_height else "viewport"), yinitial=1.0):
+    # use game_menu(_("History"), scroll=("vpgrid" if gui.history_height else "viewport"), yinitial=1.0):
 
-        style_prefix gui.theme("history")
+    #     style_prefix gui.theme("history")
 
-        has vbox
-        spacing 12
+    #     has vbox
+    #     spacing 12
 
-        default last_who = ""
+    #     default last_who = ""
 
-        for entry in _history_list:
-            vbox:
-                xfill True
-                spacing 12
+    #     for entry in _history_list:
+    #         vbox:
+    #             xfill True
+    #             spacing 12
 
-                if not last_who == entry.who:
-                    hbox:
-                        spacing 12
+    #             if not last_who == entry.who:
+    #                 hbox:
+    #                     spacing 12
 
-                        if "icon" in entry.show_args:
-                            $ icon = entry.show_args["icon"]
-                            add Fixed(gui.format("interface/achievements/{}/iconbox.webp"), Transform(f"interface/icons/head/{icon}.webp", xzoom=-1, size=(40, 40), align=(0.5, 0.5)), fit_first=True)
+    #                     if "icon" in entry.show_args:
+    #                         $ icon = entry.show_args["icon"]
+    #                         add Fixed(gui.format("interface/achievements/{}/iconbox.webp"), Transform(f"interface/icons/head/{icon}.webp", xzoom=-1, size=(40, 40), align=(0.5, 0.5)), fit_first=True)
 
-                        if entry.who:
-                            text entry.who:
-                                style "history_name"
-                                substitute False
+    #                     if entry.who:
+    #                         text entry.who:
+    #                             style "history_name"
+    #                             substitute False
 
-                                if "color" in entry.who_args:
-                                    color entry.who_args["color"]
+    #                             if "color" in entry.who_args:
+    #                                 color entry.who_args["color"]
 
-                vbox:
-                    spacing 6
-                    $ what = renpy.filter_text_tags(entry.what, allow=gui.history_allow_tags)
+    #             vbox:
+    #                 spacing 6
+    #                 $ what = renpy.filter_text_tags(entry.what, allow=gui.history_allow_tags)
 
-                    text what:
-                        substitute False
+    #                 text what:
+    #                     substitute False
 
-            $ last_who = entry.who
+    #         $ last_who = entry.who
 
-        if not _history_list:
-            label _("The dialogue history is empty.")
+    #     if not _history_list:
+    #         label _("The dialogue history is empty.")
 
 
 # Tags that are allowed to be displayed on the history screen

game/scripts/gui/player.rpy

@@ -0,0 +1,37 @@
+init offset = -1
+
+screen player(pos=(0.025, 0.2)):
+    layer "interface"
+    zorder 8
+
+    style_prefix "player"
+
+    # Note: We cannot use a VBOX here because it breaks with bouncing text.
+    frame style "empty":
+        pos pos
+
+        text "{bounce}Currently Playing{/bounce}"
+        bar value AudioPositionValue() ypos 20
+        text "[renpy.music.get_playing()!i]" style "player_text_title" ypos 40
+
+style player_vbox:
+    xfill False
+    yfill False
+    fit_first False
+    ysize 100
+    yspacing 0
+
+style player_text:
+    color "#fff"
+    outlines [(2, "#000000", 1, 1)]
+    hinting "bytecode"
+    size 24
+
+style player_text_title is player_text:
+    size 10
+
+style player_bar is empty:
+    xmaximum 280
+    ysize 20
+    left_bar Frame(Image("gui/creamy_pumpkin_pie/player/player_bar_full.png", oversample=4), tile=False)
+    right_bar Frame(Image("gui/creamy_pumpkin_pie/player/player_bar_empty.png", oversample=4), tile=False)

game/scripts/interface/gameover.rpy

@@ -40,32 +40,32 @@ label gameover(fake=False, autohide=True):
         hide screen gameover
     return
 
-define fake_credits_text = "\n".join([
-    "{image=images/logo/title.webp}{vspace=200}",
-    credits_title("Director"),
-    credits_group("The Orchestrator of Sex"),
-    credits_title("Artists"),
-    credits_group("A Professional Pervert", "The Purveyor of Pencils", "The Deviant Drawer", "A Painter of Filth"),
-    credits_title("Writers"),
-    credits_group("The Scribbler of smut", "The Lore keeper of Whores"),
-    credits_title("Programmers"),
-    credits_group("The Engineer of ecstasy", "A Tits Techie", "A guy that gets erect from calculator spelling boobs"),
-    credits_title("Music"),
-    credits_group(
-        "Happy Rooster OST\n{size=-5}{color=#808080}{k=0.7}\"Shanghai Honey\"\n\"Introducing Colin\"{/k}{/color}{/size}\n",
-        "Music Dude#1\n{size=-5}{color=#808080}{k=0.7}\"Anguish\"\n\"Awkward Meeting\"\n\"Brittle Rille\"\n\"Chipper Doodle v2\"\n\"Dark Fog\"\n\"Despair\"\n\"Game Over Theme\"\n\"Boss Theme\"\n\"Hitman\"\n\"Music for Manatees\"\n\"Plaint\"\n\"Fuzzball Parade\"\n\"Teddy Bear Waltz\"\n\"Scheming Weasel (Slower version)\"\n\"Open Those Bright Eyes\"{/k}{/color}{/size}\n",
-        "Music Dude#2\n{size=-5}{color=#808080}{k=0.7}\"Under-the-radar\"{/k}{/color}{/size}\n",
-        "Music Dude#3\n{size=-5}{color=#808080}{k=0.7}\"Playful Tension (Orchestral)\"{/k}{/color}{/size}\n",
-        "Music Dude#4\n{size=-5}{color=#808080}{k=0.7}\"Item Shop\"{/k}{/color}{/size}\n",
-        "Music Dude#5\n{size=-5}{color=#808080}{k=0.7}\"Grape Soda is Fucking Raw\"{/k}{/color}{/size}\n",
-        "Music Dude#5\n{size=-5}{color=#808080}{k=0.7}Retro Game Music Pack:\n\"Title Screen\"\n\"Level 1\"\n\"Level 3\"{/k}{/color}{/size}"
-    ),
-    credits_title("Special Thanks"),
-    credits_group("{size=+4}Pervert#1{/size}\n{color=#808080}{size=-5}{k=0.7}Creator of the original Witch Trainer and other awesome games! {a=https://www.patreon.com/akabur}PATREON{/a}{/size}{/color}\n{/k}", "Pervert#2", "Pervert#3", "Pervert#4", "Pervert#5", "Pervert#6", "Pervert#7", "Pervert#8", "Pervert#9", "Pervert#10", "Pervert#11", "Pervert#12", "Pervert#13", "Pervert#14", "Pervert#15", "Pervert#16", "Pervert#17", "Pervert#18", "Pervert#19", "Pervert#20", "Pervert#21"),
-    "\nSpecial thanks to our pervs, discord perverators and {a=https://www.patreon.com/SilverStudioGames/}perverted supporters{/a} {image=images/misc/heart.webp}\n\n",
-    "{image=images/logo/silverstudiogames.webp}\n"
-    "\n{space=220}{image=characters/genie/mage9.webp}{rb}{space=-60}Thanks for cumin!{/rb}"
-])
+# define fake_credits_text = "\n".join([
+#     "{image=images/logo/title.webp}{vspace=200}",
+#     credits_title("Director"),
+#     credits_group("The Orchestrator of Sex"),
+#     credits_title("Artists"),
+#     credits_group("A Professional Pervert", "The Purveyor of Pencils", "The Deviant Drawer", "A Painter of Filth"),
+#     credits_title("Writers"),
+#     credits_group("The Scribbler of smut", "The Lore keeper of Whores"),
+#     credits_title("Programmers"),
+#     credits_group("The Engineer of ecstasy", "A Tits Techie", "A guy that gets erect from calculator spelling boobs"),
+#     credits_title("Music"),
+#     credits_group(
+#         "Happy Rooster OST\n{size=-5}{color=#808080}{k=0.7}\"Shanghai Honey\"\n\"Introducing Colin\"{/k}{/color}{/size}\n",
+#         "Music Dude#1\n{size=-5}{color=#808080}{k=0.7}\"Anguish\"\n\"Awkward Meeting\"\n\"Brittle Rille\"\n\"Chipper Doodle v2\"\n\"Dark Fog\"\n\"Despair\"\n\"Game Over Theme\"\n\"Boss Theme\"\n\"Hitman\"\n\"Music for Manatees\"\n\"Plaint\"\n\"Fuzzball Parade\"\n\"Teddy Bear Waltz\"\n\"Scheming Weasel (Slower version)\"\n\"Open Those Bright Eyes\"{/k}{/color}{/size}\n",
+#         "Music Dude#2\n{size=-5}{color=#808080}{k=0.7}\"Under-the-radar\"{/k}{/color}{/size}\n",
+#         "Music Dude#3\n{size=-5}{color=#808080}{k=0.7}\"Playful Tension (Orchestral)\"{/k}{/color}{/size}\n",
+#         "Music Dude#4\n{size=-5}{color=#808080}{k=0.7}\"Item Shop\"{/k}{/color}{/size}\n",
+#         "Music Dude#5\n{size=-5}{color=#808080}{k=0.7}\"Grape Soda is Fucking Raw\"{/k}{/color}{/size}\n",
+#         "Music Dude#5\n{size=-5}{color=#808080}{k=0.7}Retro Game Music Pack:\n\"Title Screen\"\n\"Level 1\"\n\"Level 3\"{/k}{/color}{/size}"
+#     ),
+#     credits_title("Special Thanks"),
+#     credits_group("{size=+4}Pervert#1{/size}\n{color=#808080}{size=-5}{k=0.7}Creator of the original Witch Trainer and other awesome games! {a=https://www.patreon.com/akabur}PATREON{/a}{/size}{/color}\n{/k}", "Pervert#2", "Pervert#3", "Pervert#4", "Pervert#5", "Pervert#6", "Pervert#7", "Pervert#8", "Pervert#9", "Pervert#10", "Pervert#11", "Pervert#12", "Pervert#13", "Pervert#14", "Pervert#15", "Pervert#16", "Pervert#17", "Pervert#18", "Pervert#19", "Pervert#20", "Pervert#21"),
+#     "\nSpecial thanks to our pervs, discord perverators and {a=https://www.patreon.com/SilverStudioGames/}perverted supporters{/a} {image=images/misc/heart.webp}\n\n",
+#     "{image=images/logo/silverstudiogames.webp}\n"
+#     "\n{space=220}{image=characters/genie/mage9.webp}{rb}{space=-60}Thanks for cumin!{/rb}"
+# ])
 
 screen cartoon_zoom():
     tag gameover

game/scripts/minigames/mirror/menu.rpy

@@ -86,7 +86,7 @@ screen mirror(xx, yy):
     zorder 30
     modal True
 
-    add "gui_fade"
+    add "gui_fade_both"
 
     if renpy.mobile:
         use close_button_background
@@ -176,7 +176,7 @@ screen mirror_menuitem(xx, yy):
             text "Nothing here yet" align (0.5, 0.5) size 24
 
         if current_item:
-            frame:
+            frame style "empty":
                 xalign 0.5
                 ypos 412