diff --git a/README.md b/README.md index afd46f30..1cb263c2 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ <p align="center"><img src="https://raw.githubusercontent.com/JujuAdams/Chatterbox/master/LOGO.png" style="display:block; margin:auto; width:400px"></p> -<h1 align="center">2.8.1</h1> +<h1 align="center">2.8.2</h1> <p align="center">Narrative engine for GameMaker by <b>@jujuadams</b></p> diff --git a/chatterbox.yyp b/chatterbox.yyp index faa3c43f..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,}, @@ -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":7,"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":3,"resourceVersion":"1.0","name":"Flow","tags":[],"resourceType":"GMFolder",}, - {"folderPath":"folders/Chatterbox/Chatterboxes.yy","order":2,"resourceVersion":"1.0","name":"Chatterboxes","tags":[],"resourceType":"GMFolder",}, - {"folderPath":"folders/Chatterbox/Setup.yy","order":1,"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/Option Getters.yy","order":5,"resourceVersion":"1.0","name":"Option Getters","tags":[],"resourceType":"GMFolder",}, - {"folderPath":"folders/Chatterbox/Content Getters.yy","order":4,"resourceVersion":"1.0","name":"Content Getters","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/__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