Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added a new menu for character control #16

Merged
merged 12 commits into from
Jan 16, 2018
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ The license of the original game is not specified, but developer [is against](ht
## TODO
- [x] Extract, decompile
- [x] Fix poem game
- [ ] Fix `*.chr`-files (**spoilers!**)
- [x] Fix `*.chr`-files (kawaii menu, thanks to [@AlexAzumi](https://github.com/AlexAzumi)! See [#16](https://github.com/saber-nyan/ddlc-android/pull/16))
- [x] Fix dialogbox (bug [reasons](boxes_sizing.txt), in russian)
- [x] Test build
- [ ] Resolve all Issues **and**...
Expand Down
2 changes: 1 addition & 1 deletion README_RU.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
## TODO
- [x] Распаковать, декомпилировать, проверить работу
- [x] Пофиксить поэму
- [ ] Пофиксить интересные вещи, связанные с `*.chr`-файлами (**spoilers!**)
- [x] Пофиксить интересные вещи, связанные с `*.chr`-файлами (няшное меню, спасибо [@AlexAzumi](https://github.com/AlexAzumi)! См. [#16](https://github.com/saber-nyan/ddlc-android/pull/16))
- [x] Пофиксить диалоговое окно (глючит на каждом устройстве. Нашел [причины](boxes_sizing.txt)!)
- [x] Собрать тест
- [ ] Решить все Issues **и**...
Expand Down
7 changes: 7 additions & 0 deletions game/definitions.rpy
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,13 @@ init python:
for char in ("monika", "natsuki", "yuri", "sayori"): # TO!DONE: character fix!
restore_character(char)
renpy.save_persistent()
def check_if_exist(name):
return {
'monika': persistent.monika is None or persistent.monika == "restored",
'natsuki': persistent.natsuki is None or persistent.natsuki == "restored",
'sayori': persistent.sayori is None or persistent.sayori == "restored",
'yuri': persistent.yuri is None or persistent.yuri == "restored",
}[name]
def pause(time=None):
if not time:
renpy.ui.saybehavior(afm=" ")
Expand Down
59 changes: 39 additions & 20 deletions game/screens.rpy
Original file line number Diff line number Diff line change
@@ -1,14 +1,3 @@











init -1 style default:
font gui.default_font
size gui.text_size
Expand Down Expand Up @@ -471,7 +460,9 @@ init -501 screen navigation():
textbutton _("Main Menu") action NullAction()

textbutton _("Settings") action [ShowMenu("preferences"), SensitiveIf(renpy.get_screen("preferences") == None)]


#Added by AlexAzumi
textbutton _("Characters") action [ShowMenu("characters"), SensitiveIf(renpy.get_screen("characters") == None)]
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we should not show this button immediately after the first start: it will be a small spoiler. It is better to hide it under some condition.



if renpy.variant("pc"):
Expand Down Expand Up @@ -917,14 +908,42 @@ init -1 style slot_button_text:
color "#666"
outlines []









#Added by AlexAzumi
init -501 screen characters() tag menu:
use game_menu(_("Files"), scroll ="viewport"):
vbox:
style_prefix "navigation"
xoffset 50
frame:
xpadding 10
ypadding 10
xalign 1
yalign 1
vbox:
label "Characters":
xalign 0.5
text_size 50
null height 10
textbutton "Restore all characters":
action [Function(restore_all_characters), Show(screen="dialog", message="All characters have been restored", ok_action=Hide("dialog"))]
null height 5

textbutton "Delete Monika":
action [Function(delete_character, "monika"), Show(screen="dialog", message="Monika has been deleted", ok_action=Hide("dialog"))]
null height 5

textbutton "Delete Natsuki":
action [Function(delete_character, "natsuki"), Show(screen="dialog", message="Natsuki has been deleted", ok_action=Hide("dialog"))]
null height 5

textbutton "Delete Sayori":
action [Function(delete_character, "sayori"), Show(screen="dialog", message="Sayori has been deleted", ok_action=Hide("dialog"))]
null height 5

textbutton "Delete Yuri":
action [Function(delete_character, "yuri"), Show(screen="dialog", message="Yuri has been deleted", ok_action=Hide("dialog"))]


init -501 screen preferences() tag menu:


Expand Down