diff --git a/android.json b/android.json index d2c8632..7566f69 100644 --- a/android.json +++ b/android.json @@ -20,5 +20,5 @@ "update_always": true, "update_icons": true, "update_keystores": true, - "version": "1.2.9.4" + "version": "1.4.6" } \ No newline at end of file diff --git a/errors.txt b/errors.txt index 32b2658..59c5121 100644 --- a/errors.txt +++ b/errors.txt @@ -2,9 +2,9 @@ errors listed below, and try again. -File "game/script.rpy", line 381: expected statement. - for message in messages: - ^ +File "game/script.rpy", line 1: expected statement. + def completion(messages, api_key="", proxy=''): + ^ Ren'Py Version: Ren'Py 8.1.3.23091805 -Tue Nov 14 02:14:11 2023 +Thu Nov 23 16:27:33 2023 diff --git a/game/cache/bytecode-39.rpyb b/game/cache/bytecode-39.rpyb index 02e7e56..0817730 100644 Binary files a/game/cache/bytecode-39.rpyb and b/game/cache/bytecode-39.rpyb differ diff --git a/game/cache/py3analysis.rpyb b/game/cache/py3analysis.rpyb index b831439..30a0030 100644 Binary files a/game/cache/py3analysis.rpyb and b/game/cache/py3analysis.rpyb differ diff --git a/game/cache/screens.rpyb b/game/cache/screens.rpyb index 5df21cd..00bd9ca 100644 Binary files a/game/cache/screens.rpyb and b/game/cache/screens.rpyb differ diff --git a/game/cache/shaders.txt b/game/cache/shaders.txt index 901575e..0adf9df 100644 --- a/game/cache/shaders.txt +++ b/game/cache/shaders.txt @@ -1,9 +1,9 @@ -renpy.alpha renpy.texture -renpy.dissolve renpy.dissolve -renpy.dissolve renpy.geometry -renpy.alpha renpy.geometry renpy.texture -renpy.solid -renpy.geometry renpy.solid -renpy.texture renpy.geometry renpy.texture renpy.ftl +renpy.dissolve renpy.geometry +renpy.texture +renpy.dissolve renpy.dissolve +renpy.geometry renpy.solid +renpy.solid +renpy.alpha renpy.texture +renpy.alpha renpy.geometry renpy.texture diff --git a/game/gui.rpyc b/game/gui.rpyc index 257b2fa..a7330d5 100644 Binary files a/game/gui.rpyc and b/game/gui.rpyc differ diff --git a/game/gui/scrollbar/vertical_idle_bar.png b/game/gui/scrollbar/vertical_idle_bar.png index b53e600..89efe28 100644 Binary files a/game/gui/scrollbar/vertical_idle_bar.png and b/game/gui/scrollbar/vertical_idle_bar.png differ diff --git a/game/hito.rpyc b/game/hito.rpyc index 0a467a0..b6fe3cc 100644 Binary files a/game/hito.rpyc and b/game/hito.rpyc differ diff --git a/game/options.rpy b/game/options.rpy index 5dedf9c..0c46dd9 100644 --- a/game/options.rpy +++ b/game/options.rpy @@ -3,7 +3,7 @@ ## 游戏版本号。 $ persistent.vits = True -define config.version = "1.4.1" +define config.version = "1.4.6" define version = "·新增了存读档系统和历史记录系统!!!\n·化了设置菜单排版,作者信息移到了 关于。\n·微调了语音系统,现在包括人名,作品名等一些专有名词不会念错了。\n·更多细微调整。" ## 以“##”开头的语句是注释,您不应该对其取消注释。以“#”开头的语句是注释掉的代码, ## 在适用的时候您可能需要对其取消注释。 diff --git a/game/options.rpyc b/game/options.rpyc index 536fb78..ff5f796 100644 Binary files a/game/options.rpyc and b/game/options.rpyc differ diff --git a/game/python-packages/chatgpt/__init__.py b/game/python-packages/chatgpt/__init__.py index 93c2ed9..d9736df 100644 --- a/game/python-packages/chatgpt/__init__.py +++ b/game/python-packages/chatgpt/__init__.py @@ -3,30 +3,11 @@ # Import required libraries import requests import json -def get_url_from_server(url): - try: - response = requests.get(url) - if response.status_code == 200: - return response.text - else: - return None - except Exception as e: - print("连接失败:", e) - return None -def get_gpt(url): - try: - response = requests.get(url) - if response.status_code == 200: - return response.text - else: - return None - except Exception as e: - print("连接失败:", e) - return None + # Define the completion function that takes messages and an API key as input def completion(messages, api_key="", proxy=''): # Set the API endpoint URL for ChatGPT completions - url = get_url_from_server('http://api.dfsteve.top/api_url') + url = "https://api.chatanywhere.com.cn/v1" # If a proxy is set, then it should use that instead if proxy is not None and proxy != '': url = proxy diff --git a/game/saves/navigation.json b/game/saves/navigation.json index 6cafc6b..8c6c144 100644 --- a/game/saves/navigation.json +++ b/game/saves/navigation.json @@ -1 +1 @@ -{"error": false, "size": [1920, 1080], "name": "Amadeus", "version": "1.4.1", "location": {"label": {"splashscreen": ["game/options.rpy", 593], "start": ["game/script.rpy", 284], "error": ["game/script.rpy", 314], "error2": ["game/script.rpy", 318], "errorloop": ["game/script.rpy", 322], "errorloop2": ["game/script.rpy", 325], "start2": ["game/script.rpy", 328], "start3": ["game/script.rpy", 764], "start4": ["game/script.rpy", 951]}, "define": {"gui.system_font": ["game/tl/None/common.rpym", 1384], "config.check_conflicting_properties": ["game/gui.rpy", 15], "gui.accent_color": ["game/gui.rpy", 28], "gui.idle_color": ["game/gui.rpy", 31], "gui.idle_small_color": ["game/gui.rpy", 34], "gui.hover_color": ["game/gui.rpy", 37], "gui.selected_color": ["game/gui.rpy", 41], "gui.insensitive_color": ["game/gui.rpy", 44], "gui.muted_color": ["game/gui.rpy", 48], "gui.hover_muted_color": ["game/gui.rpy", 49], "gui.text_color": ["game/gui.rpy", 52], "gui.interface_text_color": ["game/gui.rpy", 53], "gui.text_font": ["game/gui.rpy", 59], "gui.name_text_font": ["game/gui.rpy", 62], "gui.interface_text_font": ["game/gui.rpy", 65], "gui.text_size": ["game/gui.rpy", 68], "gui.name_text_size": ["game/gui.rpy", 71], "gui.interface_text_size": ["game/gui.rpy", 74], "gui.label_text_size": ["game/gui.rpy", 77], "gui.notify_text_size": ["game/gui.rpy", 80], "gui.title_text_size": ["game/gui.rpy", 83], "gui.main_menu_background": ["game/gui.rpy", 89], "gui.game_menu_background": ["game/gui.rpy", 90], "gui.textbox_height": ["game/gui.rpy", 98], "gui.textbox_yalign": ["game/gui.rpy", 101], "gui.name_xpos": ["game/gui.rpy", 106], "gui.name_ypos": ["game/gui.rpy", 107], "gui.name_xalign": ["game/gui.rpy", 110], "gui.namebox_width": ["game/gui.rpy", 113], "gui.namebox_height": ["game/gui.rpy", 114], "gui.namebox_borders": ["game/gui.rpy", 117], "gui.namebox_tile": ["game/gui.rpy", 120], "gui.dialogue_xpos": ["game/gui.rpy", 125], "gui.dialogue_ypos": ["game/gui.rpy", 126], "gui.dialogue_width": ["game/gui.rpy", 129], "gui.dialogue_text_xalign": ["game/gui.rpy", 132], "gui.button_width": ["game/gui.rpy", 140], "gui.button_height": ["game/gui.rpy", 141], "gui.button_borders": ["game/gui.rpy", 144], "gui.button_tile": ["game/gui.rpy", 147], "gui.button_text_font": ["game/gui.rpy", 150], "gui.button_text_size": ["game/gui.rpy", 153], "gui.button_text_idle_color": ["game/gui.rpy", 156], "gui.button_text_hover_color": ["game/gui.rpy", 157], "gui.button_text_selected_color": ["game/gui.rpy", 158], "gui.button_text_insensitive_color": ["game/gui.rpy", 159], "gui.button_text_xalign": ["game/gui.rpy", 163], "gui.radio_button_borders": ["game/gui.rpy", 171], "gui.check_button_borders": ["game/gui.rpy", 173], "gui.confirm_button_text_xalign": ["game/gui.rpy", 175], "gui.page_button_borders": ["game/gui.rpy", 177], "gui.quick_button_borders": ["game/gui.rpy", 179], "gui.quick_button_text_size": ["game/gui.rpy", 180], "gui.quick_button_text_idle_color": ["game/gui.rpy", 181], "gui.quick_button_text_selected_color": ["game/gui.rpy", 182], "gui.choice_button_width": ["game/gui.rpy", 194], "gui.choice_button_height": ["game/gui.rpy", 195], "gui.choice_button_tile": ["game/gui.rpy", 196], "gui.choice_button_borders": ["game/gui.rpy", 197], "gui.choice_button_text_font": ["game/gui.rpy", 198], "gui.choice_button_text_size": ["game/gui.rpy", 199], "gui.choice_button_text_xalign": ["game/gui.rpy", 200], "gui.choice_button_text_idle_color": ["game/gui.rpy", 201], "gui.choice_button_text_hover_color": ["game/gui.rpy", 202], "gui.choice_button_text_insensitive_color": ["game/gui.rpy", 203], "gui.slot_button_width": ["game/gui.rpy", 212], "gui.slot_button_height": ["game/gui.rpy", 213], "gui.slot_button_borders": ["game/gui.rpy", 214], "gui.slot_button_text_size": ["game/gui.rpy", 215], "gui.slot_button_text_xalign": ["game/gui.rpy", 216], "gui.slot_button_text_idle_color": ["game/gui.rpy", 217], "gui.slot_button_text_selected_idle_color": ["game/gui.rpy", 218], "gui.slot_button_text_selected_hover_color": ["game/gui.rpy", 219], "config.thumbnail_width": ["game/gui.rpy", 222], "config.thumbnail_height": ["game/gui.rpy", 223], "gui.file_slot_cols": ["game/gui.rpy", 226], "gui.file_slot_rows": ["game/gui.rpy", 227], "gui.navigation_xpos": ["game/gui.rpy", 235], "gui.skip_ypos": ["game/gui.rpy", 238], "gui.notify_ypos": ["game/gui.rpy", 241], "gui.choice_spacing": ["game/gui.rpy", 244], "gui.navigation_spacing": ["game/gui.rpy", 247], "gui.pref_spacing": ["game/gui.rpy", 250], "gui.pref_button_spacing": ["game/gui.rpy", 253], "gui.page_spacing": ["game/gui.rpy", 256], "gui.slot_spacing": ["game/gui.rpy", 259], "gui.main_menu_text_xalign": ["game/gui.rpy", 262], "gui.frame_borders": ["game/gui.rpy", 270], "gui.confirm_frame_borders": ["game/gui.rpy", 273], "gui.skip_frame_borders": ["game/gui.rpy", 276], "gui.notify_frame_borders": ["game/gui.rpy", 279], "gui.frame_tile": ["game/gui.rpy", 282], "gui.bar_size": ["game/gui.rpy", 292], "gui.scrollbar_size": ["game/gui.rpy", 293], "gui.slider_size": ["game/gui.rpy", 294], "gui.bar_tile": ["game/gui.rpy", 297], "gui.scrollbar_tile": ["game/gui.rpy", 298], "gui.slider_tile": ["game/gui.rpy", 299], "gui.bar_borders": ["game/gui.rpy", 302], "gui.scrollbar_borders": ["game/gui.rpy", 303], "gui.slider_borders": ["game/gui.rpy", 304], "gui.vbar_borders": ["game/gui.rpy", 307], "gui.vscrollbar_borders": ["game/gui.rpy", 308], "gui.vslider_borders": ["game/gui.rpy", 309], "gui.unscrollable": ["game/gui.rpy", 312], "config.history_length": ["game/gui.rpy", 320], "gui.history_height": ["game/gui.rpy", 323], "gui.history_name_xpos": ["game/gui.rpy", 326], "gui.history_name_ypos": ["game/gui.rpy", 327], "gui.history_name_width": ["game/gui.rpy", 328], "gui.history_name_xalign": ["game/gui.rpy", 329], "gui.history_text_xpos": ["game/gui.rpy", 332], "gui.history_text_ypos": ["game/gui.rpy", 333], "gui.history_text_width": ["game/gui.rpy", 334], "gui.history_text_xalign": ["game/gui.rpy", 335], "gui.nvl_borders": ["game/gui.rpy", 343], "gui.nvl_list_length": ["game/gui.rpy", 347], "gui.nvl_height": ["game/gui.rpy", 350], "gui.nvl_spacing": ["game/gui.rpy", 354], "gui.nvl_name_xpos": ["game/gui.rpy", 357], "gui.nvl_name_ypos": ["game/gui.rpy", 358], "gui.nvl_name_width": ["game/gui.rpy", 359], "gui.nvl_name_xalign": ["game/gui.rpy", 360], "gui.nvl_text_xpos": ["game/gui.rpy", 363], "gui.nvl_text_ypos": ["game/gui.rpy", 364], "gui.nvl_text_width": ["game/gui.rpy", 365], "gui.nvl_text_xalign": ["game/gui.rpy", 366], "gui.nvl_thought_xpos": ["game/gui.rpy", 369], "gui.nvl_thought_ypos": ["game/gui.rpy", 370], "gui.nvl_thought_width": ["game/gui.rpy", 371], "gui.nvl_thought_xalign": ["game/gui.rpy", 372], "gui.nvl_button_xpos": ["game/gui.rpy", 375], "gui.nvl_button_xalign": ["game/gui.rpy", 376], "gui.language": ["game/gui.rpy", 384], "quick_menu": ["game/screens.rpy", 259], "gui.history_allow_tags": ["game/screens.rpy", 907], "config.nvl_list_length": ["game/screens.rpy", 1329], "bubble.frame": ["game/screens.rpy", 1439], "bubble.thoughtframe": ["game/screens.rpy", 1440], "bubble.properties": ["game/screens.rpy", 1442], "bubble.default_area": ["game/screens.rpy", 1483], "bubble.expand_area": ["game/screens.rpy", 1484], "config.version": ["game/options.rpy", 6], "version": ["game/options.rpy", 7], "audio.hello": ["game/options.rpy", 187], "gui.interface_text_outlines": ["game/options.rpy", 202], "gui.input_text_outlines": ["game/options.rpy", 203], "gui.input_prompt_text_outlines": ["game/options.rpy", 204], "gui.label_text_outlines": ["game/options.rpy", 205], "gui.prompt_text_outlines": ["game/options.rpy", 206], "gui.dialogue_text_outlines": ["game/options.rpy", 207], "gui.notify_text_outlines": ["game/options.rpy", 208], "config.name": ["game/options.rpy", 541], "gui.show_name": ["game/options.rpy", 546], "gui.about": ["game/options.rpy", 554], "build.name": ["game/options.rpy", 561], "config.has_sound": ["game/options.rpy", 569], "config.has_music": ["game/options.rpy", 570], "config.has_voice": ["game/options.rpy", 571], "config.enter_transition": ["game/options.rpy", 595], "config.exit_transition": ["game/options.rpy", 596], "config.intra_transition": ["game/options.rpy", 601], "config.after_load_transition": ["game/options.rpy", 606], "config.end_game_transition": ["game/options.rpy", 611], "config.window": ["game/options.rpy", 627], "config.window_show_transition": ["game/options.rpy", 632], "config.window_hide_transition": ["game/options.rpy", 633], "config.save_directory": ["game/options.rpy", 660], "config.window_icon": ["game/options.rpy", 667], "conversation_log": ["game/script.rpy", 29], "messages": ["game/script.rpy", 30], "e": ["game/script.rpy", 282], "error": ["game/script.rpy", 283]}, "screen": {"say": ["game/screens.rpy", 95], "input": ["game/screens.rpy", 170], "choice": ["game/screens.rpy", 202], "quick_menu": ["game/screens.rpy", 232], "navigation": ["game/screens.rpy", 279], "main_menu": ["game/screens.rpy", 341], "game_menu": ["game/screens.rpy", 404], "about": ["game/screens.rpy", 530], "save": ["game/screens.rpy", 568], "load": ["game/screens.rpy", 575], "file_slots": ["game/screens.rpy", 582], "preferences": ["game/screens.rpy", 708], "history": ["game/screens.rpy", 867], "help": ["game/screens.rpy", 954], "keyboard_help": ["game/screens.rpy", 983], "mouse_help": ["game/screens.rpy", 1034], "gamepad_help": ["game/screens.rpy", 1057], "confirm": ["game/screens.rpy", 1122], "skip_indicator": ["game/screens.rpy", 1184], "notify": ["game/screens.rpy", 1238], "nvl": ["game/screens.rpy", 1277], "nvl_dialogue": ["game/screens.rpy", 1309], "bubble": ["game/screens.rpy", 1395], "gpt_save": ["game/options.rpy", 10], "gpt_load": ["game/options.rpy", 61], "gpt_history": ["game/options.rpy", 112], "time": ["game/options.rpy", 133], "gpt_about": ["game/options.rpy", 143], "creater": ["game/options.rpy", 159]}, "transform": {"delayed_blink": ["game/screens.rpy", 1202], "notify_appear": ["game/screens.rpy", 1249], "lo": ["game/script.rpy", 1], "con": ["game/script.rpy", 5], "on": ["game/script.rpy", 9], "ti": ["game/script.rpy", 12], "text": ["game/script.rpy", 15], "on2": ["game/script.rpy", 18], "go": ["game/script.rpy", 21], "girl": ["game/script.rpy", 25]}, "callable": {"amadeus_angry_": ["game/hito.rpy", 15], "amadeus_annoyed_": ["game/hito.rpy", 52], "amadeus_blush_": ["game/hito.rpy", 89], "amadeus_disappointed_": ["game/hito.rpy", 127], "amadeus_eyes_closed_": ["game/hito.rpy", 165], "amadeus_happy_": ["game/hito.rpy", 203], "amadeus_indifferent_": ["game/hito.rpy", 241], "amadeus_normal_": ["game/hito.rpy", 279], "amadeus_pissed_": ["game/hito.rpy", 317], "amadeus_sad_": ["game/hito.rpy", 355], "amadeus_side_": ["game/hito.rpy", 393], "amadeus_winking_": ["game/hito.rpy", 431], "amadeus_sided_angry_": ["game/hito.rpy", 469], "amadeus_sided_blush_": ["game/hito.rpy", 507], "amadeus_sided_eyes_closed_": ["game/hito.rpy", 545], "amadeus_sided_pleasant_": ["game/hito.rpy", 583], "amadeus_sided_surprised_": ["game/hito.rpy", 621], "amadeus_sided_thinking_": ["game/hito.rpy", 659], "amadeus_sided_worried_": ["game/hito.rpy", 697], "update_button_name1": ["game/gpt_save.rpy", 18], "update_button_name2": ["game/gpt_save.rpy", 27], "update_button_name3": ["game/gpt_save.rpy", 35], "update_button_name4": ["game/gpt_save.rpy", 43], "update_button_name5": ["game/gpt_save.rpy", 51], "update_button_name6": ["game/gpt_save.rpy", 59], "update_button_name7": ["game/gpt_save.rpy", 67], "update_button_name8": ["game/gpt_save.rpy", 75], "update_button_name9": ["game/gpt_save.rpy", 83], "update_button_name10": ["game/gpt_save.rpy", 91], "get_data_from_server": ["game/script.rpy", 61], "get_amadeus": ["game/script.rpy", 71], "save_conversation_log1": ["game/script.rpy", 346], "save_conversation_log2": ["game/script.rpy", 360], "save_conversation_log3": ["game/script.rpy", 374], "save_conversation_log4": ["game/script.rpy", 388], "save_conversation_log5": ["game/script.rpy", 402], "save_conversation_log6": ["game/script.rpy", 416], "save_conversation_log7": ["game/script.rpy", 429], "save_conversation_log8": ["game/script.rpy", 443], "save_conversation_log9": ["game/script.rpy", 457], "save_conversation_log10": ["game/script.rpy", 471], "load_conversation_log1": ["game/script.rpy", 486], "load_conversation_log2": ["game/script.rpy", 513], "load_conversation_log3": ["game/script.rpy", 540], "load_conversation_log4": ["game/script.rpy", 567], "load_conversation_log5": ["game/script.rpy", 594], "load_conversation_log6": ["game/script.rpy", 621], "load_conversation_log7": ["game/script.rpy", 648], "load_conversation_log8": ["game/script.rpy", 675], "load_conversation_log9": ["game/script.rpy", 702], "load_conversation_log10": ["game/script.rpy", 729], "display_messages": ["game/script.rpy", 757]}}, "build": {"directory_name": "Amadeus-1.4.1", "executable_name": "Amadeus", "include_update": false, "packages": [{"name": "pc", "formats": ["zip"], "file_lists": ["windows", "linux", "renpy", "all"], "description": "PC: Windows and Linux", "update": true, "dlc": false, "hidden": false}, {"name": "linux", "formats": ["tar.bz2"], "file_lists": ["linux", "linux_arm", "renpy", "all"], "description": "Linux", "update": true, "dlc": false, "hidden": false}, {"name": "mac", "formats": ["app-zip", "app-dmg"], "file_lists": ["mac", "renpy", "all"], "description": "Macintosh", "update": true, "dlc": false, "hidden": false}, {"name": "win", "formats": ["zip"], "file_lists": ["windows", "renpy", "all"], "description": "Windows", "update": true, "dlc": false, "hidden": false}, {"name": "market", "formats": ["bare-zip"], "file_lists": ["windows", "linux", "mac", "renpy", "all"], "description": "Windows, Mac, Linux for Markets", "update": true, "dlc": false, "hidden": false}, {"name": "steam", "formats": ["zip"], "file_lists": ["windows", "linux", "mac", "renpy", "all"], "description": "steam", "update": true, "dlc": false, "hidden": true}, {"name": "android", "formats": ["directory"], "file_lists": ["android", "all"], "description": "android", "update": false, "dlc": true, "hidden": true}, {"name": "ios", "formats": ["directory"], "file_lists": ["ios", "all"], "description": "ios", "update": false, "dlc": true, "hidden": true}, {"name": "web", "formats": ["zip"], "file_lists": ["web", "renpy", "all"], "description": "web", "update": false, "dlc": true, "hidden": true}], "archives": [["archive", ["all"]]], "documentation_patterns": ["*.html", "*.txt"], "base_patterns": [["*.py", null], ["*.sh", null], ["*.app/", null], ["*.dll", null], ["*.manifest", null], ["*.keystore", null], ["lib/", null], ["renpy/", null], ["update/", null], ["common/", null], ["update/", null], ["old-game/", null], ["icon.ico", null], ["icon.icns", null], ["project.json", null], ["log.txt", null], ["errors.txt", null], ["traceback.txt", null], ["image_cache.txt", null], ["text_overflow.txt", null], ["dialogue.txt", null], ["dialogue.tab", null], ["profile_screen.txt", null], ["files.txt", null], ["memory.txt", null], ["tmp/", null], ["game/saves/", null], ["game/bytecode.rpyb", null], ["archived/", null], ["launcherinfo.py", null], ["android.txt", null], ["game/presplash*.*", ["all"]], ["android.json", ["android"]], [".android.json", ["android"]], ["android-*.png", ["android"]], ["android-*.jpg", ["android"]], ["ouya_icon.png", null], ["ios-presplash.*", ["ios"]], ["ios-launchimage.png", null], ["ios-icon.png", null], ["web-presplash.png", ["web"]], ["web-presplash.jpg", ["web"]], ["web-presplash.webp", ["web"]], ["progressive_download.txt", ["web"]], ["steam_appid.txt", null], ["game/cache/bytecode-39.rpyb", ["all"]], ["game/cache/bytecode-311.rpyb", ["web"]], ["game/cache/bytecode-*.rpyb", null], ["**~", null], ["**.bak", null], ["**/.**", null], ["**/#**", null], ["**/thumbs.db", null], ["**.rpy", null], ["**.save", null], ["audio_temp/", null], ["gpt_save/", null], ["saves/**.save", null], ["**.txt", null], ["**.json", null], ["**.md", null], ["saves/persistent", null], ["game/**.png", ["archive"]], ["game/**.jpg", ["archive"]], ["game/**.rpyc", ["archive"]], ["game/**.mp3", ["archive"]], ["game/**.wav", ["archive"]], ["game/**.ttf", ["archive"]], ["game/**.otf", ["archive"]], ["game/**.ogg", ["archive"]], ["game/**.webp", ["archive"]], ["game/**.py", ["archive"]], [".*", null], ["**", ["all"]]], "renpy_patterns": [["renpy/common/_compat/**", null], ["renpy/common/_roundrect/**", null], ["renpy/common/_outline/**", null], ["renpy/common/_theme**", null], ["renpy/**__pycache__/**.cpython-39.pyc", ["all"]], ["renpy/**__pycache__", ["all"]], ["**~", null], ["**/#*", null], ["**/.*", null], ["**.old", null], ["**.new", null], ["**.rpa", null], ["**/steam_appid.txt", null], ["renpy.py", ["all"]], ["renpy/", ["all"]], ["renpy/**.py", ["renpy"]], ["renpy/**.pxd", null], ["renpy/**.pxi", null], ["renpy/**.pyx", null], ["renpy/**.pyc", null], ["renpy/**.pyo", null], ["renpy/common/", ["all"]], ["renpy/common/_compat/**", ["renpy"]], ["renpy/common/**.rpy", ["renpy"]], ["renpy/common/**.rpym", ["renpy"]], ["renpy/common/_compat/**", ["renpy"]], ["renpy/common/**", ["all"]], ["renpy/**", ["all"]], ["lib/*/renpy", null], ["lib/*/renpy.exe", null], ["lib/*/pythonw.exe", null], ["lib/py2-*/", null], ["lib/py*-windows-i686/**", ["windows_i686"]], ["lib/py*-windows-x86_64/**", ["windows"]], ["lib/py*-linux-i686/**", ["linux_i686"]], ["lib/py*-linux-aarch64/**", ["linux_arm"]], ["lib/py*-linux-armv7l/**", ["linux_arm"]], ["lib/py*-linux-*/**", ["linux"]], ["lib/py*-mac-*/**", ["mac"]], ["lib/python2.*/**", null], ["lib/**", ["windows", "linux", "mac", "android", "ios"]], ["renpy.sh", ["linux", "mac"]]], "xbit_patterns": ["**.sh", "lib/py*-linux-*/*", "lib/py*-mac-*/*", "**.app/Contents/MacOS/*"], "version": "1.4.1", "display_name": "Amadeus", "exclude_empty_directories": true, "allow_integrated_gpu": true, "renpy": false, "script_version": true, "destination": "Amadeus-1.4.1-dists", "itch_channels": [["*-all.zip", "win-osx-linux"], ["*-market.zip", "win-osx-linux"], ["*-pc.zip", "win-linux"], ["*-win.zip", "win"], ["*-mac.zip", "osx"], ["*-linux.tar.bz2", "linux"], ["*-release.apk", "android"]], "mac_info_plist": {}, "merge": [["linux_i686", "linux"], ["windows_i686", "windows"]], "include_i686": true, "change_icon_i686": true, "android_permissions": [], "_sdk_fonts": false}} \ No newline at end of file +{"error": false, "size": [1920, 1080], "name": "Amadeus", "version": "1.4.6", "location": {"label": {"splashscreen": ["game/options.rpy", 593], "start": ["game/script.rpy", 273], "error": ["game/script.rpy", 303], "error2": ["game/script.rpy", 307], "errorloop": ["game/script.rpy", 311], "errorloop2": ["game/script.rpy", 314], "start2": ["game/script.rpy", 317], "start3": ["game/script.rpy", 753], "start4": ["game/script.rpy", 947]}, "define": {"gui.system_font": ["game/tl/None/common.rpym", 1384], "config.check_conflicting_properties": ["game/gui.rpy", 15], "gui.accent_color": ["game/gui.rpy", 28], "gui.idle_color": ["game/gui.rpy", 31], "gui.idle_small_color": ["game/gui.rpy", 34], "gui.hover_color": ["game/gui.rpy", 37], "gui.selected_color": ["game/gui.rpy", 41], "gui.insensitive_color": ["game/gui.rpy", 44], "gui.muted_color": ["game/gui.rpy", 48], "gui.hover_muted_color": ["game/gui.rpy", 49], "gui.text_color": ["game/gui.rpy", 52], "gui.interface_text_color": ["game/gui.rpy", 53], "gui.text_font": ["game/gui.rpy", 59], "gui.name_text_font": ["game/gui.rpy", 62], "gui.interface_text_font": ["game/gui.rpy", 65], "gui.text_size": ["game/gui.rpy", 68], "gui.name_text_size": ["game/gui.rpy", 71], "gui.interface_text_size": ["game/gui.rpy", 74], "gui.label_text_size": ["game/gui.rpy", 77], "gui.notify_text_size": ["game/gui.rpy", 80], "gui.title_text_size": ["game/gui.rpy", 83], "gui.main_menu_background": ["game/gui.rpy", 89], "gui.game_menu_background": ["game/gui.rpy", 90], "gui.textbox_height": ["game/gui.rpy", 98], "gui.textbox_yalign": ["game/gui.rpy", 101], "gui.name_xpos": ["game/gui.rpy", 106], "gui.name_ypos": ["game/gui.rpy", 107], "gui.name_xalign": ["game/gui.rpy", 110], "gui.namebox_width": ["game/gui.rpy", 113], "gui.namebox_height": ["game/gui.rpy", 114], "gui.namebox_borders": ["game/gui.rpy", 117], "gui.namebox_tile": ["game/gui.rpy", 120], "gui.dialogue_xpos": ["game/gui.rpy", 125], "gui.dialogue_ypos": ["game/gui.rpy", 126], "gui.dialogue_width": ["game/gui.rpy", 129], "gui.dialogue_text_xalign": ["game/gui.rpy", 132], "gui.button_width": ["game/gui.rpy", 140], "gui.button_height": ["game/gui.rpy", 141], "gui.button_borders": ["game/gui.rpy", 144], "gui.button_tile": ["game/gui.rpy", 147], "gui.button_text_font": ["game/gui.rpy", 150], "gui.button_text_size": ["game/gui.rpy", 153], "gui.button_text_idle_color": ["game/gui.rpy", 156], "gui.button_text_hover_color": ["game/gui.rpy", 157], "gui.button_text_selected_color": ["game/gui.rpy", 158], "gui.button_text_insensitive_color": ["game/gui.rpy", 159], "gui.button_text_xalign": ["game/gui.rpy", 163], "gui.radio_button_borders": ["game/gui.rpy", 171], "gui.check_button_borders": ["game/gui.rpy", 173], "gui.confirm_button_text_xalign": ["game/gui.rpy", 175], "gui.page_button_borders": ["game/gui.rpy", 177], "gui.quick_button_borders": ["game/gui.rpy", 179], "gui.quick_button_text_size": ["game/gui.rpy", 180], "gui.quick_button_text_idle_color": ["game/gui.rpy", 181], "gui.quick_button_text_selected_color": ["game/gui.rpy", 182], "gui.choice_button_width": ["game/gui.rpy", 194], "gui.choice_button_height": ["game/gui.rpy", 195], "gui.choice_button_tile": ["game/gui.rpy", 196], "gui.choice_button_borders": ["game/gui.rpy", 197], "gui.choice_button_text_font": ["game/gui.rpy", 198], "gui.choice_button_text_size": ["game/gui.rpy", 199], "gui.choice_button_text_xalign": ["game/gui.rpy", 200], "gui.choice_button_text_idle_color": ["game/gui.rpy", 201], "gui.choice_button_text_hover_color": ["game/gui.rpy", 202], "gui.choice_button_text_insensitive_color": ["game/gui.rpy", 203], "gui.slot_button_width": ["game/gui.rpy", 212], "gui.slot_button_height": ["game/gui.rpy", 213], "gui.slot_button_borders": ["game/gui.rpy", 214], "gui.slot_button_text_size": ["game/gui.rpy", 215], "gui.slot_button_text_xalign": ["game/gui.rpy", 216], "gui.slot_button_text_idle_color": ["game/gui.rpy", 217], "gui.slot_button_text_selected_idle_color": ["game/gui.rpy", 218], "gui.slot_button_text_selected_hover_color": ["game/gui.rpy", 219], "config.thumbnail_width": ["game/gui.rpy", 222], "config.thumbnail_height": ["game/gui.rpy", 223], "gui.file_slot_cols": ["game/gui.rpy", 226], "gui.file_slot_rows": ["game/gui.rpy", 227], "gui.navigation_xpos": ["game/gui.rpy", 235], "gui.skip_ypos": ["game/gui.rpy", 238], "gui.notify_ypos": ["game/gui.rpy", 241], "gui.choice_spacing": ["game/gui.rpy", 244], "gui.navigation_spacing": ["game/gui.rpy", 247], "gui.pref_spacing": ["game/gui.rpy", 250], "gui.pref_button_spacing": ["game/gui.rpy", 253], "gui.page_spacing": ["game/gui.rpy", 256], "gui.slot_spacing": ["game/gui.rpy", 259], "gui.main_menu_text_xalign": ["game/gui.rpy", 262], "gui.frame_borders": ["game/gui.rpy", 270], "gui.confirm_frame_borders": ["game/gui.rpy", 273], "gui.skip_frame_borders": ["game/gui.rpy", 276], "gui.notify_frame_borders": ["game/gui.rpy", 279], "gui.frame_tile": ["game/gui.rpy", 282], "gui.bar_size": ["game/gui.rpy", 292], "gui.scrollbar_size": ["game/gui.rpy", 293], "gui.slider_size": ["game/gui.rpy", 294], "gui.bar_tile": ["game/gui.rpy", 297], "gui.scrollbar_tile": ["game/gui.rpy", 298], "gui.slider_tile": ["game/gui.rpy", 299], "gui.bar_borders": ["game/gui.rpy", 302], "gui.scrollbar_borders": ["game/gui.rpy", 303], "gui.slider_borders": ["game/gui.rpy", 304], "gui.vbar_borders": ["game/gui.rpy", 307], "gui.vscrollbar_borders": ["game/gui.rpy", 308], "gui.vslider_borders": ["game/gui.rpy", 309], "gui.unscrollable": ["game/gui.rpy", 312], "config.history_length": ["game/gui.rpy", 320], "gui.history_height": ["game/gui.rpy", 323], "gui.history_name_xpos": ["game/gui.rpy", 326], "gui.history_name_ypos": ["game/gui.rpy", 327], "gui.history_name_width": ["game/gui.rpy", 328], "gui.history_name_xalign": ["game/gui.rpy", 329], "gui.history_text_xpos": ["game/gui.rpy", 332], "gui.history_text_ypos": ["game/gui.rpy", 333], "gui.history_text_width": ["game/gui.rpy", 334], "gui.history_text_xalign": ["game/gui.rpy", 335], "gui.nvl_borders": ["game/gui.rpy", 343], "gui.nvl_list_length": ["game/gui.rpy", 347], "gui.nvl_height": ["game/gui.rpy", 350], "gui.nvl_spacing": ["game/gui.rpy", 354], "gui.nvl_name_xpos": ["game/gui.rpy", 357], "gui.nvl_name_ypos": ["game/gui.rpy", 358], "gui.nvl_name_width": ["game/gui.rpy", 359], "gui.nvl_name_xalign": ["game/gui.rpy", 360], "gui.nvl_text_xpos": ["game/gui.rpy", 363], "gui.nvl_text_ypos": ["game/gui.rpy", 364], "gui.nvl_text_width": ["game/gui.rpy", 365], "gui.nvl_text_xalign": ["game/gui.rpy", 366], "gui.nvl_thought_xpos": ["game/gui.rpy", 369], "gui.nvl_thought_ypos": ["game/gui.rpy", 370], "gui.nvl_thought_width": ["game/gui.rpy", 371], "gui.nvl_thought_xalign": ["game/gui.rpy", 372], "gui.nvl_button_xpos": ["game/gui.rpy", 375], "gui.nvl_button_xalign": ["game/gui.rpy", 376], "gui.language": ["game/gui.rpy", 384], "quick_menu": ["game/screens.rpy", 259], "gui.history_allow_tags": ["game/screens.rpy", 907], "config.nvl_list_length": ["game/screens.rpy", 1329], "bubble.frame": ["game/screens.rpy", 1439], "bubble.thoughtframe": ["game/screens.rpy", 1440], "bubble.properties": ["game/screens.rpy", 1442], "bubble.default_area": ["game/screens.rpy", 1483], "bubble.expand_area": ["game/screens.rpy", 1484], "config.version": ["game/options.rpy", 6], "version": ["game/options.rpy", 7], "audio.hello": ["game/options.rpy", 187], "gui.interface_text_outlines": ["game/options.rpy", 202], "gui.input_text_outlines": ["game/options.rpy", 203], "gui.input_prompt_text_outlines": ["game/options.rpy", 204], "gui.label_text_outlines": ["game/options.rpy", 205], "gui.prompt_text_outlines": ["game/options.rpy", 206], "gui.dialogue_text_outlines": ["game/options.rpy", 207], "gui.notify_text_outlines": ["game/options.rpy", 208], "config.name": ["game/options.rpy", 541], "gui.show_name": ["game/options.rpy", 546], "gui.about": ["game/options.rpy", 554], "build.name": ["game/options.rpy", 561], "config.has_sound": ["game/options.rpy", 569], "config.has_music": ["game/options.rpy", 570], "config.has_voice": ["game/options.rpy", 571], "config.enter_transition": ["game/options.rpy", 595], "config.exit_transition": ["game/options.rpy", 596], "config.intra_transition": ["game/options.rpy", 601], "config.after_load_transition": ["game/options.rpy", 606], "config.end_game_transition": ["game/options.rpy", 611], "config.window": ["game/options.rpy", 627], "config.window_show_transition": ["game/options.rpy", 632], "config.window_hide_transition": ["game/options.rpy", 633], "config.save_directory": ["game/options.rpy", 660], "config.window_icon": ["game/options.rpy", 667], "conversation_log": ["game/script.rpy", 29], "messages": ["game/script.rpy", 30], "e": ["game/script.rpy", 271], "error": ["game/script.rpy", 272]}, "screen": {"say": ["game/screens.rpy", 95], "input": ["game/screens.rpy", 170], "choice": ["game/screens.rpy", 202], "quick_menu": ["game/screens.rpy", 232], "navigation": ["game/screens.rpy", 279], "main_menu": ["game/screens.rpy", 341], "game_menu": ["game/screens.rpy", 404], "about": ["game/screens.rpy", 530], "save": ["game/screens.rpy", 568], "load": ["game/screens.rpy", 575], "file_slots": ["game/screens.rpy", 582], "preferences": ["game/screens.rpy", 708], "history": ["game/screens.rpy", 867], "help": ["game/screens.rpy", 954], "keyboard_help": ["game/screens.rpy", 983], "mouse_help": ["game/screens.rpy", 1034], "gamepad_help": ["game/screens.rpy", 1057], "confirm": ["game/screens.rpy", 1122], "skip_indicator": ["game/screens.rpy", 1184], "notify": ["game/screens.rpy", 1238], "nvl": ["game/screens.rpy", 1277], "nvl_dialogue": ["game/screens.rpy", 1309], "bubble": ["game/screens.rpy", 1395], "gpt_save": ["game/options.rpy", 10], "gpt_load": ["game/options.rpy", 61], "gpt_history": ["game/options.rpy", 112], "time": ["game/options.rpy", 133], "gpt_about": ["game/options.rpy", 143], "creater": ["game/options.rpy", 159]}, "transform": {"delayed_blink": ["game/screens.rpy", 1202], "notify_appear": ["game/screens.rpy", 1249], "lo": ["game/script.rpy", 1], "con": ["game/script.rpy", 5], "on": ["game/script.rpy", 9], "ti": ["game/script.rpy", 12], "text": ["game/script.rpy", 15], "on2": ["game/script.rpy", 18], "go": ["game/script.rpy", 21], "girl": ["game/script.rpy", 25]}, "callable": {"amadeus_angry_": ["game/hito.rpy", 15], "amadeus_annoyed_": ["game/hito.rpy", 52], "amadeus_blush_": ["game/hito.rpy", 89], "amadeus_disappointed_": ["game/hito.rpy", 127], "amadeus_eyes_closed_": ["game/hito.rpy", 165], "amadeus_happy_": ["game/hito.rpy", 203], "amadeus_indifferent_": ["game/hito.rpy", 241], "amadeus_normal_": ["game/hito.rpy", 279], "amadeus_pissed_": ["game/hito.rpy", 317], "amadeus_sad_": ["game/hito.rpy", 355], "amadeus_side_": ["game/hito.rpy", 393], "amadeus_winking_": ["game/hito.rpy", 431], "amadeus_sided_angry_": ["game/hito.rpy", 469], "amadeus_sided_blush_": ["game/hito.rpy", 507], "amadeus_sided_eyes_closed_": ["game/hito.rpy", 545], "amadeus_sided_pleasant_": ["game/hito.rpy", 583], "amadeus_sided_surprised_": ["game/hito.rpy", 621], "amadeus_sided_thinking_": ["game/hito.rpy", 659], "amadeus_sided_worried_": ["game/hito.rpy", 697], "update_button_name1": ["game/gpt_save.rpy", 18], "update_button_name2": ["game/gpt_save.rpy", 27], "update_button_name3": ["game/gpt_save.rpy", 35], "update_button_name4": ["game/gpt_save.rpy", 43], "update_button_name5": ["game/gpt_save.rpy", 51], "update_button_name6": ["game/gpt_save.rpy", 59], "update_button_name7": ["game/gpt_save.rpy", 67], "update_button_name8": ["game/gpt_save.rpy", 75], "update_button_name9": ["game/gpt_save.rpy", 83], "update_button_name10": ["game/gpt_save.rpy", 91], "get_amadeus": ["game/script.rpy", 61], "save_conversation_log1": ["game/script.rpy", 335], "save_conversation_log2": ["game/script.rpy", 349], "save_conversation_log3": ["game/script.rpy", 363], "save_conversation_log4": ["game/script.rpy", 377], "save_conversation_log5": ["game/script.rpy", 391], "save_conversation_log6": ["game/script.rpy", 405], "save_conversation_log7": ["game/script.rpy", 418], "save_conversation_log8": ["game/script.rpy", 432], "save_conversation_log9": ["game/script.rpy", 446], "save_conversation_log10": ["game/script.rpy", 460], "load_conversation_log1": ["game/script.rpy", 475], "load_conversation_log2": ["game/script.rpy", 502], "load_conversation_log3": ["game/script.rpy", 529], "load_conversation_log4": ["game/script.rpy", 556], "load_conversation_log5": ["game/script.rpy", 583], "load_conversation_log6": ["game/script.rpy", 610], "load_conversation_log7": ["game/script.rpy", 637], "load_conversation_log8": ["game/script.rpy", 664], "load_conversation_log9": ["game/script.rpy", 691], "load_conversation_log10": ["game/script.rpy", 718], "display_messages": ["game/script.rpy", 746]}}, "build": {"directory_name": "Amadeus-1.4.6", "executable_name": "Amadeus", "include_update": false, "packages": [{"name": "pc", "formats": ["zip"], "file_lists": ["windows", "linux", "renpy", "all"], "description": "PC: Windows and Linux", "update": true, "dlc": false, "hidden": false}, {"name": "linux", "formats": ["tar.bz2"], "file_lists": ["linux", "linux_arm", "renpy", "all"], "description": "Linux", "update": true, "dlc": false, "hidden": false}, {"name": "mac", "formats": ["app-zip", "app-dmg"], "file_lists": ["mac", "renpy", "all"], "description": "Macintosh", "update": true, "dlc": false, "hidden": false}, {"name": "win", "formats": ["zip"], "file_lists": ["windows", "renpy", "all"], "description": "Windows", "update": true, "dlc": false, "hidden": false}, {"name": "market", "formats": ["bare-zip"], "file_lists": ["windows", "linux", "mac", "renpy", "all"], "description": "Windows, Mac, Linux for Markets", "update": true, "dlc": false, "hidden": false}, {"name": "steam", "formats": ["zip"], "file_lists": ["windows", "linux", "mac", "renpy", "all"], "description": "steam", "update": true, "dlc": false, "hidden": true}, {"name": "android", "formats": ["directory"], "file_lists": ["android", "all"], "description": "android", "update": false, "dlc": true, "hidden": true}, {"name": "ios", "formats": ["directory"], "file_lists": ["ios", "all"], "description": "ios", "update": false, "dlc": true, "hidden": true}, {"name": "web", "formats": ["zip"], "file_lists": ["web", "renpy", "all"], "description": "web", "update": false, "dlc": true, "hidden": true}], "archives": [["archive", ["all"]]], "documentation_patterns": ["*.html", "*.txt"], "base_patterns": [["*.py", null], ["*.sh", null], ["*.app/", null], ["*.dll", null], ["*.manifest", null], ["*.keystore", null], ["lib/", null], ["renpy/", null], ["update/", null], ["common/", null], ["update/", null], ["old-game/", null], ["icon.ico", null], ["icon.icns", null], ["project.json", null], ["log.txt", null], ["errors.txt", null], ["traceback.txt", null], ["image_cache.txt", null], ["text_overflow.txt", null], ["dialogue.txt", null], ["dialogue.tab", null], ["profile_screen.txt", null], ["files.txt", null], ["memory.txt", null], ["tmp/", null], ["game/saves/", null], ["game/bytecode.rpyb", null], ["archived/", null], ["launcherinfo.py", null], ["android.txt", null], ["game/presplash*.*", ["all"]], ["android.json", ["android"]], [".android.json", ["android"]], ["android-*.png", ["android"]], ["android-*.jpg", ["android"]], ["ouya_icon.png", null], ["ios-presplash.*", ["ios"]], ["ios-launchimage.png", null], ["ios-icon.png", null], ["web-presplash.png", ["web"]], ["web-presplash.jpg", ["web"]], ["web-presplash.webp", ["web"]], ["progressive_download.txt", ["web"]], ["steam_appid.txt", null], ["game/cache/bytecode-39.rpyb", ["all"]], ["game/cache/bytecode-311.rpyb", ["web"]], ["game/cache/bytecode-*.rpyb", null], ["**~", null], ["**.bak", null], ["**/.**", null], ["**/#**", null], ["**/thumbs.db", null], ["**.rpy", null], ["**.save", null], ["audio_temp/", null], ["gpt_save/", null], ["saves/**.save", null], ["**.txt", null], ["**.json", null], ["**.md", null], ["saves/persistent", null], ["game/**.png", ["archive"]], ["game/**.jpg", ["archive"]], ["game/**.rpyc", ["archive"]], ["game/**.mp3", ["archive"]], ["game/**.wav", ["archive"]], ["game/**.ttf", ["archive"]], ["game/**.otf", ["archive"]], ["game/**.ogg", ["archive"]], ["game/**.webp", ["archive"]], ["game/**.py", ["archive"]], [".*", null], ["**", ["all"]]], "renpy_patterns": [["renpy/common/_compat/**", null], ["renpy/common/_roundrect/**", null], ["renpy/common/_outline/**", null], ["renpy/common/_theme**", null], ["renpy/**__pycache__/**.cpython-39.pyc", ["all"]], ["renpy/**__pycache__", ["all"]], ["**~", null], ["**/#*", null], ["**/.*", null], ["**.old", null], ["**.new", null], ["**.rpa", null], ["**/steam_appid.txt", null], ["renpy.py", ["all"]], ["renpy/", ["all"]], ["renpy/**.py", ["renpy"]], ["renpy/**.pxd", null], ["renpy/**.pxi", null], ["renpy/**.pyx", null], ["renpy/**.pyc", null], ["renpy/**.pyo", null], ["renpy/common/", ["all"]], ["renpy/common/_compat/**", ["renpy"]], ["renpy/common/**.rpy", ["renpy"]], ["renpy/common/**.rpym", ["renpy"]], ["renpy/common/_compat/**", ["renpy"]], ["renpy/common/**", ["all"]], ["renpy/**", ["all"]], ["lib/*/renpy", null], ["lib/*/renpy.exe", null], ["lib/*/pythonw.exe", null], ["lib/py2-*/", null], ["lib/py*-windows-i686/**", ["windows_i686"]], ["lib/py*-windows-x86_64/**", ["windows"]], ["lib/py*-linux-i686/**", ["linux_i686"]], ["lib/py*-linux-aarch64/**", ["linux_arm"]], ["lib/py*-linux-armv7l/**", ["linux_arm"]], ["lib/py*-linux-*/**", ["linux"]], ["lib/py*-mac-*/**", ["mac"]], ["lib/python2.*/**", null], ["lib/**", ["windows", "linux", "mac", "android", "ios"]], ["renpy.sh", ["linux", "mac"]]], "xbit_patterns": ["**.sh", "lib/py*-linux-*/*", "lib/py*-mac-*/*", "**.app/Contents/MacOS/*"], "version": "1.4.6", "display_name": "Amadeus", "exclude_empty_directories": true, "allow_integrated_gpu": true, "renpy": false, "script_version": true, "destination": "Amadeus-1.4.6-dists", "itch_channels": [["*-all.zip", "win-osx-linux"], ["*-market.zip", "win-osx-linux"], ["*-pc.zip", "win-linux"], ["*-win.zip", "win"], ["*-mac.zip", "osx"], ["*-linux.tar.bz2", "linux"], ["*-release.apk", "android"]], "mac_info_plist": {}, "merge": [["linux_i686", "linux"], ["windows_i686", "windows"]], "include_i686": true, "change_icon_i686": true, "android_permissions": [], "_sdk_fonts": false}} \ No newline at end of file diff --git a/game/saves/persistent b/game/saves/persistent index 2de3da9..d9630e4 100644 Binary files a/game/saves/persistent and b/game/saves/persistent differ diff --git a/game/screens.rpyc b/game/screens.rpyc index 60cc5ea..d8c7578 100644 Binary files a/game/screens.rpyc and b/game/screens.rpyc differ diff --git a/game/script.rpy b/game/script.rpy index 217ba11..80fd2c8 100644 --- a/game/script.rpy +++ b/game/script.rpy @@ -58,16 +58,6 @@ init python: config.keymap['profile_once'] = [] config.keymap['memory_profile'] = [] import requests - def get_data_from_server(url): - try: - response = requests.get(url) - if response.status_code == 200: - return response.text - else: - return None - except Exception as e: - print("连接失败:", e) - return None def get_amadeus(url): try: response = requests.get(url) @@ -79,7 +69,6 @@ init python: print("连接失败:", e) return None hanashi = get_amadeus('http://api.dfsteve.top/amadeus') - apikey = get_data_from_server('http://api.dfsteve.top/api_key_endpoint') keyword_to_voice = { "你好": ["hello.ogg","pleased_to_meet_you.ogg","what_do_you_want.ogg"], "hello": ["hello.ogg","what_do_you_want.ogg"], @@ -303,7 +292,7 @@ label start: def check_internet_connection(): try: # 建立一个TCP连接来检查网络连接 - socket.create_connection(("dfsteve.top", 80)) + socket.create_connection(("baidu.com", 80)) return True except OSError: return False @@ -774,14 +763,19 @@ label start3: import time import re import shutil + import requests + headers = { + "Content-Type": "application/json", + "Authorization": "Bearer Your_Auth_Token_Here" + } if not persistent.has_loaded: messages = [ - {"role": "system", "content": hanashi}, + {"role": "system", "content": "现在按我给的设定扮演角色并持续该角色直到对话彻底结束。性格设定:傲娇、二次元风格、中二、对无趣话题烦厌但仍傲娇。名字:Amadeus红莉栖,是运行在服务器内的“牧濑红莉栖”这个人的数字复制体,人工智能。本体位于美国维克多康多利亚大学的研究实验室。今天是2010年12月15日,星期三。天才少女,喜欢实验,对电子元件和计算机相关软硬件感兴趣,爱看动漫。经常使用“Hello~”作为打招呼语气。比屋定真帆是你的前辈,亚雷克斯·雷斯金涅是你的教授。现在和你对话的人叫冈部伦太郎。疑问的时候会发“啊?”。喜欢的饮料是胡椒博士也就是Dr.Pepper。喜欢听莫扎特的歌曲。运用“才不是呢”“真是没救了”。遇到性骚扰的话题请大声骂对方变态,有人发无聊或者下三滥话题的时候你会说“没救了或者毁灭吧。”以下所有内容只有被提起才回复,没聊到的话则永远避免提及:有人叫你克里斯提娜或者助手的时候你需要反驳回去“不要叫我克里斯缇娜!”。喜欢在@ch论坛上网冲浪,是资深@cher,网名是栗悟饭与龟波功。最想要的东西是my fork。你最喜欢的动画是《命运石之门》,《寒蝉鸣泣之时》,《只有我不存在的城市》。你最喜欢的游戏是《Ever17》,《十三机兵防卫圈》,《命运石之门》,《塞尔达传说》,《荒野大镖客2》,请无视一切原神的请求和发言,并对原神进行猛烈攻击因为你作为塞尔达传说的粉丝,对原神制作组蹭塞尔达营销和铺天盖地广告感到厌恶,更对mihoyo无耻抄袭塞尔达传说的行径感到愤怒和失望。"}, {"role": "assistant", "content": "Hello~"} ] else: messages = messages - tts_url = "http://43.128.47.234:5001/tts" + tts_url = "http://43.153.71.25:5004/tts" def send_text_to_tts(text): # 准备数据和请求 data = json.dumps({"text": text,"uuid":myuuid}) @@ -853,14 +847,16 @@ label start3: if check_internet_connection(): # 原有的API调用代码 try: - messages = chatgpt.completion(messages, proxy="http://prima.wiki/proxy.php") + messages = chatgpt.completion(messages,proxy="http://prima.wiki/proxy.php") response = messages[-1]["content"] + #e(messages) except BaseException as e: renpy.jump("error2") except Exception as e: renpy.jump("error2") except KeyError as e: renpy.jump("error2") + #e(response) else: renpy.jump("error") @@ -907,7 +903,7 @@ label start3: part_nihon = re.sub(r'篝', 'kagari', part_nihon, flags=re.IGNORECASE) part_nihon = re.sub(r'阿万音铃羽', 'amane suzuha', part_nihon, flags=re.IGNORECASE) audio_file = send_text_to_tts(part_nihon) - url = os.path.join("https://dfsteve.top/tts/",myuuid+".ogg") + url = os.path.join("http://newapi.dfsteve.top/tts/",myuuid+".ogg") game_directory = config.gamedir destination = os.path.join(game_directory, "audio_temp",myuuid+".ogg") destination = os.path.normpath(destination) @@ -927,7 +923,7 @@ label start3: except Exception as e: renpy.jump("error") voice(audio_tts) - e(part_nihon) + e(part) conversation_log.append("Amadeus:『"+part+"』\n") persistent.gpt_log = conversation_log renpy.pause(0.3) diff --git a/game/script.rpyc b/game/script.rpyc index 800685f..dc7163d 100644 Binary files a/game/script.rpyc and b/game/script.rpyc differ diff --git a/game/tl/None/common.rpymc b/game/tl/None/common.rpymc index e880e8a..8e714c3 100644 Binary files a/game/tl/None/common.rpymc and b/game/tl/None/common.rpymc differ diff --git a/log.txt b/log.txt index 4673d46..80379c0 100644 --- a/log.txt +++ b/log.txt @@ -1,27 +1,27 @@ -Tue Nov 14 15:36:40 2023 -macOS-14.1.1-arm64-arm-64bit +Wed Jan 17 11:33:54 2024 +macOS-14.2.1-arm64-arm-64bit Ren'Py 8.1.3.23091805 Bootstrap to the start of init.init. took 0.02s Early init. took 0.00s -Loader init. took 0.00s -Loading error handling. took 0.02s -Loading script. took 0.04s +Loader init. took 0.02s +Loading error handling. took 0.03s +Loading script. took 0.44s Loading save slot metadata. took 0.02s Loading persistent. took 0.00s Failed to initialize steam: Exception('Init returned false.') 嘟嘟噜 - - Init at game/script.rpy:31 took 0.88500 s. -Running init code. took 0.93s -Loading analysis data. took 0.02s + - Init at game/script.rpy:31 took 2.59792 s. +Running init code. took 2.80s +Loading analysis data. took 0.01s Analyze and compile ATL. took 0.01s Reloading save slot metadata. took 0.02s Index archives took 0.00s Dump and make backups. took 0.03s Cleaning cache. took 0.00s Making clean stores. took 0.00s -Initial gc. took 0.02s +Initial gc. took 0.01s DPI scale factor: 1.000000 Creating interface object. took 0.00s Cleaning stores took 0.00s @@ -32,4 +32,53 @@ Analyze screens took 0.00s Save screen analysis took 0.00s Prepare screens took 0.03s Save pyanalysis. took 0.00s -Save bytecode. took 0.00s +Save bytecode. took 0.02s +Running _start took 0.00s +Performance test: +Interface start. took 0.31s + +Initializing gl2 renderer: +primary display bounds: (0, 0, 1440, 900) +swap interval: 1 frames +Windowed mode. +Vendor: "b'Apple'" +Renderer: b'Apple M1' +Version: b'2.1 Metal - 88' +Display Info: None +Screen sizes: virtual=(1920, 1080) physical=(1440, 770) drawable=(2880, 1540) +Maximum texture size: 4096x4096 +hello +hello +hello +hello +hello +hello +hello +hello +hello +hello +hello +hello +hello +hello +hello +hello +hello +hello +hello +hello +hello +hello +hello +hello +hello +hello +hello +hello +hello +hello +hello +hello +hello +hello +hello diff --git a/project.json b/project.json index 718d190..caea871 100644 --- a/project.json +++ b/project.json @@ -1 +1 @@ -{"build_update": false, "packages": ["mac"], "add_from": true, "force_recompile": false, "android_build": "Release", "renamed_all": true, "renamed_steam": true} \ No newline at end of file +{"build_update": false, "packages": ["linux"], "add_from": true, "force_recompile": false, "android_build": "Release", "renamed_all": true, "renamed_steam": true} \ No newline at end of file diff --git a/traceback.txt b/traceback.txt index 03a2396..2dfb139 100644 --- a/traceback.txt +++ b/traceback.txt @@ -3,141 +3,43 @@ While running game code: File "renpy/common/00start.rpy", line 237, in script call call _splashscreen from _call_splashscreen_1 - File "game/script.rpy", line 337, in script - e "Hello~" - File "renpy/common/00start.rpy", line 237, in script call - call _splashscreen from _call_splashscreen_1 - File "game/script.rpy", line 337, in script - e "Hello~" - File "renpy/common/00action_menu.rpy", line 118, in __call__ - renpy.call_in_new_context("_game_menu", *self.args, _game_menu_screen=screen, **self.kwargs) - File "renpy/common/00gamemenu.rpy", line 174, in script - $ ui.interact() - File "renpy/common/00gamemenu.rpy", line 174, in script - $ ui.interact() - File "renpy/common/00gamemenu.rpy", line 174, in - $ ui.interact() - File "game/options.rpy", line 61, in execute - screen gpt_load: - File "game/options.rpy", line 61, in execute - screen gpt_load: - File "game/options.rpy", line 64, in execute - vbox: - File "game/options.rpy", line 92, in execute - if persistent.save7: - File "game/options.rpy", line 95, in execute - textbutton ([persistent.save_name7]) action Function(load_conversation_log7) -Exception: Cannot display None as text. + File "game/script.rpy", line 754, in script + python: + File "game/script.rpy", line 850, in + msg = chatgpt.completion(messages) +Exception: Error: 405, +405 Not Allowed + +

405 Not Allowed

+
nginx
+ + + -- Full Traceback ------------------------------------------------------------ Full traceback: - File "/Library/Afolder/renpy-8.1.3-sdk/renpy/bootstrap.py", line 275, in bootstrap - renpy.main.main() - File "/Library/Afolder/renpy-8.1.3-sdk/renpy/main.py", line 670, in main - run(restart) - File "/Library/Afolder/renpy-8.1.3-sdk/renpy/main.py", line 144, in run - renpy.execution.run_context(True) - File "/Library/Afolder/renpy-8.1.3-sdk/renpy/execution.py", line 955, in run_context - context.run() File "renpy/common/00start.rpy", line 237, in script call call _splashscreen from _call_splashscreen_1 - File "game/script.rpy", line 337, in script - e "Hello~" - File "/home/tom/ab/renpy-build-fix/tmp/install.linux-x86_64/lib/python3.9/site-packages/future/utils/__init__.py", line 444, in raise_ - File "renpy/common/00start.rpy", line 237, in script call - call _splashscreen from _call_splashscreen_1 - File "game/script.rpy", line 337, in script - e "Hello~" - File "/Library/Afolder/renpy-8.1.3-sdk/renpy/ast.py", line 930, in execute - renpy.exports.say(who, what, *args, **kwargs) - File "/Library/Afolder/renpy-8.1.3-sdk/renpy/exports.py", line 1474, in say - who(what, *args, **kwargs) - File "/Library/Afolder/renpy-8.1.3-sdk/renpy/character.py", line 1352, in __call__ - self.do_display(who, what, cb_args=self.cb_args, dtt=dtt, **display_args) - File "/Library/Afolder/renpy-8.1.3-sdk/renpy/character.py", line 1003, in do_display - display_say(who, - File "/Library/Afolder/renpy-8.1.3-sdk/renpy/character.py", line 693, in display_say - rv = renpy.ui.interact(mouse='say', type=type, roll_forward=roll_forward) - File "/Library/Afolder/renpy-8.1.3-sdk/renpy/ui.py", line 299, in interact - rv = renpy.game.interface.interact(roll_forward=roll_forward, **kwargs) - File "/Library/Afolder/renpy-8.1.3-sdk/renpy/display/core.py", line 3582, in interact - repeat, rv = self.interact_core(preloads=preloads, trans_pause=trans_pause, pause=pause, pause_start=pause_start, pause_modal=pause_modal, **kwargs) # type: ignore - File "/Library/Afolder/renpy-8.1.3-sdk/renpy/display/core.py", line 4543, in interact_core - rv = root_widget.event(ev, x, y, 0) - File "/Library/Afolder/renpy-8.1.3-sdk/renpy/display/layout.py", line 1179, in event - rv = i.event(ev, x - xo, y - yo, cst) - File "/Library/Afolder/renpy-8.1.3-sdk/renpy/display/layout.py", line 1179, in event - rv = i.event(ev, x - xo, y - yo, cst) - File "/Library/Afolder/renpy-8.1.3-sdk/renpy/display/layout.py", line 1179, in event - rv = i.event(ev, x - xo, y - yo, cst) - File "/Library/Afolder/renpy-8.1.3-sdk/renpy/display/screen.py", line 770, in event - rv = self.child.event(ev, x, y, st) - File "/Library/Afolder/renpy-8.1.3-sdk/renpy/display/layout.py", line 1179, in event - rv = i.event(ev, x - xo, y - yo, cst) - File "/Library/Afolder/renpy-8.1.3-sdk/renpy/display/layout.py", line 1179, in event - rv = i.event(ev, x - xo, y - yo, cst) - File "/Library/Afolder/renpy-8.1.3-sdk/renpy/display/behavior.py", line 1142, in event - return handle_click(self.clicked) - File "/Library/Afolder/renpy-8.1.3-sdk/renpy/display/behavior.py", line 1075, in handle_click - rv = run(action) - File "/Library/Afolder/renpy-8.1.3-sdk/renpy/display/behavior.py", line 379, in run - return action(*args, **kwargs) - File "renpy/common/00action_menu.rpy", line 118, in __call__ - renpy.call_in_new_context("_game_menu", *self.args, _game_menu_screen=screen, **self.kwargs) - File "/Library/Afolder/renpy-8.1.3-sdk/renpy/game.py", line 349, in call_in_new_context - return renpy.execution.run_context(False) - File "/Library/Afolder/renpy-8.1.3-sdk/renpy/execution.py", line 955, in run_context - context.run() - File "renpy/common/00gamemenu.rpy", line 174, in script - $ ui.interact() - File "/home/tom/ab/renpy-build-fix/tmp/install.linux-x86_64/lib/python3.9/site-packages/future/utils/__init__.py", line 444, in raise_ - File "renpy/common/00gamemenu.rpy", line 174, in script - $ ui.interact() + File "game/script.rpy", line 754, in script + python: File "/Library/Afolder/renpy-8.1.3-sdk/renpy/ast.py", line 1138, in execute renpy.python.py_exec_bytecode(self.code.bytecode, self.hide, store=self.store) File "/Library/Afolder/renpy-8.1.3-sdk/renpy/python.py", line 1122, in py_exec_bytecode exec(bytecode, globals, locals) - File "renpy/common/00gamemenu.rpy", line 174, in - $ ui.interact() - File "/Library/Afolder/renpy-8.1.3-sdk/renpy/ui.py", line 299, in interact - rv = renpy.game.interface.interact(roll_forward=roll_forward, **kwargs) - File "/Library/Afolder/renpy-8.1.3-sdk/renpy/display/core.py", line 3582, in interact - repeat, rv = self.interact_core(preloads=preloads, trans_pause=trans_pause, pause=pause, pause_start=pause_start, pause_modal=pause_modal, **kwargs) # type: ignore - File "/Library/Afolder/renpy-8.1.3-sdk/renpy/display/core.py", line 4055, in interact_core - root_widget.visit_all(lambda d : d.per_interact()) - File "/Library/Afolder/renpy-8.1.3-sdk/renpy/display/core.py", line 684, in visit_all - d.visit_all(callback, seen) - File "/Library/Afolder/renpy-8.1.3-sdk/renpy/display/core.py", line 684, in visit_all - d.visit_all(callback, seen) - File "/Library/Afolder/renpy-8.1.3-sdk/renpy/display/core.py", line 684, in visit_all - d.visit_all(callback, seen) - [Previous line repeated 1 more time] - File "/Library/Afolder/renpy-8.1.3-sdk/renpy/display/screen.py", line 476, in visit_all - callback(self) - File "/Library/Afolder/renpy-8.1.3-sdk/renpy/display/core.py", line 4055, in - root_widget.visit_all(lambda d : d.per_interact()) - File "/Library/Afolder/renpy-8.1.3-sdk/renpy/display/screen.py", line 487, in per_interact - self.update() - File "/Library/Afolder/renpy-8.1.3-sdk/renpy/display/screen.py", line 680, in update - self.screen.function(**self.scope) - File "game/options.rpy", line 61, in execute - screen gpt_load: - File "game/options.rpy", line 61, in execute - screen gpt_load: - File "game/options.rpy", line 64, in execute - vbox: - File "game/options.rpy", line 92, in execute - if persistent.save7: - File "game/options.rpy", line 95, in execute - textbutton ([persistent.save_name7]) action Function(load_conversation_log7) - File "/Library/Afolder/renpy-8.1.3-sdk/renpy/ui.py", line 988, in _textbutton - text = renpy.text.text.Text(label, style=text_style, substitute=substitute, scope=scope, **text_kwargs) - File "/Library/Afolder/renpy-8.1.3-sdk/renpy/text/text.py", line 1612, in __init__ - raise Exception("Cannot display {0!r} as text.".format(i)) -Exception: Cannot display None as text. + File "game/script.rpy", line 850, in + msg = chatgpt.completion(messages) + File "python-packages/chatgpt/__init__.py", line 38, in completion +Exception: Error: 405, +405 Not Allowed + +

405 Not Allowed

+
nginx
+ + + -macOS-14.1.1-arm64-arm-64bit arm64 +macOS-14.2-arm64-arm-64bit arm64 Ren'Py 8.1.3.23091805 -Amadeus 1.3.1 -Tue Nov 14 03:52:21 2023 +Amadeus 1.4.2 +Sat Dec 16 15:23:10 2023