From f46ae52d3bdff4e01e5ae977ccae8bc71f2de97f Mon Sep 17 00:00:00 2001 From: Juju Adams Date: Sun, 14 Feb 2021 16:37:32 +0000 Subject: [PATCH] Refactors function names to PascalCase --- chatterbox.yyp | 62 +-- datafiles/Yarn/Test.yarn | 2 +- datafiles/Yarn/Test2.yarn | 2 +- .../__ChatterboxSyntax.txt} | 20 +- .../__ChatterboxSyntax.yy} | 2 +- objects/obj_test/Create_0.gml | 10 +- objects/obj_test/Draw_0.gml | 12 +- objects/obj_test/Step_0.gml | 10 +- objects/obj_testcase_action/Create_0.gml | 6 +- objects/obj_testcase_action/Draw_0.gml | 12 +- objects/obj_testcase_action/Step_0.gml | 6 +- objects/obj_testcase_bom/Create_0.gml | 6 +- objects/obj_testcase_bom/Draw_0.gml | 12 +- objects/obj_testcase_bom/Step_0.gml | 10 +- objects/obj_testcase_comments/Create_0.gml | 6 +- objects/obj_testcase_comments/Draw_0.gml | 12 +- objects/obj_testcase_comments/Step_0.gml | 10 +- objects/obj_testcase_direction/Create_0.gml | 6 +- objects/obj_testcase_direction/Draw_0.gml | 12 +- objects/obj_testcase_direction/Step_0.gml | 10 +- .../Create_0.gml | 6 +- .../Draw_0.gml | 12 +- .../Step_0.gml | 10 +- .../Create_0.gml | 6 +- .../Draw_0.gml | 12 +- .../Step_0.gml | 10 +- objects/obj_testcase_file_tags/Create_0.gml | 6 +- objects/obj_testcase_file_tags/Draw_0.gml | 12 +- objects/obj_testcase_file_tags/Step_0.gml | 10 +- .../Create_0.gml | 6 +- .../Draw_0.gml | 12 +- .../Step_0.gml | 10 +- objects/obj_testcase_jump/Create_0.gml | 6 +- objects/obj_testcase_jump/Draw_0.gml | 12 +- objects/obj_testcase_jump/Step_0.gml | 10 +- objects/obj_testcase_metadata/Create_0.gml | 6 +- objects/obj_testcase_metadata/Draw_0.gml | 12 +- objects/obj_testcase_metadata/Step_0.gml | 10 +- .../obj_testcase_negate_function/Create_0.gml | 6 +- .../obj_testcase_negate_function/Draw_0.gml | 12 +- .../obj_testcase_negate_function/Step_0.gml | 6 +- .../obj_testcase_numeric_param/Create_0.gml | 6 +- objects/obj_testcase_numeric_param/Draw_0.gml | 12 +- objects/obj_testcase_numeric_param/Step_0.gml | 6 +- objects/obj_testcase_option/Create_0.gml | 6 +- objects/obj_testcase_option/Draw_0.gml | 12 +- objects/obj_testcase_option/Step_0.gml | 6 +- objects/obj_testcase_stop/Create_0.gml | 6 +- objects/obj_testcase_stop/Draw_0.gml | 12 +- objects/obj_testcase_stop/Step_0.gml | 6 +- options/amazonfire/options_amazonfire.yy | 18 +- options/android/options_android.yy | 27 +- options/mac/options_mac.yy | 4 +- options/ps4/options_ps4.yy | 16 +- options/switch/options_switch.yy | 3 +- options/windowsuap/options_windowsuap.yy | 30 +- options/xboxone/options_xboxone.yy | 10 +- rooms/rm_main/rm_main.yy | 4 +- .../ChatterboxAddFindReplace.gml} | 2 +- .../ChatterboxAddFindReplace.yy} | 2 +- .../ChatterboxAddFunction.gml} | 8 +- .../ChatterboxAddFunction.yy} | 2 +- .../ChatterboxContinue.gml} | 4 +- .../ChatterboxContinue.yy} | 2 +- .../chatterbox_select.yy | 0 .../ChatterboxCreate.gml} | 4 +- .../ChatterboxCreate.yy} | 2 +- .../ChatterboxFastForward.gml} | 10 +- .../ChatterboxFastForward.yy} | 2 +- .../ChatterboxGetContent.gml} | 4 +- .../ChatterboxGetContent.yy} | 2 +- .../chatterbox_get_content_count.yy | 0 .../ChatterboxGetContentCount.gml} | 4 +- .../ChatterboxGetContentCount.yy} | 2 +- .../ChatterboxGetCurrent.gml} | 18 +- .../ChatterboxGetCurrent.yy} | 2 +- .../ChatterboxGetOption.gml} | 4 +- .../ChatterboxGetOption.yy | 12 + .../chatterbox_get_content.yy | 0 .../chatterbox_get_content_count.yy | 0 .../ChatterboxGetOptionCount.gml} | 4 +- .../ChatterboxGetOptionCount.yy | 12 + .../chatterbox_get_content_count.yy | 0 .../ChatterboxGoto.gml} | 6 +- .../ChatterboxGoto.yy} | 2 +- .../Script24.yy | 0 .../ChatterboxIsLoaded.gml} | 2 +- .../ChatterboxIsLoaded.yy} | 2 +- .../chatterbox_load.yy | 0 .../chatterbox_unload.yy | 0 .../ChatterboxIsStopped.gml} | 4 +- .../ChatterboxIsStopped.yy | 12 + .../ChatterboxIsWaiting.gml} | 4 +- .../ChatterboxIsWaiting.yy | 12 + .../chatterbox_is_stopped.yy | 0 .../ChatterboxLoadFromBuffer.gml} | 10 +- .../ChatterboxLoadFromBuffer.yy | 12 + .../chatterbox_load.yy | 0 .../ChatterboxLoadFromFile.gml} | 10 +- .../ChatterboxLoadFromFile.yy | 12 + .../ChatterboxLoadFromString.gml} | 10 +- .../ChatterboxLoadFromString.yy | 12 + .../chatterbox_load.yy | 0 .../chatterbox_load_from_buffer.yy | 0 .../ChatterboxSelect.gml} | 4 +- .../ChatterboxSelect.yy} | 2 +- .../ChatterboxUnload.gml} | 2 +- .../ChatterboxUnload.yy} | 2 +- .../chatterbox_is_loaded.yy | 0 .../chatterbox_load.yy | 0 .../ChatterboxVisited.gml} | 2 +- .../ChatterboxVisited.yy} | 2 +- scripts/IsChatterbox/IsChatterbox.gml | 8 + .../IsChatterbox.yy} | 2 +- .../__ChatterboxClassExpression.gml} | 4 +- .../__ChatterboxClassExpression.yy | 12 + .../__ChatterboxClassInstruction.gml} | 6 +- .../__ChatterboxClassInstruction.yy | 12 + .../__ChatterboxClassNode.gml} | 32 +- .../__ChatterboxClassNode.yy} | 2 +- .../__ChatterboxClassSource.gml} | 4 +- .../__ChatterboxClassSource.yy} | 2 +- .../__ChatterboxClassText.gml} | 2 +- .../__ChatterboxClassText.yy} | 2 +- .../__ChatterboxConfig.gml} | 0 .../__ChatterboxConfig.yy} | 2 +- .../__ChatterboxSystem.gml} | 2 +- .../__ChatterboxSystem.yy} | 2 +- .../__ChatterboxVM.gml} | 520 +++++++++--------- scripts/__ChatterboxVM/__ChatterboxVM.yy | 12 + .../__chatterbox_class_expression.yy | 12 - .../__chatterbox_class_instruction.yy | 12 - scripts/__chatterbox_vm/__chatterbox_vm.yy | 12 - .../chatterbox_add_findreplace.yy | 12 - .../chatterbox_fast_forward.yy | 12 - .../chatterbox_get_content_count.yy | 12 - .../chatterbox_get_current.yy | 12 - .../chatterbox_is_stopped.yy | 12 - scripts/chatterbox_load/chatterbox_load.gml | 6 - scripts/chatterbox_load/chatterbox_load.yy | 12 - .../chatterbox_load_from_buffer.yy | 12 - .../chatterbox_load_from_string.yy | 12 - scripts/is_chatterbox/is_chatterbox.gml | 8 - .../testcase_action_function.gml | 2 +- .../testcase_numeric_param_function.gml | 2 +- 145 files changed, 802 insertions(+), 804 deletions(-) rename notes/{__chatterbox_syntax/__chatterbox_syntax.txt => __ChatterboxSyntax/__ChatterboxSyntax.txt} (93%) rename notes/{__chatterbox_syntax/__chatterbox_syntax.yy => __ChatterboxSyntax/__ChatterboxSyntax.yy} (82%) rename scripts/{chatterbox_add_findreplace/chatterbox_add_findreplace.gml => ChatterboxAddFindReplace/ChatterboxAddFindReplace.gml} (81%) rename scripts/{chatterbox_load_from_file/chatterbox_load_from_file.yy => ChatterboxAddFindReplace/ChatterboxAddFindReplace.yy} (83%) rename scripts/{chatterbox_add_function/chatterbox_add_function.gml => ChatterboxAddFunction/ChatterboxAddFunction.gml} (87%) rename scripts/{chatterbox_add_function/chatterbox_add_function.yy => ChatterboxAddFunction/ChatterboxAddFunction.yy} (84%) rename scripts/{chatterbox_continue/chatterbox_continue.gml => ChatterboxContinue/ChatterboxContinue.gml} (89%) rename scripts/{chatterbox_continue/chatterbox_continue.yy => ChatterboxContinue/ChatterboxContinue.yy} (85%) rename scripts/{chatterbox_continue => ChatterboxContinue}/chatterbox_select.yy (100%) rename scripts/{chatterbox_create/chatterbox_create.gml => ChatterboxCreate/ChatterboxCreate.gml} (97%) rename scripts/{chatterbox_create/chatterbox_create.yy => ChatterboxCreate/ChatterboxCreate.yy} (86%) rename scripts/{chatterbox_fast_forward/chatterbox_fast_forward.gml => ChatterboxFastForward/ChatterboxFastForward.gml} (63%) rename scripts/{chatterbox_is_waiting/chatterbox_is_waiting.yy => ChatterboxFastForward/ChatterboxFastForward.yy} (85%) rename scripts/{chatterbox_get_content/chatterbox_get_content.gml => ChatterboxGetContent/ChatterboxGetContent.gml} (73%) rename scripts/{chatterbox_get_option/chatterbox_get_option.yy => ChatterboxGetContent/ChatterboxGetContent.yy} (85%) rename scripts/{chatterbox_get_content => ChatterboxGetContent}/chatterbox_get_content_count.yy (100%) rename scripts/{chatterbox_get_content_count/chatterbox_get_content_count.gml => ChatterboxGetContentCount/ChatterboxGetContentCount.gml} (63%) rename scripts/{chatterbox_get_option_count/chatterbox_get_option_count.yy => ChatterboxGetContentCount/ChatterboxGetContentCount.yy} (83%) rename scripts/{chatterbox_get_current/chatterbox_get_current.gml => ChatterboxGetCurrent/ChatterboxGetCurrent.gml} (61%) rename scripts/{chatterbox_get_content/chatterbox_get_content.yy => ChatterboxGetCurrent/ChatterboxGetCurrent.yy} (85%) rename scripts/{chatterbox_get_option/chatterbox_get_option.gml => ChatterboxGetOption/ChatterboxGetOption.gml} (72%) create mode 100644 scripts/ChatterboxGetOption/ChatterboxGetOption.yy rename scripts/{chatterbox_get_option => ChatterboxGetOption}/chatterbox_get_content.yy (100%) rename scripts/{chatterbox_get_option => ChatterboxGetOption}/chatterbox_get_content_count.yy (100%) rename scripts/{chatterbox_get_option_count/chatterbox_get_option_count.gml => ChatterboxGetOptionCount/ChatterboxGetOptionCount.gml} (63%) create mode 100644 scripts/ChatterboxGetOptionCount/ChatterboxGetOptionCount.yy rename scripts/{chatterbox_get_option_count => ChatterboxGetOptionCount}/chatterbox_get_content_count.yy (100%) rename scripts/{chatterbox_goto/chatterbox_goto.gml => ChatterboxGoto/ChatterboxGoto.gml} (91%) rename scripts/{chatterbox_goto/chatterbox_goto.yy => ChatterboxGoto/ChatterboxGoto.yy} (87%) rename scripts/{chatterbox_goto => ChatterboxGoto}/Script24.yy (100%) rename scripts/{chatterbox_is_loaded/chatterbox_is_loaded.gml => ChatterboxIsLoaded/ChatterboxIsLoaded.gml} (80%) rename scripts/{chatterbox_unload/chatterbox_is_loaded.yy => ChatterboxIsLoaded/ChatterboxIsLoaded.yy} (85%) rename scripts/{chatterbox_is_loaded => ChatterboxIsLoaded}/chatterbox_load.yy (100%) rename scripts/{chatterbox_is_loaded => ChatterboxIsLoaded}/chatterbox_unload.yy (100%) rename scripts/{chatterbox_is_stopped/chatterbox_is_stopped.gml => ChatterboxIsStopped/ChatterboxIsStopped.gml} (69%) create mode 100644 scripts/ChatterboxIsStopped/ChatterboxIsStopped.yy rename scripts/{chatterbox_is_waiting/chatterbox_is_waiting.gml => ChatterboxIsWaiting/ChatterboxIsWaiting.gml} (68%) create mode 100644 scripts/ChatterboxIsWaiting/ChatterboxIsWaiting.yy rename scripts/{chatterbox_is_waiting => ChatterboxIsWaiting}/chatterbox_is_stopped.yy (100%) rename scripts/{chatterbox_load_from_buffer/chatterbox_load_from_buffer.gml => ChatterboxLoadFromBuffer/ChatterboxLoadFromBuffer.gml} (81%) create mode 100644 scripts/ChatterboxLoadFromBuffer/ChatterboxLoadFromBuffer.yy rename scripts/{chatterbox_load_from_buffer => ChatterboxLoadFromBuffer}/chatterbox_load.yy (100%) rename scripts/{chatterbox_load_from_file/chatterbox_load_from_file.gml => ChatterboxLoadFromFile/ChatterboxLoadFromFile.gml} (86%) create mode 100644 scripts/ChatterboxLoadFromFile/ChatterboxLoadFromFile.yy rename scripts/{chatterbox_load_from_string/chatterbox_load_from_string.gml => ChatterboxLoadFromString/ChatterboxLoadFromString.gml} (77%) create mode 100644 scripts/ChatterboxLoadFromString/ChatterboxLoadFromString.yy rename scripts/{chatterbox_load_from_string => ChatterboxLoadFromString}/chatterbox_load.yy (100%) rename scripts/{chatterbox_load_from_buffer => ChatterboxLoadFromString}/chatterbox_load_from_buffer.yy (100%) rename scripts/{chatterbox_select/chatterbox_select.gml => ChatterboxSelect/ChatterboxSelect.gml} (90%) rename scripts/{chatterbox_select/chatterbox_select.yy => ChatterboxSelect/ChatterboxSelect.yy} (86%) rename scripts/{chatterbox_unload/chatterbox_unload.gml => ChatterboxUnload/ChatterboxUnload.gml} (92%) rename scripts/{chatterbox_unload/chatterbox_unload.yy => ChatterboxUnload/ChatterboxUnload.yy} (86%) rename scripts/{chatterbox_is_loaded => ChatterboxUnload}/chatterbox_is_loaded.yy (100%) rename scripts/{chatterbox_unload => ChatterboxUnload}/chatterbox_load.yy (100%) rename scripts/{chatterbox_visited/chatterbox_visited.gml => ChatterboxVisited/ChatterboxVisited.gml} (95%) rename scripts/{chatterbox_visited/chatterbox_visited.yy => ChatterboxVisited/ChatterboxVisited.yy} (86%) create mode 100644 scripts/IsChatterbox/IsChatterbox.gml rename scripts/{is_chatterbox/is_chatterbox.yy => IsChatterbox/IsChatterbox.yy} (88%) rename scripts/{__chatterbox_class_expression/__chatterbox_class_expression.gml => __ChatterboxClassExpression/__ChatterboxClassExpression.gml} (99%) create mode 100644 scripts/__ChatterboxClassExpression/__ChatterboxClassExpression.yy rename scripts/{__chatterbox_class_instruction/__chatterbox_class_instruction.gml => __ChatterboxClassInstruction/__ChatterboxClassInstruction.gml} (85%) create mode 100644 scripts/__ChatterboxClassInstruction/__ChatterboxClassInstruction.yy rename scripts/{__chatterbox_class_node/__chatterbox_class_node.gml => __ChatterboxClassNode/__ChatterboxClassNode.gml} (95%) rename scripts/{__chatterbox_class_text/__chatterbox_class_text.yy => __ChatterboxClassNode/__ChatterboxClassNode.yy} (89%) rename scripts/{__chatterbox_class_source/__chatterbox_class_source.gml => __ChatterboxClassSource/__ChatterboxClassSource.gml} (98%) rename scripts/{__chatterbox_class_node/__chatterbox_class_node.yy => __ChatterboxClassSource/__ChatterboxClassSource.yy} (89%) rename scripts/{__chatterbox_class_text/__chatterbox_class_text.gml => __ChatterboxClassText/__ChatterboxClassText.gml} (98%) rename scripts/{__chatterbox_class_source/__chatterbox_class_source.yy => __ChatterboxClassText/__ChatterboxClassText.yy} (88%) rename scripts/{__chatterbox_config/__chatterbox_config.gml => __ChatterboxConfig/__ChatterboxConfig.gml} (100%) rename scripts/{__chatterbox_config/__chatterbox_config.yy => __ChatterboxConfig/__ChatterboxConfig.yy} (86%) rename scripts/{__chatterbox_system/__chatterbox_system.gml => __ChatterboxSystem/__ChatterboxSystem.gml} (99%) rename scripts/{__chatterbox_system/__chatterbox_system.yy => __ChatterboxSystem/__ChatterboxSystem.yy} (90%) rename scripts/{__chatterbox_vm/__chatterbox_vm.gml => __ChatterboxVM/__ChatterboxVM.gml} (95%) create mode 100644 scripts/__ChatterboxVM/__ChatterboxVM.yy delete mode 100644 scripts/__chatterbox_class_expression/__chatterbox_class_expression.yy delete mode 100644 scripts/__chatterbox_class_instruction/__chatterbox_class_instruction.yy delete mode 100644 scripts/__chatterbox_vm/__chatterbox_vm.yy delete mode 100644 scripts/chatterbox_add_findreplace/chatterbox_add_findreplace.yy delete mode 100644 scripts/chatterbox_fast_forward/chatterbox_fast_forward.yy delete mode 100644 scripts/chatterbox_get_content_count/chatterbox_get_content_count.yy delete mode 100644 scripts/chatterbox_get_current/chatterbox_get_current.yy delete mode 100644 scripts/chatterbox_is_stopped/chatterbox_is_stopped.yy delete mode 100644 scripts/chatterbox_load/chatterbox_load.gml delete mode 100644 scripts/chatterbox_load/chatterbox_load.yy delete mode 100644 scripts/chatterbox_load_from_string/chatterbox_load_from_buffer.yy delete mode 100644 scripts/chatterbox_load_from_string/chatterbox_load_from_string.yy delete mode 100644 scripts/is_chatterbox/is_chatterbox.gml diff --git a/chatterbox.yyp b/chatterbox.yyp index f8b904c0..66272b6a 100644 --- a/chatterbox.yyp +++ b/chatterbox.yyp @@ -1,54 +1,53 @@ { "resources": [ - {"id":{"name":"__chatterbox_config","path":"scripts/__chatterbox_config/__chatterbox_config.yy",},"order":1,}, - {"id":{"name":"__chatterbox_class_instruction","path":"scripts/__chatterbox_class_instruction/__chatterbox_class_instruction.yy",},"order":3,}, - {"id":{"name":"__chatterbox_system","path":"scripts/__chatterbox_system/__chatterbox_system.yy",},"order":0,}, - {"id":{"name":"chatterbox_is_loaded","path":"scripts/chatterbox_is_loaded/chatterbox_is_loaded.yy",},"order":4,}, + {"id":{"name":"__ChatterboxConfig","path":"scripts/__ChatterboxConfig/__ChatterboxConfig.yy",},"order":1,}, + {"id":{"name":"__ChatterboxClassInstruction","path":"scripts/__ChatterboxClassInstruction/__ChatterboxClassInstruction.yy",},"order":3,}, + {"id":{"name":"__ChatterboxSystem","path":"scripts/__ChatterboxSystem/__ChatterboxSystem.yy",},"order":0,}, + {"id":{"name":"ChatterboxIsLoaded","path":"scripts/ChatterboxIsLoaded/ChatterboxIsLoaded.yy",},"order":4,}, {"id":{"name":"obj_testcase_direction","path":"objects/obj_testcase_direction/obj_testcase_direction.yy",},"order":10,}, - {"id":{"name":"chatterbox_get_option_count","path":"scripts/chatterbox_get_option_count/chatterbox_get_option_count.yy",},"order":3,}, - {"id":{"name":"chatterbox_get_option","path":"scripts/chatterbox_get_option/chatterbox_get_option.yy",},"order":2,}, - {"id":{"name":"chatterbox_get_current","path":"scripts/chatterbox_get_current/chatterbox_get_current.yy",},"order":5,}, + {"id":{"name":"ChatterboxGetOptionCount","path":"scripts/ChatterboxGetOptionCount/ChatterboxGetOptionCount.yy",},"order":3,}, + {"id":{"name":"ChatterboxGetOption","path":"scripts/ChatterboxGetOption/ChatterboxGetOption.yy",},"order":2,}, + {"id":{"name":"ChatterboxGetCurrent","path":"scripts/ChatterboxGetCurrent/ChatterboxGetCurrent.yy",},"order":5,}, {"id":{"name":"obj_testcase_stop","path":"objects/obj_testcase_stop/obj_testcase_stop.yy",},"order":2,}, - {"id":{"name":"chatterbox_load_from_file","path":"scripts/chatterbox_load_from_file/chatterbox_load_from_file.yy",},"order":0,}, - {"id":{"name":"chatterbox_create","path":"scripts/chatterbox_create/chatterbox_create.yy",},"order":3,}, + {"id":{"name":"ChatterboxLoadFromFile","path":"scripts/ChatterboxLoadFromFile/ChatterboxLoadFromFile.yy",},"order":0,}, + {"id":{"name":"ChatterboxCreate","path":"scripts/ChatterboxCreate/ChatterboxCreate.yy",},"order":3,}, {"id":{"name":"obj_testcase_bom","path":"objects/obj_testcase_bom/obj_testcase_bom.yy",},"order":5,}, - {"id":{"name":"chatterbox_load","path":"scripts/chatterbox_load/chatterbox_load.yy",},"order":0,}, {"id":{"name":"obj_testcase_metadata","path":"objects/obj_testcase_metadata/obj_testcase_metadata.yy",},"order":8,}, {"id":{"name":"obj_testcase_comments","path":"objects/obj_testcase_comments/obj_testcase_comments.yy",},"order":7,}, - {"id":{"name":"__chatterbox_class_expression","path":"scripts/__chatterbox_class_expression/__chatterbox_class_expression.yy",},"order":5,}, - {"id":{"name":"chatterbox_goto","path":"scripts/chatterbox_goto/chatterbox_goto.yy",},"order":0,}, - {"id":{"name":"chatterbox_load_from_buffer","path":"scripts/chatterbox_load_from_buffer/chatterbox_load_from_buffer.yy",},"order":2,}, - {"id":{"name":"chatterbox_unload","path":"scripts/chatterbox_unload/chatterbox_unload.yy",},"order":3,}, + {"id":{"name":"__ChatterboxClassExpression","path":"scripts/__ChatterboxClassExpression/__ChatterboxClassExpression.yy",},"order":5,}, + {"id":{"name":"ChatterboxGoto","path":"scripts/ChatterboxGoto/ChatterboxGoto.yy",},"order":0,}, + {"id":{"name":"ChatterboxLoadFromBuffer","path":"scripts/ChatterboxLoadFromBuffer/ChatterboxLoadFromBuffer.yy",},"order":2,}, + {"id":{"name":"ChatterboxUnload","path":"scripts/ChatterboxUnload/ChatterboxUnload.yy",},"order":3,}, {"id":{"name":"obj_testcase_escaped_characters","path":"objects/obj_testcase_escaped_characters/obj_testcase_escaped_characters.yy",},"order":13,}, - {"id":{"name":"chatterbox_add_function","path":"scripts/chatterbox_add_function/chatterbox_add_function.yy",},"order":5,}, + {"id":{"name":"ChatterboxAddFunction","path":"scripts/ChatterboxAddFunction/ChatterboxAddFunction.yy",},"order":5,}, {"id":{"name":"fnt_default","path":"fonts/fnt_default/fnt_default.yy",},"order":4,}, - {"id":{"name":"chatterbox_add_findreplace","path":"scripts/chatterbox_add_findreplace/chatterbox_add_findreplace.yy",},"order":6,}, - {"id":{"name":"__chatterbox_syntax","path":"notes/__chatterbox_syntax/__chatterbox_syntax.yy",},"order":0,}, + {"id":{"name":"ChatterboxAddFindReplace","path":"scripts/ChatterboxAddFindReplace/ChatterboxAddFindReplace.yy",},"order":6,}, + {"id":{"name":"__ChatterboxSyntax","path":"notes/__ChatterboxSyntax/__ChatterboxSyntax.yy",},"order":0,}, {"id":{"name":"obj_testcase_expression_datatypes","path":"objects/obj_testcase_expression_datatypes/obj_testcase_expression_datatypes.yy",},"order":11,}, - {"id":{"name":"__chatterbox_vm","path":"scripts/__chatterbox_vm/__chatterbox_vm.yy",},"order":6,}, - {"id":{"name":"chatterbox_fast_forward","path":"scripts/chatterbox_fast_forward/chatterbox_fast_forward.yy",},"order":5,}, - {"id":{"name":"chatterbox_is_waiting","path":"scripts/chatterbox_is_waiting/chatterbox_is_waiting.yy",},"order":3,}, + {"id":{"name":"__ChatterboxVM","path":"scripts/__ChatterboxVM/__ChatterboxVM.yy",},"order":6,}, + {"id":{"name":"ChatterboxFastForward","path":"scripts/ChatterboxFastForward/ChatterboxFastForward.yy",},"order":5,}, + {"id":{"name":"ChatterboxIsWaiting","path":"scripts/ChatterboxIsWaiting/ChatterboxIsWaiting.yy",},"order":3,}, {"id":{"name":"obj_testcase_numeric_param","path":"objects/obj_testcase_numeric_param/obj_testcase_numeric_param.yy",},"order":3,}, - {"id":{"name":"chatterbox_select","path":"scripts/chatterbox_select/chatterbox_select.yy",},"order":1,}, + {"id":{"name":"ChatterboxSelect","path":"scripts/ChatterboxSelect/ChatterboxSelect.yy",},"order":1,}, {"id":{"name":"obj_testcase_action","path":"objects/obj_testcase_action/obj_testcase_action.yy",},"order":0,}, - {"id":{"name":"chatterbox_is_stopped","path":"scripts/chatterbox_is_stopped/chatterbox_is_stopped.yy",},"order":4,}, + {"id":{"name":"ChatterboxIsStopped","path":"scripts/ChatterboxIsStopped/ChatterboxIsStopped.yy",},"order":4,}, {"id":{"name":"obj_testcase_negate_function","path":"objects/obj_testcase_negate_function/obj_testcase_negate_function.yy",},"order":4,}, {"id":{"name":"testcase_action_function","path":"scripts/testcase_action_function/testcase_action_function.yy",},"order":14,}, {"id":{"name":"testcase_numeric_param_function","path":"scripts/testcase_numeric_param_function/testcase_numeric_param_function.yy",},"order":15,}, - {"id":{"name":"chatterbox_continue","path":"scripts/chatterbox_continue/chatterbox_continue.yy",},"order":2,}, - {"id":{"name":"chatterbox_get_content","path":"scripts/chatterbox_get_content/chatterbox_get_content.yy",},"order":0,}, + {"id":{"name":"ChatterboxContinue","path":"scripts/ChatterboxContinue/ChatterboxContinue.yy",},"order":2,}, + {"id":{"name":"ChatterboxGetContent","path":"scripts/ChatterboxGetContent/ChatterboxGetContent.yy",},"order":0,}, {"id":{"name":"obj_testcase_jump","path":"objects/obj_testcase_jump/obj_testcase_jump.yy",},"order":9,}, {"id":{"name":"testcase_direction_function","path":"scripts/testcase_direction_function/testcase_direction_function.yy",},"order":16,}, {"id":{"name":"obj_testcase_in_line_expressions","path":"objects/obj_testcase_in_line_expressions/obj_testcase_in_line_expressions.yy",},"order":12,}, {"id":{"name":"obj_testcase_file_tags","path":"objects/obj_testcase_file_tags/obj_testcase_file_tags.yy",},"order":6,}, {"id":{"name":"obj_testcase_option","path":"objects/obj_testcase_option/obj_testcase_option.yy",},"order":1,}, - {"id":{"name":"chatterbox_load_from_string","path":"scripts/chatterbox_load_from_string/chatterbox_load_from_string.yy",},"order":1,}, - {"id":{"name":"is_chatterbox","path":"scripts/is_chatterbox/is_chatterbox.yy",},"order":4,}, - {"id":{"name":"chatterbox_get_content_count","path":"scripts/chatterbox_get_content_count/chatterbox_get_content_count.yy",},"order":1,}, - {"id":{"name":"__chatterbox_class_source","path":"scripts/__chatterbox_class_source/__chatterbox_class_source.yy",},"order":1,}, - {"id":{"name":"chatterbox_visited","path":"scripts/chatterbox_visited/chatterbox_visited.yy",},"order":4,}, - {"id":{"name":"__chatterbox_class_node","path":"scripts/__chatterbox_class_node/__chatterbox_class_node.yy",},"order":2,}, - {"id":{"name":"__chatterbox_class_text","path":"scripts/__chatterbox_class_text/__chatterbox_class_text.yy",},"order":4,}, + {"id":{"name":"ChatterboxLoadFromString","path":"scripts/ChatterboxLoadFromString/ChatterboxLoadFromString.yy",},"order":1,}, + {"id":{"name":"IsChatterbox","path":"scripts/IsChatterbox/IsChatterbox.yy",},"order":4,}, + {"id":{"name":"ChatterboxGetContentCount","path":"scripts/ChatterboxGetContentCount/ChatterboxGetContentCount.yy",},"order":1,}, + {"id":{"name":"__ChatterboxClassSource","path":"scripts/__ChatterboxClassSource/__ChatterboxClassSource.yy",},"order":1,}, + {"id":{"name":"ChatterboxVisited","path":"scripts/ChatterboxVisited/ChatterboxVisited.yy",},"order":4,}, + {"id":{"name":"__ChatterboxClassNode","path":"scripts/__ChatterboxClassNode/__ChatterboxClassNode.yy",},"order":2,}, + {"id":{"name":"__ChatterboxClassText","path":"scripts/__ChatterboxClassText/__ChatterboxClassText.yy",},"order":4,}, {"id":{"name":"obj_test","path":"objects/obj_test/obj_test.yy",},"order":3,}, {"id":{"name":"rm_main","path":"rooms/rm_main/rm_main.yy",},"order":2,}, ], @@ -84,7 +83,6 @@ {"folderPath":"folders/Chatterbox/Setup.yy","order":2,"resourceVersion":"1.0","name":"Setup","tags":[],"resourceType":"GMFolder",}, {"folderPath":"folders/Chatterbox/Flow.yy","order":7,"resourceVersion":"1.0","name":"Flow","tags":[],"resourceType":"GMFolder",}, {"folderPath":"folders/Chatterbox/Getters.yy","order":6,"resourceVersion":"1.0","name":"Getters","tags":[],"resourceType":"GMFolder",}, - {"folderPath":"folders/Chatterbox/(Internal system bits, don't look in here)/omg i can't believe you looked in here/Deprecated.yy","order":8,"resourceVersion":"1.0","name":"Deprecated","tags":[],"resourceType":"GMFolder",}, {"folderPath":"folders/Test Cases.yy","order":1,"resourceVersion":"1.0","name":"Test Cases","tags":[],"resourceType":"GMFolder",}, ], "AudioGroups": [ diff --git a/datafiles/Yarn/Test.yarn b/datafiles/Yarn/Test.yarn index c6bdc693..7aaf2aea 100644 --- a/datafiles/Yarn/Test.yarn +++ b/datafiles/Yarn/Test.yarn @@ -64,7 +64,7 @@ Standard choice syntax test. [[Choice 1|Node3]] [[Choice 2|Node4]] -<> +//<> === title: Node3 diff --git a/datafiles/Yarn/Test2.yarn b/datafiles/Yarn/Test2.yarn index ddf715d0..8125be71 100644 --- a/datafiles/Yarn/Test2.yarn +++ b/datafiles/Yarn/Test2.yarn @@ -78,7 +78,7 @@ Standard choice syntax test. [[Choice 1|Node3]] [[Choice 2|Node4]] -<> +//<> === title: Node3 diff --git a/notes/__chatterbox_syntax/__chatterbox_syntax.txt b/notes/__ChatterboxSyntax/__ChatterboxSyntax.txt similarity index 93% rename from notes/__chatterbox_syntax/__chatterbox_syntax.txt rename to notes/__ChatterboxSyntax/__ChatterboxSyntax.txt index e8365177..6094ab00 100644 --- a/notes/__chatterbox_syntax/__chatterbox_syntax.txt +++ b/notes/__ChatterboxSyntax/__ChatterboxSyntax.txt @@ -109,11 +109,11 @@ Chatterbox has the following native actions: <> <> -Custom actions can be added to Chatterbox by using the chatterbox_add_function() script. Custom actions should be added before -calling chatterbox_create(). +Custom actions can be added to Chatterbox by using the ChatterboxAddFunction() script. Custom actions should be added before +calling ChatterboxCreate(). - GML: chatterbox_load("example.json"); - chatterbox_add_function("playMusic", play_background_music); + GML: ChatterboxLoadFromFile("example.json"); + ChatterboxAddFunction("playMusic", play_background_music); Yarn: Here's some text! <> @@ -125,8 +125,8 @@ whenever <> is processed by Chatterbox. Custom actions can also have parameters. These parameters can be any Chatterbox value - a real number, a string, or a variable. Parameters should separated by spaces. Parameters are passed into a script as an array of values in argument0. - GML: chatterbox_load("example.json"); - chatterbox_add_function("gotoRoom", go_to_room); + GML: ChatterboxLoadFromFile("example.json"); + ChatterboxAddFunction("gotoRoom", go_to_room); Yarn: Let's go see what the priest is up to. <> @@ -205,15 +205,15 @@ By default, Chatterbox includes a visited() function, used to check whether a no We have gone to the city before! <> -Other custom functions can be added to Chatterbox using the chatterbox_add_function() script. +Other custom functions can be added to Chatterbox using the ChatterboxAddFunction() script. Much like custom actions, custom functions can have parameters. Custom functions should be defined -before calling chatterbox_create(). +before calling ChatterboxCreate(). Parameters should be separated by spaces and are passed into a script as an array of values in argument0. Custom functions can return values, but they should be reals or strings. - GML: chatterbox_load("example.json"); - chatterbox_add_function("AmIDead", am_i_dead); + GML: ChatterboxLoadFromFile("example.json"); + ChatterboxAddFunction("AmIDead", am_i_dead); Yarn: Am I dead? <> diff --git a/notes/__chatterbox_syntax/__chatterbox_syntax.yy b/notes/__ChatterboxSyntax/__ChatterboxSyntax.yy similarity index 82% rename from notes/__chatterbox_syntax/__chatterbox_syntax.yy rename to notes/__ChatterboxSyntax/__ChatterboxSyntax.yy index 1d343222..18411460 100644 --- a/notes/__chatterbox_syntax/__chatterbox_syntax.yy +++ b/notes/__ChatterboxSyntax/__ChatterboxSyntax.yy @@ -4,7 +4,7 @@ "path": "folders/Chatterbox.yy", }, "resourceVersion": "1.1", - "name": "__chatterbox_syntax", + "name": "__ChatterboxSyntax", "tags": [], "resourceType": "GMNotes", } \ No newline at end of file diff --git a/objects/obj_test/Create_0.gml b/objects/obj_test/Create_0.gml index 50f8675e..a44895ff 100644 --- a/objects/obj_test/Create_0.gml +++ b/objects/obj_test/Create_0.gml @@ -1,11 +1,11 @@ //Load in some source files -chatterbox_load_from_file("Test.yarn"); -chatterbox_load_from_file("Test2.yarn"); +ChatterboxLoadFromFile("Test.yarn"); +ChatterboxLoadFromFile("Test2.yarn"); -chatterbox_add_function("TestFunctionDoNotExecute", function(_array) { show_message(_array); }); +ChatterboxAddFunction("TestFunctionDoNotExecute", function(_array) { show_message(_array); }); //Create a chatterbox -box = chatterbox_create("Test.yarn"); +box = ChatterboxCreate("Test.yarn"); //Tell the chatterbox to jump to a node -chatterbox_goto(box, "Start"); \ No newline at end of file +ChatterboxGoto(box, "Start"); \ No newline at end of file diff --git a/objects/obj_test/Draw_0.gml b/objects/obj_test/Draw_0.gml index f2b0bdac..7645f0d9 100644 --- a/objects/obj_test/Draw_0.gml +++ b/objects/obj_test/Draw_0.gml @@ -4,7 +4,7 @@ draw_set_font(fnt_default); var _x = 10; var _y = 10; -if (chatterbox_is_stopped(box)) +if (ChatterboxIsStopped(box)) { //If we're stopped then show that draw_text(_x, _y, "(Chatterbox stopped)"); @@ -13,9 +13,9 @@ else { //All the spoken text var _i = 0; - repeat(chatterbox_get_content_count(box)) + repeat(ChatterboxGetContentCount(box)) { - draw_text(_x, _y, chatterbox_get_content(box, _i)); + draw_text(_x, _y, ChatterboxGetContent(box, _i)); _y += 20; ++_i; } @@ -23,7 +23,7 @@ else //Bit of spacing... _y += 20; - if (chatterbox_is_waiting(box)) + if (ChatterboxIsWaiting(box)) { //If we're in a "waiting" state then prompt the user for basic input draw_text(_x, _y, "(Press Space)"); @@ -32,9 +32,9 @@ else { //All the options var _i = 0; - repeat(chatterbox_get_option_count(box)) + repeat(ChatterboxGetOptionCount(box)) { - draw_text(_x, _y, string(_i+1) + ") " + chatterbox_get_option(box, _i)); + draw_text(_x, _y, string(_i+1) + ") " + ChatterboxGetOption(box, _i)); _y += 20; ++_i; } diff --git a/objects/obj_test/Step_0.gml b/objects/obj_test/Step_0.gml index d73811b7..753ae90d 100644 --- a/objects/obj_test/Step_0.gml +++ b/objects/obj_test/Step_0.gml @@ -1,18 +1,18 @@ -if (chatterbox_is_stopped(box)) +if (ChatterboxIsStopped(box)) { //If we're stopped then don't respond to user input } -else if (chatterbox_is_waiting(box)) +else if (ChatterboxIsWaiting(box)) { //If we're in a "waiting" state then let the user press to advance dialogue if (keyboard_check_released(vk_space)) { - chatterbox_continue(box); + ChatterboxContinue(box); } else if (keyboard_check_pressed(ord("F"))) { //The user can also press F to fast forward through text until they hit a choice - chatterbox_fast_forward(box); + ChatterboxFastForward(box); } } else @@ -27,5 +27,5 @@ else if (keyboard_check_released(ord("4"))) _index = 3; //If we've pressed a button, select that option - if (_index != undefined) chatterbox_select(box, _index); + if (_index != undefined) ChatterboxSelect(box, _index); } \ No newline at end of file diff --git a/objects/obj_testcase_action/Create_0.gml b/objects/obj_testcase_action/Create_0.gml index 16cad9f2..eca8be91 100644 --- a/objects/obj_testcase_action/Create_0.gml +++ b/objects/obj_testcase_action/Create_0.gml @@ -1,4 +1,4 @@ -chatterbox_load_from_file("testcase_action.yarn"); +ChatterboxLoadFromFile("testcase_action.yarn"); //Note that <> is added as a Chatterbox function in testcase_action_function() -box = chatterbox_create(); -chatterbox_goto(box, "Start"); \ No newline at end of file +box = ChatterboxCreate(); +ChatterboxGoto(box, "Start"); \ No newline at end of file diff --git a/objects/obj_testcase_action/Draw_0.gml b/objects/obj_testcase_action/Draw_0.gml index f61e7bf6..3af14ad1 100644 --- a/objects/obj_testcase_action/Draw_0.gml +++ b/objects/obj_testcase_action/Draw_0.gml @@ -1,32 +1,32 @@ var _x = 10; var _y = 10; -if (chatterbox_is_stopped(box)) +if (ChatterboxIsStopped(box)) { draw_text(_x, _y, "(Chatterbox stopped)"); } else { var _i = 0; - repeat(chatterbox_get_content_count(box)) + repeat(ChatterboxGetContentCount(box)) { - draw_text(_x, _y, chatterbox_get_content(box, _i)); + draw_text(_x, _y, ChatterboxGetContent(box, _i)); _y += 20; ++_i; } _y += 20; - if (chatterbox_is_waiting(box)) + if (ChatterboxIsWaiting(box)) { draw_text(_x, _y, "(Press Space)"); } else { var _i = 0; - repeat(chatterbox_get_option_count(box)) + repeat(ChatterboxGetOptionCount(box)) { - draw_text(_x, _y, string(_i+1) + ") " + chatterbox_get_option(box, _i)); + draw_text(_x, _y, string(_i+1) + ") " + ChatterboxGetOption(box, _i)); _y += 20; ++_i; } diff --git a/objects/obj_testcase_action/Step_0.gml b/objects/obj_testcase_action/Step_0.gml index 42da1c14..f1f7633d 100644 --- a/objects/obj_testcase_action/Step_0.gml +++ b/objects/obj_testcase_action/Step_0.gml @@ -1,6 +1,6 @@ -if (chatterbox_is_waiting(box)) +if (ChatterboxIsWaiting(box)) { - if (keyboard_check_released(vk_space)) chatterbox_continue(box); + if (keyboard_check_released(vk_space)) ChatterboxContinue(box); } else { @@ -9,5 +9,5 @@ else if (keyboard_check_released(ord("2"))) _index = 1; if (keyboard_check_released(ord("3"))) _index = 2; if (keyboard_check_released(ord("4"))) _index = 3; - if (_index != undefined) chatterbox_select(box, _index); + if (_index != undefined) ChatterboxSelect(box, _index); } \ No newline at end of file diff --git a/objects/obj_testcase_bom/Create_0.gml b/objects/obj_testcase_bom/Create_0.gml index 47db01d3..dd6dbae0 100644 --- a/objects/obj_testcase_bom/Create_0.gml +++ b/objects/obj_testcase_bom/Create_0.gml @@ -1,3 +1,3 @@ -chatterbox_load_from_file("testcase_bom.yarn"); -box = chatterbox_create(); -chatterbox_goto(box, "Start"); \ No newline at end of file +ChatterboxLoadFromFile("testcase_bom.yarn"); +box = ChatterboxCreate(); +ChatterboxGoto(box, "Start"); \ No newline at end of file diff --git a/objects/obj_testcase_bom/Draw_0.gml b/objects/obj_testcase_bom/Draw_0.gml index f2b0bdac..7645f0d9 100644 --- a/objects/obj_testcase_bom/Draw_0.gml +++ b/objects/obj_testcase_bom/Draw_0.gml @@ -4,7 +4,7 @@ draw_set_font(fnt_default); var _x = 10; var _y = 10; -if (chatterbox_is_stopped(box)) +if (ChatterboxIsStopped(box)) { //If we're stopped then show that draw_text(_x, _y, "(Chatterbox stopped)"); @@ -13,9 +13,9 @@ else { //All the spoken text var _i = 0; - repeat(chatterbox_get_content_count(box)) + repeat(ChatterboxGetContentCount(box)) { - draw_text(_x, _y, chatterbox_get_content(box, _i)); + draw_text(_x, _y, ChatterboxGetContent(box, _i)); _y += 20; ++_i; } @@ -23,7 +23,7 @@ else //Bit of spacing... _y += 20; - if (chatterbox_is_waiting(box)) + if (ChatterboxIsWaiting(box)) { //If we're in a "waiting" state then prompt the user for basic input draw_text(_x, _y, "(Press Space)"); @@ -32,9 +32,9 @@ else { //All the options var _i = 0; - repeat(chatterbox_get_option_count(box)) + repeat(ChatterboxGetOptionCount(box)) { - draw_text(_x, _y, string(_i+1) + ") " + chatterbox_get_option(box, _i)); + draw_text(_x, _y, string(_i+1) + ") " + ChatterboxGetOption(box, _i)); _y += 20; ++_i; } diff --git a/objects/obj_testcase_bom/Step_0.gml b/objects/obj_testcase_bom/Step_0.gml index d73811b7..753ae90d 100644 --- a/objects/obj_testcase_bom/Step_0.gml +++ b/objects/obj_testcase_bom/Step_0.gml @@ -1,18 +1,18 @@ -if (chatterbox_is_stopped(box)) +if (ChatterboxIsStopped(box)) { //If we're stopped then don't respond to user input } -else if (chatterbox_is_waiting(box)) +else if (ChatterboxIsWaiting(box)) { //If we're in a "waiting" state then let the user press to advance dialogue if (keyboard_check_released(vk_space)) { - chatterbox_continue(box); + ChatterboxContinue(box); } else if (keyboard_check_pressed(ord("F"))) { //The user can also press F to fast forward through text until they hit a choice - chatterbox_fast_forward(box); + ChatterboxFastForward(box); } } else @@ -27,5 +27,5 @@ else if (keyboard_check_released(ord("4"))) _index = 3; //If we've pressed a button, select that option - if (_index != undefined) chatterbox_select(box, _index); + if (_index != undefined) ChatterboxSelect(box, _index); } \ No newline at end of file diff --git a/objects/obj_testcase_comments/Create_0.gml b/objects/obj_testcase_comments/Create_0.gml index 314efc95..bf3817c2 100644 --- a/objects/obj_testcase_comments/Create_0.gml +++ b/objects/obj_testcase_comments/Create_0.gml @@ -1,3 +1,3 @@ -chatterbox_load_from_file("testcase_comments.yarn"); -box = chatterbox_create(); -chatterbox_goto(box, "Start"); \ No newline at end of file +ChatterboxLoadFromFile("testcase_comments.yarn"); +box = ChatterboxCreate(); +ChatterboxGoto(box, "Start"); \ No newline at end of file diff --git a/objects/obj_testcase_comments/Draw_0.gml b/objects/obj_testcase_comments/Draw_0.gml index f2b0bdac..7645f0d9 100644 --- a/objects/obj_testcase_comments/Draw_0.gml +++ b/objects/obj_testcase_comments/Draw_0.gml @@ -4,7 +4,7 @@ draw_set_font(fnt_default); var _x = 10; var _y = 10; -if (chatterbox_is_stopped(box)) +if (ChatterboxIsStopped(box)) { //If we're stopped then show that draw_text(_x, _y, "(Chatterbox stopped)"); @@ -13,9 +13,9 @@ else { //All the spoken text var _i = 0; - repeat(chatterbox_get_content_count(box)) + repeat(ChatterboxGetContentCount(box)) { - draw_text(_x, _y, chatterbox_get_content(box, _i)); + draw_text(_x, _y, ChatterboxGetContent(box, _i)); _y += 20; ++_i; } @@ -23,7 +23,7 @@ else //Bit of spacing... _y += 20; - if (chatterbox_is_waiting(box)) + if (ChatterboxIsWaiting(box)) { //If we're in a "waiting" state then prompt the user for basic input draw_text(_x, _y, "(Press Space)"); @@ -32,9 +32,9 @@ else { //All the options var _i = 0; - repeat(chatterbox_get_option_count(box)) + repeat(ChatterboxGetOptionCount(box)) { - draw_text(_x, _y, string(_i+1) + ") " + chatterbox_get_option(box, _i)); + draw_text(_x, _y, string(_i+1) + ") " + ChatterboxGetOption(box, _i)); _y += 20; ++_i; } diff --git a/objects/obj_testcase_comments/Step_0.gml b/objects/obj_testcase_comments/Step_0.gml index d73811b7..753ae90d 100644 --- a/objects/obj_testcase_comments/Step_0.gml +++ b/objects/obj_testcase_comments/Step_0.gml @@ -1,18 +1,18 @@ -if (chatterbox_is_stopped(box)) +if (ChatterboxIsStopped(box)) { //If we're stopped then don't respond to user input } -else if (chatterbox_is_waiting(box)) +else if (ChatterboxIsWaiting(box)) { //If we're in a "waiting" state then let the user press to advance dialogue if (keyboard_check_released(vk_space)) { - chatterbox_continue(box); + ChatterboxContinue(box); } else if (keyboard_check_pressed(ord("F"))) { //The user can also press F to fast forward through text until they hit a choice - chatterbox_fast_forward(box); + ChatterboxFastForward(box); } } else @@ -27,5 +27,5 @@ else if (keyboard_check_released(ord("4"))) _index = 3; //If we've pressed a button, select that option - if (_index != undefined) chatterbox_select(box, _index); + if (_index != undefined) ChatterboxSelect(box, _index); } \ No newline at end of file diff --git a/objects/obj_testcase_direction/Create_0.gml b/objects/obj_testcase_direction/Create_0.gml index 6ae23876..b3bb3fe0 100644 --- a/objects/obj_testcase_direction/Create_0.gml +++ b/objects/obj_testcase_direction/Create_0.gml @@ -1,3 +1,3 @@ -chatterbox_load_from_file("testcase_direction.yarn"); -box = chatterbox_create(); -chatterbox_goto(box, "Start"); \ No newline at end of file +ChatterboxLoadFromFile("testcase_direction.yarn"); +box = ChatterboxCreate(); +ChatterboxGoto(box, "Start"); \ No newline at end of file diff --git a/objects/obj_testcase_direction/Draw_0.gml b/objects/obj_testcase_direction/Draw_0.gml index f2b0bdac..7645f0d9 100644 --- a/objects/obj_testcase_direction/Draw_0.gml +++ b/objects/obj_testcase_direction/Draw_0.gml @@ -4,7 +4,7 @@ draw_set_font(fnt_default); var _x = 10; var _y = 10; -if (chatterbox_is_stopped(box)) +if (ChatterboxIsStopped(box)) { //If we're stopped then show that draw_text(_x, _y, "(Chatterbox stopped)"); @@ -13,9 +13,9 @@ else { //All the spoken text var _i = 0; - repeat(chatterbox_get_content_count(box)) + repeat(ChatterboxGetContentCount(box)) { - draw_text(_x, _y, chatterbox_get_content(box, _i)); + draw_text(_x, _y, ChatterboxGetContent(box, _i)); _y += 20; ++_i; } @@ -23,7 +23,7 @@ else //Bit of spacing... _y += 20; - if (chatterbox_is_waiting(box)) + if (ChatterboxIsWaiting(box)) { //If we're in a "waiting" state then prompt the user for basic input draw_text(_x, _y, "(Press Space)"); @@ -32,9 +32,9 @@ else { //All the options var _i = 0; - repeat(chatterbox_get_option_count(box)) + repeat(ChatterboxGetOptionCount(box)) { - draw_text(_x, _y, string(_i+1) + ") " + chatterbox_get_option(box, _i)); + draw_text(_x, _y, string(_i+1) + ") " + ChatterboxGetOption(box, _i)); _y += 20; ++_i; } diff --git a/objects/obj_testcase_direction/Step_0.gml b/objects/obj_testcase_direction/Step_0.gml index d73811b7..753ae90d 100644 --- a/objects/obj_testcase_direction/Step_0.gml +++ b/objects/obj_testcase_direction/Step_0.gml @@ -1,18 +1,18 @@ -if (chatterbox_is_stopped(box)) +if (ChatterboxIsStopped(box)) { //If we're stopped then don't respond to user input } -else if (chatterbox_is_waiting(box)) +else if (ChatterboxIsWaiting(box)) { //If we're in a "waiting" state then let the user press to advance dialogue if (keyboard_check_released(vk_space)) { - chatterbox_continue(box); + ChatterboxContinue(box); } else if (keyboard_check_pressed(ord("F"))) { //The user can also press F to fast forward through text until they hit a choice - chatterbox_fast_forward(box); + ChatterboxFastForward(box); } } else @@ -27,5 +27,5 @@ else if (keyboard_check_released(ord("4"))) _index = 3; //If we've pressed a button, select that option - if (_index != undefined) chatterbox_select(box, _index); + if (_index != undefined) ChatterboxSelect(box, _index); } \ No newline at end of file diff --git a/objects/obj_testcase_escaped_characters/Create_0.gml b/objects/obj_testcase_escaped_characters/Create_0.gml index a7592737..3b633f08 100644 --- a/objects/obj_testcase_escaped_characters/Create_0.gml +++ b/objects/obj_testcase_escaped_characters/Create_0.gml @@ -1,3 +1,3 @@ -chatterbox_load_from_file("testcase_escaped_characters.yarn"); -box = chatterbox_create(); -chatterbox_goto(box, "Start"); \ No newline at end of file +ChatterboxLoadFromFile("testcase_escaped_characters.yarn"); +box = ChatterboxCreate(); +ChatterboxGoto(box, "Start"); \ No newline at end of file diff --git a/objects/obj_testcase_escaped_characters/Draw_0.gml b/objects/obj_testcase_escaped_characters/Draw_0.gml index f2b0bdac..7645f0d9 100644 --- a/objects/obj_testcase_escaped_characters/Draw_0.gml +++ b/objects/obj_testcase_escaped_characters/Draw_0.gml @@ -4,7 +4,7 @@ draw_set_font(fnt_default); var _x = 10; var _y = 10; -if (chatterbox_is_stopped(box)) +if (ChatterboxIsStopped(box)) { //If we're stopped then show that draw_text(_x, _y, "(Chatterbox stopped)"); @@ -13,9 +13,9 @@ else { //All the spoken text var _i = 0; - repeat(chatterbox_get_content_count(box)) + repeat(ChatterboxGetContentCount(box)) { - draw_text(_x, _y, chatterbox_get_content(box, _i)); + draw_text(_x, _y, ChatterboxGetContent(box, _i)); _y += 20; ++_i; } @@ -23,7 +23,7 @@ else //Bit of spacing... _y += 20; - if (chatterbox_is_waiting(box)) + if (ChatterboxIsWaiting(box)) { //If we're in a "waiting" state then prompt the user for basic input draw_text(_x, _y, "(Press Space)"); @@ -32,9 +32,9 @@ else { //All the options var _i = 0; - repeat(chatterbox_get_option_count(box)) + repeat(ChatterboxGetOptionCount(box)) { - draw_text(_x, _y, string(_i+1) + ") " + chatterbox_get_option(box, _i)); + draw_text(_x, _y, string(_i+1) + ") " + ChatterboxGetOption(box, _i)); _y += 20; ++_i; } diff --git a/objects/obj_testcase_escaped_characters/Step_0.gml b/objects/obj_testcase_escaped_characters/Step_0.gml index d73811b7..753ae90d 100644 --- a/objects/obj_testcase_escaped_characters/Step_0.gml +++ b/objects/obj_testcase_escaped_characters/Step_0.gml @@ -1,18 +1,18 @@ -if (chatterbox_is_stopped(box)) +if (ChatterboxIsStopped(box)) { //If we're stopped then don't respond to user input } -else if (chatterbox_is_waiting(box)) +else if (ChatterboxIsWaiting(box)) { //If we're in a "waiting" state then let the user press to advance dialogue if (keyboard_check_released(vk_space)) { - chatterbox_continue(box); + ChatterboxContinue(box); } else if (keyboard_check_pressed(ord("F"))) { //The user can also press F to fast forward through text until they hit a choice - chatterbox_fast_forward(box); + ChatterboxFastForward(box); } } else @@ -27,5 +27,5 @@ else if (keyboard_check_released(ord("4"))) _index = 3; //If we've pressed a button, select that option - if (_index != undefined) chatterbox_select(box, _index); + if (_index != undefined) ChatterboxSelect(box, _index); } \ No newline at end of file diff --git a/objects/obj_testcase_expression_datatypes/Create_0.gml b/objects/obj_testcase_expression_datatypes/Create_0.gml index db617a67..31d11840 100644 --- a/objects/obj_testcase_expression_datatypes/Create_0.gml +++ b/objects/obj_testcase_expression_datatypes/Create_0.gml @@ -1,3 +1,3 @@ -chatterbox_load_from_file("testcase_expression_datatypes.yarn"); -box = chatterbox_create(); -chatterbox_goto(box, "Start"); \ No newline at end of file +ChatterboxLoadFromFile("testcase_expression_datatypes.yarn"); +box = ChatterboxCreate(); +ChatterboxGoto(box, "Start"); \ No newline at end of file diff --git a/objects/obj_testcase_expression_datatypes/Draw_0.gml b/objects/obj_testcase_expression_datatypes/Draw_0.gml index f2b0bdac..7645f0d9 100644 --- a/objects/obj_testcase_expression_datatypes/Draw_0.gml +++ b/objects/obj_testcase_expression_datatypes/Draw_0.gml @@ -4,7 +4,7 @@ draw_set_font(fnt_default); var _x = 10; var _y = 10; -if (chatterbox_is_stopped(box)) +if (ChatterboxIsStopped(box)) { //If we're stopped then show that draw_text(_x, _y, "(Chatterbox stopped)"); @@ -13,9 +13,9 @@ else { //All the spoken text var _i = 0; - repeat(chatterbox_get_content_count(box)) + repeat(ChatterboxGetContentCount(box)) { - draw_text(_x, _y, chatterbox_get_content(box, _i)); + draw_text(_x, _y, ChatterboxGetContent(box, _i)); _y += 20; ++_i; } @@ -23,7 +23,7 @@ else //Bit of spacing... _y += 20; - if (chatterbox_is_waiting(box)) + if (ChatterboxIsWaiting(box)) { //If we're in a "waiting" state then prompt the user for basic input draw_text(_x, _y, "(Press Space)"); @@ -32,9 +32,9 @@ else { //All the options var _i = 0; - repeat(chatterbox_get_option_count(box)) + repeat(ChatterboxGetOptionCount(box)) { - draw_text(_x, _y, string(_i+1) + ") " + chatterbox_get_option(box, _i)); + draw_text(_x, _y, string(_i+1) + ") " + ChatterboxGetOption(box, _i)); _y += 20; ++_i; } diff --git a/objects/obj_testcase_expression_datatypes/Step_0.gml b/objects/obj_testcase_expression_datatypes/Step_0.gml index d73811b7..753ae90d 100644 --- a/objects/obj_testcase_expression_datatypes/Step_0.gml +++ b/objects/obj_testcase_expression_datatypes/Step_0.gml @@ -1,18 +1,18 @@ -if (chatterbox_is_stopped(box)) +if (ChatterboxIsStopped(box)) { //If we're stopped then don't respond to user input } -else if (chatterbox_is_waiting(box)) +else if (ChatterboxIsWaiting(box)) { //If we're in a "waiting" state then let the user press to advance dialogue if (keyboard_check_released(vk_space)) { - chatterbox_continue(box); + ChatterboxContinue(box); } else if (keyboard_check_pressed(ord("F"))) { //The user can also press F to fast forward through text until they hit a choice - chatterbox_fast_forward(box); + ChatterboxFastForward(box); } } else @@ -27,5 +27,5 @@ else if (keyboard_check_released(ord("4"))) _index = 3; //If we've pressed a button, select that option - if (_index != undefined) chatterbox_select(box, _index); + if (_index != undefined) ChatterboxSelect(box, _index); } \ No newline at end of file diff --git a/objects/obj_testcase_file_tags/Create_0.gml b/objects/obj_testcase_file_tags/Create_0.gml index d1fd7933..8333472d 100644 --- a/objects/obj_testcase_file_tags/Create_0.gml +++ b/objects/obj_testcase_file_tags/Create_0.gml @@ -1,3 +1,3 @@ -chatterbox_load_from_file("testcase_file_tags.yarn"); -box = chatterbox_create(); -chatterbox_goto(box, "Start"); \ No newline at end of file +ChatterboxLoadFromFile("testcase_file_tags.yarn"); +box = ChatterboxCreate(); +ChatterboxGoto(box, "Start"); \ No newline at end of file diff --git a/objects/obj_testcase_file_tags/Draw_0.gml b/objects/obj_testcase_file_tags/Draw_0.gml index f2b0bdac..7645f0d9 100644 --- a/objects/obj_testcase_file_tags/Draw_0.gml +++ b/objects/obj_testcase_file_tags/Draw_0.gml @@ -4,7 +4,7 @@ draw_set_font(fnt_default); var _x = 10; var _y = 10; -if (chatterbox_is_stopped(box)) +if (ChatterboxIsStopped(box)) { //If we're stopped then show that draw_text(_x, _y, "(Chatterbox stopped)"); @@ -13,9 +13,9 @@ else { //All the spoken text var _i = 0; - repeat(chatterbox_get_content_count(box)) + repeat(ChatterboxGetContentCount(box)) { - draw_text(_x, _y, chatterbox_get_content(box, _i)); + draw_text(_x, _y, ChatterboxGetContent(box, _i)); _y += 20; ++_i; } @@ -23,7 +23,7 @@ else //Bit of spacing... _y += 20; - if (chatterbox_is_waiting(box)) + if (ChatterboxIsWaiting(box)) { //If we're in a "waiting" state then prompt the user for basic input draw_text(_x, _y, "(Press Space)"); @@ -32,9 +32,9 @@ else { //All the options var _i = 0; - repeat(chatterbox_get_option_count(box)) + repeat(ChatterboxGetOptionCount(box)) { - draw_text(_x, _y, string(_i+1) + ") " + chatterbox_get_option(box, _i)); + draw_text(_x, _y, string(_i+1) + ") " + ChatterboxGetOption(box, _i)); _y += 20; ++_i; } diff --git a/objects/obj_testcase_file_tags/Step_0.gml b/objects/obj_testcase_file_tags/Step_0.gml index d73811b7..753ae90d 100644 --- a/objects/obj_testcase_file_tags/Step_0.gml +++ b/objects/obj_testcase_file_tags/Step_0.gml @@ -1,18 +1,18 @@ -if (chatterbox_is_stopped(box)) +if (ChatterboxIsStopped(box)) { //If we're stopped then don't respond to user input } -else if (chatterbox_is_waiting(box)) +else if (ChatterboxIsWaiting(box)) { //If we're in a "waiting" state then let the user press to advance dialogue if (keyboard_check_released(vk_space)) { - chatterbox_continue(box); + ChatterboxContinue(box); } else if (keyboard_check_pressed(ord("F"))) { //The user can also press F to fast forward through text until they hit a choice - chatterbox_fast_forward(box); + ChatterboxFastForward(box); } } else @@ -27,5 +27,5 @@ else if (keyboard_check_released(ord("4"))) _index = 3; //If we've pressed a button, select that option - if (_index != undefined) chatterbox_select(box, _index); + if (_index != undefined) ChatterboxSelect(box, _index); } \ No newline at end of file diff --git a/objects/obj_testcase_in_line_expressions/Create_0.gml b/objects/obj_testcase_in_line_expressions/Create_0.gml index 7b6de2cd..63d199b8 100644 --- a/objects/obj_testcase_in_line_expressions/Create_0.gml +++ b/objects/obj_testcase_in_line_expressions/Create_0.gml @@ -1,3 +1,3 @@ -chatterbox_load_from_file("testcase_in_line_expressions.yarn"); -box = chatterbox_create(); -chatterbox_goto(box, "Start"); \ No newline at end of file +ChatterboxLoadFromFile("testcase_in_line_expressions.yarn"); +box = ChatterboxCreate(); +ChatterboxGoto(box, "Start"); \ No newline at end of file diff --git a/objects/obj_testcase_in_line_expressions/Draw_0.gml b/objects/obj_testcase_in_line_expressions/Draw_0.gml index f2b0bdac..7645f0d9 100644 --- a/objects/obj_testcase_in_line_expressions/Draw_0.gml +++ b/objects/obj_testcase_in_line_expressions/Draw_0.gml @@ -4,7 +4,7 @@ draw_set_font(fnt_default); var _x = 10; var _y = 10; -if (chatterbox_is_stopped(box)) +if (ChatterboxIsStopped(box)) { //If we're stopped then show that draw_text(_x, _y, "(Chatterbox stopped)"); @@ -13,9 +13,9 @@ else { //All the spoken text var _i = 0; - repeat(chatterbox_get_content_count(box)) + repeat(ChatterboxGetContentCount(box)) { - draw_text(_x, _y, chatterbox_get_content(box, _i)); + draw_text(_x, _y, ChatterboxGetContent(box, _i)); _y += 20; ++_i; } @@ -23,7 +23,7 @@ else //Bit of spacing... _y += 20; - if (chatterbox_is_waiting(box)) + if (ChatterboxIsWaiting(box)) { //If we're in a "waiting" state then prompt the user for basic input draw_text(_x, _y, "(Press Space)"); @@ -32,9 +32,9 @@ else { //All the options var _i = 0; - repeat(chatterbox_get_option_count(box)) + repeat(ChatterboxGetOptionCount(box)) { - draw_text(_x, _y, string(_i+1) + ") " + chatterbox_get_option(box, _i)); + draw_text(_x, _y, string(_i+1) + ") " + ChatterboxGetOption(box, _i)); _y += 20; ++_i; } diff --git a/objects/obj_testcase_in_line_expressions/Step_0.gml b/objects/obj_testcase_in_line_expressions/Step_0.gml index d73811b7..753ae90d 100644 --- a/objects/obj_testcase_in_line_expressions/Step_0.gml +++ b/objects/obj_testcase_in_line_expressions/Step_0.gml @@ -1,18 +1,18 @@ -if (chatterbox_is_stopped(box)) +if (ChatterboxIsStopped(box)) { //If we're stopped then don't respond to user input } -else if (chatterbox_is_waiting(box)) +else if (ChatterboxIsWaiting(box)) { //If we're in a "waiting" state then let the user press to advance dialogue if (keyboard_check_released(vk_space)) { - chatterbox_continue(box); + ChatterboxContinue(box); } else if (keyboard_check_pressed(ord("F"))) { //The user can also press F to fast forward through text until they hit a choice - chatterbox_fast_forward(box); + ChatterboxFastForward(box); } } else @@ -27,5 +27,5 @@ else if (keyboard_check_released(ord("4"))) _index = 3; //If we've pressed a button, select that option - if (_index != undefined) chatterbox_select(box, _index); + if (_index != undefined) ChatterboxSelect(box, _index); } \ No newline at end of file diff --git a/objects/obj_testcase_jump/Create_0.gml b/objects/obj_testcase_jump/Create_0.gml index 5dc00db7..69c3704e 100644 --- a/objects/obj_testcase_jump/Create_0.gml +++ b/objects/obj_testcase_jump/Create_0.gml @@ -1,3 +1,3 @@ -chatterbox_load_from_file("testcase_jump.yarn"); -box = chatterbox_create(); -chatterbox_goto(box, "Start"); \ No newline at end of file +ChatterboxLoadFromFile("testcase_jump.yarn"); +box = ChatterboxCreate(); +ChatterboxGoto(box, "Start"); \ No newline at end of file diff --git a/objects/obj_testcase_jump/Draw_0.gml b/objects/obj_testcase_jump/Draw_0.gml index f2b0bdac..7645f0d9 100644 --- a/objects/obj_testcase_jump/Draw_0.gml +++ b/objects/obj_testcase_jump/Draw_0.gml @@ -4,7 +4,7 @@ draw_set_font(fnt_default); var _x = 10; var _y = 10; -if (chatterbox_is_stopped(box)) +if (ChatterboxIsStopped(box)) { //If we're stopped then show that draw_text(_x, _y, "(Chatterbox stopped)"); @@ -13,9 +13,9 @@ else { //All the spoken text var _i = 0; - repeat(chatterbox_get_content_count(box)) + repeat(ChatterboxGetContentCount(box)) { - draw_text(_x, _y, chatterbox_get_content(box, _i)); + draw_text(_x, _y, ChatterboxGetContent(box, _i)); _y += 20; ++_i; } @@ -23,7 +23,7 @@ else //Bit of spacing... _y += 20; - if (chatterbox_is_waiting(box)) + if (ChatterboxIsWaiting(box)) { //If we're in a "waiting" state then prompt the user for basic input draw_text(_x, _y, "(Press Space)"); @@ -32,9 +32,9 @@ else { //All the options var _i = 0; - repeat(chatterbox_get_option_count(box)) + repeat(ChatterboxGetOptionCount(box)) { - draw_text(_x, _y, string(_i+1) + ") " + chatterbox_get_option(box, _i)); + draw_text(_x, _y, string(_i+1) + ") " + ChatterboxGetOption(box, _i)); _y += 20; ++_i; } diff --git a/objects/obj_testcase_jump/Step_0.gml b/objects/obj_testcase_jump/Step_0.gml index d73811b7..753ae90d 100644 --- a/objects/obj_testcase_jump/Step_0.gml +++ b/objects/obj_testcase_jump/Step_0.gml @@ -1,18 +1,18 @@ -if (chatterbox_is_stopped(box)) +if (ChatterboxIsStopped(box)) { //If we're stopped then don't respond to user input } -else if (chatterbox_is_waiting(box)) +else if (ChatterboxIsWaiting(box)) { //If we're in a "waiting" state then let the user press to advance dialogue if (keyboard_check_released(vk_space)) { - chatterbox_continue(box); + ChatterboxContinue(box); } else if (keyboard_check_pressed(ord("F"))) { //The user can also press F to fast forward through text until they hit a choice - chatterbox_fast_forward(box); + ChatterboxFastForward(box); } } else @@ -27,5 +27,5 @@ else if (keyboard_check_released(ord("4"))) _index = 3; //If we've pressed a button, select that option - if (_index != undefined) chatterbox_select(box, _index); + if (_index != undefined) ChatterboxSelect(box, _index); } \ No newline at end of file diff --git a/objects/obj_testcase_metadata/Create_0.gml b/objects/obj_testcase_metadata/Create_0.gml index 97a552ee..b28716cd 100644 --- a/objects/obj_testcase_metadata/Create_0.gml +++ b/objects/obj_testcase_metadata/Create_0.gml @@ -1,3 +1,3 @@ -chatterbox_load_from_file("testcase_metadata.yarn"); -box = chatterbox_create(); -chatterbox_goto(box, "Start"); \ No newline at end of file +ChatterboxLoadFromFile("testcase_metadata.yarn"); +box = ChatterboxCreate(); +ChatterboxGoto(box, "Start"); \ No newline at end of file diff --git a/objects/obj_testcase_metadata/Draw_0.gml b/objects/obj_testcase_metadata/Draw_0.gml index f2b0bdac..7645f0d9 100644 --- a/objects/obj_testcase_metadata/Draw_0.gml +++ b/objects/obj_testcase_metadata/Draw_0.gml @@ -4,7 +4,7 @@ draw_set_font(fnt_default); var _x = 10; var _y = 10; -if (chatterbox_is_stopped(box)) +if (ChatterboxIsStopped(box)) { //If we're stopped then show that draw_text(_x, _y, "(Chatterbox stopped)"); @@ -13,9 +13,9 @@ else { //All the spoken text var _i = 0; - repeat(chatterbox_get_content_count(box)) + repeat(ChatterboxGetContentCount(box)) { - draw_text(_x, _y, chatterbox_get_content(box, _i)); + draw_text(_x, _y, ChatterboxGetContent(box, _i)); _y += 20; ++_i; } @@ -23,7 +23,7 @@ else //Bit of spacing... _y += 20; - if (chatterbox_is_waiting(box)) + if (ChatterboxIsWaiting(box)) { //If we're in a "waiting" state then prompt the user for basic input draw_text(_x, _y, "(Press Space)"); @@ -32,9 +32,9 @@ else { //All the options var _i = 0; - repeat(chatterbox_get_option_count(box)) + repeat(ChatterboxGetOptionCount(box)) { - draw_text(_x, _y, string(_i+1) + ") " + chatterbox_get_option(box, _i)); + draw_text(_x, _y, string(_i+1) + ") " + ChatterboxGetOption(box, _i)); _y += 20; ++_i; } diff --git a/objects/obj_testcase_metadata/Step_0.gml b/objects/obj_testcase_metadata/Step_0.gml index d73811b7..753ae90d 100644 --- a/objects/obj_testcase_metadata/Step_0.gml +++ b/objects/obj_testcase_metadata/Step_0.gml @@ -1,18 +1,18 @@ -if (chatterbox_is_stopped(box)) +if (ChatterboxIsStopped(box)) { //If we're stopped then don't respond to user input } -else if (chatterbox_is_waiting(box)) +else if (ChatterboxIsWaiting(box)) { //If we're in a "waiting" state then let the user press to advance dialogue if (keyboard_check_released(vk_space)) { - chatterbox_continue(box); + ChatterboxContinue(box); } else if (keyboard_check_pressed(ord("F"))) { //The user can also press F to fast forward through text until they hit a choice - chatterbox_fast_forward(box); + ChatterboxFastForward(box); } } else @@ -27,5 +27,5 @@ else if (keyboard_check_released(ord("4"))) _index = 3; //If we've pressed a button, select that option - if (_index != undefined) chatterbox_select(box, _index); + if (_index != undefined) ChatterboxSelect(box, _index); } \ No newline at end of file diff --git a/objects/obj_testcase_negate_function/Create_0.gml b/objects/obj_testcase_negate_function/Create_0.gml index 37681d31..0fc58576 100644 --- a/objects/obj_testcase_negate_function/Create_0.gml +++ b/objects/obj_testcase_negate_function/Create_0.gml @@ -1,3 +1,3 @@ -chatterbox_load_from_file("testcase_negate_function.yarn"); -box = chatterbox_create(); -chatterbox_goto(box, "Start"); \ No newline at end of file +ChatterboxLoadFromFile("testcase_negate_function.yarn"); +box = ChatterboxCreate(); +ChatterboxGoto(box, "Start"); \ No newline at end of file diff --git a/objects/obj_testcase_negate_function/Draw_0.gml b/objects/obj_testcase_negate_function/Draw_0.gml index f61e7bf6..3af14ad1 100644 --- a/objects/obj_testcase_negate_function/Draw_0.gml +++ b/objects/obj_testcase_negate_function/Draw_0.gml @@ -1,32 +1,32 @@ var _x = 10; var _y = 10; -if (chatterbox_is_stopped(box)) +if (ChatterboxIsStopped(box)) { draw_text(_x, _y, "(Chatterbox stopped)"); } else { var _i = 0; - repeat(chatterbox_get_content_count(box)) + repeat(ChatterboxGetContentCount(box)) { - draw_text(_x, _y, chatterbox_get_content(box, _i)); + draw_text(_x, _y, ChatterboxGetContent(box, _i)); _y += 20; ++_i; } _y += 20; - if (chatterbox_is_waiting(box)) + if (ChatterboxIsWaiting(box)) { draw_text(_x, _y, "(Press Space)"); } else { var _i = 0; - repeat(chatterbox_get_option_count(box)) + repeat(ChatterboxGetOptionCount(box)) { - draw_text(_x, _y, string(_i+1) + ") " + chatterbox_get_option(box, _i)); + draw_text(_x, _y, string(_i+1) + ") " + ChatterboxGetOption(box, _i)); _y += 20; ++_i; } diff --git a/objects/obj_testcase_negate_function/Step_0.gml b/objects/obj_testcase_negate_function/Step_0.gml index 42da1c14..f1f7633d 100644 --- a/objects/obj_testcase_negate_function/Step_0.gml +++ b/objects/obj_testcase_negate_function/Step_0.gml @@ -1,6 +1,6 @@ -if (chatterbox_is_waiting(box)) +if (ChatterboxIsWaiting(box)) { - if (keyboard_check_released(vk_space)) chatterbox_continue(box); + if (keyboard_check_released(vk_space)) ChatterboxContinue(box); } else { @@ -9,5 +9,5 @@ else if (keyboard_check_released(ord("2"))) _index = 1; if (keyboard_check_released(ord("3"))) _index = 2; if (keyboard_check_released(ord("4"))) _index = 3; - if (_index != undefined) chatterbox_select(box, _index); + if (_index != undefined) ChatterboxSelect(box, _index); } \ No newline at end of file diff --git a/objects/obj_testcase_numeric_param/Create_0.gml b/objects/obj_testcase_numeric_param/Create_0.gml index a9839119..b40f0adb 100644 --- a/objects/obj_testcase_numeric_param/Create_0.gml +++ b/objects/obj_testcase_numeric_param/Create_0.gml @@ -1,3 +1,3 @@ -chatterbox_load_from_file("testcase_numeric_param.yarn"); -box = chatterbox_create(); -chatterbox_goto(box, "Start"); \ No newline at end of file +ChatterboxLoadFromFile("testcase_numeric_param.yarn"); +box = ChatterboxCreate(); +ChatterboxGoto(box, "Start"); \ No newline at end of file diff --git a/objects/obj_testcase_numeric_param/Draw_0.gml b/objects/obj_testcase_numeric_param/Draw_0.gml index f61e7bf6..3af14ad1 100644 --- a/objects/obj_testcase_numeric_param/Draw_0.gml +++ b/objects/obj_testcase_numeric_param/Draw_0.gml @@ -1,32 +1,32 @@ var _x = 10; var _y = 10; -if (chatterbox_is_stopped(box)) +if (ChatterboxIsStopped(box)) { draw_text(_x, _y, "(Chatterbox stopped)"); } else { var _i = 0; - repeat(chatterbox_get_content_count(box)) + repeat(ChatterboxGetContentCount(box)) { - draw_text(_x, _y, chatterbox_get_content(box, _i)); + draw_text(_x, _y, ChatterboxGetContent(box, _i)); _y += 20; ++_i; } _y += 20; - if (chatterbox_is_waiting(box)) + if (ChatterboxIsWaiting(box)) { draw_text(_x, _y, "(Press Space)"); } else { var _i = 0; - repeat(chatterbox_get_option_count(box)) + repeat(ChatterboxGetOptionCount(box)) { - draw_text(_x, _y, string(_i+1) + ") " + chatterbox_get_option(box, _i)); + draw_text(_x, _y, string(_i+1) + ") " + ChatterboxGetOption(box, _i)); _y += 20; ++_i; } diff --git a/objects/obj_testcase_numeric_param/Step_0.gml b/objects/obj_testcase_numeric_param/Step_0.gml index 42da1c14..f1f7633d 100644 --- a/objects/obj_testcase_numeric_param/Step_0.gml +++ b/objects/obj_testcase_numeric_param/Step_0.gml @@ -1,6 +1,6 @@ -if (chatterbox_is_waiting(box)) +if (ChatterboxIsWaiting(box)) { - if (keyboard_check_released(vk_space)) chatterbox_continue(box); + if (keyboard_check_released(vk_space)) ChatterboxContinue(box); } else { @@ -9,5 +9,5 @@ else if (keyboard_check_released(ord("2"))) _index = 1; if (keyboard_check_released(ord("3"))) _index = 2; if (keyboard_check_released(ord("4"))) _index = 3; - if (_index != undefined) chatterbox_select(box, _index); + if (_index != undefined) ChatterboxSelect(box, _index); } \ No newline at end of file diff --git a/objects/obj_testcase_option/Create_0.gml b/objects/obj_testcase_option/Create_0.gml index 9a88762a..e53ccc3e 100644 --- a/objects/obj_testcase_option/Create_0.gml +++ b/objects/obj_testcase_option/Create_0.gml @@ -1,3 +1,3 @@ -chatterbox_load("testcase_option.yarn"); -box = chatterbox_create(); -chatterbox_goto(box, "Start"); \ No newline at end of file +ChatterboxLoadFromFile("testcase_option.yarn"); +box = ChatterboxCreate(); +ChatterboxGoto(box, "Start"); \ No newline at end of file diff --git a/objects/obj_testcase_option/Draw_0.gml b/objects/obj_testcase_option/Draw_0.gml index f61e7bf6..3af14ad1 100644 --- a/objects/obj_testcase_option/Draw_0.gml +++ b/objects/obj_testcase_option/Draw_0.gml @@ -1,32 +1,32 @@ var _x = 10; var _y = 10; -if (chatterbox_is_stopped(box)) +if (ChatterboxIsStopped(box)) { draw_text(_x, _y, "(Chatterbox stopped)"); } else { var _i = 0; - repeat(chatterbox_get_content_count(box)) + repeat(ChatterboxGetContentCount(box)) { - draw_text(_x, _y, chatterbox_get_content(box, _i)); + draw_text(_x, _y, ChatterboxGetContent(box, _i)); _y += 20; ++_i; } _y += 20; - if (chatterbox_is_waiting(box)) + if (ChatterboxIsWaiting(box)) { draw_text(_x, _y, "(Press Space)"); } else { var _i = 0; - repeat(chatterbox_get_option_count(box)) + repeat(ChatterboxGetOptionCount(box)) { - draw_text(_x, _y, string(_i+1) + ") " + chatterbox_get_option(box, _i)); + draw_text(_x, _y, string(_i+1) + ") " + ChatterboxGetOption(box, _i)); _y += 20; ++_i; } diff --git a/objects/obj_testcase_option/Step_0.gml b/objects/obj_testcase_option/Step_0.gml index 42da1c14..f1f7633d 100644 --- a/objects/obj_testcase_option/Step_0.gml +++ b/objects/obj_testcase_option/Step_0.gml @@ -1,6 +1,6 @@ -if (chatterbox_is_waiting(box)) +if (ChatterboxIsWaiting(box)) { - if (keyboard_check_released(vk_space)) chatterbox_continue(box); + if (keyboard_check_released(vk_space)) ChatterboxContinue(box); } else { @@ -9,5 +9,5 @@ else if (keyboard_check_released(ord("2"))) _index = 1; if (keyboard_check_released(ord("3"))) _index = 2; if (keyboard_check_released(ord("4"))) _index = 3; - if (_index != undefined) chatterbox_select(box, _index); + if (_index != undefined) ChatterboxSelect(box, _index); } \ No newline at end of file diff --git a/objects/obj_testcase_stop/Create_0.gml b/objects/obj_testcase_stop/Create_0.gml index afaffbe8..01ed43aa 100644 --- a/objects/obj_testcase_stop/Create_0.gml +++ b/objects/obj_testcase_stop/Create_0.gml @@ -1,3 +1,3 @@ -chatterbox_load("testcase_stop.yarn"); -box = chatterbox_create(); -chatterbox_goto(box, "Start"); \ No newline at end of file +ChatterboxLoadFromFile("testcase_stop.yarn"); +box = ChatterboxCreate(); +ChatterboxGoto(box, "Start"); \ No newline at end of file diff --git a/objects/obj_testcase_stop/Draw_0.gml b/objects/obj_testcase_stop/Draw_0.gml index f61e7bf6..3af14ad1 100644 --- a/objects/obj_testcase_stop/Draw_0.gml +++ b/objects/obj_testcase_stop/Draw_0.gml @@ -1,32 +1,32 @@ var _x = 10; var _y = 10; -if (chatterbox_is_stopped(box)) +if (ChatterboxIsStopped(box)) { draw_text(_x, _y, "(Chatterbox stopped)"); } else { var _i = 0; - repeat(chatterbox_get_content_count(box)) + repeat(ChatterboxGetContentCount(box)) { - draw_text(_x, _y, chatterbox_get_content(box, _i)); + draw_text(_x, _y, ChatterboxGetContent(box, _i)); _y += 20; ++_i; } _y += 20; - if (chatterbox_is_waiting(box)) + if (ChatterboxIsWaiting(box)) { draw_text(_x, _y, "(Press Space)"); } else { var _i = 0; - repeat(chatterbox_get_option_count(box)) + repeat(ChatterboxGetOptionCount(box)) { - draw_text(_x, _y, string(_i+1) + ") " + chatterbox_get_option(box, _i)); + draw_text(_x, _y, string(_i+1) + ") " + ChatterboxGetOption(box, _i)); _y += 20; ++_i; } diff --git a/objects/obj_testcase_stop/Step_0.gml b/objects/obj_testcase_stop/Step_0.gml index 42da1c14..f1f7633d 100644 --- a/objects/obj_testcase_stop/Step_0.gml +++ b/objects/obj_testcase_stop/Step_0.gml @@ -1,6 +1,6 @@ -if (chatterbox_is_waiting(box)) +if (ChatterboxIsWaiting(box)) { - if (keyboard_check_released(vk_space)) chatterbox_continue(box); + if (keyboard_check_released(vk_space)) ChatterboxContinue(box); } else { @@ -9,5 +9,5 @@ else if (keyboard_check_released(ord("2"))) _index = 1; if (keyboard_check_released(ord("3"))) _index = 2; if (keyboard_check_released(ord("4"))) _index = 3; - if (_index != undefined) chatterbox_select(box, _index); + if (_index != undefined) ChatterboxSelect(box, _index); } \ No newline at end of file diff --git a/options/amazonfire/options_amazonfire.yy b/options/amazonfire/options_amazonfire.yy index 4a7034d4..91b1608e 100644 --- a/options/amazonfire/options_amazonfire.yy +++ b/options/amazonfire/options_amazonfire.yy @@ -19,22 +19,22 @@ "option_amazonfire_lint": false, "option_amazonfire_install_location": 0, "option_amazonfire_sleep_margin": 4, - "option_amazonfire_splash_screens_landscape": "${base_options_dir}\\amazonfire\\splash\\landscape.png", - "option_amazonfire_splash_screens_portrait": "${base_options_dir}\\amazonfire\\splash\\portrait.png", + "option_amazonfire_splash_screens_landscape": "${base_options_dir}/amazonfire/splash/landscape.png", + "option_amazonfire_splash_screens_portrait": "${base_options_dir}/amazonfire/splash/portrait.png", "option_amazonfire_splash_time": 0, "option_amazonfire_launchscreen_fill": 0, "option_amazonfire_splashscreen_background_colour": 4294967295, - "option_amazonfire_tv_banner": "${base_options_dir}\\android\\tv_banner.png", + "option_amazonfire_tv_banner": "${base_options_dir}/android/tv_banner.png", "option_amazonfire_interpolate_pixels": false, "option_amazonfire_screen_depth": 0, "option_amazonfire_scale": 0, "option_amazonfire_texture_page": "2048x2048", - "option_amazonfire_icon_ldpi": "${base_options_dir}\\amazonfire\\icons\\ldpi.png", - "option_amazonfire_icon_mdpi": "${base_options_dir}\\amazonfire\\icons\\mdpi.png", - "option_amazonfire_icon_hdpi": "${base_options_dir}\\amazonfire\\icons\\hdpi.png", - "option_amazonfire_icon_xhdpi": "${base_options_dir}\\amazonfire\\icons\\xhdpi.png", - "option_amazonfire_icon_xxhdpi": "${base_options_dir}\\amazonfire\\icons\\xxhdpi.png", - "option_amazonfire_icon_xxxhdpi": "${base_options_dir}\\amazonfire\\icons\\xxxhdpi.png", + "option_amazonfire_icon_ldpi": "${base_options_dir}/amazonfire/icons/ldpi.png", + "option_amazonfire_icon_mdpi": "${base_options_dir}/amazonfire/icons/mdpi.png", + "option_amazonfire_icon_hdpi": "${base_options_dir}/amazonfire/icons/hdpi.png", + "option_amazonfire_icon_xhdpi": "${base_options_dir}/amazonfire/icons/xhdpi.png", + "option_amazonfire_icon_xxhdpi": "${base_options_dir}/amazonfire/icons/xxhdpi.png", + "option_amazonfire_icon_xxxhdpi": "${base_options_dir}/amazonfire/icons/xxxhdpi.png", "option_amazonfire_permission_write_external_storage": false, "option_amazonfire_permission_read_phone_state": false, "option_amazonfire_permission_network_state": false, diff --git a/options/android/options_android.yy b/options/android/options_android.yy index 274b029a..18acbc6c 100644 --- a/options/android/options_android.yy +++ b/options/android/options_android.yy @@ -28,7 +28,7 @@ "option_android_splash_time": 0, "option_android_launchscreen_fill": 0, "option_android_splashscreen_background_colour": 4294967295, - "option_android_tv_banner": "${base_options_dir}\\android\\tv_banner.png", + "option_android_tv_banner": "${base_options_dir}/android/tv_banner.png", "option_android_interpolate_pixels": false, "option_android_screen_depth": 0, "option_android_device_support": 0, @@ -41,18 +41,18 @@ "option_android_icon_xxhdpi": "${base_options_dir}/android/icons/xxhdpi.png", "option_android_icon_xxxhdpi": "${base_options_dir}/android/icons/xxxhdpi.png", "option_android_icon_adaptive_generate": false, - "option_android_icon_adaptive_ldpi": "${base_options_dir}\\android\\icons_adaptive\\ldpi.png", - "option_android_icon_adaptive_mdpi": "${base_options_dir}\\android\\icons_adaptive\\mdpi.png", - "option_android_icon_adaptive_hdpi": "${base_options_dir}\\android\\icons_adaptive\\hdpi.png", - "option_android_icon_adaptive_xhdpi": "${base_options_dir}\\android\\icons_adaptive\\xhdpi.png", - "option_android_icon_adaptive_xxhdpi": "${base_options_dir}\\android\\icons_adaptive\\xxhdpi.png", - "option_android_icon_adaptive_xxxhdpi": "${base_options_dir}\\android\\icons_adaptive\\xxxhdpi.png", - "option_android_icon_adaptivebg_ldpi": "${base_options_dir}\\android\\icons_adaptivebg\\ldpi.png", - "option_android_icon_adaptivebg_mdpi": "${base_options_dir}\\android\\icons_adaptivebg\\mdpi.png", - "option_android_icon_adaptivebg_hdpi": "${base_options_dir}\\android\\icons_adaptivebg\\hdpi.png", - "option_android_icon_adaptivebg_xhdpi": "${base_options_dir}\\android\\icons_adaptivebg\\xhdpi.png", - "option_android_icon_adaptivebg_xxhdpi": "${base_options_dir}\\android\\icons_adaptivebg\\xxhdpi.png", - "option_android_icon_adaptivebg_xxxhdpi": "${base_options_dir}\\android\\icons_adaptivebg\\xxxhdpi.png", + "option_android_icon_adaptive_ldpi": "${base_options_dir}/android/icons_adaptive/ldpi.png", + "option_android_icon_adaptive_mdpi": "${base_options_dir}/android/icons_adaptive/mdpi.png", + "option_android_icon_adaptive_hdpi": "${base_options_dir}/android/icons_adaptive/hdpi.png", + "option_android_icon_adaptive_xhdpi": "${base_options_dir}/android/icons_adaptive/xhdpi.png", + "option_android_icon_adaptive_xxhdpi": "${base_options_dir}/android/icons_adaptive/xxhdpi.png", + "option_android_icon_adaptive_xxxhdpi": "${base_options_dir}/android/icons_adaptive/xxxhdpi.png", + "option_android_icon_adaptivebg_ldpi": "${base_options_dir}/android/icons_adaptivebg/ldpi.png", + "option_android_icon_adaptivebg_mdpi": "${base_options_dir}/android/icons_adaptivebg/mdpi.png", + "option_android_icon_adaptivebg_hdpi": "${base_options_dir}/android/icons_adaptivebg/hdpi.png", + "option_android_icon_adaptivebg_xhdpi": "${base_options_dir}/android/icons_adaptivebg/xhdpi.png", + "option_android_icon_adaptivebg_xxhdpi": "${base_options_dir}/android/icons_adaptivebg/xxhdpi.png", + "option_android_icon_adaptivebg_xxxhdpi": "${base_options_dir}/android/icons_adaptivebg/xxxhdpi.png", "option_android_use_facebook": false, "option_android_facebook_id": "", "option_android_facebook_app_display_name": "", @@ -66,6 +66,7 @@ "option_android_permission_record_audio": false, "option_android_application_tag_inject": null, "option_android_google_apk_expansion": false, + "option_android_google_dynamic_asset_delivery": false, "option_android_google_licensing_public_key": "", "option_android_tv_isgame": true, "resourceVersion": "1.0", diff --git a/options/mac/options_mac.yy b/options/mac/options_mac.yy index 78bf6709..5200f6db 100644 --- a/options/mac/options_mac.yy +++ b/options/mac/options_mac.yy @@ -6,8 +6,8 @@ "option_mac_team_id": "", "option_mac_signing_identity": "Developer ID Application:", "option_mac_copyright": "", - "option_mac_splash_png": "${base_options_dir}\\mac\\splash\\splash.png", - "option_mac_icon_png": "${base_options_dir}\\mac\\icons\\1024.png", + "option_mac_splash_png": "${base_options_dir}/mac/splash/splash.png", + "option_mac_icon_png": "${base_options_dir}/mac/icons/1024.png", "option_mac_menu_dock": false, "option_mac_display_cursor": true, "option_mac_start_fullscreen": false, diff --git a/options/ps4/options_ps4.yy b/options/ps4/options_ps4.yy index 72d35b6b..a8f609eb 100644 --- a/options/ps4/options_ps4.yy +++ b/options/ps4/options_ps4.yy @@ -4,21 +4,21 @@ "option_ps4_nptitleid": "", "option_ps4_nptitlesecret": "", "option_ps4_paramsfo": "0", - "option_ps4_nptitledat": null, + "option_ps4_nptitledat": "", "option_ps4_trophyedit": "0", - "option_ps4_shareparam": null, - "option_ps4_pronunciation": null, - "option_ps4_splash_screen": "${base_options_dir}\\ps4\\sce_sys\\pic1.png", - "option_ps4_save_data_icon": "${base_options_dir}\\ps4\\sce_sys\\save_data.png", - "option_ps4_trophy_screen": "${base_options_dir}\\ps4\\sce_sys\\pic0.png", + "option_ps4_shareparam": "", + "option_ps4_pronunciation": "", + "option_ps4_splash_screen": "${base_options_dir}/ps4/sce_sys/pic1.png", + "option_ps4_save_data_icon": "${base_options_dir}/ps4/sce_sys/save_data.png", + "option_ps4_trophy_screen": "${base_options_dir}/ps4/sce_sys/pic0.png", "option_ps4_interpolate_pixels": false, "option_ps4_display_cursor": false, "option_ps4_scale": 0, "option_ps4_texture_page": "2048x2048", "option_ps4_max_display_width": -1, "option_ps4_max_display_height": -1, - "option_ps4_icon": "${base_options_dir}\\ps4\\sce_sys\\icon0.png", - "option_ps4_shareoverlay_image": "${base_options_dir}\\ps4\\sce_sys\\shareoverlayimage.png", + "option_ps4_icon": "${base_options_dir}/ps4/sce_sys/icon0.png", + "option_ps4_shareoverlay_image": "${base_options_dir}/ps4/sce_sys/shareoverlayimage.png", "option_ps4_nptitledat_file": "${options_dir}\\ps4\\sce_sys\\nptitle.dat", "option_ps4_paramsfo_file": "${options_dir}\\ps4\\sce_sys\\param.sfo", "option_ps4_trophy00trp_file": "${options_dir}\\ps4\\sce_sys\\trophy\\trophy00.trp", diff --git a/options/switch/options_switch.yy b/options/switch/options_switch.yy index b2cc162e..a3bd2ca1 100644 --- a/options/switch/options_switch.yy +++ b/options/switch/options_switch.yy @@ -6,8 +6,9 @@ "option_switch_texture_page": "2048x2048", "option_switch_check_nsp_publish_errors": true, "option_switch_enable_fileaccess_checking": true, - "option_switch_splash_screen": "${base_options_dir}\\switch\\splash.png", + "option_switch_splash_screen": "${base_options_dir}/switch/splash.png", "option_switch_use_splash": false, + "option_switch_allow_debug_output": false, "resourceVersion": "1.0", "name": "Switch", "tags": [], diff --git a/options/windowsuap/options_windowsuap.yy b/options/windowsuap/options_windowsuap.yy index afaf4b13..0fc19a1c 100644 --- a/options/windowsuap/options_windowsuap.yy +++ b/options/windowsuap/options_windowsuap.yy @@ -9,15 +9,15 @@ "option_windowsuap_orient_portrait_flipped": true, "option_windowsuap_orient_landscape": true, "option_windowsuap_orient_landscape_flipped": true, - "option_windowsuap_small_logo": "${base_options_dir}\\windowsuap\\logos\\SmallLogo.scale-100.png", - "option_windowsuap_smallish_logo": "${base_options_dir}\\windowsuap\\logos\\SmallishLogo.scale-100.png", - "option_windowsuap_store_logo": "${base_options_dir}\\windowsuap\\logos\\StoreLogo.scale-100.png", - "option_windowsuap_logo": "${base_options_dir}\\windowsuap\\logos\\Logo.scale-100.png", + "option_windowsuap_small_logo": "${base_options_dir}/windowsuap/logos/SmallLogo.scale-100.png", + "option_windowsuap_smallish_logo": "${base_options_dir}/windowsuap/logos/SmallishLogo.scale-100.png", + "option_windowsuap_store_logo": "${base_options_dir}/windowsuap/logos/StoreLogo.scale-100.png", + "option_windowsuap_logo": "${base_options_dir}/windowsuap/logos/Logo.scale-100.png", "option_windowsuap_logo_background_colour": 4278190080, "option_windowsuap_logo_foreground_text": 0, - "option_windowsuap_wide_logo": "${base_options_dir}\\windowsuap\\logos\\WideLogo.scale-100.png", - "option_windowsuap_large_logo": "${base_options_dir}\\windowsuap\\logos\\LargeLogo.scale-100.png", - "option_windowsuap_splash_png": "${base_options_dir}\\windowsuap\\splash\\SplashScreen.scale-100.png", + "option_windowsuap_wide_logo": "${base_options_dir}/windowsuap/logos/WideLogo.scale-100.png", + "option_windowsuap_large_logo": "${base_options_dir}/windowsuap/logos/LargeLogo.scale-100.png", + "option_windowsuap_splash_png": "${base_options_dir}/windowsuap/splash/SplashScreen.scale-100.png", "option_windowsuap_splash_background_colour": 4278190080, "option_windowsuap_interpolate_pixels": false, "option_windowsuap_display_cursor": true, @@ -32,8 +32,24 @@ "option_windowsuap_internet_capable": false, "option_windowsuap_microphone_capable": false, "option_windowsuap_iap_sandbox": false, + "option_windowsuap_targetdevicefamily_universal": true, "option_windowsuap_target_platform_version": "10.0.14393.0", "option_windowsuap_target_platform_min_version": "10.0.14393.0", + "option_windowsuap_targetdevicefamily_desktop": false, + "option_windowsuap_desktop_family_platform_version": "10.0.14393.0", + "option_windowsuap_desktop_family_platform_min_version": "10.0.14393.0", + "option_windowsuap_targetdevicefamily_xbox": false, + "option_windowsuap_xbox_family_platform_version": "10.0.14393.0", + "option_windowsuap_xbox_family_platform_min_version": "10.0.14393.0", + "option_windowsuap_targetdevicefamily_mobile": false, + "option_windowsuap_mobile_family_platform_version": "10.0.14393.0", + "option_windowsuap_mobile_family_platform_min_version": "10.0.14393.0", + "option_windowsuap_targetdevicefamily_holographic": false, + "option_windowsuap_holographic_family_platform_version": "10.0.14393.0", + "option_windowsuap_holographic_family_platform_min_version": "10.0.14393.0", + "option_windowsuap_targetdevicefamily_team": false, + "option_windowsuap_team_family_platform_version": "10.0.14393.0", + "option_windowsuap_team_family_platform_min_version": "10.0.14393.0", "option_windowsuap_xbox_live": false, "option_windowsuap_xbox_live_creators_program": false, "option_windowsuap_xbox_live_title_id": 0, diff --git a/options/xboxone/options_xboxone.yy b/options/xboxone/options_xboxone.yy index 01ab0248..b963342e 100644 --- a/options/xboxone/options_xboxone.yy +++ b/options/xboxone/options_xboxone.yy @@ -16,12 +16,12 @@ "option_xbone_stats_system": 0, "option_xbone_service_config_manifest": "", "option_xbone_network_config_manifest": "", - "option_xbone_splash_screen": "${base_options_dir}\\xboxone\\SplashScreen.png", + "option_xbone_splash_screen": "${base_options_dir}/xboxone/SplashScreen.png", "option_xbone_splash_screen_colour": 4282795590, - "option_xbone_logo_store": "${base_options_dir}\\xboxone\\logos\\StoreLogo.png", - "option_xbone_logo_small": "${base_options_dir}\\xboxone\\logos\\SmallLogo.png", - "option_xbone_logo_large": "${base_options_dir}\\xboxone\\logos\\Logo.png", - "option_xbone_logo_wide": "${base_options_dir}\\xboxone\\logos\\WideLogo.png", + "option_xbone_logo_store": "${base_options_dir}/xboxone/logos/StoreLogo.png", + "option_xbone_logo_small": "${base_options_dir}/xboxone/logos/SmallLogo.png", + "option_xbone_logo_large": "${base_options_dir}/xboxone/logos/Logo.png", + "option_xbone_logo_wide": "${base_options_dir}/xboxone/logos/WideLogo.png", "option_xbone_logo_background_colour": 4282795590, "option_xbone_foreground_text": 0, "option_xbone_interpolate_pixels": false, diff --git a/rooms/rm_main/rm_main.yy b/rooms/rm_main/rm_main.yy index 3c857572..299bca07 100644 --- a/rooms/rm_main/rm_main.yy +++ b/rooms/rm_main/rm_main.yy @@ -14,7 +14,7 @@ ], "layers": [ {"instances":[ - {"properties":[],"isDnd":false,"objectId":{"name":"obj_testcase_escaped_characters","path":"objects/obj_testcase_escaped_characters/obj_testcase_escaped_characters.yy",},"inheritCode":false,"hasCreationCode":false,"colour":4294967295,"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"imageIndex":0,"imageSpeed":1.0,"inheritedItemId":null,"frozen":false,"ignore":false,"inheritItemSettings":false,"x":32.0,"y":32.0,"resourceVersion":"1.0","name":"inst_60E722C6","tags":[],"resourceType":"GMRInstance",}, + {"properties":[],"isDnd":false,"objectId":{"name":"obj_test","path":"objects/obj_test/obj_test.yy",},"inheritCode":false,"hasCreationCode":false,"colour":4294967295,"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"imageIndex":0,"imageSpeed":1.0,"inheritedItemId":null,"frozen":false,"ignore":false,"inheritItemSettings":false,"x":32.0,"y":32.0,"resourceVersion":"1.0","name":"inst_A9AA110","tags":[],"resourceType":"GMRInstance",}, ],"visible":true,"depth":0,"userdefinedDepth":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"gridX":32,"gridY":32,"layers":[],"hierarchyFrozen":false,"resourceVersion":"1.0","name":"Example","tags":[],"resourceType":"GMRInstanceLayer",}, {"spriteId":null,"colour":4281542935,"x":0,"y":0,"htiled":false,"vtiled":false,"hspeed":0.0,"vspeed":0.0,"stretch":false,"animationFPS":15.0,"animationSpeedType":0,"userdefinedAnimFPS":false,"visible":true,"depth":100,"userdefinedDepth":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"gridX":32,"gridY":32,"layers":[],"hierarchyFrozen":false,"resourceVersion":"1.0","name":"Background","tags":[],"resourceType":"GMRBackgroundLayer",}, ], @@ -22,7 +22,7 @@ "creationCodeFile": "", "inheritCode": false, "instanceCreationOrder": [ - {"name":"inst_60E722C6","path":"rooms/rm_main/rm_main.yy",}, + {"name":"inst_A9AA110","path":"rooms/rm_main/rm_main.yy",}, ], "inheritCreationOrder": false, "sequenceId": null, diff --git a/scripts/chatterbox_add_findreplace/chatterbox_add_findreplace.gml b/scripts/ChatterboxAddFindReplace/ChatterboxAddFindReplace.gml similarity index 81% rename from scripts/chatterbox_add_findreplace/chatterbox_add_findreplace.gml rename to scripts/ChatterboxAddFindReplace/ChatterboxAddFindReplace.gml index c5d9db7f..e0997d13 100644 --- a/scripts/chatterbox_add_findreplace/chatterbox_add_findreplace.gml +++ b/scripts/ChatterboxAddFindReplace/ChatterboxAddFindReplace.gml @@ -4,7 +4,7 @@ /// @param oldString /// @param newString -function chatterbox_add_findreplace(_old, _new) +function ChatterboxAddFindReplace(_old, _new) { ds_list_add(global.__chatterbox_findreplace_old_string, _old); ds_list_add(global.__chatterbox_findreplace_new_string, _new); diff --git a/scripts/chatterbox_load_from_file/chatterbox_load_from_file.yy b/scripts/ChatterboxAddFindReplace/ChatterboxAddFindReplace.yy similarity index 83% rename from scripts/chatterbox_load_from_file/chatterbox_load_from_file.yy rename to scripts/ChatterboxAddFindReplace/ChatterboxAddFindReplace.yy index 8b8f53e6..8e02a1ca 100644 --- a/scripts/chatterbox_load_from_file/chatterbox_load_from_file.yy +++ b/scripts/ChatterboxAddFindReplace/ChatterboxAddFindReplace.yy @@ -6,7 +6,7 @@ "path": "folders/Chatterbox/Setup.yy", }, "resourceVersion": "1.0", - "name": "chatterbox_load_from_file", + "name": "ChatterboxAddFindReplace", "tags": [], "resourceType": "GMScript", } \ No newline at end of file diff --git a/scripts/chatterbox_add_function/chatterbox_add_function.gml b/scripts/ChatterboxAddFunction/ChatterboxAddFunction.gml similarity index 87% rename from scripts/chatterbox_add_function/chatterbox_add_function.gml rename to scripts/ChatterboxAddFunction/ChatterboxAddFunction.gml index 83a8c2bc..b0552d58 100644 --- a/scripts/chatterbox_add_function/chatterbox_add_function.gml +++ b/scripts/ChatterboxAddFunction/ChatterboxAddFunction.gml @@ -2,8 +2,8 @@ /// /// Custom functions can return values, but they should be numbers or strings. /// -/// GML: chatterbox_load("example.json"); -/// chatterbox_add_function("AmIDead", am_i_dead); +/// GML: ChatterboxLoadFromFile("example.json"); +/// ChatterboxAddFunction("AmIDead", am_i_dead); /// /// Yarn: Am I dead? /// <> @@ -23,7 +23,7 @@ /// @param name Script name, as a string /// @param function Function to call -function chatterbox_add_function(_name, _in_function) +function ChatterboxAddFunction(_name, _in_function) { var _function = _in_function; @@ -35,7 +35,7 @@ function chatterbox_add_function(_name, _in_function) if (CHATTERBOX_ALLOW_SCRIPTS && is_numeric(_function) && script_exists(_function)) { - __chatterbox_trace("Warning! Function provided for \"", _name, "\" was a script index (", _function, "=", script_get_name(_function), "), binding to scope"); + __chatterbox_trace("Function provided for \"", _name, "\" was a script index (", _function, "=", script_get_name(_function), "), binding to scope"); _function = method(undefined, _function); } diff --git a/scripts/chatterbox_add_function/chatterbox_add_function.yy b/scripts/ChatterboxAddFunction/ChatterboxAddFunction.yy similarity index 84% rename from scripts/chatterbox_add_function/chatterbox_add_function.yy rename to scripts/ChatterboxAddFunction/ChatterboxAddFunction.yy index 6a37c4ee..0e5b46db 100644 --- a/scripts/chatterbox_add_function/chatterbox_add_function.yy +++ b/scripts/ChatterboxAddFunction/ChatterboxAddFunction.yy @@ -6,7 +6,7 @@ "path": "folders/Chatterbox/Setup.yy", }, "resourceVersion": "1.0", - "name": "chatterbox_add_function", + "name": "ChatterboxAddFunction", "tags": [], "resourceType": "GMScript", } \ No newline at end of file diff --git a/scripts/chatterbox_continue/chatterbox_continue.gml b/scripts/ChatterboxContinue/ChatterboxContinue.gml similarity index 89% rename from scripts/chatterbox_continue/chatterbox_continue.gml rename to scripts/ChatterboxContinue/ChatterboxContinue.gml index 2cca327e..a6d42db5 100644 --- a/scripts/chatterbox_continue/chatterbox_continue.gml +++ b/scripts/ChatterboxContinue/ChatterboxContinue.gml @@ -2,7 +2,7 @@ /// /// @param chatterbox -function chatterbox_continue(_chatterbox) +function ChatterboxContinue(_chatterbox) { with(_chatterbox) { @@ -20,7 +20,7 @@ function chatterbox_continue(_chatterbox) } current_instruction = wait_instruction; - __chatterbox_vm(); + __ChatterboxVM(); } } } \ No newline at end of file diff --git a/scripts/chatterbox_continue/chatterbox_continue.yy b/scripts/ChatterboxContinue/ChatterboxContinue.yy similarity index 85% rename from scripts/chatterbox_continue/chatterbox_continue.yy rename to scripts/ChatterboxContinue/ChatterboxContinue.yy index 22581101..81304262 100644 --- a/scripts/chatterbox_continue/chatterbox_continue.yy +++ b/scripts/ChatterboxContinue/ChatterboxContinue.yy @@ -6,7 +6,7 @@ "path": "folders/Chatterbox/Flow.yy", }, "resourceVersion": "1.0", - "name": "chatterbox_continue", + "name": "ChatterboxContinue", "tags": [], "resourceType": "GMScript", } \ No newline at end of file diff --git a/scripts/chatterbox_continue/chatterbox_select.yy b/scripts/ChatterboxContinue/chatterbox_select.yy similarity index 100% rename from scripts/chatterbox_continue/chatterbox_select.yy rename to scripts/ChatterboxContinue/chatterbox_select.yy diff --git a/scripts/chatterbox_create/chatterbox_create.gml b/scripts/ChatterboxCreate/ChatterboxCreate.gml similarity index 97% rename from scripts/chatterbox_create/chatterbox_create.gml rename to scripts/ChatterboxCreate/ChatterboxCreate.gml index 25beb919..ae21a56e 100644 --- a/scripts/chatterbox_create/chatterbox_create.gml +++ b/scripts/ChatterboxCreate/ChatterboxCreate.gml @@ -13,7 +13,7 @@ /// @param [singletonText] /// @param [localScope] -function chatterbox_create() +function ChatterboxCreate() { var _filename = ((argument_count > 0) && (argument[0] != undefined))? argument[0] : global.__chatterbox_default_file; var _singleton = ((argument_count > 1) && (argument[1] != undefined))? argument[1] : CHATTERBOX_DEFAULT_SINGLETON; @@ -32,7 +32,7 @@ function __chatterbox_class(_filename, _singleton, _local_scope) constructor return undefined; } - if (!chatterbox_is_loaded(_filename)) + if (!ChatterboxIsLoaded(_filename)) { __chatterbox_error("Could not create chatterbox because \"", _filename, "\" is not loaded"); return undefined; diff --git a/scripts/chatterbox_create/chatterbox_create.yy b/scripts/ChatterboxCreate/ChatterboxCreate.yy similarity index 86% rename from scripts/chatterbox_create/chatterbox_create.yy rename to scripts/ChatterboxCreate/ChatterboxCreate.yy index d81284c6..6e011dbb 100644 --- a/scripts/chatterbox_create/chatterbox_create.yy +++ b/scripts/ChatterboxCreate/ChatterboxCreate.yy @@ -6,7 +6,7 @@ "path": "folders/Chatterbox.yy", }, "resourceVersion": "1.0", - "name": "chatterbox_create", + "name": "ChatterboxCreate", "tags": [], "resourceType": "GMScript", } \ No newline at end of file diff --git a/scripts/chatterbox_fast_forward/chatterbox_fast_forward.gml b/scripts/ChatterboxFastForward/ChatterboxFastForward.gml similarity index 63% rename from scripts/chatterbox_fast_forward/chatterbox_fast_forward.gml rename to scripts/ChatterboxFastForward/ChatterboxFastForward.gml index aa4bce60..1d0258de 100644 --- a/scripts/chatterbox_fast_forward/chatterbox_fast_forward.gml +++ b/scripts/ChatterboxFastForward/ChatterboxFastForward.gml @@ -2,7 +2,7 @@ /// /// @param chatterbox -function chatterbox_fast_forward(_chatterbox) +function ChatterboxFastForward(_chatterbox) { if (!_chatterbox.verify_is_loaded()) { @@ -10,20 +10,20 @@ function chatterbox_fast_forward(_chatterbox) return undefined; } - if (chatterbox_is_stopped(_chatterbox)) + if (ChatterboxIsStopped(_chatterbox)) { __chatterbox_trace("Error! Chatterbox has stopped, cannot fast forward"); return undefined; } - if (chatterbox_get_option_count(_chatterbox) > 0) + if (ChatterboxGetOptionCount(_chatterbox) > 0) { __chatterbox_trace("Error! Player is being prompted to make a choice, cannot fast forward"); return undefined; } - while ((chatterbox_get_option_count(_chatterbox) <= 0) && chatterbox_is_waiting(_chatterbox) && !chatterbox_is_stopped(_chatterbox)) + while ((ChatterboxGetOptionCount(_chatterbox) <= 0) && ChatterboxIsWaiting(_chatterbox) && !ChatterboxIsStopped(_chatterbox)) { - chatterbox_continue(_chatterbox); + ChatterboxContinue(_chatterbox); } } \ No newline at end of file diff --git a/scripts/chatterbox_is_waiting/chatterbox_is_waiting.yy b/scripts/ChatterboxFastForward/ChatterboxFastForward.yy similarity index 85% rename from scripts/chatterbox_is_waiting/chatterbox_is_waiting.yy rename to scripts/ChatterboxFastForward/ChatterboxFastForward.yy index aa4ec662..52649a92 100644 --- a/scripts/chatterbox_is_waiting/chatterbox_is_waiting.yy +++ b/scripts/ChatterboxFastForward/ChatterboxFastForward.yy @@ -6,7 +6,7 @@ "path": "folders/Chatterbox/Flow.yy", }, "resourceVersion": "1.0", - "name": "chatterbox_is_waiting", + "name": "ChatterboxFastForward", "tags": [], "resourceType": "GMScript", } \ No newline at end of file diff --git a/scripts/chatterbox_get_content/chatterbox_get_content.gml b/scripts/ChatterboxGetContent/ChatterboxGetContent.gml similarity index 73% rename from scripts/chatterbox_get_content/chatterbox_get_content.gml rename to scripts/ChatterboxGetContent/ChatterboxGetContent.gml index 7fcccf19..e457d70b 100644 --- a/scripts/chatterbox_get_content/chatterbox_get_content.gml +++ b/scripts/ChatterboxGetContent/ChatterboxGetContent.gml @@ -3,9 +3,9 @@ /// @param chatterbox /// @param contentIndex -function chatterbox_get_content(_chatterbox, _index) +function ChatterboxGetContent(_chatterbox, _index) { - if (!is_chatterbox(_chatterbox)) return undefined; + if (!IsChatterbox(_chatterbox)) return undefined; _chatterbox.verify_is_loaded(); if ((_index < 0) || (_index >= array_length(_chatterbox.content))) return undefined; return _chatterbox.content[_index]; diff --git a/scripts/chatterbox_get_option/chatterbox_get_option.yy b/scripts/ChatterboxGetContent/ChatterboxGetContent.yy similarity index 85% rename from scripts/chatterbox_get_option/chatterbox_get_option.yy rename to scripts/ChatterboxGetContent/ChatterboxGetContent.yy index c0353bc5..eb32408e 100644 --- a/scripts/chatterbox_get_option/chatterbox_get_option.yy +++ b/scripts/ChatterboxGetContent/ChatterboxGetContent.yy @@ -6,7 +6,7 @@ "path": "folders/Chatterbox/Getters.yy", }, "resourceVersion": "1.0", - "name": "chatterbox_get_option", + "name": "ChatterboxGetContent", "tags": [], "resourceType": "GMScript", } \ No newline at end of file diff --git a/scripts/chatterbox_get_content/chatterbox_get_content_count.yy b/scripts/ChatterboxGetContent/chatterbox_get_content_count.yy similarity index 100% rename from scripts/chatterbox_get_content/chatterbox_get_content_count.yy rename to scripts/ChatterboxGetContent/chatterbox_get_content_count.yy diff --git a/scripts/chatterbox_get_content_count/chatterbox_get_content_count.gml b/scripts/ChatterboxGetContentCount/ChatterboxGetContentCount.gml similarity index 63% rename from scripts/chatterbox_get_content_count/chatterbox_get_content_count.gml rename to scripts/ChatterboxGetContentCount/ChatterboxGetContentCount.gml index 0e796ca3..588ccb4c 100644 --- a/scripts/chatterbox_get_content_count/chatterbox_get_content_count.gml +++ b/scripts/ChatterboxGetContentCount/ChatterboxGetContentCount.gml @@ -2,9 +2,9 @@ /// /// @param chatterbox -function chatterbox_get_content_count(_chatterbox) +function ChatterboxGetContentCount(_chatterbox) { - if (!is_chatterbox(_chatterbox)) return undefined; + if (!IsChatterbox(_chatterbox)) return undefined; _chatterbox.verify_is_loaded(); return array_length(_chatterbox.content); } \ No newline at end of file diff --git a/scripts/chatterbox_get_option_count/chatterbox_get_option_count.yy b/scripts/ChatterboxGetContentCount/ChatterboxGetContentCount.yy similarity index 83% rename from scripts/chatterbox_get_option_count/chatterbox_get_option_count.yy rename to scripts/ChatterboxGetContentCount/ChatterboxGetContentCount.yy index 96832b09..e253525d 100644 --- a/scripts/chatterbox_get_option_count/chatterbox_get_option_count.yy +++ b/scripts/ChatterboxGetContentCount/ChatterboxGetContentCount.yy @@ -6,7 +6,7 @@ "path": "folders/Chatterbox/Getters.yy", }, "resourceVersion": "1.0", - "name": "chatterbox_get_option_count", + "name": "ChatterboxGetContentCount", "tags": [], "resourceType": "GMScript", } \ No newline at end of file diff --git a/scripts/chatterbox_get_current/chatterbox_get_current.gml b/scripts/ChatterboxGetCurrent/ChatterboxGetCurrent.gml similarity index 61% rename from scripts/chatterbox_get_current/chatterbox_get_current.gml rename to scripts/ChatterboxGetCurrent/ChatterboxGetCurrent.gml index 5b52403c..95e69396 100644 --- a/scripts/chatterbox_get_current/chatterbox_get_current.gml +++ b/scripts/ChatterboxGetCurrent/ChatterboxGetCurrent.gml @@ -1,10 +1,10 @@ -/// Returns the title of the current node of the given chatterbox -/// -/// @param chatterbox - -function chatterbox_get_current(_chatterbox) -{ - if (!is_chatterbox(_chatterbox)) return undefined; - _chatterbox.verify_is_loaded(); - return _chatterbox.current_node.title; +/// Returns the title of the current node of the given chatterbox +/// +/// @param chatterbox + +function ChatterboxGetCurrent(_chatterbox) +{ + if (!IsChatterbox(_chatterbox)) return undefined; + _chatterbox.verify_is_loaded(); + return _chatterbox.current_node.title; } \ No newline at end of file diff --git a/scripts/chatterbox_get_content/chatterbox_get_content.yy b/scripts/ChatterboxGetCurrent/ChatterboxGetCurrent.yy similarity index 85% rename from scripts/chatterbox_get_content/chatterbox_get_content.yy rename to scripts/ChatterboxGetCurrent/ChatterboxGetCurrent.yy index 79333438..64c16a30 100644 --- a/scripts/chatterbox_get_content/chatterbox_get_content.yy +++ b/scripts/ChatterboxGetCurrent/ChatterboxGetCurrent.yy @@ -6,7 +6,7 @@ "path": "folders/Chatterbox/Getters.yy", }, "resourceVersion": "1.0", - "name": "chatterbox_get_content", + "name": "ChatterboxGetCurrent", "tags": [], "resourceType": "GMScript", } \ No newline at end of file diff --git a/scripts/chatterbox_get_option/chatterbox_get_option.gml b/scripts/ChatterboxGetOption/ChatterboxGetOption.gml similarity index 72% rename from scripts/chatterbox_get_option/chatterbox_get_option.gml rename to scripts/ChatterboxGetOption/ChatterboxGetOption.gml index e7a4d4e7..e969b196 100644 --- a/scripts/chatterbox_get_option/chatterbox_get_option.gml +++ b/scripts/ChatterboxGetOption/ChatterboxGetOption.gml @@ -3,9 +3,9 @@ /// @param chatterbox /// @param index -function chatterbox_get_option(_chatterbox, _index) +function ChatterboxGetOption(_chatterbox, _index) { - if (!is_chatterbox(_chatterbox)) return undefined; + if (!IsChatterbox(_chatterbox)) return undefined; _chatterbox.verify_is_loaded(); if ((_index < 0) || (_index >= array_length(_chatterbox.option))) return undefined; return _chatterbox.option[_index]; diff --git a/scripts/ChatterboxGetOption/ChatterboxGetOption.yy b/scripts/ChatterboxGetOption/ChatterboxGetOption.yy new file mode 100644 index 00000000..a18a674b --- /dev/null +++ b/scripts/ChatterboxGetOption/ChatterboxGetOption.yy @@ -0,0 +1,12 @@ +{ + "isDnD": false, + "isCompatibility": false, + "parent": { + "name": "Getters", + "path": "folders/Chatterbox/Getters.yy", + }, + "resourceVersion": "1.0", + "name": "ChatterboxGetOption", + "tags": [], + "resourceType": "GMScript", +} \ No newline at end of file diff --git a/scripts/chatterbox_get_option/chatterbox_get_content.yy b/scripts/ChatterboxGetOption/chatterbox_get_content.yy similarity index 100% rename from scripts/chatterbox_get_option/chatterbox_get_content.yy rename to scripts/ChatterboxGetOption/chatterbox_get_content.yy diff --git a/scripts/chatterbox_get_option/chatterbox_get_content_count.yy b/scripts/ChatterboxGetOption/chatterbox_get_content_count.yy similarity index 100% rename from scripts/chatterbox_get_option/chatterbox_get_content_count.yy rename to scripts/ChatterboxGetOption/chatterbox_get_content_count.yy diff --git a/scripts/chatterbox_get_option_count/chatterbox_get_option_count.gml b/scripts/ChatterboxGetOptionCount/ChatterboxGetOptionCount.gml similarity index 63% rename from scripts/chatterbox_get_option_count/chatterbox_get_option_count.gml rename to scripts/ChatterboxGetOptionCount/ChatterboxGetOptionCount.gml index c0384026..e8ca4960 100644 --- a/scripts/chatterbox_get_option_count/chatterbox_get_option_count.gml +++ b/scripts/ChatterboxGetOptionCount/ChatterboxGetOptionCount.gml @@ -2,9 +2,9 @@ /// /// @param chatterbox -function chatterbox_get_option_count(_chatterbox) +function ChatterboxGetOptionCount(_chatterbox) { - if (!is_chatterbox(_chatterbox)) return undefined; + if (!IsChatterbox(_chatterbox)) return undefined; _chatterbox.verify_is_loaded(); return array_length(_chatterbox.option); } \ No newline at end of file diff --git a/scripts/ChatterboxGetOptionCount/ChatterboxGetOptionCount.yy b/scripts/ChatterboxGetOptionCount/ChatterboxGetOptionCount.yy new file mode 100644 index 00000000..ac84f0b6 --- /dev/null +++ b/scripts/ChatterboxGetOptionCount/ChatterboxGetOptionCount.yy @@ -0,0 +1,12 @@ +{ + "isDnD": false, + "isCompatibility": false, + "parent": { + "name": "Getters", + "path": "folders/Chatterbox/Getters.yy", + }, + "resourceVersion": "1.0", + "name": "ChatterboxGetOptionCount", + "tags": [], + "resourceType": "GMScript", +} \ No newline at end of file diff --git a/scripts/chatterbox_get_option_count/chatterbox_get_content_count.yy b/scripts/ChatterboxGetOptionCount/chatterbox_get_content_count.yy similarity index 100% rename from scripts/chatterbox_get_option_count/chatterbox_get_content_count.yy rename to scripts/ChatterboxGetOptionCount/chatterbox_get_content_count.yy diff --git a/scripts/chatterbox_goto/chatterbox_goto.gml b/scripts/ChatterboxGoto/ChatterboxGoto.gml similarity index 91% rename from scripts/chatterbox_goto/chatterbox_goto.gml rename to scripts/ChatterboxGoto/ChatterboxGoto.gml index 601ce9de..1e18477b 100644 --- a/scripts/chatterbox_goto/chatterbox_goto.gml +++ b/scripts/ChatterboxGoto/ChatterboxGoto.gml @@ -4,7 +4,7 @@ /// @param nodeTitle /// @param [filename] -function chatterbox_goto() +function ChatterboxGoto() { var _chatterbox = argument[0]; var _title = argument[1]; @@ -15,7 +15,7 @@ function chatterbox_goto() if (_filename != undefined) { var _file = global.chatterbox_files[? _filename]; - if (instanceof(_file) == "__chatterbox_class_source") + if (instanceof(_file) == "__ChatterboxClassSource") { file = _file; filename = file.filename; @@ -44,7 +44,7 @@ function chatterbox_goto() current_instruction = current_node.root_instruction; current_node.mark_visited(); - __chatterbox_vm(); + __ChatterboxVM(); } } } \ No newline at end of file diff --git a/scripts/chatterbox_goto/chatterbox_goto.yy b/scripts/ChatterboxGoto/ChatterboxGoto.yy similarity index 87% rename from scripts/chatterbox_goto/chatterbox_goto.yy rename to scripts/ChatterboxGoto/ChatterboxGoto.yy index 1916d057..1d5bbb25 100644 --- a/scripts/chatterbox_goto/chatterbox_goto.yy +++ b/scripts/ChatterboxGoto/ChatterboxGoto.yy @@ -6,7 +6,7 @@ "path": "folders/Chatterbox/Flow.yy", }, "resourceVersion": "1.0", - "name": "chatterbox_goto", + "name": "ChatterboxGoto", "tags": [], "resourceType": "GMScript", } \ No newline at end of file diff --git a/scripts/chatterbox_goto/Script24.yy b/scripts/ChatterboxGoto/Script24.yy similarity index 100% rename from scripts/chatterbox_goto/Script24.yy rename to scripts/ChatterboxGoto/Script24.yy diff --git a/scripts/chatterbox_is_loaded/chatterbox_is_loaded.gml b/scripts/ChatterboxIsLoaded/ChatterboxIsLoaded.gml similarity index 80% rename from scripts/chatterbox_is_loaded/chatterbox_is_loaded.gml rename to scripts/ChatterboxIsLoaded/ChatterboxIsLoaded.gml index 99037b0a..f959d533 100644 --- a/scripts/chatterbox_is_loaded/chatterbox_is_loaded.gml +++ b/scripts/ChatterboxIsLoaded/ChatterboxIsLoaded.gml @@ -2,7 +2,7 @@ /// /// @param filename Name of the file to check -function chatterbox_is_loaded(_filename) +function ChatterboxIsLoaded(_filename) { return ds_map_exists(global.chatterbox_files, _filename); } \ No newline at end of file diff --git a/scripts/chatterbox_unload/chatterbox_is_loaded.yy b/scripts/ChatterboxIsLoaded/ChatterboxIsLoaded.yy similarity index 85% rename from scripts/chatterbox_unload/chatterbox_is_loaded.yy rename to scripts/ChatterboxIsLoaded/ChatterboxIsLoaded.yy index 3811fb88..53fd357d 100644 --- a/scripts/chatterbox_unload/chatterbox_is_loaded.yy +++ b/scripts/ChatterboxIsLoaded/ChatterboxIsLoaded.yy @@ -6,7 +6,7 @@ "path": "folders/Chatterbox/Setup.yy", }, "resourceVersion": "1.0", - "name": "chatterbox_is_loaded", + "name": "ChatterboxIsLoaded", "tags": [], "resourceType": "GMScript", } \ No newline at end of file diff --git a/scripts/chatterbox_is_loaded/chatterbox_load.yy b/scripts/ChatterboxIsLoaded/chatterbox_load.yy similarity index 100% rename from scripts/chatterbox_is_loaded/chatterbox_load.yy rename to scripts/ChatterboxIsLoaded/chatterbox_load.yy diff --git a/scripts/chatterbox_is_loaded/chatterbox_unload.yy b/scripts/ChatterboxIsLoaded/chatterbox_unload.yy similarity index 100% rename from scripts/chatterbox_is_loaded/chatterbox_unload.yy rename to scripts/ChatterboxIsLoaded/chatterbox_unload.yy diff --git a/scripts/chatterbox_is_stopped/chatterbox_is_stopped.gml b/scripts/ChatterboxIsStopped/ChatterboxIsStopped.gml similarity index 69% rename from scripts/chatterbox_is_stopped/chatterbox_is_stopped.gml rename to scripts/ChatterboxIsStopped/ChatterboxIsStopped.gml index 365f47a1..b16c4ec2 100644 --- a/scripts/chatterbox_is_stopped/chatterbox_is_stopped.gml +++ b/scripts/ChatterboxIsStopped/ChatterboxIsStopped.gml @@ -2,9 +2,9 @@ /// /// @param chatterbox -function chatterbox_is_stopped(_chatterbox) +function ChatterboxIsStopped(_chatterbox) { - if (!is_chatterbox(_chatterbox)) return undefined; + if (!IsChatterbox(_chatterbox)) return undefined; _chatterbox.verify_is_loaded(); return _chatterbox.stopped; } \ No newline at end of file diff --git a/scripts/ChatterboxIsStopped/ChatterboxIsStopped.yy b/scripts/ChatterboxIsStopped/ChatterboxIsStopped.yy new file mode 100644 index 00000000..89ca7970 --- /dev/null +++ b/scripts/ChatterboxIsStopped/ChatterboxIsStopped.yy @@ -0,0 +1,12 @@ +{ + "isDnD": false, + "isCompatibility": false, + "parent": { + "name": "Flow", + "path": "folders/Chatterbox/Flow.yy", + }, + "resourceVersion": "1.0", + "name": "ChatterboxIsStopped", + "tags": [], + "resourceType": "GMScript", +} \ No newline at end of file diff --git a/scripts/chatterbox_is_waiting/chatterbox_is_waiting.gml b/scripts/ChatterboxIsWaiting/ChatterboxIsWaiting.gml similarity index 68% rename from scripts/chatterbox_is_waiting/chatterbox_is_waiting.gml rename to scripts/ChatterboxIsWaiting/ChatterboxIsWaiting.gml index e980a8d3..82c42cae 100644 --- a/scripts/chatterbox_is_waiting/chatterbox_is_waiting.gml +++ b/scripts/ChatterboxIsWaiting/ChatterboxIsWaiting.gml @@ -2,9 +2,9 @@ /// /// @param chatterbox -function chatterbox_is_waiting(_chatterbox) +function ChatterboxIsWaiting(_chatterbox) { - if (!is_chatterbox(_chatterbox)) return undefined; + if (!IsChatterbox(_chatterbox)) return undefined; _chatterbox.verify_is_loaded(); return _chatterbox.waiting; } \ No newline at end of file diff --git a/scripts/ChatterboxIsWaiting/ChatterboxIsWaiting.yy b/scripts/ChatterboxIsWaiting/ChatterboxIsWaiting.yy new file mode 100644 index 00000000..cc0ab17d --- /dev/null +++ b/scripts/ChatterboxIsWaiting/ChatterboxIsWaiting.yy @@ -0,0 +1,12 @@ +{ + "isDnD": false, + "isCompatibility": false, + "parent": { + "name": "Flow", + "path": "folders/Chatterbox/Flow.yy", + }, + "resourceVersion": "1.0", + "name": "ChatterboxIsWaiting", + "tags": [], + "resourceType": "GMScript", +} \ No newline at end of file diff --git a/scripts/chatterbox_is_waiting/chatterbox_is_stopped.yy b/scripts/ChatterboxIsWaiting/chatterbox_is_stopped.yy similarity index 100% rename from scripts/chatterbox_is_waiting/chatterbox_is_stopped.yy rename to scripts/ChatterboxIsWaiting/chatterbox_is_stopped.yy diff --git a/scripts/chatterbox_load_from_buffer/chatterbox_load_from_buffer.gml b/scripts/ChatterboxLoadFromBuffer/ChatterboxLoadFromBuffer.gml similarity index 81% rename from scripts/chatterbox_load_from_buffer/chatterbox_load_from_buffer.gml rename to scripts/ChatterboxLoadFromBuffer/ChatterboxLoadFromBuffer.gml index a94a9907..5519d8c9 100644 --- a/scripts/chatterbox_load_from_buffer/chatterbox_load_from_buffer.gml +++ b/scripts/ChatterboxLoadFromBuffer/ChatterboxLoadFromBuffer.gml @@ -5,7 +5,7 @@ /// @param filename Filename to use for this buffer /// @param buffer Buffer to read -function chatterbox_load_from_buffer(_filename, _buffer) +function ChatterboxLoadFromBuffer(_filename, _buffer) { if (!is_string(_filename)) { @@ -13,11 +13,11 @@ function chatterbox_load_from_buffer(_filename, _buffer) return undefined; } - if (chatterbox_is_loaded(_filename)) + if (ChatterboxIsLoaded(_filename)) { //Unload what we have already if needed //This will invalidate any chatterboxes that currently exist and are using the file - chatterbox_unload(_filename); + ChatterboxUnload(_filename); } //Set our default file if we don't already have one @@ -30,10 +30,10 @@ function chatterbox_load_from_buffer(_filename, _buffer) buffer_seek(_buffer, buffer_seek_start, _old_tell); //Create a struct that represents this source - var _source = new __chatterbox_class_source(_filename, _string); + var _source = new __ChatterboxClassSource(_filename, _string); //If we successfully decoded a buffer add it to our collection of chatterboxes - if ((instanceof(_source) == "__chatterbox_class_source") && _source.loaded) + if ((instanceof(_source) == "__ChatterboxClassSource") && _source.loaded) { global.chatterbox_files[? _filename] = _source; } diff --git a/scripts/ChatterboxLoadFromBuffer/ChatterboxLoadFromBuffer.yy b/scripts/ChatterboxLoadFromBuffer/ChatterboxLoadFromBuffer.yy new file mode 100644 index 00000000..dbe9b09b --- /dev/null +++ b/scripts/ChatterboxLoadFromBuffer/ChatterboxLoadFromBuffer.yy @@ -0,0 +1,12 @@ +{ + "isDnD": false, + "isCompatibility": false, + "parent": { + "name": "Setup", + "path": "folders/Chatterbox/Setup.yy", + }, + "resourceVersion": "1.0", + "name": "ChatterboxLoadFromBuffer", + "tags": [], + "resourceType": "GMScript", +} \ No newline at end of file diff --git a/scripts/chatterbox_load_from_buffer/chatterbox_load.yy b/scripts/ChatterboxLoadFromBuffer/chatterbox_load.yy similarity index 100% rename from scripts/chatterbox_load_from_buffer/chatterbox_load.yy rename to scripts/ChatterboxLoadFromBuffer/chatterbox_load.yy diff --git a/scripts/chatterbox_load_from_file/chatterbox_load_from_file.gml b/scripts/ChatterboxLoadFromFile/ChatterboxLoadFromFile.gml similarity index 86% rename from scripts/chatterbox_load_from_file/chatterbox_load_from_file.gml rename to scripts/ChatterboxLoadFromFile/ChatterboxLoadFromFile.gml index 255fb9e1..eebc9ba8 100644 --- a/scripts/chatterbox_load_from_file/chatterbox_load_from_file.gml +++ b/scripts/ChatterboxLoadFromFile/ChatterboxLoadFromFile.gml @@ -5,7 +5,7 @@ /// @param filename Name of the file to add /// @param [aliasName] Alias for the filename -function chatterbox_load_from_file() +function ChatterboxLoadFromFile() { var _filename = argument[0]; var _aliasName = ((argument_count > 1) && (argument[1] != undefined))? argument[1] : undefined; @@ -37,11 +37,11 @@ function chatterbox_load_from_file() var _buffer = buffer_load(_font_directory + _filename); if (_aliasName != undefined) { - return chatterbox_load_from_buffer(_aliasName, _buffer); + return ChatterboxLoadFromBuffer(_aliasName, _buffer); } else { - return chatterbox_load_from_buffer(_filename, _buffer); + return ChatterboxLoadFromBuffer(_filename, _buffer); } } else @@ -55,11 +55,11 @@ function chatterbox_load_from_file() if (_aliasName != undefined) { - return chatterbox_load_from_string(_aliasName, _string); + return ChatterboxLoadFromString(_aliasName, _string); } else { - return chatterbox_load_from_string(_filename, _string); + return ChatterboxLoadFromString(_filename, _string); } } } \ No newline at end of file diff --git a/scripts/ChatterboxLoadFromFile/ChatterboxLoadFromFile.yy b/scripts/ChatterboxLoadFromFile/ChatterboxLoadFromFile.yy new file mode 100644 index 00000000..83dbfc36 --- /dev/null +++ b/scripts/ChatterboxLoadFromFile/ChatterboxLoadFromFile.yy @@ -0,0 +1,12 @@ +{ + "isDnD": false, + "isCompatibility": false, + "parent": { + "name": "Setup", + "path": "folders/Chatterbox/Setup.yy", + }, + "resourceVersion": "1.0", + "name": "ChatterboxLoadFromFile", + "tags": [], + "resourceType": "GMScript", +} \ No newline at end of file diff --git a/scripts/chatterbox_load_from_string/chatterbox_load_from_string.gml b/scripts/ChatterboxLoadFromString/ChatterboxLoadFromString.gml similarity index 77% rename from scripts/chatterbox_load_from_string/chatterbox_load_from_string.gml rename to scripts/ChatterboxLoadFromString/ChatterboxLoadFromString.gml index 0fe658e2..0ef2f948 100644 --- a/scripts/chatterbox_load_from_string/chatterbox_load_from_string.gml +++ b/scripts/ChatterboxLoadFromString/ChatterboxLoadFromString.gml @@ -5,7 +5,7 @@ /// @param filename Filename to use for this buffer /// @param string String to read -function chatterbox_load_from_string(_filename, _string) +function ChatterboxLoadFromString(_filename, _string) { if (!is_string(_filename)) { @@ -13,21 +13,21 @@ function chatterbox_load_from_string(_filename, _string) return undefined; } - if (chatterbox_is_loaded(_filename)) + if (ChatterboxIsLoaded(_filename)) { //Unload what we have already if needed //This will invalidate any chatterboxes that currently exist and are using the file - chatterbox_unload(_filename); + ChatterboxUnload(_filename); } //Set our default file if we don't already have one if (global.__chatterbox_default_file == "") global.__chatterbox_default_file = _filename; //Create a struct that represents this source - var _source = new __chatterbox_class_source(_filename, _string); + var _source = new __ChatterboxClassSource(_filename, _string); //If we successfully decoded a buffer add it to our collection of chatterboxes - if ((instanceof(_source) == "__chatterbox_class_source") && _source.loaded) + if ((instanceof(_source) == "__ChatterboxClassSource") && _source.loaded) { global.chatterbox_files[? _filename] = _source; } diff --git a/scripts/ChatterboxLoadFromString/ChatterboxLoadFromString.yy b/scripts/ChatterboxLoadFromString/ChatterboxLoadFromString.yy new file mode 100644 index 00000000..2a31cfa9 --- /dev/null +++ b/scripts/ChatterboxLoadFromString/ChatterboxLoadFromString.yy @@ -0,0 +1,12 @@ +{ + "isDnD": false, + "isCompatibility": false, + "parent": { + "name": "Setup", + "path": "folders/Chatterbox/Setup.yy", + }, + "resourceVersion": "1.0", + "name": "ChatterboxLoadFromString", + "tags": [], + "resourceType": "GMScript", +} \ No newline at end of file diff --git a/scripts/chatterbox_load_from_string/chatterbox_load.yy b/scripts/ChatterboxLoadFromString/chatterbox_load.yy similarity index 100% rename from scripts/chatterbox_load_from_string/chatterbox_load.yy rename to scripts/ChatterboxLoadFromString/chatterbox_load.yy diff --git a/scripts/chatterbox_load_from_buffer/chatterbox_load_from_buffer.yy b/scripts/ChatterboxLoadFromString/chatterbox_load_from_buffer.yy similarity index 100% rename from scripts/chatterbox_load_from_buffer/chatterbox_load_from_buffer.yy rename to scripts/ChatterboxLoadFromString/chatterbox_load_from_buffer.yy diff --git a/scripts/chatterbox_select/chatterbox_select.gml b/scripts/ChatterboxSelect/ChatterboxSelect.gml similarity index 90% rename from scripts/chatterbox_select/chatterbox_select.gml rename to scripts/ChatterboxSelect/ChatterboxSelect.gml index 5c07d2d2..7c2036fa 100644 --- a/scripts/chatterbox_select/chatterbox_select.gml +++ b/scripts/ChatterboxSelect/ChatterboxSelect.gml @@ -3,7 +3,7 @@ /// @param chatterbox /// @param optionIndex -function chatterbox_select(_chatterbox, _index) +function ChatterboxSelect(_chatterbox, _index) { with(_chatterbox) { @@ -22,7 +22,7 @@ function chatterbox_select(_chatterbox, _index) current_instruction = option_instruction[_index]; - __chatterbox_vm(); + __ChatterboxVM(); } } } \ No newline at end of file diff --git a/scripts/chatterbox_select/chatterbox_select.yy b/scripts/ChatterboxSelect/ChatterboxSelect.yy similarity index 86% rename from scripts/chatterbox_select/chatterbox_select.yy rename to scripts/ChatterboxSelect/ChatterboxSelect.yy index ba9a6323..3757e31d 100644 --- a/scripts/chatterbox_select/chatterbox_select.yy +++ b/scripts/ChatterboxSelect/ChatterboxSelect.yy @@ -6,7 +6,7 @@ "path": "folders/Chatterbox/Flow.yy", }, "resourceVersion": "1.0", - "name": "chatterbox_select", + "name": "ChatterboxSelect", "tags": [], "resourceType": "GMScript", } \ No newline at end of file diff --git a/scripts/chatterbox_unload/chatterbox_unload.gml b/scripts/ChatterboxUnload/ChatterboxUnload.gml similarity index 92% rename from scripts/chatterbox_unload/chatterbox_unload.gml rename to scripts/ChatterboxUnload/ChatterboxUnload.gml index beacc056..763f2063 100644 --- a/scripts/chatterbox_unload/chatterbox_unload.gml +++ b/scripts/ChatterboxUnload/ChatterboxUnload.gml @@ -2,7 +2,7 @@ /// /// @param filename Name of the file to unload -function chatterbox_unload(_filename) +function ChatterboxUnload(_filename) { if (ds_map_exists(global.chatterbox_files, _filename)) { diff --git a/scripts/chatterbox_unload/chatterbox_unload.yy b/scripts/ChatterboxUnload/ChatterboxUnload.yy similarity index 86% rename from scripts/chatterbox_unload/chatterbox_unload.yy rename to scripts/ChatterboxUnload/ChatterboxUnload.yy index a0611a65..6e1247db 100644 --- a/scripts/chatterbox_unload/chatterbox_unload.yy +++ b/scripts/ChatterboxUnload/ChatterboxUnload.yy @@ -6,7 +6,7 @@ "path": "folders/Chatterbox/Setup.yy", }, "resourceVersion": "1.0", - "name": "chatterbox_unload", + "name": "ChatterboxUnload", "tags": [], "resourceType": "GMScript", } \ No newline at end of file diff --git a/scripts/chatterbox_is_loaded/chatterbox_is_loaded.yy b/scripts/ChatterboxUnload/chatterbox_is_loaded.yy similarity index 100% rename from scripts/chatterbox_is_loaded/chatterbox_is_loaded.yy rename to scripts/ChatterboxUnload/chatterbox_is_loaded.yy diff --git a/scripts/chatterbox_unload/chatterbox_load.yy b/scripts/ChatterboxUnload/chatterbox_load.yy similarity index 100% rename from scripts/chatterbox_unload/chatterbox_load.yy rename to scripts/ChatterboxUnload/chatterbox_load.yy diff --git a/scripts/chatterbox_visited/chatterbox_visited.gml b/scripts/ChatterboxVisited/ChatterboxVisited.gml similarity index 95% rename from scripts/chatterbox_visited/chatterbox_visited.gml rename to scripts/ChatterboxVisited/ChatterboxVisited.gml index 32cb8efd..744eb79d 100644 --- a/scripts/chatterbox_visited/chatterbox_visited.gml +++ b/scripts/ChatterboxVisited/ChatterboxVisited.gml @@ -1,7 +1,7 @@ /// @param nodeTitle /// @param [filename] -function chatterbox_visited() +function ChatterboxVisited() { var _node_title = argument[0]; var _filename = ((argument_count > 1) && is_string(argument[1]))? argument[1] : ""; diff --git a/scripts/chatterbox_visited/chatterbox_visited.yy b/scripts/ChatterboxVisited/ChatterboxVisited.yy similarity index 86% rename from scripts/chatterbox_visited/chatterbox_visited.yy rename to scripts/ChatterboxVisited/ChatterboxVisited.yy index 8dcfc6ec..a29ecfae 100644 --- a/scripts/chatterbox_visited/chatterbox_visited.yy +++ b/scripts/ChatterboxVisited/ChatterboxVisited.yy @@ -6,7 +6,7 @@ "path": "folders/Chatterbox/Getters.yy", }, "resourceVersion": "1.0", - "name": "chatterbox_visited", + "name": "ChatterboxVisited", "tags": [], "resourceType": "GMScript", } \ No newline at end of file diff --git a/scripts/IsChatterbox/IsChatterbox.gml b/scripts/IsChatterbox/IsChatterbox.gml new file mode 100644 index 00000000..bd8e2c61 --- /dev/null +++ b/scripts/IsChatterbox/IsChatterbox.gml @@ -0,0 +1,8 @@ +/// Returns if the given value is a chatterbox created by ChatterboxCreate() +/// +/// @param value + +function IsChatterbox(_value) +{ + return (instanceof(_value) == "__chatterbox_class"); +} \ No newline at end of file diff --git a/scripts/is_chatterbox/is_chatterbox.yy b/scripts/IsChatterbox/IsChatterbox.yy similarity index 88% rename from scripts/is_chatterbox/is_chatterbox.yy rename to scripts/IsChatterbox/IsChatterbox.yy index c829faa3..34d8ecb5 100644 --- a/scripts/is_chatterbox/is_chatterbox.yy +++ b/scripts/IsChatterbox/IsChatterbox.yy @@ -6,7 +6,7 @@ "path": "folders/Chatterbox.yy", }, "resourceVersion": "1.0", - "name": "is_chatterbox", + "name": "IsChatterbox", "tags": [], "resourceType": "GMScript", } \ No newline at end of file diff --git a/scripts/__chatterbox_class_expression/__chatterbox_class_expression.gml b/scripts/__ChatterboxClassExpression/__ChatterboxClassExpression.gml similarity index 99% rename from scripts/__chatterbox_class_expression/__chatterbox_class_expression.gml rename to scripts/__ChatterboxClassExpression/__ChatterboxClassExpression.gml index 84b2f9d9..11b9b292 100644 --- a/scripts/__chatterbox_class_expression/__chatterbox_class_expression.gml +++ b/scripts/__ChatterboxClassExpression/__ChatterboxClassExpression.gml @@ -130,7 +130,7 @@ function __chatterbox_evaluate(_local_scope, _filename, _expression, _behaviour) case "func": if (_expression.name == "visited") { - return chatterbox_visited(_parameter_values[0], _filename); + return ChatterboxVisited(_parameter_values[0], _filename); } else { @@ -172,7 +172,7 @@ function __chatterbox_evaluate(_local_scope, _filename, _expression, _behaviour) } else { - __chatterbox_error("Function \"", _expression.name, "\" not defined with chatterbox_add_function()"); + __chatterbox_error("Function \"", _expression.name, "\" not defined with ChatterboxAddFunction()"); } return undefined; diff --git a/scripts/__ChatterboxClassExpression/__ChatterboxClassExpression.yy b/scripts/__ChatterboxClassExpression/__ChatterboxClassExpression.yy new file mode 100644 index 00000000..e75e3358 --- /dev/null +++ b/scripts/__ChatterboxClassExpression/__ChatterboxClassExpression.yy @@ -0,0 +1,12 @@ +{ + "isDnD": false, + "isCompatibility": false, + "parent": { + "name": "omg i can't believe you looked in here", + "path": "folders/Chatterbox/(Internal system bits, don't look in here)/omg i can't believe you looked in here.yy", + }, + "resourceVersion": "1.0", + "name": "__ChatterboxClassExpression", + "tags": [], + "resourceType": "GMScript", +} \ No newline at end of file diff --git a/scripts/__chatterbox_class_instruction/__chatterbox_class_instruction.gml b/scripts/__ChatterboxClassInstruction/__ChatterboxClassInstruction.gml similarity index 85% rename from scripts/__chatterbox_class_instruction/__chatterbox_class_instruction.gml rename to scripts/__ChatterboxClassInstruction/__ChatterboxClassInstruction.gml index 0f4a24b8..e0d0f01c 100644 --- a/scripts/__chatterbox_class_instruction/__chatterbox_class_instruction.gml +++ b/scripts/__ChatterboxClassInstruction/__ChatterboxClassInstruction.gml @@ -1,7 +1,7 @@ /// @param type /// @param line /// @param indent -function __chatterbox_class_instruction(_type, _line, _indent) constructor +function __ChatterboxClassInstruction(_type, _line, _indent) constructor { type = _type; line = _line; @@ -30,7 +30,7 @@ function __chatterbox_instruction_add(_parent, _child) && !variable_struct_exists(_parent, "shortcut_branch")) { //Add a marker to the end of a branch. This helps the VM understand what's going on! - var _branch_end = new __chatterbox_class_instruction("shortcut end", _parent.line, _parent.indent); + var _branch_end = new __ChatterboxClassInstruction("shortcut end", _parent.line, _parent.indent); _parent.shortcut_branch = _branch_end; _branch_end.shortcut_branch_parent = _parent; _branch_end.next = _child; @@ -43,7 +43,7 @@ function __chatterbox_instruction_add(_parent, _child) __chatterbox_instruction_add(_parent.shortcut_branch_parent, _child); //Add a marker to the end of a branch. This helps the VM understand what's going on! - var _branch_end = new __chatterbox_class_instruction("shortcut end", _parent.line, _parent.indent); + var _branch_end = new __ChatterboxClassInstruction("shortcut end", _parent.line, _parent.indent); __chatterbox_instruction_add(_parent, _branch_end); _branch_end.next = _child; diff --git a/scripts/__ChatterboxClassInstruction/__ChatterboxClassInstruction.yy b/scripts/__ChatterboxClassInstruction/__ChatterboxClassInstruction.yy new file mode 100644 index 00000000..2af649fc --- /dev/null +++ b/scripts/__ChatterboxClassInstruction/__ChatterboxClassInstruction.yy @@ -0,0 +1,12 @@ +{ + "isDnD": false, + "isCompatibility": false, + "parent": { + "name": "omg i can't believe you looked in here", + "path": "folders/Chatterbox/(Internal system bits, don't look in here)/omg i can't believe you looked in here.yy", + }, + "resourceVersion": "1.0", + "name": "__ChatterboxClassInstruction", + "tags": [], + "resourceType": "GMScript", +} \ No newline at end of file diff --git a/scripts/__chatterbox_class_node/__chatterbox_class_node.gml b/scripts/__ChatterboxClassNode/__ChatterboxClassNode.gml similarity index 95% rename from scripts/__chatterbox_class_node/__chatterbox_class_node.gml rename to scripts/__ChatterboxClassNode/__ChatterboxClassNode.gml index f2061927..fdb711b7 100644 --- a/scripts/__chatterbox_class_node/__chatterbox_class_node.gml +++ b/scripts/__ChatterboxClassNode/__ChatterboxClassNode.gml @@ -2,14 +2,14 @@ /// @param nodeTags /// @param bodyString -function __chatterbox_class_node(_filename, _node_tags, _body_string) constructor +function __ChatterboxClassNode(_filename, _node_tags, _body_string) constructor { if (__CHATTERBOX_DEBUG_COMPILER) __chatterbox_trace("[", _title, "]"); filename = _filename; title = _node_tags.title; tags = _node_tags; - root_instruction = new __chatterbox_class_instruction(undefined, -1, 0); + root_instruction = new __ChatterboxClassInstruction(undefined, -1, 0); //Prepare body string for parsing var _work_string = _body_string; @@ -222,8 +222,8 @@ function __chatterbox_compile(_in_substring_array, _root_instruction) if (string_copy(_string, 1, 2) == "->") //Shortcut //TODO - Make this part of the substring splitting step { - var _instruction = new __chatterbox_class_instruction("shortcut", _line, _indent); - _instruction.text = new __chatterbox_class_text(__chatterbox_remove_whitespace(string_delete(_string, 1, 2), all)); + var _instruction = new __ChatterboxClassInstruction("shortcut", _line, _indent); + _instruction.text = new __ChatterboxClassText(__chatterbox_remove_whitespace(string_delete(_string, 1, 2), all)); } else if (_type == "command") { @@ -246,17 +246,17 @@ function __chatterbox_compile(_in_substring_array, _root_instruction) switch(_first_word) { case "declare": - var _instruction = new __chatterbox_class_instruction(_first_word, _line, _indent); + var _instruction = new __ChatterboxClassInstruction(_first_word, _line, _indent); _instruction.expression = __chatterbox_parse_expression(_remainder); break; case "set": - var _instruction = new __chatterbox_class_instruction(_first_word, _line, _indent); + var _instruction = new __ChatterboxClassInstruction(_first_word, _line, _indent); _instruction.expression = __chatterbox_parse_expression(_remainder); break; case "jump": - var _instruction = new __chatterbox_class_instruction("jump", _line, _indent); + var _instruction = new __ChatterboxClassInstruction("jump", _line, _indent); _instruction.destination = __chatterbox_remove_whitespace(_remainder, all); break; @@ -268,7 +268,7 @@ function __chatterbox_compile(_in_substring_array, _root_instruction) } else { - var _instruction = new __chatterbox_class_instruction("if", _line, _indent); + var _instruction = new __ChatterboxClassInstruction("if", _line, _indent); _instruction.condition = __chatterbox_parse_expression(_remainder); _if_depth++; _if_stack[@ _if_depth] = _instruction; @@ -276,7 +276,7 @@ function __chatterbox_compile(_in_substring_array, _root_instruction) break; case "else": - var _instruction = new __chatterbox_class_instruction("else", _line, _indent); + var _instruction = new __ChatterboxClassInstruction("else", _line, _indent); if (_if_depth < 0) { __chatterbox_error("<> found without matching <>"); @@ -291,7 +291,7 @@ function __chatterbox_compile(_in_substring_array, _root_instruction) case "else if": if (CHATTERBOX_ERROR_NONSTANDARD_SYNTAX) __chatterbox_error("<> is non-standard Yarn syntax, please use <>\n \n(Set CHATTERBOX_ERROR_NONSTANDARD_SYNTAX to to hide this error)"); case "elseif": - var _instruction = new __chatterbox_class_instruction("else if", _line, _indent); + var _instruction = new __ChatterboxClassInstruction("else if", _line, _indent); _instruction.condition = __chatterbox_parse_expression(_remainder); if (_if_depth < 0) { @@ -307,7 +307,7 @@ function __chatterbox_compile(_in_substring_array, _root_instruction) case "end if": if (CHATTERBOX_ERROR_NONSTANDARD_SYNTAX) __chatterbox_error("<> is non-standard Yarn syntax, please use <>\n \n(Set CHATTERBOX_ERROR_NONSTANDARD_SYNTAX to to hide this error)"); case "endif": - var _instruction = new __chatterbox_class_instruction("end if", _line, _indent); + var _instruction = new __ChatterboxClassInstruction("end if", _line, _indent); if (_if_depth < 0) { __chatterbox_error("<> found without matching <>"); @@ -328,13 +328,13 @@ function __chatterbox_compile(_in_substring_array, _root_instruction) } else { - var _instruction = new __chatterbox_class_instruction(_first_word, _line, _indent); + var _instruction = new __ChatterboxClassInstruction(_first_word, _line, _indent); } break; default: - var _instruction = new __chatterbox_class_instruction("direction", _line, _indent); - _instruction.text = new __chatterbox_class_text(_string); + var _instruction = new __ChatterboxClassInstruction("direction", _line, _indent); + _instruction.text = new __ChatterboxClassText(_string); break; } @@ -364,8 +364,8 @@ function __chatterbox_compile(_in_substring_array, _root_instruction) } else if (_type == "text") { - var _instruction = new __chatterbox_class_instruction("content", _line, _indent); - _instruction.text = new __chatterbox_class_text(_string); + var _instruction = new __ChatterboxClassInstruction("content", _line, _indent); + _instruction.text = new __ChatterboxClassText(_string); } if (_instruction != undefined) diff --git a/scripts/__chatterbox_class_text/__chatterbox_class_text.yy b/scripts/__ChatterboxClassNode/__ChatterboxClassNode.yy similarity index 89% rename from scripts/__chatterbox_class_text/__chatterbox_class_text.yy rename to scripts/__ChatterboxClassNode/__ChatterboxClassNode.yy index a13fe9af..cf413387 100644 --- a/scripts/__chatterbox_class_text/__chatterbox_class_text.yy +++ b/scripts/__ChatterboxClassNode/__ChatterboxClassNode.yy @@ -6,7 +6,7 @@ "path": "folders/Chatterbox/(Internal system bits, don't look in here)/omg i can't believe you looked in here.yy", }, "resourceVersion": "1.0", - "name": "__chatterbox_class_text", + "name": "__ChatterboxClassNode", "tags": [], "resourceType": "GMScript", } \ No newline at end of file diff --git a/scripts/__chatterbox_class_source/__chatterbox_class_source.gml b/scripts/__ChatterboxClassSource/__ChatterboxClassSource.gml similarity index 98% rename from scripts/__chatterbox_class_source/__chatterbox_class_source.gml rename to scripts/__ChatterboxClassSource/__ChatterboxClassSource.gml index ee48209a..1e647f4f 100644 --- a/scripts/__chatterbox_class_source/__chatterbox_class_source.gml +++ b/scripts/__ChatterboxClassSource/__ChatterboxClassSource.gml @@ -1,7 +1,7 @@ /// @param filename /// @param string -function __chatterbox_class_source(_filename, _string) constructor +function __ChatterboxClassSource(_filename, _string) constructor { filename = _filename; name = _filename; @@ -38,7 +38,7 @@ function __chatterbox_class_source(_filename, _string) constructor } else { - var _node = new __chatterbox_class_node(filename, _node_tags, _node_temp_struct.body); + var _node = new __ChatterboxClassNode(filename, _node_tags, _node_temp_struct.body); __chatterbox_array_add(nodes, _node); } diff --git a/scripts/__chatterbox_class_node/__chatterbox_class_node.yy b/scripts/__ChatterboxClassSource/__ChatterboxClassSource.yy similarity index 89% rename from scripts/__chatterbox_class_node/__chatterbox_class_node.yy rename to scripts/__ChatterboxClassSource/__ChatterboxClassSource.yy index f02a220d..21127d31 100644 --- a/scripts/__chatterbox_class_node/__chatterbox_class_node.yy +++ b/scripts/__ChatterboxClassSource/__ChatterboxClassSource.yy @@ -6,7 +6,7 @@ "path": "folders/Chatterbox/(Internal system bits, don't look in here)/omg i can't believe you looked in here.yy", }, "resourceVersion": "1.0", - "name": "__chatterbox_class_node", + "name": "__ChatterboxClassSource", "tags": [], "resourceType": "GMScript", } \ No newline at end of file diff --git a/scripts/__chatterbox_class_text/__chatterbox_class_text.gml b/scripts/__ChatterboxClassText/__ChatterboxClassText.gml similarity index 98% rename from scripts/__chatterbox_class_text/__chatterbox_class_text.gml rename to scripts/__ChatterboxClassText/__ChatterboxClassText.gml index 4e21eb01..11247e3e 100644 --- a/scripts/__chatterbox_class_text/__chatterbox_class_text.gml +++ b/scripts/__ChatterboxClassText/__ChatterboxClassText.gml @@ -1,6 +1,6 @@ /// @param string -function __chatterbox_class_text(_string) constructor +function __ChatterboxClassText(_string) constructor { raw_string = _string; substrings = []; diff --git a/scripts/__chatterbox_class_source/__chatterbox_class_source.yy b/scripts/__ChatterboxClassText/__ChatterboxClassText.yy similarity index 88% rename from scripts/__chatterbox_class_source/__chatterbox_class_source.yy rename to scripts/__ChatterboxClassText/__ChatterboxClassText.yy index 768f4d88..f24738f8 100644 --- a/scripts/__chatterbox_class_source/__chatterbox_class_source.yy +++ b/scripts/__ChatterboxClassText/__ChatterboxClassText.yy @@ -6,7 +6,7 @@ "path": "folders/Chatterbox/(Internal system bits, don't look in here)/omg i can't believe you looked in here.yy", }, "resourceVersion": "1.0", - "name": "__chatterbox_class_source", + "name": "__ChatterboxClassText", "tags": [], "resourceType": "GMScript", } \ No newline at end of file diff --git a/scripts/__chatterbox_config/__chatterbox_config.gml b/scripts/__ChatterboxConfig/__ChatterboxConfig.gml similarity index 100% rename from scripts/__chatterbox_config/__chatterbox_config.gml rename to scripts/__ChatterboxConfig/__ChatterboxConfig.gml diff --git a/scripts/__chatterbox_config/__chatterbox_config.yy b/scripts/__ChatterboxConfig/__ChatterboxConfig.yy similarity index 86% rename from scripts/__chatterbox_config/__chatterbox_config.yy rename to scripts/__ChatterboxConfig/__ChatterboxConfig.yy index 797187a8..eb5adcff 100644 --- a/scripts/__chatterbox_config/__chatterbox_config.yy +++ b/scripts/__ChatterboxConfig/__ChatterboxConfig.yy @@ -6,7 +6,7 @@ "path": "folders/Chatterbox.yy", }, "resourceVersion": "1.0", - "name": "__chatterbox_config", + "name": "__ChatterboxConfig", "tags": [], "resourceType": "GMScript", } \ No newline at end of file diff --git a/scripts/__chatterbox_system/__chatterbox_system.gml b/scripts/__ChatterboxSystem/__ChatterboxSystem.gml similarity index 99% rename from scripts/__chatterbox_system/__chatterbox_system.gml rename to scripts/__ChatterboxSystem/__ChatterboxSystem.gml index 98e083f6..e9956f51 100644 --- a/scripts/__chatterbox_system/__chatterbox_system.gml +++ b/scripts/__ChatterboxSystem/__ChatterboxSystem.gml @@ -1,7 +1,7 @@ #region Internal Macro Definitions #macro __CHATTERBOX_VERSION "2.x.x" -#macro __CHATTERBOX_DATE "2021/01/29" +#macro __CHATTERBOX_DATE "2021-02-14" #macro __CHATTERBOX_ON_MOBILE ((os_type == os_ios) || (os_type == os_android)) diff --git a/scripts/__chatterbox_system/__chatterbox_system.yy b/scripts/__ChatterboxSystem/__ChatterboxSystem.yy similarity index 90% rename from scripts/__chatterbox_system/__chatterbox_system.yy rename to scripts/__ChatterboxSystem/__ChatterboxSystem.yy index a1f88ec3..da37b2a1 100644 --- a/scripts/__chatterbox_system/__chatterbox_system.yy +++ b/scripts/__ChatterboxSystem/__ChatterboxSystem.yy @@ -6,7 +6,7 @@ "path": "folders/Chatterbox/(Internal system bits, don't look in here)/omg i can't believe you looked in here.yy", }, "resourceVersion": "1.0", - "name": "__chatterbox_system", + "name": "__ChatterboxSystem", "tags": [], "resourceType": "GMScript", } \ No newline at end of file diff --git a/scripts/__chatterbox_vm/__chatterbox_vm.gml b/scripts/__ChatterboxVM/__ChatterboxVM.gml similarity index 95% rename from scripts/__chatterbox_vm/__chatterbox_vm.gml rename to scripts/__ChatterboxVM/__ChatterboxVM.gml index 5492427a..659aabac 100644 --- a/scripts/__chatterbox_vm/__chatterbox_vm.gml +++ b/scripts/__ChatterboxVM/__ChatterboxVM.gml @@ -1,261 +1,261 @@ -function __chatterbox_vm() -{ - content = []; - option = []; - option_instruction = []; - - stopped = false; - waiting = false; - wait_instruction = undefined; - entered_shortcut = false; - leaving_shortcut = false; - rejected_if = false; - - if (current_instruction.type == "stop") - { - stopped = true; - if (__CHATTERBOX_DEBUG_VM) __chatterbox_trace("STOP"); - return undefined; - } - - __chatterbox_vm_inner(current_instruction); - if (__CHATTERBOX_DEBUG_VM) __chatterbox_trace("HALT"); -} - -function __chatterbox_vm_inner(_instruction) -{ - var _do_next = true; - var _next = variable_struct_get(_instruction, "next"); - - if (is_string(_instruction.type)) - { - var _condition_failed = false; - - if (!((_instruction.type == "if") || (_instruction.type == "else if")) && variable_struct_exists(_instruction, "condition")) - { - if (!__chatterbox_evaluate(local_scope, filename, _instruction.condition, undefined)) _condition_failed = true; - } - - if (!_condition_failed) - { - if ((_instruction.type == "shortcut") && !leaving_shortcut) - { - entered_shortcut = true; - - if (_instruction.type == "shortcut") - { - var _branch = variable_struct_get(_instruction, "shortcut_branch"); - if (_branch == undefined) _branch = variable_struct_get(_instruction, "next"); - - __chatterbox_array_add(option, _instruction.text.evaluate(local_scope, filename)); - __chatterbox_array_add(option_instruction, _branch); - if (__CHATTERBOX_DEBUG_VM) __chatterbox_trace(__chatterbox_generate_indent(_instruction.indent), "-> \"", _instruction.text.raw_string, "\" ", instanceof(_branch)); - } - } - else - { - if ((_instruction.type != "shortcut") && leaving_shortcut) leaving_shortcut = false; - } - - if (entered_shortcut) - { - if (_instruction.type != "shortcut") - { - _do_next = false; - } - } - else - { - switch(_instruction.type) - { - case "content": - __chatterbox_array_add(content, _instruction.text.evaluate(local_scope, filename)); - if (__CHATTERBOX_DEBUG_VM) __chatterbox_trace(__chatterbox_generate_indent(_instruction.indent), _instruction.text.raw_string); - - if (singleton_text) - { - if (instanceof(_next) == "__chatterbox_class_instruction") - { - if (((_next.type != "shortcut") || CHATTERBOX_SINGLETON_WAIT_BEFORE_SHORTCUT) - && (_next.type != "wait") - && (_next.type != "stop")) - { - waiting = true; - wait_instruction = _next; - _do_next = false; - } - } - } - break; - - case "wait": - waiting = true; - wait_instruction = _instruction.next; - _do_next = false; - if (__CHATTERBOX_DEBUG_VM) __chatterbox_trace(__chatterbox_generate_indent(_instruction.indent), "<>"); - break; - - case "jump": - if (__CHATTERBOX_DEBUG_VM) __chatterbox_trace(__chatterbox_generate_indent(_instruction.indent), "[goto ", _instruction.destination, "]"); - - var _split = __chatterbox_split_goto(_instruction.destination); - if (_split.filename == undefined) - { - var _next_node = find_node(_split.node); - _next_node.mark_visited(); - _next = _next_node.root_instruction; - current_node = _next_node; - } - else - { - var _file = global.chatterbox_files[? _split.filename]; - if (instanceof(_file) == "__chatterbox_class_source") - { - file = _file; - filename = file.filename; - - _next_node = find_node(_split.node); - _next_node.mark_visited(); - _next = _next_node.root_instruction; - current_node = _next_node; - } - else - { - __chatterbox_trace("Error! File \"", _split.filename, "\" not found or not loaded"); - } - } - break; - - case "stop": - if (CHATTERBOX_WAIT_BEFORE_STOP && (array_length(content) > 0) && (array_length(option) <= 0)) - { - waiting = true; - wait_instruction = _instruction; - } - else - { - stopped = true; - } - - _do_next = false; - if (__CHATTERBOX_DEBUG_VM) __chatterbox_trace(__chatterbox_generate_indent(_instruction.indent), "<>"); - break; - - case "shortcut end": - leaving_shortcut = true; - if (__CHATTERBOX_DEBUG_VM) __chatterbox_trace(__chatterbox_generate_indent(_instruction.indent), "<>"); - break; - - case "declare": - if (__CHATTERBOX_DEBUG_VM) __chatterbox_trace(_instruction.expression); - __chatterbox_evaluate(local_scope, filename, _instruction.expression, "declare"); - break; - - case "set": - if (__CHATTERBOX_DEBUG_VM) __chatterbox_trace(_instruction.expression); - __chatterbox_evaluate(local_scope, filename, _instruction.expression, "set"); - break; - - case "direction": - if (__CHATTERBOX_DEBUG_VM) __chatterbox_trace(_instruction.expression); - - if (is_method(CHATTERBOX_DIRECTION_FUNCTION)) - { - CHATTERBOX_DIRECTION_FUNCTION(_instruction.text.evaluate(local_scope, filename)); - } - else if (is_numeric(CHATTERBOX_DIRECTION_FUNCTION) && script_exists(CHATTERBOX_DIRECTION_FUNCTION)) - { - script_execute(CHATTERBOX_DIRECTION_FUNCTION, _instruction.text.evaluate(local_scope, filename)); - } - - //if (__chatterbox_evaluate(local_scope, filename, _instruction.expression, false) == "<>") - //{ - // waiting = true; - // wait_instruction = _instruction.next; - // _do_next = false; - // if (__CHATTERBOX_DEBUG_VM) __chatterbox_trace(__chatterbox_generate_indent(_instruction.indent), "<> (returned by function)"); - //} - break; - - case "if": - if (__CHATTERBOX_DEBUG_VM) __chatterbox_trace("<> ", _instruction.condition); - - if (__chatterbox_evaluate(local_scope, filename, _instruction.condition, undefined)) - { - rejected_if = false; - } - else - { - rejected_if = true; - _next = variable_struct_get(_instruction, "branch_reject"); - } - break; - - case "else": - if (__CHATTERBOX_DEBUG_VM) __chatterbox_trace("<>"); - - if (!rejected_if) - { - _next = variable_struct_get(_instruction, "branch_reject"); - } - break; - - case "else if": - if (__CHATTERBOX_DEBUG_VM) __chatterbox_trace("<> ", _instruction.condition); - - if (rejected_if && __chatterbox_evaluate(local_scope, filename, _instruction.condition, undefined)) - { - rejected_if = false; - } - else - { - _next = variable_struct_get(_instruction, "branch_reject"); - } - break; - - case "end if": - rejected_if = false; - if (__CHATTERBOX_DEBUG_VM) __chatterbox_trace("<>"); - break; - - default: - if (__CHATTERBOX_DEBUG_VM) __chatterbox_trace("\"", _instruction.type, "\" instruction ignored"); - break; - } - } - } - } - - if (_do_next) - { - if (instanceof(_next) == "__chatterbox_class_instruction") - { - __chatterbox_vm_inner(_next); - } - else - { - __chatterbox_trace(__chatterbox_generate_indent(_instruction.indent), "Warning! Instruction found without next node (datatype=", instanceof(_next), ")"); - stopped = true; - } - } -} - -/// @param string -function __chatterbox_split_goto(_string) -{ - var _pos = string_pos(CHATTERBOX_FILENAME_SEPARATOR, _string); - if (_pos <= 0) - { - return { - filename : undefined, - node : _string, - }; - } - else - { - return { - filename : string_copy(_string, 1, _pos-1), - node : string_delete(_string, 1, _pos), - }; - } +function __ChatterboxVM() +{ + content = []; + option = []; + option_instruction = []; + + stopped = false; + waiting = false; + wait_instruction = undefined; + entered_shortcut = false; + leaving_shortcut = false; + rejected_if = false; + + if (current_instruction.type == "stop") + { + stopped = true; + if (__CHATTERBOX_DEBUG_VM) __chatterbox_trace("STOP"); + return undefined; + } + + __chatterbox_vm_inner(current_instruction); + if (__CHATTERBOX_DEBUG_VM) __chatterbox_trace("HALT"); +} + +function __chatterbox_vm_inner(_instruction) +{ + var _do_next = true; + var _next = variable_struct_get(_instruction, "next"); + + if (is_string(_instruction.type)) + { + var _condition_failed = false; + + if (!((_instruction.type == "if") || (_instruction.type == "else if")) && variable_struct_exists(_instruction, "condition")) + { + if (!__chatterbox_evaluate(local_scope, filename, _instruction.condition, undefined)) _condition_failed = true; + } + + if (!_condition_failed) + { + if ((_instruction.type == "shortcut") && !leaving_shortcut) + { + entered_shortcut = true; + + if (_instruction.type == "shortcut") + { + var _branch = variable_struct_get(_instruction, "shortcut_branch"); + if (_branch == undefined) _branch = variable_struct_get(_instruction, "next"); + + __chatterbox_array_add(option, _instruction.text.evaluate(local_scope, filename)); + __chatterbox_array_add(option_instruction, _branch); + if (__CHATTERBOX_DEBUG_VM) __chatterbox_trace(__chatterbox_generate_indent(_instruction.indent), "-> \"", _instruction.text.raw_string, "\" ", instanceof(_branch)); + } + } + else + { + if ((_instruction.type != "shortcut") && leaving_shortcut) leaving_shortcut = false; + } + + if (entered_shortcut) + { + if (_instruction.type != "shortcut") + { + _do_next = false; + } + } + else + { + switch(_instruction.type) + { + case "content": + __chatterbox_array_add(content, _instruction.text.evaluate(local_scope, filename)); + if (__CHATTERBOX_DEBUG_VM) __chatterbox_trace(__chatterbox_generate_indent(_instruction.indent), _instruction.text.raw_string); + + if (singleton_text) + { + if (instanceof(_next) == "__ChatterboxClassInstruction") + { + if (((_next.type != "shortcut") || CHATTERBOX_SINGLETON_WAIT_BEFORE_SHORTCUT) + && (_next.type != "wait") + && (_next.type != "stop")) + { + waiting = true; + wait_instruction = _next; + _do_next = false; + } + } + } + break; + + case "wait": + waiting = true; + wait_instruction = _instruction.next; + _do_next = false; + if (__CHATTERBOX_DEBUG_VM) __chatterbox_trace(__chatterbox_generate_indent(_instruction.indent), "<>"); + break; + + case "jump": + if (__CHATTERBOX_DEBUG_VM) __chatterbox_trace(__chatterbox_generate_indent(_instruction.indent), "[goto ", _instruction.destination, "]"); + + var _split = __chatterbox_split_goto(_instruction.destination); + if (_split.filename == undefined) + { + var _next_node = find_node(_split.node); + _next_node.mark_visited(); + _next = _next_node.root_instruction; + current_node = _next_node; + } + else + { + var _file = global.chatterbox_files[? _split.filename]; + if (instanceof(_file) == "__ChatterboxClassSource") + { + file = _file; + filename = file.filename; + + _next_node = find_node(_split.node); + _next_node.mark_visited(); + _next = _next_node.root_instruction; + current_node = _next_node; + } + else + { + __chatterbox_trace("Error! File \"", _split.filename, "\" not found or not loaded"); + } + } + break; + + case "stop": + if (CHATTERBOX_WAIT_BEFORE_STOP && (array_length(content) > 0) && (array_length(option) <= 0)) + { + waiting = true; + wait_instruction = _instruction; + } + else + { + stopped = true; + } + + _do_next = false; + if (__CHATTERBOX_DEBUG_VM) __chatterbox_trace(__chatterbox_generate_indent(_instruction.indent), "<>"); + break; + + case "shortcut end": + leaving_shortcut = true; + if (__CHATTERBOX_DEBUG_VM) __chatterbox_trace(__chatterbox_generate_indent(_instruction.indent), "<>"); + break; + + case "declare": + if (__CHATTERBOX_DEBUG_VM) __chatterbox_trace(_instruction.expression); + __chatterbox_evaluate(local_scope, filename, _instruction.expression, "declare"); + break; + + case "set": + if (__CHATTERBOX_DEBUG_VM) __chatterbox_trace(_instruction.expression); + __chatterbox_evaluate(local_scope, filename, _instruction.expression, "set"); + break; + + case "direction": + if (__CHATTERBOX_DEBUG_VM) __chatterbox_trace(_instruction.expression); + + if (is_method(CHATTERBOX_DIRECTION_FUNCTION)) + { + CHATTERBOX_DIRECTION_FUNCTION(_instruction.text.evaluate(local_scope, filename)); + } + else if (is_numeric(CHATTERBOX_DIRECTION_FUNCTION) && script_exists(CHATTERBOX_DIRECTION_FUNCTION)) + { + script_execute(CHATTERBOX_DIRECTION_FUNCTION, _instruction.text.evaluate(local_scope, filename)); + } + + //if (__chatterbox_evaluate(local_scope, filename, _instruction.expression, false) == "<>") + //{ + // waiting = true; + // wait_instruction = _instruction.next; + // _do_next = false; + // if (__CHATTERBOX_DEBUG_VM) __chatterbox_trace(__chatterbox_generate_indent(_instruction.indent), "<> (returned by function)"); + //} + break; + + case "if": + if (__CHATTERBOX_DEBUG_VM) __chatterbox_trace("<> ", _instruction.condition); + + if (__chatterbox_evaluate(local_scope, filename, _instruction.condition, undefined)) + { + rejected_if = false; + } + else + { + rejected_if = true; + _next = variable_struct_get(_instruction, "branch_reject"); + } + break; + + case "else": + if (__CHATTERBOX_DEBUG_VM) __chatterbox_trace("<>"); + + if (!rejected_if) + { + _next = variable_struct_get(_instruction, "branch_reject"); + } + break; + + case "else if": + if (__CHATTERBOX_DEBUG_VM) __chatterbox_trace("<> ", _instruction.condition); + + if (rejected_if && __chatterbox_evaluate(local_scope, filename, _instruction.condition, undefined)) + { + rejected_if = false; + } + else + { + _next = variable_struct_get(_instruction, "branch_reject"); + } + break; + + case "end if": + rejected_if = false; + if (__CHATTERBOX_DEBUG_VM) __chatterbox_trace("<>"); + break; + + default: + if (__CHATTERBOX_DEBUG_VM) __chatterbox_trace("\"", _instruction.type, "\" instruction ignored"); + break; + } + } + } + } + + if (_do_next) + { + if (instanceof(_next) == "__ChatterboxClassInstruction") + { + __chatterbox_vm_inner(_next); + } + else + { + __chatterbox_trace(__chatterbox_generate_indent(_instruction.indent), "Warning! Instruction found without next node (datatype=", instanceof(_next), ")"); + stopped = true; + } + } +} + +/// @param string +function __chatterbox_split_goto(_string) +{ + var _pos = string_pos(CHATTERBOX_FILENAME_SEPARATOR, _string); + if (_pos <= 0) + { + return { + filename : undefined, + node : _string, + }; + } + else + { + return { + filename : string_copy(_string, 1, _pos-1), + node : string_delete(_string, 1, _pos), + }; + } } \ No newline at end of file diff --git a/scripts/__ChatterboxVM/__ChatterboxVM.yy b/scripts/__ChatterboxVM/__ChatterboxVM.yy new file mode 100644 index 00000000..71a5471b --- /dev/null +++ b/scripts/__ChatterboxVM/__ChatterboxVM.yy @@ -0,0 +1,12 @@ +{ + "isDnD": false, + "isCompatibility": false, + "parent": { + "name": "omg i can't believe you looked in here", + "path": "folders/Chatterbox/(Internal system bits, don't look in here)/omg i can't believe you looked in here.yy", + }, + "resourceVersion": "1.0", + "name": "__ChatterboxVM", + "tags": [], + "resourceType": "GMScript", +} \ No newline at end of file diff --git a/scripts/__chatterbox_class_expression/__chatterbox_class_expression.yy b/scripts/__chatterbox_class_expression/__chatterbox_class_expression.yy deleted file mode 100644 index 9a4efad1..00000000 --- a/scripts/__chatterbox_class_expression/__chatterbox_class_expression.yy +++ /dev/null @@ -1,12 +0,0 @@ -{ - "isDnD": false, - "isCompatibility": false, - "parent": { - "name": "omg i can't believe you looked in here", - "path": "folders/Chatterbox/(Internal system bits, don't look in here)/omg i can't believe you looked in here.yy", - }, - "resourceVersion": "1.0", - "name": "__chatterbox_class_expression", - "tags": [], - "resourceType": "GMScript", -} \ No newline at end of file diff --git a/scripts/__chatterbox_class_instruction/__chatterbox_class_instruction.yy b/scripts/__chatterbox_class_instruction/__chatterbox_class_instruction.yy deleted file mode 100644 index 1aea3487..00000000 --- a/scripts/__chatterbox_class_instruction/__chatterbox_class_instruction.yy +++ /dev/null @@ -1,12 +0,0 @@ -{ - "isDnD": false, - "isCompatibility": false, - "parent": { - "name": "omg i can't believe you looked in here", - "path": "folders/Chatterbox/(Internal system bits, don't look in here)/omg i can't believe you looked in here.yy", - }, - "resourceVersion": "1.0", - "name": "__chatterbox_class_instruction", - "tags": [], - "resourceType": "GMScript", -} \ No newline at end of file diff --git a/scripts/__chatterbox_vm/__chatterbox_vm.yy b/scripts/__chatterbox_vm/__chatterbox_vm.yy deleted file mode 100644 index 519f8a4f..00000000 --- a/scripts/__chatterbox_vm/__chatterbox_vm.yy +++ /dev/null @@ -1,12 +0,0 @@ -{ - "isDnD": false, - "isCompatibility": false, - "parent": { - "name": "omg i can't believe you looked in here", - "path": "folders/Chatterbox/(Internal system bits, don't look in here)/omg i can't believe you looked in here.yy", - }, - "resourceVersion": "1.0", - "name": "__chatterbox_vm", - "tags": [], - "resourceType": "GMScript", -} \ No newline at end of file diff --git a/scripts/chatterbox_add_findreplace/chatterbox_add_findreplace.yy b/scripts/chatterbox_add_findreplace/chatterbox_add_findreplace.yy deleted file mode 100644 index f25769f9..00000000 --- a/scripts/chatterbox_add_findreplace/chatterbox_add_findreplace.yy +++ /dev/null @@ -1,12 +0,0 @@ -{ - "isDnD": false, - "isCompatibility": false, - "parent": { - "name": "Setup", - "path": "folders/Chatterbox/Setup.yy", - }, - "resourceVersion": "1.0", - "name": "chatterbox_add_findreplace", - "tags": [], - "resourceType": "GMScript", -} \ No newline at end of file diff --git a/scripts/chatterbox_fast_forward/chatterbox_fast_forward.yy b/scripts/chatterbox_fast_forward/chatterbox_fast_forward.yy deleted file mode 100644 index afbc58c2..00000000 --- a/scripts/chatterbox_fast_forward/chatterbox_fast_forward.yy +++ /dev/null @@ -1,12 +0,0 @@ -{ - "isDnD": false, - "isCompatibility": false, - "parent": { - "name": "Flow", - "path": "folders/Chatterbox/Flow.yy", - }, - "resourceVersion": "1.0", - "name": "chatterbox_fast_forward", - "tags": [], - "resourceType": "GMScript", -} \ No newline at end of file diff --git a/scripts/chatterbox_get_content_count/chatterbox_get_content_count.yy b/scripts/chatterbox_get_content_count/chatterbox_get_content_count.yy deleted file mode 100644 index 8d12aada..00000000 --- a/scripts/chatterbox_get_content_count/chatterbox_get_content_count.yy +++ /dev/null @@ -1,12 +0,0 @@ -{ - "isDnD": false, - "isCompatibility": false, - "parent": { - "name": "Getters", - "path": "folders/Chatterbox/Getters.yy", - }, - "resourceVersion": "1.0", - "name": "chatterbox_get_content_count", - "tags": [], - "resourceType": "GMScript", -} \ No newline at end of file diff --git a/scripts/chatterbox_get_current/chatterbox_get_current.yy b/scripts/chatterbox_get_current/chatterbox_get_current.yy deleted file mode 100644 index 8cc91714..00000000 --- a/scripts/chatterbox_get_current/chatterbox_get_current.yy +++ /dev/null @@ -1,12 +0,0 @@ -{ - "isDnD": false, - "isCompatibility": false, - "parent": { - "name": "Getters", - "path": "folders/Chatterbox/Getters.yy", - }, - "resourceVersion": "1.0", - "name": "chatterbox_get_current", - "tags": [], - "resourceType": "GMScript", -} \ No newline at end of file diff --git a/scripts/chatterbox_is_stopped/chatterbox_is_stopped.yy b/scripts/chatterbox_is_stopped/chatterbox_is_stopped.yy deleted file mode 100644 index 51452295..00000000 --- a/scripts/chatterbox_is_stopped/chatterbox_is_stopped.yy +++ /dev/null @@ -1,12 +0,0 @@ -{ - "isDnD": false, - "isCompatibility": false, - "parent": { - "name": "Flow", - "path": "folders/Chatterbox/Flow.yy", - }, - "resourceVersion": "1.0", - "name": "chatterbox_is_stopped", - "tags": [], - "resourceType": "GMScript", -} \ No newline at end of file diff --git a/scripts/chatterbox_load/chatterbox_load.gml b/scripts/chatterbox_load/chatterbox_load.gml deleted file mode 100644 index aa412fc3..00000000 --- a/scripts/chatterbox_load/chatterbox_load.gml +++ /dev/null @@ -1,6 +0,0 @@ -function chatterbox_load(_filename) -{ - __chatterbox_error("chatterbox_load() has been deprecated. Please use chatterbox_load_from_file() instead"); - - return chatterbox_load_from_file(_filename); -} \ No newline at end of file diff --git a/scripts/chatterbox_load/chatterbox_load.yy b/scripts/chatterbox_load/chatterbox_load.yy deleted file mode 100644 index aefc6da3..00000000 --- a/scripts/chatterbox_load/chatterbox_load.yy +++ /dev/null @@ -1,12 +0,0 @@ -{ - "isDnD": false, - "isCompatibility": false, - "parent": { - "name": "Deprecated", - "path": "folders/Chatterbox/(Internal system bits, don't look in here)/omg i can't believe you looked in here/Deprecated.yy", - }, - "resourceVersion": "1.0", - "name": "chatterbox_load", - "tags": [], - "resourceType": "GMScript", -} \ No newline at end of file diff --git a/scripts/chatterbox_load_from_string/chatterbox_load_from_buffer.yy b/scripts/chatterbox_load_from_string/chatterbox_load_from_buffer.yy deleted file mode 100644 index ecb7e1e6..00000000 --- a/scripts/chatterbox_load_from_string/chatterbox_load_from_buffer.yy +++ /dev/null @@ -1,12 +0,0 @@ -{ - "isDnD": false, - "isCompatibility": false, - "parent": { - "name": "Setup", - "path": "folders/Chatterbox/Setup.yy", - }, - "resourceVersion": "1.0", - "name": "chatterbox_load_from_buffer", - "tags": [], - "resourceType": "GMScript", -} \ No newline at end of file diff --git a/scripts/chatterbox_load_from_string/chatterbox_load_from_string.yy b/scripts/chatterbox_load_from_string/chatterbox_load_from_string.yy deleted file mode 100644 index 354af3ec..00000000 --- a/scripts/chatterbox_load_from_string/chatterbox_load_from_string.yy +++ /dev/null @@ -1,12 +0,0 @@ -{ - "isDnD": false, - "isCompatibility": false, - "parent": { - "name": "Setup", - "path": "folders/Chatterbox/Setup.yy", - }, - "resourceVersion": "1.0", - "name": "chatterbox_load_from_string", - "tags": [], - "resourceType": "GMScript", -} \ No newline at end of file diff --git a/scripts/is_chatterbox/is_chatterbox.gml b/scripts/is_chatterbox/is_chatterbox.gml deleted file mode 100644 index 19f040f9..00000000 --- a/scripts/is_chatterbox/is_chatterbox.gml +++ /dev/null @@ -1,8 +0,0 @@ -/// Returns if the given value is a chatterbox created by chatterbox_create() -/// -/// @param value - -function is_chatterbox(_value) -{ - return (instanceof(_value) == "__chatterbox_class"); -} \ No newline at end of file diff --git a/scripts/testcase_action_function/testcase_action_function.gml b/scripts/testcase_action_function/testcase_action_function.gml index fc4e20cf..c325f854 100644 --- a/scripts/testcase_action_function/testcase_action_function.gml +++ b/scripts/testcase_action_function/testcase_action_function.gml @@ -1,4 +1,4 @@ -chatterbox_add_function("testcaseAction", testcase_action_function); +ChatterboxAddFunction("testcaseAction", testcase_action_function); function testcase_action_function(_array) { diff --git a/scripts/testcase_numeric_param_function/testcase_numeric_param_function.gml b/scripts/testcase_numeric_param_function/testcase_numeric_param_function.gml index 870155e3..0336949b 100644 --- a/scripts/testcase_numeric_param_function/testcase_numeric_param_function.gml +++ b/scripts/testcase_numeric_param_function/testcase_numeric_param_function.gml @@ -1,4 +1,4 @@ -chatterbox_add_function("testcaseNumericParam", testcase_numeric_param_function); +ChatterboxAddFunction("testcaseNumericParam", testcase_numeric_param_function); function testcase_numeric_param_function(_array) {