diff --git a/game/gui/creamy_pumpkin_pie/book/book_background.png b/game/gui/creamy_pumpkin_pie/book/book_background.png index e6f068bf..874d9818 100644 --- a/game/gui/creamy_pumpkin_pie/book/book_background.png +++ b/game/gui/creamy_pumpkin_pie/book/book_background.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3d00b635eec9535bae1e5d4457b794edb5ec947594999ed4b661af6e9b987e1e -size 150200 +oid sha256:5f62fbabed4dbb2dd787dbb181feb11b143bae02a20ebf51e105567e143b7e68 +size 1124048 diff --git a/game/gui/creamy_pumpkin_pie/book/book_doodles_glasses.png b/game/gui/creamy_pumpkin_pie/book/book_doodles_glasses.png new file mode 100644 index 00000000..9fdf345f --- /dev/null +++ b/game/gui/creamy_pumpkin_pie/book/book_doodles_glasses.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:912a984612384eecab797fbe9c6ce717acb39c91409f1664339929c2afd0c26f +size 126203 diff --git a/game/gui/creamy_pumpkin_pie/book/book_doodles_hermione.png b/game/gui/creamy_pumpkin_pie/book/book_doodles_hermione.png new file mode 100644 index 00000000..983b7857 --- /dev/null +++ b/game/gui/creamy_pumpkin_pie/book/book_doodles_hermione.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cebd3718a9d74b362be93b725ed1ef88af84d2b40b70593afbd9be71e52a5a2f +size 476988 diff --git a/game/gui/creamy_pumpkin_pie/book/book_doodles_hermione2.png b/game/gui/creamy_pumpkin_pie/book/book_doodles_hermione2.png new file mode 100644 index 00000000..3844ef85 --- /dev/null +++ b/game/gui/creamy_pumpkin_pie/book/book_doodles_hermione2.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d77b344c046c45686a4772cf21914749f3e5f25fd4ba630ae7bef0b10db44584 +size 488470 diff --git a/game/gui/creamy_pumpkin_pie/book/book_doodles_letter.png b/game/gui/creamy_pumpkin_pie/book/book_doodles_letter.png new file mode 100644 index 00000000..64dd6e70 --- /dev/null +++ b/game/gui/creamy_pumpkin_pie/book/book_doodles_letter.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ab97837bafc61c93ed93bca2d4f146938f277c7874f4983b5d36f23cd897fcc2 +size 335098 diff --git a/game/gui/creamy_pumpkin_pie/book/book_doodles_owl.png b/game/gui/creamy_pumpkin_pie/book/book_doodles_owl.png new file mode 100644 index 00000000..5045f5b7 --- /dev/null +++ b/game/gui/creamy_pumpkin_pie/book/book_doodles_owl.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3f1f1a8b8be32de465d43957e77307e11b417bc5ca0cc1a4d85de5c57de3ff77 +size 269488 diff --git a/game/gui/creamy_pumpkin_pie/book/book_doodles_panties.png b/game/gui/creamy_pumpkin_pie/book/book_doodles_panties.png new file mode 100644 index 00000000..396ed417 --- /dev/null +++ b/game/gui/creamy_pumpkin_pie/book/book_doodles_panties.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bfc7f559caf11d2ee4b4acfd57ef33720bbe00bd9a35cce7df56caec83ff968c +size 102994 diff --git a/game/gui/creamy_pumpkin_pie/book/book_doodles_snitch.png b/game/gui/creamy_pumpkin_pie/book/book_doodles_snitch.png new file mode 100644 index 00000000..3a66a6ca --- /dev/null +++ b/game/gui/creamy_pumpkin_pie/book/book_doodles_snitch.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6fe135a68717464a1be33e3f6d81f99a5abdfa9b909e7aafd93d2cf1d9a1bd77 +size 191177 diff --git a/game/gui/creamy_pumpkin_pie/book/book_page_left.png b/game/gui/creamy_pumpkin_pie/book/book_page_left.png index f62d1ac5..edce4a01 100644 --- a/game/gui/creamy_pumpkin_pie/book/book_page_left.png +++ b/game/gui/creamy_pumpkin_pie/book/book_page_left.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a98ec3c3ee3efb3454baf61fb444967c69dd71a45062b8f493a0609e3561b586 -size 148811 +oid sha256:0be418bc5352898fac6bbc4365009c23865ac493e0c969d32df8a79b6cbbbbf8 +size 2827641 diff --git a/game/gui/creamy_pumpkin_pie/book/book_page_right.png b/game/gui/creamy_pumpkin_pie/book/book_page_right.png index cc9a98ec..97b6c226 100644 --- a/game/gui/creamy_pumpkin_pie/book/book_page_right.png +++ b/game/gui/creamy_pumpkin_pie/book/book_page_right.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:118feac9267ae8fa7c728aecd2694da59b5de9635ea2fb91a70215f32bdfed55 -size 151677 +oid sha256:e8da844a2f6f13435b7c1c2cc1580627e5b5322dfa4a4318444e34df157fe7ff +size 2828718 diff --git a/game/gui/creamy_pumpkin_pie/book/book_tab.png b/game/gui/creamy_pumpkin_pie/book/book_tab.png index 0145ae99..f0a4d78c 100644 --- a/game/gui/creamy_pumpkin_pie/book/book_tab.png +++ b/game/gui/creamy_pumpkin_pie/book/book_tab.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7ee9361508a4b5bed8da75f6be80c04786cd5b6c100d6456d28480901cb46570 -size 7070 +oid sha256:b43707771e7f3f4d48747d86b71cfd36fd9277197bf255e68d94e9a961256cca +size 15943 diff --git a/game/scripts/gui/main_menu.rpy b/game/scripts/gui/main_menu.rpy index 65f4201e..bd2447c2 100644 --- a/game/scripts/gui/main_menu.rpy +++ b/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) \ No newline at end of file diff --git a/game/scripts/gui/preferences.rpy b/game/scripts/gui/preferences.rpy index eaae9ee8..6be28a59 100644 --- a/game/scripts/gui/preferences.rpy +++ b/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! :)" diff --git a/game/scripts/utility/actions.rpy b/game/scripts/utility/actions.rpy index 1c5186fd..004e8652 100644 --- a/game/scripts/utility/actions.rpy +++ b/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