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

game/scripts/gui/main_menu.rpy

@@ -333,6 +333,8 @@ screen navigation():
                 null height 35
                 textbutton "Next" action FilePageNext() at navigation_tabs
                 textbutton "Previous" action FilePagePrevious() at navigation_tabs
+                null height 35
+                textbutton "Last Page" action FilePageLast() at navigation_tabs
 
             use file_slots(_("Save"))
         elif category == "load":
@@ -344,6 +346,8 @@ screen navigation():
                 null height 35
                 textbutton "Next" action FilePageNext() at navigation_tabs
                 textbutton "Previous" action FilePagePrevious() at navigation_tabs
+                null height 35
+                textbutton "Last Page" action FilePageLast() at navigation_tabs
 
             use file_slots(_("Load"))
         elif category == "settings":
@@ -408,14 +412,14 @@ style navigation_frame is empty:
 style navigation_page_left is empty:
     fit_first True
     xanchor 1.0
-    pos (364, 8)
+    pos (366, 8)
     xysize (343, 490)
     background Image("gui/creamy_pumpkin_pie/book/book_page_left.png", oversample=4)
 
 style navigation_page_right is empty:
     fit_first True
     xanchor 0.0
-    pos (364, 8)
+    pos (362, 8)
     xysize (343, 490)
     background Image("gui/creamy_pumpkin_pie/book/book_page_right.png", oversample=4)
 
@@ -432,6 +436,7 @@ style navigation_label:
     background Frame(Image("gui/creamy_pumpkin_pie/book/book_label.png", oversample=4), 80, 0, 80, 0, tile=False)
 
 style navigation_tabs_vbox:
+    xfill True
     yspacing 10
     pos (721, 50)
 
@@ -441,7 +446,7 @@ style navigation_tabs_button:
     right_padding 30
     selected_right_padding 50
     background Frame(Image("gui/creamy_pumpkin_pie/book/book_tab.png", oversample=4), 0, 0, 80, 0, tile=False)
-    selected_background Frame(Image("gui/creamy_pumpkin_pie/book/book_tab.png", oversample=4), 0, 0, 80, 0, tile=False)
+    selected_background Frame(Transform(Image("gui/creamy_pumpkin_pie/book/book_tab.png", oversample=4), matrixcolor=HueMatrix(180.0)), 0, 0, 80, 0, tile=False)
     insensitive_background Frame(Transform(Image("gui/creamy_pumpkin_pie/book/book_tab.png", oversample=4), matrixcolor=SaturationMatrix(0.0)), 0, 0, 80, 0, tile=False)
 
 style navigation_tabs_button_text is who:
@@ -451,10 +456,12 @@ style navigation_tabs_button_text is who:
     font gui.bold_font
     size 20
     yalign 0.5
+    selected_xoffset 15
 
 style navigation_subtabs_vbox:
+    xfill True
     xanchor 1.0
-    pos (23, 50)
+    pos (24, 50)
     yspacing 10
 
 style navigation_subtabs_button:
@@ -464,9 +471,11 @@ style navigation_subtabs_button:
     left_padding 30
     selected_left_padding 50
     background Frame(Transform(Image("gui/creamy_pumpkin_pie/book/book_tab.png", oversample=4), xzoom=-1), 80, 0, 0, 0, tile=False)
+    selected_background Frame(Transform(Image("gui/creamy_pumpkin_pie/book/book_tab.png", oversample=4), xzoom=-1, matrixcolor=HueMatrix(180.0)), 80, 0, 0, 0, tile=False)
     insensitive_background Frame(Transform(Image("gui/creamy_pumpkin_pie/book/book_tab.png", oversample=4), xzoom=-1, matrixcolor=SaturationMatrix(0.0)), 80, 0, 0, 0, tile=False)
 
-style navigation_subtabs_button_text is navigation_tabs_button_text
+style navigation_subtabs_button_text is navigation_tabs_button_text:
+    selected_xoffset -15
 
 style navigation_label_text:
     ypos 8
@@ -557,3 +566,11 @@ style navigation_bar is empty:
 style navigation_note:
     padding (6, 4)
     background Frame(Image("gui/creamy_pumpkin_pie/book/book_note.png", oversample=4), 40, 40, 40, 40, tile=False)
+
+image doodle_hermione = Image("gui/creamy_pumpkin_pie/book/book_doodles_hermione.png", oversample=4)
+image doodle_hermione2 = Image("gui/creamy_pumpkin_pie/book/book_doodles_hermione2.png", oversample=4)
+image doodle_letter = Image("gui/creamy_pumpkin_pie/book/book_doodles_letter.png", oversample=4)
+image doodle_owl = Image("gui/creamy_pumpkin_pie/book/book_doodles_owl.png", oversample=4)
+image doodle_panties = Image("gui/creamy_pumpkin_pie/book/book_doodles_panties.png", oversample=4)
+image doodle_snitch = Image("gui/creamy_pumpkin_pie/book/book_doodles_snitch.png", oversample=4)
+image doodle_glasses = Image("gui/creamy_pumpkin_pie/book/book_doodles_glasses.png", oversample=4)

game/scripts/gui/preferences.rpy

@@ -77,7 +77,11 @@ screen preferences_general():
                 textbutton _("Power-saving") action Preference("gl powersave", "toggle")
                 textbutton _("multithreading") action settings.Toggle("multithreading") tooltip "Improves performance by executing tasks asynchronously. (Requires restart)"    
     frame style "navigation_page_right":
-        pass
+        if settings.get("tooltip"):
+            add "doodle_hermione" align (0.5, 0.5)
+        else:
+            add "doodle_hermione2" align (0.5, 0.5)
+
 screen preferences_visuals():
     frame style "navigation_page_left":
         vbox:
@@ -122,7 +126,8 @@ screen preferences_visuals():
             null height 35
             text get_gpu_info() yalign 1.0 size 12
     frame style "navigation_page_right":
-        pass
+        add "doodle_snitch" align (0.5, 0.1)
+        add "doodle_panties" align (0.5, 0.7)
 
 screen preferences_sound():
     frame style "navigation_page_left":
@@ -152,8 +157,9 @@ screen preferences_sound():
                 action Preference("audio when minimized", "toggle")
                 selected (not _preferences.audio_when_minimized)
                 style "navigation_checkbox_button"
+            add "doodle_owl" align (0.5, 0.9)
     frame style "navigation_page_right":
-        pass
+        add "doodle_letter" align (0.5, 0.5)
 
 screen preferences_accessibility():
     frame style "navigation_page_left":
@@ -204,15 +210,16 @@ screen preferences_accessibility():
                     textbutton "Delete persistent data ({color=#f00}!{/color})" action Confirm(gui.CONFIRM_DELETE_PERSISTENT, Function(delete_persistent))
                     textbutton "Delete save files ({color=#f00}!{/color})" action Confirm(gui.CONFIRM_DELETE_SAVES, Function(delete_saves))
     frame style "navigation_page_right":
+        add "doodle_glasses" align (0.5, 0.1)
         frame style "navigation_note":
             xysize (180, 180)
-            pos (20, 50)
+            pos (20, 130)
             at transform:
                 rotate 6
             text "TIP: If text overflows, try reducing vertical text spacing."
         frame style "navigation_note":
             xysize (180, 180)
-            pos (25, 150)
+            pos (25, 230)
             at transform:
                 rotate -4
             text "You could also try changing the font, it might help! :)"

game/scripts/utility/actions.rpy

@@ -1,4 +1,19 @@
 init python:
+    class FilePageLast(Action):
+        def __call__(self):
+            if not self.get_sensitive():
+                return
+
+            saves = renpy.list_saved_games(r"\d+")
+
+            if not saves:
+                return 1
+
+            last_page = int(saves[-1][0][0])
+
+            persistent._file_page = last_page
+            renpy.restart_interaction()
+
     class SetShopCategory(Action):
         def __init__(self, category: str, items: list):
             self.category = category