diff --git a/README.md b/README.md index afd46f30..1cb263c2 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@

-

2.8.1

+

2.8.2

Narrative engine for GameMaker by @jujuadams

diff --git a/chatterbox.yyp b/chatterbox.yyp index 0696107b..169fabc8 100644 --- a/chatterbox.yyp +++ b/chatterbox.yyp @@ -1,4 +1,7 @@ { + "resourceType": "GMProject", + "resourceVersion": "1.6", + "name": "chatterbox", "resources": [ {"id":{"name":"__ChatterboxExpressionFuncs","path":"scripts/__ChatterboxExpressionFuncs/__ChatterboxExpressionFuncs.yy",},"order":5,}, {"id":{"name":"__ChatterboxSystem","path":"scripts/__ChatterboxSystem/__ChatterboxSystem.yy",},"order":6,}, @@ -21,7 +24,7 @@ {"id":{"name":"ChatterboxIsStopped","path":"scripts/ChatterboxIsStopped/ChatterboxIsStopped.yy",},"order":3,}, {"id":{"name":"oTestCaseDirection","path":"objects/oTestCaseDirection/oTestCaseDirection.yy",},"order":15,}, {"id":{"name":"ChatterboxVariableDefault","path":"scripts/ChatterboxVariableDefault/ChatterboxVariableDefault.yy",},"order":0,}, - {"id":{"name":"ChatterboxSourceGetTags","path":"scripts/ChatterboxSourceGetTags/ChatterboxSourceGetTags.yy",},"order":6,}, + {"id":{"name":"ChatterboxSourceGetTags","path":"scripts/ChatterboxSourceGetTags/ChatterboxSourceGetTags.yy",},"order":7,}, {"id":{"name":"oTestCaseNodeMetadata","path":"objects/oTestCaseNodeMetadata/oTestCaseNodeMetadata.yy",},"order":11,}, {"id":{"name":"ChatterboxGetOption","path":"scripts/ChatterboxGetOption/ChatterboxGetOption.yy",},"order":0,}, {"id":{"name":"oTestCaseSetterLocalScope","path":"objects/oTestCaseSetterLocalScope/oTestCaseSetterLocalScope.yy",},"order":32,}, @@ -29,9 +32,9 @@ {"id":{"name":"oTestCaseSourceData","path":"objects/oTestCaseSourceData/oTestCaseSourceData.yy",},"order":22,}, {"id":{"name":"ChatterboxHop","path":"scripts/ChatterboxHop/ChatterboxHop.yy",},"order":6,}, {"id":{"name":"oTestCaseVariableAccess","path":"objects/oTestCaseVariableAccess/oTestCaseVariableAccess.yy",},"order":23,}, - {"id":{"name":"ChatterboxSourceGetNodeTitles","path":"scripts/ChatterboxSourceGetNodeTitles/ChatterboxSourceGetNodeTitles.yy",},"order":6,}, + {"id":{"name":"ChatterboxSourceGetNodeTitles","path":"scripts/ChatterboxSourceGetNodeTitles/ChatterboxSourceGetNodeTitles.yy",},"order":10,}, {"id":{"name":"oTestCaseStop","path":"objects/oTestCaseStop/oTestCaseStop.yy",},"order":3,}, - {"id":{"name":"IsChatterbox","path":"scripts/IsChatterbox/IsChatterbox.yy",},"order":2,}, + {"id":{"name":"IsChatterbox","path":"scripts/IsChatterbox/IsChatterbox.yy",},"order":1,}, {"id":{"name":"ChatterboxGetAllContentString","path":"scripts/ChatterboxGetAllContentString/ChatterboxGetAllContentString.yy",},"order":0,}, {"id":{"name":"oTestCaseAllContentString","path":"objects/oTestCaseAllContentString/oTestCaseAllContentString.yy",},"order":28,}, {"id":{"name":"oTestCaseBOM","path":"objects/oTestCaseBOM/oTestCaseBOM.yy",},"order":9,}, @@ -43,16 +46,16 @@ {"id":{"name":"oTestCaseEvaluationOrder","path":"objects/oTestCaseEvaluationOrder/oTestCaseEvaluationOrder.yy",},"order":36,}, {"id":{"name":"ChatterboxVariableGet","path":"scripts/ChatterboxVariableGet/ChatterboxVariableGet.yy",},"order":1,}, {"id":{"name":"oTestCaseEmptyParam","path":"objects/oTestCaseEmptyParam/oTestCaseEmptyParam.yy",},"order":7,}, - {"id":{"name":"ChatterboxSourceNodeCount","path":"scripts/ChatterboxSourceNodeCount/ChatterboxSourceNodeCount.yy",},"order":7,}, + {"id":{"name":"ChatterboxSourceNodeCount","path":"scripts/ChatterboxSourceNodeCount/ChatterboxSourceNodeCount.yy",},"order":8,}, {"id":{"name":"TestCaseSetterLocalScope","path":"scripts/TestCaseSetterLocalScope/TestCaseSetterLocalScope.yy",},"order":33,}, - {"id":{"name":"ChatterboxCreate","path":"scripts/ChatterboxCreate/ChatterboxCreate.yy",},"order":1,}, + {"id":{"name":"ChatterboxCreate","path":"scripts/ChatterboxCreate/ChatterboxCreate.yy",},"order":0,}, {"id":{"name":"ChatterboxVariablesClearVisited","path":"scripts/ChatterboxVariablesClearVisited/ChatterboxVariablesClearVisited.yy",},"order":6,}, {"id":{"name":"oTestCaseEscapedCharacters","path":"objects/oTestCaseEscapedCharacters/oTestCaseEscapedCharacters.yy",},"order":21,}, {"id":{"name":"ChatterboxGetContent","path":"scripts/ChatterboxGetContent/ChatterboxGetContent.yy",},"order":1,}, {"id":{"name":"fntDefault","path":"fonts/fntDefault/fntDefault.yy",},"order":3,}, {"id":{"name":"oTestCaseExpressionDatatypes","path":"objects/oTestCaseExpressionDatatypes/oTestCaseExpressionDatatypes.yy",},"order":19,}, {"id":{"name":"__ChatterboxClassText","path":"scripts/__ChatterboxClassText/__ChatterboxClassText.yy",},"order":3,}, - {"id":{"name":"ChatterboxSourceNodeExists","path":"scripts/ChatterboxSourceNodeExists/ChatterboxSourceNodeExists.yy",},"order":8,}, + {"id":{"name":"ChatterboxSourceNodeExists","path":"scripts/ChatterboxSourceNodeExists/ChatterboxSourceNodeExists.yy",},"order":9,}, {"id":{"name":"ChatterboxGetCurrent","path":"scripts/ChatterboxGetCurrent/ChatterboxGetCurrent.yy",},"order":2,}, {"id":{"name":"oTestCaseJumpIncludeVariable","path":"objects/oTestCaseJumpIncludeVariable/oTestCaseJumpIncludeVariable.yy",},"order":18,}, {"id":{"name":"oTestCaseNumericParam","path":"objects/oTestCaseNumericParam/oTestCaseNumericParam.yy",},"order":6,}, @@ -90,7 +93,7 @@ {"id":{"name":"TestCaseActionFunctionArguments","path":"scripts/TestCaseActionFunctionArguments/TestCaseActionFunctionArguments.yy",},"order":35,}, {"id":{"name":"TestCaseDirectionFunction","path":"scripts/TestCaseDirectionFunction/TestCaseDirectionFunction.yy",},"order":27,}, {"id":{"name":"oTestCaseInLineExpressions","path":"objects/oTestCaseInLineExpressions/oTestCaseInLineExpressions.yy",},"order":20,}, - {"id":{"name":"ChatterboxUnload","path":"scripts/ChatterboxUnload/ChatterboxUnload.yy",},"order":9,}, + {"id":{"name":"ChatterboxUnload","path":"scripts/ChatterboxUnload/ChatterboxUnload.yy",},"order":6,}, {"id":{"name":"oTestCaseFileTags","path":"objects/oTestCaseFileTags/oTestCaseFileTags.yy",},"order":10,}, {"id":{"name":"ChatterboxGetOptionMetadata","path":"scripts/ChatterboxGetOptionMetadata/ChatterboxGetOptionMetadata.yy",},"order":3,}, {"id":{"name":"oTestCaseOption","path":"objects/oTestCaseOption/oTestCaseOption.yy",},"order":2,}, @@ -112,9 +115,7 @@ {"name":"Amazon Fire","path":"options/amazonfire/options_amazonfire.yy",}, {"name":"iOS","path":"options/ios/options_ios.yy",}, {"name":"Linux","path":"options/linux/options_linux.yy",}, - {"name":"Windows UWP","path":"options/windowsuap/options_windowsuap.yy",}, {"name":"Windows","path":"options/windows/options_windows.yy",}, - {"name":"Xbox One","path":"options/xboxone/options_xboxone.yy",}, {"name":"Android","path":"options/android/options_android.yy",}, {"name":"Main","path":"options/main/options_main.yy",}, {"name":"macOS","path":"options/mac/options_mac.yy",}, @@ -133,63 +134,59 @@ {"roomId":{"name":"rmTest","path":"rooms/rmTest/rmTest.yy",},}, ], "Folders": [ - {"folderPath":"folders/Test Cases.yy","order":4,"resourceVersion":"1.0","name":"Test Cases","tags":[],"resourceType":"GMFolder",}, - {"folderPath":"folders/Chatterbox.yy","order":0,"resourceVersion":"1.0","name":"Chatterbox","tags":[],"resourceType":"GMFolder",}, - {"folderPath":"folders/Chatterbox/(System) (Don't look in here).yy","order":8,"resourceVersion":"1.0","name":"(System) (Don't look in here)","tags":[],"resourceType":"GMFolder",}, - {"folderPath":"folders/Chatterbox/(System) (Don't look in here)/omg i can't believe you looked in here.yy","order":1,"resourceVersion":"1.0","name":"omg i can't believe you looked in here","tags":[],"resourceType":"GMFolder",}, - {"folderPath":"folders/Chatterbox/Flow.yy","order":4,"resourceVersion":"1.0","name":"Flow","tags":[],"resourceType":"GMFolder",}, - {"folderPath":"folders/Chatterbox/Getters.yy","order":5,"resourceVersion":"1.0","name":"Getters","tags":[],"resourceType":"GMFolder",}, - {"folderPath":"folders/Chatterbox/Setup.yy","order":3,"resourceVersion":"1.0","name":"Setup","tags":[],"resourceType":"GMFolder",}, - {"folderPath":"folders/Chatterbox/Variables and Constants.yy","order":6,"resourceVersion":"1.0","name":"Variables and Constants","tags":[],"resourceType":"GMFolder",}, - {"folderPath":"folders/Chatterbox/Getters/Options.yy","order":1,"resourceVersion":"1.0","name":"Options","tags":[],"resourceType":"GMFolder",}, - {"folderPath":"folders/Chatterbox/Getters/Content.yy","order":0,"resourceVersion":"1.0","name":"Content","tags":[],"resourceType":"GMFolder",}, + {"resourceType":"GMFolder","resourceVersion":"1.0","name":"Chatterbox","folderPath":"folders/Chatterbox.yy","order":0,}, + {"resourceType":"GMFolder","resourceVersion":"1.0","name":"(System) (Don't look in here)","folderPath":"folders/Chatterbox/(System) (Don't look in here).yy","order":7,}, + {"resourceType":"GMFolder","resourceVersion":"1.0","name":"omg i can't believe you looked in here","folderPath":"folders/Chatterbox/(System) (Don't look in here)/omg i can't believe you looked in here.yy","order":1,}, + {"resourceType":"GMFolder","resourceVersion":"1.0","name":"Chatterboxes","folderPath":"folders/Chatterbox/Chatterboxes.yy","order":2,}, + {"resourceType":"GMFolder","resourceVersion":"1.0","name":"Content Getters","folderPath":"folders/Chatterbox/Content Getters.yy","order":4,}, + {"resourceType":"GMFolder","resourceVersion":"1.0","name":"Flow","folderPath":"folders/Chatterbox/Flow.yy","order":3,}, + {"resourceType":"GMFolder","resourceVersion":"1.0","name":"Option Getters","folderPath":"folders/Chatterbox/Option Getters.yy","order":5,}, + {"resourceType":"GMFolder","resourceVersion":"1.0","name":"Setup","folderPath":"folders/Chatterbox/Setup.yy","order":1,}, + {"resourceType":"GMFolder","resourceVersion":"1.0","name":"Variables and Constants","folderPath":"folders/Chatterbox/Variables and Constants.yy","order":6,}, + {"resourceType":"GMFolder","resourceVersion":"1.0","name":"Test Cases","folderPath":"folders/Test Cases.yy","order":4,}, ], "AudioGroups": [ - {"targets":-1,"resourceVersion":"1.3","name":"audiogroup_default","resourceType":"GMAudioGroup",}, + {"resourceType":"GMAudioGroup","resourceVersion":"1.3","name":"audiogroup_default","targets":-1,}, ], "TextureGroups": [ - {"isScaled":false,"compressFormat":"bz2","autocrop":true,"border":2,"mipsToGenerate":0,"groupParent":null,"targets":-1,"resourceVersion":"1.3","name":"Default","resourceType":"GMTextureGroup",}, + {"resourceType":"GMTextureGroup","resourceVersion":"1.3","name":"Default","isScaled":false,"compressFormat":"bz2","loadType":"default","directory":"","autocrop":true,"border":2,"mipsToGenerate":0,"groupParent":null,"targets":-1,}, ], "IncludedFiles": [ - {"CopyToMask":-1,"filePath":"datafiles","resourceVersion":"1.0","name":"testcase_action.yarn","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles","resourceVersion":"1.0","name":"testcase_option.yarn","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles","resourceVersion":"1.0","name":"testcase_stop.yarn","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles","resourceVersion":"1.0","name":"testcase_numeric_param.yarn","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles","resourceVersion":"1.0","name":"testcase_negate_function.yarn","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles","resourceVersion":"1.0","name":"testcase_file_tags.yarn","resourceType":"GMIncludedFile",}, - {"CopyToMask":3035461389054378222,"filePath":"datafiles","resourceVersion":"1.0","name":"example.yarn","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles","resourceVersion":"1.0","name":"testcase_bom.yarn","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles","resourceVersion":"1.0","name":"testcase_comments.yarn","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles","resourceVersion":"1.0","name":"testcase_metadata.yarn","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles","resourceVersion":"1.0","name":"testcase_jump.yarn","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles","resourceVersion":"1.0","name":"testcase_direction.yarn","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles","resourceVersion":"1.0","name":"testcase_expression_datatypes.yarn","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles","resourceVersion":"1.0","name":"testcase_in_line_expressions.yarn","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles","resourceVersion":"1.0","name":"testcase_escaped_characters.yarn","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles","resourceVersion":"1.0","name":"testcase_direction_as_expression.yarn","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles","resourceVersion":"1.0","name":"testcase_direction_as_weirdo.yarn","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles","resourceVersion":"1.0","name":"testcase_if.yarn","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles","resourceVersion":"1.0","name":"testcase_empty_param.yarn","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles","resourceVersion":"1.0","name":"testcase_node_metadata.yarn","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles","resourceVersion":"1.0","name":"testcase_jump_include_variable.yarn","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles","resourceVersion":"1.0","name":"testcase_variable_access.yarn","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles","resourceVersion":"1.0","name":"testcase_parsers.yarn","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles","resourceVersion":"1.0","name":"testcase_stop_multimode.yarn","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles","resourceVersion":"1.0","name":"testcase_all_content_string.yarn","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles","resourceVersion":"1.0","name":"testcase_wait_function.yarn","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles","resourceVersion":"1.0","name":"testcase_setter_local_scope.yarn","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles","resourceVersion":"1.0","name":"testcase_fast_forward.yarn","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles","resourceVersion":"1.0","name":"testcase_direction_as_expression_arguments.yarn","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles","resourceVersion":"1.0","name":"testcase_hop.yarn","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles","resourceVersion":"1.0","name":"testcase_evaluation_order.yarn","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles","resourceVersion":"1.0","name":"testcase_hop_2.yarn","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles","resourceVersion":"1.0","name":"testcase_constants.yarn","resourceType":"GMIncludedFile",}, + {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"testcase_action.yarn","CopyToMask":-1,"filePath":"datafiles",}, + {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"testcase_option.yarn","CopyToMask":-1,"filePath":"datafiles",}, + {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"testcase_stop.yarn","CopyToMask":-1,"filePath":"datafiles",}, + {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"testcase_numeric_param.yarn","CopyToMask":-1,"filePath":"datafiles",}, + {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"testcase_negate_function.yarn","CopyToMask":-1,"filePath":"datafiles",}, + {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"testcase_file_tags.yarn","CopyToMask":-1,"filePath":"datafiles",}, + {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"example.yarn","CopyToMask":3035461389054378222,"filePath":"datafiles",}, + {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"testcase_bom.yarn","CopyToMask":-1,"filePath":"datafiles",}, + {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"testcase_comments.yarn","CopyToMask":-1,"filePath":"datafiles",}, + {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"testcase_metadata.yarn","CopyToMask":-1,"filePath":"datafiles",}, + {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"testcase_jump.yarn","CopyToMask":-1,"filePath":"datafiles",}, + {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"testcase_direction.yarn","CopyToMask":-1,"filePath":"datafiles",}, + {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"testcase_expression_datatypes.yarn","CopyToMask":-1,"filePath":"datafiles",}, + {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"testcase_in_line_expressions.yarn","CopyToMask":-1,"filePath":"datafiles",}, + {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"testcase_escaped_characters.yarn","CopyToMask":-1,"filePath":"datafiles",}, + {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"testcase_direction_as_expression.yarn","CopyToMask":-1,"filePath":"datafiles",}, + {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"testcase_direction_as_weirdo.yarn","CopyToMask":-1,"filePath":"datafiles",}, + {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"testcase_if.yarn","CopyToMask":-1,"filePath":"datafiles",}, + {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"testcase_empty_param.yarn","CopyToMask":-1,"filePath":"datafiles",}, + {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"testcase_node_metadata.yarn","CopyToMask":-1,"filePath":"datafiles",}, + {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"testcase_jump_include_variable.yarn","CopyToMask":-1,"filePath":"datafiles",}, + {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"testcase_variable_access.yarn","CopyToMask":-1,"filePath":"datafiles",}, + {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"testcase_parsers.yarn","CopyToMask":-1,"filePath":"datafiles",}, + {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"testcase_stop_multimode.yarn","CopyToMask":-1,"filePath":"datafiles",}, + {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"testcase_all_content_string.yarn","CopyToMask":-1,"filePath":"datafiles",}, + {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"testcase_wait_function.yarn","CopyToMask":-1,"filePath":"datafiles",}, + {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"testcase_setter_local_scope.yarn","CopyToMask":-1,"filePath":"datafiles",}, + {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"testcase_fast_forward.yarn","CopyToMask":-1,"filePath":"datafiles",}, + {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"testcase_direction_as_expression_arguments.yarn","CopyToMask":-1,"filePath":"datafiles",}, + {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"testcase_hop.yarn","CopyToMask":-1,"filePath":"datafiles",}, + {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"testcase_evaluation_order.yarn","CopyToMask":-1,"filePath":"datafiles",}, + {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"testcase_hop_2.yarn","CopyToMask":-1,"filePath":"datafiles",}, + {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"testcase_constants.yarn","CopyToMask":-1,"filePath":"datafiles",}, ], "MetaData": { - "IDEVersion": "2022.3.0.625", + "IDEVersion": "2022.0.0.19", }, - "resourceVersion": "1.5", - "name": "chatterbox", - "tags": [], - "resourceType": "GMProject", } \ No newline at end of file diff --git a/options/windows/options_windows.yy b/options/windows/options_windows.yy index 34fd3e2b..53b25e9c 100644 --- a/options/windows/options_windows.yy +++ b/options/windows/options_windows.yy @@ -1,7 +1,10 @@ { + "resourceType": "GMWindowsOptions", + "resourceVersion": "1.1", + "name": "Windows", "option_windows_display_name": "Chatterbox", "option_windows_executable_name": "${project_name}", - "option_windows_version": "2.8.1", + "option_windows_version": "2.8.2.0", "option_windows_company_info": "@jujuadams", "option_windows_product_info": "Chatterbox", "option_windows_copyright_info": "@jujuadams (c) 2022", @@ -28,9 +31,4 @@ "option_windows_enable_steam": false, "option_windows_disable_sandbox": false, "option_windows_steam_use_alternative_launcher": false, - "option_windows_use_x64": true, - "resourceVersion": "1.1", - "name": "Windows", - "tags": [], - "resourceType": "GMWindowsOptions", } \ No newline at end of file diff --git a/scripts/ChatterboxCreate/ChatterboxCreate.yy b/scripts/ChatterboxCreate/ChatterboxCreate.yy index 6e011dbb..ec1c7e1f 100644 --- a/scripts/ChatterboxCreate/ChatterboxCreate.yy +++ b/scripts/ChatterboxCreate/ChatterboxCreate.yy @@ -2,8 +2,8 @@ "isDnD": false, "isCompatibility": false, "parent": { - "name": "Chatterbox", - "path": "folders/Chatterbox.yy", + "name": "Chatterboxes", + "path": "folders/Chatterbox/Chatterboxes.yy", }, "resourceVersion": "1.0", "name": "ChatterboxCreate", diff --git a/scripts/ChatterboxGetAllContentString/ChatterboxGetAllContentString.yy b/scripts/ChatterboxGetAllContentString/ChatterboxGetAllContentString.yy index ed3b5a2b..31bf0785 100644 --- a/scripts/ChatterboxGetAllContentString/ChatterboxGetAllContentString.yy +++ b/scripts/ChatterboxGetAllContentString/ChatterboxGetAllContentString.yy @@ -2,8 +2,8 @@ "isDnD": false, "isCompatibility": false, "parent": { - "name": "Content", - "path": "folders/Chatterbox/Getters/Content.yy", + "name": "Content Getters", + "path": "folders/Chatterbox/Content Getters.yy", }, "resourceVersion": "1.0", "name": "ChatterboxGetAllContentString", diff --git a/scripts/ChatterboxGetContent/ChatterboxGetContent.yy b/scripts/ChatterboxGetContent/ChatterboxGetContent.yy index 1d81c01e..52c9b4cc 100644 --- a/scripts/ChatterboxGetContent/ChatterboxGetContent.yy +++ b/scripts/ChatterboxGetContent/ChatterboxGetContent.yy @@ -2,8 +2,8 @@ "isDnD": false, "isCompatibility": false, "parent": { - "name": "Content", - "path": "folders/Chatterbox/Getters/Content.yy", + "name": "Content Getters", + "path": "folders/Chatterbox/Content Getters.yy", }, "resourceVersion": "1.0", "name": "ChatterboxGetContent", diff --git a/scripts/ChatterboxGetContentArray/ChatterboxGetContentArray.yy b/scripts/ChatterboxGetContentArray/ChatterboxGetContentArray.yy index 41c92d66..eeb68518 100644 --- a/scripts/ChatterboxGetContentArray/ChatterboxGetContentArray.yy +++ b/scripts/ChatterboxGetContentArray/ChatterboxGetContentArray.yy @@ -2,8 +2,8 @@ "isDnD": false, "isCompatibility": false, "parent": { - "name": "Content", - "path": "folders/Chatterbox/Getters/Content.yy", + "name": "Content Getters", + "path": "folders/Chatterbox/Content Getters.yy", }, "resourceVersion": "1.0", "name": "ChatterboxGetContentArray", diff --git a/scripts/ChatterboxGetContentCount/ChatterboxGetContentCount.yy b/scripts/ChatterboxGetContentCount/ChatterboxGetContentCount.yy index a0ab3116..ab084d74 100644 --- a/scripts/ChatterboxGetContentCount/ChatterboxGetContentCount.yy +++ b/scripts/ChatterboxGetContentCount/ChatterboxGetContentCount.yy @@ -2,8 +2,8 @@ "isDnD": false, "isCompatibility": false, "parent": { - "name": "Content", - "path": "folders/Chatterbox/Getters/Content.yy", + "name": "Content Getters", + "path": "folders/Chatterbox/Content Getters.yy", }, "resourceVersion": "1.0", "name": "ChatterboxGetContentCount", diff --git a/scripts/ChatterboxGetContentMetadata/ChatterboxGetContentMetadata.yy b/scripts/ChatterboxGetContentMetadata/ChatterboxGetContentMetadata.yy index 364b9a11..68c737e6 100644 --- a/scripts/ChatterboxGetContentMetadata/ChatterboxGetContentMetadata.yy +++ b/scripts/ChatterboxGetContentMetadata/ChatterboxGetContentMetadata.yy @@ -2,8 +2,8 @@ "isDnD": false, "isCompatibility": false, "parent": { - "name": "Content", - "path": "folders/Chatterbox/Getters/Content.yy", + "name": "Content Getters", + "path": "folders/Chatterbox/Content Getters.yy", }, "resourceVersion": "1.0", "name": "ChatterboxGetContentMetadata", diff --git a/scripts/ChatterboxGetContentSpeaker/ChatterboxGetContentSpeaker.yy b/scripts/ChatterboxGetContentSpeaker/ChatterboxGetContentSpeaker.yy index 118dacdf..3443df20 100644 --- a/scripts/ChatterboxGetContentSpeaker/ChatterboxGetContentSpeaker.yy +++ b/scripts/ChatterboxGetContentSpeaker/ChatterboxGetContentSpeaker.yy @@ -2,8 +2,8 @@ "isDnD": false, "isCompatibility": false, "parent": { - "name": "Content", - "path": "folders/Chatterbox/Getters/Content.yy", + "name": "Content Getters", + "path": "folders/Chatterbox/Content Getters.yy", }, "resourceVersion": "1.0", "name": "ChatterboxGetContentSpeaker", diff --git a/scripts/ChatterboxGetContentSpeakerData/ChatterboxGetContentSpeakerData.yy b/scripts/ChatterboxGetContentSpeakerData/ChatterboxGetContentSpeakerData.yy index 397585e9..a68f2b51 100644 --- a/scripts/ChatterboxGetContentSpeakerData/ChatterboxGetContentSpeakerData.yy +++ b/scripts/ChatterboxGetContentSpeakerData/ChatterboxGetContentSpeakerData.yy @@ -2,8 +2,8 @@ "isDnD": false, "isCompatibility": false, "parent": { - "name": "Content", - "path": "folders/Chatterbox/Getters/Content.yy", + "name": "Content Getters", + "path": "folders/Chatterbox/Content Getters.yy", }, "resourceVersion": "1.0", "name": "ChatterboxGetContentSpeakerData", diff --git a/scripts/ChatterboxGetContentSpeech/ChatterboxGetContentSpeech.yy b/scripts/ChatterboxGetContentSpeech/ChatterboxGetContentSpeech.yy index 46b4b5d5..e34bce7c 100644 --- a/scripts/ChatterboxGetContentSpeech/ChatterboxGetContentSpeech.yy +++ b/scripts/ChatterboxGetContentSpeech/ChatterboxGetContentSpeech.yy @@ -2,8 +2,8 @@ "isDnD": false, "isCompatibility": false, "parent": { - "name": "Content", - "path": "folders/Chatterbox/Getters/Content.yy", + "name": "Content Getters", + "path": "folders/Chatterbox/Content Getters.yy", }, "resourceVersion": "1.0", "name": "ChatterboxGetContentSpeech", diff --git a/scripts/ChatterboxGetCurrent/ChatterboxGetCurrent.yy b/scripts/ChatterboxGetCurrent/ChatterboxGetCurrent.yy index 64c16a30..23425351 100644 --- a/scripts/ChatterboxGetCurrent/ChatterboxGetCurrent.yy +++ b/scripts/ChatterboxGetCurrent/ChatterboxGetCurrent.yy @@ -2,8 +2,8 @@ "isDnD": false, "isCompatibility": false, "parent": { - "name": "Getters", - "path": "folders/Chatterbox/Getters.yy", + "name": "Chatterboxes", + "path": "folders/Chatterbox/Chatterboxes.yy", }, "resourceVersion": "1.0", "name": "ChatterboxGetCurrent", diff --git a/scripts/ChatterboxGetCurrentMetadata/ChatterboxGetCurrentMetadata.yy b/scripts/ChatterboxGetCurrentMetadata/ChatterboxGetCurrentMetadata.yy index 8081d328..049bad97 100644 --- a/scripts/ChatterboxGetCurrentMetadata/ChatterboxGetCurrentMetadata.yy +++ b/scripts/ChatterboxGetCurrentMetadata/ChatterboxGetCurrentMetadata.yy @@ -2,8 +2,8 @@ "isDnD": false, "isCompatibility": false, "parent": { - "name": "Getters", - "path": "folders/Chatterbox/Getters.yy", + "name": "Chatterboxes", + "path": "folders/Chatterbox/Chatterboxes.yy", }, "resourceVersion": "1.0", "name": "ChatterboxGetCurrentMetadata", diff --git a/scripts/ChatterboxGetCurrentSource/ChatterboxGetCurrentSource.yy b/scripts/ChatterboxGetCurrentSource/ChatterboxGetCurrentSource.yy index dfa382ee..4064a4b7 100644 --- a/scripts/ChatterboxGetCurrentSource/ChatterboxGetCurrentSource.yy +++ b/scripts/ChatterboxGetCurrentSource/ChatterboxGetCurrentSource.yy @@ -2,8 +2,8 @@ "isDnD": false, "isCompatibility": false, "parent": { - "name": "Getters", - "path": "folders/Chatterbox/Getters.yy", + "name": "Chatterboxes", + "path": "folders/Chatterbox/Chatterboxes.yy", }, "resourceVersion": "1.0", "name": "ChatterboxGetCurrentSource", diff --git a/scripts/ChatterboxGetOption/ChatterboxGetOption.yy b/scripts/ChatterboxGetOption/ChatterboxGetOption.yy index 997fcb09..30f9dc6d 100644 --- a/scripts/ChatterboxGetOption/ChatterboxGetOption.yy +++ b/scripts/ChatterboxGetOption/ChatterboxGetOption.yy @@ -2,8 +2,8 @@ "isDnD": false, "isCompatibility": false, "parent": { - "name": "Options", - "path": "folders/Chatterbox/Getters/Options.yy", + "name": "Option Getters", + "path": "folders/Chatterbox/Option Getters.yy", }, "resourceVersion": "1.0", "name": "ChatterboxGetOption", diff --git a/scripts/ChatterboxGetOptionArray/ChatterboxGetOptionArray.yy b/scripts/ChatterboxGetOptionArray/ChatterboxGetOptionArray.yy index c3950d78..04508f37 100644 --- a/scripts/ChatterboxGetOptionArray/ChatterboxGetOptionArray.yy +++ b/scripts/ChatterboxGetOptionArray/ChatterboxGetOptionArray.yy @@ -2,8 +2,8 @@ "isDnD": false, "isCompatibility": false, "parent": { - "name": "Options", - "path": "folders/Chatterbox/Getters/Options.yy", + "name": "Option Getters", + "path": "folders/Chatterbox/Option Getters.yy", }, "resourceVersion": "1.0", "name": "ChatterboxGetOptionArray", diff --git a/scripts/ChatterboxGetOptionConditionBool/ChatterboxGetOptionConditionBool.yy b/scripts/ChatterboxGetOptionConditionBool/ChatterboxGetOptionConditionBool.yy index bad5e3af..7ebfcd02 100644 --- a/scripts/ChatterboxGetOptionConditionBool/ChatterboxGetOptionConditionBool.yy +++ b/scripts/ChatterboxGetOptionConditionBool/ChatterboxGetOptionConditionBool.yy @@ -2,8 +2,8 @@ "isDnD": false, "isCompatibility": false, "parent": { - "name": "Options", - "path": "folders/Chatterbox/Getters/Options.yy", + "name": "Option Getters", + "path": "folders/Chatterbox/Option Getters.yy", }, "resourceVersion": "1.0", "name": "ChatterboxGetOptionConditionBool", diff --git a/scripts/ChatterboxGetOptionCount/ChatterboxGetOptionCount.yy b/scripts/ChatterboxGetOptionCount/ChatterboxGetOptionCount.yy index e85243d0..e7d0b9f6 100644 --- a/scripts/ChatterboxGetOptionCount/ChatterboxGetOptionCount.yy +++ b/scripts/ChatterboxGetOptionCount/ChatterboxGetOptionCount.yy @@ -2,8 +2,8 @@ "isDnD": false, "isCompatibility": false, "parent": { - "name": "Options", - "path": "folders/Chatterbox/Getters/Options.yy", + "name": "Option Getters", + "path": "folders/Chatterbox/Option Getters.yy", }, "resourceVersion": "1.0", "name": "ChatterboxGetOptionCount", diff --git a/scripts/ChatterboxGetOptionMetadata/ChatterboxGetOptionMetadata.yy b/scripts/ChatterboxGetOptionMetadata/ChatterboxGetOptionMetadata.yy index 914abe13..8cbb7f4f 100644 --- a/scripts/ChatterboxGetOptionMetadata/ChatterboxGetOptionMetadata.yy +++ b/scripts/ChatterboxGetOptionMetadata/ChatterboxGetOptionMetadata.yy @@ -2,8 +2,8 @@ "isDnD": false, "isCompatibility": false, "parent": { - "name": "Options", - "path": "folders/Chatterbox/Getters/Options.yy", + "name": "Option Getters", + "path": "folders/Chatterbox/Option Getters.yy", }, "resourceVersion": "1.0", "name": "ChatterboxGetOptionMetadata", diff --git a/scripts/ChatterboxGetVisited/ChatterboxGetVisited.yy b/scripts/ChatterboxGetVisited/ChatterboxGetVisited.yy index 5de4eca9..8d5cd821 100644 --- a/scripts/ChatterboxGetVisited/ChatterboxGetVisited.yy +++ b/scripts/ChatterboxGetVisited/ChatterboxGetVisited.yy @@ -2,8 +2,8 @@ "isDnD": false, "isCompatibility": false, "parent": { - "name": "Getters", - "path": "folders/Chatterbox/Getters.yy", + "name": "Chatterboxes", + "path": "folders/Chatterbox/Chatterboxes.yy", }, "resourceVersion": "1.0", "name": "ChatterboxGetVisited", diff --git a/scripts/ChatterboxLoadFromFile/ChatterboxLoadFromFile.gml b/scripts/ChatterboxLoadFromFile/ChatterboxLoadFromFile.gml index 38c0a743..6326c7a5 100644 --- a/scripts/ChatterboxLoadFromFile/ChatterboxLoadFromFile.gml +++ b/scripts/ChatterboxLoadFromFile/ChatterboxLoadFromFile.gml @@ -6,7 +6,7 @@ function ChatterboxLoadFromFile() { var _path = argument[0]; - var _aliasName = ((argument_count > 1) && (argument[1] != undefined))? argument[1] : filename_name(_path); + var _aliasName = ((argument_count > 1) && (argument[1] != undefined))? argument[1] : _path; if (!is_string(_path)) { diff --git a/scripts/ChatterboxSourceGetNodeTitles/ChatterboxSourceGetNodeTitles.yy b/scripts/ChatterboxSourceGetNodeTitles/ChatterboxSourceGetNodeTitles.yy index 3ae87c82..c5304896 100644 --- a/scripts/ChatterboxSourceGetNodeTitles/ChatterboxSourceGetNodeTitles.yy +++ b/scripts/ChatterboxSourceGetNodeTitles/ChatterboxSourceGetNodeTitles.yy @@ -2,8 +2,8 @@ "isDnD": false, "isCompatibility": false, "parent": { - "name": "Getters", - "path": "folders/Chatterbox/Getters.yy", + "name": "Setup", + "path": "folders/Chatterbox/Setup.yy", }, "resourceVersion": "1.0", "name": "ChatterboxSourceGetNodeTitles", diff --git a/scripts/IsChatterbox/IsChatterbox.yy b/scripts/IsChatterbox/IsChatterbox.yy index 34d8ecb5..6210135f 100644 --- a/scripts/IsChatterbox/IsChatterbox.yy +++ b/scripts/IsChatterbox/IsChatterbox.yy @@ -2,8 +2,8 @@ "isDnD": false, "isCompatibility": false, "parent": { - "name": "Chatterbox", - "path": "folders/Chatterbox.yy", + "name": "Chatterboxes", + "path": "folders/Chatterbox/Chatterboxes.yy", }, "resourceVersion": "1.0", "name": "IsChatterbox", diff --git a/scripts/__ChatterboxSystem/__ChatterboxSystem.gml b/scripts/__ChatterboxSystem/__ChatterboxSystem.gml index 5d0d2161..a78212e4 100644 --- a/scripts/__ChatterboxSystem/__ChatterboxSystem.gml +++ b/scripts/__ChatterboxSystem/__ChatterboxSystem.gml @@ -1,7 +1,7 @@ #region Internal Macro Definitions -#macro __CHATTERBOX_VERSION "2.8.1" -#macro __CHATTERBOX_DATE "2022-10-15" +#macro __CHATTERBOX_VERSION "2.8.2" +#macro __CHATTERBOX_DATE "2022-11-02" #macro CHATTERBOX_VARIABLES_MAP global.__chatterboxVariablesMap #macro CHATTERBOX_VARIABLES_LIST global.__chatterboxVariablesList diff --git a/scripts/__ChatterboxSystem/__ChatterboxSystem.yy b/scripts/__ChatterboxSystem/__ChatterboxSystem.yy index 5e3f279f..7c39eb5b 100644 --- a/scripts/__ChatterboxSystem/__ChatterboxSystem.yy +++ b/scripts/__ChatterboxSystem/__ChatterboxSystem.yy @@ -1,12 +1,11 @@ { + "resourceType": "GMScript", + "resourceVersion": "1.0", + "name": "__ChatterboxSystem", "isDnD": false, "isCompatibility": false, "parent": { "name": "omg i can't believe you looked in here", "path": "folders/Chatterbox/(System) (Don't look in here)/omg i can't believe you looked in here.yy", }, - "resourceVersion": "1.0", - "name": "__ChatterboxSystem", - "tags": [], - "resourceType": "GMScript", } \ No newline at end of file