diff --git a/chatterbox.yyp b/chatterbox.yyp index f2bd380b..842cb90f 100644 --- a/chatterbox.yyp +++ b/chatterbox.yyp @@ -5,32 +5,34 @@ {"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":"oTestCaseDirection","path":"objects/oTestCaseDirection/oTestCaseDirection.yy",},"order":12,}, + {"id":{"name":"oTestCaseDirection","path":"objects/oTestCaseDirection/oTestCaseDirection.yy",},"order":13,}, {"id":{"name":"ChatterboxVariablesFind","path":"scripts/ChatterboxVariablesFind/ChatterboxVariablesFind.yy",},"order":4,}, {"id":{"name":"ChatterboxGetOptionCount","path":"scripts/ChatterboxGetOptionCount/ChatterboxGetOptionCount.yy",},"order":6,}, - {"id":{"name":"oTestCaseSourceData","path":"objects/oTestCaseSourceData/oTestCaseSourceData.yy",},"order":18,}, + {"id":{"name":"oTestCaseNodeMetadata","path":"objects/oTestCaseNodeMetadata/oTestCaseNodeMetadata.yy",},"order":9,}, + {"id":{"name":"oTestCaseSourceData","path":"objects/oTestCaseSourceData/oTestCaseSourceData.yy",},"order":19,}, {"id":{"name":"ChatterboxGetOption","path":"scripts/ChatterboxGetOption/ChatterboxGetOption.yy",},"order":3,}, {"id":{"name":"ChatterboxGetOptionMetadata","path":"scripts/ChatterboxGetOptionMetadata/ChatterboxGetOptionMetadata.yy",},"order":4,}, {"id":{"name":"ChatterboxGetCurrent","path":"scripts/ChatterboxGetCurrent/ChatterboxGetCurrent.yy",},"order":8,}, {"id":{"name":"ChatterboxVariableSet","path":"scripts/ChatterboxVariableSet/ChatterboxVariableSet.yy",},"order":1,}, {"id":{"name":"oTestCaseStop","path":"objects/oTestCaseStop/oTestCaseStop.yy",},"order":2,}, {"id":{"name":"ChatterboxLoadFromFile","path":"scripts/ChatterboxLoadFromFile/ChatterboxLoadFromFile.yy",},"order":0,}, + {"id":{"name":"ChatterboxSourceGetTags","path":"scripts/ChatterboxSourceGetTags/ChatterboxSourceGetTags.yy",},"order":9,}, {"id":{"name":"ChatterboxCreate","path":"scripts/ChatterboxCreate/ChatterboxCreate.yy",},"order":2,}, {"id":{"name":"oTestCaseBOM","path":"objects/oTestCaseBOM/oTestCaseBOM.yy",},"order":7,}, - {"id":{"name":"oTestCaseMetadata","path":"objects/oTestCaseMetadata/oTestCaseMetadata.yy",},"order":10,}, - {"id":{"name":"oTestCaseComments","path":"objects/oTestCaseComments/oTestCaseComments.yy",},"order":9,}, + {"id":{"name":"oTestCaseMetadata","path":"objects/oTestCaseMetadata/oTestCaseMetadata.yy",},"order":11,}, + {"id":{"name":"oTestCaseComments","path":"objects/oTestCaseComments/oTestCaseComments.yy",},"order":10,}, {"id":{"name":"oTestCaseEmptyParam","path":"objects/oTestCaseEmptyParam/oTestCaseEmptyParam.yy",},"order":5,}, {"id":{"name":"__ChatterboxEvaluate","path":"scripts/__ChatterboxEvaluate/__ChatterboxEvaluate.yy",},"order":6,}, {"id":{"name":"ChatterboxJump","path":"scripts/ChatterboxJump/ChatterboxJump.yy",},"order":0,}, {"id":{"name":"ChatterboxLoadFromBuffer","path":"scripts/ChatterboxLoadFromBuffer/ChatterboxLoadFromBuffer.yy",},"order":2,}, {"id":{"name":"ChatterboxGetOptionConditionBool","path":"scripts/ChatterboxGetOptionConditionBool/ChatterboxGetOptionConditionBool.yy",},"order":5,}, {"id":{"name":"ChatterboxUnload","path":"scripts/ChatterboxUnload/ChatterboxUnload.yy",},"order":3,}, - {"id":{"name":"oTestCaseEscapedCharacters","path":"objects/oTestCaseEscapedCharacters/oTestCaseEscapedCharacters.yy",},"order":17,}, + {"id":{"name":"oTestCaseEscapedCharacters","path":"objects/oTestCaseEscapedCharacters/oTestCaseEscapedCharacters.yy",},"order":18,}, {"id":{"name":"ChatterboxAddFunction","path":"scripts/ChatterboxAddFunction/ChatterboxAddFunction.yy",},"order":5,}, {"id":{"name":"fntDefault","path":"fonts/fntDefault/fntDefault.yy",},"order":149,}, {"id":{"name":"ChatterboxAddFindReplace","path":"scripts/ChatterboxAddFindReplace/ChatterboxAddFindReplace.yy",},"order":6,}, {"id":{"name":"ChatterboxVariablesImport","path":"scripts/ChatterboxVariablesImport/ChatterboxVariablesImport.yy",},"order":3,}, - {"id":{"name":"oTestCaseExpressionDatatypes","path":"objects/oTestCaseExpressionDatatypes/oTestCaseExpressionDatatypes.yy",},"order":15,}, + {"id":{"name":"oTestCaseExpressionDatatypes","path":"objects/oTestCaseExpressionDatatypes/oTestCaseExpressionDatatypes.yy",},"order":16,}, {"id":{"name":"__ChatterboxVM","path":"scripts/__ChatterboxVM/__ChatterboxVM.yy",},"order":7,}, {"id":{"name":"ChatterboxFastForward","path":"scripts/ChatterboxFastForward/ChatterboxFastForward.yy",},"order":5,}, {"id":{"name":"__ChatterboxExpressionFuncs","path":"scripts/__ChatterboxExpressionFuncs/__ChatterboxExpressionFuncs.yy",},"order":5,}, @@ -40,17 +42,18 @@ {"id":{"name":"oTestCaseAction","path":"objects/oTestCaseAction/oTestCaseAction.yy",},"order":0,}, {"id":{"name":"ChatterboxIsStopped","path":"scripts/ChatterboxIsStopped/ChatterboxIsStopped.yy",},"order":4,}, {"id":{"name":"oTestCaseNegateFunction","path":"objects/oTestCaseNegateFunction/oTestCaseNegateFunction.yy",},"order":6,}, - {"id":{"name":"TestCaseActionFunction","path":"scripts/TestCaseActionFunction/TestCaseActionFunction.yy",},"order":19,}, - {"id":{"name":"TestCaseNumericParamFunction","path":"scripts/TestCaseNumericParamFunction/TestCaseNumericParamFunction.yy",},"order":20,}, + {"id":{"name":"TestCaseActionFunction","path":"scripts/TestCaseActionFunction/TestCaseActionFunction.yy",},"order":20,}, + {"id":{"name":"TestCaseNumericParamFunction","path":"scripts/TestCaseNumericParamFunction/TestCaseNumericParamFunction.yy",},"order":21,}, {"id":{"name":"ChatterboxContinue","path":"scripts/ChatterboxContinue/ChatterboxContinue.yy",},"order":2,}, + {"id":{"name":"ChatterboxGetCurrentMetadata","path":"scripts/ChatterboxGetCurrentMetadata/ChatterboxGetCurrentMetadata.yy",},"order":9,}, {"id":{"name":"oTestCaseIf","path":"objects/oTestCaseIf/oTestCaseIf.yy",},"order":3,}, {"id":{"name":"ChatterboxGetContent","path":"scripts/ChatterboxGetContent/ChatterboxGetContent.yy",},"order":0,}, {"id":{"name":"ChatterboxVariablesExport","path":"scripts/ChatterboxVariablesExport/ChatterboxVariablesExport.yy",},"order":2,}, - {"id":{"name":"oTestCaseJump","path":"objects/oTestCaseJump/oTestCaseJump.yy",},"order":11,}, - {"id":{"name":"oTestCaseDirectionAsWeirdo","path":"objects/oTestCaseDirectionAsWeirdo/oTestCaseDirectionAsWeirdo.yy",},"order":14,}, - {"id":{"name":"TestCaseDirectionFunction","path":"scripts/TestCaseDirectionFunction/TestCaseDirectionFunction.yy",},"order":21,}, - {"id":{"name":"ChatterboxGetCurrentSource","path":"scripts/ChatterboxGetCurrentSource/ChatterboxGetCurrentSource.yy",},"order":9,}, - {"id":{"name":"oTestCaseInLineExpressions","path":"objects/oTestCaseInLineExpressions/oTestCaseInLineExpressions.yy",},"order":16,}, + {"id":{"name":"oTestCaseJump","path":"objects/oTestCaseJump/oTestCaseJump.yy",},"order":12,}, + {"id":{"name":"oTestCaseDirectionAsWeirdo","path":"objects/oTestCaseDirectionAsWeirdo/oTestCaseDirectionAsWeirdo.yy",},"order":15,}, + {"id":{"name":"TestCaseDirectionFunction","path":"scripts/TestCaseDirectionFunction/TestCaseDirectionFunction.yy",},"order":22,}, + {"id":{"name":"ChatterboxGetCurrentSource","path":"scripts/ChatterboxGetCurrentSource/ChatterboxGetCurrentSource.yy",},"order":10,}, + {"id":{"name":"oTestCaseInLineExpressions","path":"objects/oTestCaseInLineExpressions/oTestCaseInLineExpressions.yy",},"order":17,}, {"id":{"name":"oTestCaseFileTags","path":"objects/oTestCaseFileTags/oTestCaseFileTags.yy",},"order":8,}, {"id":{"name":"oTestCaseOption","path":"objects/oTestCaseOption/oTestCaseOption.yy",},"order":1,}, {"id":{"name":"ChatterboxLoadFromString","path":"scripts/ChatterboxLoadFromString/ChatterboxLoadFromString.yy",},"order":1,}, @@ -61,7 +64,7 @@ {"id":{"name":"ChatterboxGetVisited","path":"scripts/ChatterboxGetVisited/ChatterboxGetVisited.yy",},"order":7,}, {"id":{"name":"__ChatterboxClassNode","path":"scripts/__ChatterboxClassNode/__ChatterboxClassNode.yy",},"order":2,}, {"id":{"name":"__ChatterboxClassText","path":"scripts/__ChatterboxClassText/__ChatterboxClassText.yy",},"order":4,}, - {"id":{"name":"oTestCaseDirectionAsExpression","path":"objects/oTestCaseDirectionAsExpression/oTestCaseDirectionAsExpression.yy",},"order":13,}, + {"id":{"name":"oTestCaseDirectionAsExpression","path":"objects/oTestCaseDirectionAsExpression/oTestCaseDirectionAsExpression.yy",},"order":14,}, {"id":{"name":"ChatterboxVariableGet","path":"scripts/ChatterboxVariableGet/ChatterboxVariableGet.yy",},"order":0,}, {"id":{"name":"ChatterboxSourceNodeCount","path":"scripts/ChatterboxSourceNodeCount/ChatterboxSourceNodeCount.yy",},"order":8,}, {"id":{"name":"oTest","path":"objects/oTest/oTest.yy",},"order":148,}, @@ -109,138 +112,8 @@ {"isScaled":false,"autocrop":true,"border":2,"mipsToGenerate":0,"groupParent":null,"targets":-1,"resourceVersion":"1.3","name":"Default","resourceType":"GMTextureGroup",}, ], "IncludedFiles": [ - {"CopyToMask":-1,"filePath":"datafiles/Yarn","resourceVersion":"1.0","name":"Test.json","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles/Yarn","resourceVersion":"1.0","name":"Test2.json","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles/Yarn","resourceVersion":"1.0","name":"Test2.yarn","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles/Yarn","resourceVersion":"1.0","name":"Test2.json","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles/Yarn","resourceVersion":"1.0","name":"Test2.yarn","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles/Yarn","resourceVersion":"1.0","name":"Test.json","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles/Yarn","resourceVersion":"1.0","name":"Test2.json","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles/Yarn","resourceVersion":"1.0","name":"Test.json","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles/Yarn","resourceVersion":"1.0","name":"Test2.yarn","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles/Yarn","resourceVersion":"1.0","name":"Test.json","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles/Yarn","resourceVersion":"1.0","name":"Test2.json","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles/Yarn","resourceVersion":"1.0","name":"Test2.yarn","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles/Yarn","resourceVersion":"1.0","name":"Test2.yarn","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles/Yarn","resourceVersion":"1.0","name":"Test2.json","resourceType":"GMIncludedFile",}, - {"CopyToMask":153720560310812910,"filePath":"datafiles/Yarn","resourceVersion":"1.0","name":"Test.json","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles/Yarn","resourceVersion":"1.0","name":"Test.json","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles/Yarn","resourceVersion":"1.0","name":"Test2.json","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles/Yarn","resourceVersion":"1.0","name":"Test2.yarn","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles/Yarn","resourceVersion":"1.0","name":"Test.json","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles/Yarn","resourceVersion":"1.0","name":"Test2.json","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles/Yarn","resourceVersion":"1.0","name":"Test2.yarn","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles/Yarn","resourceVersion":"1.0","name":"Test.json","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles/Yarn","resourceVersion":"1.0","name":"Test2.json","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles/Yarn","resourceVersion":"1.0","name":"Test2.yarn","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles/Yarn","resourceVersion":"1.0","name":"Test2.json","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles/Yarn","resourceVersion":"1.0","name":"Test2.yarn","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles/Yarn","resourceVersion":"1.0","name":"Test.json","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles/Yarn","resourceVersion":"1.0","name":"Test2.yarn","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles/Yarn","resourceVersion":"1.0","name":"Test.json","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles/Yarn","resourceVersion":"1.0","name":"Test2.json","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles/Yarn","resourceVersion":"1.0","name":"Test2.json","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles/Yarn","resourceVersion":"1.0","name":"Test2.yarn","resourceType":"GMIncludedFile",}, - {"CopyToMask":153720560310812910,"filePath":"datafiles/Yarn","resourceVersion":"1.0","name":"Test.json","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles/Yarn","resourceVersion":"1.0","name":"Test2.json","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles/Yarn","resourceVersion":"1.0","name":"Test.json","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles/Yarn","resourceVersion":"1.0","name":"Test2.yarn","resourceType":"GMIncludedFile",}, - {"CopyToMask":153720560310812910,"filePath":"datafiles/Yarn","resourceVersion":"1.0","name":"Test2.yarn","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles/Yarn","resourceVersion":"1.0","name":"Test2.json","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles/Yarn","resourceVersion":"1.0","name":"Test.json","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles/Yarn","resourceVersion":"1.0","name":"Test.json","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles/Yarn","resourceVersion":"1.0","name":"Test2.yarn","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles/Yarn","resourceVersion":"1.0","name":"Test2.json","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles/Yarn","resourceVersion":"1.0","name":"Test2.json","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles/Yarn","resourceVersion":"1.0","name":"Test.json","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles/Yarn","resourceVersion":"1.0","name":"Test2.yarn","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles/Yarn","resourceVersion":"1.0","name":"Test2.yarn","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles/Yarn","resourceVersion":"1.0","name":"Test.json","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles/Yarn","resourceVersion":"1.0","name":"Test2.json","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles/Yarn","resourceVersion":"1.0","name":"Test.json","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles/Yarn","resourceVersion":"1.0","name":"Test2.yarn","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles/Yarn","resourceVersion":"1.0","name":"Test2.json","resourceType":"GMIncludedFile",}, {"CopyToMask":-1,"filePath":"datafiles","resourceVersion":"1.0","name":"testcase_action.yarn","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles/Yarn","resourceVersion":"1.0","name":"Test.json","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles/Yarn","resourceVersion":"1.0","name":"Test2.json","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles/Yarn","resourceVersion":"1.0","name":"testcase_action.yarn","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles/Yarn","resourceVersion":"1.0","name":"Test2.yarn","resourceType":"GMIncludedFile",}, {"CopyToMask":-1,"filePath":"datafiles","resourceVersion":"1.0","name":"testcase_option.yarn","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles/Yarn","resourceVersion":"1.0","name":"Test2.json","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles/Yarn","resourceVersion":"1.0","name":"Test2.yarn","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles/Yarn","resourceVersion":"1.0","name":"Test.json","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles/Yarn","resourceVersion":"1.0","name":"testcase_action.yarn","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles/Yarn","resourceVersion":"1.0","name":"testcase_option.yarn","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles/Yarn","resourceVersion":"1.0","name":"Test.json","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles/Yarn","resourceVersion":"1.0","name":"Test2.json","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles/Yarn","resourceVersion":"1.0","name":"Test2.yarn","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles/Yarn","resourceVersion":"1.0","name":"testcase_action.yarn","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles/Yarn","resourceVersion":"1.0","name":"testcase_option.yarn","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles/Yarn","resourceVersion":"1.0","name":"Test.json","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles/Yarn","resourceVersion":"1.0","name":"Test2.yarn","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles/Yarn","resourceVersion":"1.0","name":"testcase_action.yarn","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles/Yarn","resourceVersion":"1.0","name":"Test2.json","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles/Yarn","resourceVersion":"1.0","name":"testcase_option.yarn","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles/Yarn","resourceVersion":"1.0","name":"Test.json","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles/Yarn","resourceVersion":"1.0","name":"Test2.json","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles/Yarn","resourceVersion":"1.0","name":"testcase_option.yarn","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles/Yarn","resourceVersion":"1.0","name":"Test2.yarn","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles/Yarn","resourceVersion":"1.0","name":"testcase_action.yarn","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles/Yarn","resourceVersion":"1.0","name":"Test.json","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles/Yarn","resourceVersion":"1.0","name":"Test2.json","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles/Yarn","resourceVersion":"1.0","name":"testcase_option.yarn","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles/Yarn","resourceVersion":"1.0","name":"testcase_action.yarn","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles/Yarn","resourceVersion":"1.0","name":"Test2.yarn","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles/Yarn","resourceVersion":"1.0","name":"Test.json","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles/Yarn","resourceVersion":"1.0","name":"testcase_action.yarn","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles/Yarn","resourceVersion":"1.0","name":"testcase_option.yarn","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles/Yarn","resourceVersion":"1.0","name":"Test2.yarn","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles/Yarn","resourceVersion":"1.0","name":"Test2.json","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles/Yarn","resourceVersion":"1.0","name":"Test.json","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles/Yarn","resourceVersion":"1.0","name":"Test2.yarn","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles/Yarn","resourceVersion":"1.0","name":"Test2.json","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles/Yarn","resourceVersion":"1.0","name":"testcase_action.yarn","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles/Yarn","resourceVersion":"1.0","name":"testcase_option.yarn","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles/Yarn","resourceVersion":"1.0","name":"Test2.yarn","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles/Yarn","resourceVersion":"1.0","name":"testcase_option.yarn","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles/Yarn","resourceVersion":"1.0","name":"testcase_action.yarn","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles/Yarn","resourceVersion":"1.0","name":"Test2.json","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles/Yarn","resourceVersion":"1.0","name":"Test.json","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles/Yarn","resourceVersion":"1.0","name":"Test.json","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles/Yarn","resourceVersion":"1.0","name":"Test2.json","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles/Yarn","resourceVersion":"1.0","name":"testcase_action.yarn","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles/Yarn","resourceVersion":"1.0","name":"Test2.yarn","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles/Yarn","resourceVersion":"1.0","name":"testcase_option.yarn","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles/Yarn","resourceVersion":"1.0","name":"Test2.yarn","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles/Yarn","resourceVersion":"1.0","name":"Test.json","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles/Yarn","resourceVersion":"1.0","name":"testcase_action.yarn","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles/Yarn","resourceVersion":"1.0","name":"testcase_option.yarn","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles/Yarn","resourceVersion":"1.0","name":"Test2.json","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles/Yarn","resourceVersion":"1.0","name":"testcase_option.yarn","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles/Yarn","resourceVersion":"1.0","name":"testcase_action.yarn","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles/Yarn","resourceVersion":"1.0","name":"Test2.json","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles/Yarn","resourceVersion":"1.0","name":"Test2.yarn","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles/Yarn","resourceVersion":"1.0","name":"Test.json","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles/Yarn","resourceVersion":"1.0","name":"Test.json","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles/Yarn","resourceVersion":"1.0","name":"testcase_action.yarn","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles/Yarn","resourceVersion":"1.0","name":"Test2.json","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles/Yarn","resourceVersion":"1.0","name":"Test2.yarn","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles/Yarn","resourceVersion":"1.0","name":"testcase_option.yarn","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles/Yarn","resourceVersion":"1.0","name":"Test.json","resourceType":"GMIncludedFile",}, - {"CopyToMask":153157610357391598,"filePath":"datafiles/Yarn","resourceVersion":"1.0","name":"Test2.yarn","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles/Yarn","resourceVersion":"1.0","name":"testcase_action.yarn","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles/Yarn","resourceVersion":"1.0","name":"Test2.json","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles/Yarn","resourceVersion":"1.0","name":"testcase_option.yarn","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles/Yarn","resourceVersion":"1.0","name":"Test.json","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles/Yarn","resourceVersion":"1.0","name":"Test2.json","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles/Yarn","resourceVersion":"1.0","name":"testcase_option.yarn","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles/Yarn","resourceVersion":"1.0","name":"testcase_action.yarn","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles/Yarn","resourceVersion":"1.0","name":"Test2.yarn","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles/Yarn","resourceVersion":"1.0","name":"Test.json","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles/Yarn","resourceVersion":"1.0","name":"Test2.json","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles/Yarn","resourceVersion":"1.0","name":"testcase_option.yarn","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles/Yarn","resourceVersion":"1.0","name":"testcase_action.yarn","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles/Yarn","resourceVersion":"1.0","name":"Test2.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",}, @@ -258,9 +131,10 @@ {"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",}, ], "MetaData": { - "IDEVersion": "2.3.1.542", + "IDEVersion": "2.3.2.560", }, "resourceVersion": "1.4", "name": "chatterbox", diff --git a/datafiles/testcase_node_metadata.yarn b/datafiles/testcase_node_metadata.yarn new file mode 100644 index 00000000..fce876cb --- /dev/null +++ b/datafiles/testcase_node_metadata.yarn @@ -0,0 +1,16 @@ +#tag: 1 +#tag2 : hello! +#tag : duplicate + +title: Start +tags: a, b, c, d, e +section: Section1 +colorID: 0 +position: 534.5534057617188, 350.60845947265625 +--- + +Hello +<> +This shouldn't appear + +=== \ No newline at end of file diff --git a/objects/oTest/oTest.yy b/objects/oTest/oTest.yy index 5f6495c8..3d764c84 100644 --- a/objects/oTest/oTest.yy +++ b/objects/oTest/oTest.yy @@ -18,9 +18,9 @@ "physicsKinematic": false, "physicsShapePoints": [], "eventList": [ - {"isDnD":false,"eventNum":0,"eventType":0,"collisionObjectId":null,"parent":{"name":"oTest","path":"objects/oTest/oTest.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, - {"isDnD":false,"eventNum":0,"eventType":3,"collisionObjectId":null,"parent":{"name":"oTest","path":"objects/oTest/oTest.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, - {"isDnD":false,"eventNum":0,"eventType":8,"collisionObjectId":null,"parent":{"name":"oTest","path":"objects/oTest/oTest.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, + {"isDnD":false,"eventNum":0,"eventType":0,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, + {"isDnD":false,"eventNum":0,"eventType":3,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, + {"isDnD":false,"eventNum":0,"eventType":8,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, ], "properties": [], "overriddenProperties": [], diff --git a/objects/oTestCaseAction/oTestCaseAction.yy b/objects/oTestCaseAction/oTestCaseAction.yy index e730b871..ab0b5952 100644 --- a/objects/oTestCaseAction/oTestCaseAction.yy +++ b/objects/oTestCaseAction/oTestCaseAction.yy @@ -18,9 +18,9 @@ "physicsKinematic": false, "physicsShapePoints": [], "eventList": [ - {"isDnD":false,"eventNum":0,"eventType":0,"collisionObjectId":null,"parent":{"name":"oTestCaseAction","path":"objects/oTestCaseAction/oTestCaseAction.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, - {"isDnD":false,"eventNum":0,"eventType":3,"collisionObjectId":null,"parent":{"name":"oTestCaseAction","path":"objects/oTestCaseAction/oTestCaseAction.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, - {"isDnD":false,"eventNum":0,"eventType":8,"collisionObjectId":null,"parent":{"name":"oTestCaseAction","path":"objects/oTestCaseAction/oTestCaseAction.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, + {"isDnD":false,"eventNum":0,"eventType":0,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, + {"isDnD":false,"eventNum":0,"eventType":3,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, + {"isDnD":false,"eventNum":0,"eventType":8,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, ], "properties": [], "overriddenProperties": [], diff --git a/objects/oTestCaseBOM/oTestCaseBOM.yy b/objects/oTestCaseBOM/oTestCaseBOM.yy index 5ec4775e..a0454619 100644 --- a/objects/oTestCaseBOM/oTestCaseBOM.yy +++ b/objects/oTestCaseBOM/oTestCaseBOM.yy @@ -18,9 +18,9 @@ "physicsKinematic": false, "physicsShapePoints": [], "eventList": [ - {"isDnD":false,"eventNum":0,"eventType":0,"collisionObjectId":null,"parent":{"name":"oTestCaseBOM","path":"objects/oTestCaseBOM/oTestCaseBOM.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, - {"isDnD":false,"eventNum":0,"eventType":3,"collisionObjectId":null,"parent":{"name":"oTestCaseBOM","path":"objects/oTestCaseBOM/oTestCaseBOM.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, - {"isDnD":false,"eventNum":0,"eventType":8,"collisionObjectId":null,"parent":{"name":"oTestCaseBOM","path":"objects/oTestCaseBOM/oTestCaseBOM.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, + {"isDnD":false,"eventNum":0,"eventType":0,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, + {"isDnD":false,"eventNum":0,"eventType":3,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, + {"isDnD":false,"eventNum":0,"eventType":8,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, ], "properties": [], "overriddenProperties": [], diff --git a/objects/oTestCaseComments/oTestCaseComments.yy b/objects/oTestCaseComments/oTestCaseComments.yy index 8b7b67a8..66547228 100644 --- a/objects/oTestCaseComments/oTestCaseComments.yy +++ b/objects/oTestCaseComments/oTestCaseComments.yy @@ -18,9 +18,9 @@ "physicsKinematic": false, "physicsShapePoints": [], "eventList": [ - {"isDnD":false,"eventNum":0,"eventType":0,"collisionObjectId":null,"parent":{"name":"oTestCaseComments","path":"objects/oTestCaseComments/oTestCaseComments.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, - {"isDnD":false,"eventNum":0,"eventType":3,"collisionObjectId":null,"parent":{"name":"oTestCaseComments","path":"objects/oTestCaseComments/oTestCaseComments.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, - {"isDnD":false,"eventNum":0,"eventType":8,"collisionObjectId":null,"parent":{"name":"oTestCaseComments","path":"objects/oTestCaseComments/oTestCaseComments.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, + {"isDnD":false,"eventNum":0,"eventType":0,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, + {"isDnD":false,"eventNum":0,"eventType":3,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, + {"isDnD":false,"eventNum":0,"eventType":8,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, ], "properties": [], "overriddenProperties": [], diff --git a/objects/oTestCaseDirection/oTestCaseDirection.yy b/objects/oTestCaseDirection/oTestCaseDirection.yy index d3bda0a8..8b1e8ecc 100644 --- a/objects/oTestCaseDirection/oTestCaseDirection.yy +++ b/objects/oTestCaseDirection/oTestCaseDirection.yy @@ -18,9 +18,9 @@ "physicsKinematic": false, "physicsShapePoints": [], "eventList": [ - {"isDnD":false,"eventNum":0,"eventType":0,"collisionObjectId":null,"parent":{"name":"oTestCaseDirection","path":"objects/oTestCaseDirection/oTestCaseDirection.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, - {"isDnD":false,"eventNum":0,"eventType":3,"collisionObjectId":null,"parent":{"name":"oTestCaseDirection","path":"objects/oTestCaseDirection/oTestCaseDirection.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, - {"isDnD":false,"eventNum":0,"eventType":8,"collisionObjectId":null,"parent":{"name":"oTestCaseDirection","path":"objects/oTestCaseDirection/oTestCaseDirection.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, + {"isDnD":false,"eventNum":0,"eventType":0,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, + {"isDnD":false,"eventNum":0,"eventType":3,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, + {"isDnD":false,"eventNum":0,"eventType":8,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, ], "properties": [], "overriddenProperties": [], diff --git a/objects/oTestCaseDirectionAsExpression/oTestCaseDirectionAsExpression.yy b/objects/oTestCaseDirectionAsExpression/oTestCaseDirectionAsExpression.yy index 04ae3fbe..662d5c2f 100644 --- a/objects/oTestCaseDirectionAsExpression/oTestCaseDirectionAsExpression.yy +++ b/objects/oTestCaseDirectionAsExpression/oTestCaseDirectionAsExpression.yy @@ -18,9 +18,9 @@ "physicsKinematic": false, "physicsShapePoints": [], "eventList": [ - {"isDnD":false,"eventNum":0,"eventType":0,"collisionObjectId":null,"parent":{"name":"oTestCaseDirectionAsExpression","path":"objects/oTestCaseDirectionAsExpression/oTestCaseDirectionAsExpression.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, - {"isDnD":false,"eventNum":0,"eventType":3,"collisionObjectId":null,"parent":{"name":"oTestCaseDirectionAsExpression","path":"objects/oTestCaseDirectionAsExpression/oTestCaseDirectionAsExpression.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, - {"isDnD":false,"eventNum":0,"eventType":8,"collisionObjectId":null,"parent":{"name":"oTestCaseDirectionAsExpression","path":"objects/oTestCaseDirectionAsExpression/oTestCaseDirectionAsExpression.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, + {"isDnD":false,"eventNum":0,"eventType":0,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, + {"isDnD":false,"eventNum":0,"eventType":3,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, + {"isDnD":false,"eventNum":0,"eventType":8,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, ], "properties": [], "overriddenProperties": [], diff --git a/objects/oTestCaseDirectionAsWeirdo/oTestCaseDirectionAsWeirdo.yy b/objects/oTestCaseDirectionAsWeirdo/oTestCaseDirectionAsWeirdo.yy index 669d8755..6760dc36 100644 --- a/objects/oTestCaseDirectionAsWeirdo/oTestCaseDirectionAsWeirdo.yy +++ b/objects/oTestCaseDirectionAsWeirdo/oTestCaseDirectionAsWeirdo.yy @@ -18,9 +18,9 @@ "physicsKinematic": false, "physicsShapePoints": [], "eventList": [ - {"isDnD":false,"eventNum":0,"eventType":0,"collisionObjectId":null,"parent":{"name":"oTestCaseDirectionAsWeirdo","path":"objects/oTestCaseDirectionAsWeirdo/oTestCaseDirectionAsWeirdo.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, - {"isDnD":false,"eventNum":0,"eventType":3,"collisionObjectId":null,"parent":{"name":"oTestCaseDirectionAsWeirdo","path":"objects/oTestCaseDirectionAsWeirdo/oTestCaseDirectionAsWeirdo.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, - {"isDnD":false,"eventNum":0,"eventType":8,"collisionObjectId":null,"parent":{"name":"oTestCaseDirectionAsWeirdo","path":"objects/oTestCaseDirectionAsWeirdo/oTestCaseDirectionAsWeirdo.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, + {"isDnD":false,"eventNum":0,"eventType":0,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, + {"isDnD":false,"eventNum":0,"eventType":3,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, + {"isDnD":false,"eventNum":0,"eventType":8,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, ], "properties": [], "overriddenProperties": [], diff --git a/objects/oTestCaseEmptyParam/oTestCaseEmptyParam.yy b/objects/oTestCaseEmptyParam/oTestCaseEmptyParam.yy index 70887d8e..9a767885 100644 --- a/objects/oTestCaseEmptyParam/oTestCaseEmptyParam.yy +++ b/objects/oTestCaseEmptyParam/oTestCaseEmptyParam.yy @@ -18,9 +18,9 @@ "physicsKinematic": false, "physicsShapePoints": [], "eventList": [ - {"isDnD":false,"eventNum":0,"eventType":0,"collisionObjectId":null,"parent":{"name":"oTestCaseEmptyParam","path":"objects/oTestCaseEmptyParam/oTestCaseEmptyParam.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, - {"isDnD":false,"eventNum":0,"eventType":3,"collisionObjectId":null,"parent":{"name":"oTestCaseEmptyParam","path":"objects/oTestCaseEmptyParam/oTestCaseEmptyParam.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, - {"isDnD":false,"eventNum":0,"eventType":8,"collisionObjectId":null,"parent":{"name":"oTestCaseEmptyParam","path":"objects/oTestCaseEmptyParam/oTestCaseEmptyParam.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, + {"isDnD":false,"eventNum":0,"eventType":0,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, + {"isDnD":false,"eventNum":0,"eventType":3,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, + {"isDnD":false,"eventNum":0,"eventType":8,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, ], "properties": [], "overriddenProperties": [], diff --git a/objects/oTestCaseEscapedCharacters/oTestCaseEscapedCharacters.yy b/objects/oTestCaseEscapedCharacters/oTestCaseEscapedCharacters.yy index 2f8d88a5..11d715e0 100644 --- a/objects/oTestCaseEscapedCharacters/oTestCaseEscapedCharacters.yy +++ b/objects/oTestCaseEscapedCharacters/oTestCaseEscapedCharacters.yy @@ -18,9 +18,9 @@ "physicsKinematic": false, "physicsShapePoints": [], "eventList": [ - {"isDnD":false,"eventNum":0,"eventType":0,"collisionObjectId":null,"parent":{"name":"oTestCaseEscapedCharacters","path":"objects/oTestCaseEscapedCharacters/oTestCaseEscapedCharacters.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, - {"isDnD":false,"eventNum":0,"eventType":3,"collisionObjectId":null,"parent":{"name":"oTestCaseEscapedCharacters","path":"objects/oTestCaseEscapedCharacters/oTestCaseEscapedCharacters.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, - {"isDnD":false,"eventNum":0,"eventType":8,"collisionObjectId":null,"parent":{"name":"oTestCaseEscapedCharacters","path":"objects/oTestCaseEscapedCharacters/oTestCaseEscapedCharacters.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, + {"isDnD":false,"eventNum":0,"eventType":0,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, + {"isDnD":false,"eventNum":0,"eventType":3,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, + {"isDnD":false,"eventNum":0,"eventType":8,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, ], "properties": [], "overriddenProperties": [], diff --git a/objects/oTestCaseExpressionDatatypes/oTestCaseExpressionDatatypes.yy b/objects/oTestCaseExpressionDatatypes/oTestCaseExpressionDatatypes.yy index a057a225..6109ed96 100644 --- a/objects/oTestCaseExpressionDatatypes/oTestCaseExpressionDatatypes.yy +++ b/objects/oTestCaseExpressionDatatypes/oTestCaseExpressionDatatypes.yy @@ -18,9 +18,9 @@ "physicsKinematic": false, "physicsShapePoints": [], "eventList": [ - {"isDnD":false,"eventNum":0,"eventType":0,"collisionObjectId":null,"parent":{"name":"oTestCaseExpressionDatatypes","path":"objects/oTestCaseExpressionDatatypes/oTestCaseExpressionDatatypes.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, - {"isDnD":false,"eventNum":0,"eventType":3,"collisionObjectId":null,"parent":{"name":"oTestCaseExpressionDatatypes","path":"objects/oTestCaseExpressionDatatypes/oTestCaseExpressionDatatypes.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, - {"isDnD":false,"eventNum":0,"eventType":8,"collisionObjectId":null,"parent":{"name":"oTestCaseExpressionDatatypes","path":"objects/oTestCaseExpressionDatatypes/oTestCaseExpressionDatatypes.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, + {"isDnD":false,"eventNum":0,"eventType":0,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, + {"isDnD":false,"eventNum":0,"eventType":3,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, + {"isDnD":false,"eventNum":0,"eventType":8,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, ], "properties": [], "overriddenProperties": [], diff --git a/objects/oTestCaseFileTags/Draw_0.gml b/objects/oTestCaseFileTags/Draw_0.gml index 4fd91e6c..8eba1e47 100644 --- a/objects/oTestCaseFileTags/Draw_0.gml +++ b/objects/oTestCaseFileTags/Draw_0.gml @@ -27,7 +27,9 @@ else if (ChatterboxIsWaiting(box)) { //If we're in a "waiting" state then prompt the user for basic input - draw_text(_x, _y, "(Press Space)"); + var _string = "(Press Space)"; + draw_text(_x, _y, _string); + _y += string_height(_string); } else { @@ -41,4 +43,18 @@ else ++_i; } } + + //More spacing... + _y += 30; + + //Draw all file tags + var _metadata = ChatterboxSourceGetTags(ChatterboxGetCurrentSource(box)); + var _i = 0; + repeat(array_length(_metadata)) + { + var _string = "tag " + string(_i) + " = \"" + _metadata[_i] + "\""; + draw_text(_x, _y, _string); + _y += string_height(_string); + ++_i; + } } \ No newline at end of file diff --git a/objects/oTestCaseFileTags/oTestCaseFileTags.yy b/objects/oTestCaseFileTags/oTestCaseFileTags.yy index 8367c7b0..e8e947ec 100644 --- a/objects/oTestCaseFileTags/oTestCaseFileTags.yy +++ b/objects/oTestCaseFileTags/oTestCaseFileTags.yy @@ -18,9 +18,9 @@ "physicsKinematic": false, "physicsShapePoints": [], "eventList": [ - {"isDnD":false,"eventNum":0,"eventType":0,"collisionObjectId":null,"parent":{"name":"oTestCaseFileTags","path":"objects/oTestCaseFileTags/oTestCaseFileTags.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, - {"isDnD":false,"eventNum":0,"eventType":3,"collisionObjectId":null,"parent":{"name":"oTestCaseFileTags","path":"objects/oTestCaseFileTags/oTestCaseFileTags.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, - {"isDnD":false,"eventNum":0,"eventType":8,"collisionObjectId":null,"parent":{"name":"oTestCaseFileTags","path":"objects/oTestCaseFileTags/oTestCaseFileTags.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, + {"isDnD":false,"eventNum":0,"eventType":0,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, + {"isDnD":false,"eventNum":0,"eventType":3,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, + {"isDnD":false,"eventNum":0,"eventType":8,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, ], "properties": [], "overriddenProperties": [], diff --git a/objects/oTestCaseIf/oTestCaseIf.yy b/objects/oTestCaseIf/oTestCaseIf.yy index 6fa36201..d91a6983 100644 --- a/objects/oTestCaseIf/oTestCaseIf.yy +++ b/objects/oTestCaseIf/oTestCaseIf.yy @@ -18,9 +18,9 @@ "physicsKinematic": false, "physicsShapePoints": [], "eventList": [ - {"isDnD":false,"eventNum":0,"eventType":0,"collisionObjectId":null,"parent":{"name":"oTestCaseIf","path":"objects/oTestCaseIf/oTestCaseIf.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, - {"isDnD":false,"eventNum":0,"eventType":3,"collisionObjectId":null,"parent":{"name":"oTestCaseIf","path":"objects/oTestCaseIf/oTestCaseIf.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, - {"isDnD":false,"eventNum":0,"eventType":8,"collisionObjectId":null,"parent":{"name":"oTestCaseIf","path":"objects/oTestCaseIf/oTestCaseIf.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, + {"isDnD":false,"eventNum":0,"eventType":0,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, + {"isDnD":false,"eventNum":0,"eventType":3,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, + {"isDnD":false,"eventNum":0,"eventType":8,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, ], "properties": [], "overriddenProperties": [], diff --git a/objects/oTestCaseInLineExpressions/oTestCaseInLineExpressions.yy b/objects/oTestCaseInLineExpressions/oTestCaseInLineExpressions.yy index d13b6f0c..4a70b3f2 100644 --- a/objects/oTestCaseInLineExpressions/oTestCaseInLineExpressions.yy +++ b/objects/oTestCaseInLineExpressions/oTestCaseInLineExpressions.yy @@ -18,9 +18,9 @@ "physicsKinematic": false, "physicsShapePoints": [], "eventList": [ - {"isDnD":false,"eventNum":0,"eventType":0,"collisionObjectId":null,"parent":{"name":"oTestCaseInLineExpressions","path":"objects/oTestCaseInLineExpressions/oTestCaseInLineExpressions.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, - {"isDnD":false,"eventNum":0,"eventType":3,"collisionObjectId":null,"parent":{"name":"oTestCaseInLineExpressions","path":"objects/oTestCaseInLineExpressions/oTestCaseInLineExpressions.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, - {"isDnD":false,"eventNum":0,"eventType":8,"collisionObjectId":null,"parent":{"name":"oTestCaseInLineExpressions","path":"objects/oTestCaseInLineExpressions/oTestCaseInLineExpressions.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, + {"isDnD":false,"eventNum":0,"eventType":0,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, + {"isDnD":false,"eventNum":0,"eventType":3,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, + {"isDnD":false,"eventNum":0,"eventType":8,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, ], "properties": [], "overriddenProperties": [], diff --git a/objects/oTestCaseJump/oTestCaseJump.yy b/objects/oTestCaseJump/oTestCaseJump.yy index 6ac04890..10a242b9 100644 --- a/objects/oTestCaseJump/oTestCaseJump.yy +++ b/objects/oTestCaseJump/oTestCaseJump.yy @@ -18,9 +18,9 @@ "physicsKinematic": false, "physicsShapePoints": [], "eventList": [ - {"isDnD":false,"eventNum":0,"eventType":0,"collisionObjectId":null,"parent":{"name":"oTestCaseJump","path":"objects/oTestCaseJump/oTestCaseJump.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, - {"isDnD":false,"eventNum":0,"eventType":3,"collisionObjectId":null,"parent":{"name":"oTestCaseJump","path":"objects/oTestCaseJump/oTestCaseJump.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, - {"isDnD":false,"eventNum":0,"eventType":8,"collisionObjectId":null,"parent":{"name":"oTestCaseJump","path":"objects/oTestCaseJump/oTestCaseJump.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, + {"isDnD":false,"eventNum":0,"eventType":0,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, + {"isDnD":false,"eventNum":0,"eventType":3,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, + {"isDnD":false,"eventNum":0,"eventType":8,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, ], "properties": [], "overriddenProperties": [], diff --git a/objects/oTestCaseMetadata/oTestCaseMetadata.yy b/objects/oTestCaseMetadata/oTestCaseMetadata.yy index 9f351c0f..b958732d 100644 --- a/objects/oTestCaseMetadata/oTestCaseMetadata.yy +++ b/objects/oTestCaseMetadata/oTestCaseMetadata.yy @@ -18,9 +18,9 @@ "physicsKinematic": false, "physicsShapePoints": [], "eventList": [ - {"isDnD":false,"eventNum":0,"eventType":0,"collisionObjectId":null,"parent":{"name":"oTestCaseMetadata","path":"objects/oTestCaseMetadata/oTestCaseMetadata.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, - {"isDnD":false,"eventNum":0,"eventType":3,"collisionObjectId":null,"parent":{"name":"oTestCaseMetadata","path":"objects/oTestCaseMetadata/oTestCaseMetadata.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, - {"isDnD":false,"eventNum":0,"eventType":8,"collisionObjectId":null,"parent":{"name":"oTestCaseMetadata","path":"objects/oTestCaseMetadata/oTestCaseMetadata.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, + {"isDnD":false,"eventNum":0,"eventType":0,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, + {"isDnD":false,"eventNum":0,"eventType":3,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, + {"isDnD":false,"eventNum":0,"eventType":8,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, ], "properties": [], "overriddenProperties": [], diff --git a/objects/oTestCaseNegateFunction/oTestCaseNegateFunction.yy b/objects/oTestCaseNegateFunction/oTestCaseNegateFunction.yy index c11b8ec9..08898e59 100644 --- a/objects/oTestCaseNegateFunction/oTestCaseNegateFunction.yy +++ b/objects/oTestCaseNegateFunction/oTestCaseNegateFunction.yy @@ -18,9 +18,9 @@ "physicsKinematic": false, "physicsShapePoints": [], "eventList": [ - {"isDnD":false,"eventNum":0,"eventType":0,"collisionObjectId":null,"parent":{"name":"oTestCaseNegateFunction","path":"objects/oTestCaseNegateFunction/oTestCaseNegateFunction.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, - {"isDnD":false,"eventNum":0,"eventType":3,"collisionObjectId":null,"parent":{"name":"oTestCaseNegateFunction","path":"objects/oTestCaseNegateFunction/oTestCaseNegateFunction.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, - {"isDnD":false,"eventNum":0,"eventType":8,"collisionObjectId":null,"parent":{"name":"oTestCaseNegateFunction","path":"objects/oTestCaseNegateFunction/oTestCaseNegateFunction.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, + {"isDnD":false,"eventNum":0,"eventType":0,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, + {"isDnD":false,"eventNum":0,"eventType":3,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, + {"isDnD":false,"eventNum":0,"eventType":8,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, ], "properties": [], "overriddenProperties": [], diff --git a/objects/oTestCaseNodeMetadata/Create_0.gml b/objects/oTestCaseNodeMetadata/Create_0.gml new file mode 100644 index 00000000..612295d1 --- /dev/null +++ b/objects/oTestCaseNodeMetadata/Create_0.gml @@ -0,0 +1,3 @@ +ChatterboxLoadFromFile("testcase_node_metadata.yarn"); +box = ChatterboxCreate(); +ChatterboxJump(box, "Start"); \ No newline at end of file diff --git a/objects/oTestCaseNodeMetadata/Draw_0.gml b/objects/oTestCaseNodeMetadata/Draw_0.gml new file mode 100644 index 00000000..346c4976 --- /dev/null +++ b/objects/oTestCaseNodeMetadata/Draw_0.gml @@ -0,0 +1,63 @@ +draw_set_font(fntDefault); + +//Iterate over all text and draw it +var _x = 10; +var _y = 10; + +if (ChatterboxIsStopped(box)) +{ + //If we're stopped then show that + draw_text(_x, _y, "(Chatterbox stopped)"); +} +else +{ + //All the spoken text + var _i = 0; + repeat(ChatterboxGetContentCount(box)) + { + var _string = ChatterboxGetContent(box, _i); + draw_text(_x, _y, _string); + _y += string_height(_string); + ++_i; + } + + //Bit of spacing... + _y += 30; + + if (ChatterboxIsWaiting(box)) + { + //If we're in a "waiting" state then prompt the user for basic input + var _string = "(Press Space)"; + draw_text(_x, _y, _string); + _y += string_height(_string); + } + else + { + //All the options + var _i = 0; + repeat(ChatterboxGetOptionCount(box)) + { + var _string = ChatterboxGetOption(box, _i); + draw_text(_x, _y, string(_i+1) + ") " + _string); + _y += string_height(_string); + ++_i; + } + } + + //More spacing... + _y += 30; + + //Draw all node metadata + var _metadata = ChatterboxGetCurrentMetadata(box); + var _names = variable_struct_get_names(_metadata); + var _i = 0; + repeat(array_length(_names)) + { + var _name = _names[_i]; + var _value = _metadata[$ _name]; + var _string = "metadata \"" + string(_name) + "\" = \"" + _value + "\""; + draw_text(_x, _y, _string); + _y += string_height(_string); + ++_i; + } +} \ No newline at end of file diff --git a/objects/oTestCaseNodeMetadata/Step_0.gml b/objects/oTestCaseNodeMetadata/Step_0.gml new file mode 100644 index 00000000..753ae90d --- /dev/null +++ b/objects/oTestCaseNodeMetadata/Step_0.gml @@ -0,0 +1,31 @@ +if (ChatterboxIsStopped(box)) +{ + //If we're stopped then don't respond to user input +} +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)) + { + 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 + ChatterboxFastForward(box); + } +} +else +{ + //If we're not waiting then we have some options! + + //Check for any keyboard input + var _index = undefined; + if (keyboard_check_released(ord("1"))) _index = 0; + 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 we've pressed a button, select that option + if (_index != undefined) ChatterboxSelect(box, _index); +} \ No newline at end of file diff --git a/objects/oTestCaseNodeMetadata/oTestCaseFileTags.yy b/objects/oTestCaseNodeMetadata/oTestCaseFileTags.yy new file mode 100644 index 00000000..e8e947ec --- /dev/null +++ b/objects/oTestCaseNodeMetadata/oTestCaseFileTags.yy @@ -0,0 +1,35 @@ +{ + "spriteId": null, + "solid": false, + "visible": true, + "spriteMaskId": null, + "persistent": false, + "parentObjectId": null, + "physicsObject": false, + "physicsSensor": false, + "physicsShape": 1, + "physicsGroup": 1, + "physicsDensity": 0.5, + "physicsRestitution": 0.1, + "physicsLinearDamping": 0.1, + "physicsAngularDamping": 0.1, + "physicsFriction": 0.2, + "physicsStartAwake": true, + "physicsKinematic": false, + "physicsShapePoints": [], + "eventList": [ + {"isDnD":false,"eventNum":0,"eventType":0,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, + {"isDnD":false,"eventNum":0,"eventType":3,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, + {"isDnD":false,"eventNum":0,"eventType":8,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, + ], + "properties": [], + "overriddenProperties": [], + "parent": { + "name": "Test Cases", + "path": "folders/Test Cases.yy", + }, + "resourceVersion": "1.0", + "name": "oTestCaseFileTags", + "tags": [], + "resourceType": "GMObject", +} \ No newline at end of file diff --git a/objects/oTestCaseNodeMetadata/oTestCaseNodeMetadata.yy b/objects/oTestCaseNodeMetadata/oTestCaseNodeMetadata.yy new file mode 100644 index 00000000..b468bd83 --- /dev/null +++ b/objects/oTestCaseNodeMetadata/oTestCaseNodeMetadata.yy @@ -0,0 +1,35 @@ +{ + "spriteId": null, + "solid": false, + "visible": true, + "spriteMaskId": null, + "persistent": false, + "parentObjectId": null, + "physicsObject": false, + "physicsSensor": false, + "physicsShape": 1, + "physicsGroup": 1, + "physicsDensity": 0.5, + "physicsRestitution": 0.1, + "physicsLinearDamping": 0.1, + "physicsAngularDamping": 0.1, + "physicsFriction": 0.2, + "physicsStartAwake": true, + "physicsKinematic": false, + "physicsShapePoints": [], + "eventList": [ + {"isDnD":false,"eventNum":0,"eventType":0,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, + {"isDnD":false,"eventNum":0,"eventType":3,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, + {"isDnD":false,"eventNum":0,"eventType":8,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, + ], + "properties": [], + "overriddenProperties": [], + "parent": { + "name": "Test Cases", + "path": "folders/Test Cases.yy", + }, + "resourceVersion": "1.0", + "name": "oTestCaseNodeMetadata", + "tags": [], + "resourceType": "GMObject", +} \ No newline at end of file diff --git a/objects/oTestCaseNodeMetadata/obj_testcase_action.yy b/objects/oTestCaseNodeMetadata/obj_testcase_action.yy new file mode 100644 index 00000000..5d394928 --- /dev/null +++ b/objects/oTestCaseNodeMetadata/obj_testcase_action.yy @@ -0,0 +1,35 @@ +{ + "spriteId": null, + "solid": false, + "visible": true, + "spriteMaskId": null, + "persistent": false, + "parentObjectId": null, + "physicsObject": false, + "physicsSensor": false, + "physicsShape": 1, + "physicsGroup": 1, + "physicsDensity": 0.5, + "physicsRestitution": 0.1, + "physicsLinearDamping": 0.1, + "physicsAngularDamping": 0.1, + "physicsFriction": 0.2, + "physicsStartAwake": true, + "physicsKinematic": false, + "physicsShapePoints": [], + "eventList": [ + {"isDnD":false,"eventNum":0,"eventType":0,"collisionObjectId":null,"parent":{"name":"obj_testcase_action","path":"objects/obj_testcase_action/obj_testcase_action.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, + {"isDnD":false,"eventNum":0,"eventType":3,"collisionObjectId":null,"parent":{"name":"obj_testcase_action","path":"objects/obj_testcase_action/obj_testcase_action.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, + {"isDnD":false,"eventNum":0,"eventType":8,"collisionObjectId":null,"parent":{"name":"obj_testcase_action","path":"objects/obj_testcase_action/obj_testcase_action.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, + ], + "properties": [], + "overriddenProperties": [], + "parent": { + "name": "chatterbox", + "path": "chatterbox.yyp", + }, + "resourceVersion": "1.0", + "name": "obj_testcase_action", + "tags": [], + "resourceType": "GMObject", +} \ No newline at end of file diff --git a/objects/oTestCaseNumericParam/oTestCaseNumericParam.yy b/objects/oTestCaseNumericParam/oTestCaseNumericParam.yy index 1cc2e9ab..abd22be5 100644 --- a/objects/oTestCaseNumericParam/oTestCaseNumericParam.yy +++ b/objects/oTestCaseNumericParam/oTestCaseNumericParam.yy @@ -18,9 +18,9 @@ "physicsKinematic": false, "physicsShapePoints": [], "eventList": [ - {"isDnD":false,"eventNum":0,"eventType":0,"collisionObjectId":null,"parent":{"name":"oTestCaseNumericParam","path":"objects/oTestCaseNumericParam/oTestCaseNumericParam.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, - {"isDnD":false,"eventNum":0,"eventType":3,"collisionObjectId":null,"parent":{"name":"oTestCaseNumericParam","path":"objects/oTestCaseNumericParam/oTestCaseNumericParam.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, - {"isDnD":false,"eventNum":0,"eventType":8,"collisionObjectId":null,"parent":{"name":"oTestCaseNumericParam","path":"objects/oTestCaseNumericParam/oTestCaseNumericParam.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, + {"isDnD":false,"eventNum":0,"eventType":0,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, + {"isDnD":false,"eventNum":0,"eventType":3,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, + {"isDnD":false,"eventNum":0,"eventType":8,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, ], "properties": [], "overriddenProperties": [], diff --git a/objects/oTestCaseOption/oTestCaseOption.yy b/objects/oTestCaseOption/oTestCaseOption.yy index 33daf402..c481b1f8 100644 --- a/objects/oTestCaseOption/oTestCaseOption.yy +++ b/objects/oTestCaseOption/oTestCaseOption.yy @@ -18,9 +18,9 @@ "physicsKinematic": false, "physicsShapePoints": [], "eventList": [ - {"isDnD":false,"eventNum":0,"eventType":0,"collisionObjectId":null,"parent":{"name":"oTestCaseOption","path":"objects/oTestCaseOption/oTestCaseOption.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, - {"isDnD":false,"eventNum":0,"eventType":3,"collisionObjectId":null,"parent":{"name":"oTestCaseOption","path":"objects/oTestCaseOption/oTestCaseOption.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, - {"isDnD":false,"eventNum":0,"eventType":8,"collisionObjectId":null,"parent":{"name":"oTestCaseOption","path":"objects/oTestCaseOption/oTestCaseOption.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, + {"isDnD":false,"eventNum":0,"eventType":0,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, + {"isDnD":false,"eventNum":0,"eventType":3,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, + {"isDnD":false,"eventNum":0,"eventType":8,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, ], "properties": [], "overriddenProperties": [], diff --git a/objects/oTestCaseSourceData/oTestCaseSourceData.yy b/objects/oTestCaseSourceData/oTestCaseSourceData.yy index 2870ce0f..0e7e78a4 100644 --- a/objects/oTestCaseSourceData/oTestCaseSourceData.yy +++ b/objects/oTestCaseSourceData/oTestCaseSourceData.yy @@ -18,8 +18,8 @@ "physicsKinematic": false, "physicsShapePoints": [], "eventList": [ - {"isDnD":false,"eventNum":0,"eventType":0,"collisionObjectId":null,"parent":{"name":"oTestCaseSourceData","path":"objects/oTestCaseSourceData/oTestCaseSourceData.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, - {"isDnD":false,"eventNum":0,"eventType":8,"collisionObjectId":null,"parent":{"name":"oTestCaseSourceData","path":"objects/oTestCaseSourceData/oTestCaseSourceData.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, + {"isDnD":false,"eventNum":0,"eventType":0,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, + {"isDnD":false,"eventNum":0,"eventType":8,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, ], "properties": [], "overriddenProperties": [], diff --git a/objects/oTestCaseStop/oTestCaseStop.yy b/objects/oTestCaseStop/oTestCaseStop.yy index 70c28a58..c3a578ba 100644 --- a/objects/oTestCaseStop/oTestCaseStop.yy +++ b/objects/oTestCaseStop/oTestCaseStop.yy @@ -18,9 +18,9 @@ "physicsKinematic": false, "physicsShapePoints": [], "eventList": [ - {"isDnD":false,"eventNum":0,"eventType":0,"collisionObjectId":null,"parent":{"name":"oTestCaseStop","path":"objects/oTestCaseStop/oTestCaseStop.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, - {"isDnD":false,"eventNum":0,"eventType":3,"collisionObjectId":null,"parent":{"name":"oTestCaseStop","path":"objects/oTestCaseStop/oTestCaseStop.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, - {"isDnD":false,"eventNum":0,"eventType":8,"collisionObjectId":null,"parent":{"name":"oTestCaseStop","path":"objects/oTestCaseStop/oTestCaseStop.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, + {"isDnD":false,"eventNum":0,"eventType":0,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, + {"isDnD":false,"eventNum":0,"eventType":3,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, + {"isDnD":false,"eventNum":0,"eventType":8,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, ], "properties": [], "overriddenProperties": [], diff --git a/options/mac/options_mac.yy b/options/mac/options_mac.yy index 5200f6db..73e249f3 100644 --- a/options/mac/options_mac.yy +++ b/options/mac/options_mac.yy @@ -8,6 +8,7 @@ "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_installer_background_png": "${base_options_dir}/mac/splash/installer_background.png", "option_mac_menu_dock": false, "option_mac_display_cursor": true, "option_mac_start_fullscreen": false, diff --git a/rooms/rmMain/rmMain.yy b/rooms/rmMain/rmMain.yy index 07c8facc..3b7b6fbb 100644 --- a/rooms/rmMain/rmMain.yy +++ b/rooms/rmMain/rmMain.yy @@ -14,7 +14,7 @@ ], "layers": [ {"instances":[ - {"properties":[],"isDnd":false,"objectId":{"name":"oTest","path":"objects/oTest/oTest.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_23FFDBAF","tags":[],"resourceType":"GMRInstance",}, + {"properties":[],"isDnd":false,"objectId":{"name":"oTest","path":"objects/oTest/oTest.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_34B1AA8D","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_23FFDBAF","path":"rooms/rmMain/rmMain.yy",}, + {"name":"inst_34B1AA8D","path":"rooms/rmMain/rmMain.yy",}, ], "inheritCreationOrder": false, "sequenceId": null, diff --git a/scripts/ChatterboxGetCurrentMetadata/ChatterboxGetCurrent.yy b/scripts/ChatterboxGetCurrentMetadata/ChatterboxGetCurrent.yy new file mode 100644 index 00000000..64c16a30 --- /dev/null +++ b/scripts/ChatterboxGetCurrentMetadata/ChatterboxGetCurrent.yy @@ -0,0 +1,12 @@ +{ + "isDnD": false, + "isCompatibility": false, + "parent": { + "name": "Getters", + "path": "folders/Chatterbox/Getters.yy", + }, + "resourceVersion": "1.0", + "name": "ChatterboxGetCurrent", + "tags": [], + "resourceType": "GMScript", +} \ No newline at end of file diff --git a/scripts/ChatterboxGetCurrentMetadata/ChatterboxGetCurrentMetadata.gml b/scripts/ChatterboxGetCurrentMetadata/ChatterboxGetCurrentMetadata.gml new file mode 100644 index 00000000..f0ef24f4 --- /dev/null +++ b/scripts/ChatterboxGetCurrentMetadata/ChatterboxGetCurrentMetadata.gml @@ -0,0 +1,10 @@ +/// Returns the metadata struct for the current node of the given chatterbox +/// +/// @param chatterbox + +function ChatterboxGetCurrentMetadata(_chatterbox) +{ + if (!IsChatterbox(_chatterbox)) return undefined; + _chatterbox.VerifyIsLoaded(); + return _chatterbox.current_node.metadata; +} \ No newline at end of file diff --git a/scripts/ChatterboxGetCurrentMetadata/ChatterboxGetCurrentMetadata.yy b/scripts/ChatterboxGetCurrentMetadata/ChatterboxGetCurrentMetadata.yy new file mode 100644 index 00000000..8081d328 --- /dev/null +++ b/scripts/ChatterboxGetCurrentMetadata/ChatterboxGetCurrentMetadata.yy @@ -0,0 +1,12 @@ +{ + "isDnD": false, + "isCompatibility": false, + "parent": { + "name": "Getters", + "path": "folders/Chatterbox/Getters.yy", + }, + "resourceVersion": "1.0", + "name": "ChatterboxGetCurrentMetadata", + "tags": [], + "resourceType": "GMScript", +} \ No newline at end of file diff --git a/scripts/ChatterboxSourceGetTags/ChatterboxSourceGetTags.gml b/scripts/ChatterboxSourceGetTags/ChatterboxSourceGetTags.gml new file mode 100644 index 00000000..f4a00567 --- /dev/null +++ b/scripts/ChatterboxSourceGetTags/ChatterboxSourceGetTags.gml @@ -0,0 +1,12 @@ +/// @param sourceName + +function ChatterboxSourceGetTags(_sourceName) +{ + if (!ChatterboxIsLoaded(_sourceName)) + { + __ChatterboxError("Source file \"", _sourceName, "\" has not been loaded"); + return []; + } + + return global.chatterboxFiles[? _sourceName].tags; +} \ No newline at end of file diff --git a/scripts/ChatterboxSourceGetTags/ChatterboxSourceGetTags.yy b/scripts/ChatterboxSourceGetTags/ChatterboxSourceGetTags.yy new file mode 100644 index 00000000..797594a6 --- /dev/null +++ b/scripts/ChatterboxSourceGetTags/ChatterboxSourceGetTags.yy @@ -0,0 +1,12 @@ +{ + "isDnD": false, + "isCompatibility": false, + "parent": { + "name": "Setup", + "path": "folders/Chatterbox/Setup.yy", + }, + "resourceVersion": "1.0", + "name": "ChatterboxSourceGetTags", + "tags": [], + "resourceType": "GMScript", +} \ No newline at end of file diff --git a/scripts/ChatterboxSourceGetTags/ChatterboxSourceNodeCount.yy b/scripts/ChatterboxSourceGetTags/ChatterboxSourceNodeCount.yy new file mode 100644 index 00000000..bba82031 --- /dev/null +++ b/scripts/ChatterboxSourceGetTags/ChatterboxSourceNodeCount.yy @@ -0,0 +1,12 @@ +{ + "isDnD": false, + "isCompatibility": false, + "parent": { + "name": "Setup", + "path": "folders/Chatterbox/Setup.yy", + }, + "resourceVersion": "1.0", + "name": "ChatterboxSourceNodeCount", + "tags": [], + "resourceType": "GMScript", +} \ No newline at end of file diff --git a/scripts/ChatterboxSourceGetTags/ChatterboxSourceNodeExists.yy b/scripts/ChatterboxSourceGetTags/ChatterboxSourceNodeExists.yy new file mode 100644 index 00000000..06748058 --- /dev/null +++ b/scripts/ChatterboxSourceGetTags/ChatterboxSourceNodeExists.yy @@ -0,0 +1,12 @@ +{ + "isDnD": false, + "isCompatibility": false, + "parent": { + "name": "Setup", + "path": "folders/Chatterbox/Setup.yy", + }, + "resourceVersion": "1.0", + "name": "ChatterboxSourceNodeExists", + "tags": [], + "resourceType": "GMScript", +} \ No newline at end of file diff --git a/scripts/__ChatterboxClassNode/__ChatterboxClassNode.gml b/scripts/__ChatterboxClassNode/__ChatterboxClassNode.gml index 78f03371..cd0f5d1a 100644 --- a/scripts/__ChatterboxClassNode/__ChatterboxClassNode.gml +++ b/scripts/__ChatterboxClassNode/__ChatterboxClassNode.gml @@ -2,11 +2,11 @@ /// @param nodeTags /// @param bodyString -function __ChatterboxClassNode(_filename, _node_tags, _body_string) constructor +function __ChatterboxClassNode(_filename, _node_metadata, _body_string) constructor { filename = _filename; - title = _node_tags.title; - tags = _node_tags; + title = _node_metadata.title; + metadata = _node_metadata; root_instruction = new __ChatterboxClassInstruction(undefined, -1, 0); if (__CHATTERBOX_DEBUG_COMPILER) __ChatterboxTrace("[", title, "]"); diff --git a/scripts/__ChatterboxClassSource/__ChatterboxClassSource.gml b/scripts/__ChatterboxClassSource/__ChatterboxClassSource.gml index 27ffdf76..8688827f 100644 --- a/scripts/__ChatterboxClassSource/__ChatterboxClassSource.gml +++ b/scripts/__ChatterboxClassSource/__ChatterboxClassSource.gml @@ -5,7 +5,7 @@ function __ChatterboxClassSource(_filename, _string) constructor { filename = _filename; name = _filename; - tags = {}; + tags = []; nodes = []; loaded = false; //We set this to at the bottom of the constructor @@ -31,14 +31,14 @@ function __ChatterboxClassSource(_filename, _string) constructor { var _node_temp_struct = _nodes_temp_array[_n]; - var _node_tags = _node_temp_struct.tags; - if (!variable_struct_exists(_node_tags, "title")) + var _node_metadata = _node_temp_struct.metadata; + if (!variable_struct_exists(_node_metadata, "title")) { - __ChatterboxError("Node in \"", filename, "\" has no title tag"); + __ChatterboxError("Node in \"", filename, "\" has no title metadata"); } else { - var _node = new __ChatterboxClassNode(filename, _node_tags, _node_temp_struct.body); + var _node = new __ChatterboxClassNode(filename, _node_metadata, _node_temp_struct.body); array_push(nodes, _node); } @@ -94,7 +94,7 @@ function __ChatterboxParseYarn(_input_string) var _line_is_file_tag = false; var _in_comment = false; - var _node_tags = {}; + var _node_metadata = {}; repeat(buffer_get_size(_buffer) - buffer_tell(_buffer)) { @@ -150,13 +150,13 @@ function __ChatterboxParseYarn(_input_string) buffer_poke(_buffer, _string_start, buffer_u8, _byte); buffer_seek(_buffer, buffer_seek_start, _old_tell); - if (__CHATTERBOX_DEBUG_LOADER) __ChatterboxTrace("Creating node \"", __ChatterboxStringLimit(_string, 100), "\" ", _node_tags); + if (__CHATTERBOX_DEBUG_LOADER) __ChatterboxTrace("Creating node \"", __ChatterboxStringLimit(_string, 100), "\" ", _node_metadata); - var _node_struct = { tags : _node_tags, body : _string }; + var _node_struct = { metadata : _node_metadata, body : _string }; array_push(_node_array, _node_struct); _in_body = false; - _node_tags = {}; + _node_metadata = {}; } } else if (!_in_body) //Treat everything in the header as key:value pairs @@ -180,9 +180,9 @@ function __ChatterboxParseYarn(_input_string) _value = __ChatterboxUnescapeString(_value); } - if (__CHATTERBOX_DEBUG_LOADER) __ChatterboxTrace("Found node tag \"", _key, "\" = \"", _value, "\""); - if (variable_struct_exists(_node_tags, _key)) __ChatterboxTrace("Warning! Duplicate node tag found \"", _key, "\""); - _node_tags[$ _key] = _value; + if (__CHATTERBOX_DEBUG_LOADER) __ChatterboxTrace("Found node metadata \"", _key, "\" = \"", _value, "\""); + if (variable_struct_exists(_node_metadata, _key)) __ChatterboxTrace("Warning! Duplicate node metadata found \"", _key, "\""); + _node_metadata[$ _key] = _value; } } } @@ -226,17 +226,17 @@ function __ChatterboxParseYarn(_input_string) buffer_poke(_buffer, _string_start, buffer_u8, _byte); buffer_seek(_buffer, buffer_seek_start, _old_tell); - if (__CHATTERBOX_DEBUG_LOADER) __ChatterboxTrace("Creating node \"", __ChatterboxStringLimit(_string, 100), "\" ", _node_tags); + if (__CHATTERBOX_DEBUG_LOADER) __ChatterboxTrace("Creating node \"", __ChatterboxStringLimit(_string, 100), "\" ", _node_metadata); - var _node_struct = { tags : _node_tags, body : _string }; + var _node_struct = { metadata : _node_metadata, body : _string }; array_push(_node_array, _node_struct); - _node_tags = {}; + _node_metadata = {}; } buffer_delete(_buffer); - if (variable_struct_names_count(_node_tags) > 0) + if (variable_struct_names_count(_node_metadata) > 0) { throw "File ended in the middle of a node header"; }