diff --git a/.android.json b/.android.json index a1a9a94..93e7bba 100644 --- a/.android.json +++ b/.android.json @@ -1 +1 @@ -{"layout": null, "name": "Doki Doki Literature Club!", "package": "ru.saber_nyan.ddlc", "orientation": "sensorLandscape", "include_pil": false, "expansion": true, "source": false, "icon_name": "DDLC!", "version": "0.0.2", "target_version": 14, "permissions": ["VIBRATE"], "include_sqlite": false, "store": "none", "numeric_version": "2"} \ No newline at end of file +{"layout": null, "name": "Doki Doki Literature Club!", "package": "ru.saber_nyan.ddlc", "include_pil": false, "numeric_version": "3", "expansion": true, "source": false, "icon_name": "DDLC!", "version": "0.0.3", "target_version": 14, "permissions": ["VIBRATE"], "include_sqlite": false, "store": "none", "orientation": "sensorLandscape"} \ No newline at end of file diff --git a/README.md b/README.md index d8a6929..5baa92c 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,8 @@ - [x] Распаковать, декомпилировать, проверить работу - [x] Пофиксить поэму - [x] Пофиксить интересные вещи, связанные с `*.chr`-файлами (**spoilers!**) -- [ ] Пофиксить диалоговое окно (глючит на каждом устройстве. Нашел [причины](boxes_sizing.txt)!) +- [x] Пофиксить диалоговое окно (глючит на каждом устройстве. Нашел [причины](boxes_sizing.txt)!) - [ ] Собрать тест - [ ] Полностью прочитать ВН, поймать баги и вылеты +- [ ] Возможно, придумать способ покрасивее оформить `TextBox` - [ ] Собрать релиз diff --git a/game/gui.rpy b/game/gui.rpy index 791e772..baa8cea 100644 --- a/game/gui.rpy +++ b/game/gui.rpy @@ -67,22 +67,22 @@ define -2 gui.name_font = "gui/font/RifficFree-Bold.ttf" define -2 gui.interface_font = "gui/font/Aller_Rg.ttf" -define -2 gui.text_size = 24 +define -2 gui.text_size = 26 -define -2 gui.name_text_size = 24 +define -2 gui.name_text_size = 26 -define -2 gui.interface_text_size = 24 +define -2 gui.interface_text_size = 26 -define -2 gui.label_text_size = 28 +define -2 gui.label_text_size = 30 define -2 gui.notify_text_size = 16 -define -2 gui.title_text_size = 38 +define -2 gui.title_text_size = 40 @@ -134,11 +134,11 @@ define -2 gui.namebox_tile = False -define -2 gui.text_xpos = 268 -define -2 gui.text_ypos = 62 +define -2 gui.text_xpos = 240 +define -2 gui.text_ypos = 43 -define -2 gui.text_width = 744 +define -2 gui.text_width = 804 @@ -193,7 +193,7 @@ define -2 gui.confirm_button_text_xalign = 0.5 define -2 gui.page_button_borders = Borders(10, 4, 10, 4) -define -2 gui.quick_button_text_size = 14 +define -2 gui.quick_button_text_size = 16 define -2 gui.quick_button_text_idle_color = "#522" define -2 gui.quick_button_text_hover_color = "#fcc" define -2 gui.quick_button_text_selected_color = gui.accent_color @@ -413,7 +413,7 @@ init -2 python: - if renpy.variant("small"): + if False: # TO!DONE: problem: defaults! gui.text_size = 30 diff --git a/game/options.rpy b/game/options.rpy index 8108bde..5106cdf 100644 --- a/game/options.rpy +++ b/game/options.rpy @@ -1,5 +1,19 @@ +## TO!DONE: thank you, lolbot! Displays current script:line and screen, file:line +python early: + def widget__info(): + import os + def editoverlay(): + fullfn, line = renpy.get_filename_line() + ui.button(clicked=None, xpos=1.0, xanchor=1.0, ypos=2, xpadding=0, xminimum=200) + ui.text(u"%s:%d" % (os.path.basename(fullfn), line), size=16) + ui.button(clicked=None, xpos=0.75, xanchor=1.0, ypos=2, xpadding=0, xminimum=200) + ui.text(u"%s, %s" % (renpy.current_screen(), str(renpy.current_screen()._location)), size=16) + config.overlay_functions.append(editoverlay) +init 9000 python: + if config.developer: + widget__info() diff --git a/game/screens.rpy b/game/screens.rpy index 9fb06a4..dd8db36 100644 --- a/game/screens.rpy +++ b/game/screens.rpy @@ -158,7 +158,7 @@ init -1 style frame: -init -501 screen say(who, what): +init -501 screen say(who, what): # TO!DONE: screen_say! style_prefix "say" window: @@ -174,8 +174,8 @@ init -501 screen say(who, what): - if not renpy.variant("small"): - add SideImage() xalign 0.0 yalign 1.0 + #if not renpy.variant("small"): + # add SideImage() xalign 0.0 yalign 1.0 use quick_menu @@ -189,7 +189,7 @@ init -1 style namebox is default init -1 style namebox_label is say_label -init -1 style window: # TODO: или же здесь? +init -1 style window: # TO!DONE: или же здесь? xalign 0.5 xfill True yalign gui.textbox_yalign @@ -218,7 +218,7 @@ init -1 style say_label: yalign 0.5 outlines [(3, "#b59", 0, 0), (1, "#b59", 1, 1)] -init -1 style say_dialogue: # TODO: фикс положения должен быть здесь? +init -1 style say_dialogue: # TO!DONE: фикс положения должен быть здесь? xpos gui.text_xpos xanchor gui.text_xalign xsize gui.text_width @@ -394,6 +394,8 @@ init -501 screen quick_menu(): textbutton _("Settings") action ShowMenu('preferences') + if config.developer: + textbutton "Devtools" action ShowMenu('_developer') @@ -478,7 +480,7 @@ init -501 screen navigation(): textbutton _("Help") action [Help("README.html"), Show(screen="dialog", message="The help file has been opened in your browser.", ok_action=Hide("dialog"))] - textbutton _("Quit") action Quit(confirm=not main_menu) + textbutton _("Quit") action Quit(confirm=not main_menu) # TO!DONE: now u can exit even on Android! else: timer 1.75 action Start("autoload_yurikill")