diff --git a/game/src/cg_gallery.rpy b/game/src/cg_gallery.rpy index 296f670..3cd8d3b 100644 --- a/game/src/cg_gallery.rpy +++ b/game/src/cg_gallery.rpy @@ -109,7 +109,7 @@ init 2 python: #CACHE_PATH = config.basedir.replace("\\","/") + "/game/cache/" FILENAME = os.path.join(config.basedir, 'game/src/gallery_dataset.json') #CACHE_PATH = config.basedir.replace("\\","/") + "/game/cache/" - fp = open(FILENAME) + fp = renpy.open_file('src/gallery_dataset.json') data = json.load(fp) list_img = renpy.list_images() diff --git a/game/src/mod_menu.rpy b/game/src/mod_menu.rpy index f40fe0f..4d5fdc9 100644 --- a/game/src/mod_menu.rpy +++ b/game/src/mod_menu.rpy @@ -56,18 +56,50 @@ screen mod_menu(): ymaximum 0.8 ypos 200 yinitial 0 - scrollbars "vertical" + if len(mod_menu_access) > 5: # Hides the scrollbar when not needed. Ideally nobody would install mora than one at the same time, but oh well + scrollbars "vertical" mousewheel True draggable True pagekeys True - vbox: - #xpos 1885 - spacing 18 -#yalign 0.98 - #buttons are messed up but that's ok - use mod_menu_button("gui/button/menubuttons/template_idle.png", "Return", ShowMenu("main_menu")) - if len(mod_menu_access) != 0: + + if len(mod_menu_access) != 0: + vbox: + use mod_menu_button("gui/button/menubuttons/template_idle.png", "Return", ShowMenu("main_menu")) + spacing 18 use mod_menu_buttons("gui/button/menubuttons/template_idle.png", mod_menu_access ) - else: - use mod_menu_button("gui/button/menubuttons/template_idle.png", "You have no mods", None) + else: + use mod_menu_button("gui/button/menubuttons/template_idle.png", "Return", ShowMenu("main_menu")) + text "You have no mods! \nInstall some in:\n\"[moddir]\"": + style_prefix "navigation" + size 45 + text_align 0.5 + outlines [(3, "#445ABB", absolute(0), absolute(0))] + at center + +############################# +# Stuff for mods in android # +############################# + +init python: + + import os + + if renpy.windows: + moddir = renpy.config.gamedir.replace("\\", "/") + + elif renpy.android: + + moddir = os.path.join(os.environ["ANDROID_PUBLIC"], "game") + + try: + # We have to create both the 'game' and 'mods' folder for android. + os.mkdir(moddir) + os.mkdir(os.path.join(moddir, "mods")) + except: + pass + + else: + moddir = renpy.config.gamedir + + moddir += "/mods/" \ No newline at end of file