diff --git a/README.md b/README.md index b6f6430..ca50b2f 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,10 @@ Ren'Py Event Editor forked from this: [Ren'Py Event Editor forum topic][http://lemmasoft.renai.us/forums/viewtopic.php?f=51&t=24108#p374045] -#Now it: +## Features: +- You can test your events from menu +- All generated events have *EEout_* prefix + - Genterate buttons for all spekers added to speakers list: ``` $ speakers.append(mycharacter) @@ -14,6 +17,9 @@ Ren'Py Event Editor forked from this: [Ren'Py Event Editor forum topic][http://l addEVs('my_custom_ev', 'my_ev_prefix') addChs('my_custom_ch') ``` +## Changes: +- Add imgs from Ren'Py Tutorial +- Remove buggy basic speakers - Remove old comments - Comments make in EE are in next line - Fix indentation or speakers lines diff --git a/game/Event Editor/EE_auto_res.rpy b/game/Event Editor/EE_auto_res.rpy index f07c72c..8142a3a 100644 --- a/game/Event Editor/EE_auto_res.rpy +++ b/game/Event Editor/EE_auto_res.rpy @@ -7,9 +7,9 @@ ## And add every character to speakers list: ## $ speakers.append(mycharacter) ## To add custom image folder write in init -30 python: -## addBGs('my_custom_bgs', 'my_bg_prefix') #you don't have to write prefix -## addEVs('my_custom_ev', 'my_ev_prefix') -## addChs('my_custom_ch') +## addBGs('my_custom_bgs_dir', 'my_bg_prefix') #you don't have to write prefix +## addEVs('my_custom_evs_dir', 'my_ev_prefix') +## addChs('my_custom_chs_dir') screen speaker_selection: zorder 1 diff --git a/game/Event Editor/EE_main.rpy b/game/Event Editor/EE_main.rpy index 11875d1..8366f74 100644 --- a/game/Event Editor/EE_main.rpy +++ b/game/Event Editor/EE_main.rpy @@ -1,4 +1,4 @@ -#######VERSION: 2.1 +#######VERSION: 2.4 # #DON'T TOUCH: #Code needed to capture the input text everytime the page changes. @@ -131,25 +131,23 @@ screen comments_screen: label EE_start: - "This is an Event Editor, have fun!" + devloper "This is an Event Editor, have fun!" call screen new_tutorial_menu return - - # # #When you start to write a new event: # label new_project: - $ project_name=renpy.input("Write a name for the event","test") - if project_name=="": - "You must write a name for the event" + $ project_name = "EEout_" + renpy.input("Write a name for the event","test") + if project_name == "EEout_": + devloper "You must write a name for the event" jump new_project - elif project_kind=="map": + elif project_kind == "map": jump EE_map else: $ minievent_list[project_name]=minievent(project_name,project_name,False) diff --git a/game/Event Editor/base_speakers.rpy b/game/Event Editor/base_speakers.rpy index 0fca406..614db4c 100644 --- a/game/Event Editor/base_speakers.rpy +++ b/game/Event Editor/base_speakers.rpy @@ -3,8 +3,7 @@ init -90 python: speakers = [] base_speakers = {"boy":"#729fcf", "girl":"#e65fc8", "men":"#3465a4", - "women":"#ad7fa8", "old_men":"#555753", - "old_women":"#d3d7cf", "devloper":"#cc0000", "debug":"#ef2920"} + "women":"#ad7fa8", "devloper":"#cc0000", "debug":"#ef2920"} for sp in base_speakers.items(): var_name = sp[0] diff --git a/game/Event Editor/test_event.rpy b/game/Event Editor/test_event.rpy new file mode 100644 index 0000000..abd6a7b --- /dev/null +++ b/game/Event Editor/test_event.rpy @@ -0,0 +1,23 @@ +label EE_test: + scene bg start code + + devloper "Here you can test yours events.\n + If you don't see your event on list just restart game." + + $ EE__label_list = renpy.get_all_labels() + + label EE_watch_event_list_repeat: + call screen EE_label_list + call expression _return + jump EE_test + + return + +screen EE_label_list: + vbox: + xalign 0.5 + yalign 0.5 + box_wrap True + for ii in EE__label_list: + if "EEout_" in ii: + textbutton _(ii) action Return(ii) xminimum 200 diff --git a/game/events/start.rpy b/game/events/start.rpy index 6f909a0..f9300dc 100644 --- a/game/events/start.rpy +++ b/game/events/start.rpy @@ -1,4 +1,4 @@ -label start: +label EEout_start: scene bg start code devloper "Hi! Welcome in Ren'Py Event Editor." scene bg start imgs diff --git a/game/images/bgs/washington.jpg b/game/images/bgs/washington.jpg new file mode 100644 index 0000000..3545502 Binary files /dev/null and b/game/images/bgs/washington.jpg differ diff --git a/game/images/bgs/whitehouse.jpg b/game/images/bgs/whitehouse.jpg new file mode 100644 index 0000000..8d4b562 Binary files /dev/null and b/game/images/bgs/whitehouse.jpg differ diff --git a/game/images/characters/eileen/concerned.png b/game/images/characters/eileen/concerned.png new file mode 100644 index 0000000..0c44e39 Binary files /dev/null and b/game/images/characters/eileen/concerned.png differ diff --git a/game/images/characters/eileen/happy.png b/game/images/characters/eileen/happy.png new file mode 100644 index 0000000..f69e270 Binary files /dev/null and b/game/images/characters/eileen/happy.png differ diff --git a/game/images/characters/eileen/vhappy.png b/game/images/characters/eileen/vhappy.png new file mode 100644 index 0000000..b4b5e95 Binary files /dev/null and b/game/images/characters/eileen/vhappy.png differ diff --git a/game/images/events/concert/1.jpg b/game/images/events/concert/1.jpg new file mode 100644 index 0000000..446eed5 Binary files /dev/null and b/game/images/events/concert/1.jpg differ diff --git a/game/images/events/concert/2.jpg b/game/images/events/concert/2.jpg new file mode 100644 index 0000000..ac6ad86 Binary files /dev/null and b/game/images/events/concert/2.jpg differ diff --git a/game/images/events/concert/3.jpg b/game/images/events/concert/3.jpg new file mode 100644 index 0000000..cac90c9 Binary files /dev/null and b/game/images/events/concert/3.jpg differ diff --git a/game/main_menu.rpy b/game/main_menu.rpy index a080312..08cb13a 100644 --- a/game/main_menu.rpy +++ b/game/main_menu.rpy @@ -21,8 +21,9 @@ screen main_menu(): has vbox - textbutton _("New Game") action Start() + textbutton _("New Game") action Start("EEout_start") textbutton _("Add New Event") action Start("EE_start") + textbutton _("Test Event") action Start("EE_test") textbutton _("Load Game") action ShowMenu("load") textbutton _("Preferences") action ShowMenu("preferences") textbutton _("Help") action Help() @@ -33,4 +34,3 @@ init -2: # Make all the main menu buttons be the same size. style mm_button: size_group "mm" - diff --git a/game/pystuff.py b/game/pystuff.py new file mode 100644 index 0000000..e9f1430 --- /dev/null +++ b/game/pystuff.py @@ -0,0 +1,31 @@ +def addImgs(src, prefix, li): + for file in renpy.list_files(): + if file.startswith(src): + if file.endswith(tuple(exts)): + name = file.replace(src, prefix) + + for space in spaces: + name = name.replace(space, ' ') + + for ext in exts: + name = name.replace(ext,'') + + renpy.image(name, Image(file)) + li.append(name) + +def addBGs(src, prefix = 'bg'): + addImgs(src, prefix, bgs) + +def addEVs(src, prefix = 'event'): + addImgs(src, prefix, ev_bgs) + +def addChs(src, prefix = ''): + addImgs(src, prefix, characters) + +try: + from tkinter import Tk + from tkinter.filedialog import askdirectory as ask + +except ImportError: + from Tkinter import Tk + from tkFileDialog import askdirectory as ask