CoffeeAnon/SnootGame
1
Fork 0
forked from Cavemanon/SnootGame
Code Issues Pull Requests Projects Releases Wiki Activity

menu name consistency, reformat updates submenu, fix "extramenu" messy

Browse Source
This commit is contained in:
tick bumley
2021-07-16 16:42:58 -05:00
parent 8c4177438b
commit 38e62a4814
1 changed files with 19 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
game/screens.rpy
View File

@ -356,7 +356,7 @@ screen navigation():
textbutton _("Load") action ShowMenu("load") textbutton _("Load") action ShowMenu("load")
textbutton _("Delete") action ShowMenu("delete") textbutton _("Delete") action ShowMenu("delete")
textbutton _("Options") action ShowMenu("preferences") textbutton _("Options") action ShowMenu("preferences")
textbutton _("Extras") action ShowMenu("extras") #textbutton _("Extras") action ShowMenu("extras")
textbutton _("Return") action Return() textbutton _("Return") action Return()
@ -441,7 +441,7 @@ screen main_menu():
[ "Start", Start() ], \ [ "Start", Start() ], \
[ "Load", ShowMenu("load") ], \ [ "Load", ShowMenu("load") ], \
[ "Options", ShowMenu("preferences") ], \ [ "Options", ShowMenu("preferences") ], \
[ "Extra", ShowMenu("extras") ], \ [ "Extras", ShowMenu("extras") ], \
[ "Quit", Quit(confirm=not main_menu) ] \ [ "Quit", Quit(confirm=not main_menu) ] \
] ) ] )
on "show" action renpy.start_predict_screen("cg_gallery") on "show" action renpy.start_predict_screen("cg_gallery")
@ -647,7 +647,6 @@ screen about():
screen updates(): screen updates():
tag menu tag menu
style_prefix "main_menu" style_prefix "main_menu"
add gui.main_menu_background add gui.main_menu_background
@ -661,47 +660,39 @@ screen updates():
## contents of the main menu are in the navigation screen. ## contents of the main menu are in the navigation screen.
vbox: vbox:
xpos 1140 yalign 0.00
ypos 900 yoffset 100
label _("{color=#5D009C}[config.name!t]{/color}") xoffset 80
text _("{color=#5D009C}Your Version is [config.version!t]\n{/color}") xmaximum 1100
label "[config.name!t]"
text _("Version [config.version!t]\n")
if updater.can_update(): if updater.can_update():
label _("{color=#5D009C}{size=26}Update directory exists, updating is possible!{/size}{/color}") label _("{color=#00FF00}Update directory exists, updating is possible!{/color}")
else: else:
label _("{color=#5D009C}{size=26}Update directory does not exist or is corrupt!{/size}") label _("{color=#FF0000}Update directory does not exist or is corrupt!{/color}")
textbutton _("Enable Automatic Updates") action [Notify("Toggling Automatic Updates..."), ToggleVariable("persistent.autoup", True, False)] textbutton _("Enable Automatic Updates") action [Notify("Toggling Automatic Updates..."), ToggleVariable("persistent.autoup", True, False)]
text _("{color=#5D009C}Automatic Updates: [persistent.autoup!t]\n{/color}") text _("Automatic Updates: [persistent.autoup!t]\n")
textbutton _("Check for Update!") action [Notify("Checking for update..."), Function(UpdateCheck)] textbutton _("Check for Update!") action [Notify("Checking for update..."), Function(UpdateCheck)]
label _("{color=#5D009C}Update Check Result:\n{/color}") label _("Update Check Result:\n")
text _("{color=#5D009C}[persistent.updateresult!t]\n{/color}") text _("[persistent.updateresult!t]\n")
if persistent.updateresult != "No new version is available": if persistent.updateresult != "No new version is available":
textbutton _("Update Now!") action updater.Update(persistent.updateWebServer, force=False) textbutton _("Update Now!") action updater.Update(persistent.updateWebServer, force=False)
else: else:
textbutton _("Update Now!") action Notify("Nothing to update to!") textbutton _("Update Now!") action Notify("Nothing to update to!")
label _("Update Server:\n")
label _("{color=#5D009C}Update Server:\n{/color}")
default input_on = False default input_on = False
button: button:
key_events True key_events True
if input_on: if input_on:
input: input:
default "[persistent.updateWebServer!t]" size 20 color '#FFFFFF' default "[persistent.updateWebServer!t]" size 24 color '#FFFFFF'
value FieldInputValue(persistent, 'updateWebServer') value FieldInputValue(persistent, 'updateWebServer')
length 49 length 49
copypaste True copypaste True
else: else:
text persistent.updateWebServer size 20 color '#FFFF00' text persistent.updateWebServer size 24 color '#FFFF00'
action ToggleScreenVariable('input_on') action ToggleScreenVariable('input_on')
style_prefix "quick"
textbutton "Back to Extras" action ShowMenu("extras")
vbox:
xpos 1942
# xalign 1.0
yalign 0.95
use extrasnavigation use extrasnavigation
## Load and Save screens ####################################################### ## Load and Save screens #######################################################
@ -854,7 +845,7 @@ screen preferences():
tag menu tag menu
use game_menu(_("Preferences"), scroll="viewport"): use game_menu(_("Options"), scroll="viewport"):
vbox: vbox: