SilverStudioGames/WTS
SilverStudioGames/WTS
2
0
Fork 1
Code Issues Pull Requests Wiki Activity

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

Browse Source
This commit is contained in:
Johnny28 2024-06-17 21:06:26 +02:00
commit 62e2393fef
8 changed files with 121 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
game/gui/creamy_pumpkin_pie/book/book_vslider.png (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
game/gui/creamy_pumpkin_pie/book/book_vslider_thumb.png (Stored with Git LFS) Normal file
View File

Binary file not shown.

9
game/scripts/gui/_styles_.rpy
View File

@ -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

14
game/scripts/gui/credits.rpy
View File

@ -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
@ -227,9 +227,9 @@ 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:
@ -283,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):
@ -299,7 +299,7 @@ screen credits():
modal True
predict False
style_prefix "credits"
default duration = 180
default pauses = 13
@ -325,4 +325,4 @@ screen credits():
use player((0.025, 0.88))
timer duration+pauses action [Hide("credits"), Function(achievements.unlock, "Credits")]
timer duration+pauses action [Hide("credits"), Function(achievements.unlock, "Credits")]

116
game/scripts/gui/history.rpy
View File

File diff suppressed because it is too large Load Diff

31
game/scripts/gui/navigation.rpy
View File

@ -174,6 +174,8 @@ screen navigation():
default page_right_atl = None
default page_left_atl = None
on "show" action Play("sound", "sounds/bookopen.ogg")
add last_frame at navigation_last_frame_atl
# add "gui_fade_both" at gui_fade
@ -194,8 +196,9 @@ screen navigation():
textbutton _("Settings") action [SetLocalVariable("subcategory", "general"), SetLocalVariable("category", "settings")] at navigation_tabs
textbutton _("Main Menu") action MainMenu() at navigation_tabs
null height 35
textbutton _("Return") action [SetScreenVariable("navigation_last_frame_atl", navigation_last_frame_hide), SetScreenVariable("navigation_atl", navigation_hide), SetScreenVariable("navigation_exit", True)] keysym "game_menu" at navigation_tabs
textbutton _("Return") action [SetScreenVariable("navigation_last_frame_atl", navigation_last_frame_hide), SetScreenVariable("navigation_atl", navigation_hide), SetScreenVariable("navigation_exit", True)] keysym "game_menu" activate_sound "sounds/bookclose.ogg" at navigation_tabs
null height 35
textbutton _("History") action [SetLocalVariable("subcategory", None), SetLocalVariable("category", "history")] selected (category=="history") at navigation_tabs
textbutton _("Credits") action Show("credits") at navigation_tabs
if category == "save":
@ -241,6 +244,8 @@ screen navigation():
use settings_display
elif subcategory == "general":
use settings_general
elif category == "history":
use history
transform navigation_tabs:
subpixel True
@ -315,6 +320,7 @@ style navigation_tabs_button:
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)
activate_sound "sounds/pageflip.ogg"
style navigation_tabs_button_text is who:
color "#ffffff"
@ -340,6 +346,7 @@ style navigation_subtabs_button:
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)
activate_sound "sounds/pageflip.ogg"
style navigation_subtabs_button_text is navigation_tabs_button_text:
selected_xoffset -15
@ -412,7 +419,7 @@ style navigation_radio_button_text is navigation_text:
first_indent 24
insensitive_color "#704F3280"
style navigation_slider is empty:
style navigation_slider:
xalign 0.5
xmaximum 300
ysize 20
@ -421,14 +428,22 @@ style navigation_slider is empty:
thumb Image("gui/creamy_pumpkin_pie/book/book_slider_thumb.png", oversample=4)
thumb_offset 16
style navigation_bar is empty:
style navigation_vscrollbar:
xalign 0.5
xsize 20
base_bar Frame(Image("gui/creamy_pumpkin_pie/book/book_vslider.png", oversample=4), 8, 40, 8, 40, tile=False)
thumb Image("gui/creamy_pumpkin_pie/book/book_vslider_thumb.png", oversample=4)
thumb_offset 1
style navigation_bar:
xalign 0.5
xmaximum 300
ysize 20
left_bar Frame(Image("gui/creamy_pumpkin_pie/book/book_bar_full.png", oversample=4), tile=False)
right_bar Frame(Image("gui/creamy_pumpkin_pie/book/book_bar_empty.png", oversample=4), tile=False)
hover_right_bar Fixed(Frame(Image("gui/creamy_pumpkin_pie/book/book_select.png", oversample=4), 20, 4, 20, 4, tile=False), Frame(Image("gui/creamy_pumpkin_pie/book/book_bar_empty.png", oversample=4), tile=False))
hover_left_bar Fixed(Frame(Image("gui/creamy_pumpkin_pie/book/book_select.png", oversample=4), 20, 4, 20, 4, tile=False), Frame(Image("gui/creamy_pumpkin_pie/book/book_bar_full.png", oversample=4), tile=False))
left_bar Frame(Image("gui/creamy_pumpkin_pie/book/book_bar_full.png", oversample=4), 40, 8, 40, 8, tile=False)
right_bar Frame(Image("gui/creamy_pumpkin_pie/book/book_bar_empty.png", oversample=4), 40, 8, 40, 8, tile=False)
hover_right_bar Fixed(Frame(Image("gui/creamy_pumpkin_pie/book/book_select.png", oversample=4), 20, 4, 20, 4, tile=False), Frame(Image("gui/creamy_pumpkin_pie/book/book_bar_empty.png", oversample=4), 40, 8, 40, 8, tile=False))
hover_left_bar Fixed(Frame(Image("gui/creamy_pumpkin_pie/book/book_select.png", oversample=4), 20, 4, 20, 4, tile=False), Frame(Image("gui/creamy_pumpkin_pie/book/book_bar_full.png", oversample=4), 40, 8, 40, 8, tile=False))
thumb None
style navigation_note:
padding (6, 4)
@ -440,4 +455,4 @@ image doodle_letter = Image("gui/creamy_pumpkin_pie/book/book_doodles_letter.png
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)
image doodle_glasses = Image("gui/creamy_pumpkin_pie/book/book_doodles_glasses.png", oversample=4)

4
game/scripts/gui/settings.rpy
View File

@ -14,7 +14,7 @@ screen settings_general():
textbutton _("System Cursor") action Preference("system cursor", "toggle")
textbutton _("Autosaves") action ToggleField(store, "_autosave")
textbutton _("Automatic Update Checks") action settings.Toggle("updates")
textbutton _("Kinetic Text") action settings.Toggle("kinetictext")
textbutton _("Kinetic Text") action settings.Toggle("kinetictext") tooltip "{bounce}Kinetic Text Example.{/bounce}"
text _("Skipping")
textbutton _("Skip Unseen Text") action Preference("skip", "toggle")
@ -27,7 +27,7 @@ screen settings_general():
bar value Preference("auto-forward time") style "navigation_bar"
textbutton _("Power-saving") action Preference("gl powersave", "toggle")
textbutton _("multithreading") action settings.Toggle("multithreading") tooltip "Improves performance by executing tasks asynchronously. (Requires restart)"
textbutton _("multithreading") action settings.Toggle("multithreading") tooltip "Improves performance by executing tasks asynchronously. (Requires restart)"
frame style "navigation_page_right":
if settings.get("tooltip"):
add "doodle_hermione" align (0.5, 0.5)

6
game/scripts/utility/text_tags.rpy
View File

@ -28,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}"""
@ -273,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,