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

This commit is contained in:
Johnny28 2024-06-15 18:25:16 +02:00
commit 5beab11f64
4 changed files with 45 additions and 45 deletions

View File

@ -36,7 +36,7 @@ define credits_images = [] # TODO: Add images once new chibis are in.
define credits_mods = "\n\n## Game Mods\n\n" + "\n\n".join(["### " + i[1]["Name"] + "\n- " + i[1]["Author"] for i in mods_list.items()]) if mods_list else "" define credits_mods = "\n\n## Game Mods\n\n" + "\n\n".join(["### " + i[1]["Name"] + "\n- " + i[1]["Author"] for i in mods_list.items()]) if mods_list else ""
define credits = credits.convert(f"""{{image=game_logo}}{{vspace=10}} define credits = credits.convert(_(f"""{{image=game_logo}}{{vspace=10}}
## Development Team ## Development Team
### Project Lead ### Project Lead
@ -229,7 +229,7 @@ define credits = credits.convert(f"""{{image=game_logo}}{{vspace=10}}
- [renpy.license!t]{{vspace=300}} - [renpy.license!t]{{vspace=300}}
# Thank you for playing!{{vspace=300}} # Thank you for playing!{{vspace=300}}
""") """))
style credits_header1: style credits_header1:
color "#ffffff" color "#ffffff"

View File

@ -189,49 +189,49 @@ screen navigation():
vbox: vbox:
style_prefix "navigation_tabs" style_prefix "navigation_tabs"
textbutton "Save" action [SetLocalVariable("subcategory", None), SetLocalVariable("category", "save")] selected (category=="save") at navigation_tabs textbutton _("Save") action [SetLocalVariable("subcategory", None), SetLocalVariable("category", "save")] selected (category=="save") at navigation_tabs
textbutton "Load" action [SetLocalVariable("subcategory", None), SetLocalVariable("category", "load")] selected (category=="load") at navigation_tabs textbutton _("Load") action [SetLocalVariable("subcategory", None), SetLocalVariable("category", "load")] selected (category=="load") at navigation_tabs
textbutton "Settings" action [SetLocalVariable("subcategory", "general"), SetLocalVariable("category", "settings")] at navigation_tabs textbutton _("Settings") action [SetLocalVariable("subcategory", "general"), SetLocalVariable("category", "settings")] at navigation_tabs
textbutton "Main Menu" action MainMenu() at navigation_tabs textbutton _("Main Menu") action MainMenu() at navigation_tabs
null height 35 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" at navigation_tabs
null height 35 null height 35
textbutton "Credits" action Show("credits") at navigation_tabs textbutton _("Credits") action Show("credits") at navigation_tabs
if category == "save": if category == "save":
vbox: vbox:
style_prefix "navigation_subtabs" style_prefix "navigation_subtabs"
textbutton "A.Saves" action FilePage("auto") at navigation_tabs textbutton _("A.Saves") action FilePage("auto") at navigation_tabs
textbutton "Q.Saves" action FilePage("quick") at navigation_tabs textbutton _("Q.Saves") action FilePage("quick") at navigation_tabs
null height 35 null height 35
textbutton "Next" action FilePageNext() at navigation_tabs textbutton _("Next") action FilePageNext() at navigation_tabs
textbutton "Previous" action FilePagePrevious() at navigation_tabs textbutton _("Previous") action FilePagePrevious() at navigation_tabs
null height 35 null height 35
textbutton "Last Page" action FilePageLast() at navigation_tabs textbutton _("Last Page") action FilePageLast() at navigation_tabs
use file_slots(_("Save")) use file_slots(_("Save"))
elif category == "load": elif category == "load":
vbox: vbox:
style_prefix "navigation_subtabs" style_prefix "navigation_subtabs"
textbutton "A.Saves" action FilePage("auto") at navigation_tabs textbutton _("A.Saves") action FilePage("auto") at navigation_tabs
textbutton "Q.Saves" action FilePage("quick") at navigation_tabs textbutton _("Q.Saves") action FilePage("quick") at navigation_tabs
null height 35 null height 35
textbutton "Next" action FilePageNext() at navigation_tabs textbutton _("Next") action FilePageNext() at navigation_tabs
textbutton "Previous" action FilePagePrevious() at navigation_tabs textbutton _("Previous") action FilePagePrevious() at navigation_tabs
null height 35 null height 35
textbutton "Last Page" action FilePageLast() at navigation_tabs textbutton _("Last Page") action FilePageLast() at navigation_tabs
use file_slots(_("Load")) use file_slots(_("Load"))
elif category == "settings": elif category == "settings":
vbox: vbox:
style_prefix "navigation_subtabs" style_prefix "navigation_subtabs"
textbutton "General" action SetLocalVariable("subcategory", "general") at navigation_tabs textbutton _("General") action SetLocalVariable("subcategory", "general") at navigation_tabs
textbutton "Display" action SetLocalVariable("subcategory", "display") at navigation_tabs textbutton _("Display") action SetLocalVariable("subcategory", "display") at navigation_tabs
textbutton "Audio" action SetLocalVariable("subcategory", "audio") at navigation_tabs textbutton _("Audio") action SetLocalVariable("subcategory", "audio") at navigation_tabs
textbutton "Other" action SetLocalVariable("subcategory", "other") at navigation_tabs textbutton _("Other") action SetLocalVariable("subcategory", "other") at navigation_tabs
if subcategory == "audio": if subcategory == "audio":
use settings_audio use settings_audio

View File

@ -10,7 +10,7 @@ screen player(pos=(0.025, 0.2)):
frame style "empty": frame style "empty":
pos pos pos pos
text "{bounce}Currently Playing{/bounce}" text _("{bounce}Currently Playing{/bounce}")
bar value AudioPositionValue() ypos 20 bar value AudioPositionValue() ypos 20
text "[renpy.music.get_playing()!i]" style "player_text_title" ypos 40 text "[renpy.music.get_playing()!i]" style "player_text_title" ypos 40

File diff suppressed because it is too large Load Diff